rockstor#518 - Added shell template and view plus router.js mods to h…

…andle
MFlyer · Jul 6, 2016 · 96be6e3 · 96be6e3
1 parent 48a953f
commit 96be6e3
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/src/rockstor/storageadmin/static/storageadmin/js/router.js b/src/rockstor/storageadmin/static/storageadmin/js/router.js
@@ -96,6 +96,7 @@ var AppRouter = Backbone.Router.extend({
 	    "add-afp-share": "addAFPShare",
 	    "afp/edit/:afpShareId": "editAFPShare",
 	    "rockons": "showRockons",
+		"shell": "showShell",
 	    "images": "showImages",
 	    "containers": "showContainers",
 	    "appliances": "showAppliances",
@@ -757,7 +758,15 @@ var AppRouter = Backbone.Router.extend({
         this.currentLayout = new LogsView();
         $('#maincontent').empty();
         $('#maincontent').append(this.currentLayout.render().el);
-    }
+    },
+
+	showShell: function() {
+		this.renderSidebar('system', 'shell');
+        this.cleanup();
+		this.currentLayout = new ShellView();
+        $('#maincontent').empty();
+        $('#maincontent').append(this.currentLayout.render().el);
+	},
 
 
 });
@@ -910,6 +919,12 @@ $(document).ready(function() {
     var kernelInfo = function(data) {
 	    $loadavg.text('Linux: ' + data);
     };
+
+    var displayLocaleTime = function(data) {
+
+        $('#local-time > span').text(data);
+
+    }	
 
     var displayLoadAvg = function(data) {
 	    var n = parseInt(data);
@@ -961,6 +976,7 @@ $(document).ready(function() {
 
     RockStorSocket.addListener(kernelInfo, this, 'sysinfo:kernel_info');
     RockStorSocket.addListener(displayLoadAvg, this, 'sysinfo:uptime');
+    RockStorSocket.addListener(displayLocaleTime, this, 'sysinfo:localtime');
     RockStorSocket.addListener(kernelError, this, 'sysinfo:kernel_error');
     RockStorSocket.addListener(displayUpdate, this, 'sysinfo:software-update');