diff options
| author | Simon Rettberg | 2019-03-19 14:31:33 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-03-19 14:31:33 +0100 |
| commit | 7d839511c1d51cd31a7a6025839d400c43dd0d3c (patch) | |
| tree | 33b8156b44e536b47f8764287564d80b4f636552 | |
| parent | [statistics] Feature: BIOS update info (diff) | |
| download | slx-admin-7d839511c1d51cd31a7a6025839d400c43dd0d3c.tar.gz slx-admin-7d839511c1d51cd31a7a6025839d400c43dd0d3c.tar.xz slx-admin-7d839511c1d51cd31a7a6025839d400c43dd0d3c.zip | |
[statistics] Show error message if BIOS info fetching fails
| -rw-r--r-- | modules-available/statistics/style.css | 8 | ||||
| -rw-r--r-- | modules-available/statistics/templates/machine-bios-update.html | 7 | ||||
| -rw-r--r-- | modules-available/statistics/templates/machine-main.html | 4 |
3 files changed, 16 insertions, 3 deletions
diff --git a/modules-available/statistics/style.css b/modules-available/statistics/style.css index c48275ba..dffe973b 100644 --- a/modules-available/statistics/style.css +++ b/modules-available/statistics/style.css @@ -40,4 +40,12 @@ white-space: nowrap; z-index: 1000; text-shadow: #fff 1px 1px; +} + +.warn { + background: #F0AD4E; + font-size: 75%; + border-radius: 3px; + color: #fff; + padding: 1px 3px; }
\ No newline at end of file diff --git a/modules-available/statistics/templates/machine-bios-update.html b/modules-available/statistics/templates/machine-bios-update.html index 2e8a8908..96e64850 100644 --- a/modules-available/statistics/templates/machine-bios-update.html +++ b/modules-available/statistics/templates/machine-bios-update.html @@ -1,3 +1,7 @@ +{{#error}} + <div class="warn" style="white-space: normal"><b>{{lang_biosUpdate}}</b>: {{error}}</div> +{{/error}} +{{^error}} <div><span class="btn btn-{{class}} btn-sm" data-toggle="modal" data-target="#bios-modal"> {{lang_biosUpdate}} » </span></div> @@ -23,4 +27,5 @@ </div> </div> </div> -</div>
\ No newline at end of file +</div> +{{/error}}
\ No newline at end of file diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html index e040a6c5..e8e67065 100644 --- a/modules-available/statistics/templates/machine-main.html +++ b/modules-available/statistics/templates/machine-main.html @@ -133,8 +133,8 @@ <div>{{lang_biosVersion}}</div> <div>{{lang_biosDate}}</div> </td> - <td> - <div id="bios-panel" class="pull-right">{{{bioshtml}}}</div> + <td class="text-nowrap"> + <div id="bios-panel" class="pull-right"style="max-width:30%">{{{bioshtml}}}</div> <div>{{biosversion}} (<b>{{biosrevision}}</b>)</div> <div>{{biosdate}}</div> </td> |