Browse Source

ui fixes

develop
Robin Thoni 8 years ago
parent
commit
f67f63d1e8

+ 4
- 3
bower.json View File

@@ -12,10 +12,11 @@
12 12
     "angular-ui-router": "0.2.x",
13 13
     "bootstrap": "3.3.x",
14 14
     "less": "1.7.x",
15
-    "luticate-utils": "https://git.rthoni.com/repos/luticate-front/utils.git#0.1.0",
16
-    "luticate-auth": "https://git.rthoni.com/repos/luticate-front/auth.git#0.1.0",
15
+    "luticate-utils": "https://git.rthoni.com/repos/luticate-front/utils.git#0.1.x",
16
+    "luticate-auth": "https://git.rthoni.com/repos/luticate-front/auth.git#0.1.x",
17 17
     "angular-dialog-service": "~5.2.8",
18 18
     "ngSanitize": "~0.0.2",
19
-    "angular-ui-validate": "~1.2.1"
19
+    "angular-ui-validate": "~1.2.1",
20
+    "flat-ui": "~2.2.2"
20 21
   }
21 22
 }

+ 9
- 1
index.html View File

@@ -8,11 +8,19 @@
8 8
     <!-- build:css css/css.css -->
9 9
     <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
10 10
     <link rel="stylesheet" href="bower_components/luticate-utils/src/lubusy.css">
11
-    <link rel="stylesheet" href="bower_components/luticate-utils/src/lubasictable.css">
12 11
     <link rel="stylesheet" href="bower_components/luticate-utils/src/lupickertable.css">
12
+    <link rel="stylesheet" href="bower_components/flat-ui/dist/css/flat-ui.css">
13 13
     <link rel="stylesheet/less" href="css/app.less">
14 14
     <!-- endbuild -->
15 15
 
16
+    <!-- build:remove -->
17
+    <script>
18
+        less = {
19
+            async: true
20
+        };
21
+    </script>
22
+    <!-- endbuild -->
23
+
16 24
     <!-- build:js app.js -->
17 25
     <!-- bower component -->
18 26
     <script src="bower_components/jquery/dist/jquery.js"></script>

+ 1
- 1
views/home.html View File

@@ -56,7 +56,7 @@
56 56
             </div>
57 57
 
58 58
             <div class="form-group col-sm-12">
59
-                <button class="btn btn-default">Edit</button>
59
+                <button class="btn btn-primary">Edit</button>
60 60
             </div>
61 61
         </form>
62 62
     </div>

+ 1
- 1
views/login.html View File

@@ -13,7 +13,7 @@
13 13
 
14 14
                 <br />
15 15
                 <div class="col-sm-12 center-block">
16
-                    <button type="submit" class="btn btn-default center-block">Login</button>
16
+                    <button type="submit" class="btn btn-primary center-block">Login</button>
17 17
                 </div>
18 18
 
19 19
                 <br />

+ 3
- 3
views/modals/groupedit.html View File

@@ -2,16 +2,16 @@
2 2
     <div class="form-group">
3 3
         <label for="name" class="col-sm-2 control-label">Name</label>
4 4
         <div class="col-sm-9">
5
-            <input id="name" class="form-control" ng-model="group.Name" required lu-enable-permission="{{ permission }}"/>
5
+            <input autofocus id="name" class="form-control" ng-model="group.Name" required lu-enable-permission="{{ permission }}"/>
6 6
         </div>
7 7
     </div>
8 8
     <div class="form-group">
9 9
         <div class="col-sm-2"></div>
10
-        <button type="button" class="btn btn-default"
10
+        <button type="button" class="btn btn-primary"
11 11
                 ng-click="editPermissions(group)" ng-show="canEditPermissions()">
12 12
             Edit permissions
13 13
         </button>
14
-        <button type="button" class="btn btn-default"
14
+        <button type="button" class="btn btn-primary"
15 15
                 ng-click="editUsers(group)" ng-show="canEditUsers()">
