ui

luticate/views/home.html

@@ -1,55 +1,63 @@
 <!-- Page Content -->
 <div class="container">
-    <form name="form" ng-submit="submit()">
-        <div class="form-group">
-            <div class="row co-sm-8 col-sm-offset-2" lu-busy="form">
-                <div class="form-group">
-                    <label for="email" class="col-sm-2 control-label">Email</label>
-                    <div class="col-sm-9">
-                        <input id="email" class="form-control" ng-model="user.Email" lu-enable-permission="LU_USER_EDIT_ME"/>
-                    </div>
+    <div class="row co-sm-8 col-sm-offset-2" lu-busy="form">
+        <form name="form" ng-submit="submit()">
+            <div class="form-group">
+                <label for="email" class="col-sm-2 control-label">Email</label>
+                <div class="col-sm-9">
+                    <input id="email" class="form-control" ng-model="user.Email" lu-enable-permission="LU_USER_EDIT_ME"/>
                 </div>
-                <div class="form-group">
-                    <label for="firstname" class="col-sm-2 control-label">Firstname</label>
-                    <div class="col-sm-9">
-                        <input id="firstname" class="form-control" ng-model="user.Firstname" lu-enable-permission="LU_USER_EDIT_ME"/>
-                    </div>
+            </div>
+
+            <div class="form-group">
+                <label for="firstname" class="col-sm-2 control-label">Firstname</label>
+                <div class="col-sm-9">
+                    <input id="firstname" class="form-control" ng-model="user.Firstname" lu-enable-permission="LU_USER_EDIT_ME"/>
                 </div>
-                <div class="form-group">
-                    <label for="lastname" class="col-sm-2 control-label">Lastname</label>
-                    <div class="col-sm-9">
-                        <input id="lastname" class="form-control" ng-model="user.Lastname" lu-enable-permission="LU_USER_EDIT_ME"/>
-                    </div>
+            </div>
+
+            <div class="form-group">
+                <label for="lastname" class="col-sm-2 control-label">Lastname</label>
+                <div class="col-sm-9">
+                    <input id="lastname" class="form-control" ng-model="user.Lastname" lu-enable-permission="LU_USER_EDIT_ME"/>
                 </div>
+            </div>
+
+            <div lu-show-permission="LU_USER_SET_PASSWORD_ME">
 
-                <div class="form-group" lu-show-permission="LU_USER_SET_PASSWORD_ME">
+                <div class="form-group">
                     <label for="oldPassword" class="col-sm-2 control-label">Old Password</label>
                     <div class="col-sm-9">
                         <input id="oldPassword" class="form-control" type="password" ng-model="userPassword.old"
                                name="oldPassword"/>
                     </div>
+                </div>
+
+                <div class="form-group">
                     <label for="password" class="col-sm-2 control-label">New Password</label>
                     <div class="col-sm-9">
                         <input id="password" class="form-control" type="password" ng-model="userPassword.value"
                                name="password" ui-validate="passwordValidation"/>
                     </div>
-                    <div class="clearfix"></div>
+                </div>
+
+                <div class="form-group">
                     <label for="password2" class="col-sm-2 control-label">Confirmation</label>
                     <div class="col-sm-9">
                         <input id="password2" class="form-control" type="password" ng-model="userPassword.confirm"
                                name="password2" ui-validate="password2Validation" ui-validate-watch="'userPassword.value'"/>
                     </div>
-                    <div class="clearfix"></div>
-                    <div class="col-sm-offset-2 col-sm-9">
-                        <p class="error" ng-show="form.password.$error.length">Passwords is too short</p>
-                        <p class="error" ng-show="form.password2.$error.same_passwords">Passwords do not match</p>
-                    </div>
                 </div>
-                <div class="clearfix"></div>
-                <div class="form-group" class="col-sm-12">
-                    <button class="btn btn-default">Edit</button>
+
+                <div class="col-sm-offset-2 col-sm-9">
+                    <p class="error" ng-show="form.password.$error.length">Passwords is too short</p>
+                    <p class="error" ng-show="form.password2.$error.same_passwords">Passwords do not match</p>
                 </div>
             </div>
-        </div>
-    </form>
+
+            <div class="form-group col-sm-12">
+                <button class="btn btn-default">Edit</button>
+            </div>
+        </form>
+    </div>
 </div>

