From c53f811e83b6cf7124e2d5f26554276436f3b7cd Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 1 Feb 2017 15:58:19 +0100
Subject: [statistics_reporting] Show hand-cursor for sortable columns

---
 modules-available/statistics_reporting/style.css   |   6 +-
 .../statistics_reporting/templates/_page.html      | 238 ++++++++++-----------
 .../templates/columnChooser.html                   |   3 +-
 3 files changed, 112 insertions(+), 135 deletions(-)

(limited to 'modules-available')

diff --git a/modules-available/statistics_reporting/style.css b/modules-available/statistics_reporting/style.css
index 4f314b14..81dc74b0 100644
--- a/modules-available/statistics_reporting/style.css
+++ b/modules-available/statistics_reporting/style.css
@@ -37,6 +37,6 @@
     line-height: 1.6em;
 }
 
-#applybound {
-    display: none;
-}
\ No newline at end of file
+th[data-sort] {
+    cursor: pointer;
+}
diff --git a/modules-available/statistics_reporting/templates/_page.html b/modules-available/statistics_reporting/templates/_page.html
index 39726d51..1f4ac52c 100644
--- a/modules-available/statistics_reporting/templates/_page.html
+++ b/modules-available/statistics_reporting/templates/_page.html
@@ -1,133 +1,111 @@
-<div class="container-fluid">
-	<div class="row">
-		<div class="col-md-12">
-			<table id="table-total" class="table table-condensed table-striped">
-				<thead>
-					<tr>
-						<th class="text-left col-md-2"></th>
-						<th class="text-left column-totaltime">{{lang_totalTime}}</th>
-						<th class="text-left column-mediantime">{{lang_medianSessionLength}}</th>
-						<th class="text-left column-longsessions">{{lang_longSessions}}</th>
-						<th class="text-left column-shortsessions">{{lang_shortSessions}}</th>
-						<th class="text-left column-timeoffline">{{lang_overallOfftime}}</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<th class="text-left">{{lang_total}}</th>
-						<td class="text-left column-totaltime">{{time_s}}</td>
-						<td class="text-left column-mediantime">{{medianTime_s}}</td>
-						<td class="text-left column-longsessions">{{sessions}}</td>
-						<td class="text-left column-shortsessions">{{shortSessions}}</td>
-						<td class="text-left column-timeoffline">{{totalOfftime_s}}</td>
-					</tr>
-				</tbody>
-			</table>
-		</div>
-	</div>
-	<div class="row">
-		<div class="col-md-12">
-			<table id="table-perlocation" class="table table-condensed table-striped">
-				<thead>
-					<tr>
-						<th data-sort="string" class="text-left col-md-2">{{lang_location}}</th>
-						<th data-sort="int" data-sort-default="desc" class="text-left column-totaltime">{{lang_totalTime}}</th>
-						<th data-sort="int" data-sort-default="desc" class="text-left column-mediantime">{{lang_medianSessionLength}}</th>
-						<th data-sort="int" data-sort-default="desc" class="text-left column-longsessions">{{lang_longSessions}}</th>
-						<th data-sort="int" data-sort-default="desc" class="text-left column-shortsessions">{{lang_shortSessions}}</th>
-						<th data-sort="int" data-sort-default="desc" class="text-left column-timeoffline">{{lang_totalOffTime}}</th>
-					</tr>
-				</thead>
-				<tbody>
-					{{#perLocation}}
-					<tr>
-						<td class="locationName text-left">{{location}}</td>
-						<td data-sort-value="{{time}}" class="text-left column-totaltime">{{time_s}}</td>
-						<td data-sort-value="{{medianTime}}" class="text-left column-mediantime">{{medianTime_s}}</td>
-						<td class="text-left column-longsessions">{{sessions}}</td>
-						<td class="text-left column-shortsessions">{{shortSessions}}</td>
-						<td data-sort-value="{{offTime}}" class="text-left column-timeoffline">{{offTime_s}}</td>
-					</tr>
-					{{/perLocation}}
-				</tbody>
-			</table>
-		</div>
-	</div>
-	<div class="row">
-		<div class="col-md-12">
-			<table id="table-perclient" class="table table-condensed table-striped">
-				<thead>
-					<tr>
-						<th data-sort="string" class="text-left col-md-4">{{lang_hostname}}</th>
-						<th data-sort="string" class="text-left column-location">{{lang_location}}</th>
-						<th data-sort="int" data-sort-default="desc" class="text-left column-totaltime">{{lang_totalTime}}</th>
-						<th data-sort="int" data-sort-default="desc" class="text-left column-mediantime">{{lang_medianSessionLength}}</th>
-						<th data-sort="int" data-sort-default="desc" class="text-left column-longsessions">{{lang_longSessions}}</th>
-						<th data-sort="int" data-sort-default="desc" class="text-left column-shortsessions">{{lang_shortSessions}}</th>
-						<th data-sort="int" data-sort-default="desc" class="text-left column-timeoffline">{{lang_totalOffTime}}</th>
-						<th data-sort="int" data-sort-default="desc" class="text-left column-lastlogout">{{lang_clientLogout}}</th>
-						<th data-sort="int" data-sort-default="desc" class="text-left column-laststart">{{lang_clientStart}}</th>
-					</tr>
-				</thead>
-				<tbody>
-					{{#perClient}}
-					<tr>
-						<td class="text-left">{{hostname}}</td>
-						<td class="text-left column-location"><a class="locationLink" href="#">{{location}}</a></td>
-						<td data-sort-value="{{time}}" class="text-left column-totaltime">{{time_s}}</td>
-						<td data-sort-value="{{medianTime}}" class="text-left column-mediantime">{{medianTime_s}}</td>
-						<td class="text-left column-longsessions">{{sessions}}</td>
-						<td class="text-left column-shortsessions">{{shortSessions}}</td>
-						<td data-sort-value="{{offTime}}" class="text-left column-timeoffline">{{offTime_s}}</td>
-						<td data-sort-value="{{lastLogout}}" class="text-left column-lastlogout">{{lastLogout_s}}</td>
-						<td data-sort-value="{{lastStart}}" class="text-left column-laststart">{{lastStart_s}}</td>
-					</tr>
-					{{/perClient}}
-				</tbody>
-			</table>
-		</div>
-	</div>
-	<div class="row">
-		<div class="col-md-12">
-			<table id="table-peruser" class="table table-condensed table-striped">
-				<thead>
-				<tr>
-					<th data-sort="string" class="text-left col-md-4">{{lang_user}}</th>
-					<th data-sort="int" data-sort-default="desc" class="text-left column-sessions">{{lang_sessions}}</th>
-				</tr>
-				</thead>
-				<tbody>
-				{{#perUser}}
-				<tr>
-					<td class="text-left">{{user}}</td>
-					<td class="text-left column-sessions">{{sessions}}</td>
-				</tr>
-				{{/perUser}}
-				</tbody>
-			</table>
-		</div>
-	</div>
-	<div class="row">
-		<div class="col-md-12">
-			<table id="table-pervm" class="table table-condensed table-striped">
-				<thead>
-				<tr>
-					<th data-sort="string" class="text-left col-md-4">{{lang_vm}}</th>
-					<th data-sort="int" data-sort-default="desc" class="text-left column-sessions">{{lang_sessions}}</th>
-				</tr>
-				</thead>
-				<tbody>
-				{{#perVM}}
-				<tr>
-					<td class="text-left">{{vm}}</td>
-					<td class="text-left column-sessions">{{sessions}}</td>
-				</tr>
-				{{/perVM}}
-				</tbody>
-			</table>
-		</div>
-	</div>
-</div>
+<table id="table-total" class="table table-condensed table-striped">
+	<thead>
+	<tr>
+		<th class="text-left col-md-2"></th>
+		<th class="text-left column-totaltime">{{lang_totalTime}}</th>
+		<th class="text-left column-mediantime">{{lang_medianSessionLength}}</th>
+		<th class="text-left column-longsessions">{{lang_longSessions}}</th>
+		<th class="text-left column-shortsessions">{{lang_shortSessions}}</th>
+		<th class="text-left column-timeoffline">{{lang_overallOfftime}}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<tr>
+		<th class="text-left">{{lang_total}}</th>
+		<td class="text-left column-totaltime">{{time_s}}</td>
+		<td class="text-left column-mediantime">{{medianTime_s}}</td>
+		<td class="text-left column-longsessions">{{sessions}}</td>
+		<td class="text-left column-shortsessions">{{shortSessions}}</td>
+		<td class="text-left column-timeoffline">{{totalOfftime_s}}</td>
+	</tr>
+	</tbody>
+</table>
+<table id="table-perlocation" class="table table-condensed table-striped">
+	<thead>
+	<tr>
+		<th data-sort="string" class="text-left col-md-2">{{lang_location}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left column-totaltime">{{lang_totalTime}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left column-mediantime">{{lang_medianSessionLength}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left column-longsessions">{{lang_longSessions}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left column-shortsessions">{{lang_shortSessions}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left column-timeoffline">{{lang_totalOffTime}}</th>
+	</tr>
+	</thead>
+	<tbody>
+	{{#perLocation}}
+	<tr>
+		<td class="locationName text-left">{{location}}</td>
+		<td data-sort-value="{{time}}" class="text-left column-totaltime">{{time_s}}</td>
+		<td data-sort-value="{{medianTime}}" class="text-left column-mediantime">{{medianTime_s}}</td>
+		<td class="text-left column-longsessions">{{sessions}}</td>
+		<td class="text-left column-shortsessions">{{shortSessions}}</td>
+		<td data-sort-value="{{offTime}}" class="text-left column-timeoffline">{{offTime_s}}</td>
+	</tr>
+	{{/perLocation}}
+	</tbody>
+</table>
+<table id="table-perclient" class="table table-condensed table-striped">
+	<thead>
+	<tr>
+		<th data-sort="string" class="text-left col-md-4">{{lang_hostname}}</th>
+		<th data-sort="string" class="text-left column-location">{{lang_location}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left column-totaltime">{{lang_totalTime}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left column-mediantime">{{lang_medianSessionLength}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left column-longsessions">{{lang_longSessions}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left column-shortsessions">{{lang_shortSessions}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left column-timeoffline">{{lang_totalOffTime}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left column-lastlogout">{{lang_clientLogout}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left column-laststart">{{lang_clientStart}}</th>
+	</tr>
+	</thead>
+	<tbody>
+	{{#perClient}}
+	<tr>
+		<td class="text-left">{{hostname}}</td>
+		<td class="text-left column-location"><a class="locationLink" href="#">{{location}}</a></td>
+		<td data-sort-value="{{time}}" class="text-left column-totaltime">{{time_s}}</td>
+		<td data-sort-value="{{medianTime}}" class="text-left column-mediantime">{{medianTime_s}}</td>
+		<td class="text-left column-longsessions">{{sessions}}</td>
+		<td class="text-left column-shortsessions">{{shortSessions}}</td>
+		<td data-sort-value="{{offTime}}" class="text-left column-timeoffline">{{offTime_s}}</td>
+		<td data-sort-value="{{lastLogout}}" class="text-left column-lastlogout">{{lastLogout_s}}</td>
+		<td data-sort-value="{{lastStart}}" class="text-left column-laststart">{{lastStart_s}}</td>
+	</tr>
+	{{/perClient}}
+	</tbody>
+</table>
+<table id="table-peruser" class="table table-condensed table-striped">
+	<thead>
+	<tr>
+		<th data-sort="string" class="text-left col-md-4">{{lang_user}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left column-sessions">{{lang_sessions}}</th>
+	</tr>
+	</thead>
+	<tbody>
+	{{#perUser}}
+	<tr>
+		<td class="text-left">{{user}}</td>
+		<td class="text-left column-sessions">{{sessions}}</td>
+	</tr>
+	{{/perUser}}
+	</tbody>
+</table>
+<table id="table-pervm" class="table table-condensed table-striped">
+	<thead>
+	<tr>
+		<th data-sort="string" class="text-left col-md-4">{{lang_vm}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left column-sessions">{{lang_sessions}}</th>
+	</tr>
+	</thead>
+	<tbody>
+	{{#perVM}}
+	<tr>
+		<td class="text-left">{{vm}}</td>
+		<td class="text-left column-sessions">{{sessions}}</td>
+	</tr>
+	{{/perVM}}
+	</tbody>
+</table>
 
 
 
diff --git a/modules-available/statistics_reporting/templates/columnChooser.html b/modules-available/statistics_reporting/templates/columnChooser.html
index 86903583..c51250bd 100644
--- a/modules-available/statistics_reporting/templates/columnChooser.html
+++ b/modules-available/statistics_reporting/templates/columnChooser.html
@@ -21,7 +21,7 @@
 				<div id="lower-handle" class="ui-slider-handle"></div>
 				<div id="upper-handle" class="ui-slider-handle"></div>
 			</div>
-			<button id="applybound" type="button" class="btn btn-sm btn-primary" onclick="reloadPage()">{{lang_apply}}</button>
+			<button id="applybound" type="button" class="btn btn-sm btn-primary collapse" onclick="reloadPage()">{{lang_apply}}</button>
 			<button id="button-settings" type="button" class="pull-right btn btn-default" data-toggle="modal" data-target="#modal-settings" onclick="loadSettings()"><span class="glyphicon glyphicon-cog"></span></button>
 		</div>
 		<div class="col-md-12 buttonbar">
@@ -38,7 +38,6 @@
 	</div>
 </div>
 
-
 <div id="modal-settings" class="modal fade" role="dialog">
 	<div class="modal-dialog">
 
-- 
cgit v1.2.3-55-g7522