From f6242f2c740b74c8c5a2d7db01b4943d9699a23a Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Sat, 29 Jun 2013 21:26:58 +0200 Subject: [PATCH] Adding swipable sidebar * Login to mobile version to enable sidebar * Swipe right to display your old dashboard * Modified `home.inc.php` to default to news at all times again * Modified sidebar implementation to change via config setting * Modified mobile navigation bar and header * Added `sidebar_prop.tpl` file for both themes Some breaking changes might be introduced here if you are running your own template implementation. Please ensure that `home/default.tpl` will display the news posts. `sidebar.tpl` is now `sidebar_prop.tpl`. If the files are missing you will get a PHP error. Check your logs what file is missing and create them from my original samples. Fixes #283 --- public/include/pages/home.inc.php | 12 +--- .../global/{sidebar.tpl => sidebar_prop.tpl} | 0 public/templates/mmcFE/master.tpl | 7 +-- public/templates/mmcFE/news/default.tpl | 5 -- public/templates/mobile/global/navigation.tpl | 8 ++- .../{home/pps.tpl => global/sidebar_pps.tpl} | 16 ++--- .../templates/mobile/global/sidebar_prop.tpl | 54 +++++++++++++++++ public/templates/mobile/home/default.tpl | 59 +++---------------- public/templates/mobile/master.tpl | 30 +++++++++- public/templates/mobile/news/default.tpl | 8 --- 10 files changed, 107 insertions(+), 92 deletions(-) rename public/templates/mmcFE/global/{sidebar.tpl => sidebar_prop.tpl} (100%) delete mode 100644 public/templates/mmcFE/news/default.tpl rename public/templates/mobile/{home/pps.tpl => global/sidebar_pps.tpl} (71%) create mode 100644 public/templates/mobile/global/sidebar_prop.tpl delete 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 ac846304..2d0f5b23 100644 --- a/public/include/pages/home.inc.php +++ b/public/include/pages/home.inc.php @@ -15,15 +15,5 @@ foreach ($aNews as $key => $aData) { // Load news entries for Desktop site and unauthenticated users $smarty->assign("NEWS", $aNews); - -// Tempalte specifics -if ($detect->isMobile() && $_SESSION['AUTHENTICATED'] == true) { - if ($config['payout_system'] == 'pps') { - $smarty->assign("CONTENT", "pps.tpl"); - } else { - $smarty->assign("CONTENT", "default.tpl"); - } -} else { - $smarty->assign("CONTENT", "../news/default.tpl"); -} +$smarty->assign("CONTENT", "default.tpl"); ?> diff --git a/public/templates/mmcFE/global/sidebar.tpl b/public/templates/mmcFE/global/sidebar_prop.tpl similarity index 100% rename from public/templates/mmcFE/global/sidebar.tpl rename to public/templates/mmcFE/global/sidebar_prop.tpl diff --git a/public/templates/mmcFE/master.tpl b/public/templates/mmcFE/master.tpl index 8709e974..de478b38 100644 --- a/public/templates/mmcFE/master.tpl +++ b/public/templates/mmcFE/master.tpl @@ -47,11 +47,8 @@
{if $smarty.session.AUTHENTICATED|default} - {if $GLOBAL.config.payout_system == 'pps'} - {include file="global/sidebar_pps.tpl"} - {else} - {include file="global/sidebar.tpl"} - {/if} + {assign var=payout_system value=$GLOBAL.config.payout_system} + {include file="global/sidebar_$payout_system.tpl"} {else} {include file="global/login.tpl"} {/if} diff --git a/public/templates/mmcFE/news/default.tpl b/public/templates/mmcFE/news/default.tpl deleted file mode 100644 index e898af86..00000000 --- a/public/templates/mmcFE/news/default.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{section name=news loop=$NEWS} - {include file="global/block_header.tpl" BLOCK_HEADER="{$NEWS[news].header}, posted {$NEWS[news].time|date_format:"%b %e, %Y at %H:%M"} by {$NEWS[news].author}"} - {$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 4fd17134..219ca68b 100644 --- a/public/templates/mobile/global/navigation.tpl +++ b/public/templates/mobile/global/navigation.tpl @@ -1,12 +1,14 @@ + + {if $smarty.session.AUTHENTICATED|default:"0" == 1} + Left Sidebar + {/if}
diff --git a/public/templates/mobile/home/pps.tpl b/public/templates/mobile/global/sidebar_pps.tpl similarity index 71% rename from public/templates/mobile/home/pps.tpl rename to public/templates/mobile/global/sidebar_pps.tpl index bbabab3b..0d325b23 100644 --- a/public/templates/mobile/home/pps.tpl +++ b/public/templates/mobile/global/sidebar_pps.tpl @@ -1,4 +1,5 @@ + @@ -14,20 +15,21 @@ + - + - - + + - - + + @@ -45,6 +47,6 @@ - - + +
 
Your Stats
PPS Value {$GLOBAL.ppsvalue}
 
Round Shares
Pool Valid{$GLOBAL.roundshares.valid|number_format}{$GLOBAL.roundshares.valid|number_format}
Pool Invalid{$GLOBAL.roundshares.invalid|number_format} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid)|number_format:"2"}%)Pool Invalid ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid)|number_format:"2"}%){$GLOBAL.roundshares.invalid|number_format}
Your Invalid{$GLOBAL.userdata.shares.invalid|number_format} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.userdata.shares.invalid)|number_format:"2"}%)Your Invalid ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.userdata.shares.invalid)|number_format:"2"}%){$GLOBAL.userdata.shares.invalid|number_format}
 
