diff options
| author | Simon Rettberg | 2017-05-10 11:03:40 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2017-05-10 11:03:40 +0200 |
| commit | e7fb2eafc44d0b5eab79b13432d3e7c4227fd83e (patch) | |
| tree | 592fe695572d7e7d32b5980d7d5e222bf9989c23 /modules-available/webinterface | |
| parent | [statistics] Hide "add beamer" for screens with no EDID (diff) | |
| download | slx-admin-e7fb2eafc44d0b5eab79b13432d3e7c4227fd83e.tar.gz slx-admin-e7fb2eafc44d0b5eab79b13432d3e7c4227fd83e.tar.xz slx-admin-e7fb2eafc44d0b5eab79b13432d3e7c4227fd83e.zip | |
[weninterface] Improve color list a bit
Diffstat (limited to 'modules-available/webinterface')
| -rw-r--r-- | modules-available/webinterface/page.inc.php | 4 | ||||
| -rw-r--r-- | modules-available/webinterface/templates/customization.html | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules-available/webinterface/page.inc.php b/modules-available/webinterface/page.inc.php index e5a25834..e576807e 100644 --- a/modules-available/webinterface/page.inc.php +++ b/modules-available/webinterface/page.inc.php @@ -133,8 +133,8 @@ class Page_WebInterface extends Page $data['selected_hide'] = 'checked'; Render::addTemplate('passwords', $data); $data = array('prefix' => Property::get('page-title-prefix')); - $data['colors'] = array_map(function ($i) { return array('color' => $i); }, - array('', 'red', 'green', 'blue', 'black', 'white', 'orange', 'gray', 'lime', 'magenta', 'yellow')); + $data['colors'] = array_map(function ($i) { return array('color' => $i ? '#' . $i : '', 'text' => Render::readableColor($i)); }, + array('', 'f00', '0f0', '00f', 'ff0', 'f0f', '0ff', 'fff', '000', 'f90', '09f', '90f', 'f09', '9f0')); $color = Property::get('logo-background'); foreach ($data['colors'] as &$c) { if ($c['color'] === $color) { diff --git a/modules-available/webinterface/templates/customization.html b/modules-available/webinterface/templates/customization.html index 447404a6..7949f95b 100644 --- a/modules-available/webinterface/templates/customization.html +++ b/modules-available/webinterface/templates/customization.html @@ -17,7 +17,7 @@ {{lang_logoBackground}} <select class="form-control" name="bgcolor"> {{#colors}} - <option style="color:{{color}}" {{selected}}>{{color}}</option> + <option style="color:{{text}};background:{{color}}" {{selected}}>{{color}}</option> {{/colors}} </select> </label> |