[exams] replaced confirm dialog with modal; added panels to edit/add exam page;

added visual separation to the "add exam period" button;

4 files changed, 125 insertions, 93 deletions

diff --git a/modules-available/exams/lang/de/template-tags.json b/modules-available/exams/lang/de/template-tags.json
index 650cfaa2..8bf37143 100644
--- a/modules-available/exams/lang/de/template-tags.json
+++ b/modules-available/exams/lang/de/template-tags.json
@@ -12,6 +12,7 @@
     "lang_begin_date": "Beginn Datum",
     "lang_begin_time": "Uhrzeit",
     "lang_comfirmGlobalExam": "Wollen Sie wirklich eine globale Pr\u00fcfung definieren? Im gew\u00e4hlten Zeitraum werden s\u00e4mtliche R\u00e4ume in den Pr\u00fcfungsmodus geschaltet.",
+    "lang_dateTime": "Datum\/Uhrzeit",
     "lang_deleteConfirmation": "Wirklich l\u00f6schen?",
     "lang_description": "Beschreibung",
     "lang_duration": "Dauer",
diff --git a/modules-available/exams/lang/en/template-tags.json b/modules-available/exams/lang/en/template-tags.json
index a05dc29f..af87bb01 100644
--- a/modules-available/exams/lang/en/template-tags.json
+++ b/modules-available/exams/lang/en/template-tags.json
@@ -12,6 +12,7 @@
     "lang_begin_date": "Begin Date",
     "lang_begin_time": "Time",
     "lang_comfirmGlobalExam": "Do you really want to create a global exam? Every single room will be set to lecture mode during the selected time period.",
+    "lang_dateTime": "Date\/Time",
     "lang_deleteConfirmation": "Are you sure?",
     "lang_description": "Description",
     "lang_duration": "Duration",
diff --git a/modules-available/exams/templates/page-add-edit-exam.html b/modules-available/exams/templates/page-add-edit-exam.html
index f4db8a93..290b9f64 100644
--- a/modules-available/exams/templates/page-add-edit-exam.html
+++ b/modules-available/exams/templates/page-add-edit-exam.html
@@ -8,101 +8,115 @@
 <div class="alert alert-info">{{lang_addingBasedOnLecture}}:<br><b>{{exam.displayname}}</b></div>
 {{/exam.displayname}}
 
+
 <form class="form" method="POST" action="?do=exams" id="tolleform">
