Modified navbar

diff --git a/zephyr/bower.json b/zephyr/bower.json
index 27fa252..0d1f4ec 100644 (file)
--- a/zephyr/bower.json
+++ b/zephyr/bower.json
@@ -14,7 +14,8 @@
     "angular-bootstrap": "~0.11.0",
     "font-awesome": ">=4.1.0",
     "lodash": "~2.4.1",
-    "startbootstrap": "*"
+    "startbootstrap": "*",
+    "fontawesome": "~4.2.0"
   },
   "devDependencies": {
     "angular-mocks": ">=1.2.*",

diff --git a/zephyr/client/app/directive/navbar/navbar.directive.js b/zephyr/client/app/directive/navbar/navbar.directive.js
index 5d392c2..dff2234 100644 (file)
--- a/zephyr/client/app/directive/navbar/navbar.directive.js
+++ b/zephyr/client/app/directive/navbar/navbar.directive.js
@@ -6,23 +6,8 @@ angular.module('zephyrApp')
         templateUrl: 'app/directive/navbar/navbar.html',
     restrict: 'EA',
     link: function (scope, element, attrs) {
-    }
-    /*
-    contoroller: function($scope){
-                    $scope.links = {
-                    dashboard: true,
-                    command: false,
-                    workspace: false,
-                    activity: false    
-                }
-
-                        $scope.activate = function(active) {
-                        $angular.forEach($scope.links, function(link) {
-                        link = false;
-                        };
-                        $scope.links[active] = "active";
-                        };
-                        }
-                        */
-    }
+    },
+    controllor: ['$scope',function($scope) {
+                }]
+    };
 });

diff --git a/zephyr/client/app/directive/navbar/navbar.html b/zephyr/client/app/directive/navbar/navbar.html
index 4e1d097..e1cd128 100644 (file)
--- a/zephyr/client/app/directive/navbar/navbar.html
+++ b/zephyr/client/app/directive/navbar/navbar.html
@@ -235,16 +235,16 @@
                     <!-- /input-group -->
                 </li>
                 <li>
-                    <a ng-class="{{links.dashboard}}" href="dashboard"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a>
+                    <a href="#"><i class="fa fa-dashboard fa-fw" ng-class="active"></i> Dashboard</a>
                 </li>
                 <li>
-                    <a ng-class="{{links.command}}" href="commandPage"><i class="fa fa-bar-chart-o fa-fw"></i> Command</a>
+                    <a href="commandPage"><i class="fa fa-bar-chart-o fa-fw"></i> Command</a>
                 </li>
                 <li>
-                    <a ng-class="{{links.workspace}}" href="workspacePage"><i class="fa fa-table fa-fw"></i> WorkSpace</a>
+                    <a href="workspacePage"><i class="fa fa-table fa-fw"></i> WorkSpace</a>
                 </li>
                 <li>
-                    <a ng-class="{{links.activity}}" href="activityLogPage"><i class="fa fa-edit fa-fw"></i> Activity Log</a>
+                    <a href="activityLogPage"><i class="fa fa-edit fa-fw"></i> Activity Log</a>
                 </li>
             </ul>
         </div>

diff --git a/zephyr/client/app/route/dashboard/dashboard.controller.js b/zephyr/client/app/route/dashboard/dashboard.controller.js
index 6acfa28..593d44e 100644 (file)
--- a/zephyr/client/app/route/dashboard/dashboard.controller.js
+++ b/zephyr/client/app/route/dashboard/dashboard.controller.js
@@ -6,4 +6,11 @@ angular.module('zephyrApp')
     //$location.path('/workspacePage');
     //console.log(api('workspace/update'));
     $scope.workspaces = api('workspace/read');
+
+    $scope.workspaceIsActive = false;
+    $scope.onWorkspace = function() {
+        $scope.workspaceIsActive = true;
+    };
+
+
   });

