Before implementation of createDirModal

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

diff --git a/zephyr/client/app/directive/navbar/sb-admin-2.css b/zephyr/client/app/directive/navbar/sb-admin-2.css
old mode 100644 (file)
new mode 100755 (executable)
index 151ee76..1f5284a
--- a/zephyr/client/app/directive/navbar/sb-admin-2.css
+++ b/zephyr/client/app/directive/navbar/sb-admin-2.css
@@ -24,7 +24,7 @@ body {
         margin: 0 0 0 250px;
         padding: 0 30px;
         border-left: 1px solid #e7e7e7;
-    }
+}
 }
 
 .navbar-top-links li {
@@ -129,13 +129,13 @@ body {
         position: absolute;
         width: 250px;
         margin-top: 51px;
-    }
+}
 
-    .navbar-top-links .dropdown-messages,
-    .navbar-top-links .dropdown-tasks,
-    .navbar-top-links .dropdown-alerts {
-        margin-left: auto;
-    }
+.navbar-top-links .dropdown-messages,
+.navbar-top-links .dropdown-tasks,
+.navbar-top-links .dropdown-alerts {
+    margin-left: auto;
+}
 }
 
 .btn-outline {
@@ -342,4 +342,4 @@ table.dataTable thead .sorting:after {
 
 .panel-yellow a:hover {
     color: #df8a13;
-}
\ No newline at end of file
+}

diff --git a/zephyr/client/app/route/dashboard/dashboard.controller.js b/zephyr/client/app/route/dashboard/dashboard.controller.js
index 593d44e..de52d5a 100644 (file)
--- a/zephyr/client/app/route/dashboard/dashboard.controller.js
+++ b/zephyr/client/app/route/dashboard/dashboard.controller.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('zephyrApp')
-  .controller('RouteCtrl', function ($scope, $location, directivePath, api, modalService) {
+  .controller('RouteCtrl', function ($scope, $location, directivePath, api) {
     $scope.navbar = directivePath.navbar;
     //$location.path('/workspacePage');
     //console.log(api('workspace/update'));

diff --git a/zephyr/client/app/route/dashboard/dashboard.html b/zephyr/client/app/route/dashboard/dashboard.html
index 5146921..d848f3d 100644 (file)
--- a/zephyr/client/app/route/dashboard/dashboard.html
+++ b/zephyr/client/app/route/dashboard/dashboard.html
@@ -1,3 +1,4 @@
+<div id="wrapper">
 <navbar></navbar>
 <div id="page-wrapper">
     <div class="page-header">
@@ -20,4 +21,4 @@
     </div>
 </div>
 <!-- /#page-wrapper -->
-
+</div>

diff --git a/zephyr/client/app/route/workspacePage/workspacePage.controller.js b/zephyr/client/app/route/workspacePage/workspacePage.controller.js
index 67c3448..6997513 100644 (file)
--- a/zephyr/client/app/route/workspacePage/workspacePage.controller.js
+++ b/zephyr/client/app/route/workspacePage/workspacePage.controller.js
@@ -2,32 +2,21 @@
 
 angular.module('zephyrApp')
 .controller('WorkspacepageCtrl', function ($scope, directivePath, modalService) {
-    $scope.navbar = directivePath.navbar;
-    $scope.files = [{
-        name: 'sample.txt',
-    type: 'txt',
-    createdTime: '16:30'
-    },
-    {
-        name: 'sample.txt',
-    type: 'txt',
-    createdTime: '16:30'
-    },
-    {
-        name: 'sample.txt',
-    type: 'txt',
-    createdTime: '16:30'
-    }
-];
-
-$scope.openModal = function() {
-    modalService.openModal({
-        modalHeader: "This is Header",
-        modalBody  : "This Body",
-        okFunc     : function() {
-            alert("Close");
-        }
-    });
-}
-
+    //$scope.navbar = directivePath.navbar;
+    $scope.tableRows = [];
+    $scope.tableRows.push(new Table("hoge"));
+    $scope.tableRows.push(new Table("hoge"));
+    $scope.tableRows.push(new Table("hoge"));
+    $scope.tableRows.push(new Table("hoge"));
+    $scope.tableRows.push(new Table("hoge"));
+    $scope.tableRows.push(new Table("hoge"));
 });
+
+function Table(info) {
+    var row = {
+        name: info,
+        size: info,
+        created_time: info
+    };
+   return row;
+};

diff --git a/zephyr/client/app/route/workspacePage/workspacePage.html b/zephyr/client/app/route/workspacePage/workspacePage.html
index ba8e2dd..37c3690 100644 (file)
--- a/zephyr/client/app/route/workspacePage/workspacePage.html
+++ b/zephyr/client/app/route/workspacePage/workspacePage.html
@@ -1,43 +1,66 @@
-<div ng-include="navbar"></div>
-
-<div id="page-wrapper">
-    <div ng-controller="WorkspacepageCtrl">
-        <div class="row"> 
-            <div class="col-md-12">
-                <div class="panel-body">
-                    <h4>WorkSpace-1<span>
-                            <ul class="nav navbar-top-links navbar-right">
-                                <li><a href="" opover-placement="top" popover-trigger="mouseenter" popover="upload" ng-click="openModal()"><span class="glyphicon glyphicon-file"></span></a></li>
-                                <li><a href="#" popover-placement="top" popover-trigger="mouseenter" popover="create folder"><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 id="wrapper">
+    <navbar></navbar>
+    <div id="page-wrapper">
+        <div ng-controller="WorkspacepageCtrl">
 
+            <div class="container">
+
+                <div class="row page-header">
+                    <ol class="breadcrumb">
+                        <li>
+                            <i class="fa fa-dashboar"></i><a href="index.html">Dashboard</a>
+                        </li>
+                        <li class="active">
+                            All Workspaces
+                        </li>
+                    </ol>
+                </div>
+
+                <div class="row">
+                    <div class="collapse navbar-collapse">
+                        <h3 class="pull-left" style="display:inline">All Workspaces</h3>
+                        <form class="navbar-form navbar-right" role="search">
+                            <div class="form-group">
+                                <input type="text" class="form-control" placeholder="Search">
+                            </div>
+                        </form>
+                        <ul class="nav navbar-nav navbar-right">
+                            <li popover-trigger="mouseenter" popover="Create"><a href=""><i class="icon-addfolderalt"></i></a></li>
+                        </ul>
+                    </div>
+                </div>
+
+                <div class="row">
                     <div class="table-responsive">
-                        <table class="table table-bordered table-striped">
+                        <table class="table table-hover">
                             <thead>
                                 <tr>
-                                    <td>hoge</td>
-                                    <td>hage</td>
-                                    <td>hige</td>
-                                    <td>huge</td>
+                                    <th>#</th>
+                                    <th>Name</th>
+                                    <th>Size</th>
+                                    <th>Created Time</th>
                                 </tr>
                             </thead>
                             <tbody>
-                                <tr ng-repeat="file in files">
-                                    <td>1</td>
-                                    <td>2</td>
-                                    <td>3</td>
-                                    <td><button type="button">delete</button></td>
+                                <tr ng-repeat="row in tableRows">
+                                    <td>{{$index}}</td>
+                                    <td>{{row.name}}</td>
+                                    <td>{{row.size}}</td>
+                                    <td>{{row.created_time}}</td>
                                 </tr>
                             </tbody>
-                        </div>
+                        </table>
                     </div>
-                </div> 
+                </div>
+
             </div>
+            <!-- WorkspacepageCtrl -->
+
         </div>
+        <!-- .containeri -->
+
     </div>
+    <!-- /#page-wrapper -->
+
 </div>
-<!-- /#page-wrapper -->
 

diff --git a/zephyr/client/app/service/createDirModal/createDirModal.service.js b/zephyr/client/app/service/createDirModal/createDirModal.service.js
new file mode 100644 (file)
index 0000000..4c2134d
--- /dev/null
+++ b/zephyr/client/app/service/createDirModal/createDirModal.service.js
@@ -0,0 +1,6 @@
+'use strict';
+
+angular.module('zephyrApp')
+  .service('createDirModal', function () {
+    // AngularJS will instantiate a singleton by calling "new" on this function
+  });

diff --git a/zephyr/client/app/service/createDirModal/createDirModal.service.spec.js b/zephyr/client/app/service/createDirModal/createDirModal.service.spec.js
new file mode 100644 (file)
index 0000000..563f9ee
--- /dev/null
+++ b/zephyr/client/app/service/createDirModal/createDirModal.service.spec.js
@@ -0,0 +1,18 @@
+'use strict';
+
+describe('Service: createDirModal', function () {
+
+  // load the service's module
+  beforeEach(module('zephyrApp'));
+
+  // instantiate service
+  var createDirModal;
+  beforeEach(inject(function (_createDirModal_) {
+    createDirModal = _createDirModal_;
+  }));
+
+  it('should do something', function () {
+    expect(!!createDirModal).toBe(true);
+  });
+
+});

diff --git a/zephyr/client/app/service/modalService/modalService.controller.js b/zephyr/client/app/service/modalService/modalService.controller.js
deleted file mode 100644 (file)
index f32c2c6..0000000
--- a/zephyr/client/app/service/modalService/modalService.controller.js
+++ /dev/null
@@ -1,20 +0,0 @@
-angular.module('zephyrApp')
-.controller('BasicModalController', function ($scope, $modalInstance, modalParam) {
-    $scope.modalHeader = modalParam.modalHeader;
-    $scope.modalBody   = modalParam.modalBody;
-
-    $scope.ok          = function() {
-        modalParam.okFunc();
-        $modalInstance.close();
-    };
-
-    $scope.cancel      = function() {
-        $modalInstance.close();
-    };
-
-    $scope.upload      = function() {
-        var upload = document.getElementById("upload");
-        upload.click();
-        $modalInstance.close();
-    };
-});

diff --git a/zephyr/client/app/service/modalService/modalService.html b/zephyr/client/app/service/modalService/modalService.html
deleted file mode 100644 (file)
index 3f32ae5..0000000
--- a/zephyr/client/app/service/modalService/modalService.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="modal-header">
-    <h3>{{modalHeader}}</h3>
-</div>
-<div class="modal-body">
-    <span style="white-space: pre-line;">{{modalBody}}</span>
-</div>
-<div class="modal-footer">
-    <form action="/api/upload/create/hoge" method="post" enctype="multipart/form-data">
-          <input type="file" name="file" id="file">
-          <input type="submit" name="submit" value="Submit">
-    </form>
-    <button class="btn btn-warning cancel" data-ng-click="cancel()" type="button">
-        <span class="glyphicon glyphicon-ban-circle"></span>
-        <span>Cancel upload</span>
-    </button>
-    <ng-upload-form url="//jquery-file-upload.appspot.com/" auto-upload="true" size-limit="500000"></ng-upload-form>
-    <span class="fileupload-process"></span>
-</div>

diff --git a/zephyr/client/app/service/modalService/modalService.service.js b/zephyr/client/app/service/modalService/modalService.service.js
deleted file mode 100644 (file)
index 23db235..0000000
--- a/zephyr/client/app/service/modalService/modalService.service.js
+++ /dev/null
@@ -1,24 +0,0 @@
-'use strict';
-
-angular.module('zephyrApp')
-  .service('modalService', function ($modal) {
-    var openModal = function(modalParam) {
-        $modal.open(
-            {
-                templateUrl: "app/service/modalService/modalService.html",
-                controller : "BasicModalController",
-                backdrop   : true,
-                resolve    : {
-                    modalParam : function() {
-                                     return modalParam;
-                                 }
-                }
-            }
-            );
-    };
-
-    return {
-        openModal: openModal
-    }
-
-  });

diff --git a/zephyr/client/app/service/modalService/modalService.service.spec.js b/zephyr/client/app/service/modalService/modalService.service.spec.js
deleted file mode 100644 (file)
index 20e9665..0000000
--- a/zephyr/client/app/service/modalService/modalService.service.spec.js
+++ /dev/null
@@ -1,18 +0,0 @@
-'use strict';
-
-describe('Service: modalService', function () {
-
-  // load the service's module
-  beforeEach(module('zephyrApp'));
-
-  // instantiate service
-  var modalService;
-  beforeEach(inject(function (_modalService_) {
-    modalService = _modalService_;
-  }));
-
-  it('should do something', function () {
-    expect(!!modalService).toBe(true);
-  });
-
-});

diff --git a/zephyr/client/index.html b/zephyr/client/index.html
index 3d318fc..8a5f5cf 100644 (file)
--- a/zephyr/client/index.html
+++ b/zephyr/client/index.html
@@ -15,7 +15,7 @@
       <!-- 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" />
+      <link rel="stylesheet" href="bower_components/webhostinghub-glyphs/css/webhostinghub-glyphs.css" />
       <!-- endbower -->
     <!-- endbuild -->
     <!-- build:css({.tmp,client}) app/app.css -->