diff options
| author | Simon Rettberg | 2016-09-07 16:32:06 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-09-07 16:32:06 +0200 |
| commit | d22fd667d09c2c159daed9d7f1ba4f705fec9c74 (patch) | |
| tree | ac76f4e0c2219b569ce959f690d4a512880c1676 /modules-available/sysconfig/templates | |
| parent | [roomplanner] Sanity checks/fixups when saving computers, more user feedback,... (diff) | |
| download | slx-admin-d22fd667d09c2c159daed9d7f1ba4f705fec9c74.tar.gz slx-admin-d22fd667d09c2c159daed9d7f1ba4f705fec9c74.tar.xz slx-admin-d22fd667d09c2c159daed9d7f1ba4f705fec9c74.zip | |
[sysconfig] Improve design, hide more controls in location-specific view, get rid of JS hack for ellipsis in tables (by adding a HTML/CSS hack for it :))
Diffstat (limited to 'modules-available/sysconfig/templates')
4 files changed, 15 insertions, 11 deletions
diff --git a/modules-available/sysconfig/templates/cfg-finish.html b/modules-available/sysconfig/templates/cfg-finish.html index 91532abd..c9622db0 100644 --- a/modules-available/sysconfig/templates/cfg-finish.html +++ b/modules-available/sysconfig/templates/cfg-finish.html @@ -7,7 +7,7 @@ <input type="hidden" name="action" value="config"> <input type="hidden" name="activate" value="{{configid}}"> <div class="btn-group"> - <button type="submit" class="btn btn-primary">{{lang_configurationActive}}</button> - <a href="?do=SysConfig" class="btn btn-default"> {{lang_configurationActivateLater}}</a> + <button type="submit" class="btn btn-primary">{{lang_activateGlobally}}</button> + <a href="?do=SysConfig" class="btn btn-default">{{lang_backToSysconfig}}</a> </div> </form> diff --git a/modules-available/sysconfig/templates/list-configs.html b/modules-available/sysconfig/templates/list-configs.html index 987becfd..222ac43c 100644 --- a/modules-available/sysconfig/templates/list-configs.html +++ b/modules-available/sysconfig/templates/list-configs.html @@ -18,11 +18,11 @@ <input type="hidden" name="token" value="{{token}}"> <input type="hidden" name="action" value="config"> <input type="hidden" name="locationid" value="{{locationid}}"> - <table id="conftable" class="slx-table" style="max-width:100px !important"> + <table id="conftable" class="slx-table" style="width:100%"> {{#configs}} <tr> - <td data-modlist="{{modlist}}" class="slx-pointer slx-width-ignore text-nowrap"onclick="showmod(this, 'bold')" onmouseover="showmod(this, 'fade')" onmouseout="showmod(this, 'reset')" width="100%"> - <div class="slx-dyn-ellipsis">{{config}}</div> + <td data-modlist="{{modlist}}" class="slx-pointer" onclick="showmod(this, 'bold')" onmouseover="showmod(this, 'fade')" onmouseout="showmod(this, 'reset')" width="100%"> + <table class="slx-ellipsis"><tr><td>{{config}}</td></tr></table> </td> <td> {{^current}} @@ -46,6 +46,7 @@ {{/locationCount}} </td> <td class="text-nowrap"> + {{^locationid}} <button {{#needrebuild}} class="refconf btn btn-primary btn-xs" @@ -54,19 +55,22 @@ class="refconf btn btn-default btn-xs" {{/needrebuild}} name="rebuild" value="{{configid}}" title="{{lang_rebuild}}"><span class="glyphicon glyphicon-refresh"></span></button> + {{/locationid}} </td> <td class="text-nowrap"> + {{^locationid}} <a class="btn btn-success btn-xs" href="?do=SysConfig&action=addconfig&edit={{configid}}" title="{{lang_edit}}"><span class="glyphicon glyphicon-edit"></span></a> <button class="btn btn-danger btn-xs" name="del" value="{{configid}}" title="{{lang_delete}}"><span class="glyphicon glyphicon-trash"></span></button> + {{/locationid}} </td> </tr> {{/configs}} {{#locationid}} <tr> - <td><i>Vererben von übergeordnetem Raum</i></td> + <td><table class="slx-ellipsis"><tr><td><i>{{lang_inheritFromParentLoc}}</i></td></tr></table></td> <td> {{^inheritConfig}} - <button class="btn btn-primary btn-xs" name="activate" value="0"> + <button class="btn btn-info btn-xs" name="activate" value="0"> <span class="glyphicon glyphicon-flag"></span> {{lang_activate}} </button> @@ -95,9 +99,11 @@ {{/configs}} </form> </div> + {{^locationid}} <div class="panel-footer"> <a class="btn btn-primary" href="?do=SysConfig&action=addconfig">{{lang_newConfiguration}}</a> </div> + {{/locationid}} </div> <div class="modal fade" id="help-config" tabindex="-1" role="dialog"> diff --git a/modules-available/sysconfig/templates/list-legend.html b/modules-available/sysconfig/templates/list-legend.html index 090ef526..4a46a6a0 100644 --- a/modules-available/sysconfig/templates/list-legend.html +++ b/modules-available/sysconfig/templates/list-legend.html @@ -36,8 +36,6 @@ <script type="application/javascript"><!-- document.addEventListener("DOMContentLoaded", function () { - forceTable($("#modtable")); - forceTable($("#conftable")); checkBuildStatus(); $('[data-toggle="tooltip"]').tooltip(); }, false); diff --git a/modules-available/sysconfig/templates/list-modules.html b/modules-available/sysconfig/templates/list-modules.html index 29726c5d..585b3522 100644 --- a/modules-available/sysconfig/templates/list-modules.html +++ b/modules-available/sysconfig/templates/list-modules.html @@ -8,11 +8,11 @@ <form method="post" action="?do=SysConfig"> <input type="hidden" name="token" value="{{token}}"> <input type="hidden" name="action" value="module"> - <table id="modtable" class="slx-table" style="max-width:100px !important"> + <table id="modtable" class="slx-table" style="width:100%"> {{#modules}} <tr> <td class="badge text-nowrap">{{moduleType}}</td> - <td data-id="{{id}}" class="modrow slx-width-ignore text-nowrap" width="100%"><div class="slx-dyn-ellipsis">{{title}}</div></td> + <td data-id="{{id}}" class="modrow" width="100%"><table class="slx-ellipsis"><tr><td>{{title}}</td></tr></table></td> <td class="text-nowrap"> {{#allowDownload}} <button class="btn btn-default btn-xs" name="list" value="{{id}}" title="{{lang_show}}"><span class="glyphicon glyphicon-eye-open"></span></button> |