Changeset 13848 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views

Timestamp:

05/13/16 13:17:52 (8 years ago)

Author:

jlodewyc

Message:

#2582 Hive finish, start OKB

Location:

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

Files:

• Shared/Navbar.cshtml (modified) (4 diffs)
• User/Index.cshtml (modified) (2 diffs)
• User/Roles.cshtml (modified) (2 diffs)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Shared/Navbar.cshtml

@@ -6 +6 @@
         class="@(Model.Active == "Job" ? "active" : "")">
         <a asp-controller="Job"
+           accesskey="j"
            asp-action="Index">
             Job management
@@ -17 +18 @@
             {
                 <a asp-controller="User"
-                   asp-action="Index">
+                   asp-action="Index"
+                   accesskey="u">
                     User management
                 </a>
@@ -34 +36 @@
             {
             <a asp-controller="Resource"
-               asp-action="Index">
+               asp-action="Index"
+               accesskey="r">
                 Resources
             </a>
@@ -50 +53 @@
         <a asp-controller="Home"
            asp-action="Logout"
+           accesskey="l"
            class="text-danger">
             Logout

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

@@ -309 +309 @@
                                 <div class="form-group">
                                     <label class="col-sm-3 control-label">
-                                        @Model.SelectedUserRoles.Count Roles
+                                        @Model.SelectedUserRoles.Count Roles <br />
+                                        @if (Model.SelectedUserRoles.Where(x => x.Name == "Hive User").Count() != 0)
+                                        {
+                                            if (Model.SelectedUserRoles.Where(x => x.Name == "AccessService Administrator").Count() != 0)
+                                            {
+                                                if (Model.SelectedUserRoles.Where(x => x.Name == "Hive Administrator").Count() != 0)
+                                                {
+                                                    <span style="color:forestgreen">Job management<br/>User management<br />Resources</span>
+
+                                                }
+                                                else
+                                                {
+                                                    <span style="color:forestgreen">Job management<br />User management</span>
+
+                                                }
+                                            }
+                                            else
+                                            {
+                                                <span style="color:forestgreen">Job management</span>
+
+                                            }
+
+                                        }
+                                        else
+                                        {
+                                            <span style="color:darkred">No access to Hive</span>
+
+                                        }
                                     </label>
+                                    
                                     <div class="col-sm-8 control-label" style="text-align:left">
                                         @if (Model.SelectedUserRoles.Count > 0)
@@ -368 +396 @@
                                                                onclick="triggerSave()">
                                                         @role.Name
+                                                        <span style="color:forestgreen">
+                                                            @(role.Name == "Hive User" ? " (access to Hive and job manager)" : "")
+                                                            @(role.Name == "Hive Administrator" ? " (access to resources)" : "")
+                                                            @(role.Name == "AccessService Administrator" ? " (access to user manager)" : "")
+                                                        </span>
                                                     </label>
                                                 </div>

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

@@ -66 +66 @@
                        onclick="showRole()">
                         @role.Name
+                        <span style="color:forestgreen">
+                            @(role.Name == "Hive User" ? " (Hive + job manager)" : "")
+                            @(role.Name == "Hive Administrator" ? " (Resources)" : "")
+                            @(role.Name == "AccessService Administrator" ? " (User manager)" : "")
+                        </span>
                     </a>
                 }
@@ -101 +106 @@
                         @if (Model.SelectedRole.Name != "")
                         {
-                            <i class="fa fa-gavel "></i> @Model.SelectedRole.Name;
+                            <i class="fa fa-gavel "></i> @Model.SelectedRole.Name
+                            <span style="color:forestgreen">
+                                @(Model.SelectedRole.Name == "Hive User" ? " (access to Hive and job manager)" : "")
+                                @(Model.SelectedRole.Name == "Hive Administrator" ? " (access to resources)" : "")
+                                @(Model.SelectedRole.Name == "AccessService Administrator" ? " (access to user manager)" : "")
+                            </span>
+
                         }
                         else