Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 17:44:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refinements to the invoice fields settings

Browse Source
This commit is contained in:
Hillel Coren 2016-09-21 12:43:47 +03:00
parent 25582a6ca3
commit a8b606634d
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/lang/en/texts.php
View File

@ -2134,6 +2134,7 @@ $LANG = array(
'raw' => 'Raw', 'raw' => 'Raw',
'raw_html' => 'Raw HTML', 'raw_html' => 'Raw HTML',
'update' => 'Update', 'update' => 'Update',
'invoice_fields_help' => 'Drag and drop fields to change their order and location',
); );

9
resources/views/accounts/invoice_design.blade.php
View File

@ -201,7 +201,7 @@
</div> </div>
</div> </div>
<div class="help-block"> <div class="help-block" style="padding-top:16px">
{{ trans('texts.color_font_help') }} {{ trans('texts.color_font_help') }}
</div> </div>
@ -239,8 +239,11 @@
@include('accounts.partials.invoice_fields_selector', ['section' => 'account_fields1', 'fields' => INVOICE_FIELDS_ACCOUNT]) @include('accounts.partials.invoice_fields_selector', ['section' => 'account_fields1', 'fields' => INVOICE_FIELDS_ACCOUNT])
@include('accounts.partials.invoice_fields_selector', ['section' => 'account_fields2', 'fields' => INVOICE_FIELDS_ACCOUNT]) @include('accounts.partials.invoice_fields_selector', ['section' => 'account_fields2', 'fields' => INVOICE_FIELDS_ACCOUNT])
</div> </div>
<div class="row"> <div class="row" style="padding-top:30px">
<div class="pull-right" style="padding-top:18px;padding-right:14px"> <div class="pull-left help-block">
{{ trans('texts.invoice_fields_help') }}
</div>
<div class="pull-right" style="padding-right:14px">
{!! Button::normal(trans('texts.reset')) {!! Button::normal(trans('texts.reset'))
->withAttributes(['onclick' => 'sweetConfirm(function() { ->withAttributes(['onclick' => 'sweetConfirm(function() {
resetFields(); resetFields();

6
resources/views/accounts/partials/invoice_fields.blade.php
View File

@ -161,10 +161,4 @@ function loadFields(selectedFields)
color: red; color: red;
} }
.field-list .fa-bars {
position: absolute;
right: 20px;
color: #AAA;
}
</style> </style>

6
resources/views/accounts/partials/invoice_fields_selector.blade.php
View File

@ -8,11 +8,11 @@
<table class="field-list"> <table class="field-list">
<tbody data-bind="sortable: { data: {{ $section }}, as: 'field', afterMove: onDragged }"> <tbody data-bind="sortable: { data: {{ $section }}, as: 'field', afterMove: onDragged }">
<tr> <tr style="cursor:move;background-color:#fff;margin:1px">
<td> <td>
<i class="fa fa-close" data-bind="click: $root.{{ Utils::toCamelCase('remove' . ucwords($section)) }}"></i> <i class="fa fa-close" style="cursor:pointer" title="{{ trans('texts.remove') }}"
data-bind="click: $root.{{ Utils::toCamelCase('remove' . ucwords($section)) }}"></i>
<span data-bind="text: window.field_map[field]"></span> <span data-bind="text: window.field_map[field]"></span>
<i class="fa fa-bars"></i>
</td> </td>
</tr> </tr>
</tbody> </tbody>