From 5f6e43734d8fb60b74e47b91f81adac41ae69597 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Fri, 29 Sep 2017 13:36:54 +0200
Subject:
 [baseconfig][baseconfig_partitions_cdn][eventlog][minilinux][permissionmanager][rebootcontrol][statisics_reporting][syslog]
 fixed inconsistencies

---
 .../lang/de/template-tags.json                     |   1 +
 .../lang/en/template-tags.json                     |   1 +
 .../templates/columnChooser.html                   | 107 ++++++++++++---------
 3 files changed, 63 insertions(+), 46 deletions(-)

(limited to 'modules-available/statistics_reporting')

diff --git a/modules-available/statistics_reporting/lang/de/template-tags.json b/modules-available/statistics_reporting/lang/de/template-tags.json
index fb624fad..8d00978c 100644
--- a/modules-available/statistics_reporting/lang/de/template-tags.json
+++ b/modules-available/statistics_reporting/lang/de/template-tags.json
@@ -10,6 +10,7 @@
     "lang_location": "Ort",
     "lang_longSessions": "Sitzungen \u2265 60s",
     "lang_medianSessionLength": "Sitzungsdauer Median",
+    "lang_moduleName": "Statistikauswertung",
     "lang_reportMoreInfo": "Weitere Informationen...",
     "lang_reportingDescription": "Helfen Sie uns bwLehrpool durch das w\u00f6chentliche Verschicken eines anonymisierten Statistikberichts zu verbessern. Wenn Sie den Inhalt eines solchen Reports genauer inspizieren wollen, k\u00f6nnen Sie \u00fcber den untenstehenden Button einen aktuellen Report Ihres Servers herunterladen.",
     "lang_reportingLabel": "Anonymisierte Nutzungsstatistiken \u00fcbermitteln",
diff --git a/modules-available/statistics_reporting/lang/en/template-tags.json b/modules-available/statistics_reporting/lang/en/template-tags.json
index 4e33ffed..407b52b6 100644
--- a/modules-available/statistics_reporting/lang/en/template-tags.json
+++ b/modules-available/statistics_reporting/lang/en/template-tags.json
@@ -10,6 +10,7 @@
     "lang_location": "Location",
     "lang_longSessions": "Sessions \u2265 60s",
     "lang_medianSessionLength": "Median Session Length",
+    "lang_moduleName": "Statistics Reporting",
     "lang_reportMoreInfo": "More information...",
     "lang_reportingDescription": "Help us improve bwLehrpool by automatically sending an anonymized statistics report once a week. If you want to check what data the report contains, you can download such a report for reference below.",
     "lang_reportingLabel": "Send anonymized usage statistics",
diff --git a/modules-available/statistics_reporting/templates/columnChooser.html b/modules-available/statistics_reporting/templates/columnChooser.html
index d0408b6f..9ce92367 100644
--- a/modules-available/statistics_reporting/templates/columnChooser.html
+++ b/modules-available/statistics_reporting/templates/columnChooser.html
@@ -1,64 +1,78 @@
 <form method="get" id="controlsForm">
 	<input type="hidden" name="do" value="statistics_reporting">
-	<div class="row">
-		<div class="col-md-12">
-			<button id="button-settings" type="button" class="pull-right btn btn-{{settingsButtonClass}}" data-toggle="modal" data-target="#modal-settings"><span class="glyphicon glyphicon-cog"></span></button>
-			<strong class="text-capitalize">{{lang_displaySelection}}</strong>
+
+	<div class="page-header">
+		<div class="form-inline pull-right">
+			<div class="input-group">
+				<select class="form-control" name="format">
+					<option value="json">JSON</option>
+					<option value="csv">CSV (Excel)</option>
+					<option value="xml">XML</option>
+				</select>
+				<div class="input-group-btn">
+					<button type="submit" class="btn btn-default" name="action" value="export">{{lang_export}}</button>
+				</div>
+			</div>
+			<button id="button-settings" type="button" class="btn btn-{{settingsButtonClass}}" data-toggle="modal" data-target="#modal-settings"><span class="glyphicon glyphicon-cog"></span> Settings</button>
 		</div>
