From 4be76130cb0340bdba7d45f4a27f2f4b54d19cd8 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Sun, 12 Jan 2014 17:49:20 +0100
Subject: [PATCH] [FIX] Show cron status in admin dashboard

Removing duplicate version box

Fixes #1379 once merged.
---
 .../templates/mpos/admin/dashboard/status.tpl | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/public/templates/mpos/admin/dashboard/status.tpl b/public/templates/mpos/admin/dashboard/status.tpl
index b4695040..2a21e1ac 100644
--- a/public/templates/mpos/admin/dashboard/status.tpl
+++ b/public/templates/mpos/admin/dashboard/status.tpl
@@ -1,34 +1,28 @@
 {nocache}
 <article class="module width_quarter">
-  <header><h3>MPOS Version Information</h3></header>
-  <table width="25%" class="tablesorter" cellspacing="0">
+  <header><h3>MPOS Status</h3></header>
+  <table class="tablesorter" cellspacing="0">
     <thead>
       <tr>
-        <th>Component</th>
-        <th align="center">Current</th>
-        <th align="center">Installed</th>
+        <th colspan="2" align="center">Cronjobs</th>
+        <th align="center">Wallet</th>
+      </tr>
+      <tr>
+        <th align="center"><strong>Errors</strong></th>
+        <th align="center"><strong>Disabled</strong></th>
+        <th align="center"><strong>Errors</strong></th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td><strong>MPOS</strong></td>
-        <td align="center"><font color="green">{$VERSION['CURRENT']['CORE']}</font></td>
         <td align="center">
-          <font color="{if $VERSION['INSTALLED']['CORE'] == $VERSION['CURRENT']['CORE']}green{else}red{/if}">{$VERSION['INSTALLED']['CORE']}</font>
+          <a href="{$smarty.server.PHP_SELF}?page=admin&action=monitoring">{if $CRON_ERROR == 0}None - OK{else}{$CRON_ERROR}{/if}</a>
         </td>
-      </tr>
-      <tr>
-        <td><strong>Config</strong></td>
-        <td align="center"><font color="green">{$VERSION['CURRENT']['CONFIG']}</font></td>
         <td align="center">
-          <font color="{if $VERSION['INSTALLED']['CONFIG'] == $VERSION['CURRENT']['CONFIG']}green{else}red{/if}">{$VERSION['INSTALLED']['CONFIG']}</font>
+          <a href="{$smarty.server.PHP_SELF}?page=admin&action=monitoring">{if $CRON_DISABLED == 0}None - OK{else}{$CRON_DISABLED}{/if}</a>
         </td>
-      </tr>
-      <tr>
-        <td><strong>Database</strong></td>
-        <td align="center"><font color="green">{$VERSION['CURRENT']['DB']}</font></td>
         <td align="center">
-          <font color="{if $VERSION['INSTALLED']['DB'] == $VERSION['CURRENT']['DB']}green{else}red{/if}">{$VERSION['INSTALLED']['DB']}</font>
+          <a href="{$smarty.server.PHP_SELF}?page=admin&action=wallet">{$WALLET_ERROR|default:"None - OK"}</a>
         </td>
       </tr>
     </tbody>