Merge branch 'permission-manager' of git.openslx.org:openslx-ng/slx-admin into permission-manager

7 files changed, 34 insertions, 27 deletions

diff --git a/modules-available/rebootcontrol/templates/_page.html b/modules-available/rebootcontrol/templates/_page.html
index dfbd6835..1bef8dd4 100644
--- a/modules-available/rebootcontrol/templates/_page.html
+++ b/modules-available/rebootcontrol/templates/_page.html
@@ -1,4 +1,5 @@
 <div class="page-header">
+	<button type="button" id="settingsButton" class="btn btn-default pull-right" data-toggle="modal" data-target="#settingsModal"><span class="glyphicon glyphicon-cog"></span> {{lang_settings}}</button>
 	<h1>{{lang_rebootControl}}</h1>
 </div>
 
@@ -14,7 +15,6 @@
 						{{/locations}}
 					</select>
 				</label>
-			<button type="button" id="settingsButton" class="btn btn-default pull-right" data-toggle="modal" data-target="#settingsModal"><span class="glyphicon glyphicon-cog"></span></button>
 			<button type="button" id="selectAllButton" class="btn btn-primary pull-right" onclick="selectAllRows()"><span class="glyphicon glyphicon-check"></span> {{lang_selectall}}</button>
 			<button type="button" id="unselectAllButton" class="btn btn-default pull-right" onclick="unselectAllRows()" style="display: none;"><span class="glyphicon glyphicon-unchecked"></span> {{lang_unselectall}}</button>
 			<button type="button" id="rebootButton" class="btn btn-warning pull-right" data-toggle="modal" data-target="#rebootModal" disabled><span class="glyphicon glyphicon-repeat"></span> {{lang_rebootButton}}</button>
@@ -79,7 +79,7 @@
 				</div>
 				<div class="modal-body">
 					<span id="pubKeyTitle">{{lang_pubKey}}</span>
-					<button class="btn btn-s btn-warning pull-right" onclick="generateNewKeypair()" type="button">{{lang_genNew}}</button>
+					<button class="btn btn-s btn-warning pull-right" onclick="generateNewKeypair()" type="button"><span class="glyphicon glyphicon-refresh"></span> {{lang_genNew}}</button>
 					<pre id="pubKey">{{pubKey}}</pre>
 				</div>
 				<div class="modal-footer">
diff --git a/modules-available/statistics_reporting/lang/de/template-tags.json b/modules-available/statistics_reporting/lang/de/template-tags.json
index 8d00978c..f8829b79 100644
--- a/modules-available/statistics_reporting/lang/de/template-tags.json
+++ b/modules-available/statistics_reporting/lang/de/template-tags.json
@@ -16,6 +16,7 @@
     "lang_reportingLabel": "Anonymisierte Nutzungsstatistiken \u00fcbermitteln",
     "lang_sessions": "Sitzungen",
     "lang_shortSessions": "Sitzungen < 60s",
+    "lang_show": "Anzeigen",
     "lang_total": "Gesamt",
     "lang_totalOffTime": "Gesamtzeit offline",
     "lang_totalTime": "Gesamtzeit",
diff --git a/modules-available/statistics_reporting/lang/en/template-tags.json b/modules-available/statistics_reporting/lang/en/template-tags.json
index 407b52b6..73c21112 100644
--- a/modules-available/statistics_reporting/lang/en/template-tags.json
+++ b/modules-available/statistics_reporting/lang/en/template-tags.json
@@ -16,6 +16,7 @@
     "lang_reportingLabel": "Send anonymized usage statistics",
     "lang_sessions": "Sessions",
     "lang_shortSessions": "Sessions < 60s",
+    "lang_show": "Show",
     "lang_total": "Total",
     "lang_totalOffTime": "Total Time Offline",
     "lang_totalTime": "Total Time",
diff --git a/modules-available/statistics_reporting/templates/columnChooser.html b/modules-available/statistics_reporting/templates/columnChooser.html
index 9ce92367..0059e681 100644
--- a/modules-available/statistics_reporting/templates/columnChooser.html
+++ b/modules-available/statistics_reporting/templates/columnChooser.html
@@ -2,36 +2,24 @@
 	<input type="hidden" name="do" value="statistics_reporting">
 
 	<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>
