From 00c184d45e8fb85441133435765626f508af84d1 Mon Sep 17 00:00:00 2001
From: iAmShorty <rafta@gmx.net>
Date: Sun, 23 Feb 2014 22:58:57 +0100
Subject: [PATCH] [UPDATE] cleaning up admin dashboard

---
 .../mpos/admin/dashboard/default.tpl          |  7 +-
 .../mpos/admin/dashboard/invitations.tpl      | 21 ------
 .../templates/mpos/admin/dashboard/logins.tpl | 25 -------
 .../admin/dashboard/{version.tpl => mpos.tpl} | 39 ++++++++++
 .../templates/mpos/admin/dashboard/status.tpl | 31 --------
 .../templates/mpos/admin/dashboard/user.tpl   | 74 +++++++++++++++++++
 .../templates/mpos/admin/dashboard/users.tpl  | 25 -------
 7 files changed, 115 insertions(+), 107 deletions(-)
 delete mode 100644 public/templates/mpos/admin/dashboard/invitations.tpl
 delete mode 100644 public/templates/mpos/admin/dashboard/logins.tpl
 rename public/templates/mpos/admin/dashboard/{version.tpl => mpos.tpl} (54%)
 delete mode 100644 public/templates/mpos/admin/dashboard/status.tpl
 create mode 100644 public/templates/mpos/admin/dashboard/user.tpl
 delete mode 100644 public/templates/mpos/admin/dashboard/users.tpl

diff --git a/public/templates/mpos/admin/dashboard/default.tpl b/public/templates/mpos/admin/dashboard/default.tpl
index 16fbad24..36dabf89 100644
--- a/public/templates/mpos/admin/dashboard/default.tpl
+++ b/public/templates/mpos/admin/dashboard/default.tpl
@@ -1,8 +1,5 @@
 {nocache}
-{include file="admin/dashboard/version.tpl"}
-{include file="admin/dashboard/users.tpl"}
-{include file="admin/dashboard/status.tpl"}
-{if $GLOBAL.config.disable_invitations|default:"0" == 0}{include file="admin/dashboard/invitations.tpl"}{/if}
-{include file="admin/dashboard/logins.tpl"}
+{include file="admin/dashboard/mpos.tpl"}
+{include file="admin/dashboard/user.tpl"}
 {include file="admin/dashboard/registrations.tpl"}
 {/nocache}
diff --git a/public/templates/mpos/admin/dashboard/invitations.tpl b/public/templates/mpos/admin/dashboard/invitations.tpl
deleted file mode 100644
index d8b60599..00000000
--- a/public/templates/mpos/admin/dashboard/invitations.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{nocache}
-<article class="module width_quarter">
-  <header><h3>Invitations</h3></header>
-  <table class="tablesorter" cellspacing="0">
-    <thead>
-      <tr>
-        <th align="center">Total</th>
-        <th align="center">Activated</th>
-        <th align="center">Outstanding</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td align="center">{$INVITATION_INFO.total}</td>
-        <td align="center">{$INVITATION_INFO.activated}</td>
-        <td align="center">{$INVITATION_INFO.outstanding}</td>
-      </tr>
-    </tbody>
-  </table>
-</article>
-{/nocache}
diff --git a/public/templates/mpos/admin/dashboard/logins.tpl b/public/templates/mpos/admin/dashboard/logins.tpl
deleted file mode 100644
index 85c5a469..00000000
--- a/public/templates/mpos/admin/dashboard/logins.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-{nocache}
-<article class="module width_quarter">
-  <header><h3>Logins</h3></header>
-  <table class="tablesorter" cellspacing="0">
-    <thead>
-      <tr>
-        <th align="center">24 hours</th>
-        <th align="center">7 days</th>
-        <th align="center">1 month</th>
-        <th align="center">6 months</th>
-        <th align="center">1 year</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td align="center">{$USER_LOGINS.24hours}</td>
-        <td align="center">{$USER_LOGINS.7days}</td>
-        <td align="center">{$USER_LOGINS.1month}</td>
-        <td align="center">{$USER_LOGINS.6month}</td>
-        <td align="center">{$USER_LOGINS.1year}</td>
-      </tr>
-    </tbody>
-  </table>
-</article>
-{/nocache}
diff --git a/public/templates/mpos/admin/dashboard/version.tpl b/public/templates/mpos/admin/dashboard/mpos.tpl
similarity index 54%
rename from public/templates/mpos/admin/dashboard/version.tpl
rename to public/templates/mpos/admin/dashboard/mpos.tpl
index b4695040..96203ac6 100644
--- a/public/templates/mpos/admin/dashboard/version.tpl
+++ b/public/templates/mpos/admin/dashboard/mpos.tpl
@@ -1,4 +1,7 @@
 {nocache}
+<article class="module width_full">
+  <header><h3>MPOS Informations</h3></header>
+  
 <article class="module width_quarter">
   <header><h3>MPOS Version Information</h3></header>
   <table width="25%" class="tablesorter" cellspacing="0">
@@ -34,4 +37,40 @@
     </tbody>
   </table>
 </article>
