Browse Source

ui

develop
Robin Thoni 9 years ago
parent
commit
a95d04ccca
4 changed files with 65 additions and 47 deletions
  1. BIN
      favicon.ico
  2. 38
    30
      luticate/views/home.html
  3. 21
    11
      luticate/views/modals/useredit.html
  4. 6
    6
      luticate/views/navbar.html

BIN
favicon.ico View File


+ 38
- 30
luticate/views/home.html View File

1
 <!-- Page Content -->
1
 <!-- Page Content -->
2
 <div class="container">
2
 <div class="container">
3
-    <form name="form" ng-submit="submit()">
4
-        <div class="form-group">
5
-            <div class="row co-sm-8 col-sm-offset-2" lu-busy="form">
6
-                <div class="form-group">
7
-                    <label for="email" class="col-sm-2 control-label">Email</label>
8
-                    <div class="col-sm-9">
9
-                        <input id="email" class="form-control" ng-model="user.Email" lu-enable-permission="LU_USER_EDIT_ME"/>
10
-                    </div>
3
+    <div class="row co-sm-8 col-sm-offset-2" lu-busy="form">
4
+        <form name="form" ng-submit="submit()">
5
+            <div class="form-group">
6
+                <label for="email" class="col-sm-2 control-label">Email</label>
7
+                <div class="col-sm-9">
8
+                    <input id="email" class="form-control" ng-model="user.Email" lu-enable-permission="LU_USER_EDIT_ME"/>
11
                 </div>
9
                 </div>
12
-                <div class="form-group">
13
-                    <label for="firstname" class="col-sm-2 control-label">Firstname</label>
14
-                    <div class="col-sm-9">
15
-                        <input id="firstname" class="form-control" ng-model="user.Firstname" lu-enable-permission="LU_USER_EDIT_ME"/>
16
-                    </div>
10
+            </div>
11
+
12
+            <div class="form-group">
13
+                <label for="firstname" class="col-sm-2 control-label">Firstname</label>
14
+                <div class="col-sm-9">
15
+                    <input id="firstname" class="form-control" ng-model="user.Firstname" lu-enable-permission="LU_USER_EDIT_ME"/>
17
                 </div>
16
                 </div>
18
-                <div class="form-group">
19
-                    <label for="lastname" class="col-sm-2 control-label">Lastname</label>
20
-                    <div class="col-sm-9">
21
-                        <input id="lastname" class="form-control" ng-model="user.Lastname" lu-enable-permission="LU_USER_EDIT_ME"/>
22
-                    </div>
17
+            </div>
18
+
19
+            <div class="form-group">
20
+                <label for="lastname" class="col-sm-2 control-label">Lastname</label>
21
+                <div class="col-sm-9">
22
+                    <input id="lastname" class="form-control" ng-model="user.Lastname" lu-enable-permission="LU_USER_EDIT_ME"/>
23
                 </div>
23
                 </div>
24
+            </div>
25
+
26
+            <div lu-show-permission="LU_USER_SET_PASSWORD_ME">
24
 
27
 
25
-                <div class="form-group" lu-show-permission="LU_USER_SET_PASSWORD_ME">
28
+                <div class="form-group">
26
                     <label for="oldPassword" class="col-sm-2 control-label">Old Password</label>
29
                     <label for="oldPassword" class="col-sm-2 control-label">Old Password</label>
27
                     <div class="col-sm-9">
30
                     <div class="col-sm-9">
28
                         <input id="oldPassword" class="form-control" type="password" ng-model="userPassword.old"
31
                         <input id="oldPassword" class="form-control" type="password" ng-model="userPassword.old"
29
                                name="oldPassword"/>
32
                                name="oldPassword"/>
30
                     </div>
33
                     </div>
34
+                </div>
35
+
36
+                <div class="form-group">
31
                     <label for="password" class="col-sm-2 control-label">New Password</label>
37
                     <label for="password" class="col-sm-2 control-label">New Password</label>
32
                     <div class="col-sm-9">
38
                     <div class="col-sm-9">
33
                         <input id="password" class="form-control" type="password" ng-model="userPassword.value"
39
                         <input id="password" class="form-control" type="password" ng-model="userPassword.value"
