[exams] fixed inconsistencies + made tables sortable

3 files changed, 110 insertions, 89 deletions

diff --git a/modules-available/exams/templates/page-add-edit-exam.html b/modules-available/exams/templates/page-add-edit-exam.html
index bf000df5..cb1578ad 100644
--- a/modules-available/exams/templates/page-add-edit-exam.html
+++ b/modules-available/exams/templates/page-add-edit-exam.html
@@ -1,8 +1,8 @@
 {{#exam.examid}}
-<h1>{{lang_editExam}}</h1>
+<h1>{{lang_headingEditExam}}</h1>
 {{/exam.examid}}
 {{^exam.examid}}
-<h1>{{lang_addExam}}</h1>
+<h1>{{lang_headingAddExam}}</h1>
 {{/exam.examid}}
 {{#exam.displayname}}
 <div class="alert alert-info">{{lang_addingBasedOnLecture}}:<br><b>{{exam.displayname}}</b></div>
@@ -110,7 +110,11 @@
 	<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" type="submit">{{lang_save}}</button>
+	<div class="text-right" style="margin-bottom: 20px">
+		<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"><span class="glyphicon glyphicon-remove"></span> {{lang_cancel}}</button>
+	</div>
+
 </form>
 
 <script type="application/javascript"><!--
@@ -214,5 +218,9 @@ document.addEventListener("DOMContentLoaded", function () {
 		}
 	});
 
+	$("#cancelButton").click(function () {
+		window.location.replace("?do=exams");
+	});
+
 }, false);
 // --></script>
diff --git a/modules-available/exams/templates/page-exams.html b/modules-available/exams/templates/page-exams.html
index fc88e4f4..18dd1ab2 100644
--- a/modules-available/exams/templates/page-exams.html
+++ b/modules-available/exams/templates/page-exams.html
@@ -1,52 +1,59 @@
 <h2>{{lang_allExamPeriods}}</h2>
 
 <div class="slx-space">
-	<table class="table">
-		<tr>
-			<th>{{lang_id}}</th>
-			<th>{{lang_locations}}</th>
-			<th>{{lang_begin}}</th>
-			<th>{{lang_end}}</th>
-			<th>{{lang_actions}}</th>
-		</tr>
-		{{#exams}}
-		<tr class="{{rowClass}}">
-			<td>{{examid}}</td>
-			<td>
-				{{locationnames}}
-				{{^locationnames}}
-				<i>{{lang_global}}</i>
-				{{/locationnames}}
-				{{#lecturename}}
-				<div>
-					<b>{{lang_autostart}}</b>: {{lecturename}}
-				</div>
-				{{/lecturename}}
-				<div class="small">
-					{{description}}
-					{{^description}}
-					<i>{{lang_noDescription}}</i>
-					{{/description}}
-				</div>
-			</td>
-			<td class="text-nowrap">{{starttime_s}}</td>
-			<td class="text-nowrap">{{endtime_s}}</td>
-			<td class="text-nowrap text-right">
-				<form method="POST" action="?do=exams&action=delete" {{^liesInPast}}onsubmit="return confirm('{{lang_deleteConfirmation}}');"{{/liesInPast}} >
-					{{^liesInPast}}
-					<a onclick="slxShow({{starttime}}, {{endtime}})" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-eye-open"></span></a>
-					{{/liesInPast}}
-					<a href="?do=exams&action=edit&examid={{examid}}" class="btn btn-default btn-sm" >{{lang_edit}}</a>
-					<input type="hidden" name="token" value="{{token}}">
-					<input type="hidden" name="examid" value="{{examid}}">
-					<button class="btn {{btnClass}} btn-sm">{{lang_delete}}</button>
-				</form>
-			</td>
-		</tr>
-		{{/exams}}
+	<table class="table stupidtable">
+		<thead>
+			<tr>
+				<th data-sort="int">{{lang_id}}</th>
+				<th data-sort="string">{{lang_locations}}</th>
+				<th data-sort="int">{{lang_begin}}</th>
+				<th data-sort="int">{{lang_end}}</th>
+				<th></th>
+			</tr>
+		</thead>
+		<tbody>
+			{{#exams}}
+			<tr class="{{rowClass}}">
+				<td>{{examid}}</td>
+				<td>
+					{{locationnames}}
+					{{^locationnames}}
+					<i>{{lang_global}}</i>
+					{{/locationnames}}
+					{{#lecturename}}
+					<div>
+						<b>{{lang_autostart}}</b>: {{lecturename}}
+					</div>
+					{{/lecturename}}
+					<div class="small">
+						{{description}}
+						{{^description}}
+						<i>{{lang_noDescription}}</i>
+						{{/description}}
+					</div>
+				</td>
+				<td class="text-nowrap" data-sort-value={{starttime}}>{{starttime_s}}</td>
+				<td class="text-nowrap" data-sort-value={{endtime}}>{{endtime_s}}</td>
+				<td class="text-nowrap text-right">
+					<form method="POST" action="?do=exams&action=delete" {{^liesInPast}}onsubmit="return confirm('{{lang_deleteConfirmation}}');"{{/liesInPast}} >
+						{{^liesInPast}}
+						<a onclick="slxShow({{starttime}}, {{endtime}})" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-eye-open"></span></a>
+						{{/liesInPast}}
+						<a href="?do=exams&action=edit&examid={{examid}}" class="btn btn-default btn-sm" >{{lang_edit}}</a>
+						<input type="hidden" name="token" value="{{token}}">
+						<input type="hidden" name="examid" value="{{examid}}">
+						<button class="btn {{btnClass}} btn-sm">{{lang_delete}}</button>
+					</form>
+				</td>
+			</tr>
+			{{/exams}}
+		</tbody>
 	</table>
 </div>
 
-<div class="btn-group" role="group">
-	<a href="?do=exams&action=add" class="btn btn-success">{{lang_addExam}}</a>
+<div class="text-right" style="margin-bottom: 20px">
+	<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>
+	</div>
 </div>
+
diff --git a/modules-available/exams/templates/page-upcoming-lectures.html b/modules-available/exams/templates/page-upcoming-lectures.html
index 323b1017..b8c47725 100644
--- a/modules-available/exams/templates/page-upcoming-lectures.html
+++ b/modules-available/exams/templates/page-upcoming-lectures.html
@@ -1,46 +1,52 @@
 <h2>{{lang_headingAllExamLectures}}</h2>
 
 <div class="slx-space">
-	<table class="table">
-		<tr>
-			<th>{{lang_lectureName}}</th>
-			<th>{{lang_timeFrame}}</th>
-			<th>{{lang_actions}}</th>
-		</tr>
-		{{#pending_lectures}}
-		<tr class="{{class}}">
-			<td>
-				{{displayname}}
-				<div class="small">
-					<a href="mailto:{{email}}">{{lastname}}, {{firstname}}</a>
-				</div>
-			</td>
-			<td width="30%" class="text-nowrap">
-				{{starttime_s}} &ensp; {{endtime_s}}
-				<div class="small">
-					{{lang_duration}}: {{duration_s}}
-					{{^duration_s}}{{lang_moreThanOneDay}}{{/duration_s}}
-				</div>
-			</td>
-			<td width="20%">
-				<div class="pull-right text-nowrap">
-					<a class="btn btn-sm btn-default" role="button" onclick="slxShow({{starttime}}, {{endtime}})"><span class="glyphicon glyphicon-eye-open"></span></a>
-					<a href="?do=exams&amp;action=add&amp;lectureid={{lectureid}}" class="btn btn-sm btn-default" role="button">
-						<span class="glyphicon glyphicon-plus-sign"></span>
-						<span class="hidden-sm">{{lang_addExam}}</span>
-					</a>
-				</div>
-			</td>
-		</tr>
-		{{/pending_lectures}}
-		{{#decollapse}}
-		<tr class="slx-decollapse">
-			<td colspan="3">
-				<span class="btn-group btn-group-justified">
-					<span class="btn btn-default btn-sm"><span class="glyphicon glyphicon-menu-down"></span></span>
-				</span>
-			</td>
-		</tr>
-		{{/decollapse}}
+	<table class="table stupidtable">
+		<thead>
+			<tr>
+				<th data-sort="string">{{lang_lectureName}}</th>
+				<th data-sort="int">{{lang_timeFrame}}</th>
+				<th></th>
+			</tr>
+		</thead>
+		<tbody>
+			{{#pending_lectures}}
+			<tr class="{{class}}">
+				<td>
+					{{displayname}}
+					<div class="small">
+						<a href="mailto:{{email}}">{{lastname}}, {{firstname}}</a>
+					</div>
+				</td>
+				<td data-sort-value={{starttime}} width="30%" class="text-nowrap">
+					{{starttime_s}} &ensp; {{endtime_s}}
+					<div class="small">
+						{{lang_duration}}: {{duration_s}}
+						{{^duration_s}}{{lang_moreThanOneDay}}{{/duration_s}}
+					</div>
+				</td>
+				<td width="20%">
+					<div class="pull-right text-nowrap">
+						<a class="btn btn-sm btn-default" role="button" onclick="slxShow({{starttime}}, {{endtime}})"><span class="glyphicon glyphicon-eye-open"></span></a>
+						<a href="?do=exams&amp;action=add&amp;lectureid={{lectureid}}" class="btn btn-sm btn-default" role="button">
+							<span class="glyphicon glyphicon-plus-sign"></span>
+							<span class="hidden-sm">{{lang_addExam}}</span>
+						</a>
+					</div>
+				</td>
+			</tr>
+			{{/pending_lectures}}
+		</tbody>
+		<tfoot>
+			{{#decollapse}}
+			<tr class="slx-decollapse">
+				<td colspan="3">
+					<span class="btn-group btn-group-justified">
+						<span class="btn btn-default btn-sm"><span class="glyphicon glyphicon-menu-down"></span></span>
+					</span>
+				</td>
+			</tr>
+			{{/decollapse}}
+		</tfoot>
 	</table>
 </div>
\ No newline at end of file