initial status setup for wearscript#4

theonlyjames · Mar 18, 2014 · 43718e9 · 43718e9
1 parent ecebbfc
commit 43718e9
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 13 deletions.
diff --git a/app/index.html b/app/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
-<html>
-  <head>
+<html data-ng-app="wearscriptPlaygroundApp">
+  <head >
     <meta charset="utf-8">
     <title>Wearscript Playground</title>
     <meta name="description" content="">
@@ -34,19 +34,19 @@
     <!(endif)-->
   </head>
   <body
-    data-ng-app="wearscriptPlaygroundApp"
-    data-ng-class="{'menu-open': menu }"
+    data-ng-class="{'menu-open': profile.menu }"
     data-ng-cloak >
-    <header>
-      <a
-         data-ng-click="menu=!menu"
-         data-ng-init="menu=true"><i class="fa fa-bars"></i></a>
+    <header data-ng-controller="HeaderCtrl">
+      <a data-ng-click="profile.toggle('menu')">
+         <i class="fa fa-bars"></i>
+      </a>
+      <div class="status">{{status}}</div>
       <div ng-controller="ModalCtrl">
           <a ng-click="open()"><i class="fa fa-ellipsis-v"></i></a>
       </div>
       <h1>Wearscript Playground</h1>
     </header>
-    <aside  ng-show="menu" data-ng-controller="MenuCtrl">
+    <aside  ng-show="profile.menu" data-ng-controller="MenuCtrl">
       <nav>
         <ul>
           <li>
@@ -79,7 +79,7 @@ <h1>Wearscript Playground</h1>
                data-ng-class="{'active': active==logging}"
                href="#/logging">Logging</a>
           </li>
-          <li data-ng-show="debugMode">
+          <li data-ng-show="profile.debug_mode">
             <a data-ng-click='active=channels'
                data-ng-class="{'active': active==debug}"
                href="#/debug">Debug</a>
@@ -148,14 +148,15 @@ <h1>Wearscript Playground</h1>
     <script src="scripts/controllers/help.js"></script>
     <script src="scripts/controllers/modal.js"></script>
     <script src="scripts/controllers/logging.js"></script>
+    <script src="scripts/controllers/header.js"></script>
+    <script src="scripts/controllers/debug.js"></script>
+    <script src="scripts/controllers/menu.js"></script>
     <script src="scripts/services/storage.js"></script>
     <script src="scripts/services/socket.js"></script>
     <script src="scripts/services/editor.js"></script>
     <script src="scripts/services/storage.js"></script>
     <script src="scripts/services/profile.js"></script>
     <script src="scripts/services/playground.js"></script>
-    <script src="scripts/controllers/debug.js"></script>
-    <script src="scripts/controllers/menu.js"></script>
     <!-- endbuild -->
   </body>
 </html>
diff --git a/app/scripts/controllers/header.js b/app/scripts/controllers/header.js
@@ -0,0 +1,7 @@
+'use strict';
+
+angular.module('wearscriptPlaygroundApp')
+  .controller('HeaderCtrl', function ($scope,Editor) {
+    $scope.status = Editor.status || "Loaded"
+    $scope.editorActive = Editor.active; 
+  });
diff --git a/app/scripts/services/editor.js b/app/scripts/services/editor.js
@@ -17,7 +17,9 @@ angular.module('wearscriptPlaygroundApp')
       gistid: undefined,
       file: undefined,
       forkonsave: false,
-      session: false
+      session: false,
+      menu: true,
+      status: "Loaded"
     }
 
     service.init = function(editor){

diff --git a/app/styles/main.less b/app/styles/main.less
@@ -31,6 +31,19 @@ body {
     left:0px;
     height:@nav_height;
     background:#333;
+    div.status {
+        font-size:12px;
+        position:absolute; 
+        color:#888;
+        right:50px;
+        top:6px;
+        border:1px #111 solid;
+        background:#222;
+        opacity:0.6;
+        padding:2px 8px;
+        text-align:center;
+        border-radius:10px;
+    }
     > a, div > a {
       display:block;
       height:@nav_height;

diff --git a/test/spec/controllers/header.js b/test/spec/controllers/header.js
@@ -0,0 +1,22 @@
+'use strict';
+
+describe('Controller: HeaderCtrl', function () {
+
+  // load the controller's module
+  beforeEach(module('wearscriptPlaygroundApp'));
+
+  var HeaderCtrl,
+    scope;
+
+  // Initialize the controller and a mock scope
+  beforeEach(inject(function ($controller, $rootScope) {
+    scope = $rootScope.$new();
+    HeaderCtrl = $controller('HeaderCtrl', {
+      $scope: scope
+    });
+  }));
+
+  it('should attach a list of awesomeThings to the scope', function () {
+    expect(scope.awesomeThings.length).toBe(3);
+  });
+});