Changeset 13827 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Resource

Timestamp:

05/03/16 17:13:50 (9 years ago)

Author:

jlodewyc

Message:

#2582 Parameter changing busy, save file, download file and email on pass reset

File:

• branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Resource/Index.cshtml (modified) (11 diffs)

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

@@ -41 +41 @@
                    class="btn pull-right"
                    style="box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-                            text-shadow:2px 2px black;font-weight:bold;margin-bottom:5px"
+                            text-shadow:2px 2px black;font-weight:bold;margin-bottom:5px;"
                    ng-class="{ 'btn-success': treeview.currentNode.IsDisposable, 'btn-warning': !treeview.currentNode.IsDisposable }"
                    ng-click="toggleDisposable()">
@@ -60 +60 @@
                     ng-class="{ 'active': permissionview }"
                     ng-style="{ 'text-decoration': permissionview ? 'underline' : ''}">
-                    <a style="text-shadow:2px 2px black; color:white; font-weight:bold; border: 1px solid white;"
+                    <a style="text-shadow:2px 2px black; color:white; font-weight:bold; border:1px solid white;"
                        href=""
                        ng-click="menuchange(1)">
@@ -69 +69 @@
                     role="presentation"
                     ng-class="{ 'active': resaddview }"
-                    ng-style="{ 'text-decoration': resaddview ? 'underline' : ''}">
+                    ng-style="{'text-decoration': resaddview ? 'underline' : ''}">
 
                     <a style="text-shadow:2px 2px black; color:white; font-weight:bold; border: 1px solid white;"
@@ -88 +88 @@
                     <p>
                         This shows only
-                        <span style="text-decoration:underline">direct members</span>
+                        <span style="text-decoration:underline;">direct members</span>
                         of the group (not members of subgroups).
                     </p>
+                    <p><span style="color:lightgray;">Gray clients</span> are already subscribed to another group. White are ungrouped.</p>
                     <p>Adding a member will overwrite the current group it's a member in (if any)</p>
                     <p>Removing an existing member will make it revert to Ungrouped.</p>
@@ -97 +98 @@
                        style="box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
                             text-shadow:2px 2px black;">Reset to current members</a>
-                    <div class="row" style="margin:5px">
+                    <div class="row" style="margin:5px;">
                         <h4>All resources</h4>
                         <label class="col-sm-3"
                                ng-style="{
-                                   'background-color':client.add === true ? 'green' : '' }"
-                               ng-repeat="client in clients  | orderBy:['!add', 'Name' ]  | filter:searchText">
-                            <input type="checkbox"
+                                   'background-color':client.add === true ? 'green' : '',
+                               'color':client.ParentResourceId != null ? 'lightgray' : ''}"
+                               ng-repeat="client in clients  | orderBy:['!add', 'Name']  | filter:searchText">
+                            <input 
+                                  type="checkbox"
                                    name="addres"
                                    value="{{client.Id}}"
@@ -110 +113 @@
                     </div>
                 </div>
-                <input style="display:none"
+                <input style="display:none;"
                        type="text"
                        id="groupid"
@@ -163 +166 @@
                   class="row panel-heading"
                   style="padding:10px;">
-                <table class="table" style="margin-bottom:0px">
+                <table class="table" style="margin-bottom:0;">
                     <tbody>
                         <tr>
@@ -186 +189 @@
                             <td>
 
-                                <input style="display:none" type="text" id="inpid" name="inpid" value="{{treeview.currentNode.Id}}" />
+                                <input style="display:none;" type="text" id="inpid" name="inpid" value="{{treeview.currentNode.Id}}" />
                                 <input type="checkbox" ng-model="checkDel" /> I want to delete this group
                             </td>
@@ -225 +228 @@
                   class="row"
                   style="padding:10px;">
-                <input style="display:none" type="text" id="inpid" name="inpid" value="{{treeview.currentNode.Id}}" />
-
-                <span style="padding:0px" class="col-sm-4">Change group: </span>
+                <input style="display:none;" type="text" id="inpid" name="inpid" value="{{treeview.currentNode.Id}}" />
+
+                <span style="padding:0;" class="col-sm-4">Change group: </span>
 
                 <select class="form-control col-sm-5"
@@ -258 +261 @@
                  ui-calendar="uiConfig.calendar"
                  id="resourcecalendar"
-                 style="font-size:medium"
+                 style="font-size:medium;"
                  class="span8 calendar"
                  ng-model="currentcal.down"></div>
@@ -304 +307 @@
                     <td>
                         <input type="checkbox" class="checkbox" ng-model="currentcal.down[0][selectedEventId].rec.recurrence" ng-change="setChanged(selectedEventId)" />
-                        <p ng-if="currentcal.down[0][selectedEventId].changed && currentcal.down[0][selectedEventId].rec.recurrence" style="color:darkred;font-weight:bold">
+                        <p ng-if="currentcal.down[0][selectedEventId].changed && currentcal.down[0][selectedEventId].rec.recurrence" style="color:darkred; font-weight:bold;">
                             The recurrence itself will be made during saving, settings can be changed here.
                         </p>