Merge branch 'master' into permission-manager

3 files changed, 18 insertions, 8 deletions

diff --git a/modules-available/statistics/templates/clientlist.html b/modules-available/statistics/templates/clientlist.html
index 3d3e66a4..d06eb4f7 100644
--- a/modules-available/statistics/templates/clientlist.html
+++ b/modules-available/statistics/templates/clientlist.html
@@ -11,27 +11,27 @@
 			<td></td>
 			<td class="text-right">
 				<button type="button" class="btn btn-default btn-xs" onclick="popupFilter('lastseen')">
-					<span id="btn_filter_lastseen" class="glyphicon glyphicon-filter"></span>
+					<span class="glyphicon glyphicon-filter"></span>
 				</button>
 			</td>
 			<td>
 				<button type="button" class="btn btn-default btn-xs" onclick="popupFilter('kvmstate')">
-					<span id="btn_filter_kvmstate" class="glyphicon glyphicon-filter"></span>
+					<span class="glyphicon glyphicon-filter"></span>
 				</button>
 			</td>
 			<td class="text-right">
 				<button type="button" class="btn btn-default btn-xs" onclick="popupFilter('gbram')">
-					<span id="btn_filter_gbram" class="glyphicon glyphicon-filter"></span>
+					<span class="glyphicon glyphicon-filter"></span>
 				</button>
 			</td>
 			<td class="text-right">
 				<button type="button" class="btn btn-default btn-xs" onclick="popupFilter('hddgb')">
-					<span id="btn_filter_hddgb" class="glyphicon glyphicon-filter"></span>
+					<span class="glyphicon glyphicon-filter"></span>
 				</button>
 			</td>
 			<td>
-				<button class="btn btn-default btn-xs" onclick="popupFilter('realcores')">
-					<span id="btn_filter_cpu" class="glyphicon glyphicon-filter"></span>
+				<button type="button" class="btn btn-default btn-xs" onclick="popupFilter('realcores')">
+					<span class="glyphicon glyphicon-filter"></span>
 				</button>
 			</td>
 		</tr>
@@ -72,7 +72,11 @@
 			{{/state_STANDBY}}
 				<a href="?do=Statistics&amp;uuid={{machineuuid}}"><b>{{hostname}}</b></a>
 				<div class="small">{{machineuuid}}</div>
-			{{#rmmodule}}<div class="small">{{lang_runMode}}: <a class="slx-bold" href="?do=runmode&amp;module={{rmmodule}}">{{rmmodule}}</a></div>{{/rmmodule}}
+			{{#rmmodule}}
+				<div class="small">{{lang_runMode}}:
+					<a class="slx-bold" href="?do=runmode&amp;module={{rmmodule}}">{{moduleName}}</a> / {{modeName}}
+				</div>
+			{{/rmmodule}}
 			</td>
 			<td data-sort-value="{{clientip}}"><b><a href="?do=Statistics&amp;show=list&amp;filters=subnet={{subnet}}">{{subnet}}</a>{{lastoctet}}</b><br>{{macaddr}}</td>
 			<td data-sort-value="{{lastseen_int}}" class="text-right text-nowrap">{{lastseen}}</td>
diff --git a/modules-available/statistics/templates/filterbox.html b/modules-available/statistics/templates/filterbox.html
index 758bc287..58b66a75 100644
--- a/modules-available/statistics/templates/filterbox.html
+++ b/modules-available/statistics/templates/filterbox.html
@@ -99,7 +99,9 @@ var slxFilterNames = {
 	state: '{{lang_usageState}}',
 	location: '{{lang_location}}',
 	currentuser: '{{lang_currentUser}}',
-	subnet: '{{lang_subnet}}'
+	subnet: '{{lang_subnet}}',
+	runtime: '{{lang_runtimeHours}}',
+	hostname: '{{lang_hostname}}'
 };
 
 slxLocations = {{{locations}}};
diff --git a/modules-available/statistics/templates/page-replace.html b/modules-available/statistics/templates/page-replace.html
index f87610a2..d0e9f766 100644
--- a/modules-available/statistics/templates/page-replace.html
+++ b/modules-available/statistics/templates/page-replace.html
@@ -17,6 +17,10 @@
 	}
 </style>
 
+<p>
+	{{lang_replaceInstructions}}
+</p>
+
 <form method="post" action="?do=statistics&amp;show=replace">
 	<input type="hidden" name="token" value="{{token}}">
 	<table class="reptable">