-	<div class="form-group">
-		<div>
-			<label for="locations">{{lang_location}}</label>
-			<p><i>{{lang_locationInfo}}</i></p>
+	<div class="panel panel-default">
+		<div class="panel-heading"><label for="locations">{{lang_location}}</label></div>
+		<div class="panel-body">
+			<div class="form-group">
+				<div>
+					<p><i>{{lang_locationInfo}}</i></p>
+				</div>
+				<select id="locations" multiple name="locations[]">
+					{{#locations}}
+					<option value="{{locationid}}" {{#selected}}selected{{/selected}}>{{locationpad}} {{locationname}}</option>
+					{{/locations}}
+				</select>
+			</div>
 		</div>
-		<select id="locations" multiple name="locations[]">
-			{{#locations}}
-			<option value="{{locationid}}" {{#selected}}selected{{/selected}}>{{locationpad}} {{locationname}}</option>
-			{{/locations}}
-		</select>
 	</div>
 
-	<div class="row form-group">
-		<div class="col-xs-6">
-			<label for="starttime_date">{{lang_begin_date}}</label>
-			<div class="input-group">
-				<span class="input-group-addon">
-					<span class="glyphicon glyphicon-calendar"></span>
-				</span>
-				<input required class="form-control datepicker" name="starttime_date" id="starttime_date"
-						 value="{{exam.starttime_date}}">
-			</div>
-		</div>
-		<div class="col-xs-6">
-			<label for="starttime_time">{{lang_begin_time}}</label>
-			<div class="input-group bootstrap-timepicker timepicker">
-				<span class="input-group-addon">
-					<span class="glyphicon glyphicon-time"></span>
-				</span>
-				<input required type="text" class="form-control timepicker2" name="starttime_time" id="starttime_time"
-						 value="{{exam.starttime_time}}"
-						 pattern="[0-9]{1,2}:[0-9]{2}">
+	<div class="panel panel-default">
+		<div class="panel-heading"><b>{{lang_dateTime}}</b></div>
+		<div class="panel-body">
+			<div class="row form-group">
+				<div class="col-xs-6">
+					<label for="starttime_date">{{lang_begin_date}}</label>
+					<div class="input-group">
+						<span class="input-group-addon">
+							<span class="glyphicon glyphicon-calendar"></span>
+						</span>
+						<input required class="form-control datepicker" name="starttime_date" id="starttime_date"
+								 value="{{exam.starttime_date}}">
+					</div>
+				</div>
+				<div class="col-xs-6">
+					<label for="starttime_time">{{lang_begin_time}}</label>
+					<div class="input-group bootstrap-timepicker timepicker">
+						<span class="input-group-addon">
+							<span class="glyphicon glyphicon-time"></span>
+						</span>
+						<input required type="text" class="form-control timepicker2" name="starttime_time" id="starttime_time"
+								 value="{{exam.starttime_time}}"
+								 pattern="[0-9]{1,2}:[0-9]{2}">
+					</div>
+				</div>
 			</div>
-		</div>
-	</div>
 
-	<div class="row form-group">
-		<div class="col-xs-6">
-			<label for="endtime_date">{{lang_end_date}}</label>
-			<div class="input-group">
-				<span class="input-group-addon">
-					<span class="glyphicon glyphicon-calendar"></span>
-				</span>
-				<input required class="form-control datepicker" name="endtime_date" id="endtime_date"
-						 value="{{exam.endtime_date}}">
+			<div class="row form-group">
+				<div class="col-xs-6">
+					<label for="endtime_date">{{lang_end_date}}</label>
+					<div class="input-group">
+						<span class="input-group-addon">
+							<span class="glyphicon glyphicon-calendar"></span>
+						</span>
+						<input required class="form-control datepicker" name="endtime_date" id="endtime_date"
+								 value="{{exam.endtime_date}}">
+					</div>
+				</div>
+				<div class="col-xs-6">
+					<label for="endtime_time">{{lang_end_time}}</label>
+					<div class="input-group bootstrap-timepicker timepicker">
+						<span class="input-group-addon">
+							<span class="glyphicon glyphicon-time"></span>
+						</span>
+						<input required type="text" class="form-control timepicker2" name="endtime_time" id="endtime_time"
+								 value="{{exam.endtime_time}}"
+								 pattern="[0-9]{1,2}:[0-9]{2}">
+					</div>
+				</div>
 			</div>
-		</div>
-		<div class="col-xs-6">
-			<label for="endtime_time">{{lang_end_time}}</label>
-			<div class="input-group bootstrap-timepicker timepicker">
-				<span class="input-group-addon">
-					<span class="glyphicon glyphicon-time"></span>
-				</span>
-				<input required type="text" class="form-control timepicker2" name="endtime_time" id="endtime_time"
-						 value="{{exam.endtime_time}}"
-						 pattern="[0-9]{1,2}:[0-9]{2}">
+
+			<div class="panel">
+				<div class="panel-body">
+					{{lang_duration}}: <span id="exam-duration">-</span>
+				</div>
 			</div>
 		</div>
 	</div>
 
-	<div class="panel">
+	<div class="panel panel-default">
+		<div class="panel-heading"><label for="lecturelist">{{lang_autoStartLecture}}</label></div>
 		<div class="panel-body">
-			{{lang_duration}}: <span id="exam-duration">-</span>
-		</div>
-	</div>
-
-	<div class="row form-group">
-		<div class="form-group col-xs-12">
-			<label for="description">{{lang_autoStartLecture}}</label>
-			<p><i>{{lang_autoStartInfo}}</i></p>
-			<div class="input-group">
-				<span class="input-group-addon">
-					<span class="glyphicon glyphicon-pencil"></span>
-				</span>
-				<select class="form-control" id="lecturelist" name="lectureid">
-					<option value="">{{lang_none}}</option>
-					{{#lectures}}
-					<option data-from="{{starttime}}" data-to="{{endtime}}" value="{{lectureid}}" {{selected}} >{{displayname}}</option>
-					{{/lectures}}
-				</select>
+			<div class="row form-group">
+				<div class="form-group col-xs-12">
+					<p><i>{{lang_autoStartInfo}}</i></p>
+					<div class="input-group">
+						<span class="input-group-addon">
+							<span class="glyphicon glyphicon-pencil"></span>
+						</span>
+						<select class="form-control" id="lecturelist" name="lectureid">
+							<option value="">{{lang_none}}</option>
+							{{#lectures}}
+							<option data-from="{{starttime}}" data-to="{{endtime}}" value="{{lectureid}}" {{selected}} >{{displayname}}</option>
+							{{/lectures}}
+						</select>
+					</div>
+				</div>
+				<div class="form-group col-xs-12">
+					<div class="checkbox"><input id="autologin" type="checkbox" name="autologin" value="demo" class="form-control" {{#exam.autologin}}checked{{/exam.autologin}}><label for="autologin">{{lang_autoLogin}}</label></div>
+					<p><i>{{lang_autoLoginInfo}}</i></p>
+				</div>
+				<div class="col-xs-12" id="lecture-info">
+					-
+				</div>
 			</div>
 		</div>
-		<div class="form-group col-xs-12">
-			<div class="checkbox"><input id="autologin" type="checkbox" name="autologin" value="demo" class="form-control" {{#exam.autologin}}checked{{/exam.autologin}}><label for="autologin">{{lang_autoLogin}}</label></div>
-			<p><i>{{lang_autoLoginInfo}}</i></p>
-		</div>
-		<div class="col-xs-12" id="lecture-info">
-			-
-		</div>
 	</div>
 
-	<div class="row form-group">
-		<div class="form-group col-xs-12">
-			<label for="description">{{lang_description}}</label>
+	<div class="panel panel-default">
+		<div class="panel-heading"><label for="description">{{lang_description}}</label></div>
+		<div class="panel-body">
 			<textarea class="form-control" type="textarea" name="description" id="description">{{exam.description}}</textarea>
 		</div>
 	</div>
@@ -111,13 +125,38 @@
 	<input type="hidden" name="token" value="{{token}}">
 	<input type="hidden" name="examid" value="{{exam.examid}}">
 	<div class="text-right" style="margin-bottom: 20px">
-		<button type="button" id="cancelButton" class="btn btn-default">{{lang_cancel}}</button>
-		<button type="submit" id="saveButton" class="btn btn-primary" style="margin-right: 10px"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button>
+		<button type="button" id="cancelButton" class="btn btn-default"< style="margin-right: 10px">{{lang_cancel}}</button>
+		<button type="button" onclick="checkGlobalExam()" id="saveButton" class="btn btn-primary"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button>
+	</div>
+
+	<div class ="modal fade" id="confirmGlobalModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+		<div class="modal-dialog" style="width: 400px" role="document">
+			<div class="modal-content">
+				<div class="modal-body">
+					{{lang_comfirmGlobalExam}}
+				</div>
+				<div class="modal-footer">
+					<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
+					<button type="submit" class="btn btn-sm btn-primary"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button>
+				</div>
+			</div>
+		</div>
 	</div>
 
 </form>
 
+
+
 <script type="application/javascript"><!--
+
+function checkGlobalExam() {
+	if ($('#locations option:selected').length === 0 && $('#locations option').length > 1) {
+		$("#confirmGlobalModal").modal();
+	} else {
+		$('#tolleform').submit();
+	}
+}
+
 document.addEventListener("DOMContentLoaded", function () {
 	var filename = "modules/bootstrap_datepicker/lang/bootstrap-datepicker." + LANG + ".js";
 	moment.locale(LANG);
@@ -193,7 +232,7 @@ document.addEventListener("DOMContentLoaded", function () {
 			}
 		});
 		updateLectureInfo();
-	}
+	};
 
 	var updateLectureInfo = function() {
 		var sel = $('#lecturelist option:selected');
@@ -202,7 +241,7 @@ document.addEventListener("DOMContentLoaded", function () {
 		} else {
 			$('#lecture-info').text('{{lang_lectureOutOfRange}} (' + slxMoment(sel.data('from') * 1000).format('YYYY-MM-DD H:mm') + ' - ' + slxMoment(sel.data('to') * 1000).format('YYYY-MM-DD H:mm') + ')');
 		}
-	}
+	};
 
 	start_date.change(startEndChanged);
 	start_time.change(startEndChanged);
@@ -210,14 +249,6 @@ document.addEventListener("DOMContentLoaded", function () {
 	end_time.change(startEndChanged);
 	$('#lecturelist').change(updateLectureInfo);
 
-	$('#tolleform').submit(function(ev) {
-		if ($('#locations option:selected').length === 0 && $('#locations option').length > 1) {
-			if (!confirm('{{lang_comfirmGlobalExam}}')) {
-				ev.preventDefault();
-			}
-		}
-	});
-
 	$("#cancelButton").click(function () {
 		window.location.replace("?do=exams");
 	});
diff --git a/modules-available/exams/templates/page-exams.html b/modules-available/exams/templates/page-exams.html
index 06e5905c..29b8c319 100644
--- a/modules-available/exams/templates/page-exams.html
+++ b/modules-available/exams/templates/page-exams.html
@@ -5,7 +5,7 @@
 	</div>
 	<div class="panel-body">
 		<div class="slx-space">
-			<table class="table stupidtable">
+			<table class="table table-bordered stupidtable">
 				<thead>
 					<tr>
 						<th data-sort="int">{{lang_id}}</th>
@@ -54,7 +54,6 @@
 				</tbody>
 			</table>
 		</div>
-
 		<div class="text-right">
 			<div class="btn-group" role="group">
 				<a href="?do=exams&action=add" class="btn btn-success"><span class="glyphicon glyphicon-plus-sign"></span> {{lang_addExam}}</a>