{$GLOBAL.config.currency} Estimates
 
{$GLOBAL.config.currency} Account Balance
Confirmed{$GLOBAL.userdata.balance.confirmed|default:"0"}
Unconfirmed{$GLOBAL.userdata.balance.unconfirmed|default:"0"}
Confirmed{$GLOBAL.userdata.balance.confirmed|default:"0"|number_format:"3"}
Unconfirmed{$GLOBAL.userdata.balance.unconfirmed|default:"0"|number_format:"3"}
diff --git a/public/templates/mobile/global/sidebar_prop.tpl b/public/templates/mobile/global/sidebar_prop.tpl new file mode 100644 index 00000000..6cb85adf --- /dev/null +++ b/public/templates/mobile/global/sidebar_prop.tpl @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
Your Stats
Hashrate{$GLOBAL.userdata.hashrate|number_format} KH/s
 
Round Shares
Pool Valid{$GLOBAL.roundshares.valid|number_format}
Pool Invalid ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid)|number_format:"2"}%){$GLOBAL.roundshares.invalid|number_format}
Your Valid{$GLOBAL.userdata.shares.valid|number_format}
Your Invalid ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.userdata.shares.invalid)|number_format:"2"}%){$GLOBAL.userdata.shares.invalid|number_format}
 
{$GLOBAL.config.currency} Round Estimate
Block{$GLOBAL.userdata.est_block|number_format:"3"}
Fees{$GLOBAL.userdata.est_fee|number_format:"3"}
Donation{$GLOBAL.userdata.est_donation|number_format:"3"}
Payout{$GLOBAL.userdata.est_payout|number_format:"3"}
 
{$GLOBAL.config.currency} Account Balance
Confirmed{$GLOBAL.userdata.balance.confirmed|default:"0"|number_format:"3"}
Unconfirmed{$GLOBAL.userdata.balance.unconfirmed|default:"0"|number_format:"3"}
diff --git a/public/templates/mobile/home/default.tpl b/public/templates/mobile/home/default.tpl index 7fdef4c8..69ecd30d 100644 --- a/public/templates/mobile/home/default.tpl +++ b/public/templates/mobile/home/default.tpl @@ -1,51 +1,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Your Stats
Hashrate{$GLOBAL.userdata.hashrate|number_format} KH/s
Round Shares
Pool Valid{$GLOBAL.roundshares.valid|number_format}
Pool Invalid{$GLOBAL.roundshares.invalid|number_format} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid)|number_format:"2"}%)
Your Valid{$GLOBAL.userdata.shares.valid|number_format}
Your Invalid{$GLOBAL.userdata.shares.invalid|number_format} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.userdata.shares.invalid)|number_format:"2"}%)
{$GLOBAL.config.currency} Round Estimate
Block{$GLOBAL.userdata.est_block|number_format:"3"}
Fees{$GLOBAL.userdata.est_fee|number_format:"3"}
Donation{$GLOBAL.userdata.est_donation|number_format:"3"}
Payout{$GLOBAL.userdata.est_payout|number_format:"3"}
 
{$GLOBAL.config.currency} Account Balance
Confirmed{$GLOBAL.userdata.balance.confirmed|default:"0"}
Unconfirmed{$GLOBAL.userdata.balance.unconfirmed|default:"0"}
+{section name=news loop=$NEWS} +
+
+

{$NEWS[news].header}

+

{$NEWS[news].content}

+
+
+{/section} diff --git a/public/templates/mobile/master.tpl b/public/templates/mobile/master.tpl index a9004bdd..24b20c58 100644 --- a/public/templates/mobile/master.tpl +++ b/public/templates/mobile/master.tpl @@ -6,10 +6,36 @@ - {if is_array($smarty.session.POPUP|default)}{/if} + {if $smarty.session.AUTHENTICATED|default:"0" == 1} + +{/if} -
+
+{if $smarty.session.AUTHENTICATED|default:"0" == 1} +{assign var=payout_system value=$GLOBAL.config.payout_system} + +{/if}
{include file="global/header.tpl"} {include file="global/navigation.tpl"} diff --git a/public/templates/mobile/news/default.tpl b/public/templates/mobile/news/default.tpl deleted file mode 100644 index 69ecd30d..00000000 --- a/public/templates/mobile/news/default.tpl +++ /dev/null @@ -1,8 +0,0 @@ -{section name=news loop=$NEWS} -
-
-

{$NEWS[news].header}

-

{$NEWS[news].content}

-
-
-{/section}