luticate/views/modals/useredit.html

@@ -5,42 +5,52 @@
             <input id="username" class="form-control" ng-model="user.Username" ng-readonly="user.Id != null" required/>
         </div>
     </div>
+
     <div class="form-group">
         <label for="email" class="col-sm-2 control-label">Email</label>
         <div class="col-sm-9">
             <input id="email" class="form-control" ng-model="user.Email" lu-enable-permission="{{ permission }}"/>
         </div>
     </div>
+
     <div class="form-group">
         <label for="firstname" class="col-sm-2 control-label">Firstname</label>
         <div class="col-sm-9">
             <input id="firstname" class="form-control" ng-model="user.Firstname" lu-enable-permission="{{ permission }}"/>
         </div>
     </div>
+
     <div class="form-group">
         <label for="lastname" class="col-sm-2 control-label">Lastname</label>
         <div class="col-sm-9">
             <input id="lastname" class="form-control" ng-model="user.Lastname" lu-enable-permission="{{ permission }}"/>
         </div>
     </div>
-    <div class="form-group" lu-show-permission="{{ permissionPassword }}">
-        <label for="password" class="col-sm-2 control-label">Password</label>
-        <div class="col-sm-9">
-            <input id="password" class="form-control" type="password" ng-model="userPassword.value"
-                   name="password" ui-validate="passwordValidation"/>
+
+    <div lu-show-permission="{{ permissionPassword }}">
+
+        <div class="form-group">
+            <label for="password" class="col-sm-2 control-label">Password</label>
+            <div class="col-sm-9">
+                <input id="password" class="form-control" type="password" ng-model="userPassword.value"
+                       name="password" ui-validate="passwordValidation"/>
+            </div>
         </div>
-        <div class="clearfix"></div>
-        <label for="password2" class="col-sm-2 control-label">Confirmation</label>
-        <div class="col-sm-9">
-            <input id="password2" class="form-control" type="password" ng-model="userPassword.confirm"
-                   name="password2" ui-validate="password2Validation" ui-validate-watch="'userPassword.value'"/>
+
+        <div class="form-group">
+            <label for="password2" class="col-sm-2 control-label">Confirmation</label>
+            <div class="col-sm-9">
+                <input id="password2" class="form-control" type="password" ng-model="userPassword.confirm"
+                       name="password2" ui-validate="password2Validation" ui-validate-watch="'userPassword.value'"/>
+            </div>
         </div>
-        <div class="clearfix"></div>
+
         <div class="col-sm-offset-2 col-sm-9">
             <p class="error" ng-show="form.password.$error.length">Passwords is too short</p>
             <p class="error" ng-show="form.password2.$error.same_passwords">Passwords do not match</p>
         </div>
     </div>
+
     <div class="form-group">
         <div class="col-sm-2"></div>
         <button type="button" class="btn btn-default"

luticate/views/navbar.html

@@ -10,18 +10,18 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" ui-sref="home">Luticate</a>
+            <a class="navbar-brand" ui-sref="login">Luticate</a>
         </div>
         <!-- Collect the nav links, forms, and other content for toggling -->
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
             <ul class="nav navbar-nav navbar-left">
-                <li><a href="#/users" lu-show-permission="LU_USER_GET">Users</a></li>
-                <li><a href="#/groups" lu-show-permission="LU_GROUP_GET">Groups</a></li>
-                <li><a href="#/permissions" lu-show-permission="LU_PERM_GET">Permissions</a></li>
-                <!--<li><a href="#/test" >Test</a></li>-->
+                <li><a ui-sref="users" lu-show-permission="LU_USER_GET">Users</a></li>
+                <li><a ui-sref="groups" lu-show-permission="LU_GROUP_GET">Groups</a></li>
+                <li><a ui-sref="permissions" lu-show-permission="LU_PERM_GET">Permissions</a></li>
+                <!--<li><a ui-sref="test" >Test</a></li>-->
             </ul>
             <ul class="nav navbar-nav navbar-right">
-                <li ng-show="isLogged()"><a href="#/home">{{ getUsername() }}</a></li>
+                <li ng-show="isLogged()"><a ui-sref="home">{{ getUsername() }}</a></li>
                 <li ng-show="isLogged()"><a href="" ng-click="logout()">Logout</a></li>
             </ul>
         </div>