[locations] New module for managing locations

7 files changed, 49 insertions, 2 deletions

diff --git a/lang/en/messages.json b/lang/en/messages.json
index aed10cce..7d60575d 100644
--- a/lang/en/messages.json
+++ b/lang/en/messages.json
@@ -1,5 +1,6 @@
 {
     "ad-config-failed": "Rebuilding the Active Directory configuration failed",
+    "added-x-entries": "Entries added: {{0}}",
     "adduser-disabled": "Insufficient privileges to add more users",
     "adduser-success": "User successfully added",
     "backup-failed": "Backup failed!",
@@ -25,6 +26,8 @@
     "invalid-ip": "No interface is configured with the address {{0}}",
     "invalid-path": "Invalid path.",
     "invalid-template": "Selected template is not valid",
+    "location-deleted": "Location has been deleted (locations: {{0}}, subnets: {{1}})",
+    "location-updated": "Location {{0}} has been updated",
     "loginfail": "Username or Password incorrect",
     "mail-config-saved": "Mail config saved",
     "missing-file": "There was no file selected!",
@@ -42,6 +45,7 @@
     "no-image": "Could not find an SVG-image at the given URL",
     "no-permission": "No sufficient privileges to access this page",
     "notes-saved": "Notes have been saved",
+    "parameter-missing": "Missing parameter: {{0}}",
     "password-mismatch": "Password and password confirmation do not match",
     "reboot-unconfirmed": "Confirmation prompt to reboot not confirmed",
     "remote-parse-failed": "Parsing the received data failed ({{0}})",
@@ -50,6 +54,9 @@
     "replacing-module": "Replace module {{0}}",
     "restore-done": "Restore done",
     "settings-updated": "Settings have been updated",
+    "subnets-created": "{{0}} subnet(s) created",
+    "subnets-deleted": "{{0}} subnet(s) deleted",
+    "subnets-updated": "{{0}} subnet(s) updated",
     "task-error": "Execution failed: {{0}}",
     "taskmanager-error": "Failed to connect to the Task Manager",
     "taskmanager-format": "Task Manager has returned invalid data",
diff --git a/lang/en/settings/cat_setting.json b/lang/en/settings/cat_setting.json
index 856775a9..7c0ab654 100644
--- a/lang/en/settings/cat_setting.json
+++ b/lang/en/settings/cat_setting.json
@@ -4,5 +4,6 @@
     "cat_3": "Time Synchronization",
     "cat_4": "Basic System",
     "cat_5": "Common network share",
-    "cat_6": "Uncategorized"
+    "cat_6": "Uncategorized",
+    "cat_7": "vmchooser"
 }
\ No newline at end of file
diff --git a/lang/en/settings/setting.json b/lang/en/settings/setting.json
index 11a34f17..36ac6e8c 100644
--- a/lang/en/settings/setting.json
+++ b/lang/en/settings/setting.json
@@ -16,5 +16,8 @@
     "SLX_REMOTE_LOG_SESSIONS": "Determines whether logins and logouts of the users should be reported to the satellite.\r\n*yes* = log with user ID\r\n*anonymous* = anonymous logging\r\n*no* = no logging",
     "SLX_ROOT_PASS": "The root password of the client system. Only required for diagnostic purposes on the client.Leave field blank to disallow root logins.\r\n\/Hint\/: The password SHA-512-with-salt hashed before it's being sent to the client. It's only stored in clear text on the Satellite Server. If you want to have it hashed on the server too, you can supply a pre-hashed passoword in \/$6$...$...\/-format.",
     "SLX_SHUTDOWN_SCHEDULE": "Fixed time to turn off the computer, even if there is a user active.Several times can be specified, separated by spaces.",
