mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Added support for right aligning table columns
This commit is contained in:
parent
63c1293e3b
commit
523b008d01
@ -722,7 +722,6 @@ class AccountController extends BaseController
|
|||||||
|
|
||||||
private function saveInvoiceDesign()
|
private function saveInvoiceDesign()
|
||||||
{
|
{
|
||||||
//dd(Input::get('all_pages_header'));
|
|
||||||
if (Auth::user()->account->isPro()) {
|
if (Auth::user()->account->isPro()) {
|
||||||
$account = Auth::user()->account;
|
$account = Auth::user()->account;
|
||||||
$account->hide_quantity = Input::get('hide_quantity') ? true : false;
|
$account->hide_quantity = Input::get('hide_quantity') ? true : false;
|
||||||
|
@ -195,6 +195,8 @@ class AccountGatewayController extends BaseController
|
|||||||
|
|
||||||
if ($gatewayId == GATEWAY_DWOLLA) {
|
if ($gatewayId == GATEWAY_DWOLLA) {
|
||||||
$optional = array_merge($optional, ['key', 'secret']);
|
$optional = array_merge($optional, ['key', 'secret']);
|
||||||
|
} elseif ($gatewayId == GATEWAY_STRIPE) {
|
||||||
|
$rules['publishable_key'] = 'required';
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($fields as $field => $details) {
|
foreach ($fields as $field => $details) {
|
||||||
|
4
public/css/built.css
vendored
4
public/css/built.css
vendored
@ -3372,6 +3372,10 @@ ul.user-accounts a:hover div.remove {
|
|||||||
font-size: .9em;
|
font-size: .9em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
td.right {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
/* Show selected section in settings nav */
|
/* Show selected section in settings nav */
|
||||||
.list-group-item.selected:before {
|
.list-group-item.selected:before {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
4
public/css/style.css
vendored
4
public/css/style.css
vendored
@ -1021,6 +1021,10 @@ ul.user-accounts a:hover div.remove {
|
|||||||
font-size: .9em;
|
font-size: .9em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
td.right {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
/* Show selected section in settings nav */
|
/* Show selected section in settings nav */
|
||||||
.list-group-item.selected:before {
|
.list-group-item.selected:before {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h3 class="panel-title" data-bind="text: title"></h3>
|
<h3 class="panel-title" data-bind="text: title"> </h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
|
|
||||||
|
@ -56,10 +56,16 @@
|
|||||||
@if (isset($hasCheckboxes) && $hasCheckboxes)
|
@if (isset($hasCheckboxes) && $hasCheckboxes)
|
||||||
'aaSorting': [['1', 'asc']],
|
'aaSorting': [['1', 'asc']],
|
||||||
// Disable sorting on the first column
|
// Disable sorting on the first column
|
||||||
"aoColumnDefs": [ {
|
"aoColumnDefs": [
|
||||||
'bSortable': false,
|
{
|
||||||
'aTargets': [ 0, {{ count($columns) - 1 }} ]
|
'bSortable': false,
|
||||||
} ],
|
'aTargets': [ 0, {{ count($columns) - 1 }} ]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'sClass': 'right',
|
||||||
|
'aTargets': {{ isset($values['rightAlign']) ? json_encode($values['rightAlign']) : '[]' }}
|
||||||
|
}
|
||||||
|
],
|
||||||
@endif
|
@endif
|
||||||
@foreach ($options as $k => $o)
|
@foreach ($options as $k => $o)
|
||||||
{!! json_encode($k) !!}: {!! json_encode($o) !!},
|
{!! json_encode($k) !!}: {!! json_encode($o) !!},
|
||||||
|
@ -45,6 +45,7 @@
|
|||||||
{!! Datatable::table()
|
{!! Datatable::table()
|
||||||
->addColumn($columns)
|
->addColumn($columns)
|
||||||
->setUrl(route('api.' . $entityType . 's'))
|
->setUrl(route('api.' . $entityType . 's'))
|
||||||
|
->setCustomValues('rightAlign', isset($rightAlign) ? $rightAlign : [])
|
||||||
->setOptions('sPaginationType', 'bootstrap')
|
->setOptions('sPaginationType', 'bootstrap')
|
||||||
->setOptions('aaSorting', [[isset($sortCol) ? $sortCol : '1', 'desc']])
|
->setOptions('aaSorting', [[isset($sortCol) ? $sortCol : '1', 'desc']])
|
||||||
->render('datatable') !!}
|
->render('datatable') !!}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user