Parcourir la source

ui fixes

develop
Robin Thoni il y a 8 ans
Parent
révision
08299a6eec

+ 5
- 3
views/home.html Voir le fichier

@@ -1,6 +1,6 @@
1 1
 <!-- Page Content -->
2 2
 <div class="container">
3
-    <div class="row co-sm-8 col-sm-offset-2" lu-busy="form">
3
+    <div class="row col-sm-9 col-sm-offset-1" lu-busy="form">
4 4
         <form name="form" ng-submit="submit()" class="form-horizontal">
5 5
             <div class="form-group">
6 6
                 <label for="email" class="col-sm-2 control-label">Email</label>
@@ -55,8 +55,10 @@
55 55
                 </div>
56 56
             </div>
57 57
 
58
-            <div class="form-group col-sm-12">
59
-                <button class="btn btn-primary">Edit</button>
58
+            <div class="form-group">
59
+                <div class="col-sm-9 col-sm-offset-2">
60
+                    <button class="btn btn-primary btn-block">Edit</button>
61
+                </div>
60 62
             </div>
61 63
         </form>
62 64
     </div>

+ 0
- 8
views/lupickertable.html Voir le fichier

@@ -1,8 +0,0 @@
1
-<div class="col-sm-3">
2
-    Selected items:
3
-    <div ng-repeat="item in pickerOptions.pickedItems" ng-click="unPickItem(item)"
4
-         class="col-sm-12 lu-picker-table-picked-items">
5
-        {{ pickerOptions.getItemText(item) }}
6
-    </div>
7
-</div>
8
-<lu-basic-table options="pickerOptions" class="col-sm-9"></lu-basic-table>

+ 14
- 9
views/modals/groupedit.html Voir le fichier

@@ -6,14 +6,19 @@
6 6
         </div>
7 7
     </div>
8 8
     <div class="form-group">
9
-        <div class="col-sm-2"></div>
10
-        <button type="button" class="btn btn-primary"
11
-                ng-click="editPermissions(group)" ng-show="canEditPermissions()">
12
-            Edit permissions
13
-        </button>
14
-        <button type="button" class="btn btn-primary"
15
-                ng-click="editUsers(group)" ng-show="canEditUsers()">
16
-            Edit users
17
-        </button>
9
+        <div class="col-sm-9 col-sm-offset-2">
10
+            <div class="col-sm-6">
11
+                <button type="button" class="btn btn-primary btn-block"
12
+                        ng-click="editPermissions(group)" ng-show="canEditPermissions()">
13
+                    Edit permissions
14
+                </button>
15
+            </div>
16
+            <div class="col-sm-6">
17
+                <button type="button" class="btn btn-primary btn-block"
18
+                        ng-click="editUsers(group)" ng-show="canEditUsers()">
19
+                    Edit users
20
+                </button>
21
+            </div>
22
+        </div>
18 23
     </div>
19 24
 </dialog-ok-cancel>

+ 8
- 9
views/modals/permissionedit.html Voir le fichier

@@ -8,15 +8,14 @@
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
-            <div class="btn-group">
12
-                <button type="button" class="btn btn-primary dropdown-toggle btn-select" data-toggle="dropdown" href="" lu-enable-permission="{{ neededPermission }}">
13
-                    {{ permission.Value ? 'Yes' : 'No' }} <span class="caret"></span>
14
-                </button>
15
-                <ul class="dropdown-menu">
16
-                    <li><a href="" ng-click="permission.Value = false">No</a></li>
17
-                    <li><a href="" ng-click="permission.Value = true">Yes</a></li>
18
-                </ul>
19
-            </div>
11
+            <button type="button" class="btn btn-primary dropdown-toggle btn-select btn-block" data-toggle="dropdown" href="" lu-enable-permission="{{ neededPermission }}">
12
+                <span class="pull-left">{{ permission.Value ? 'Yes' : 'No' }}</span>
13
+                <span class="caret pull-right"></span>
14
+            </button>
15
+            <ul class="dropdown-menu col-sm-12">
16
+                <li><a href="" ng-click="permission.Value = false">No</a></li>
17
+                <li><a href="" ng-click="permission.Value = true">Yes</a></li>
18
+            </ul>
20 19
         </div>
21 20
     </div>
22 21
 </dialog-ok-cancel>