-    "SLX_SHUTDOWN_TIMEOUT": "Time in seconds after which a computer is switched off, if no user is logged on.Leave blank to disable the function."
+    "SLX_SHUTDOWN_TIMEOUT": "Time in seconds after which a computer is switched off, if no user is logged on.Leave blank to disable the function.",
+    "SLX_VMCHOOSER_FORLOCATION": "Defines how lectures special to the user's location are handled in the vmchooser.\r\n*IGNORE*: Sort them alphabetically among the global lectures.\r\n*BUMP*: Put them atop the global lectures.\r\n*EXCLUSIVE*: Put them atop the global lectures and aditionally collapse the node which contains the global lectures.",
+    "SLX_VMCHOOSER_TAB": "Defines which tab is show by default, if the user doesn't have stored a last used session on his persistent home directory.\r\n*0*: Native Linux sessions\r\n*1*: User specific lectures\r\n*2*: All lectures\r\n*AUTO*: If the computer has low system specs, show the Linux sessions, otherwise, show all lectures",
+    "SLX_VMCHOOSER_TEMPLATES": "Defines how lectures that link to template VMs are treated wrt sorting.\r\n*IGNORE*: Sort among regular lectures\r\n*BUMP*: Move to top of list"
 }
\ No newline at end of file
diff --git a/lang/en/templates/locations/location-subnets.json b/lang/en/templates/locations/location-subnets.json
new file mode 100644
index 00000000..2ba94384
--- /dev/null
+++ b/lang/en/templates/locations/location-subnets.json
@@ -0,0 +1,18 @@
+{
+    "lang_addNewSubnet": "Add new subnet",
+    "lang_assignSubnetExplanation": "Client machines which fall into an IP range listed below will be assigned to this location and will see an according lecture list (e.g. they will see lectures that are exclusively assigned to this location).",
+    "lang_assignedSubnets": "Assigned subnets \/ IP ranges",
+    "lang_deleteChildLocations": "Delete child locations aswell",
+    "lang_deleteLocation": "Delete location",
+    "lang_deleteSubnet": "Delete range",
+    "lang_endAddress": "End address",
+    "lang_locationInfo": "Location details",
+    "lang_locationSettings": "Edit this room or location",
+    "lang_matchingMachines": "Matching clients",
+    "lang_name": "Name",
+    "lang_parentLocation": "Parent location",
+    "lang_referencingLectures": "Assigned Lectures",
+    "lang_save": "Save",
+    "lang_startAddress": "Start address",
+    "lang_subnet": "IP range"
+}
\ No newline at end of file
diff --git a/lang/en/templates/locations/locations.json b/lang/en/templates/locations/locations.json
new file mode 100644
index 00000000..db4fd0a7
--- /dev/null
+++ b/lang/en/templates/locations/locations.json
@@ -0,0 +1,10 @@
+{
+    "lang_areYouSureNoUndo": "Are you sure? This cannot be undone!",
+    "lang_edit": "Edit",
+    "lang_location": "Ort",
+    "lang_locationName": "Name",
+    "lang_locationsMainHeading": "Manage rooms and locations",
+    "lang_noParent": "No parent",
+    "lang_save": "Save",
+    "lang_thisListBySubnet": "List by subnet"
+}
\ No newline at end of file
diff --git a/lang/en/templates/locations/subnets.json b/lang/en/templates/locations/subnets.json
new file mode 100644
index 00000000..65da254b
--- /dev/null
+++ b/lang/en/templates/locations/subnets.json
@@ -0,0 +1,7 @@
+{
+    "lang_endAddress": "End",
+    "lang_listOfSubnets": "List of subnets",
+    "lang_location": "Location",
+    "lang_startAddress": "Start",
+    "lang_thisListByLocation": "List by location"
+}
\ No newline at end of file
diff --git a/lang/en/templates/main-menu.json b/lang/en/templates/main-menu.json
index be9cefed..d22f90d7 100644
--- a/lang/en/templates/main-menu.json
+++ b/lang/en/templates/main-menu.json
@@ -10,6 +10,7 @@
     "lang_internetAccess": "Internet access",
     "lang_language": "Language",
     "lang_localization": "Localization",
+    "lang_locations": "Rooms\/Locations",
     "lang_login": "Login",
     "lang_logout": "Logout",
     "lang_needsSetup": "Setup incomplete",