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

Timestamp:

05/10/16 16:55:18 (9 years ago)

Author:

jlodewyc

Message:

#2582 More parameter datatypes, splitting fileopening service, approving users, reopen last file, change name tasks and repetitions

File:

• branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Index.cshtml (modified) (5 diffs)

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

@@ -68 +68 @@
                 </div>
                 <div class="btn-group-vertical btn-block">
-                    
-                    
+
+
                     @foreach (var user in Model.users)
                     {
@@ -111 +111 @@
                         box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);">
                     <div class="row">
-                        <h2 style="padding-left:20px">
+                        @if (Model.SelectedUser.Id != Guid.Empty && Model.SelectedUser.IsApproved)
+                        {<div class="row" style="margin-right:20px">
+                            <a class="btn btn-success pull-right disabled"><i class="fa fa-check-square-o "></i> Approved</a>
+                        </div>
+                        }
+                        else if (Model.SelectedUser.Id != Guid.Empty && !Model.SelectedUser.IsApproved)
+                        {<div class="row" style="margin-right:20px">
+                            <a class="btn btn-warning pull-right"
+                               asp-action="approveUser"
+                               asp-controller="User"
+                               asp-route-id="@Model.SelectedUser.Id">
+                                <i class="fa fa-square-o" ></i> Not approved
+                            </a>
+                            
+                        </div>
+                        }
+                        <h2 style="padding-left:20px; margin-top:0">
                             @if (Model.SelectedUser.Id != Guid.Empty)
                             {
-                                <i class="fa fa-user "></i> @Model.SelectedUser.UserName;
+                                <i class="fa fa-user "></i> @Model.SelectedUser.UserName
+
                             }
                             else
@@ -122 +139 @@
                             }
                         </h2>
+                        
                         <form class="form-horizontal"
                               method="post"
@@ -189 +207 @@
 
                                 </div>
-                                <div class="form-group">
-                                    <label class="col-sm-3 control-label">
-                                        User created
-                                    </label>
-                                    <label class="col-sm-8 control-label" style="text-align:left">
-                                        @Model.SelectedUser.CreationDate.AddHours(2).ToString();
-                                    </label>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-3 control-label">
-                                        Last activity
-                                    </label>
-                                    <label class="col-sm-8 control-label" style="text-align:left">
-                                        @Model.SelectedUser.LastActivityDate.AddHours(2).ToString()
-                                    </label>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-3 control-label">
-                                        Password
-                                    </label>
-                                    <div id="inppassreset" class="col-sm-8">
-                                        Last change: @Model.SelectedUser.LastPasswordChangedDate.ToShortDateString()
-                                        <button type="button"
-                                                onclick="resetPass('@(Model.SelectedUser.Id)')"
-                                                class="btn btn-default">
-                                            <i class="fa fa-unlock"></i> Reset password
-                                        </button>
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label class="col-sm-3 control-label">
-                                        Member of @Model.SelectedUserSubscriptions.Count groups
-                                    </label>
-                                    <div class="col-sm-8 control-label" style="text-align:left">
-                                        @if (Model.SelectedUserSubscriptions.Count > 0)
-                                        {
-                                            @foreach (var g in Model.SelectedUserSubscriptions)
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">
+                                            User created
+                                        </label>
+                                        <label class="col-sm-8 control-label" style="text-align:left">
+                                            @Model.SelectedUser.CreationDate.AddHours(2).ToString();
+                                        </label>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">
+                                            Last activity
+                                        </label>
+                                        <label class="col-sm-8 control-label" style="text-align:left">
+                                            @Model.SelectedUser.LastActivityDate.AddHours(2).ToString()
+                                        </label>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">
+                                            Password
+                                        </label>
+                                        <div id="inppassreset" class="col-sm-8">
+                                            Last change: @Model.SelectedUser.LastPasswordChangedDate.ToShortDateString()
+                                            <button type="button"
+                                                    onclick="resetPass('@(Model.SelectedUser.Id)')"
+                                                    class="btn btn-default">
+                                                <i class="fa fa-unlock"></i> Reset password
+                                            </button>
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">
+                                            Member of @Model.SelectedUserSubscriptions.Count groups
+                                        </label>
+                                        <div class="col-sm-8 control-label" style="text-align:left">
+                                            @if (Model.SelectedUserSubscriptions.Count > 0)
                                             {
-                                                <div class="row">
-                                                    <p class="col-sm-10"><i class="fa fa-group"></i> @g.Name</p>
-                                                    <p class="col-sm-2">
-                                                        <a class="btn btn-danger pull-right"
-                                                           asp-controller="User"
-                                                           asp-action="deleteUserGroup"
-                                                           asp-route-id="@Model.SelectedUser.Id"
-                                                           asp-route-group="@g.Id"
-                                                           onclick="showDeleter()">
-                                                            <i class="fa fa-trash-o"></i>
-                                                        </a>
-                                                    </p>
-                                                </div>
+                                                @foreach (var g in Model.SelectedUserSubscriptions)
+                                                {
+                                                    <div class="row">
+                                                        <p class="col-sm-10"><i class="fa fa-group"></i> @g.Name</p>
+                                                        <p class="col-sm-2">
+                                                            <a class="btn btn-danger pull-right"
+                                                               asp-controller="User"
+                                                               asp-action="deleteUserGroup"
+                                                               asp-route-id="@Model.SelectedUser.Id"
+                                                               asp-route-group="@g.Id"
+                                                               onclick="showDeleter()">
+                                                                <i class="fa fa-trash-o"></i>
+                                                            </a>
+                                                        </p>
+                                                    </div>
+                                                }
                                             }
-                                        }
-                                        else
-                                        {
-                                            <p>Not a member of any groups</p>
-                                        }
-                                    </div>
-                                </div>
+                                            else
+                                            {
+                                                <p>Not a member of any groups</p>
+                                            }
+                                        </div>
+                                    </div>
                             }
 
@@ -293 +311 @@
                                 <div class="form-group">
                                     <label class="col-sm-3 control-label">
-                                       @Model.SelectedUserRoles.Count Roles
+                                        @Model.SelectedUserRoles.Count Roles
                                     </label>
                                     <div class="col-sm-8 control-label" style="text-align:left">