Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into modularization

Conflicts:
	modules-available/main/templates/main-menu.html

4 files changed, 26 insertions, 27 deletions

diff --git a/modules-available/main/lang/de/messages.json b/modules-available/main/lang/de/messages.json
index 245d4871..fc73f891 100644
--- a/modules-available/main/lang/de/messages.json
+++ b/modules-available/main/lang/de/messages.json
@@ -3,6 +3,7 @@
     "empty-field": "Ein Feld wurde nicht ausgef\u00fcllt",
     "error-read": "Fehler beim Lesen von {{0}}",
     "error-write": "Fehler beim Schreiben von {{0}}",
+    "module-missing-deps": "Modul {{0}} hat fehlende Abh\u00e4ngigkeiten",
     "no-permission": "Keine ausreichenden Rechte, um auf diese Seite zuzugreifen",
     "no-such-module": "Modul {{0}} existiert nicht oder ist nicht aktiv",
     "task-error": "Ausf\u00fchrung fehlgeschlagen: {{0}}",
diff --git a/modules-available/main/lang/de/module.json b/modules-available/main/lang/de/module.json
deleted file mode 100644
index b1f0ef93..00000000
--- a/modules-available/main/lang/de/module.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "module_name": "Dashboard",
-    "page_title": "Startseite"
-}
\ No newline at end of file
diff --git a/modules-available/main/lang/en/messages.json b/modules-available/main/lang/en/messages.json
index f3e97b77..2b735eec 100644
--- a/modules-available/main/lang/en/messages.json
+++ b/modules-available/main/lang/en/messages.json
@@ -1,12 +1,14 @@
 {
-    "no-permission": "No sufficient privileges to access this page",
-    "error-write": "Failed to write {{0}}",
+    "debug-mode": "The debug mode is active!",
     "empty-field": "A field was not filled",
-    "value-invalid": "The value {{1}} is invalid for option {{0}} and has been ignored",
     "error-read": "Error reading {{0}}",
-    "taskmanager-error": "Failed to connect to the Task Manager",
+    "error-write": "Failed to write {{0}}",
+    "module-missing-deps": "Module {{0}} has missing dependencies",
+    "no-permission": "No sufficient privileges to access this page",
+    "no-such-module": "Modul {{0}} existiert nicht",
     "task-error": "Execution failed: {{0}}",
+    "taskmanager-error": "Failed to connect to the Task Manager",
     "taskmanager-format": "Task Manager has returned invalid data",
     "token": "Invalid token. CSRF attack?",
-    "debug-mode": "The debug mode is active!"
+    "value-invalid": "The value {{1}} is invalid for option {{0}} and has been ignored"
 }
\ No newline at end of file
diff --git a/modules-available/main/templates/main-menu.html b/modules-available/main/templates/main-menu.html
index 8f32271d..57f0fa88 100644
--- a/modules-available/main/templates/main-menu.html
+++ b/modules-available/main/templates/main-menu.html
@@ -12,8 +12,8 @@
 	</div>
 </div>
 <div class="sidebar-bg"></div>
-<nav class="navbar navbar-inverse sidebar" role="navigation">
-    <div class="container-fluid">
+<nav class="navbar navbar-inverse sidebar">
+	<div class="container-fluid">
 		<!-- Brand and toggle get grouped for better mobile display -->
 		<div class="navbar-header">
 			<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
@@ -73,22 +73,22 @@
 			</ul>
 
 			<ul class="nav navbar-nav navbar-right visible-sm visible-md" style="margin-top:10px">
-				{{#user}}
-				<ul class="btn-group">
-					<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-						{{user}}
-						<span class="caret"></span>
-					</button>
-					<ul class="dropdown-menu">
-						<!--<li><a href="#">Settings</a></li>
-						<li role="separator" class="divider"></li> -->
-						<li><a href="#" onclick="$('#logoutForm').submit();">{{lang_logout}}</a></li>
-					</ul>
-				</ul>
-				{{/user}}
-				{{^user}}
-					<a type="button" href="?do=Session&action=login" class="btn btn-default">{{lang_login}}</a>
-				{{/user}}
+				<li>
+					{{#user}}
+						<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+							{{user}}
+							<span class="caret"></span>
+						</button>
+						<ul class="dropdown-menu">
+							<!--<li><a href="#">Settings</a></li> -->
+							<!--<li role="separator" class="divider"></li> -->
+							<li><a href="#" onclick="$('#logoutForm').submit();">{{lang_logout}}</a></li>
+						</ul>
+					{{/user}}
+					{{^user}}
+						<a type="button" href="?do=Session&action=login" class="btn btn-default">{{lang_login}}</a>
+					{{/user}}
+				</li>
 			</ul>
 		</div>
 	</div>