From fb78c393d086f15ae3f08ebf3d22f26dabe848c9 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 17 Nov 2017 11:02:35 +0100
Subject: [dozmod] Add config option for max. locations per lecture

---
 modules-available/dozmod/lang/de/template-tags.json   |  1 +
 modules-available/dozmod/lang/en/template-tags.json   |  1 +
 modules-available/dozmod/page.inc.php                 |  1 +
 modules-available/dozmod/style.css                    |  1 +
 modules-available/dozmod/templates/runtimeconfig.html | 18 ++++++++++++------
 5 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'modules-available/dozmod')

diff --git a/modules-available/dozmod/lang/de/template-tags.json b/modules-available/dozmod/lang/de/template-tags.json
index 97ab0a21..ad4f1142 100644
--- a/modules-available/dozmod/lang/de/template-tags.json
+++ b/modules-available/dozmod/lang/de/template-tags.json
@@ -44,6 +44,7 @@
     "lang_mailTemplates": "E-Mail Templates",
     "lang_maxImageValidity": "G\u00fcltigkeitsdauer neuer VM-Versionen (Tage)",
     "lang_maxLectureVisibility": "Sp\u00e4testes Enddatum einer Veranstaltung (Tage in der Zukunft)",
+    "lang_maxLocationsPerLecture": "Max. explizite Orte pro Veranstaltung",
     "lang_maxTransfers": "Maximale Zahl gleichzeitiger Up-\/Downloads pro Benutzer",
     "lang_miscOptions": "Verschiedene Einstellungen",
     "lang_modified": "Modifiziert",
diff --git a/modules-available/dozmod/lang/en/template-tags.json b/modules-available/dozmod/lang/en/template-tags.json
index e2e085b4..875ca374 100644
--- a/modules-available/dozmod/lang/en/template-tags.json
+++ b/modules-available/dozmod/lang/en/template-tags.json
@@ -44,6 +44,7 @@
     "lang_mailTemplates": "E-Mail templates",
     "lang_maxImageValidity": "New VM validity (days)",
     "lang_maxLectureVisibility": "Max time lecture end date may lie in the future (days)",
+    "lang_maxLocationsPerLecture": "Max. explicit locations per lecture",
     "lang_maxTransfers": "Max concurrent transfers per user",
     "lang_miscOptions": "Misc options",
     "lang_modified": "modified",
diff --git a/modules-available/dozmod/page.inc.php b/modules-available/dozmod/page.inc.php
index 9c247770..548084a2 100644
--- a/modules-available/dozmod/page.inc.php
+++ b/modules-available/dozmod/page.inc.php
@@ -330,6 +330,7 @@ class Page_DozMod extends Page
 				'int' => [
 					'maxImageValidityDays' => array('min' => 7, 'max' => 999),
 					'maxLectureValidityDays' => array('min' => 7, 'max' => 999),
+					'maxLocationsPerLecture' => array('min' => 0, 'max' => 999),
 					'maxTransfers' => array('min' => 1, 'max' => 10),
 				],
 				'bool' => [
diff --git a/modules-available/dozmod/style.css b/modules-available/dozmod/style.css
index 22d769ed..8612b426 100644
--- a/modules-available/dozmod/style.css
+++ b/modules-available/dozmod/style.css
@@ -30,6 +30,7 @@
 
 .table-input-group tr.input-group input.form-control {
   width: auto;
+  min-width: 95px;
 }
 
 .table-input-group tr.input-group td:last-child input {
diff --git a/modules-available/dozmod/templates/runtimeconfig.html b/modules-available/dozmod/templates/runtimeconfig.html
index 9bdc44b0..3fa69d28 100644
--- a/modules-available/dozmod/templates/runtimeconfig.html
+++ b/modules-available/dozmod/templates/runtimeconfig.html
@@ -71,21 +71,27 @@
 				<p><i>{{lang_descriptionRuntimeLimits}}</i></p>
 				<table class="table-input-group">
 					<tr class="input-group">
-						<td class="input-group-addon" for="max_image_validity">{{lang_maxImageValidity}}</td>
+						<td class="input-group-addon">{{lang_maxImageValidity}}</td>
 						<td>
-							<input name="maxImageValidityDays" id="max_image_validity" class="form-control" type="number" value="{{maxImageValidityDays}}" min="7" max="999" pattern="^\d+$">
+							<input name="maxImageValidityDays" class="form-control" type="number" value="{{maxImageValidityDays}}" min="7" max="999" pattern="^\d+$">
 						</td>
 					</tr>
 					<tr class="input-group">
-						<td class="input-group-addon" for="max_lecture_validity">{{lang_maxLectureVisibility}}</td>
+						<td class="input-group-addon">{{lang_maxLectureVisibility}}</td>
 						<td>
-							<input name="maxLectureValidityDays" id="max_lecture_validity" class="form-control" type="number" value="{{maxLectureValidityDays}}" min="1" max="999" pattern="^\d+$">
+							<input name="maxLectureValidityDays" class="form-control" type="number" value="{{maxLectureValidityDays}}" min="1" max="999" pattern="^\d+$">
 						</td>
 					</tr>
 					<tr class="input-group">
-						<td class="input-group-addon" for="max_transfers">{{lang_maxTransfers}}</td>
+						<td class="input-group-addon">{{lang_maxLocationsPerLecture}}</td>
 						<td>
-							<input name="maxTransfers" id="max_transfers" class="form-control" type="number" value="{{maxTransfers}}" min="1" max="10" pattern="^\d+$">
+							<input name="maxLocationsPerLecture" class="form-control" type="number" value="{{maxLocationsPerLecture}}" min="0" max="999" pattern="^\d+$">
+						</td>
+					</tr>
+					<tr class="input-group">
+						<td class="input-group-addon">{{lang_maxTransfers}}</td>
+						<td>
+							<input name="maxTransfers" class="form-control" type="number" value="{{maxTransfers}}" min="1" max="10" pattern="^\d+$">
 						</td>
 					</tr>
 				</table>
-- 
cgit v1.2.3-55-g7522