Work on translations: templates and messages work

19 files changed, 81 insertions, 118 deletions

diff --git a/modules-available/main/lang/de/module.json b/modules-available/main/lang/de/module.json
index f03e52ad..b1f0ef93 100644
--- a/modules-available/main/lang/de/module.json
+++ b/modules-available/main/lang/de/module.json
@@ -1,4 +1,4 @@
 {
-	"module_name": "Dashboard",
-	"page_title": "Startseite"
-}
+    "module_name": "Dashboard",
+    "page_title": "Startseite"
+}
\ No newline at end of file
diff --git a/modules-available/main/lang/de/template-tags.json b/modules-available/main/lang/de/template-tags.json
new file mode 100644
index 00000000..d31fb64d
--- /dev/null
+++ b/modules-available/main/lang/de/template-tags.json
@@ -0,0 +1,35 @@
+{
+    "lang_bootMenuWarning": "Das Bootmen\u00fc ist veraltet oder wurde noch nicht generiert.",
+    "lang_configurationBasic": "PXE\/Boot",
+    "lang_configurationVariables": "KonfigurationsVariablen",
+    "lang_configure": "Konfigurieren",
+    "lang_dozmod": "Dozentenmodul",
+    "lang_eventLog": "Server Log",
+    "lang_internetAccess": "Internetzugriff",
+    "lang_intro": "Dies ist die bwLehrpool Konfigurationsoberfl\u00e4che.",
+    "lang_introGuest": "Dies ist das Administrations-Interface der lokalen bwLehrpool-Installation. Bitte authentifizieren Sie sich, um Einstellungen vorzunehmen.",
+    "lang_language": "Sprachen",
+    "lang_localization": "Lokalisierung + Integration",
+    "lang_locations": "R\u00e4ume\/Orte",
+    "lang_login": "Anmelden",
+    "lang_logout": "Abmelden",
+    "lang_minilinuxMissing": "Wichtige Dateien der MiniLinux-Installation fehlen.",
+    "lang_needsSetup": "Einrichtung unvollst\u00e4ndig",
+    "lang_news": "vmChooser News",
+    "lang_next": "Weiter",
+    "lang_noExistingAccount": "Es existiert noch kein Administrator-Zugang f\u00fcr diesen Satelliten-Server.",
+    "lang_numerOfImagesMarkedForDeletion": "Zur L\u00f6schung markierte Abbilder",
+    "lang_register": "Registrieren",
+    "lang_server": "Server",
+    "lang_serverStatus": "Server Status",
+    "lang_settings": "Einstellungen",
+    "lang_status": "Status",
+    "lang_systemConfiguration": "Systemkonfiguration",
+    "lang_systemConfigurationNotChosen": "Es wurde noch keine Systemkonfiguration ausgew\u00e4hlt.",
+    "lang_translations": "\u00dcbersetzungen",
+    "lang_vmLocation": "VM Speicherort",
+    "lang_vmLocationNotSet": "Es ist noch kein Speicherort f\u00fcr die Virtuellen Maschinen festgelegt.",
+    "lang_warning": "Warnung",
+    "lang_webInterface": "Web-Schnittstelle",
+    "lang_welcome": "Willkommen"
+}
\ No newline at end of file
diff --git a/modules-available/main/lang/de/templates/dialog-generic.json b/modules-available/main/lang/de/templates/dialog-generic.json
deleted file mode 100644
index ff429fdd..00000000
--- a/modules-available/main/lang/de/templates/dialog-generic.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "lang_next": "Weiter"
-}
\ No newline at end of file
diff --git a/modules-available/main/lang/de/templates/main-menu.json b/modules-available/main/lang/de/templates/main-menu.json
deleted file mode 100644
index 057bfcf2..00000000
--- a/modules-available/main/lang/de/templates/main-menu.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "lang_configurationBasic": "PXE\/Boot",
-    "lang_configurationVariables": "KonfigurationsVariablen",
-    "lang_dozmod": "Dozentenmodul",
-    "lang_eventLog": "Server Log",
-    "lang_internetAccess": "Internetzugriff",
-    "lang_language": "Sprachen",
-    "lang_localization": "Lokalisierung + Integration",
-    "lang_locations": "R\u00e4ume\/Orte",
-    "lang_login": "Anmelden",
-    "lang_logout": "Abmelden",
-    "lang_needsSetup": "Einrichtung unvollst\u00e4ndig",
-    "lang_news": "vmChooser News",
-    "lang_server": "Server",
-    "lang_serverStatus": "Server Status",
-    "lang_settings": "Einstellungen",
-    "lang_status": "Status",
-    "lang_translations": "\u00dcbersetzungen",
-    "lang_vmLocation": "VM Speicherort",
-    "lang_warning": "Warnung",
-    "lang_webInterface": "Web-Schnittstelle"
-}
diff --git a/modules-available/main/lang/de/templates/messagebox-error.json b/modules-available/main/lang/de/templates/messagebox-error.json
deleted file mode 100644
index c44dc44f..00000000
--- a/modules-available/main/lang/de/templates/messagebox-error.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-
-]
\ No newline at end of file
diff --git a/modules-available/main/lang/de/templates/messagebox-info.json b/modules-available/main/lang/de/templates/messagebox-info.json
deleted file mode 100644
index 0967ef42..00000000
--- a/modules-available/main/lang/de/templates/messagebox-info.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/modules-available/main/lang/de/templates/messagebox-success.json b/modules-available/main/lang/de/templates/messagebox-success.json
deleted file mode 100644
index 0967ef42..00000000
--- a/modules-available/main/lang/de/templates/messagebox-success.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/modules-available/main/lang/de/templates/messagebox-warning.json b/modules-available/main/lang/de/templates/messagebox-warning.json
deleted file mode 100644
index 0967ef42..00000000
--- a/modules-available/main/lang/de/templates/messagebox-warning.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/modules-available/main/lang/de/templates/page-main-guest.json b/modules-available/main/lang/de/templates/page-main-guest.json
deleted file mode 100644
index 876fccac..00000000
--- a/modules-available/main/lang/de/templates/page-main-guest.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "lang_introGuest": "Dies ist das Administrations-Interface der lokalen bwLehrpool-Installation. Bitte authentifizieren Sie sich, um Einstellungen vorzunehmen.",
-    "lang_login": "Anmelden",
-    "lang_noExistingAccount": "Es existiert noch kein Administrator-Zugang f\u00fcr diesen Satelliten-Server.",
-    "lang_register": "Registrieren",
-    "lang_welcome": "Willkommen"
-}
\ No newline at end of file
diff --git a/modules-available/main/lang/de/templates/page-main.json b/modules-available/main/lang/de/templates/page-main.json
deleted file mode 100644
index a927e4ce..00000000
--- a/modules-available/main/lang/de/templates/page-main.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "lang_bootMenuWarning": "Das Bootmen\u00fc ist veraltet oder wurde noch nicht generiert.",
-    "lang_configure": "Konfigurieren",
-    "lang_intro": "Dies ist die bwLehrpool Konfigurationsoberfl\u00e4che.",
-    "lang_minilinuxMissing": "Wichtige Dateien der MiniLinux-Installation fehlen.",
-    "lang_numerOfImagesMarkedForDeletion": "Zur L\u00f6schung markierte Abbilder",
-    "lang_systemConfiguration": "Systemkonfiguration",
-    "lang_systemConfigurationNotChosen": "Es wurde noch keine Systemkonfiguration ausgew\u00e4hlt.",
-    "lang_vmLocationNotSet": "Es ist noch kein Speicherort f\u00fcr die Virtuellen Maschinen festgelegt.",
-    "lang_welcome": "Willkommen"
-}
\ No newline at end of file
diff --git a/modules-available/main/lang/en/module.json b/modules-available/main/lang/en/module.json
deleted file mode 100644
index 613213d9..00000000
--- a/modules-available/main/lang/en/module.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "lang_intro": "Esta \u00e9 a interface de configura\u00e7\u00e3o do OpenSLX.",
-    "lang_introGuest": "This is the administration interface of the local bwLehrpool intallation. Please authenticate yourself to adjust settings.",
-    "lang_language": "Language",
-    "lang_login": "Login",
-    "lang_logout": "Logout",
-    "lang_needsSetup": "Setup incomplete",
-    "lang_next": "Next",
-    "lang_noExistingAccount": "No account has been created yet. Sign up to become the administrator.",
-    "lang_register": "Register",
-    "lang_warning": "Warning",
-    "lang_welcome": "Welcome"
-}
\ No newline at end of file
diff --git a/modules-available/main/lang/en/template-tags.json b/modules-available/main/lang/en/template-tags.json
new file mode 100644
index 00000000..f368e8b8
--- /dev/null
+++ b/modules-available/main/lang/en/template-tags.json
@@ -0,0 +1,41 @@
+{
+    "lang_backup": "Backup\/Restore",
+    "lang_bootMenuWarning": "The boot menu is outdated or has not been generated.",
+    "lang_client": "Client",
+    "lang_clientLog": "Client Log",
+    "lang_clientStats": "Client statistics",
+    "lang_configurationBasic": "PXE\/Boot",
+    "lang_configurationVariables": "Configuration Variables",
+    "lang_configure": "Configure",
+    "lang_dozmod": "Tutor module",
+    "lang_eventLog": "Server Log",
+    "lang_internetAccess": "Internet access",
+    "lang_intro": "This is the bwLehrpool configuration interface.",
+    "lang_introGuest": "This is the administration interface of the local bwLehrpool intallation. Please authenticate yourself to adjust settings.",
+    "lang_language": "Language",
+    "lang_localization": "Localization",
+    "lang_locations": "Rooms\/Locations",
+    "lang_loggedInPrefix": "Logged in as",
+    "lang_loggedInSuffix": " ",
+    "lang_login": "Login",
+    "lang_logout": "Logout",
+    "lang_minilinuxMissing": "Important files from the mini Linux installation are missing.",
+    "lang_needsSetup": "Setup incomplete",
+    "lang_news": "vmChooser news",
+    "lang_next": "Next",
+    "lang_noExistingAccount": "No account has been created yet. Sign up to become the administrator.",
+    "lang_numerOfImagesMarkedForDeletion": "Images marked for deletion",
+    "lang_register": "Register",
+    "lang_server": "Server",
+    "lang_serverStatus": "Server status",
+    "lang_settings": "Settings",
+    "lang_status": "Status",
+    "lang_systemConfiguration": "System Configuration",
+    "lang_systemConfigurationNotChosen": "A system configuration has not been chosen yet.",
+    "lang_translations": "Translations",
+    "lang_vmLocation": "VM Location",
+    "lang_vmLocationNotSet": "A location for the virtual machine is not set yet.",
+    "lang_warning": "Warning",
+    "lang_webInterface": "Web interface",
+    "lang_welcome": "Welcome"
+}
\ No newline at end of file
diff --git a/modules-available/main/lang/en/templates/dialog-generic.json b/modules-available/main/lang/en/templates/dialog-generic.json
deleted file mode 100644
index c7551ed3..00000000
--- a/modules-available/main/lang/en/templates/dialog-generic.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "lang_next": "Next"
-}
\ No newline at end of file
diff --git a/modules-available/main/lang/en/templates/main-menu.json b/modules-available/main/lang/en/templates/main-menu.json
deleted file mode 100644
index 635c7aa8..00000000
--- a/modules-available/main/lang/en/templates/main-menu.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "lang_backup": "Backup\/Restore",
-    "lang_client": "Client",
-    "lang_clientLog": "Client Log",
-    "lang_clientStats": "Client statistics",
-    "lang_configurationBasic": "PXE\/Boot",
-    "lang_configurationVariables": "Configuration Variables",
-    "lang_dozmod": "Tutor module",
-    "lang_eventLog": "Server Log",
-    "lang_internetAccess": "Internet access",
-    "lang_language": "Language",
-    "lang_localization": "Localization",
-    "lang_locations": "Rooms\/Locations",
-    "lang_login": "Login",
-    "lang_logout": "Logout",
-    "lang_needsSetup": "Setup incomplete",
-    "lang_news": "vmChooser news",
-    "lang_server": "Server",
-    "lang_serverStatus": "Server status",
-    "lang_settings": "Settings",
-    "lang_status": "Status",
-    "lang_translations": "Translations",
-    "lang_vmLocation": "VM Location",
-    "lang_warning": "Warning",
-    "lang_webInterface": "Web interface",
-    "lang_loggedInPrefix": "Logged in as",
-    "lang_loggedInSuffix": " "
-}
diff --git a/modules-available/main/lang/en/templates/messagebox-warning.json b/modules-available/main/lang/en/templates/messagebox-warning.json
deleted file mode 100644
index 2c63c085..00000000
--- a/modules-available/main/lang/en/templates/messagebox-warning.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
diff --git a/modules-available/main/lang/en/templates/page-main-guest.json b/modules-available/main/lang/en/templates/page-main-guest.json
deleted file mode 100644
index 6526f5bd..00000000
--- a/modules-available/main/lang/en/templates/page-main-guest.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "lang_introGuest": "This is the administration interface of the local bwLehrpool intallation. Please authenticate yourself to adjust settings.",
-    "lang_login": "Login",
-    "lang_noExistingAccount": "No account has been created yet. Sign up to become the administrator.",
-    "lang_register": "Register",
-    "lang_welcome": "Welcome"
-}
\ No newline at end of file
diff --git a/modules-available/main/lang/en/templates/page-main.json b/modules-available/main/lang/en/templates/page-main.json
deleted file mode 100644
index 8031ac1c..00000000
--- a/modules-available/main/lang/en/templates/page-main.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "lang_bootMenuWarning": "The boot menu is outdated or has not been generated.",
-    "lang_configure": "Configure",
-    "lang_intro": "This is the bwLehrpool configuration interface.",
-    "lang_minilinuxMissing": "Important files from the mini Linux installation are missing.",
-    "lang_numerOfImagesMarkedForDeletion": "Images marked for deletion",
-    "lang_systemConfiguration": "System Configuration",
-    "lang_systemConfigurationNotChosen": "A system configuration has not been chosen yet.",
-    "lang_vmLocationNotSet": "A location for the virtual machine is not set yet.",
-    "lang_welcome": "Welcome"
-}
\ No newline at end of file
diff --git a/modules-available/main/lang/pt/module.json b/modules-available/main/lang/pt/template-tags.json
index e4e35acd..d9acf58b 100644
--- a/modules-available/main/lang/pt/module.json
+++ b/modules-available/main/lang/pt/template-tags.json
@@ -11,4 +11,4 @@
     "lang_translations": "Tradu\u00e7\u00f5es",
     "lang_warning": "Aten\u00e7\u00e3o",
     "lang_welcome": "Bem-vindo"
-}
+}
\ 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 65085ee6..af8f833f 100644
--- a/modules-available/main/templates/main-menu.html
+++ b/modules-available/main/templates/main-menu.html
@@ -22,7 +22,7 @@
 				<span class="icon-bar"></span>
 				<span class="icon-bar"></span>
 			</button>
-			<a class="navbar-brand" href="#">OpenSLX</a>
+			<a class="navbar-brand" href="?do=Main">OpenSLX</a>
 		</div>
 		<!-- Collect the nav links, forms, and other content for toggling -->
 		<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">