diff --git a/zephyr/client/app/route/dashboard/dashboard.html b/zephyr/client/app/route/dashboard/dashboard.html
index eeca750..5146921 100644 (file)
--- a/zephyr/client/app/route/dashboard/dashboard.html
+++ b/zephyr/client/app/route/dashboard/dashboard.html
@@ -1,48 +1,21 @@
 <navbar></navbar>
 <div id="page-wrapper">
     <div class="page-header">
+    </div>
+    <div class="container">
         <div class="row">
-            <div class="col-lg-12">
-                <h1>WorkSpace</h1>
-            </div>
-            <!-- /.col-lg-12 -->
+            <i class="fa fa-university fa-2x"></i><a href="/workspacePage"><h3 style="display:inline">Workspace</h3></a>
         </div>
         <div class="row">
+            <p>Workspaceに関する説明をいろいろと書く。</p>
         </div>
     </div>
-
-    <div class="row">
-        <div class="col-md-12">
-            <div class="panel-body">
-                <h4>一覧<span>
-                        <ul class="nav navbar-top-links navbar-right">
-                            <li><a href="#" popover-placement="top" popover-trigger="mouseenter" popover="create folder" ng-click="openModal()"><span class="glyphicon glyphicon-folder-close"></span></a></li>
-                            <li><a href="#" popover-placement="top" popover-trigger="mouseenter" popover="delete"><span class="glyphicon glyphicon-trash"></span></a></li>
-                        </ul>
-                    </span>
-                </h4>
-            </div>
-
-            <div class="table-responsive">
-                <table class="table table-bordered table-striped">
-                    <thead>
-                        <tr>
-                            <td>hoge</td>
-                            <td>hage</td>
-                            <td>hige</td>
-                            <td>huge</td>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr ng-repeat="workspace in workspaces">
-                            <td>{{workspace}}</td>
-                            <td>{{workspace}}</td>
-                            <td>{{workspace}}</td>
-                            <td><button type="button">delete</button></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
+    <div class="page-header">
+    </div>
+    <div class="container">
+        <div class="row">
+            <i class="fa fa-database fa-2x"></i><a href="activityLogPage"><h3 style="display:inline">ActivityLog</h3></a>
+            <p>ActivityLogに関する説明をいろいろと書く。</p>
         </div>
     </div>
 </div>

diff --git a/zephyr/client/components/fonts/flaticon.css b/zephyr/client/components/fonts/flaticon.css
new file mode 100755 (executable)
index 0000000..ece6353
--- /dev/null
+++ b/zephyr/client/components/fonts/flaticon.css
@@ -0,0 +1,19 @@
+@font-face {
+       font-family: "Flaticon";
+       src: url("flaticon.eot");
+       src: url("flaticon.eot#iefix") format("embedded-opentype"),
+       url("flaticon.woff") format("woff"),
+       url("flaticon.ttf") format("truetype"),
+       url("flaticon.svg") format("svg");
+       font-weight: normal;
+       font-style: normal;
+}
+[class^="flaticon-"]:before, [class*=" flaticon-"]:before,
+[class^="flaticon-"]:after, [class*=" flaticon-"]:after {   
+       font-family: Flaticon;
+        font-size: 20px;
+font-style: normal;
+margin-left: 20px;
+}.flaticon-physical:before {
+       content: "\e000";
+}

diff --git a/zephyr/client/index.html b/zephyr/client/index.html
index 3ada59f..3d318fc 100644 (file)
--- a/zephyr/client/index.html
+++ b/zephyr/client/index.html
@@ -15,12 +15,14 @@
       <!-- bower:css -->
       <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
       <link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.css" />
+      <link rel="stylesheet" href="bower_components/fontawesome/css/font-awesome.css" />
       <!-- endbower -->
     <!-- endbuild -->
     <!-- build:css({.tmp,client}) app/app.css -->
     <link rel="stylesheet" href="app/app.css">
       <!-- injector:css -->
       <link rel="stylesheet" href="app/directive/navbar/sb-admin-2.css">
+      <link rel="stylesheet" href="components/fonts/flaticon.css">
       <!-- endinjector -->
     <!-- endbuild -->
   </head>