Merge pull request #8 from friendica/master

merging red master into nuvola.red

1 files changed, 10 insertions, 14 deletions

diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl
index 7f752a773..259640849 100755
--- a/view/tpl/admin_summary.tpl
+++ b/view/tpl/admin_summary.tpl
@@ -1,36 +1,32 @@
 <div class="generic-content-wrapper-styled" id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
-
+{{if $adminalertmsg}}
+	<p class="alert alert-warning" role="alert">{{$adminalertmsg}}</p>
+{{/if}}
 	<dl>
 		<dt>{{$queues.label}}</dt>
 		<dd>{{$queues.queue}}</dd>
 	</dl>
 	<dl>
+		<dt>{{$accounts.0}}</dt>
+		<dd>{{foreach from=$accounts.1 item=acc name=account}}<span title="{{$acc.label}}">{{$acc.val}}</span>{{if !$smarty.foreach.account.last}} / {{/if}}{{/foreach}}</dd>
+	</dl>
+	<dl>
 		<dt>{{$pending.0}}</dt>
 		<dd>{{$pending.1}}</dt>
 	</dl>
-
 	<dl>
-		<dt>{{$users.0}}</dt>
-		<dd>{{$users.1}}</dd>
+		<dt>{{$channels.0}}</dt>
+		<dd>{{foreach from=$channels.1 item=ch name=chan}}<span title="{{$ch.label}}">{{$ch.val}}</span>{{if !$smarty.foreach.chan.last}} / {{/if}}{{/foreach}}</dd>
 	</dl>
-	<!-- $accounts is empty
-		{{foreach $accounts as $p}}
-		<dl>
-			<dt>{{$p.0}}</dt>
-			<dd>{{if $p.1}}{{$p.1}}{{else}}0{{/if}}</dd>
-		</dl>
-	{{/foreach}} -->
 	<dl>
 		<dt>{{$plugins.0}}</dt>
 		<dd>
 		{{foreach $plugins.1 as $p}} {{$p}} {{/foreach}}
-		&nbsp;
 		</dd>
 	</dl>
 	<dl>
 		<dt>{{$version.0}}</dt>
 		<dd>{{$version.1}} - {{$build}}</dd>
 	</dl>
-
-</div>
+</div>
\ No newline at end of file