From 037cd74e8e02f048892208bedef0d16faef16af4 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Mon, 6 Jun 2016 19:44:22 -0700
Subject: rename admin/users to admin/accounts, provide sortable columns in
 account and channel summaries - issue #255

---
 view/tpl/admin_accounts.tpl | 88 +++++++++++++++++++++++++++++++++++++++++++++
 view/tpl/admin_channels.tpl |  2 +-
 view/tpl/admin_users.tpl    | 88 ---------------------------------------------
 3 files changed, 89 insertions(+), 89 deletions(-)
 create mode 100755 view/tpl/admin_accounts.tpl
 delete mode 100755 view/tpl/admin_users.tpl

(limited to 'view')

diff --git a/view/tpl/admin_accounts.tpl b/view/tpl/admin_accounts.tpl
new file mode 100755
index 000000000..53f5f1aba
--- /dev/null
+++ b/view/tpl/admin_accounts.tpl
@@ -0,0 +1,88 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "{{$confirm_delete}}".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("{{$confirm_delete_multi}}");
+	}
+	function toggle_selectall(cls){
+		$("."+cls).prop("checked", !$("."+cls).prop("checked"));
+		return false;
+	}
+</script>
+<div class="generic-content-wrapper-styled" id="adminpage">
+	<h1>{{$title}} - {{$page}}</h1>
+
+	<form action="{{$baseurl}}/admin/accounts" method="post">
+		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+
+		<h3>{{$h_pending}}</h3>
+		{{if $pending}}
+			<table id="pending">
+				<thead>
+				<tr>
+					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{foreach $pending as $u}}
+				<tr>
+					<td class="created">{{$u.account_created}}</td>
+					<td class="email">{{$u.account_email}}</td>
+					<td class="checkbox_bulkedit"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"></td>
+					<td class="tools">
+						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$approve}}"><i class="fa fa-thumbs-o-up admin-icons"></i></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$deny}}"><i class="fa fa-thumbs-o-down admin-icons"></i></a>
+					</td>
+				</tr>
+			{{/foreach}}
+				</tbody>
+			</table>
+			<div class="selectall"><a href="#" onclick="return toggle_selectall('pending_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"> <input type="submit" name="page_users_approve" value="{{$approve}}"></div>
+		{{else}}
+			<p>{{$no_pending}}</p>
+		{{/if}}
+
+
+		<h3>{{$h_users}}</h3>
+		{{if $users}}
+			<table id="users">
+				<thead>
+				<tr>
+					{{foreach $th_users as $th}}<th><a href="{{$base}}&key={{$th.1}}&dir={{$odir}}">{{$th.0}}</a></th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $users as $u}}
+					<tr>
+						<td class="account_id">{{$u.account_id}}</td>
+						<td class="email">{{if $u.blocked}}
+							<i>{{$u.account_email}}</i>
+						{{else}}
+							<strong>{{$u.account_email}}</strong>
+						{{/if}}</td>
+						<td class="channels">{{$u.channels}}</td>
+						<td class="register_date">{{$u.account_created}}</td>
+						<td class="login_date">{{$u.account_lastlog}}</td>
+						<td class="account_expires">{{$u.account_expires}}</td>
+						<td class="service_class">{{$u.account_service_class}}</td>
+						<td class="checkbox_bulkedit"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"><input type="hidden" name="blocked[]" value="{{$u.blocked}}"></td>
+						<td class="tools">
+							<a href="{{$baseurl}}/admin/accounts/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}"  class="btn btn-default btn-xs" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/accounts/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a>
+						</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+			<div class="selectall"><a href="#" onclick="return toggle_selectall('users_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}"> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()"></div>
+		{{else}}
+			NO USERS?!?
+		{{/if}}
+	</form>
+</div>
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
index 6db963304..f15742f78 100755
--- a/view/tpl/admin_channels.tpl
+++ b/view/tpl/admin_channels.tpl
@@ -21,7 +21,7 @@
 			<table id='channels'>
 				<thead>
 				<tr>
-					{{foreach $th_channels as $th}}<th>{{$th}}</th>{{/foreach}}
+					{{foreach $th_channels as $th}}<th><a href="{{$base}}&key={{$th.1}}&dir={{$odir}}">{{$th.0}}</a></th>{{/foreach}}
 					<th></th>
 					<th></th>
 				</tr>
diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl
deleted file mode 100755
index ae77ef24c..000000000
--- a/view/tpl/admin_users.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "{{$confirm_delete}}".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("{{$confirm_delete_multi}}");
-	}
-	function toggle_selectall(cls){
-		$("."+cls).prop("checked", !$("."+cls).prop("checked"));
-		return false;
-	}
-</script>
-<div class="generic-content-wrapper-styled" id="adminpage">
-	<h1>{{$title}} - {{$page}}</h1>
-
-	<form action="{{$baseurl}}/admin/users" method="post">
-		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-
-		<h3>{{$h_pending}}</h3>
-		{{if $pending}}
-			<table id="pending">
-				<thead>
-				<tr>
-					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{foreach $pending as $u}}
-				<tr>
-					<td class="created">{{$u.account_created}}</td>
-					<td class="email">{{$u.account_email}}</td>
-					<td class="checkbox_bulkedit"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"></td>
-					<td class="tools">
-						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$approve}}"><i class="fa fa-thumbs-o-up admin-icons"></i></a>
-						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$deny}}"><i class="fa fa-thumbs-o-down admin-icons"></i></a>
-					</td>
-				</tr>
-			{{/foreach}}
-				</tbody>
-			</table>
-			<div class="selectall"><a href="#" onclick="return toggle_selectall('pending_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"> <input type="submit" name="page_users_approve" value="{{$approve}}"></div>
-		{{else}}
-			<p>{{$no_pending}}</p>
-		{{/if}}
-
-
-		<h3>{{$h_users}}</h3>
-		{{if $users}}
-			<table id="users">
-				<thead>
-				<tr>
-					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{foreach $users as $u}}
-					<tr>
-						<td class="account_id">{{$u.account_id}}</td>
-						<td class="email">{{if $u.blocked}}
-							<i>{{$u.account_email}}</i>
-						{{else}}
-							<strong>{{$u.account_email}}</strong>
-						{{/if}}</td>
-						<td class="channels">{{$u.channels}}</td>
-						<td class="register_date">{{$u.account_created}}</td>
-						<td class="login_date">{{$u.account_lastlog}}</td>
-						<td class="account_expires">{{$u.account_expires}}</td>
-						<td class="service_class">{{$u.account_service_class}}</td>
-						<td class="checkbox_bulkedit"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"><input type="hidden" name="blocked[]" value="{{$u.blocked}}"></td>
-						<td class="tools">
-							<a href="{{$baseurl}}/admin/users/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}"  class="btn btn-default btn-xs" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/users/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a>
-						</td>
-					</tr>
-				{{/foreach}}
-				</tbody>
-			</table>
-			<div class="selectall"><a href="#" onclick="return toggle_selectall('users_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}"> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()"></div>
-		{{else}}
-			NO USERS?!?
-		{{/if}}
-	</form>
-</div>
-- 
cgit v1.2.3