From 43281909e652d651e8d5b721b440ea5c6eaf8798 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 24 Jun 2016 14:24:00 +0200
Subject: [exams] Indent location by tree depth; fix ordering of locations in
 vis.js

---
 modules-available/exams/templates/page-add-edit-exam.html |  2 +-
 modules-available/exams/templates/page-exams.html         | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

(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
index 98683a54..3cc38cfb 100644
--- a/modules-available/exams/templates/page-add-edit-exam.html
+++ b/modules-available/exams/templates/page-add-edit-exam.html
@@ -10,7 +10,7 @@
 		<label for="locations">{{lang_location}}</label>
 		<select id="locations" multiple name="locations[]">
 			{{#locations}}
-			<option value="{{locationid}}" {{#selected}}selected{{/selected}}> {{locationname}}</option>
+			<option value="{{locationid}}" {{#selected}}selected{{/selected}}>{{locationpad}} {{locationname}}</option>
 			{{/locations}}
 		</select>
 	</div>
diff --git a/modules-available/exams/templates/page-exams.html b/modules-available/exams/templates/page-exams.html
index d0be479d..45ec0b50 100644
--- a/modules-available/exams/templates/page-exams.html
+++ b/modules-available/exams/templates/page-exams.html
@@ -43,8 +43,14 @@
 <script type="application/javascript"><!--
 
 
-function customOrder(a, b) {
-	return 1000; // just in order of appeareance
+function itemOrderFun(a, b) {
+	return a.content.localeCompare(b.content);
+}
+
+function groupOrderFun(a, b) {
+	var s = a.sortIndex - b.sortIndex;
+	if (s != 0) return s;
+	return itemOrderFun(a, b);
 }
 
 document.addEventListener("DOMContentLoaded", function () {
@@ -67,7 +73,8 @@ document.addEventListener("DOMContentLoaded", function () {
 		'max'		: {{vis_max_date}},
 		'zoomMin': 6 * 3600 * 1000,
 		'zoomMax': 2 * 86400 * 1000,
-		'order' 	: customOrder,
+		'order' 	: itemOrderFun,
+		'groupOrder' : groupOrderFun,
 		'locale'	: language,
 		'moment'	: function(date) { return vis.moment(date).utc(); }
 	};
-- 
cgit v1.2.3-55-g7522