Merge pull request #214 from tuscanhobbit/master

admin user table now shows the channel list and ID, minor changes to admin summary table

2 files changed, 10 insertions, 12 deletions

diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl
index d3665626f..24cdd57cc 100755
--- a/view/tpl/admin_summary.tpl
+++ b/view/tpl/admin_summary.tpl
@@ -14,27 +14,23 @@
 		<dt>{{$users.0}}</dt>
 		<dd>{{$users.1}}</dd>
 	</dl>
-	{{foreach $accounts as $p}}
+	<!-- $accounts is empty
+		{{foreach $accounts as $p}}
 		<dl>
 			<dt>{{$p.0}}</dt>
 			<dd>{{if $p.1}}{{$p.1}}{{else}}0{{/if}}</dd>
 		</dl>
-	{{/foreach}}
-
-
+	{{/foreach}} -->
 	<dl>
 		<dt>{{$plugins.0}}</dt>
-		
-		{{foreach $plugins.1 as $p}}
-			<dd>{{$p}}</dd>
-		{{/foreach}}
-		
+		<dd>
+		{{foreach $plugins.1 as $p}} {{$p}} {{/foreach}}
+		&nbsp;
+		</dd>
 	</dl>
-
 	<dl>
 		<dt>{{$version.0}}</dt>
-		<dd>{{$version.1}} - {{$build}}</dt>
+		<dd>{{$version.1}} - {{$build}}</dd>
 	</dl>
 
-
 </div>
diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl
index 609289013..3549dc5c2 100755
--- a/view/tpl/admin_users.tpl
+++ b/view/tpl/admin_users.tpl
@@ -63,11 +63,13 @@
 				<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>