From c66c448836526e0bf49b37a9e775226367c7cec1 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Sat, 29 Jun 2013 15:11:57 +0200
Subject: [PATCH] Adding mobile dashboard and news page

* Adding mobile detection to home page
* Allow home page to default to news for desktops
* Use payout specific sidebar for mobile homescreen
* Added News navigation option to mobile

Fixes #278
Fixes #279
---
 public/include/pages/home.inc.php             | 14 ++++-
 public/include/pages/news.inc.php             | 19 ++++++
 public/templates/mmcFE/news/default.tpl       |  5 ++
 public/templates/mobile/global/navigation.tpl |  3 +-
 public/templates/mobile/home/default.tpl      | 59 ++++++++++++++++---
 public/templates/mobile/home/pps.tpl          | 50 ++++++++++++++++
 public/templates/mobile/news/default.tpl      |  8 +++
 7 files changed, 147 insertions(+), 11 deletions(-)
 create mode 100644 public/include/pages/news.inc.php
 create mode 100644 public/templates/mmcFE/news/default.tpl
 create mode 100644 public/templates/mobile/home/pps.tpl
 create mode 100644 public/templates/mobile/news/default.tpl

diff --git a/public/include/pages/home.inc.php b/public/include/pages/home.inc.php
index 38e1022d..ffd08520 100644
--- a/public/include/pages/home.inc.php
+++ b/public/include/pages/home.inc.php
@@ -13,7 +13,17 @@ foreach ($aNews as $key => $aData) {
   $aNews[$key]['content'] = Markdown::defaultTransform($aData['content']);
 }
 
-// Tempalte specifics
+// Load news entries in case news is the homepage
 $smarty->assign("NEWS", $aNews);
-$smarty->assign("CONTENT", "default.tpl");
+
+// Tempalte specifics
+if ($detect->isMobile()) {
+  if ($config['payout_system'] == 'pps') {
+    $smarty->assign("CONTENT", "pps.tpl");
+  } else {
+    $smarty->assign("CONTENT", "default.tpl");
+  }
+} else {
+  $smarty->assign("CONTENT", "default.tpl");
+}
 ?>
diff --git a/public/include/pages/news.inc.php b/public/include/pages/news.inc.php
new file mode 100644
index 00000000..38e1022d
--- /dev/null
+++ b/public/include/pages/news.inc.php
@@ -0,0 +1,19 @@
+<?php
+
+// Make sure we are called from index.php
+if (!defined('SECURITY')) die('Hacking attempt');
+
+// Include markdown library
+use \Michelf\Markdown;
+
+// Fetch active news to display
+$aNews = $news->getAllActive();
+foreach ($aNews as $key => $aData) {
+  // Transform Markdown content to HTML
+  $aNews[$key]['content'] = Markdown::defaultTransform($aData['content']);
+}
+
+// Tempalte specifics
+$smarty->assign("NEWS", $aNews);
+$smarty->assign("CONTENT", "default.tpl");
+?>
diff --git a/public/templates/mmcFE/news/default.tpl b/public/templates/mmcFE/news/default.tpl
new file mode 100644
index 00000000..e898af86
--- /dev/null
+++ b/public/templates/mmcFE/news/default.tpl
@@ -0,0 +1,5 @@
+{section name=news loop=$NEWS}
+  {include file="global/block_header.tpl" BLOCK_HEADER="{$NEWS[news].header}, <font size=\"1px\">posted {$NEWS[news].time|date_format:"%b %e, %Y at %H:%M"} by <b>{$NEWS[news].author}</b></font>"}
+  {$NEWS[news].content}
+  {include file="global/block_footer.tpl"}
+{/section}
diff --git a/public/templates/mobile/global/navigation.tpl b/public/templates/mobile/global/navigation.tpl
index 2821454f..92785791 100644
--- a/public/templates/mobile/global/navigation.tpl
+++ b/public/templates/mobile/global/navigation.tpl
@@ -1,6 +1,7 @@
         <div data-role="navbar">
           <ul>