34
                                name="password" ui-validate="passwordValidation"/>
40
                                name="password" ui-validate="passwordValidation"/>
35
                     </div>
41
                     </div>
36
-                    <div class="clearfix"></div>
42
+                </div>
43
+
44
+                <div class="form-group">
37
                     <label for="password2" class="col-sm-2 control-label">Confirmation</label>
45
                     <label for="password2" class="col-sm-2 control-label">Confirmation</label>
38
                     <div class="col-sm-9">
46
                     <div class="col-sm-9">
39
                         <input id="password2" class="form-control" type="password" ng-model="userPassword.confirm"
47
                         <input id="password2" class="form-control" type="password" ng-model="userPassword.confirm"
40
                                name="password2" ui-validate="password2Validation" ui-validate-watch="'userPassword.value'"/>
48
                                name="password2" ui-validate="password2Validation" ui-validate-watch="'userPassword.value'"/>
41
                     </div>
49
                     </div>
42
-                    <div class="clearfix"></div>
43
-                    <div class="col-sm-offset-2 col-sm-9">
44
-                        <p class="error" ng-show="form.password.$error.length">Passwords is too short</p>
45
-                        <p class="error" ng-show="form.password2.$error.same_passwords">Passwords do not match</p>
46
-                    </div>
47
                 </div>
50
                 </div>
48
-                <div class="clearfix"></div>
49
-                <div class="form-group" class="col-sm-12">
50
-                    <button class="btn btn-default">Edit</button>
51
+
52
+                <div class="col-sm-offset-2 col-sm-9">
53
+                    <p class="error" ng-show="form.password.$error.length">Passwords is too short</p>
54
+                    <p class="error" ng-show="form.password2.$error.same_passwords">Passwords do not match</p>
51
                 </div>
55
                 </div>
52
             </div>
56
             </div>
53
-        </div>
54
-    </form>
57
+
58
+            <div class="form-group col-sm-12">
59
+                <button class="btn btn-default">Edit</button>
60
+            </div>
61
+        </form>
62
+    </div>
55
 </div>
63
 </div>

+ 21
- 11
luticate/views/modals/useredit.html View File

5
             <input id="username" class="form-control" ng-model="user.Username" ng-readonly="user.Id != null" required/>
5
             <input id="username" class="form-control" ng-model="user.Username" ng-readonly="user.Id != null" required/>
6
         </div>
6
         </div>
7
     </div>
7
     </div>
8
+
8
     <div class="form-group">
9
     <div class="form-group">
9
         <label for="email" class="col-sm-2 control-label">Email</label>
10
         <label for="email" class="col-sm-2 control-label">Email</label>
10
         <div class="col-sm-9">
11
         <div class="col-sm-9">
11
             <input id="email" class="form-control" ng-model="user.Email" lu-enable-permission="{{ permission }}"/>
12
             <input id="email" class="form-control" ng-model="user.Email" lu-enable-permission="{{ permission }}"/>
12
         </div>
13
         </div>
13
     </div>
14
     </div>
15
+
14
     <div class="form-group">
16
     <div class="form-group">
15
         <label for="firstname" class="col-sm-2 control-label">Firstname</label>
17
         <label for="firstname" class="col-sm-2 control-label">Firstname</label>
16
         <div class="col-sm-9">
18
         <div class="col-sm-9">
17
             <input id="firstname" class="form-control" ng-model="user.Firstname" lu-enable-permission="{{ permission }}"/>
19
             <input id="firstname" class="form-control" ng-model="user.Firstname" lu-enable-permission="{{ permission }}"/>
18
         </div>
20
         </div>
19
     </div>
21
     </div>
22
+
20
     <div class="form-group">
23
     <div class="form-group">
21
         <label for="lastname" class="col-sm-2 control-label">Lastname</label>
24
         <label for="lastname" class="col-sm-2 control-label">Lastname</label>
22
         <div class="col-sm-9">
25
         <div class="col-sm-9">
23
             <input id="lastname" class="form-control" ng-model="user.Lastname" lu-enable-permission="{{ permission }}"/>
26
             <input id="lastname" class="form-control" ng-model="user.Lastname" lu-enable-permission="{{ permission }}"/>
