Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap

This commit is contained in:
Sebastian Grewe 2014-03-01 21:52:06 +01:00
commit b4e44aba30
11 changed files with 52 additions and 58 deletions

5
public/site_assets/bootstrap/js/mpos.js Normal file → Executable file
View File

@ -16,3 +16,8 @@ $(function() {
}
})
})
// Make all table with "datatable" class a datatable
$(document).ready(function() {
$('.datatable').dataTable();
});

View File

@ -3,7 +3,7 @@
<div class="col-lg-12">
<div class="panel panel-info">
<div class="panel-heading">
<i class="fa fa-info fa-fw"></i> <a href="#collapse{$smarty.section.news.index}">{$NEWS[news].header}</a>
<i class="fa fa-info fa-fw"></i> {$NEWS[news].header}</a>
<br />
<font size="1px">posted {$NEWS[news].time|date_format:"%b %e, %Y at %H:%M"}{if $HIDEAUTHOR|default:"0" == 0} by <b>{$NEWS[news].author}</b>{/if}</font>
</div>

4
public/templates/bootstrap/master.tpl Normal file → Executable file
View File

@ -29,10 +29,10 @@
<script src="{$PATH}/js/jquery-2.0.3.min.js"></script>
<script src="{$PATH}/js/bootstrap.min.js"></script>
<script src="{$PATH}/js/bootstrap-switch.min.js"></script>
<script src="{$PATH}/js/plugins/dataTables/jquery.dataTables.js"></script>
<script src="{$PATH}/js/plugins/dataTables/dataTables.bootstrap.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>

View File

@ -16,4 +16,4 @@
{include file="statistics/round/block_stats.tpl"}
{include file="statistics/round/round_shares.tpl"}
</div>
{/if}
{/if}

View File

@ -4,21 +4,31 @@
<div class="panel-heading">
<i class="fa fa-refresh fa-fw"></i> Round Statistics
</div>
<div class="panel-body">
<form action="{$smarty.server.SCRIPT_NAME}" method="POST" id='search' role="form">
<input type="hidden" name="page" value="{$smarty.request.page|escape}">
<input type="hidden" name="action" value="{$smarty.request.action|escape}">
<label>Search Block Height</label>
<div class="form-group input-group">
<input type="text" class="form-control" name="search" value="{$smarty.request.height|default:"%"|escape}">
<span class="input-group-btn">
<button class="btn btn-default" type="submit" value="Search"><i class="fa fa-search"></i>
</button>
</span>
</div>
</form>
<ul class="pager">
<li class="previous">
<a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={$BLOCKDETAILS.height}&prev=1"> &larr; </a>
</li>
<li class="next">
<a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={$BLOCKDETAILS.height}&next=1"> &rarr; </a>
</li>
</ul>
</div>
<div class="panel-body no-padding">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<tbody>
<tr>
<td>
<a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={$BLOCKDETAILS.height}&prev=1"><i class="fa fa-chevron-left fa-fw"></i></a>
</td>
<td colspan="4">
<a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={$BLOCKDETAILS.height}&next=1"><i class="fa fa-chevron-right fa-fw"></i></a>
</td>
</tr>
</tbody>
</table>
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
@ -89,24 +99,7 @@
</tr>
</tbody>
</table>
<footer>
<form action="{$smarty.server.SCRIPT_NAME}" method="POST" id='search' role="form">
<input type="hidden" name="page" value="{$smarty.request.page|escape}">
<input type="hidden" name="action" value="{$smarty.request.action|escape}">
<div class="form-group input-group">
<input type="text" class="form-control" name="search" value="{$smarty.request.height|default:"%"|escape}">
<span class="input-group-btn">
<button class="btn btn-default" type="submit" value="Search"><i class="fa fa-search"></i>
</button>
</span>
</div>
</form>
</footer>
</div>
</div>
</div>
</div>
</div>
</d

View File

@ -4,18 +4,14 @@
<div class="panel-heading">
<i class="fa fa-bar-chart fa-fw"></i> Block Statistics
</div>
<table class="table table-striped table-bordered table-hover">
<tbody>
<tr>
<td>
<a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={$BLOCKDETAILS.height}&prev=1"><i class="icon-left-open"></i></a>
</td>
<td colspan="4">
<a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={$BLOCKDETAILS.height}&next=1"><i class="icon-right-open"></i></a>
</td>
</tr>
</tbody>
</table>
<ul class="pager">
<li class="previous">
<a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={$BLOCKDETAILS.height}&prev=1">&larr; Prev</a>
</li>
<li class="next">
<a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={$BLOCKDETAILS.height}&next=1">Next &rarr;</a>
</li>
</ul>
<table class="tablesorter">
<thead>
<tr>

View File

@ -3,9 +3,9 @@
<div class="panel-heading">
<i class="fa fa-refresh fa-fw"></i> PPLNS Round Shares
</div>
<div class="panel-body no-padding">
<div class="panel-body">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<table class="table table-striped table-bordered table-hover datatable">
<thead>
<tr>
<th>Rank</th>

View File

@ -4,12 +4,12 @@
<div class="panel-heading">
<i class="fa fa-credit-card fa-fw"></i> Round Transactions
</div>
<div class="panel-body no-padding">
<div class="panel-body ">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th >User Name</th>
<th>User Name</th>
<th>Round Shares</th>
<th>Round %</th>
<th>PPLNS Shares</th>

View File

@ -4,9 +4,9 @@
<div class="panel-heading">
<i class="fa fa-refresh fa-fw"></i> Round Statistics
</div>
<div class="panel-body no-padding">
<div class="panel-body">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<table class="table table-striped table-bordered table-hover datatable">
<thead>
<tr>
<th >User Name</th>

View File

@ -3,9 +3,9 @@
<div class="panel-heading">
<i class="fa fa-refresh fa-fw"></i> Round Shares
</div>
<div class="panel-body no-padding">
<div class="panel-body">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<table class="table table-striped table-bordered table-hover datatable">
<thead>
<tr>
<th>Rank</th>

View File

@ -3,15 +3,15 @@
<div class="panel-heading">
Round Transactions
</div>
<div class="panel-body no-padding">
<div class="panel-body">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<table class="table table-striped table-bordered table-hover datatable">
<thead>
<tr>
<th>User Name</th>
<th>Type</th>
<th>Round Shares</th>
<th scope="col">Round %</th>
<th>Round %</th>
<th>Amount</th>
</tr>
</thead>