From 75181322baabc7b99ca0c919131a266d6987aa6d Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Fri, 1 Dec 2017 22:33:04 -0500
Subject: [PATCH] Improve page contacblock for frio theme

---
 mod/admin.php                                 |  1 +
 view/templates/admin/contactblock.tpl         |  1 -
 view/theme/frio/js/mod_admin.js               | 31 +++++++++++++++++++
 .../frio/templates/admin/contactblock.tpl     | 27 +++++++---------
 4 files changed, 44 insertions(+), 16 deletions(-)
 create mode 100644 view/theme/frio/js/mod_admin.js

diff --git a/mod/admin.php b/mod/admin.php
index 1bcbb45e75..fcd67aa9e1 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -441,6 +441,7 @@ function admin_page_contactblock(App $a)
 		'$baseurl'    => System::baseUrl(true),
 
 		'$contacts'   => $contacts,
+		'$total_contacts' => tt('%s total blocked contact', '%s total blocked contacts', $total),
 		'$paginate'   => paginate($a),
 		'$contacturl' => ['contact_url', t("Profile URL"), '', t("URL of the remote contact to block.")],
 	));
diff --git a/view/templates/admin/contactblock.tpl b/view/templates/admin/contactblock.tpl
index dcd33e8793..152550f017 100644
--- a/view/templates/admin/contactblock.tpl
+++ b/view/templates/admin/contactblock.tpl
@@ -1,4 +1,3 @@
-
 <script>
 	function selectall(cls) {
 		$('.' + cls).prop('checked', true);
diff --git a/view/theme/frio/js/mod_admin.js b/view/theme/frio/js/mod_admin.js
new file mode 100644
index 0000000000..b9fc467813
--- /dev/null
+++ b/view/theme/frio/js/mod_admin.js
@@ -0,0 +1,31 @@
+/**
+ * @brief Javascript for the admin module
+ */
+$(function() {
+	$('body').on('click', '.selectall', function() {
+		selectall($(this).data('selectAll'));
+	});
+	$('body').on('click', '.selectnone', function() {
+		selectnone($(this).data('selectNone'));
+	});
+
+	$('body').on('change', 'input[type=checkbox].select', function() {
+		$this = $(this);
+		if ($this.prop('checked')) {
+			selectall($this.data('selectClass'));
+			$this.attr('title', $this.data('selectNone'));
+		} else {
+			selectnone($this.data('selectClass'));
+			$this.attr('title', $this.data('selectAll'));
+		}
+	});
+
+	function selectall(cls) {
+		$('.' + cls).prop('checked', true);
+		return false;
+	}
+	function selectnone(cls) {
+		$('.' + cls).prop('checked', false);
+		return false;
+	}
+});
diff --git a/view/theme/frio/templates/admin/contactblock.tpl b/view/theme/frio/templates/admin/contactblock.tpl
index db0d2ed9db..f330854bc9 100644
--- a/view/theme/frio/templates/admin/contactblock.tpl
+++ b/view/theme/frio/templates/admin/contactblock.tpl
@@ -1,14 +1,4 @@
-
-<script>
-	function selectall(cls) {
-		$('.' + cls).prop('checked', true);
-		return false;
-	}
-	function selectnone(cls) {
-		$('.' + cls).prop('checked', false);
-		return false;
-	}
-</script>
+<script type="text/javascript" src="view/theme/frio/js/mod_admin.js"></script>
 <div id="adminpage">
 	<h1>{{$title}} - {{$page}}</h1>
 	<p>{{$description}}</p>
@@ -20,7 +10,7 @@
 		<table id="contactblock" class="table table-condensed table-striped">
 			<thead>
 				<tr>
-					<th></th>
+					<th><input type="checkbox" class="select contacts_ckbx" data-select-class="contacts_ckbx" data-select-all="{{$select_all}}"  data-select-none="{{$select_none}}" title="{{$select_all}}"/></th>
 						{{foreach $th_contacts as $th}}
 					<th>
 						{{$th}}
@@ -39,10 +29,17 @@
 				</tr>
 				{{/foreach}}
 			</tbody>
+			<tfoot>
+				<tr>
+					<td><input type="checkbox" class="select contacts_ckbx" data-select-class="contacts_ckbx" data-select-all="{{$select_all}}"  data-select-none="{{$select_none}}" title="{{$select_all}}"/></td>
+					<td colspan="3">
+						{{$total_contacts}}
+					</td>
+				</tr>
+			</tfoot>
 		</table>
-		<p><a href="#" onclick="return selectall('contacts_ckbx');">{{$select_all}}</a> | <a href="#" onclick="return selectnone('contacts_ckbx');">{{$select_none}}</a></p>
+		<div class="submit"><button type="submit" class="btn btn-small btn-default" name="page_contactblock_unblock" value="1">{{$unblock|escape:'html'}}</button></div>
 		{{$paginate}}
-		<div class="submit"><input type="submit" name="page_contactblock_unblock" value="{{$unblock|escape:'html'}}" /></div>
 	{{else}}
 		<p>{{$no_data|escape:'html'}}</p>
 	{{/if}}
@@ -58,6 +55,6 @@
 				</tr>
 			</tbody>
 		</table>
-		<div class="submit"><input type="submit" name="page_contactblock_block" value="{{$submit|escape:'html'}}" /></div>
+		<div class="submit"><button type="submit" class="btn btn-primary" name="page_contactblock_block" value="1">{{$submit|escape:'html'}}</button></div>
 	</form>
 </div>
-- 
2.39.5