Use collapse mode for translations, runmode, rebootcontrol

Also shuffle around modules.

8 files changed, 17 insertions, 13 deletions

diff --git a/config.php.example b/config.php.example
index 0de6fd8d..b78ace80 100644
--- a/config.php.example
+++ b/config.php.example
@@ -43,18 +43,18 @@ define('CONFIG_PRODUCT_NAME_LONG', 'OpenSLX Admin');
 // overriding the config.json entry
 $MENU_CAT_OVERRIDE = array(
 	'main.content' => array(
-		'news', 'locations', 'exams', 'dozmod', 'translation'
+		'news', 'locations', 'exams', 'dozmod', 'adduser', 'permissionmanager', 'locationinfo'
 	),
 	'main.settings-client' => array(
 		'sysconfig', 'baseconfig', 'minilinux'
 	),
 	'main.settings-server' => array(
-		'serversetup', 'vmstore', 'webinterface', 'backup'
+		'serversetup', 'vmstore', 'webinterface', 'backup', 'dnbd3'
 	),
 	'main.status' => array(
 		'systemstatus', 'eventlog', 'syslog', 'statistics', 'statistics_reporting'
 	),
-	'main.beta' => array(
-		'locationinfo', 'rebootcontrol'
+	'main.etc' => array(
+		'rebootcontrol', 'runmode', 'translation'
 	)
 );
\ No newline at end of file
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&amp;show=edit-panel&amp;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}}&amp;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