-            <li><a href="{$smarty.server.PHP_SELF}" data-icon="home" data-ajax="false">Home</a></li>
+            <li><a href="{$smarty.server.PHP_SELF}" data-icon="home" data-ajax="false">Dash</a></li>
+            <li><a href="{$smarty.server.PHP_SELF}?page=news" data-icon="info" data-ajax="false">News</a></li>
             {if $smarty.session.AUTHENTICATED|default:"0" == 1}
             <li><a href="{$smarty.server.PHP_SELF}?page=statistics&action=pool" data-icon="grid" data-ajax="false">Statistics</a></li>
             <li><a href="{$smarty.server.PHP_SELF}?page=logout" data-icon="gear" data-ajax="false">Logout</a></li>
diff --git a/public/templates/mobile/home/default.tpl b/public/templates/mobile/home/default.tpl
index 69ecd30d..7fdef4c8 100644
--- a/public/templates/mobile/home/default.tpl
+++ b/public/templates/mobile/home/default.tpl
@@ -1,8 +1,51 @@
-{section name=news loop=$NEWS}
-<div data-role="collapsible-set">
-  <div data-role="collapsible" data-collapsed="true">
-    <h3>{$NEWS[news].header}</h3>
-    <p>{$NEWS[news].content}</p>
-  </div>
-</div>
-{/section}
+                <table width="100%">
+                    <tr>
+                      <td colspan="2"><b><u>Your Stats</u></b></td>
+                    </tr>
+                    <tr>
+                      <td><b>Hashrate</b></td>
+                      <td align="right">{$GLOBAL.userdata.hashrate|number_format} KH/s</td>
+                    </tr>
+                    <tr>
+                      <td colspan="2"><b><u>Round Shares</u></b></td>
+                    </tr>
+                    <tr>
+                      <td><b>Pool Valid</b></td>
+                      <td align="right"><i>{$GLOBAL.roundshares.valid|number_format}</i></td>
+                    </tr>
+                    <tr>
+                      <td><b>Pool Invalid</b></td>
+                      <td align="right"><i>{$GLOBAL.roundshares.invalid|number_format}</i><font size='1px'> ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid)|number_format:"2"}%)</font></td>
+                    </tr>
+                    <tr>
+                      <td><b>Your Valid<b></td>
+                      <td align="right"><i>{$GLOBAL.userdata.shares.valid|number_format}</i><font size='1px'></font></b></td>
+                    </tr>
+                    <tr>
+                      <td><b>Your Invalid</b></td>
+                      <td align="right"><i>{$GLOBAL.userdata.shares.invalid|number_format}</i><font size='1px'> ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.userdata.shares.invalid)|number_format:"2"}%)</font></td>
+                    </tr>
+                    <tr>
+                      <td colspan="2"><b><u>{$GLOBAL.config.currency} Round Estimate</u></b></td>
+                    </tr>
+                    <tr>
+                      <td><b>Block</b></td>
+                      <td align="right">{$GLOBAL.userdata.est_block|number_format:"3"}</td>
+                    </tr>
+                    <tr>
+                      <td><b>Fees</b></td>
+                      <td align="right">{$GLOBAL.userdata.est_fee|number_format:"3"}</td>
+                    </tr>
+                    <tr>
+                      <td><b>Donation</b></td>
+                      <td align="right">{$GLOBAL.userdata.est_donation|number_format:"3"}</td>
+                    </tr>
+                    <tr>
+                      <td><b>Payout</b></td>
+                      <td align="right">{$GLOBAL.userdata.est_payout|number_format:"3"}</td>
+                    </tr>
+                    <tr><td colspan="2">&nbsp;</td></tr>
+                    <tr><td colspan="2"><b><u>{$GLOBAL.config.currency} Account Balance</u></b></td></tr>
+                    <tr><td>Confirmed</td><td align="right"><b>{$GLOBAL.userdata.balance.confirmed|default:"0"}</td></tr>
+                    <tr><td>Unconfirmed</td><td align="right"><b>{$GLOBAL.userdata.balance.unconfirmed|default:"0"}</td></tr>
+                  </table>
diff --git a/public/templates/mobile/home/pps.tpl b/public/templates/mobile/home/pps.tpl
new file mode 100644
index 00000000..bbabab3b
--- /dev/null
+++ b/public/templates/mobile/home/pps.tpl
@@ -0,0 +1,50 @@
+                <table width="100%">
+                    <tr>
+                      <td colspan="2"><b><u>Your Stats</u></b></td>
+                    </tr>
+                    <tr>
+                      <td><b>Hashrate</b></td>
+                      <td align="right">{$GLOBAL.userdata.hashrate|number_format} KH/s</td>
+                    </tr>
+                    <tr>
+                      <td><b>Share Rate</b></td>
+                      <td align="right">{$GLOBAL.userdata.sharerate|number_format:"2"} S/s</td>
+                    </tr>
+                    <tr>
+                      <td><b>PPS Value</b></td>
+                      <td align="right">{$GLOBAL.ppsvalue}</td>
+                    </tr>
+                    <tr>
+                      <td colspan="2"><b><u>Round Shares</u></b></td>
+                    </tr>
+                    <tr>
+                      <td><b>Pool Valid</b></td>
+                      <td align="right"><i>{$GLOBAL.roundshares.valid|number_format}</i></td>
+                    </tr>
+                    <tr>
+                      <td><b>Pool Invalid</b></td>
+                      <td align="right"><i>{$GLOBAL.roundshares.invalid|number_format}<font size='1px'> ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid)|number_format:"2"}%)</font></i></td>
+                    </tr>
+                    <tr>
+                      <td><b>Your Invalid</b></td>
+                      <td align="right"><i>{$GLOBAL.userdata.shares.invalid|number_format}</i><font size='1px'> ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.userdata.shares.invalid)|number_format:"2"}%)</font></td>
+                    </tr>
+                    <tr><td colspan="2">&nbsp;</td></tr>
+                    <tr><td colspan="2"><b><u>{$GLOBAL.config.currency} Estimates</u></b></td></tr>
+                    <tr>
+                      <td><b>in 24 hours</b></td>
+                      <td align="right">{($GLOBAL.userdata.sharerate * 24 * 60 * 60 * $GLOBAL.ppsvalue)|number_format:"8"}</td>
+                    </tr>
+                    <tr>
+                      <td><b>in 7 days</b></td>
+                      <td align="right">{($GLOBAL.userdata.sharerate * 7 * 24 * 60 * 60 * $GLOBAL.ppsvalue)|number_format:"8"}</td>
+                    </tr>
+                    <tr>
+                      <td><b>in 14 days</b></td>
+                      <td align="right">{($GLOBAL.userdata.sharerate * 14 * 24 * 60 * 60 * $GLOBAL.ppsvalue)|number_format:"8"}</td>
+                    </tr>
+                    <tr><td colspan="2">&nbsp;</td></tr>
+                    <tr><td colspan="2"><b><u>{$GLOBAL.config.currency} Account Balance</u></b></td></tr>
+                    <tr><td>Confirmed</td><td align="right"><b>{$GLOBAL.userdata.balance.confirmed|default:"0"}</td></tr>
+                    <tr><td>Unconfirmed</td><td align="right"><b>{$GLOBAL.userdata.balance.unconfirmed|default:"0"}</td></tr>
+                  </table>
diff --git a/public/templates/mobile/news/default.tpl b/public/templates/mobile/news/default.tpl
new file mode 100644
index 00000000..69ecd30d
--- /dev/null
+++ b/public/templates/mobile/news/default.tpl
@@ -0,0 +1,8 @@
+{section name=news loop=$NEWS}
+<div data-role="collapsible-set">
+  <div data-role="collapsible" data-collapsed="true">
+    <h3>{$NEWS[news].header}</h3>
+    <p>{$NEWS[news].content}</p>
+  </div>
+</div>
+{/section}