+		<h1>{{lang_moduleName}}</h1>
 	</div>
-	<div class="row top-row">
-		<div class="col-md-4">
-			<select name="type" id="select-table" class="form-control">
-				{{#tables}}
-				<option value="{{value}}" {{selected}}>{{name}}</option>
-				{{/tables}}
-			</select>
-		</div>
-		<div class="col-md-4">
-			<select name="cutoff" id="select-cutoff" class="form-control">
-				{{#days}}
-				<option value="{{days}}" {{selected}}>{{days}} {{lang_days}}</option>
-				{{/days}}
-			</select>
+
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			<strong class="text-capitalize">{{lang_displaySelection}}</strong>
 		</div>
-		<div class="col-md-3">
-			<div id="slider">
-				<div id="lower-handle" class="ui-slider-handle"></div>
-				<div id="upper-handle" class="ui-slider-handle"></div>
-				<input type="hidden" id="lower-field" name="lower" value="{{lower}}">
-				<input type="hidden" id="upper-field" name="upper" value="{{upper}}">
+		<div class="panel-body">
+			<div class="row top-row">
+				<div class="col-md-4">
+					<select name="type" id="select-table" class="form-control">
+						{{#tables}}
+						<option value="{{value}}" {{selected}}>{{name}}</option>
+						{{/tables}}
+					</select>
+				</div>
+				<div class="col-md-3">
+					<select name="cutoff" id="select-cutoff" class="form-control">
+						{{#days}}
+						<option value="{{days}}" {{selected}}>{{days}} {{lang_days}}</option>
+						{{/days}}
+					</select>
+				</div>
+				<div class="col-md-3" style="margin-top: 10px;">
+					<div id="slider">
+						<div id="lower-handle" class="ui-slider-handle"></div>
+						<div id="upper-handle" class="ui-slider-handle"></div>
+						<input type="hidden" id="lower-field" name="lower" value="{{lower}}">
+						<input type="hidden" id="upper-field" name="upper" value="{{upper}}">
+					</div>
+				</div>
+				<div class="col-md-1">
+					<button type="submit" class="btn btn-primary">{{lang_apply}}</button>
+				</div>
 			</div>
+
 		</div>
 	</div>
-	<div class="row top-row">
-		<div class="col-md-12 form-inline">
-			<div><strong class="text-capitalize">{{lang_displayColumns}}</strong></div>
-			{{#columns}}
-				<div class="checkbox">
-					<input id="id_{{id}}" name="{{id}}" value="on" type="checkbox" class="column-toggle form-control" {{checked}}>
-					<label for="id_{{id}}">{{name}}</label>
-				</div>
-			{{/columns}}
+
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			<strong class="text-capitalize">{{lang_displayColumns}}</strong>
 		</div>
-	</div>
-	<div class="row top-row">
-		<div class="col-md-12 form-inline">
-			<div class="pull-right input-group">
-				<select class="form-control" name="format">
-					<option value="json">JSON</option>
-					<option value="csv">CSV (Excel)</option>
-					<option value="xml">XML</option>
-				</select>
-				<div class="input-group-btn">
-				<button type="submit" class="btn btn-default" name="action" value="export">{{lang_export}}</button>
+		<div class="panel-body">
+			<div class="row top-row">
+				<div class="col-md-12 form-inline">
+					{{#columns}}
+					<div class="checkbox">
+						<input id="id_{{id}}" name="{{id}}" value="on" type="checkbox" class="column-toggle form-control" {{checked}}>
+						<label for="id_{{id}}">{{name}}</label>
+					</div>
+					{{/columns}}
 				</div>
 			</div>
-			<button type="submit" class="btn btn-primary">{{lang_apply}}</button>
 		</div>
 	</div>
 </form>
 
-<hr>
 
 <div id="modal-settings" class="modal fade" role="dialog">
 	<div class="modal-dialog">
@@ -81,6 +95,7 @@
 				</div>
 			</div>
 			<div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
 				<button type="button" class="btn btn-primary" data-dismiss="modal" onclick="saveSettings()">{{lang_save}}</button>
 			</div>
 		</div>
-- 
cgit v1.2.3-55-g7522