diff options
| -rw-r--r-- | app/assets/images/logo.svg | 27 | ||||
| -rw-r--r-- | app/common/directives/app-header.html | 2 | ||||
| -rw-r--r-- | app/common/styles/directives/app-navigation.scss | 2 | ||||
| -rw-r--r-- | app/overview/controllers/log-controller.html | 422 | ||||
| -rw-r--r-- | app/overview/controllers/log-controller.js | 28 | ||||
| -rw-r--r-- | app/overview/controllers/sensors-controller.html | 191 | ||||
| -rw-r--r-- | app/overview/controllers/sensors-controller.js | 32 | ||||
| -rw-r--r-- | app/overview/controllers/sensors-overview-controller.js | 28 | ||||
| -rw-r--r-- | app/overview/controllers/sensors-overview.html | 442 | ||||
| -rw-r--r-- | app/overview/controllers/system-overview-controller.html | 33 | ||||
| -rw-r--r-- | app/overview/styles/sensors.scss | 133 | ||||
| -rw-r--r-- | app/server-health/controllers/inventory-overview-controller.html | 9 | ||||
| -rw-r--r-- | app/server-health/controllers/log-controller.html | 14 | ||||
| -rw-r--r-- | app/server-health/controllers/sensors-overview-controller.html | 1 |
14 files changed, 30 insertions, 1334 deletions
diff --git a/app/assets/images/logo.svg b/app/assets/images/logo.svg index 79dac09..6cc6001 100644 --- a/app/assets/images/logo.svg +++ b/app/assets/images/logo.svg @@ -1,18 +1,15 @@ -<svg version="1.1" id="logo" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - viewBox="0 0 356.5 142.8" style="enable-background:new 0 0 356.5 142.8;" xml:space="preserve"> -<style type="text/css"> - .st0{fill:#737373;} -</style> -<path class="st0" d="M-0.5,0v9.8H69V0H-0.5z M78.8,0v9.8h99c0,0-10.1-9.8-23.5-9.8H78.8z M197.2,0v9.8h59.9L253.6,0H197.2z M300.1,0 - l-3.6,9.8h59.4V0H300.1z M-0.5,19v9.8H69V19H-0.5z M78.8,19v9.8h110.5c0,0-1.3-7.5-3.5-9.8H78.8z M197.2,19v9.8h66.5l-3.3-9.8H197.2 - z M293,19l-3.3,9.8h66.2V19H293z M19.4,38v9.8h30.1V38H19.4z M98.8,38v9.8h30.1V38H98.8z M158.1,38v9.8h30.1c0,0,1.9-5.2,1.9-9.8 - H158.1z M217.2,38v9.8h53.4L267,38H217.2z M286.4,38l-3.6,9.8h53.6V38H286.4z M19.4,57v9.8h30.1V57H19.4z M98.8,57v9.8h76.9 - c0,0,6.4-5,8.5-9.8C184.2,57,98.8,57,98.8,57z M217.2,57v9.8h30.1v-5.4l1.9,5.4h55.1l2.1-5.4v5.4h30.1V57H280l-3,8.3l-3-8.3 - C274,57,217.2,57,217.2,57z M19.4,76v9.8h30.1V76H19.4z M98.8,76v9.8h85.3c-2.1-4.7-8.5-9.8-8.5-9.8H98.8z M217.2,76v9.8h30.1V76 - H217.2z M252.8,76l3.6,9.8h41.3l3.5-9.8H252.8z M306.4,76v9.8h30.1V76H306.4z M19.4,95v9.8h30.1V95H19.4z M98.8,95v9.8h30.1V95H98.8 - z M158.1,95v9.8h32c0-4.6-1.9-9.8-1.9-9.8H158.1z M217.2,95v9.8h30.1V95H217.2z M259.6,95l3.5,9.8h27.7l3.6-9.8H259.6z M306.4,95 - v9.8h30.1V95H306.4z M0,114v9.8h69.5V114H0z M78.8,114v9.8h107c2.3-2.2,3.5-9.8,3.5-9.8H78.8z M197.8,114v9.8h49.5V114H197.8z - M266.4,114l3.6,9.8h14.1l3.4-9.8H266.4z M306.4,114v9.8h50.1V114H306.4z M0,133v9.8h69.5V133H0z M78.8,133v9.8h75.5 +<svg version="1.1" baseProfile="tiny" id="logo" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + x="0px" y="0px" viewBox="0 0 356.5 142.8" xml:space="preserve"> +<path fill="#1F70C1" d="M-0.5,0v9.8H69V0H-0.5z M78.8,0v9.8h99c0,0-10.1-9.8-23.5-9.8H78.8z M197.2,0v9.8h59.9L253.6,0H197.2z + M300.1,0l-3.6,9.8h59.4V0H300.1z M-0.5,19v9.8H69V19H-0.5z M78.8,19v9.8h110.5c0,0-1.3-7.5-3.5-9.8H78.8z M197.2,19v9.8h66.5 + l-3.3-9.8H197.2z M293,19l-3.3,9.8h66.2V19H293z M19.4,38v9.8h30.1V38H19.4z M98.8,38v9.8h30.1V38H98.8z M158.1,38v9.8h30.1 + c0,0,1.9-5.2,1.9-9.8H158.1z M217.2,38v9.8h53.4L267,38H217.2z M286.4,38l-3.6,9.8h53.6V38H286.4z M19.4,57v9.8h30.1V57H19.4z + M98.8,57v9.8h76.9c0,0,6.4-5,8.5-9.8C184.2,57,98.8,57,98.8,57z M217.2,57v9.8h30.1v-5.4l1.9,5.4h55.1l2.1-5.4v5.4h30.1V57H280 + l-3,8.3l-3-8.3C274,57,217.2,57,217.2,57z M19.4,76v9.8h30.1V76H19.4z M98.8,76v9.8h85.3c-2.1-4.7-8.5-9.8-8.5-9.8H98.8z M217.2,76 + v9.8h30.1V76H217.2z M252.8,76l3.6,9.8h41.3l3.5-9.8H252.8z M306.4,76v9.8h30.1V76H306.4z M19.4,95v9.8h30.1V95H19.4z M98.8,95v9.8 + h30.1V95H98.8z M158.1,95v9.8h32c0-4.6-1.9-9.8-1.9-9.8H158.1z M217.2,95v9.8h30.1V95H217.2z M259.6,95l3.5,9.8h27.7l3.6-9.8H259.6z + M306.4,95v9.8h30.1V95H306.4z M0,114v9.8h69.5V114H0z M78.8,114v9.8h107c2.3-2.2,3.5-9.8,3.5-9.8H78.8z M197.8,114v9.8h49.5V114 + H197.8z M266.4,114l3.6,9.8h14.1l3.4-9.8H266.4z M306.4,114v9.8h50.1V114H306.4z M0,133v9.8h69.5V133H0z M78.8,133v9.8h75.5 c13.4,0,23.5-9.8,23.5-9.8H78.8z M197.8,133v9.8h49.5V133H197.8z M273.3,133l3.5,9.7h0.6l3.5-9.8h-7.6V133z M306.4,133v9.8h50.1V133 H306.4z"/> </svg> diff --git a/app/common/directives/app-header.html b/app/common/directives/app-header.html index 03d7049..d6eb8bc 100644 --- a/app/common/directives/app-header.html +++ b/app/common/directives/app-header.html @@ -12,7 +12,7 @@ </div> <div class="header__functions"> <a href="#/server-health/event-log" class="header__server-health">Server health <i class="icon icon-angle"></i><span class="status-light__error">{{dataService.server_health}}</span></a> - <a href="#/server-control/power-operations" class="header__server-power" role="button">Server power <i class="icon icon-angle"></i><span ng-class="{'status-light__off': dataService.server_state == 'Off', 'status-light__disabled': dataService.server_state == 'Unreachable', 'status-light__good': dataService.server_state == 'Running', 'status-light__warn': dataService.server_state == 'Quiesced'}">{{dataService.server_state}}</span></a> + <a href="#/server-control/power-operations" class="header__server-power" role="button">Server power <i class="icon icon-angle"></i><span ng-class="{'status-light__error': dataService.server_state == 'Off', 'status-light__disabled': dataService.server_state == 'Unreachable', 'status-light__good': dataService.server_state == 'Running', 'status-light__warn': dataService.server_state == 'Quiesced'}">{{dataService.server_state}}</span></a> <p class="header__refresh">Data last refreshed<span>{{dataService.last_updated |date:'h:mm:ss MMM dd yyyy'}}</span></p> <button class="header__page-refresh" ng-click="refresh()"><span>Refresh</span><svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52.18 51.91"><path class="cls-1" d="M38,20.77H52v-14H48.3v6.07A26,26,0,1,0,48.7,38H44.32a22.14,22.14,0,1,1,1.8-20.92H38v3.67Z" transform="translate(0.16 0.14)"/></button> </div> diff --git a/app/common/styles/directives/app-navigation.scss b/app/common/styles/directives/app-navigation.scss index f91457c..c89b8e4 100644 --- a/app/common/styles/directives/app-navigation.scss +++ b/app/common/styles/directives/app-navigation.scss @@ -176,4 +176,4 @@ $nav__seclvlWidth: 240px; } } } -}
\ No newline at end of file +} diff --git a/app/overview/controllers/log-controller.html b/app/overview/controllers/log-controller.html deleted file mode 100644 index 47429f5..0000000 --- a/app/overview/controllers/log-controller.html +++ /dev/null @@ -1,422 +0,0 @@ -<div id="event-log"> - <div class="row column"> - <h1>Event Log</h1> - </div> - <section class="row column"> - <div class="page-header"> - <h2 class="inline h4">Events generated by the system</h2> - <div class="event-log__timezone inline float-right"> - <button class="dropdown__button" ng-click="timezone = timezone == true ? false : true;" - ng-blur="timezone = timezone == true ? false : false;">User timezone: EDT (UTC-4) - </button> - <ul class="dropdown__list inline" ng-show="timezone"> - <li> - <button>User timezone: EDT (UTC-4)</button> - </li> - <li> - <button>UTC Timezone : UTC - 0</button> - </li> - </ul> - </div> - </div> - </section> - <!-- Filters --> - <section class="row column"> - <!-- search --> - <div class="content__search"> - <label for="content__search-input">Event Log Search</label> - <input id="content__search-input" type="text" placeholder="Search logs"/> - <input id="content__search-submit" type="submit" class="btn btn-secondary" value="Submit"/> - <!-- filters --> - <div class="event-log__filters"> - - </div> - </div> - </section> <!-- end filter --> - - <section id="event-filter" class="row column"> - <div class="inline event__severity-filter"> - <p class="filter-label">Filter by severity</p> - <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> - <div class="inline event__date-filter"> - <p class="filter-label">Filter by date range (MM/DD/YYYY)</p> - <div class="inline"> - <label for="event-filter-start-date">Start Date</label> - <input id="event-filter-start-date" type="date" placeholder="MM/DD/YYYY" /> - </div> - <strong>–</strong> - <div class="inline"> - <label for="event-filter-end-date">End Date</label> - <input id="event-filter-end-date" type="date" placeholder="MM/DD/YYYY"/> - </div> - </div> - <div class="inline event__status-filter"> - <p class="filter-label">Filter by issue status</p> - <!-- Status filter --> - <div class="dropdown__wrapper"> - <button class="dropdown__button" ng-click="statusFilter = statusFilter == true ? false : true;" - ng-class="{'active' : statusFilter}">Unresolved issues - </button> - <ul class="dropdown__list inline" ng-show="statusFilter"> - <li> - <button>Resolved issues</button> - </li> - <li> - <button>Unresolved issues</button> - </li> - </ul> - </div> - </div> - </section> <!-- end filter --> - - <section id="event-log__events" class="row column"> - <div id="header__actions-bar" class="row "> - <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"/> - <div class="control__indicator"></div> - </label> - </div> - <div class="column small-11 large-11 end col-logged-events"> - <!-- top bar confirmation - ADD ACTIVE CLASS TO DISPLAY--> - <div class="inline__confirm event__confirm" ng-class="{active: confirm}"> - <div class="inline__confirm-message"> - <p class="h3"><i></i>Are you sure you want to <strong class="ng-binding">delete 9 logs</strong>? - </p> - </div> - <div class="inline__confirm-buttons"> - <button class="btn-primary" ng-click="accept()">Yes</button> - <button class="btn-primary" ng-click="cancel()">No</button> - </div> - </div> - <p class="inline"><span class="event__select-count">999</span> Events are logged</p> - <!-- when logs are selected, this text changes to show how many logs are checked --> - <div class="event__actions"> - <button class="inline btn-delete" ng-show="event || all" ng-click="confirm= ! confirm"> - <img class="event__icon" src="assets/images/icon-trashcan.svg" alt="">Delete - </button> - <button class="inline btn-resolve" ng-show="event || all"> - <img class="event__icon" src="assets/images/icon-checklist.svg" alt="">Mark as resolved - </button> - <button class="inline btn-export">Export</button> - </div> - </div> - </div> - <!-- EVENT --> - <div class="row column event-log__single-event" - ng-class="{'active': event__metadatarow, 'selected': event__selected}"> - <div class="row"> - <div class="inline__confirm" ng-class="{active: eventConfirm}"> - <div class="inline__confirm-message"> - <p class="h3"><i></i>Are you sure you want to <strong class="ng-binding">delete this - event</strong>?</p> - </div> - <div class="inline__confirm-buttons"> - <button class="btn-primary" ng-click="accept()">Yes</button> - <button class="btn-primary" ng-click="cancel()">No</button> - </div> - </div> - <div class="column small-1 large-2 event-log__col-check"> - <label class="control-check"> - <input type="checkbox" name="event__check" ng-click="event__selected= ! event__selected" - ng-model="event" ng-checked="all"/> - <div class="control__indicator"></div> - </label> - </div> - <div class="column small-9 large-9 event-log__event-info" - ng-click="event__metadatarow = ! event__metadatarow"> - <p class="inline event__priority med-priority">Medium</p> - <p class="inline event__severity">warning</p> - <p class="inline event__description">org.open_power.Error.Host.Event.Event</p> - <div> - <p class="inline event__id">#00997</p> - <p class="inline event__timestamp">03/09/2017 21:00:26 EDT</p></div> - </div> - <div class="column small-1 large-1"> - <button class="accord-trigger" ng-class="{'active': event__metadatarow}" - ng-click="event__metadatarow = ! event__metadatarow"></button> - </div> - </div> - <div class="row event__metadata-row" ng-class="{'active': event__metadatarow}"> - <div class="column small-1 large-1 event-log__col-check"> </div> - <div class="column small-11 large-11 end"> - <div class="event__metadata">ESEL=00 00 df 00 00 00 00 20 00 04 12 01 6f aa 00 00 50 48 00 30 01 00 - 17 00 00 00 00 04 31 71 56 4c 00 00 00 04 31 73 df b2 42 00 00 07 00 00 00 00 00 00 00 00 00 00 - 00 00 90 00 00 28 90 00 00 28 55 48 00 18 01 00 17 00 8a 03 40 00 00 00 00 00 ff ff 00 00 00 00 - 00 00 50 53 00 50 01 01 00 00 02 00 00 09 17 0e 00 48 00 00 00 e0 00 00 0a 00 00 00 00 00 00 20 - 00 00 00 05 00 01 00 2d 00 04 00 00 00 00 00 00 00 00 42 43 38 41 31 37 30 45 20 20 20 20 20 20 - 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 55 44 00 1c 01 06 01 00 02 54 41 4b 00 00 - 00 06 00 00 00 55 00 03 b6 94 00 00 00 00 55 44 00 4c 01 02 01 00 ee ee ee ee 54 61 72 67 65 74 - 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 05 00 01 00 00 00 03 00 00 00 05 00 00 - 00 14 0f 7a bb 7c 23 01 00 02 00 05 01 0b 5a fc d7 13 01 00 02 00 05 01 00 00 55 44 00 30 01 03 - 01 00 00 00 00 00 00 03 f3 54 00 00 00 00 00 03 b6 94 00 00 00 00 40 03 dd 68 00 00 00 00 40 03 - ba 48 00 00 00 00 00 00 25 80 55 44 00 38 01 01 01 00 48 6f 73 74 62 6f 6f 74 20 42 75 69 6c 64 - 20 49 44 3a 20 68 6f 73 74 62 6f 6f 74 2d 38 36 62 61 65 31 63 2f 68 62 69 63 6f 72 65 2e 62 69 - 6e 00 00 00 df 00 00 00 00 20 00 04 12 01 6f aa 00 00 50 48 00 30 01 00 17 00 00 00 00 04 31 71 - 56 4c 00 00 00 04 31 73 df b2 42 00 00 07 00 00 00 00 00 00 00 00 00 00 00 00 90 00 00 28 90 00 - 00 28 55 48 00 18 01 00 17 00 8a 03 40 00 00 00 00 00 ff ff 00 00 00 00 00 00 50 53 00 50 01 01 - 00 00 02 00 00 09 17 0e 00 48 00 00 00 e0 00 00 0a 00 00 00 00 00 00 20 00 00 00 05 00 01 00 2d - 00 04 00 00 00 00 00 00 00 00 42 43 38 41 31 37 30 45 20 20 20 20 20 20 20 20 20 20 20 20 20 20 - 20 20 20 20 20 20 20 20 20 20 55 44 00 1c 01 06 01 00 02 54 41 4b 00 00 00 06 00 00 00 55 00 03 - b6 94 00 00 00 00 55 44 00 4c 01 02 01 00 ee ee ee ee 54 61 72 67 65 74 00 00 00 00 00 00 00 00 - 00 00 00 00 00 00 00 00 00 00 00 05 00 01 00 00 00 03 00 00 00 05 00 00 00 14 0f 7a bb 7c 23 01 - 00 02 00 05 01 0b 5a fc d7 13 01 00 02 00 05 01 00 00 55 44 00 30 01 03 01 00 00 00 00 00 00 03 - f3 54 00 00 00 00 00 03 b6 94 00 00 00 00 40 03 dd 68 00 00 00 00 40 03 ba 48 00 00 00 00 00 00 - 25 80 55 44 00 38 01 01 01 00 48 6f 73 74 62 6f 6f 74 20 42 75 69 6c 64 20 49 44 3a 20 68 6f 73 - 74 62 6f 6f 74 2d 38 36 62 61 65 31 63 2f 68 62 69 63 6f 72 65 2e 62 69 6e 00 00 df 00 00 00 00 - 20 00 04 12 01 6f aa 00 00 50 48 00 30 01 00 17 00 00 00 00 04 31 71 56 4c 00 00 00 04 31 73 df - b2 42 00 00 07 00 00 00 00 00 00 00 00 00 00 00 00 90 00 00 28 90 00 00 28 55 48 00 18 01 00 17 - 00 8a 03 40 00 00 00 00 00 ff ff 00 00 00 00 00 00 50 53 00 50 01 01 00 00 02 00 00 09 17 0e 00 - 48 00 00 00 e0 00 00 0a 00 00 00 00 00 00 20 00 00 00 05 00 01 00 2d 00 04 00 00 00 00 00 00 00 - 00 42 43 38 41 31 37 30 45 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 - 20 55 44 00 1c 01 06 01 00 02 54 41 4b 00 00 00 06 00 00 00 55 00 03 b6 94 00 00 00 00 55 44 00 - 4c 01 02 01 00 ee ee ee ee 54 61 72 67 65 74 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 - 00 00 05 00 01 00 00 00 03 00 00 00 05 00 00 00 14 0f 7a bb 7c 23 01 00 02 00 05 01 0b 5a fc d7 - 13 01 00 02 00 05 01 00 00 55 44 00 30 01 03 01 00 00 00 00 00 00 03 f3 54 00 00 00 00 00 03 b6 - 94 00 00 00 00 40 03 dd 68 00 00 00 00 40 03 ba 48 00 00 00 00 00 00 25 80 55 44 00 38 01 01 01 - 00 48 6f 73 74 62 6f 6f 74 20 42 75 69 6c 64 20 49 44 3a 20 68 6f 73 74 62 6f 6f 74 2d 38 36 62 - 61 65 31 63 2f 68 62 69 63 6f 72 65 2e 62 69 6e 00 - </div> - <div> - <div class="event__actions"> - <button class="btn-meta-copy"><img class="event__icon" src="assets/images/icon-copy.svg" - alt="">Copy - </button> - <button class="btn-delete" ng-click="eventConfirm= ! eventConfirm"><img class="event__icon" - src="assets/images/icon-trashcan.svg" - alt=""/>Delete - </button> - <button class="btn-resolve"><img class="event__icon" src="assets/images/icon-checklist.svg" - alt="">Resolved - </button> - </div> - <div class="event__related"> - <p class="inline event__related-label">Related items:</p> - <a href="" class="event__related-item">/org/openbmc/control/chassis0/</a> - <a href="" class="event__related-item">/org/openbmc/control/power0/</a> - <a href="" class="event__related-item">/org/openbmc/control/chassis0/</a> - <a href="" class="event__related-item">/org/openbmc/control/power0/</a> - </div> - </div> - </div> - </div> - </div> - <!-- EVENT --> - <div class="row column event-log__single-event" - ng-class="{'active': event__metadatarow_2, 'selected': event__selected_2}"> - <div class="row"> - <div class="inline__confirm" ng-class="{active: eventConfirm2}"> - <div class="inline__confirm-message"> - <p class="h3"><i></i>Are you sure you want to <strong class="ng-binding">delete this - event</strong>?</p> - </div> - <div class="inline__confirm-buttons"> - <button class="btn-primary" ng-click="accept()">Yes</button> - <button class="btn-primary" ng-click="cancel()">No</button> - </div> - </div> - <div class="column small-1 large-2 event-log__col-check"> - <label class="control-check"> - <input type="checkbox" name="events__check" ng-click="event__selected_2= ! event__selected_2" - ng-checked="all"/> - <div class="control__indicator"></div> - </label> - </div> - <div class="column small-9 large-9 event-log__event-info" - ng-click="event__metadatarow_2 = ! event__metadatarow_2"> - <p class="inline event__priority event-resolved">Resolved</p> - <p class="inline event__severity">emergency</p> - <p class="inline event__description">org.open_power.Error.Host.Event.Event</p> - <div> - <p class="inline event__id">#00996</p> - <p class="inline event__timestamp">03/09/2017 21:00:26 EDT</p></div> - </div> - <div class="column small-1 large-1"> - <button class="accord-trigger" ng-class="{'active': event__metadatarow_2}" - ng-click="event__metadatarow_2 = ! event__metadatarow_2"></button> - </div> - </div> - <div class="row event__metadata-row" ng-class="{'active': event__metadatarow_2}"> - <div class="column small-1 large-1 event-log__col-check"> </div> - <div class="column small-11 large-11 end"> - <div class="event__metadata">Curabitur aliquet quam id dui posuere blandit. Curabitur aliquet quam - id dui posuere blandit. Curabitur aliquet quam id dui posuere blandit. Proin eget tortor risus. - Quisque velit nisi, pretium ut lacinia in, elementum id enim. Pellentesque in ipsum id orci - porta dapibus. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Vestibulum - ac diam sit amet quam vehicula elementum sed sit amet dui. Curabitur arcu erat, accumsan id - imperdiet et, porttitor at sem. Nulla porttitor accumsan tincidunt.Curabitur aliquet quam id dui - posuere blandit. Curabitur aliquet quam id dui posuere blandit. Curabitur aliquet quam id dui - posuere blandit. Proin eget tortor risus. Quisque velit nisi, pretium ut lacinia in, elementum - id enim. Pellentesque in ipsum id orci porta dapibus. Praesent sapien massa, convallis a - pellentesque nec, egestas non nisi. Vestibulum ac diam sit amet quam vehicula elementum sed sit - amet dui. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Nulla porttitor - accumsan tincidunt.Curabitur aliquet quam id dui posuere blandit. Curabitur aliquet quam id dui - posuere blandit. Curabitur aliquet quam id dui posuere blandit. Proin eget tortor risus. Quisque - velit nisi, pretium ut lacinia in, elementum id enim. Pellentesque in ipsum id orci porta - dapibus. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Vestibulum ac - diam sit amet quam vehicula elementum sed sit amet dui. Curabitur arcu erat, accumsan id - imperdiet et, porttitor at sem. Nulla porttitor accumsan tincidunt.Curabitur aliquet quam id dui - posuere blandit. Curabitur aliquet quam id dui posuere blandit. Curabitur aliquet quam id dui - posuere blandit. Proin eget tortor risus. Quisque velit nisi, pretium ut lacinia in, elementum - id enim. Pellentesque in ipsum id orci porta dapibus. Praesent sapien massa, convallis a - pellentesque nec, egestas non nisi. Vestibulum ac diam sit amet quam vehicula elementum sed sit - amet dui. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Nulla porttitor - accumsan tincidunt. - </div> - <div> - <div class="event__actions"> - <button class="btn-meta-copy"><img class="event__icon" src="assets/images/icon-copy.svg" - alt="">Copy - </button> - <button class="btn-delete" ng-click="eventConfirm2= ! eventConfirm2"><img - class="event__icon" - src="assets/images/icon-trashcan.svg" - alt="">Delete - </button> - <button class="btn-resolve"><img class="event__icon" src="assets/images/icon-checklist.svg" - alt="">Resolved - </button> - </div> - <div class="event__related"> - <p class="inline event__related-label">Related items:</p> - <p class="event__related-item">Attribute-1</p> - <p class="event__related-item">Attribute-2</p> - </div> - </div> - </div> - </div> - </div> - <!-- EVENT --> - <div class="row column event-log__single-event" ng-class="{'active': event__metadatarow_1}"> - <div class="row"> - <div class="column small-1 large-2 event-log__col-check"> - <label class="control-check"> - <input type="checkbox" name="events__check" ng-checked="all"/> - <div class="control__indicator"></div> - </label> - </div> - <div class="column small-9 large-9 event-log__event-info" - ng-click="event__metadatarow_1 = ! event__metadatarow_1"> - <p class="inline event__priority high-priority">High</p> - <p class="inline event__severity">emergency</p> - <p class="inline event__description">Vestibulum ac diam sit amet quam vehicula aliquet quam id - dui</p> - <div> - <p class="inline event__id">#00995</p> - <p class="inline event__timestamp">03/09/2017 21:00:26 EDT</p></div> - </div> - <div class="column small-1 large-1"> - <button class="accord-trigger" ng-class="{'active': event__metadatarow_1}" - ng-click="event__metadatarow_1 = ! event__metadatarow_1"></button> - </div> - </div> - <div class="row event__metadata-row" ng-class="{'active': event__metadatarow_1}"> - <div class="column small-1 large-1 event-log__col-check"> </div> - <div class="column small-11 large-11 end"> - <div class="event__metadata">Curabitur aliquet quam id dui posuere blandit. Curabitur aliquet quam - id dui posuere blandit. Curabitur aliquet quam id dui posuere blandit. Proin eget tortor risus. - Quisque velit nisi, pretium ut lacinia in, elementum id enim. Pellentesque in ipsum id orci - porta dapibus. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Vestibulum - ac diam sit amet quam vehicula elementum sed sit amet dui. Curabitur arcu erat, accumsan id - imperdiet et, porttitor at sem. Nulla porttitor accumsan tincidunt.Curabitur aliquet quam id dui - posuere blandit. Curabitur aliquet quam id dui posuere blandit. Curabitur aliquet quam id dui - posuere blandit. Proin eget tortor risus. Quisque velit nisi, pretium ut lacinia in, elementum - id enim. Pellentesque in ipsum id orci porta dapibus. Praesent sapien massa, convallis a - pellentesque nec, egestas non nisi. Vestibulum ac diam sit amet quam vehicula elementum sed sit - amet dui. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Nulla porttitor - accumsan tincidunt.Curabitur aliquet quam id dui posuere blandit. Curabitur aliquet quam id dui - posuere blandit. Curabitur aliquet quam id dui posuere blandit. Proin eget tortor risus. Quisque - velit nisi, pretium ut lacinia in, elementum id enim. Pellentesque in ipsum id orci porta - dapibus. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Vestibulum ac - diam sit amet quam vehicula elementum sed sit amet dui. Curabitur arcu erat, accumsan id - imperdiet et, porttitor at sem. Nulla porttitor accumsan tincidunt.Curabitur aliquet quam id dui - posuere blandit. Curabitur aliquet quam id dui posuere blandit. Curabitur aliquet quam id dui - posuere blandit. Proin eget tortor risus. Quisque velit nisi, pretium ut lacinia in, elementum - id enim. Pellentesque in ipsum id orci porta dapibus. Praesent sapien massa, convallis a - pellentesque nec, egestas non nisi. Vestibulum ac diam sit amet quam vehicula elementum sed sit - amet dui. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Nulla porttitor - accumsan tincidunt. - </div> - <div> - <div class="event__actions"> - <button class="btn-meta-copy"><img class="event__icon" src="assets/images/icon-copy.svg" - alt="">Copy - </button> - <button class="btn-delete"><img class="event__icon" src="assets/images/icon-trashcan.svg" - alt="">Delete - </button> - <button class="btn-resolve"><img class="event__icon" src="assets/images/icon-checklist.svg" - alt="">Resolved - </button> - </div> - <div class="event__related"> - <p class="inline event__related-label">Related items:</p> - <p class="event__related-item">Attribute-1</p> - <p class="event__related-item">Attribute-2</p> - </div> - </div> - </div> - </div> - </div> - <!-- EVENT --> - <div class="row column event-log__single-event"> - <div class="row"> - <div class="column small-1 large-2 event-log__col-check"> - <label class="control-check"> - <input type="checkbox" name="events__check" ng-checked="all"/> - <div class="control__indicator"></div> - </label> - </div> - <div class="column small-9 large-9 event-log__event-info"> - <p class="inline event__priority low-priority">Low</p> - <p class="inline event__severity">Informational</p> - <p class="inline event__description">org.open_power.Error.Host.Event.Event</p> - <div> - <p class="inline event__id">#00994</p> - <p class="inline event__timestamp">03/09/2017 21:00:26 EDT</p></div> - </div> - <div class="column small-1 large-1"> - <button class="accord-trigger"></button> - </div> - </div> - <div class="row event__metadata-row"> - <div class="column small-1 large-1 event-log__col-check"> </div> - <div class="column small-11 large-11 end"> - <div class="event__metadata"> - </div> - <div> - <div class="event__actions"> - <button class="btn-meta-copy"><img class="event__icon" src="assets/images/icon-copy.svg" - alt="">Copy - </button> - <button class="btn-delete"><img class="event__icon" src="assets/images/icon-trashcan.svg" - alt="">Delete - </button> - <button class="btn-resolve"><img class="event__icon" src="assets/images/icon-checklist.svg" - alt="">Resolved - </button> - </div> - <div class="event__related"> - <p class="inline event__related-label">Related items:</p> - <p class="event__related-item">Attribute-1</p> - <p class="event__related-item">Attribute-2</p> - </div> - </div> - </div> - </div> - </div> - </section> - <paginate ng-include="paginate"></paginate> -</div> <!-- end event log -->
\ No newline at end of file diff --git a/app/overview/controllers/log-controller.js b/app/overview/controllers/log-controller.js deleted file mode 100644 index b952893..0000000 --- a/app/overview/controllers/log-controller.js +++ /dev/null @@ -1,28 +0,0 @@ -/** - * Controller for log - * - * @module app/overview - * @exports logController - * @name logController - * @version 0.1.0 - */ - -window.angular && (function (angular) { - 'use strict'; - - angular - .module('app.overview') - .controller('logController', [ - '$scope', - '$window', - 'APIUtils', - 'dataService', - function($scope, $window, APIUtils, dataService, userModel){ - $scope.dataService = dataService; - - $scope.dropdown_selected = false; - } - ] - ); - -})(angular); diff --git a/app/overview/controllers/sensors-controller.html b/app/overview/controllers/sensors-controller.html deleted file mode 100644 index b742f07..0000000 --- a/app/overview/controllers/sensors-controller.html +++ /dev/null @@ -1,191 +0,0 @@ -<div id="sensors"> - <div class="row column"> - <h1>Sensors</h1> - </div> - <section class="row column"> - <div class="page-header"> - <h2 class="inline h4">Sensors present in the system</h2> - - </div> - </section> - <!-- Filters --> - <section class="row column"> - <!-- filters --> - <div class="event-log__filters"> - <!-- severity filter --> - <div class="dropdown__wrapper"> - <button class="dropdown__button" ng-click="severityFilter = severityFilter == true ? false : true;" - ng-class="{'active' : severityFilter}">All Severity - </button> - <ul class="dropdown__list multi-select inline" ng-show="severityFilter"> - <li> - <button>All severity (999)</button> - </li> - <li ng-click="dropdown_selectedHigh = !dropdown_selectedHigh; filterHigh = !filterHigh " - ng-class="{'active' : dropdown_selectedHigh, 'active' : filterHigh}"> - <button>High severity (999)</button> - </li> - <li ng-click="dropdown_selectedMed = !dropdown_selectedMed; filterMed = !filterMed" - ng-class="{'active' : dropdown_selectedMed, 'active' : filterMed}"> - <button>Medium severity (999)</button> - </li> - <li ng-click="dropdown_selectedLow = !dropdown_selectedLow; filterLow = !filterLow" - ng-class="{'active' : dropdown_selectedLow, 'active' : filterLow}"> - <button>Low severity (999)</button> - </li> - </ul> - </div> - <!-- date range --> - <div class="dropdown__wrapper"> - <button class="dropdown__button" ng-click="dateFilter = dateFilter == true ? false : true;" - ng-class="{'active' : dateFilter}">Date Range - </button> - <div class="dropdown__list dropdown__date row" ng-show="dateFilter"> - <div class="column small-6"> - <label>Start Date</label> - <input type="date"/> - </div> - <div class="column small-6"> - <label>End Date</label> - <input type="date"/> - </div> - </div> - </div> - <!-- Status filter --> - <div class="dropdown__wrapper"> - <button class="dropdown__button" ng-click="statusFilter = statusFilter == true ? false : true;" - ng-class="{'active' : statusFilter}">Status - </button> - <ul class="dropdown__list multi-select inline" ng-show="statusFilter"> - <li> - <button>All status (999)</button> - </li> - <li ng-click="dropdown_selectedResolved = !dropdown_selectedResolved; filterResolved = !filterResolved" - ng-class="{'active' : dropdown_selectedResolved, 'active' : filterResolved}"> - <button>Resolved issues (999)</button> - </li> - <li ng-click="dropdown_selectedUnresolved = !dropdown_selectedUnresolved; filterUnresolved = !filterUnresolved" - ng-class="{'active' : dropdown_selectedUnresolved, 'active' : filterUnresolved}"> - <button>Unresolved issues (999)</button> - </li> - </ul> - </div> - </div> - <!-- search --> - <div class="content__search"> - <label for="content__search-input">Event Log Search</label> - <input id="content__search-input" type="text" placeholder="Filter issues"/> - <input id="sensors__search-submit" type="submit" class="btn btn-secondary" value="Submit"/> - <div class="sensors__search-tag-wrapper row" - ng-show="filterUnresolved || filterResolved || filterHigh || filterMed || filterLow"> - <div class="column small-2 large-1 no-padding"> - <p class="inline label tag-filter-label">Filtered by: </p> - </div> - <div class="column small-10 large-11 "> - <button class="tag custom">Custom Tag</button> - <button class="tag sensors__high" ng-click="filterHigh = !filterHigh" ng-show="filterHigh">High - priority - </button> - <button class="tag sensors__medium" ng-click="filterMed = !filterMed" ng-show="filterMed">Medium - priority - </button> - <button class="tag sensors__low" ng-click="filterLow = !filterLow" ng-show="filterLow">Low priority - </button> - <button class="tag sensors__resolved" ng-click="filterUnresolved = !filterUnresolved" - ng-show="filterUnresolved">Unresolved issues - </button> - <button class="tag sensors__resolved" ng-click="filterResolved = !filterResolved" - ng-show="filterResolved">Resolved issues - </button> - </div> - </div> - </div> - </section> <!-- end filter --> - - <section id="sensor__details" class="row column"> - <div id="header__actions-bar" class="row "> - <div class="column"> - <p class="inline">icon here</p> - <h3 class="inline"><strong>Fan speed sensors</strong> <span class="h5">(RPMs)</span></h3> - </div> - </div> - - <!-- Sensor --> - <div class="row column accord-row" - ng-class="{'active': sensors__metadatarow, 'selected': sensors__selected}"> - <div class="row"> - <div class="column small-10 large-11 sensor__info" - ng-click="sensors__metadatarow = ! sensors__metadatarow"> - <p class="inline priority-tag high-priority">High</p> - <p class="inline sensor__title">Fan Speed 1</p> - <p class="inline sensor__reading float-right">6200 <span>rpms</span></p> - </div> - <div class="column small-2 large-1"> - <button class="accord-trigger" ng-class="{'active': sensors__metadatarow}" - ng-click="sensors__metadatarow = ! sensors__metadatarow"></button> - </div> - </div> - <div class="row sensors__metadata-row" ng-class="{'active': sensors__metadatarow}"> - <div class="column small-12"> - <div class="threshold-chart"> - <span class="threshold__marker" style="left: 90%;"><p class="threshold__value">6200</p></span> - <span class="threshold thresh__low-critical"></span> - <span class="threshold thresh__low-warn"></span> - <span class="threshold thresh__normal"></span> - <span class="threshold thresh__high-warn"></span> - <span class="threshold thresh__high-critical"></span> - </div> - </div> - - <div class="column small-6"> - <p class="h5 content-header">Associated Events</p> - <a href="#/overview/log">View 5 events related to Fan 1</a> - </div> - <div class="column small-6"> - <p class="h5 content-header">Associated Hardware</p> - <a href="">None</a> - </div> - </div> - </div> - - <!-- Sensor --> - <div class="row column accord-row" - ng-class="{'active': sensors__metadatarow2, 'selected': sensors__selected}"> - <div class="row"> - <div class="column small-10 large-11 sensor__info" - ng-click="sensors__metadatarow2 = ! sensors__metadatarow2"> - <p class="inline priority-tag high-priority">High</p> - <p class="inline sensor__title">Fan Speed 2</p> - <p class="inline sensor__reading float-right">3600 <span>rpms</span></p> - </div> - <div class="column small-2 large-1"> - <button class="accord-trigger" ng-class="{'active': sensors__metadatarow2}" - ng-click="sensors__metadatarow2 = ! sensors__metadatarow2"></button> - </div> - </div> - <div class="row sensors__metadata-row" ng-class="{'active': sensors__metadatarow2}"> - <div class="column small-12"> - <div class="threshold-chart"> - <span class="threshold__marker" style="left: 50%"><p class="threshold__value">3600</p></span> - <span class="threshold thresh__low-critical"></span> - <span class="threshold thresh__low-warn"></span> - <span class="threshold thresh__normal"></span> - <span class="threshold thresh__high-warn"></span> - <span class="threshold thresh__high-critical"></span> - </div> - </div> - - <div class="column small-6"> - <p class="h5 content-header">Associated Events</p> - <a href="#/overview/log">View 5 events related to Fan 1</a> - </div> - <div class="column small-6"> - <p class="h5 content-header">Associated Hardware</p> - <a href="">None</a> - </div> - </div> - </div> - - </section> - <paginate ng-include="paginate"></paginate> -</div> <!-- end event log -->
\ No newline at end of file diff --git a/app/overview/controllers/sensors-controller.js b/app/overview/controllers/sensors-controller.js deleted file mode 100644 index 0ab0a42..0000000 --- a/app/overview/controllers/sensors-controller.js +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Controller for log - * - * @module app/overview - * @exports logController - * @name logController - * @version 0.1.0 - */ - -window.angular && (function (angular) { - 'use strict'; - - angular - .module('app.overview') - .controller('sensorsController', [ - '$scope', - '$log', - '$window', - 'APIUtils', - 'dataService', - function($scope, $log, $window, APIUtils, dataService, userModel){ - $scope.dataService = dataService; - - $scope.dropdown_selected = false; - - $scope.$log = $log; - $scope.message = 'Hello World!'; - } - ] - ); - -})(angular); diff --git a/app/overview/controllers/sensors-overview-controller.js b/app/overview/controllers/sensors-overview-controller.js deleted file mode 100644 index ecb4ec1..0000000 --- a/app/overview/controllers/sensors-overview-controller.js +++ /dev/null @@ -1,28 +0,0 @@ -/** - * Controller for log - * - * @module app/overview - * @exports logController - * @name logController - * @version 0.1.0 - */ - -window.angular && (function (angular) { - 'use strict'; - - angular - .module('app.overview') - .controller('sensorsController', [ - '$scope', - '$window', - 'APIUtils', - 'dataService', - function($scope, $window, APIUtils, dataService, userModel){ - $scope.dataService = dataService; - - $scope.dropdown_selected = false; - } - ] - ); - -})(angular); diff --git a/app/overview/controllers/sensors-overview.html b/app/overview/controllers/sensors-overview.html deleted file mode 100644 index 882fcd9..0000000 --- a/app/overview/controllers/sensors-overview.html +++ /dev/null @@ -1,442 +0,0 @@ -<div id="sensors"> - <div class="row column"> - <h1>Sensors</h1> - </div> - <section class="row column"> - <div class="page-header"> - <h2 class="inline h4">Sensors present in the system</h2> - - </div> - </section> - <!-- Filters --> - <section class="row column"> - <!-- filters --> - <div class="event-log__filters"> - <!-- severity filter --> - <div class="dropdown__wrapper"> - <button class="dropdown__button" ng-click="severityFilter = severityFilter == true ? false : true;" - ng-class="{'active' : severityFilter}">All Severity - </button> - <ul class="dropdown__list multi-select inline" ng-show="severityFilter"> - <li> - <button>All severity (999)</button> - </li> - <li ng-click="dropdown_selectedHigh = !dropdown_selectedHigh; filterHigh = !filterHigh " - ng-class="{'active' : dropdown_selectedHigh, 'active' : filterHigh}"> - <button>High severity (999)</button> - </li> - <li ng-click="dropdown_selectedMed = !dropdown_selectedMed; filterMed = !filterMed" - ng-class="{'active' : dropdown_selectedMed, 'active' : filterMed}"> - <button>Medium severity (999)</button> - </li> - <li ng-click="dropdown_selectedLow = !dropdown_selectedLow; filterLow = !filterLow" - ng-class="{'active' : dropdown_selectedLow, 'active' : filterLow}"> - <button>Low severity (999)</button> - </li> - </ul> - </div> - <!-- date range --> - <div class="dropdown__wrapper"> - <button class="dropdown__button" ng-click="dateFilter = dateFilter == true ? false : true;" - ng-class="{'active' : dateFilter}">Date Range - </button> - <div class="dropdown__list dropdown__date row" ng-show="dateFilter"> - <div class="column small-6"> - <label>Start Date</label> - <input type="date"/> - </div> - <div class="column small-6"> - <label>End Date</label> - <input type="date"/> - </div> - </div> - </div> - <!-- Status filter --> - <div class="dropdown__wrapper"> - <button class="dropdown__button" ng-click="statusFilter = statusFilter == true ? false : true;" - ng-class="{'active' : statusFilter}">Status - </button> - <ul class="dropdown__list multi-select inline" ng-show="statusFilter"> - <li> - <button>All status (999)</button> - </li> - <li ng-click="dropdown_selectedResolved = !dropdown_selectedResolved; filterResolved = !filterResolved" - ng-class="{'active' : dropdown_selectedResolved, 'active' : filterResolved}"> - <button>Resolved issues (999)</button> - </li> - <li ng-click="dropdown_selectedUnresolved = !dropdown_selectedUnresolved; filterUnresolved = !filterUnresolved" - ng-class="{'active' : dropdown_selectedUnresolved, 'active' : filterUnresolved}"> - <button>Unresolved issues (999)</button> - </li> - </ul> - </div> - </div> - <!-- search --> - <div class="content__search"> - <label for="event__search">Event Log Search</label> - <input id="content__search-input" type="text" placeholder="Filter issues"/> - <input id="event__search-submit" type="submit" class="btn btn-secondary" value="Submit"/> - <div class="event__search-tag-wrapper row" - ng-show="filterUnresolved || filterResolved || filterHigh || filterMed || filterLow"> - <div class="column small-2 large-1 no-padding"> - <p class="inline label tag-filter-label">Filtered by: </p> - </div> - <div class="column small-10 large-11 "> - <button class="tag custom">Custom Tag</button> - <button class="tag event__high" ng-click="filterHigh = !filterHigh" ng-show="filterHigh">High - priority - </button> - <button class="tag event__medium" ng-click="filterMed = !filterMed" ng-show="filterMed">Medium - priority - </button> - <button class="tag event__low" ng-click="filterLow = !filterLow" ng-show="filterLow">Low priority - </button> - <button class="tag event__resolved" ng-click="filterUnresolved = !filterUnresolved" - ng-show="filterUnresolved">Unresolved issues - </button> - <button class="tag event__resolved" ng-click="filterResolved = !filterResolved" - ng-show="filterResolved">Resolved issues - </button> - </div> - </div> - </div> - </section> <!-- end filter --> - <section id="event-log__events" class="row column"> - <div id="header__actions-bar" class="row "> - <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"/> - <div class="control__indicator"></div> - </label> - </div> - <div class="column small-11 large-11 end col-logged-events"> - <!-- top bar confirmation - ADD ACTIVE CLASS TO DISPLAY--> - <div class="inline__confirm event__confirm" ng-class="{active: confirm}"> - <div class="inline__confirm-message"> - <p class="h3"><i></i>Are you sure you want to <strong class="ng-binding">delete 9 logs</strong>? - </p> - </div> - <div class="inline__confirm-buttons"> - <button class="btn-primary" ng-click="accept()">Yes</button> - <button class="btn-primary" ng-click="cancel()">No</button> - </div> - </div> - <p class="inline"><span class="event__select-count">999</span> Events are logged</p> - <!-- when logs are selected, this text changes to show how many logs are checked --> - <div class="event__actions"> - <button class="inline btn-delete" ng-show="event || all" ng-click="confirm= ! confirm"> - <img class="event__icon" src="assets/images/icon-trashcan.svg" alt="">Delete - </button> - <button class="inline btn-resolve" ng-show="event || all"> - <img class="event__icon" src="assets/images/icon-checklist.svg" alt="">Mark as resolved - </button> - <button class="inline btn-export">Export</button> - </div> - </div> - </div> - <!-- EVENT --> - <div class="row column accord-row" - ng-class="{'active': event__metadatarow, 'selected': event__selected}"> - <div class="row"> - <div class="inline__confirm" ng-class="{active: eventConfirm}"> - <div class="inline__confirm-message"> - <p class="h3"><i></i>Are you sure you want to <strong class="ng-binding">delete this - event</strong>?</p> - </div> - <div class="inline__confirm-buttons"> - <button class="btn-primary" ng-click="accept()">Yes</button> - <button class="btn-primary" ng-click="cancel()">No</button> - </div> - </div> - <div class="column small-1 large-2 event-log__col-check"> - <label class="control-check"> - <input type="checkbox" name="event__check" ng-click="event__selected= ! event__selected" - ng-model="event" ng-checked="all"/> - <div class="control__indicator"></div> - </label> - </div> - <div class="column small-9 large-9 event-log__event-info" - ng-click="event__metadatarow = ! event__metadatarow"> - <p class="inline event__priority med-priority">Medium</p> - <p class="inline event__severity">warning</p> - <p class="inline event__description">org.open_power.Error.Host.Event.Event</p> - <div> - <p class="inline event__id">#00997</p> - <p class="inline event__timestamp">03/09/2017 21:00:26 EDT</p></div> - </div> - <div class="column small-1 large-1"> - <button class="accord-trigger" ng-class="{'active': event__metadatarow}" - ng-click="event__metadatarow = ! event__metadatarow"></button> - </div> - </div> - <div class="row event__metadata-row" ng-class="{'active': event__metadatarow}"> - <div class="column small-1 large-1 event-log__col-check"> </div> - <div class="column small-11 large-11 end"> - <div class="event__metadata">ESEL=00 00 df 00 00 00 00 20 00 04 12 01 6f aa 00 00 50 48 00 30 01 00 - 17 00 00 00 00 04 31 71 56 4c 00 00 00 04 31 73 df b2 42 00 00 07 00 00 00 00 00 00 00 00 00 00 - 00 00 90 00 00 28 90 00 00 28 55 48 00 18 01 00 17 00 8a 03 40 00 00 00 00 00 ff ff 00 00 00 00 - 00 00 50 53 00 50 01 01 00 00 02 00 00 09 17 0e 00 48 00 00 00 e0 00 00 0a 00 00 00 00 00 00 20 - 00 00 00 05 00 01 00 2d 00 04 00 00 00 00 00 00 00 00 42 43 38 41 31 37 30 45 20 20 20 20 20 20 - 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 55 44 00 1c 01 06 01 00 02 54 41 4b 00 00 - 00 06 00 00 00 55 00 03 b6 94 00 00 00 00 55 44 00 4c 01 02 01 00 ee ee ee ee 54 61 72 67 65 74 - 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 05 00 01 00 00 00 03 00 00 00 05 00 00 - 00 14 0f 7a bb 7c 23 01 00 02 00 05 01 0b 5a fc d7 13 01 00 02 00 05 01 00 00 55 44 00 30 01 03 - 01 00 00 00 00 00 00 03 f3 54 00 00 00 00 00 03 b6 94 00 00 00 00 40 03 dd 68 00 00 00 00 40 03 - ba 48 00 00 00 00 00 00 25 80 55 44 00 38 01 01 01 00 48 6f 73 74 62 6f 6f 74 20 42 75 69 6c 64 - 20 49 44 3a 20 68 6f 73 74 62 6f 6f 74 2d 38 36 62 61 65 31 63 2f 68 62 69 63 6f 72 65 2e 62 69 - 6e 00 00 00 df 00 00 00 00 20 00 04 12 01 6f aa 00 00 50 48 00 30 01 00 17 00 00 00 00 04 31 71 - 56 4c 00 00 00 04 31 73 df b2 42 00 00 07 00 00 00 00 00 00 00 00 00 00 00 00 90 00 00 28 90 00 - 00 28 55 48 00 18 01 00 17 00 8a 03 40 00 00 00 00 00 ff ff 00 00 00 00 00 00 50 53 00 50 01 01 - 00 00 02 00 00 09 17 0e 00 48 00 00 00 e0 00 00 0a 00 00 00 00 00 00 20 00 00 00 05 00 01 00 2d - 00 04 00 00 00 00 00 00 00 00 42 43 38 41 31 37 30 45 20 20 20 20 20 20 20 20 20 20 20 20 20 20 - 20 20 20 20 20 20 20 20 20 20 55 44 00 1c 01 06 01 00 02 54 41 4b 00 00 00 06 00 00 00 55 00 03 - b6 94 00 00 00 00 55 44 00 4c 01 02 01 00 ee ee ee ee 54 61 72 67 65 74 00 00 00 00 00 00 00 00 - 00 00 00 00 00 00 00 00 00 00 00 05 00 01 00 00 00 03 00 00 00 05 00 00 00 14 0f 7a bb 7c 23 01 - 00 02 00 05 01 0b 5a fc d7 13 01 00 02 00 05 01 00 00 55 44 00 30 01 03 01 00 00 00 00 00 00 03 - f3 54 00 00 00 00 00 03 b6 94 00 00 00 00 40 03 dd 68 00 00 00 00 40 03 ba 48 00 00 00 00 00 00 - 25 80 55 44 00 38 01 01 01 00 48 6f 73 74 62 6f 6f 74 20 42 75 69 6c 64 20 49 44 3a 20 68 6f 73 - 74 62 6f 6f 74 2d 38 36 62 61 65 31 63 2f 68 62 69 63 6f 72 65 2e 62 69 6e 00 00 df 00 00 00 00 - 20 00 04 12 01 6f aa 00 00 50 48 00 30 01 00 17 00 00 00 00 04 31 71 56 4c 00 00 00 04 31 73 df - b2 42 00 00 07 00 00 00 00 00 00 00 00 00 00 00 00 90 00 00 28 90 00 00 28 55 48 00 18 01 00 17 - 00 8a 03 40 00 00 00 00 00 ff ff 00 00 00 00 00 00 50 53 00 50 01 01 00 00 02 00 00 09 17 0e 00 - 48 00 00 00 e0 00 00 0a 00 00 00 00 00 00 20 00 00 00 05 00 01 00 2d 00 04 00 00 00 00 00 00 00 - 00 42 43 38 41 31 37 30 45 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 - 20 55 44 00 1c 01 06 01 00 02 54 41 4b 00 00 00 06 00 00 00 55 00 03 b6 94 00 00 00 00 55 44 00 - 4c 01 02 01 00 ee ee ee ee 54 61 72 67 65 74 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 - 00 00 05 00 01 00 00 00 03 00 00 00 05 00 00 00 14 0f 7a bb 7c 23 01 00 02 00 05 01 0b 5a fc d7 - 13 01 00 02 00 05 01 00 00 55 44 00 30 01 03 01 00 00 00 00 00 00 03 f3 54 00 00 00 00 00 03 b6 - 94 00 00 00 00 40 03 dd 68 00 00 00 00 40 03 ba 48 00 00 00 00 00 00 25 80 55 44 00 38 01 01 01 - 00 48 6f 73 74 62 6f 6f 74 20 42 75 69 6c 64 20 49 44 3a 20 68 6f 73 74 62 6f 6f 74 2d 38 36 62 - 61 65 31 63 2f 68 62 69 63 6f 72 65 2e 62 69 6e 00 - </div> - <div> - <div class="event__actions"> - <button class="btn-meta-copy"><img class="event__icon" src="assets/images/icon-copy.svg" - alt="">Copy - </button> - <button class="btn-delete" ng-click="eventConfirm= ! eventConfirm"><img class="event__icon" - src="assets/images/icon-trashcan.svg" - alt=""/>Delete - </button> - <button class="btn-resolve"><img class="event__icon" src="assets/images/icon-checklist.svg" - alt="">Resolved - </button> - </div> - <div class="event__related"> - <p class="inline event__related-label">Related items:</p> - <a href="" class="event__related-item">/org/openbmc/control/chassis0/</a> - <a href="" class="event__related-item">/org/openbmc/control/power0/</a> - <a href="" class="event__related-item">/org/openbmc/control/chassis0/</a> - <a href="" class="event__related-item">/org/openbmc/control/power0/</a> - </div> - </div> - </div> - </div> - </div> - <!-- EVENT --> - <div class="row column accord-row" - ng-class="{'active': event__metadatarow_2, 'selected': event__selected_2}"> - <div class="row"> - <div class="inline__confirm" ng-class="{active: eventConfirm2}"> - <div class="inline__confirm-message"> - <p class="h3"><i></i>Are you sure you want to <strong class="ng-binding">delete this - event</strong>?</p> - </div> - <div class="inline__confirm-buttons"> - <button class="btn-primary" ng-click="accept()">Yes</button> - <button class="btn-primary" ng-click="cancel()">No</button> - </div> - </div> - <div class="column small-1 large-2 event-log__col-check"> - <label class="control-check"> - <input type="checkbox" name="events__check" ng-click="event__selected_2= ! event__selected_2" - ng-checked="all"/> - <div class="control__indicator"></div> - </label> - </div> - <div class="column small-9 large-9 event-log__event-info" - ng-click="event__metadatarow_2 = ! event__metadatarow_2"> - <p class="inline event__priority event-resolved">Resolved</p> - <p class="inline event__severity">emergency</p> - <p class="inline event__description">org.open_power.Error.Host.Event.Event</p> - <div> - <p class="inline event__id">#00996</p> - <p class="inline event__timestamp">03/09/2017 21:00:26 EDT</p></div> - </div> - <div class="column small-1 large-1"> - <button class="accord-trigger" ng-class="{'active': event__metadatarow_2}" - ng-click="event__metadatarow_2 = ! event__metadatarow_2"></button> - </div> - </div> - <div class="row event__metadata-row" ng-class="{'active': event__metadatarow_2}"> - <div class="column small-1 large-1 event-log__col-check"> </div> - <div class="column small-11 large-11 end"> - <div class="event__metadata">Curabitur aliquet quam id dui posuere blandit. Curabitur aliquet quam - id dui posuere blandit. Curabitur aliquet quam id dui posuere blandit. Proin eget tortor risus. - Quisque velit nisi, pretium ut lacinia in, elementum id enim. Pellentesque in ipsum id orci - porta dapibus. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Vestibulum - ac diam sit amet quam vehicula elementum sed sit amet dui. Curabitur arcu erat, accumsan id - imperdiet et, porttitor at sem. Nulla porttitor accumsan tincidunt.Curabitur aliquet quam id dui - posuere blandit. Curabitur aliquet quam id dui posuere blandit. Curabitur aliquet quam id dui - posuere blandit. Proin eget tortor risus. Quisque velit nisi, pretium ut lacinia in, elementum - id enim. Pellentesque in ipsum id orci porta dapibus. Praesent sapien massa, convallis a - pellentesque nec, egestas non nisi. Vestibulum ac diam sit amet quam vehicula elementum sed sit - amet dui. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Nulla porttitor - accumsan tincidunt.Curabitur aliquet quam id dui posuere blandit. Curabitur aliquet quam id dui - posuere blandit. Curabitur aliquet quam id dui posuere blandit. Proin eget tortor risus. Quisque - velit nisi, pretium ut lacinia in, elementum id enim. Pellentesque in ipsum id orci porta - dapibus. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Vestibulum ac - diam sit amet quam vehicula elementum sed sit amet dui. Curabitur arcu erat, accumsan id - imperdiet et, porttitor at sem. Nulla porttitor accumsan tincidunt.Curabitur aliquet quam id dui - posuere blandit. Curabitur aliquet quam id dui posuere blandit. Curabitur aliquet quam id dui - posuere blandit. Proin eget tortor risus. Quisque velit nisi, pretium ut lacinia in, elementum - id enim. Pellentesque in ipsum id orci porta dapibus. Praesent sapien massa, convallis a - pellentesque nec, egestas non nisi. Vestibulum ac diam sit amet quam vehicula elementum sed sit - amet dui. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Nulla porttitor - accumsan tincidunt. - </div> - <div> - <div class="event__actions"> - <button class="btn-meta-copy"><img class="event__icon" src="assets/images/icon-copy.svg" - alt="">Copy - </button> - <button class="btn-delete" ng-click="eventConfirm2= ! eventConfirm2"><img - class="event__icon" - src="assets/images/icon-trashcan.svg" - alt="">Delete - </button> - <button class="btn-resolve"><img class="event__icon" src="assets/images/icon-checklist.svg" - alt="">Resolved - </button> - </div> - <div class="event__related"> - <p class="inline event__related-label">Related items:</p> - <p class="event__related-item">Attribute-1</p> - <p class="event__related-item">Attribute-2</p> - </div> - </div> - </div> - </div> - </div> - <!-- EVENT --> - <div class="row column accord-row" ng-class="{'active': event__metadatarow_1}"> - <div class="row"> - <div class="column small-1 large-2 event-log__col-check"> - <label class="control-check"> - <input type="checkbox" name="events__check" ng-checked="all"/> - <div class="control__indicator"></div> - </label> - </div> - <div class="column small-9 large-9 event-log__event-info" - ng-click="event__metadatarow_1 = ! event__metadatarow_1"> - <p class="inline event__priority high-priority">High</p> - <p class="inline event__severity">emergency</p> - <p class="inline event__description">Vestibulum ac diam sit amet quam vehicula aliquet quam id - dui</p> - <div> - <p class="inline event__id">#00995</p> - <p class="inline event__timestamp">03/09/2017 21:00:26 EDT</p></div> - </div> - <div class="column small-1 large-1"> - <button class="accord-trigger" ng-class="{'active': event__metadatarow_1}" - ng-click="event__metadatarow_1 = ! event__metadatarow_1"></button> - </div> - </div> - <div class="row event__metadata-row" ng-class="{'active': event__metadatarow_1}"> - <div class="column small-1 large-1 event-log__col-check"> </div> - <div class="column small-11 large-11 end"> - <div class="event__metadata">Curabitur aliquet quam id dui posuere blandit. Curabitur aliquet quam - id dui posuere blandit. Curabitur aliquet quam id dui posuere blandit. Proin eget tortor risus. - Quisque velit nisi, pretium ut lacinia in, elementum id enim. Pellentesque in ipsum id orci - porta dapibus. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Vestibulum - ac diam sit amet quam vehicula elementum sed sit amet dui. Curabitur arcu erat, accumsan id - imperdiet et, porttitor at sem. Nulla porttitor accumsan tincidunt.Curabitur aliquet quam id dui - posuere blandit. Curabitur aliquet quam id dui posuere blandit. Curabitur aliquet quam id dui - posuere blandit. Proin eget tortor risus. Quisque velit nisi, pretium ut lacinia in, elementum - id enim. Pellentesque in ipsum id orci porta dapibus. Praesent sapien massa, convallis a - pellentesque nec, egestas non nisi. Vestibulum ac diam sit amet quam vehicula elementum sed sit - amet dui. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Nulla porttitor - accumsan tincidunt.Curabitur aliquet quam id dui posuere blandit. Curabitur aliquet quam id dui - posuere blandit. Curabitur aliquet quam id dui posuere blandit. Proin eget tortor risus. Quisque - velit nisi, pretium ut lacinia in, elementum id enim. Pellentesque in ipsum id orci porta - dapibus. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Vestibulum ac - diam sit amet quam vehicula elementum sed sit amet dui. Curabitur arcu erat, accumsan id - imperdiet et, porttitor at sem. Nulla porttitor accumsan tincidunt.Curabitur aliquet quam id dui - posuere blandit. Curabitur aliquet quam id dui posuere blandit. Curabitur aliquet quam id dui - posuere blandit. Proin eget tortor risus. Quisque velit nisi, pretium ut lacinia in, elementum - id enim. Pellentesque in ipsum id orci porta dapibus. Praesent sapien massa, convallis a - pellentesque nec, egestas non nisi. Vestibulum ac diam sit amet quam vehicula elementum sed sit - amet dui. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Nulla porttitor - accumsan tincidunt. - </div> - <div> - <div class="event__actions"> - <button class="btn-meta-copy"><img class="event__icon" src="assets/images/icon-copy.svg" - alt="">Copy - </button> - <button class="btn-delete"><img class="event__icon" src="assets/images/icon-trashcan.svg" - alt="">Delete - </button> - <button class="btn-resolve"><img class="event__icon" src="assets/images/icon-checklist.svg" - alt="">Resolved - </button> - </div> - <div class="event__related"> - <p class="inline event__related-label">Related items:</p> - <p class="event__related-item">Attribute-1</p> - <p class="event__related-item">Attribute-2</p> - </div> - </div> - </div> - </div> - </div> - <!-- EVENT --> - <div class="row column accord-row"> - <div class="row"> - <div class="column small-1 large-2 event-log__col-check"> - <label class="control-check"> - <input type="checkbox" name="events__check" ng-checked="all"/> - <div class="control__indicator"></div> - </label> - </div> - <div class="column small-9 large-9 event-log__event-info"> - <p class="inline event__priority low-priority">Low</p> - <p class="inline event__severity">Informational</p> - <p class="inline event__description">org.open_power.Error.Host.Event.Event</p> - <div> - <p class="inline event__id">#00994</p> - <p class="inline event__timestamp">03/09/2017 21:00:26 EDT</p></div> - </div> - <div class="column small-1 large-1"> - <button class="accord-trigger"></button> - </div> - </div> - <div class="row event__metadata-row"> - <div class="column small-1 large-1 event-log__col-check"> </div> - <div class="column small-11 large-11 end"> - <div class="event__metadata"> - </div> - <div> - <div class="event__actions"> - <button class="btn-meta-copy"><img class="event__icon" src="assets/images/icon-copy.svg" - alt="">Copy - </button> - <button class="btn-delete"><img class="event__icon" src="assets/images/icon-trashcan.svg" - alt="">Delete - </button> - <button class="btn-resolve"><img class="event__icon" src="assets/images/icon-checklist.svg" - alt="">Resolved - </button> - </div> - <div class="event__related"> - <p class="inline event__related-label">Related items:</p> - <p class="event__related-item">Attribute-1</p> - <p class="event__related-item">Attribute-2</p> - </div> - </div> - </div> - </div> - </div> - </section> - <paginate ng-include="paginate"></paginate> -</div> <!-- end event log -->
\ No newline at end of file diff --git a/app/overview/controllers/system-overview-controller.html b/app/overview/controllers/system-overview-controller.html index c3534da..384ca99 100644 --- a/app/overview/controllers/system-overview-controller.html +++ b/app/overview/controllers/system-overview-controller.html @@ -114,10 +114,8 @@ </div> <div class="row column overview__event-log event-log__events" ng-show="!logs.length"> - <div class="page-header"> - <h3 class="bold h4">High priority events (0)</h3> - <p>There are no high priority events to display at this time.</p> - </div> + <h3 class="bold h4">High priority events (0)</h3> + <p>There are no high priority events to display at this time.</p> </div> </div> <div class="column large-4 no-padding"> @@ -153,30 +151,3 @@ </div> </section> </div> -<!-- edit server name modal --> -<section class="modal" aria-hidden="true" aria-labelledby="modalTitle" aria-describedby="modalDescription" role="dialog" ng-class="{'active': edit_server_name}"> - <div class="modal__upload" role="document"> - <div class="screen-reader-offscreen modal-description">Edit server name</div><!-- accessibility only; used for screen readers --> - <div class="page-header "> - <h1 class="modal-title h4"><span class="icon icon__info"><svg xmlns="http://www.w3.org/2000/svg" - viewBox="0 0 32 32"><path - d="M18 14h-6v2h1v6h-2v2h8v-2h-2z"/><circle cx="16" cy="10" r="2"/><path - d="M16 2C8.269 2 2 8.269 2 16s6.269 14 14 14 14-6.269 14-14S23.731 2 16 2zm0 26C9.383 28 4 22.617 4 16S9.383 4 16 4s12 5.383 12 12-5.383 12-12 12z"/></svg></span> - Edit server name - </h1> - </div> - <div class="modal__content"> - <p>The server name is displayed in the header and can contain any characters up to a total of 64</p> - <form> - <label for="editServerName" class="hide"></label> - <input id="editServerName" class="modal__edit-server-name" maxlength="64" type="text" ng-model="char_count" ng-trim="false"> - <p class="modal__char-count">{{64 - char_count.length}}/64</p> - </form> - </div> - <div class="modal__button-wrapper"> - <button class="inline btn-secondary" ng-click="edit_server_name= false;">Cancel</button> - <button class="inline btn-primary" ng-click="">Save</button> - </div> - </div> -</section> -<div class="modal-overlay" tabindex="-1" ng-class="{'active': edit_server_name}"></div>
\ No newline at end of file diff --git a/app/overview/styles/sensors.scss b/app/overview/styles/sensors.scss deleted file mode 100644 index ee101c0..0000000 --- a/app/overview/styles/sensors.scss +++ /dev/null @@ -1,133 +0,0 @@ -// Event Log SCSS -#sensors { - #sensors__detail { - display: block; - margin-top: 1.6em; - border-top: 1px solid $lightgrey; - position: relative; - overflow: hidden; - } -} - -//end sensors - - - -#sensor__details { - display: block; - margin-top: 1.6em; - border-top: 1px solid $lightgrey; - position: relative; - overflow: hidden; - - - //Export log - .btn-export { - text-transform: capitalize; - color: $black; - font-size: .9em; - font-weight: 700; - position: relative; - padding: 0 0 1em 2em; - &:hover { - text-decoration: underline; - } - } - .btn-export { - margin-top: 7px; - } - .btn-export:before { - content: '\21E5'; - position: absolute; - font-size: 1.7em; - vertical-align: middle; - transform: rotate(90deg); - display: inline-block; - left: 2px; - top: -5px; - } - - .sensor__info { - padding-top: 10px; - - &:hover { - cursor: pointer; - } - } - - .accord-row { - .priority-tag { - margin: 0 2em 0 1em; - } - } - - //Sensor info - .sensor__title { - font-weight: 400; - font-size: 1.3em; - } - .sensors__description { - font-weight: 400; - } - - //Event ID - .sensor__reading { - @include fontCourierBold; - font-size: 1.2em; - color: $darkgrey; - float: left; - margin-left: 1em; - @media (min-width: 950px) { - float: right; - } - } - - // Event metadata row - .sensors__metadata-row { - max-height: 0; - overflow: hidden; - -webkit-transition: 0.5s linear max-height; - transition: 0.5s linear max-height; - padding: 0 1em; - &.active { - max-height: 1000px; //max-height used to allow flexible height of content and still allow transition - @include mediaQuery(small) { - max-height: 1000px; - } - @include mediaQuery(medium) { - max-height: 1000px; - } - } - } - - - //Event Related Items - .sensors__related { - width: 100%; - } - .sensors__related-label { - font-weight: 700; - margin-right: 1.2em; - padding-top: .3em; - } - - .sensors__related-item { - margin-right: 1em; - padding-top: .3em; - display: inline-block; - float: left; - clear: both; - } - - .sensors__icon { - width: 20px; - height: 20px; - font-weight: normal; - margin-right: .5em; - margin-top: -3px; - display: inline-block; - } - -} - -//end sensors diff --git a/app/server-health/controllers/inventory-overview-controller.html b/app/server-health/controllers/inventory-overview-controller.html index 9af8166..597a664 100644 --- a/app/server-health/controllers/inventory-overview-controller.html +++ b/app/server-health/controllers/inventory-overview-controller.html @@ -8,7 +8,7 @@ </div> </div> - <section class="row column" aria-label="hardware filtering"> + <section class="row column"> <!-- search --> <p class="content-label" aria-label="hardware filter">Filter hardware components</p> <div class="content__search"> @@ -18,10 +18,12 @@ <button class="clear-input" ng-click="customSearch = ''">✕</button> <input id="content__search-submit" type="submit" class="btn btn-primary content__search-submit" value="Filter" ng-click="doSearchOnClick()"/> </div> + </div> + </section> <!-- end search --> - <section id="inventory-categories" class="row column" aria-label="hardware list"> + <section id="inventory-categories" class="row column"> <div class="row column header-row"> <div class="column large-12 header__actions-bar"> <div class="inline inventory__heading inventory__device-col">Hardware</div> @@ -33,7 +35,7 @@ <p class="inline inventory__device-col">{{inventory.title}}</p> <p class="inline inventory__function-col"></p> <p class="inline inventory__assoc-event"><!--<a href="#/server-health/event-log">View 3 events</a>--></p> - <span class="accord-trigger button float-right" ng-class="{'active': inventory.expanded}"></span> + <button class="accord-trigger float-right" ng-class="{'active': inventory.expanded}"></button> <div class="row inventory__metadata" ng-class="{'active': inventory.expanded}" ng-click="$event.stopPropagation()"> <div class="column large-9 no-padding"> <div ng-repeat="item in inventory.items" class="inline inventory__metadata-block"> @@ -43,6 +45,7 @@ </div> <div class="column large-3 no-padding" ng-show="inventory.sub_components.length"> <div class="inventory__metadata-scroll show-scroll"> <!-- If content overflows; add 'show-scroll' class via JS to force visible scrollbar in webkit browsers--> + <div class="content-label">Subcomponents</div> <div ng-repeat="sub_component in inventory.sub_components" class="inline inventory__metadata-block"> <p class="courier-bold">{{sub_component.title}}<span class="icon icon__warning" ng-if="sub_component.Present"></span></p> </div> diff --git a/app/server-health/controllers/log-controller.html b/app/server-health/controllers/log-controller.html index fce664d..3db7bd9 100644 --- a/app/server-health/controllers/log-controller.html +++ b/app/server-health/controllers/log-controller.html @@ -3,7 +3,7 @@ <div class="row column"> <h1>Event log</h1> </div> - <section class="row column" aria-label="page header"> + <section class="row column"> <div class="page-header"> <h2 class="inline h4">All events from the BMC</h2> <div class="event-log__timezone inline float-right"> @@ -22,26 +22,26 @@ </div> </section> <!-- Filters --> - <section class="row column" aria-label="event log search"> + <section class="row column"> <!-- search --> <log-search-control></log-search-control> <!-- filters --> <log-filter></log-filter> </section> <!-- end filter --> - <section id="event-log__events" class="row column" aria-label="event log events"> + <section id="event-log__events" class="row column"> <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="(logs|filter:{selected: true}).length == logs.length"/> - <span class="control__indicator accessible-text">select all log events</span> + <span class="control__indicator"></span> </label> </div> <div class="column small-11 end col-logged-events"> <!-- top bar confirmation - ADD ACTIVE CLASS TO DISPLAY--> <div class="inline__confirm event__confirm" ng-class="{active: confirm}"> <div class="inline__confirm-message"> - <p class="h3"><i></i>Are you sure you want to <strong class="ng-binding">delete {{selectedEvents.length}} events</strong>? + <p class="h3"><i></i>Are you sure you want to <strong class="ng-binding">delete {{selectedEvents.length}} logs</strong>? </p> </div> <div class="inline__confirm-buttons"> @@ -57,7 +57,7 @@ <img class="event__icon" src="assets/images/icon-trashcan-white.svg" alt="">Delete </button> <button class="inline btn-resolve" ng-class="{'disabled': ((selectedEvents|unResolvedCount) == 0)}" ng-show="selectedEvents.length || all" ng-click="resolve()" ng-disabled="(selectedEvents|unResolvedCount) == 0"> - <img class="event__icon" src="assets/images/icon-check-white.svg" alt="">Mark as resolved + <img class="event__icon" src="assets/images/icon-checklist-white.svg" alt="">Mark as resolved </button> <a ng-href="data:text/json;charset=utf-8,{{export_data}}" class="inline btn-export" download="{{export_name}}" ng-show="selectedEvents.length || all">Export</a> </div> @@ -70,4 +70,4 @@ </log-event> </section> <dir-pagination-controls template-url="common/directives/dirPagination.tpl.html"></dir-pagination-controls> -</div> <!-- end event log -->
\ No newline at end of file +</div> <!-- end event log --> diff --git a/app/server-health/controllers/sensors-overview-controller.html b/app/server-health/controllers/sensors-overview-controller.html index 8ee8d8a..95631e8 100644 --- a/app/server-health/controllers/sensors-overview-controller.html +++ b/app/server-health/controllers/sensors-overview-controller.html @@ -19,6 +19,7 @@ <button class="clear-input" ng-click="customSearch = ''">✕</button> <input id="content__search-submit" type="submit" class="btn btn-primary content__search-submit" value="Filter" ng-click="doSearchOnClick()"/> </div> + </div> <div class="toggle-filter"> <p class="content-label">FILTER BY SEVERITY</p> |