+
+<article class="module width_quarter">
+  <header><h3>MPOS Status</h3></header>
+  <table class="tablesorter" cellspacing="0">
+    <thead>
+      <tr>
+        <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 align="center">
+          <a href="{$smarty.server.SCRIPT_NAME}?page=admin&action=monitoring">{if $CRON_ERROR == 0}None - OK{else}{$CRON_ERROR}{/if}</a>
+        </td>
+        <td align="center">
+          <a href="{$smarty.server.SCRIPT_NAME}?page=admin&action=monitoring">{if $CRON_DISABLED == 0}None - OK{else}{$CRON_DISABLED}{/if}</a>
+        </td>
+        <td align="center">
+          <a href="{$smarty.server.SCRIPT_NAME}?page=admin&action=wallet">{$WALLET_ERROR|default:"None - OK"}</a>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</article>
+
+</article>
 {/nocache}
+
+
+
+
diff --git a/public/templates/mpos/admin/dashboard/status.tpl b/public/templates/mpos/admin/dashboard/status.tpl
deleted file mode 100644
index 9795f4b7..00000000
--- a/public/templates/mpos/admin/dashboard/status.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-{nocache}
-<article class="module width_quarter">
-  <header><h3>MPOS Status</h3></header>
-  <table class="tablesorter" cellspacing="0">
-    <thead>
-      <tr>
-        <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 align="center">
-          <a href="{$smarty.server.SCRIPT_NAME}?page=admin&action=monitoring">{if $CRON_ERROR == 0}None - OK{else}{$CRON_ERROR}{/if}</a>
-        </td>
-        <td align="center">
-          <a href="{$smarty.server.SCRIPT_NAME}?page=admin&action=monitoring">{if $CRON_DISABLED == 0}None - OK{else}{$CRON_DISABLED}{/if}</a>
-        </td>
-        <td align="center">
-          <a href="{$smarty.server.SCRIPT_NAME}?page=admin&action=wallet">{$WALLET_ERROR|default:"None - OK"}</a>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-</article>
-{/nocache}
diff --git a/public/templates/mpos/admin/dashboard/user.tpl b/public/templates/mpos/admin/dashboard/user.tpl
new file mode 100644
index 00000000..0855d6a0
--- /dev/null
+++ b/public/templates/mpos/admin/dashboard/user.tpl
@@ -0,0 +1,74 @@
+{nocache}
+<article class="module width_full">
+  <header><h3>User Informations</h3></header>
+
+<article class="module width_quarter">
+  <header><h3>Users</h3></header>
+  <table class="tablesorter" cellspacing="0">
+    <thead>
+      <tr>
+        <th align="center">Total</th>
+        <th align="center">Active</th>
+        <th align="center">Locked</th>
+        <th align="center">Admins</th>
+        <th align="center">No Fees</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td align="center">{$USER_INFO.total}</td>
+        <td align="center">{$USER_INFO.active}</td>
+        <td align="center">{$USER_INFO.locked}</td>
+        <td align="center">{$USER_INFO.admins}</td>
+        <td align="center">{$USER_INFO.nofees}</td>
+      </tr>
+    </tbody>
+  </table>
+</article>
+{if $GLOBAL.config.disable_invitations|default:"0" == 0}
+<article class="module width_quarter">
+  <header><h3>Invitations</h3></header>
+  <table class="tablesorter" cellspacing="0">
+    <thead>
+      <tr>
+        <th align="center">Total</th>
+        <th align="center">Activated</th>
+        <th align="center">Outstanding</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td align="center">{$INVITATION_INFO.total}</td>
+        <td align="center">{$INVITATION_INFO.activated}</td>
+        <td align="center">{$INVITATION_INFO.outstanding}</td>
+      </tr>
+    </tbody>
+  </table>
+</article>
+{/if}
+<article class="module width_quarter">
+  <header><h3>Logins</h3></header>
+  <table class="tablesorter" cellspacing="0">
+    <thead>
+      <tr>
+        <th align="center">24 hours</th>
+        <th align="center">7 days</th>
+        <th align="center">1 month</th>
+        <th align="center">6 months</th>
+        <th align="center">1 year</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td align="center">{$USER_LOGINS.24hours}</td>
+        <td align="center">{$USER_LOGINS.7days}</td>
+        <td align="center">{$USER_LOGINS.1month}</td>
+        <td align="center">{$USER_LOGINS.6month}</td>
+        <td align="center">{$USER_LOGINS.1year}</td>
+      </tr>
+    </tbody>
+  </table>
+</article>
+
+</article>
+{/nocache}
\ No newline at end of file
diff --git a/public/templates/mpos/admin/dashboard/users.tpl b/public/templates/mpos/admin/dashboard/users.tpl
deleted file mode 100644
index 3ca86cef..00000000
--- a/public/templates/mpos/admin/dashboard/users.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-{nocache}
-<article class="module width_quarter">
-  <header><h3>Users</h3></header>
-  <table class="tablesorter" cellspacing="0">
-    <thead>
-      <tr>
-        <th align="center">Total</th>
-        <th align="center">Active</th>
-        <th align="center">Locked</th>
-        <th align="center">Admins</th>
-        <th align="center">No Fees</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td align="center">{$USER_INFO.total}</td>
-        <td align="center">{$USER_INFO.active}</td>
-        <td align="center">{$USER_INFO.locked}</td>
-        <td align="center">{$USER_INFO.admins}</td>
-        <td align="center">{$USER_INFO.nofees}</td>
-      </tr>
-    </tbody>
-  </table>
-</article>
-{/nocache}