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

[UPDATE] pagination in admin transactions

Browse Source
This commit is contained in:
iAmShorty 2014-03-01 23:35:04 +01:00
parent f56530851f
commit 5bd8fcbc12
3 changed files with 66 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/templates/bootstrap/admin/transactions/default.tpl
View File

@ -42,11 +42,8 @@
<input type="hidden" name="action" value="{$smarty.request.action|escape}" />
<ul class="pager">
<li class="previous {if $smarty.get.start <= 0}disabled{/if}">
<<<<<<< HEAD
<a href="{if $smarty.get.start <= 0}#{else}{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&start={$smarty.request.start|escape|default:"0" - $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}{/if}">&larr; Prev</a>
=======
<a href="{if $smarty.get.start|default:"0" <= 0}#{else}{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&start={$smarty.request.start|escape|default:"0" - $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}{/if}">&larr; Prev</a>
>>>>>>> 3139333a3d84d1aa3053a0806a7e32e11bbbaa49
</li>
<li class="next">
<a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&start={$smarty.request.start|escape|default:"0" + $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}">Next &rarr;</a>

48
public/templates/bootstrap/master.tpl
View File

@ -5,10 +5,40 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{$GLOBAL.website.title} I {$smarty.request.page|escape|default:"home"|capitalize}</title>
<<<<<<< Updated upstream
<!--[if lt IE 9]>
<link rel="stylesheet" href="{$PATH}/css/ie.css" type="text/css" media="screen" />
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
=======
<!--[if lt IE 9]>
<link rel="stylesheet" href="{$PATH}/css/ie.css" type="text/css" media="screen" />
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<script type="text/javascript" src="{$PATH}/js/jquery-2.0.3.min.js"></script>
<script type="text/javascript" src="{$PATH}/js/jquery-migrate-1.2.1.min.js"></script>
<script type="text/javascript" src="{$PATH}/js/hideshow.js" type="text/javascript"></script>
<script type="text/javascript" src="{$PATH}/js/jquery.visualize.js"></script>
<script type="text/javascript" src="{$PATH}/js/jquery.jqplot.min.js"></script>
<script type="text/javascript" src="{$PATH}/js/jquery.tablesorter.min.js" type="text/javascript"></script>
<script type="text/javascript" src="{$PATH}/js/jquery.equalHeight.js"></script>
<script type="text/javascript" src="{$PATH}/js/custom.js"></script>
<script type="text/javascript" src="{$PATH}/js/tinybox.js"></script>
<script type="text/javascript" src="{$PATH}/../global/js/number_format.js"></script>
<!--[if IE]><script type="text/javascript" src="{$PATH}/js/excanvas.js"></script><![endif]-->
{literal}<script>
var zxcvbnPath = "{/literal}{$PATH}{literal}/js/zxcvbn/zxcvbn.js";
</script>{/literal}
<script type="text/javascript" src="{$PATH}/js/pwcheck.js"></script>
{if $GLOBAL.statistics.analytics.enabled}
{$GLOBAL.statistics.analytics.code nofilter}
{/if}
<link href="{$PATH}/css/bootstrap.min.css" rel="stylesheet">
<link href="{$PATH}/font-awesome/css/font-awesome.css" rel="stylesheet">
<link href="{$PATH}/css/plugins/morris/morris-0.4.3.min.css" rel="stylesheet">
<link href="{$PATH}/css/plugins/timeline/timeline.css" rel="stylesheet">
<link href="{$PATH}/css/mpos.css" rel="stylesheet">
>>>>>>> Stashed changes
<!--[if IE]><script type="text/javascript" src="{$PATH}/js/excanvas.js"></script><![endif]-->
{if $GLOBAL.statistics.analytics.enabled}
@ -64,9 +94,25 @@
</div>
</div>
<<<<<<< Updated upstream
<div id="footer">
{include file="global/footer.tpl"}
</div>
=======
<script src="{$PATH}/js/jquery-1.10.2.js"></script>
<script src="{$PATH}/js/bootstrap.min.js"></script>
<script src="{$PATH}/js/plugins/metisMenu/jquery.metisMenu.js"></script>
<!-- Page-Level Plugin Scripts - Morris -->
<script src="{$PATH}/js/plugins/morris/raphael-2.1.0.min.js"></script>
<script src="{$PATH}/js/plugins/morris/morris.js"></script>
<script src="{$PATH}/js/mpos.js"></script>
<script type="text/javascript" src="{$PATH}/js/justgage.1.0.1.min.js"></script>
<!-- Page-Level Plugin Scripts - Flot -->
<!--[if lte IE 8]><script src="{$PATH}/js/excanvas.min.js"></script><![endif]-->
>>>>>>> Stashed changes
</body>
</html>
</html>

19
public/templates/bootstrap/statistics/blocks/block_shares_graph.tpl
View File

@ -3,7 +3,11 @@ $(function () {
var blockdata = [
{section block $BLOCKSFOUND step=-1}{ldelim}
<<<<<<< Updated upstream
blockHeight: {$BLOCKSFOUND[block].height},
=======
blockHeight: "{$BLOCKSFOUND[block].height}",
>>>>>>> Stashed changes
estShares: {$BLOCKSFOUND[block].estshares},
actShares: {$BLOCKSFOUND[block].shares|default:"0"},
{if $USEBLOCKAVERAGE}
@ -12,6 +16,7 @@ $(function () {
{if $GLOBAL.config.payout_system == 'pplns'}
pplnsShares: {$BLOCKSFOUND[block].pplns_shares|default:"0"},
{/if}
<<<<<<< Updated upstream
{rdelim},
{/section}
];
@ -19,18 +24,32 @@ $(function () {
Morris.Area({
parseTime: false,
behaveLikeLine: true,
=======
{rdelim},
{/section}
];
Morris.Area({
>>>>>>> Stashed changes
element: 'block-area-chart',
data: blockdata,
xkey: 'blockHeight',
ykeys : ['estShares', {if $USEBLOCKAVERAGE}'avgShares', {/if}{if $GLOBAL.config.payout_system == 'pplns'}'pplnsShares', {/if} 'actShares'],
labels : ['Expected Shares', {if $USEBLOCKAVERAGE}'Average Shares', {/if}{if $GLOBAL.config.payout_system == 'pplns'}'PPLNS Shares',{/if} 'Actual Shares'],
pointSize: 2,
<<<<<<< Updated upstream
lineColors: ['#2D9C2F','#D58665','#2D619C','#FF0000'],
pointFillColors: ['#FFFFFF'],
hideHover: 'auto',
resize: true,
fillOpacity: 0.05
});
=======
hideHover: 'auto',
resize: true
});
>>>>>>> Stashed changes
});
</script>