Browse Source

ui

develop
Robin Thoni 9 years ago
parent
commit
6290fa22f2

+ 1
- 1
admin/views/navbar.html View File

15
         <!-- Collect the nav links, forms, and other content for toggling -->
15
         <!-- Collect the nav links, forms, and other content for toggling -->
16
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
16
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
17
             <ul class="nav navbar-nav navbar-left">
17
             <ul class="nav navbar-nav navbar-left">
18
-                <li><a href="/luticate" ng-show="canSeeLuticate()">Luticate</a></li>
18
+                <li><a href="/luticate" target="_blank" ng-show="canSeeLuticate()">Luticate</a></li>
19
                 <li><a ui-sref="hosts" lu-show-permission="CAMOTION_HOST_GET">Hosts</a></li>
19
                 <li><a ui-sref="hosts" lu-show-permission="CAMOTION_HOST_GET">Hosts</a></li>
20
                 <li><a ui-sref="cameras" lu-show-permission="CAMOTION_CAMERA_GET,CAMOTION_HOST_GET">Cameras</a></li>
20
                 <li><a ui-sref="cameras" lu-show-permission="CAMOTION_CAMERA_GET,CAMOTION_HOST_GET">Cameras</a></li>
21
                 <li><a ui-sref="sensors" lu-show-permission="CAMOTION_SENSOR_GET,CAMOTION_HOST_GET">Sensors</a></li>
21
                 <li><a ui-sref="sensors" lu-show-permission="CAMOTION_SENSOR_GET,CAMOTION_HOST_GET">Sensors</a></li>

+ 6
- 0
camotion/controllers/cameras.controller.js View File

1
+angular.module('camotion')
2
+    .controller('CamerasController', ['$scope', '$state',
3
+        function($scope, $state) {
4
+
5
+
6
+    }]);

+ 10
- 1
camotion/index.html View File

9
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.css">
9
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.css">
10
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
10
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
11
     <link rel="stylesheet" href="../bower_components/luticate-utils/src/lubusy.css">
11
     <link rel="stylesheet" href="../bower_components/luticate-utils/src/lubusy.css">
12
-    <link href="../bower_components/flat-ui/dist/css/flat-ui.css" rel="stylesheet">
12
+    <link rel="stylesheet" href="../bower_components/flat-ui/dist/css/flat-ui.css">
13
     <link rel="stylesheet/less" href="css/app.less">
13
     <link rel="stylesheet/less" href="css/app.less">
14
     <!-- endbuild -->
14
     <!-- endbuild -->
15
 
15
 
16
+    <!-- build:remove -->
17
+    <script>
18
+        less = {
19
+            async: true
20
+        };
21
+    </script>
22
+    <!-- endbuild -->
23
+
16
     <!-- build:js app.js -->
24
     <!-- build:js app.js -->
17
     <!-- bower component -->
25
     <!-- bower component -->
18
     <script src="../bower_components/jquery/dist/jquery.js"></script>
26
     <script src="../bower_components/jquery/dist/jquery.js"></script>
37
     <script src="controllers/login.controller.js"></script>
45
     <script src="controllers/login.controller.js"></script>
38
     <script src="controllers/home.controller.js"></script>
46
     <script src="controllers/home.controller.js"></script>
39
     <script src="controllers/navbar.controller.js"></script>
47
     <script src="controllers/navbar.controller.js"></script>
48
+    <script src="controllers/cameras.controller.js"></script>
40
     <script src="controllers/sensors.controller.js"></script>
49
     <script src="controllers/sensors.controller.js"></script>
41
     <script src="controllers/commands.controller.js"></script>
50
     <script src="controllers/commands.controller.js"></script>
42
 
51
 

+ 4
- 0
camotion/views/cameras.html View File

1
+<!-- Page Content -->
2
+<div class="container">
3
+
4
+</div>

+ 1
- 1
camotion/views/navbar.html View File

18
                 <li ui-sref-active="active"><a ui-sref="cameras" lu-show-permission="CAMOTION_CAMERA_GET">Cameras</a></li>
18
                 <li ui-sref-active="active"><a ui-sref="cameras" lu-show-permission="CAMOTION_CAMERA_GET">Cameras</a></li>
19
                 <li ui-sref-active="active"><a ui-sref="sensors" lu-show-permission="CAMOTION_SENSOR_GET">Sensors</a></li>
19
                 <li ui-sref-active="active"><a ui-sref="sensors" lu-show-permission="CAMOTION_SENSOR_GET">Sensors</a></li>
20
                 <li ui-sref-active="active"><a ui-sref="commands" lu-show-permission="CAMOTION_COMMAND_GET">Commands</a></li>
20
                 <li ui-sref-active="active"><a ui-sref="commands" lu-show-permission="CAMOTION_COMMAND_GET">Commands</a></li>
21
-                <li><a href="/admin" ng-show="canSeeAdmin()">Administration</a></li>
21
+                <li><a href="/admin" target="_blank" ng-show="canSeeAdmin()">Administration</a></li>
22
             </ul>
22
             </ul>
23
             <ul class="nav navbar-nav navbar-right">
23
             <ul class="nav navbar-nav navbar-right">
24
                 <ul class="nav navbar-nav navbar-right">
24
                 <ul class="nav navbar-nav navbar-right">

Loading…
Cancel
Save