+		<button id="button-settings" type="button" class="btn btn-{{settingsButtonClass}} pull-right" data-toggle="modal" data-target="#modal-settings"><span class="glyphicon glyphicon-cog"></span> Settings</button>
 		<h1>{{lang_moduleName}}</h1>
 	</div>
 
 	<div class="panel panel-default">
 		<div class="panel-heading">
-			<strong class="text-capitalize">{{lang_displaySelection}}</strong>
+			{{lang_displaySelection}}
 		</div>
 		<div class="panel-body">
 			<div class="row top-row">
-				<div class="col-md-4">
+				<div class="col-md-2">
 					<select name="type" id="select-table" class="form-control">
 						{{#tables}}
 						<option value="{{value}}" {{selected}}>{{name}}</option>
 						{{/tables}}
 					</select>
 				</div>
-				<div class="col-md-3">
+				<div class="col-md-2">
 					<select name="cutoff" id="select-cutoff" class="form-control">
 						{{#days}}
 						<option value="{{days}}" {{selected}}>{{days}} {{lang_days}}</option>
@@ -47,8 +35,21 @@
 					</div>
 				</div>
 				<div class="col-md-1">
-					<button type="submit" class="btn btn-primary">{{lang_apply}}</button>
+						<button type="submit" class="btn btn-primary">{{lang_show}}</button>
 				</div>
+				<div class="col-md-3">
+					<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>
+				</div>
+
 			</div>
 
 		</div>
@@ -56,7 +57,7 @@
 
 	<div class="panel panel-default">
 		<div class="panel-heading">
-			<strong class="text-capitalize">{{lang_displayColumns}}</strong>
+			{{lang_displayColumns}}
 		</div>
 		<div class="panel-body">
 			<div class="row top-row">
diff --git a/modules-available/syslog/lang/de/template-tags.json b/modules-available/syslog/lang/de/template-tags.json
index 49e94602..c8b2bb45 100644
--- a/modules-available/syslog/lang/de/template-tags.json
+++ b/modules-available/syslog/lang/de/template-tags.json
@@ -6,5 +6,6 @@
     "lang_filter": "Filter",
     "lang_go": "Go",
     "lang_not": "not",
-    "lang_when": "Wann"
+    "lang_when": "Wann",
+    "lang_applyFilter": "Filter anwenden"
 }
\ No newline at end of file
diff --git a/modules-available/syslog/lang/en/template-tags.json b/modules-available/syslog/lang/en/template-tags.json
index 71f61693..7dae52d9 100644
--- a/modules-available/syslog/lang/en/template-tags.json
+++ b/modules-available/syslog/lang/en/template-tags.json
@@ -6,5 +6,6 @@
     "lang_filter": "Filter",
     "lang_go": "Go",
     "lang_not": "not",
-    "lang_when": "When"
+    "lang_when": "When",
+    "lang_applyFilter": "Apply Filter"
 }
\ No newline at end of file
diff --git a/modules-available/syslog/templates/page-syslog.html b/modules-available/syslog/templates/page-syslog.html
index 9287d855..2177822f 100644
--- a/modules-available/syslog/templates/page-syslog.html
+++ b/modules-available/syslog/templates/page-syslog.html
@@ -19,11 +19,13 @@
 				<label for="notbox">{{lang_not}}</label>
 			</div>
 		</div>
-		<div class="col-sm-10">
-			<input id="filterstring" placeholder="id" value="{{filter}}" name="filter">
-		</div>
-		<div class="col-sm-1">
-			<button class="btn btn-primary" style="display: inline-block;" type="submit">{{lang_go}}</button>
+		<div class="col-sm-11">
+			<div class="input-group">
+				<input id="filterstring" placeholder="id" value="{{filter}}" name="filter">
+				<span style="padding-bottom: 5px;" class="input-group-btn">
+					<button class="btn btn-primary" type="submit">{{lang_applyFilter}}</button>
+				</span>
+			</div>
 		</div>
 	</div>
 </form>