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

This commit is contained in:
Sebastian Grewe 2014-03-01 20:23:38 +01:00
commit 9a87874d45
2 changed files with 11 additions and 7 deletions

View File

@ -319,3 +319,7 @@ table.dataTable thead .sorting:after {
.no-padding .table-bordered { .no-padding .table-bordered {
border: 0; border: 0;
} }
.borderless > tbody > tr > td {
border: none;
}

View File

@ -10,14 +10,14 @@
<input type="hidden" name="action" value="{$smarty.request.action|escape}"> <input type="hidden" name="action" value="{$smarty.request.action|escape}">
<input type="hidden" name="do" value="save"> <input type="hidden" name="do" value="save">
<input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}" /> <input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}" />
<table width="100%"> <table class="table borderless">
<tr> <tr>
<td> <td>
<label>IDLE Worker</label> <label>IDLE Worker</label>
</td> </td>
<td> <td>
<input type="hidden" name="data[idle_worker]" value="0" /> <input type="hidden" name="data[idle_worker]" value="0" />
<input type="checkbox" data-size="mini" name="data[idle_worker]" id="idle_worker" value="1"{nocache}{if $SETTINGS['idle_worker']|default:"0" == 1}checked{/if}{/nocache} /> <input type="checkbox" data-size="small" name="data[idle_worker]" id="idle_worker" value="1"{nocache}{if $SETTINGS['idle_worker']|default:"0" == 1}checked{/if}{/nocache} />
<script> <script>
$("[id='idle_worker']").bootstrapSwitch(); $("[id='idle_worker']").bootstrapSwitch();
</script> </script>
@ -30,7 +30,7 @@
</td> </td>
<td> <td>
<input type="hidden" name="data[new_block]" value="0" /> <input type="hidden" name="data[new_block]" value="0" />
<input type="checkbox" data-size="mini" name="data[new_block]" id="new_block" value="1"{nocache}{if $SETTINGS['new_block']|default:"0" == 1}checked{/if}{/nocache} /> <input type="checkbox" data-size="small" name="data[new_block]" id="new_block" value="1"{nocache}{if $SETTINGS['new_block']|default:"0" == 1}checked{/if}{/nocache} />
<script> <script>
$("[id='new_block']").bootstrapSwitch(); $("[id='new_block']").bootstrapSwitch();
</script> </script>
@ -43,7 +43,7 @@
</td> </td>
<td> <td>
<input type="hidden" name="data[payout]" value="0" /> <input type="hidden" name="data[payout]" value="0" />
<input type="checkbox" data-size="mini" name="data[payout]" id="payout" value="1"{nocache}{if $SETTINGS['payout']|default:"0" == 1}checked{/if}{/nocache} /> <input type="checkbox" data-size="small" name="data[payout]" id="payout" value="1"{nocache}{if $SETTINGS['payout']|default:"0" == 1}checked{/if}{/nocache} />
<script> <script>
$("[id='payout']").bootstrapSwitch(); $("[id='payout']").bootstrapSwitch();
</script> </script>
@ -55,7 +55,7 @@
</td> </td>
<td> <td>
<input type="hidden" name="data[success_login]" value="0" /> <input type="hidden" name="data[success_login]" value="0" />
<input type="checkbox" data-size="mini" name="data[success_login]" id="success_login" value="1"{nocache}{if $SETTINGS['success_login']|default:"0" == 1}checked{/if}{/nocache} /> <input type="checkbox" data-size="small" name="data[success_login]" id="success_login" value="1"{nocache}{if $SETTINGS['success_login']|default:"0" == 1}checked{/if}{/nocache} />
<script> <script>
$("[id='success_login']").bootstrapSwitch(); $("[id='success_login']").bootstrapSwitch();
</script> </script>
@ -77,7 +77,7 @@
<div class="panel-heading"> <div class="panel-heading">
<i class="fa fa-clock-o fa-fw"></i> Notification History <i class="fa fa-clock-o fa-fw"></i> Notification History
</div> </div>
<div class="panel-body no-padding"> <div class="panel-body">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-bordered table-hover"> <table class="table table-striped table-bordered table-hover">
<thead> <thead>