Commit: a4f0202d1cfc5bdfb16ed9d60216b5b9e13b4b6d - Eos (git)

Commit MetaInfo

• Revisión: a4f0202d1cfc5bdfb16ed9d60216b5b9e13b4b6d (tree)
• Tiempo: 2014-11-21 12:37:51
• Autor: himatani_cafe <fumifumi@yasu...>
• Commiter: himatani_cafe

Log Message

Little Modification (without tickets)

Cambiar Resumen

• modified: zephyr/client/app/directive/navbar/navbar.directive.js
• modified: zephyr/client/app/directive/navbar/navbar.html
• modified: zephyr/client/app/route/dashboard/dashboard.controller.js
• modified: zephyr/client/app/route/dashboard/dashboard.html

Diferencia incremental

--- a/zephyr/client/app/directive/navbar/navbar.directive.js
+++ b/zephyr/client/app/directive/navbar/navbar.directive.js
@@ -1,27 +1,28 @@
 'use strict';
 
 angular.module('zephyrApp')
-  .directive('navbar', function () {
+.directive('navbar', function () {
     return {
-      templateUrl: 'app/directive/navbar/navbar.html',
-      restrict: 'EA',
-      link: function (scope, element, attrs) {
-      },
-      contoroller: function($scope){
+        templateUrl: 'app/directive/navbar/navbar.html',
+    restrict: 'EA',
+    link: function (scope, element, attrs) {
+    }
+    /*
+    contoroller: function($scope){
                     $scope.links = {
-                        dashboard: "active",
-                        command: false,
-                        workspace: false,
-                        activity: false    
-                   };
+                    dashboard: true,
+                    command: false,
+                    workspace: false,
+                    activity: false    
+                }
 
-                    $scope.activate = function(active) {
+                        $scope.activate = function(active) {
                         $angular.forEach($scope.links, function(link) {
-                            link = false;
+                        link = false;
                         };
                         $scope.links[active] = "active";
-                    };
-                    }
-
-    };
-  });
+                        };
+                        }
+                        */
+    }
+});

--- a/zephyr/client/app/directive/navbar/navbar.html
+++ b/zephyr/client/app/directive/navbar/navbar.html
@@ -244,7 +244,7 @@
                     <a ng-class="{{links.workspace}}" href="workspacePage"><i class="fa fa-table fa-fw"></i> WorkSpace</a>
                 </li>
                 <li>
-                    <a ng-class="{{.activity}}" href="activityLogPage"><i class="fa fa-edit fa-fw"></i> Activity Log</a>
+                    <a ng-class="{{links.activity}}" href="activityLogPage"><i class="fa fa-edit fa-fw"></i> Activity Log</a>
                 </li>
             </ul>
         </div>

--- a/zephyr/client/app/route/dashboard/dashboard.controller.js
+++ b/zephyr/client/app/route/dashboard/dashboard.controller.js
@@ -4,6 +4,6 @@ angular.module('zephyrApp')
   .controller('RouteCtrl', function ($scope, $location, directivePath, api, modalService) {
     $scope.navbar = directivePath.navbar;
     //$location.path('/workspacePage');
-    console.log(api('workspace/update'));
+    //console.log(api('workspace/update'));
     $scope.workspaces = api('workspace/read');
   });

--- a/zephyr/client/app/route/dashboard/dashboard.html
+++ b/zephyr/client/app/route/dashboard/dashboard.html
@@ -1,5 +1,4 @@
-<div ng-include="navbar"></div>
-
+<navbar></navbar>
 <div id="page-wrapper">
     <div class="page-header">
         <div class="row">
@@ -9,7 +8,6 @@
             <!-- /.col-lg-12 -->
         </div>
         <div class="row">
-            unnko
         </div>
     </div>