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

Merge pull request #2062 from SamuelNZ/development

Browse Source 
Removing Some Inline CSS
This commit is contained in:
Sebastian Grewe 2014-03-31 07:57:52 +02:00
commit 5061386fb8
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
public/site_assets/bootstrap/css/mpos.css
View File

@ -586,3 +586,21 @@ div.fade {
}
/* End Test */
/* Tables */
.table>tbody>tr>th
{
padding-left:3px;
padding-bottom:3px;
border: 1px solid #ddd;
background-color: #f9f9f9;
padding-right:1px;
}
.table>tbody>tr>td
{
padding:4px;
}
/* End Tables */

10
public/templates/bootstrap/statistics/blocks/block_overview_time.tpl
View File

@ -24,7 +24,7 @@
</thead>
<tbody>
<tr>
<th style="padding-left:3px;">All Time</th>
<th>All Time</th>
<td class="text-right">{($FIRSTBLOCKFOUND / $COINGENTIME)|number_format}</td>
<td class="text-right">{$LASTBLOCKSBYTIME.Total|number_format}</td>
<td class="text-right">{$LASTBLOCKSBYTIME.TotalValid|number_format}</td>
@ -49,7 +49,7 @@
<td class="text-right">{($LASTBLOCKSBYTIME.Total|default:"0.00" / ($FIRSTBLOCKFOUND / $COINGENTIME) * 100)|number_format:"2"}%</td>
</tr>
<tr>
<th style="padding-left:3px;">Last Hour</th>
<th>Last Hour</th>
<td class="text-right">{(3600 / $COINGENTIME)|number_format}</td>
<td class="text-right">{$LASTBLOCKSBYTIME.1HourTotal|number_format}</td>
<td class="text-right">{$LASTBLOCKSBYTIME.1HourValid|number_format}</td>
@ -99,7 +99,7 @@
<td class="text-right">{($LASTBLOCKSBYTIME.24HourTotal|default:"0.00" / (86400 / $COINGENTIME) * 100)|number_format:"2"}%</td>
</tr>
<tr>
<th style="padding-left:3px;">Last 7 Days</th>
<th>Last 7 Days</th>
<td class="text-right">{(604800 / $COINGENTIME)|number_format}</td>
<td class="text-right">{$LASTBLOCKSBYTIME.7DaysTotal|number_format}</td>
<td class="text-right">{$LASTBLOCKSBYTIME.7DaysValid|number_format}</td>
@ -124,7 +124,7 @@
<td class="text-right">{($LASTBLOCKSBYTIME.7DaysTotal|default:"0.00" / (604800 / $COINGENTIME) * 100)|number_format:"2"}%</td>
</tr>
<tr>
<th style="padding-left:3px;padding-right:1px;">Last 4 Weeks</th>
<th>Last 4 Weeks</th>
<td class="text-right">{(2419200 / $COINGENTIME)|number_format}</td>
<td class="text-right">{$LASTBLOCKSBYTIME.4WeeksTotal|number_format}</td>
<td class="text-right">{$LASTBLOCKSBYTIME.4WeeksValid|number_format}</td>
@ -149,7 +149,7 @@
<td class="text-right">{($LASTBLOCKSBYTIME.4WeeksTotal|default:"0.00" / (2419200 / $COINGENTIME) * 100)|number_format:"2"}%</td>
</tr>
<tr>
<th style="padding-left:3px;">The Past 12 Months</th>
<th>The Past 12 Months</th>
<td class="text-right">{(29030400 / $COINGENTIME)|number_format}</td>
<td class="text-right">{$LASTBLOCKSBYTIME.12MonthTotal|number_format}</td>
<td class="text-right">{$LASTBLOCKSBYTIME.12MonthValid|number_format}</td>

2
public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl
View File

@ -35,7 +35,7 @@
{/section}
{if $listed != 1 && $GLOBAL.userdata.username|default:"" && $GLOBAL.userdata.rawhashrate|default:"0" > 0}
{math assign="myestday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$GLOBAL.userdata.rawhashrate}
{if $GLOBAL.userdata.username|default:""|lower == $CONTRIBHASHES[contrib].account|lower}{assign var=listed value=1}<tr class="success">{else}</tr>{/if}>
{if $GLOBAL.userdata.username|default:""|lower == $CONTRIBHASHES[contrib].account|lower}{assign var=listed value=1}<tr class="success">{else}<tr>{/if}>
<td>n/a</td>
<td>{if $GLOBAL.userdata.donate_percent|default:"0" >= 2}<i class="fa fa-trophy fa-fw"></i>{elseif $GLOBAL.userdata.donate_percent|default:"0" < 2 AND $GLOBAL.userdata.donate_percent|default:"0" > 0}<i class="fa fa-star-o fa-fw"></i>{else}<i class="fa fa-ban fa-fw"></i>{/if}</td>
<td>{$GLOBAL.userdata.username|escape}</td>

2
public/templates/bootstrap/statistics/pool/contributors_shares.tpl
View File

@ -25,7 +25,7 @@
</tr>
{/section}
{if $listed != 1 && $GLOBAL.userdata.username|default:"" && $GLOBAL.userdata.shares.valid|default:"0" > 0}
{if $GLOBAL.userdata.username|default:""|lower == $CONTRIBHASHES[contrib].account|lower}{assign var=listed value=1}<tr class="success">{else}</tr>{/if}>
{if $GLOBAL.userdata.username|default:""|lower == $CONTRIBHASHES[contrib].account|lower}{assign var=listed value=1}<tr class="success">{else}<tr>{/if}>
<td>n/a</td>
<td>{if $GLOBAL.userdata.donate_percent|default:"0" >= 2}<i class="fa fa-trophy fa-fw"></i>{elseif $GLOBAL.userdata.donate_percent|default:"0" < 2 AND $GLOBAL.userdata.donate_percent|default:"0" > 0}<i class="fa fa-star-o fa-fw"></i>{else}<i class="fa fa-ban fa-fw"></i>{/if}</td>
<td>{$GLOBAL.userdata.username|escape}</td>