24
         </div>
27
         </div>
25
     </div>
28
     </div>
26
-    <div class="form-group" lu-show-permission="{{ permissionPassword }}">
27
-        <label for="password" class="col-sm-2 control-label">Password</label>
28
-        <div class="col-sm-9">
29
-            <input id="password" class="form-control" type="password" ng-model="userPassword.value"
30
-                   name="password" ui-validate="passwordValidation"/>
29
+
30
+    <div lu-show-permission="{{ permissionPassword }}">
31
+
32
+        <div class="form-group">
33
+            <label for="password" class="col-sm-2 control-label">Password</label>
34
+            <div class="col-sm-9">
35
+                <input id="password" class="form-control" type="password" ng-model="userPassword.value"
36
+                       name="password" ui-validate="passwordValidation"/>
37
+            </div>
31
         </div>
38
         </div>
32
-        <div class="clearfix"></div>
33
-        <label for="password2" class="col-sm-2 control-label">Confirmation</label>
34
-        <div class="col-sm-9">
35
-            <input id="password2" class="form-control" type="password" ng-model="userPassword.confirm"
36
-                   name="password2" ui-validate="password2Validation" ui-validate-watch="'userPassword.value'"/>
39
+
40
+        <div class="form-group">
41
+            <label for="password2" class="col-sm-2 control-label">Confirmation</label>
42
+            <div class="col-sm-9">
43
+                <input id="password2" class="form-control" type="password" ng-model="userPassword.confirm"
44
+                       name="password2" ui-validate="password2Validation" ui-validate-watch="'userPassword.value'"/>
45
+            </div>
37
         </div>
46
         </div>
38
-        <div class="clearfix"></div>
47
+
39
         <div class="col-sm-offset-2 col-sm-9">
48
         <div class="col-sm-offset-2 col-sm-9">
40
             <p class="error" ng-show="form.password.$error.length">Passwords is too short</p>
49
             <p class="error" ng-show="form.password.$error.length">Passwords is too short</p>
41
             <p class="error" ng-show="form.password2.$error.same_passwords">Passwords do not match</p>
50
             <p class="error" ng-show="form.password2.$error.same_passwords">Passwords do not match</p>
42
         </div>
51
         </div>
43
     </div>
52
     </div>
53
+
44
     <div class="form-group">
54
     <div class="form-group">
45
         <div class="col-sm-2"></div>
55
         <div class="col-sm-2"></div>
46
         <button type="button" class="btn btn-default"
56
         <button type="button" class="btn btn-default"

+ 6
- 6
luticate/views/navbar.html View File

10
                 <span class="icon-bar"></span>
10
                 <span class="icon-bar"></span>
11
                 <span class="icon-bar"></span>
11
                 <span class="icon-bar"></span>
12
             </button>
12
             </button>
13
-            <a class="navbar-brand" ui-sref="home">Luticate</a>
13
+            <a class="navbar-brand" ui-sref="login">Luticate</a>
14
         </div>
14
         </div>
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="#/users" lu-show-permission="LU_USER_GET">Users</a></li>
19
-                <li><a href="#/groups" lu-show-permission="LU_GROUP_GET">Groups</a></li>
20
-                <li><a href="#/permissions" lu-show-permission="LU_PERM_GET">Permissions</a></li>
21
-                <!--<li><a href="#/test" >Test</a></li>-->
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>
21
+                <!--<li><a ui-sref="test" >Test</a></li>-->
22
             </ul>
22
             </ul>
23
             <ul class="nav navbar-nav navbar-right">
23
             <ul class="nav navbar-nav navbar-right">
24
-                <li ng-show="isLogged()"><a href="#/home">{{ getUsername() }}</a></li>
24
+                <li ng-show="isLogged()"><a ui-sref="home">{{ getUsername() }}</a></li>
25
                 <li ng-show="isLogged()"><a href="" ng-click="logout()">Logout</a></li>
25
                 <li ng-show="isLogged()"><a href="" ng-click="logout()">Logout</a></li>
26
             </ul>
26
             </ul>
27
         </div>
27
         </div>

Loading…
Cancel
Save