diff options
| author | Michael Davis <michael.s.davis@ibm.com> | 2017-07-09 11:56:06 -0500 |
|---|---|---|
| committer | Adriana Kobylak <anoo@us.ibm.com> | 2017-10-09 13:41:30 -0500 |
| commit | 0a80dd6792a4e2664abb2ece24bb203bb90bbf19 (patch) | |
| tree | 1f9e30774c36b9eb4f84f882de8f68fdb464f6e0 /app | |
| parent | 25aaa22c076027ddcb18f758a14db663ac8fa256 (diff) | |
| download | phosphor-webui-0a80dd6792a4e2664abb2ece24bb203bb90bbf19.tar.gz phosphor-webui-0a80dd6792a4e2664abb2ece24bb203bb90bbf19.zip | |
Added label to content filter input and fixed disable class
Change-Id: I86dc3a4764eabd94aa08bf2dbb56b5fc1565d195
Signed-off-by: Michael Davis <michael.s.davis@ibm.com>
Diffstat (limited to 'app')
| -rw-r--r-- | app/common/directives/log-search-control.html | 3 | ||||
| -rw-r--r-- | app/server-health/controllers/inventory-controller.html | 24 |
2 files changed, 2 insertions, 25 deletions
diff --git a/app/common/directives/log-search-control.html b/app/common/directives/log-search-control.html index bfd461b..09a393b 100644 --- a/app/common/directives/log-search-control.html +++ b/app/common/directives/log-search-control.html @@ -1,5 +1,6 @@ +<p class="content-label">Filter events</p> <div class="content__search"> <label for="content__search-input">Event Log Search</label> - <input id="content__search-input" type="text" placeholder="Filter issues" ng-model="customSearch" ng-keydown="doSearchOnEnter($event)"/> + <input id="content__search-input" type="text" ng-model="customSearch" ng-keydown="doSearchOnEnter($event)"/> <input id="content__search-submit" type="submit" class="btn btn-primary" value="Filter" ng-click="doSearchOnClick()"/> </div>
\ No newline at end of file diff --git a/app/server-health/controllers/inventory-controller.html b/app/server-health/controllers/inventory-controller.html index 2941aaa..7506954 100644 --- a/app/server-health/controllers/inventory-controller.html +++ b/app/server-health/controllers/inventory-controller.html @@ -16,20 +16,6 @@ <input id="content__search-input" type="text" placeholder="Filter hardware components"/> <input id="content__search-submit" type="submit" class="btn btn-primary" value="Submit"/> </div> - <!--<div class="toggle-filter">--> - <!--<button class="inline first" ng-click="toggleall = !toggleall"--> - <!--ng-class="toggleall ? 'btn-primary' : 'btn-secondary'">All--> - <!--</button>--> - <!--<button class="inline " ng-click="togglehigh = !togglehigh"--> - <!--ng-class="togglehigh ? 'btn-primary' : 'btn-secondary'">High--> - <!--</button>--> - <!--<button class="inline" ng-click="togglemed = !togglemed"--> - <!--ng-class="togglemed ? 'btn-primary' : 'btn-secondary'">Medium--> - <!--</button>--> - <!--<button class="inline last" ng-click="togglelow = !togglelow"--> - <!--ng-class="togglelow ? 'btn-primary' : 'btn-secondary'">Low--> - <!--</button>--> - <!--</div>--> </section> <!-- end filter --> <section class="row column"> <div class="back-link"> @@ -41,16 +27,6 @@ <div class="column small-12"> <p class="h2">CPU cores (6)</p> </div> - <!--<div class="column hide-for-medium-only large-3 ">--> - <!--<p class="inline inventory__heading inventory__function-col inv-active">Active</p>--> - <!--</div>--> - <!--<div class="column hide-for-medium-only large-3 ">--> - <!--<p class="inline inventory__heading inventory__present-col inv-present">Present</p>--> - <!--</div>--> - <!--<div class="column hide-for-medium-only large-2 ">--> - <!--<p class="inline inventory__heading inventory__state-col inventory__critical-label" aria-label="High - Emergency">High - Emergency</p>--> - <!--</div>--> - <!--<div class="column small-4 large-1 "></div>--> </div> <!-- Inventory Item --> |
