summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbeccabroek <beccabroek@gmail.com>2019-03-13 10:29:08 -0500
committerGunnar Mills <gmills@us.ibm.com>2019-03-18 14:56:18 +0000
commitdde251d5ad547c0c7536b6b930e1bad8c2ef2752 (patch)
treefd1b310510eef28614428daecbe85d79b4911fda
parentf6cdacfdbd966c7e4ef1c32bb342a67c3e78f519 (diff)
downloadphosphor-webui-dde251d5ad547c0c7536b6b930e1bad8c2ef2752.tar.gz
phosphor-webui-dde251d5ad547c0c7536b6b930e1bad8c2ef2752.zip
Checkbox disabled when 0 event logs
The 'select all' box on event log page should be disabled when there are no event logs presented to the user. Also adds a message to the user when there are no logs or there are no logs with their selected filters applied. Resolves openbmc/phosphor-webui#44 Tested: Checked that correct user message appears when there are no logs and when the logs are all filtered out. Also that when there are no logs presented to the user, the select all box is disabled. Change-Id: I3106426a72d2148a323ceed978bcdd5515096e2b Signed-off-by: beccabroek <beccabroek@gmail.com>
-rw-r--r--app/server-health/controllers/log-controller.html3
-rw-r--r--app/server-health/styles/log.scss6
2 files changed, 8 insertions, 1 deletions
diff --git a/app/server-health/controllers/log-controller.html b/app/server-health/controllers/log-controller.html
index 0a5dfab..0a985c5 100644
--- a/app/server-health/controllers/log-controller.html
+++ b/app/server-health/controllers/log-controller.html
@@ -29,7 +29,7 @@
<div id="event__actions-bar" class="row header__actions-bar no-margin">
<div class="column small-1 large-1 event-log__col-check">
<label class="control-check">
- <input type="checkbox" name="events__check-all" ng-model="all" ng-checked="((filteredLogs|filter:{selected: true}).length == filteredLogs.length) && filteredLogs.length != 0"/>
+ <input type="checkbox" name="events__check-all" ng-disabled="filteredLogs.length === 0" ng-model="all" ng-checked="((filteredLogs|filter:{selected: true}).length == filteredLogs.length) && filteredLogs.length != 0"/>
<span class="control__indicator"></span>
</label>
</div>
@@ -59,6 +59,7 @@
</div>
</div>
</div>
+ <div class="empty__logs" ng-if="filteredLogs.length === 0">{{filteredLogs.length === logs.length ? 'No events have been logged yet.' : 'There are no events that match the selected criteria.'}}</div>
<log-event
dir-paginate="event in (filteredLogs = (logs|filter:filterBySeverity|filter:filterByStatus|filter:filterByDate|filter:filterBySearchTerms | orderBy:'-Id'))| itemsPerPage: itemsPerPage"
event="event"
diff --git a/app/server-health/styles/log.scss b/app/server-health/styles/log.scss
index 0e7174e..aa505e3 100644
--- a/app/server-health/styles/log.scss
+++ b/app/server-health/styles/log.scss
@@ -96,6 +96,12 @@
display: inline-block;
}
}
+.empty__logs {
+ border: 1px solid $lightbg__grey;
+ margin-top: .5em;
+ text-align: center;
+ padding: 2em;
+}
.accord-trigger {
position: absolute;
OpenPOWER on IntegriCloud