RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #284 from TheSerapher/issue-283

Browse Source 
Adding swipable sidebar
This commit is contained in:
Sebastian Grewe 2013-06-29 12:32:07 -07:00
commit ed06dc5c0d
10 changed files with 107 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/include/pages/home.inc.php
View File

@ -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");
?>

0
public/templates/mmcFE/global/sidebar.tpl → public/templates/mmcFE/global/sidebar_prop.tpl
View File

7
public/templates/mmcFE/master.tpl
View File

@ -47,11 +47,8 @@
<div class="block_content">
<div class="sidebar">
{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}

5
public/templates/mmcFE/news/default.tpl
View File

@ -1,5 +0,0 @@
{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}

8
public/templates/mobile/global/navigation.tpl
View File

@ -1,12 +1,14 @@
{if $smarty.session.AUTHENTICATED|default:"0" == 1}
<a href="#left-sidebar" data-icon="arrow-l" data-iconpos="notext" data-shadow="false" data-iconshadow="false" class="ui-icon-nodisc">Left Sidebar</a>
{/if}
<div data-role="navbar">
<ul>
<li><a href="{$smarty.server.PHP_SELF}" data-icon="info" data-ajax="false">News</a></li>
{if $smarty.session.AUTHENTICATED|default:"0" == 1}
<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>
<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>
{else}
<li><a href="{$smarty.server.PHP_SELF}" data-icon="info" data-ajax="false">News</a></li>
<li><a href="{$smarty.server.PHP_SELF}?page=login" data-icon="gear" data-ajax="false">Login</a></li>
{/if}
</ul>

16
public/templates/mobile/home/pps.tpl → public/templates/mobile/global/sidebar_pps.tpl
View File

@ -1,4 +1,5 @@
<table width="100%">
<tr><td colspan="2">&nbsp;</td></tr>
<tr>
<td colspan="2"><b><u>Your Stats</u></b></td>
</tr>
@ -14,20 +15,21 @@
<td><b>PPS Value</b></td>
<td align="right">{$GLOBAL.ppsvalue}</td>
</tr>
<tr><td colspan="2">&nbsp;</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>
<td align="right">{$GLOBAL.roundshares.valid|number_format}</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>
<td><b>Pool Invalid</b><font size='1px'> ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid)|number_format:"2"}%)</font></td>
<td align="right">{$GLOBAL.roundshares.invalid|number_format}</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>
<td><b>Your Invalid</b><font size='1px'> ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.userdata.shares.invalid)|number_format:"2"}%)</font></td>
<td align="right">{$GLOBAL.userdata.shares.invalid|number_format}</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
<tr><td colspan="2"><b><u>{$GLOBAL.config.currency} Estimates</u></b></td></tr>
@ -45,6 +47,6 @@
</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>
<tr><td>Confirmed</td><td align="right"><b>{$GLOBAL.userdata.balance.confirmed|default:"0"|number_format:"3"}</td></tr>
<tr><td>Unconfirmed</td><td align="right"><b>{$GLOBAL.userdata.balance.unconfirmed|default:"0"|number_format:"3"}</td></tr>
</table>

54
public/templates/mobile/global/sidebar_prop.tpl Normal file
View File

@ -0,0 +1,54 @@
<table width="100%">
<tr><td colspan="2">&nbsp;</td></tr>
<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">&nbsp;</td></tr>
<tr>
<td colspan="2"><b><u>Round Shares</u></b></td>
</tr>
<tr>
<td><b>Pool Valid</b></td>
<td align="right">{$GLOBAL.roundshares.valid|number_format}</td>
</tr>
<tr>
<td><b>Pool Invalid</b> <font size='1px'>({(100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid)|number_format:"2"}%)</font></td>
<td align="right">{$GLOBAL.roundshares.invalid|number_format}</td>
</tr>
<tr>
<td><b>Your Valid<b></td>
<td align="right">{$GLOBAL.userdata.shares.valid|number_format}<font size='1px'></font></b></td>
</tr>
<tr>
<td><b>Your Invalid</b> <font size='1px'> ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.userdata.shares.invalid)|number_format:"2"}%)</font></td>
<td align="right">{$GLOBAL.userdata.shares.invalid|number_format}</td>
</tr>
<tr><td colspan="2">&nbsp;</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"|number_format:"3"}</td></tr>
<tr><td>Unconfirmed</td><td align="right"><b>{$GLOBAL.userdata.balance.unconfirmed|default:"0"|number_format:"3"}</td></tr>
</table>

59
public/templates/mobile/home/default.tpl
View File

@ -1,51 +1,8 @@
<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>
{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}

30
public/templates/mobile/master.tpl
View File

@ -6,10 +6,36 @@
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.3.0/jquery.mobile-1.3.0.min.css" />
<script src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
<script src="http://code.jquery.com/mobile/1.3.0/jquery.mobile-1.3.0.min.js"></script>
{if is_array($smarty.session.POPUP|default)}<script>{literal}$('#status').popup();{/literal}</script>{/if}
{if $smarty.session.AUTHENTICATED|default:"0" == 1}
<script>
{literal}
$( document ).on( "pageinit", "#mmcfe-ng-page", function() {
$( document ).on( "swipeleft swiperight", "#mmcfe-ng-page", function( e ) {
// We check if there is no open panel on the page because otherwise
// a swipe to close the left panel would also open the right panel (and v.v.).
// We do this by checking the data that the framework stores on the page element (panel: open).
if ( $.mobile.activePage.jqmData( "panel" ) !== "open" ) {
if ( e.type === "swipeleft" ) {
$( "#right-sidebar" ).panel( "open" );
} else if ( e.type === "swiperight" ) {
$( "#left-sidebar" ).panel( "open" );
}
}
});
});
{/literal}
</script>
{/if}
</head>
<body>
<div data-role="page">
<div data-role="page" id="mmcfe-ng-page" data-url="mmcfe-ng-page">
{if $smarty.session.AUTHENTICATED|default:"0" == 1}
{assign var=payout_system value=$GLOBAL.config.payout_system}
<div data-role="panel" id="left-sidebar" data-theme="a">
{include file="global/sidebar_$payout_system.tpl"}
<a href="#" data-rel="close" data-role="button" data-mini="true" data-inline="true" data-icon="delete" data-iconpos="right">Close</a>
</div><!-- /panel -->
{/if}
<div data-role="header">
{include file="global/header.tpl"}
{include file="global/navigation.tpl"}

8
public/templates/mobile/news/default.tpl
View File

@ -1,8 +0,0 @@
{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}