Changeset 13754 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Groups.cshtml

Timestamp:

04/12/16 15:28:19 (8 years ago)

Author:

jlodewyc

Message:

#2582 User management done, start resource calendar

File:

• branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Groups.cshtml (modified) (8 diffs)

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

@@ -26 +26 @@
             <a asp-controller="User"
                asp-action="Roles">
-                <i class="fa fa-sitemap"></i> Roles
+                <i class="fa fa-gavel"></i> Roles
             </a>
         </li>
@@ -129 +129 @@
                             </div>
 
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">
-                                    Group id
-                                </label>
-                                <label class="col-sm-8 control-label" style="text-align:left">
-                                    @Model.SelectedGroup.Id
-                                </label>
-                                <input type="text"
-                                       style="display:none"
-                                       id="u"
-                                       name="u"
-                                       value="@Model.SelectedGroup.Id" />
-                            </div>
+
                             @if (Model.SelectedGroup.Id != Guid.Empty)
                             {
-                                <div style="padding-left:20px">
-                                    <h3>@Model.SelectedGroupMembers.Count Member@(Model.SelectedGroupMembers.Count != 1 ? "s" : "")</h3>
-                                    @foreach (var member in Model.SelectedGroupMembers)
-                                    {
-                                        <p>
-                                            <a class="btn btn-danger"
-                                               asp-controller="User"
-                                               asp-action="deleteMember"
-                                               asp-route-g="@Model.SelectedGroup.Id"
-                                               asp-route-m="@member.Id"
-                                               onclick="showDeleter()">
-                                                <i class="fa fa-trash-o"></i>
-                                            </a>
-                                            @if (member is User)
-                                            {
-                                                var umember = (User)member;
-                                                <i class="fa fa-user"></i> @(umember.UserName + "(" + umember.FullName + ")")
-
-
-                                            }
-                                            else if (member is UserGroup)
-                                            {
-                                                var gmember = (UserGroup)member;
-                                                <i class="fa fa-group"></i> @(gmember.Name)
-
-                                            }
-
-                                        </p>
-                                    }
-                                    @if (Model.SelectedGroupMembers.Count == 0)
-                                    {
-                                        <p>This group currently has no members</p>
-
-                                    }
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">
+                                        Group id
+                                    </label>
+                                    <label class="col-sm-8 control-label" style="text-align:left">
+                                        @Model.SelectedGroup.Id
+                                    </label>
+                                    <input type="text"
+                                           style="display:none"
+                                           id="u"
+                                           name="u"
+                                           value="@Model.SelectedGroup.Id" />
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">
+                                        Members
+                                    </label>
+                                    <div class="col-sm-8 control-label" >
+
+                                        @foreach (var member in Model.SelectedGroupMembers)
+                                        {
+                                            <div class="row">
+                                                <p class="col-sm-10" style="text-align:left">
+
+                                                    @if (member is User)
+                                                    {
+                                                        var umember = (User)member;
+                                                        <i class="fa fa-user"></i> @(umember.UserName + "(" + umember.FullName + ")")
+
+
+                                                    }
+                                                    else if (member is UserGroup)
+                                                    {
+                                                        var gmember = (UserGroup)member;
+                                                        <i class="fa fa-group"></i> @(gmember.Name)
+
+                                                    }
+
+                                                </p>
+                                                <p class="col-sm-2">
+                                                    <a class="btn btn-danger"
+                                                       asp-controller="User"
+                                                       asp-action="deleteMember"
+                                                       asp-route-g="@Model.SelectedGroup.Id"
+                                                       asp-route-m="@member.Id"
+                                                       onclick="showDeleter()">
+                                                        <i class="fa fa-trash-o"></i>
+                                                    </a>
+                                                </p>
+                                            </div>
+                                        }
+                                        @if (Model.SelectedGroupMembers.Count == 0)
+                                        {
+                                            <p style="text-align:left">This group currently has no members</p>
+
+                                        }
+                                    </div>
                                 </div>
                             }
@@ -196 +207 @@
                                             <p>
                                                 <i class="fa fa-user"></i> Users
-                                                <button class="btn btn-sm btn-default" 
+                                                <button class="btn btn-sm btn-default"
                                                         type="button"
-                                                        onclick="selectAll('userstoadd'); triggerSave()">Select all</button> 
+                                                        onclick="selectAll('userstoadd'); triggerSave()">
+                                                    Select all
+                                                </button>
                                                 <button class="btn btn-sm btn-default"
-                                                         type="button"
-                                                        onclick="deselectAll('userstoadd'); triggerSave()">Deselect all</button> 
+                                                        type="button"
+                                                        onclick="deselectAll('userstoadd'); triggerSave()">
+                                                    Deselect all
+                                                </button>
                                             </p>
                                         </div>
@@ -223 +238 @@
                                     <div class="panel panel-primary col-sm-6" style="padding:0px">
                                         <div class="panel-heading">
-                                            <p><i class="fa fa-group"></i> Groups
-                                            
+                                            <p>
+                                                <i class="fa fa-group"></i> Groups
+
                                                 <button class="btn btn-sm btn-default"
                                                         type="button"
@@ -234 +250 @@
                                                         onclick="deselectAll('groupstoadd'); triggerSave()">
                                                     Deselect all
-                                                </button> 
+                                                </button>
                                             </p>
                                         </div>
@@ -244 +260 @@
                                                         <input type="checkbox"
                                                                name="groupstoadd"
-                                                               @(Model.SelectedGroupMembers.Contains(group) ? "checked disabled" : "")
+                                                               @(Model.SelectedGroupMembers.Contains(group) ||
+                                                                    Model.SelectedGroup.Id == group.Id ? "checked disabled" : "")
                                                                value="@group.Id"
                                                                onclick="triggerSave()">
-                                                        @group.Name
+                                                        @group.Name @( Model.SelectedGroup.Id == group.Id ? "(selected group)" : "")
                                                     </label>
                                                 </div>
@@ -338 +355 @@
         function selectAll(name) {
             checkboxes = document.getElementsByName(name);
-            for(var i=0, n=checkboxes.length;i<n;i++) {
+            for (var i = 0, n = checkboxes.length; i < n; i++) {
                 checkboxes[i].checked = true;
             }
@@ -345 +362 @@
             checkboxes = document.getElementsByName(name);
             for (var i = 0, n = checkboxes.length; i < n; i++) {
-                if(checkboxes[i].disabled == false)
-                checkboxes[i].checked = false;
+                if (checkboxes[i].disabled == false)
+                    checkboxes[i].checked = false;
             }
         }