From 75b7c70b0130c1d8eff2de03b76d2771f1f19781 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 24 Jun 2016 11:25:27 +0200
Subject: [exams] Unify add/edit templates, add error messages, limit zoom
 range some more

---
 .../exams/templates/page-add-edit-exam.html        | 70 ++++++++++++++++++++++
 .../exams/templates/page-add-exam.html             | 61 -------------------
 .../exams/templates/page-edit-exam.html            | 61 -------------------
 modules-available/exams/templates/page-exams.html  |  3 +-
 4 files changed, 72 insertions(+), 123 deletions(-)
 create mode 100644 modules-available/exams/templates/page-add-edit-exam.html
 delete mode 100644 modules-available/exams/templates/page-add-exam.html
 delete mode 100644 modules-available/exams/templates/page-edit-exam.html

(limited to 'modules-available/exams/templates')

diff --git a/modules-available/exams/templates/page-add-edit-exam.html b/modules-available/exams/templates/page-add-edit-exam.html
new file mode 100644
index 00000000..26cbf8bc
--- /dev/null
+++ b/modules-available/exams/templates/page-add-edit-exam.html
@@ -0,0 +1,70 @@
+{{#exam.examid}}
+<h1>{{lang_editExam}}</h1>
+{{/exam.examid}}
+{{^exam.examid}}
+<h1>{{lang_addExam}}</h1>
+{{/exam.examid}}
+
+<form class="form" method="POST" action="?do=exams" id="tolleform">
+	<div class="form-group">
+		<label for="locations">{{lang_location}}</label>
+		<select id="locations" multiple name="locations[]">
+			{{#locations}}
+			<option value="{{locationid}}" {{#selected}}selected{{/selected}}> {{locationname}}</option>
+			{{/locations}}
+		</select>
+	</div>
+
+	<div class="row">
+		<div class="form-group col-xs-6">
+			<label for="starttime_date">{{lang_begin_date}}</label>
+			<input required class="form-control datepicker" name="starttime_date" id="starttime_date" value="{{exam.starttime_date}}">
+		</div>
+		<div class="form-group col-xs-6">
+			<label for="starttime_time">{{lang_begin_time}}</label>
+			<input required type="text" class="form-control timepicker" name="starttime_time" id="starttime_time" value="{{exam.starttime_time}}"
+					 pattern="[0-9]{1,2}:[0-9]{2}">
+		</div>
+	</div>
+
+	<div class="row">
+		<div class="form-group col-xs-6">
+			<label for="endtime_date">{{lang_end_date}}</label>
+			<input required class="form-control datepicker" name="endtime_date" id="endtime_date" value="{{exam.endtime_date}}">
+		</div>
+		<div class="form-group col-xs-6">
+			<label for="endtime_time">{{lang_end_time}}</label>
+			<input required type="texxt" class="form-control timepicker" name="endtime_time" id="endtime_time" value="{{exam.endtime_time}}"
+					 pattern="[0-9]{1,2}:[0-9]{2}">
+		</div>
+	</div>
+	<div class="row">
+		<div class="form-group col-xs-12">
+			<label for="description">{{lang_description}}</label>
+			<textarea class="form-control" type="textarea" name="description" id="description">{{exam.description}}</textarea>
+		</div>
+	</div>
+
+	<input type="hidden" name="action" value="save">
+	<input type="hidden" name="token" value="{{token}}">
+	<input type="hidden" name="examid" value="{{exam.examid}}">
+	<button class="btn btn-success">{{lang_addExam}}</button>
+</form>
+
+<script type="application/javascript"><!--
+document.addEventListener("DOMContentLoaded", function () {
+	var dateSettings = {
+		format: 'yyyy-mm-dd',
+		weekStart: 1,
+		startDate: 'today',
+	};
+	var timeSettings = {
+		showSeconds: false,
+		showMeridian: false
+	};
+	$('.datepicker').datepicker(dateSettings);
+	$('.timepicker').timepicker(timeSettings);
+
+	$('#locations').multiselect({numberDisplayed: 1});
+}, false);
+// --></script>
diff --git a/modules-available/exams/templates/page-add-exam.html b/modules-available/exams/templates/page-add-exam.html
deleted file mode 100644
index 89a7881a..00000000
--- a/modules-available/exams/templates/page-add-exam.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<h1>{{lang_addExam}}</h1>
-
-<form class="form" method="POST" action="?do=exams&action=add">
-    <div class="form-group">
-        <label for="locations">{{lang_location}}</label>
-        <select id="locations" multiple="multiple" name="locations[]" class="">
-            {{#locations}}
-            <option value="{{locationid}}"> {{locationname}} </option>
-            {{/locations}}
-        </select>
-    </div>
-
-    <div class="row">
-        <div class="form-group col-xs-6">
-            <label for="starttime_date">{{lang_begin_date}}</label>
-            <input required class="form-control datepicker" name="starttime_date" />
-        </div>
-        <div class="form-group col-xs-6">
-            <label for="starttime_time">{{lang_begin_time}}</label>
-            <input required type="text" class="form-control timepicker" name="starttime_time" />
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="form-group col-xs-6">
-            <label for="endtime_date">{{lang_end_date}}</label>
-            <input required class="form-control datepicker" name="endtime_date" />
-        </div>
-        <div class="form-group col-xs-6">
-            <label for="endtime_time">{{lang_end_time}}</label>
-            <input required type="texxt" class="form-control timepicker" name="endtime_time" />
-        </div>
-    </div>
-    <div class="row">
-        <div class="form-group col-xs-12">
-            <label for="description">{{lang_description}}</label>
-            <textarea class="form-control" type="textarea" name="description"></textarea>
-        </div>
-    </div>
-
-    <input type="hidden" name="token" value="{{token}}" />
-    <input type="submit" class="btn btn-success" value="{{lang_addExam}}"></input>
-</form>
-
-<script type="application/javascript"><!--
-document.addEventListener("DOMContentLoaded", function () {
-    var dateSettings = {
-        format: 'yyyy-mm-dd',
-        weekStart: 1,
-        startDate: 'today',
-    };
-    var timeSettings = {
-        showSeconds: false,
-        showMeridian: false
-    };
-    $('.datepicker').datepicker(dateSettings);
-    $('.timepicker').timepicker(timeSettings);
-
-    $('#locations').multiselect({numberDisplayed: 1});
-}, false);
-// --></script>
diff --git a/modules-available/exams/templates/page-edit-exam.html b/modules-available/exams/templates/page-edit-exam.html
deleted file mode 100644
index 61848ec2..00000000
--- a/modules-available/exams/templates/page-edit-exam.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<h1>{{lang_editExam}}: </h1>
-
-<form class="form" method="POST" action="?do=exams&action=edit&examid={{exam.examid}}">
-    <div class="form-group">
-        <label for="locations">{{lang_location}}</label>
-        <select id="locations" multiple="multiple" name="locations[]" class="">
-            {{#locations}}
-            <option value="{{locationid}}" {{#selected}}selected{{/selected}} > {{locationname}} </option>
-            {{/locations}}
-        </select>
-    </div>
-
-    <div class="row">
-        <div class="form-group col-xs-6">
-            <label for="starttime_date">{{lang_begin_date}}</label>
-            <input required class="form-control datepicker" name="starttime_date" value="{{exam.starttime_date}}"/>
-        </div>
-        <div class="form-group col-xs-6">
-            <label for="starttime_time">{{lang_begin_time}}</label>
-            <input required type="text" class="form-control timepicker" name="starttime_time" value="{{exam.starttime_time}}" />
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="form-group col-xs-6">
-            <label for="endtime_date">{{lang_end_date}}</label>
-            <input required class="form-control datepicker" name="endtime_date" value="{{exam.endtime_date}}"/>
-        </div>
-        <div class="form-group col-xs-6">
-            <label for="endtime_time">{{lang_end_time}}</label>
-            <input required type="texxt" class="form-control timepicker" name="endtime_time" value="{{exam.endtime_time}}"/>
-        </div>
-    </div>
-    <div class="row">
-        <div class="form-group col-xs-12">
-            <label for="description">{{lang_description}}</label>
-            <textarea class="form-control" type="textarea" name="description">{{exam.description}}</textarea>
-        </div>
-    </div>
-
-    <input type="hidden" name="token" value="{{token}}" />
-    <input type="submit" class="btn btn-success" value="{{lang_saveExam}}"></input>
-</form>
-
-<script type="application/javascript"><!--
-document.addEventListener("DOMContentLoaded", function () {
-    var dateSettings = {
-        format: 'yyyy-mm-dd',
-        weekStart: 1,
-        startDate: 'today',
-    };
-    var timeSettings = {
-        showSeconds: false,
-        showMeridian: false
-    };
-    $('.datepicker').datepicker(dateSettings);
-    $('.timepicker').timepicker(timeSettings);
-
-    $('#locations').multiselect({numberDisplayed: 1});
-}, false);
-// --></script>
diff --git a/modules-available/exams/templates/page-exams.html b/modules-available/exams/templates/page-exams.html
index c714ed2b..b2483d6e 100644
--- a/modules-available/exams/templates/page-exams.html
+++ b/modules-available/exams/templates/page-exams.html
@@ -65,7 +65,8 @@ document.addEventListener("DOMContentLoaded", function () {
 		'editable'	: false,
 		'min'		: {{vis_min_date}},
 		'max'		: {{vis_max_date}},
-		'zoomMin': 2 * 3600 * 1000,
+		'zoomMin': 6 * 3600 * 1000,
+		'zoomMax': 2 * 86400 * 1000,
 		'order' 	: customOrder,
 		'locale'	: language,
 		'moment'	: function(date) { return vis.moment(date).utc(); }
-- 
cgit v1.2.3-55-g7522