diff options
| author | Simon Rettberg | 2019-03-26 12:07:42 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-03-26 12:07:42 +0100 |
| commit | f53e563e0e671364963513579c7b4aaea5e0bbb1 (patch) | |
| tree | 671dcf281f4cac276c6c20eaa17232a486703c28 /modules-available | |
| parent | [inc/Dashboard] Add feature to collapse sections in sidebar mode (diff) | |
| download | slx-admin-f53e563e0e671364963513579c7b4aaea5e0bbb1.tar.gz slx-admin-f53e563e0e671364963513579c7b4aaea5e0bbb1.tar.xz slx-admin-f53e563e0e671364963513579c7b4aaea5e0bbb1.zip | |
Use collapse mode for translations, runmode, rebootcontrol
Also shuffle around modules.
Diffstat (limited to 'modules-available')
| -rw-r--r-- | modules-available/locationinfo/config.json | 2 | ||||
| -rw-r--r-- | modules-available/locationinfo/templates/page-panels.html | 4 | ||||
| -rw-r--r-- | modules-available/main/category-icons.json | 2 | ||||
| -rw-r--r-- | modules-available/main/templates/main-menu.html | 6 | ||||
| -rw-r--r-- | modules-available/rebootcontrol/config.json | 3 | ||||
| -rw-r--r-- | modules-available/runmode/config.json | 2 | ||||
| -rw-r--r-- | modules-available/translation/config.json | 3 |
7 files changed, 13 insertions, 9 deletions
diff --git a/modules-available/locationinfo/config.json b/modules-available/locationinfo/config.json index 837acfcf..15298ea1 100644 --- a/modules-available/locationinfo/config.json +++ b/modules-available/locationinfo/config.json @@ -1,5 +1,5 @@ { - "category": "main.beta", + "category": "main.content", "dependencies": [ "js_jqueryui", "bootstrap_timepicker", diff --git a/modules-available/locationinfo/templates/page-panels.html b/modules-available/locationinfo/templates/page-panels.html index 215f5df8..3c8ce67c 100644 --- a/modules-available/locationinfo/templates/page-panels.html +++ b/modules-available/locationinfo/templates/page-panels.html @@ -41,13 +41,13 @@ <span class="badge">{{assignedMachineCount}}</span> </td> {{/hasRunmode}} - <td class="text-center" style="vertical-align: middle"> + <td class="text-center"> <a class="btn btn-default btn-xs {{edit_disabled}}" href="?do=locationinfo&show=edit-panel&uuid={{paneluuid}}"> <span class="glyphicon glyphicon-edit"></span> </a> </td> - <td class="text-center" style="vertical-align: middle"> + <td class="text-center"> <button type="submit" name="uuid" value="{{paneluuid}}" class="btn btn-xs btn-danger" data-confirm="#confirm-delete" data-title="{{panelname}}" {{edit_disabled}}> <span class="glyphicon glyphicon-trash"></span> diff --git a/modules-available/main/category-icons.json b/modules-available/main/category-icons.json index f790089e..a62ac025 100644 --- a/modules-available/main/category-icons.json +++ b/modules-available/main/category-icons.json @@ -5,5 +5,5 @@ "settings-server":"cog", "status":"tasks", "users":"user", - "beta":"flash" + "etc":"option-vertical" } diff --git a/modules-available/main/templates/main-menu.html b/modules-available/main/templates/main-menu.html index 92422425..35b7f57f 100644 --- a/modules-available/main/templates/main-menu.html +++ b/modules-available/main/templates/main-menu.html @@ -27,8 +27,8 @@ <ul class="nav navbar-nav"> {{#categories}} <li class="dropdown"> - <a href="#" class="dropdown-toggle slx-nopointer" data-toggle="dropdown"><span class="sidebar-visible-inline {{icon}}"></span> {{displayName}}<b class="caret sidebar-hide"></b></a> - <ul class="dropdown-menu sidebar-visible-block" role="menu"> + <a href="#" class="dropdown-toggle {{^collapse}}slx-nopointer{{/collapse}}" data-toggle="dropdown"><span class="sidebar-visible-inline {{icon}}"></span> {{displayName}}<b class="caret {{^collapse}}sidebar-hide{{/collapse}}"></b></a> + <ul class="dropdown-menu {{^collapse}}sidebar-visible-block{{/collapse}}" role="menu"> {{#modules}} <li class="{{className}}"><a href="?do={{identifier}}">{{displayName}}</a></li> {{#subMenu}} @@ -44,7 +44,7 @@ <span class="sidebar-visible-inline">{{lang_language}}</span> <b class="caret"></b> </a> - <ul class="dropdown-menu"> + <ul class="dropdown-menu" role="menu"> <li class="dropdown-header">{{lang_language}}</li> {{#langs}} <li><a href="?lang={{cc}}&url={{url}}"><img src="lang/{{cc}}/flag.png" alt="{{name}}"> {{name}}</a></li> diff --git a/modules-available/rebootcontrol/config.json b/modules-available/rebootcontrol/config.json index 43d2c28f..f823e2eb 100644 --- a/modules-available/rebootcontrol/config.json +++ b/modules-available/rebootcontrol/config.json @@ -1,5 +1,6 @@ { - "category": "main.beta", + "category": "main.etc", + "collapse": true, "dependencies": [ "locations", "js_stupidtable" diff --git a/modules-available/runmode/config.json b/modules-available/runmode/config.json index 84e044ce..9e04b56c 100644 --- a/modules-available/runmode/config.json +++ b/modules-available/runmode/config.json @@ -1,4 +1,6 @@ { + "category": "main.etc", + "collapse": true, "dependencies": [ "statistics", "js_selectize" diff --git a/modules-available/translation/config.json b/modules-available/translation/config.json index 110f8b67..ed9b7a8a 100644 --- a/modules-available/translation/config.json +++ b/modules-available/translation/config.json @@ -1,3 +1,4 @@ { - "category": "main.content" + "category": "main.etc", + "collapse": true }
\ No newline at end of file |