Changeset 13847 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User

Timestamp:

05/12/16 17:09:12 (9 years ago)

Author:

jlodewyc

Message:

#2582 Security access implemented, directory renaming and choosing, adding more partials

Location:

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User

Files:

• Groups.cshtml (modified) (3 diffs)
• Index.cshtml (modified) (3 diffs)
• Roles.cshtml (modified) (3 diffs)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Groups.cshtml

@@ -5 +5 @@
 <div>
 
-    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User"))
+    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.currentUser))
 
     <ul class="nav nav-pills nav-justified">
@@ -30 +30 @@
         </li>
     </ul>
-    <div class="row"
-         style="text-align:center">
-        @Model.message
-    </div>
+    @Html.Partial("_ErrorMessage", Model.message)
+
     <div class="row"
          style="padding:10px; margin-right:0px!important">
@@ -59 +57 @@
             <div class="btn-group-vertical btn-block">
                 
-                @foreach (var group in Model.ugroups)
+                @foreach (var group in Model.ugroups.OrderBy(x => x.Name))
                 {
                     <a class="btn  btn-default @( group.Id == Model.SelectedGroup.Id ? "active" : "" )"

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Index.cshtml

@@ -4 +4 @@
 <div>
 
-    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User"))
+    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.currentUser))
 
     <ul class="nav nav-pills nav-justified">
@@ -29 +29 @@
         </li>
     </ul>
-    <div class="row"
-         style="text-align:center">
-        @Model.message
-    </div>
+    @Html.Partial("_ErrorMessage", Model.message)
+
     <div class="row"
          style="padding:10px; margin-right:0px!important">
@@ -70 +68 @@
 
 
-                    @foreach (var user in Model.users)
+                    @foreach (var user in Model.users.OrderBy(x => x.UserName))
                     {
                         <a class="btn  btn-default @( user.Id == Model.SelectedUser.Id ? "active" : "" )"

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Roles.cshtml

@@ -5 +5 @@
 <div>
 
-    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User"))
+    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.currentUser))
 
     <ul class="nav nav-pills nav-justified">
@@ -30 +30 @@
         </li>
     </ul>
-    <div class="row"
-         style="text-align:center">
-        @Model.message
-    </div>
+    @Html.Partial("_ErrorMessage", Model.message)
     <div class="row"
          style="padding:10px; margin-right:0px!important">
@@ -60 +57 @@
             <div class="btn-group-vertical btn-block">
                 
-                @foreach (var role in Model.roles)
+                @foreach (var role in Model.roles.OrderBy(x => x.Name))
                 {
                     <a class="btn  btn-default @( role.Name == Model.SelectedRole.Name ? "active" : "" )"