+ 24
- 27
views/modals/settingedit.html Voir le fichier

@@ -8,43 +8,40 @@
8 8
     <div class="form-group">
9 9
         <label class="col-sm-2 control-label">Blocked</label>
10 10
         <div class="col-sm-9">
11
-            <div class="btn-group">
12
-                <button type="button" class="btn btn-primary dropdown-toggle btn-select" data-toggle="dropdown" href="" lu-enable-permission="{{ neededPermission }}">
13
-                    {{ setting.IsBlocked ? 'Yes' : 'No' }} <span class="caret"></span>
14
-                </button>
15
-                <ul class="dropdown-menu">
16
-                    <li><a href="" ng-click="setting.IsBlocked = false">No</a></li>
17
-                    <li><a href="" ng-click="setting.IsBlocked = true">Yes</a></li>
18
-                </ul>
19
-            </div>
11
+            <button type="button" class="btn btn-primary dropdown-toggle btn-select btn-block" data-toggle="dropdown" href="" lu-enable-permission="{{ neededPermission }}">
12
+                <span class="pull-left">{{ setting.IsBlocked ? 'Yes' : 'No' }}</span>
13
+                <span class="caret pull-right"></span>
14
+            </button>
15
+            <ul class="dropdown-menu col-sm-12">
16
+                <li><a href="" ng-click="setting.IsBlocked = false">No</a></li>
17
+                <li><a href="" ng-click="setting.IsBlocked = true">Yes</a></li>
18
+            </ul>
20 19
         </div>
21 20
     </div>
22 21
     <div class="form-group">
23 22
         <label class="col-sm-2 control-label">Admin</label>
24 23
         <div class="col-sm-9">
25
-            <div class="btn-group">
26
-                <button type="button" class="btn btn-primary dropdown-toggle btn-select" data-toggle="dropdown" href="" lu-enable-permission="{{ neededPermission }}">
27
-                    {{ setting.IsAdmin ? 'Yes' : 'No' }} <span class="caret"></span>
28
-                </button>
29
-                <ul class="dropdown-menu">
30
-                    <li><a href="" ng-click="setting.IsAdmin = false">No</a></li>
31
-                    <li><a href="" ng-click="setting.IsAdmin = true">Yes</a></li>
32
-                </ul>
33
-            </div>
24
+            <button type="button" class="btn btn-primary dropdown-toggle btn-select btn-block" data-toggle="dropdown" href="" lu-enable-permission="{{ neededPermission }}">
25
+                <span class="pull-left">{{ setting.IsAdmin ? 'Yes' : 'No' }}</span>
26
+                <span class="caret pull-right"></span>
27
+            </button>
28
+            <ul class="dropdown-menu col-sm-12">
29
+                <li><a href="" ng-click="setting.IsAdmin = false">No</a></li>
30
+                <li><a href="" ng-click="setting.IsAdmin = true">Yes</a></li>
31
+            </ul>
34 32
         </div>
35 33
     </div>
36 34
     <div class="form-group">
37 35
         <label class="col-sm-2 control-label">Type</label>
38 36
         <div class="col-sm-9">
39
-            <div class="btn-group">
40
-                <button type="button" class="btn btn-primary dropdown-toggle btn-select" data-toggle="dropdown"
41
-                        href="" lu-enable-permission="{{ neededPermission }}" ng-disabled="!setting.IsNew">
42
-                    {{ setting.Type }} <span class="caret"></span>
43
-                </button>
44
-                <ul class="dropdown-menu">
45
-                    <li ng-repeat="type in types"><a href="" ng-click="setType(type)">{{ type }}</a></li>
46
-                </ul>
47
-            </div>
37
+            <button type="button" class="btn btn-primary dropdown-toggle btn-select btn-block" data-toggle="dropdown"
38
+                    href="" lu-enable-permission="{{ neededPermission }}" ng-disabled="!setting.IsNew">
39
+                <span class="pull-left">{{ setting.Type }}</span>
40
+                <span class="caret pull-right"></span>
41
+            </button>
42
+            <ul class="dropdown-menu col-sm-12">
43
+                <li ng-repeat="type in types"><a href="" ng-click="setType(type)">{{ type }}</a></li>
44
+            </ul>
48 45
         </div>
49 46
     </div>
50 47
     <div class="form-group">

Chargement…
Annuler
Enregistrer