16 16
             Edit users
17 17
         </button>

+ 2
- 2
views/modals/permissionedit.html View File

@@ -2,14 +2,14 @@
2 2
     <div class="form-group">
3 3
         <label for="name" class="col-sm-2 control-label">Name</label>
4 4
         <div class="col-sm-9">
5
-            <input id="name" class="form-control input-permission-name" ng-model="permission.Name" required ng-disabled="!permission.IsNew"/>
5
+            <input autofocus id="name" class="form-control input-permission-name" ng-model="permission.Name" required ng-disabled="!permission.IsNew"/>
6 6
         </div>
7 7
     </div>
8 8
     <div class="form-group">
9 9
         <label class="col-sm-2 control-label">Allowed</label>
10 10
         <div class="col-sm-9">
11 11
             <div class="btn-group">
12
-                <button class="btn btn-default dropdown-toggle btn-select" data-toggle="dropdown" href="" lu-enable-permission="{{ neededPermission }}">
12
+                <button type="button" class="btn btn-primary dropdown-toggle btn-select" data-toggle="dropdown" href="" lu-enable-permission="{{ neededPermission }}">
13 13
                     {{ permission.Value ? 'Yes' : 'No' }} <span class="caret"></span>
14 14
                 </button>
15 15
                 <ul class="dropdown-menu">

+ 3
- 3
views/modals/useredit.html View File

@@ -2,7 +2,7 @@
2 2
     <div class="form-group">
3 3
         <label for="username" class="col-sm-2 control-label">Username</label>
4 4
         <div class="col-sm-9">
5
-            <input id="username" class="form-control" ng-model="user.Username" ng-readonly="user.Id != null" required/>
5
+            <input autofocus id="username" class="form-control" ng-model="user.Username" ng-readonly="user.Id != null" required/>
6 6
         </div>
7 7
     </div>
8 8
 
@@ -53,11 +53,11 @@
53 53
 
54 54
     <div class="form-group">
55 55
         <div class="col-sm-2"></div>
56
-        <button type="button" class="btn btn-default"
56
+        <button type="button" class="btn btn-primary"
57 57
                 ng-click="editPermissions(user)" ng-show="canEditPermissions()">
58 58
             Edit permissions
59 59
         </button>
60
-        <button type="button" class="btn btn-default" lu-show-permission="LU_PERM_EFFECTIVE_GET,LU_PERM_GET"
60
+        <button type="button" class="btn btn-info" lu-show-permission="LU_PERM_EFFECTIVE_GET,LU_PERM_GET"
61 61
                 ng-click="showEffectivePermissions(user)" ng-show="user.Id != null">
62 62
             Show effective permissions
63 63
         </button>

+ 3
- 3
views/navbar.html View File

@@ -15,9 +15,9 @@
15 15
         <!-- Collect the nav links, forms, and other content for toggling -->
16 16
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
17 17
             <ul class="nav navbar-nav navbar-left">
18
-                <li><a ui-sref="users" lu-show-permission="LU_USER_GET">Users</a></li>
19
-                <li><a ui-sref="groups" lu-show-permission="LU_GROUP_GET">Groups</a></li>
20
-                <li><a ui-sref="permissions" lu-show-permission="LU_PERM_GET">Permissions</a></li>
18
+                <li ui-sref-active="active"><a ui-sref="users" lu-show-permission="LU_USER_GET">Users</a></li>
19
+                <li ui-sref-active="active"><a ui-sref="groups" lu-show-permission="LU_GROUP_GET">Groups</a></li>
20
+                <li ui-sref-active="active"><a ui-sref="permissions" lu-show-permission="LU_PERM_GET">Permissions</a></li>
21 21
                 <!--<li><a ui-sref="test" >Test</a></li>-->
22 22
             </ul>
23 23
             <ul class="nav navbar-nav navbar-right">

Loading…
Cancel
Save