Merge pull request #2 from friendica/develop

[friendica.git] / view / templates / admin / summary.tpl

diff --git a/view/templates/admin/summary.tpl b/view/templates/admin/summary.tpl
index 6b1ebe40ea2513861584c6fda2dad4d369b46bf5..07c2957bd1c5f5540bea5539138028cd4e191bb2 100644 (file)
--- a/view/templates/admin/summary.tpl
+++ b/view/templates/admin/summary.tpl
@@ -4,14 +4,14 @@
 {{if $showwarning}}
        <div id="admin-warning-message-wrapper">
                {{foreach $warningtext as $wt}}
-               <p class="warning-message">{{$wt}}</p>
+               <p class="warning-message">{{$wt nofilter}}</p>
                {{/foreach}}
        </div>
 {{/if}}
 
        <dl>
                <dt>{{$queues.label}}</dt>
-               <dd><a href="{{$baseurl}}/admin/queue">{{$queues.queue}}</a> - {{$queues.workerq}}</dd>
+               <dd><a href="{{$baseurl}}/admin/queue">{{$queues.queue}}</a> - <a href="{{$baseurl}}/admin/deferred">{{$queues.deferred}}</a> - <a href="{{$baseurl}}/admin/workerqueue">{{$queues.workerq}}</a></dd>
        </dl>
        <dl>
                <dt>{{$pending.0}}</dt>
@@ -44,5 +44,22 @@
                <dd> {{$platform}} '{{$codename}}' {{$version.1}} - {{$build}}</dt>
        </dl>
 
+       <dl>
+               <dt>{{$serversettings.label}}</dt>
+               <dd>
+                       <table>
+                               <tbody>
+                                       <tr><td colspan="2"><b>PHP</b></td></tr>
+                                       {{foreach $serversettings.php as $k => $p}}
+                                               <tr><td>{{$k}}</td><td>{{$p}}</td></tr>
+                                       {{/foreach}}
+                                       <tr><td colspan="2"><b>MySQL / MariaDB</b></td></tr>
+                                       {{foreach $serversettings.mysql as $k => $p}}
+                                               <tr><td>{{$k}}</td><td>{{$p}}</td></tr>
+                                       {{/foreach}}
+                               </tbody>
+                       </table>
+               </dd>
+       </dl>
 
 </div>