Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improved invoice design form layout

Browse Source
This commit is contained in:
Hillel Coren 2016-01-10 20:40:04 +02:00
parent 9436f5a51e
commit d72ff27e62
2 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Account.php
View File

@ -35,8 +35,8 @@ class Account extends Eloquent
public static $advancedSettings = [ public static $advancedSettings = [
ACCOUNT_INVOICE_SETTINGS, ACCOUNT_INVOICE_SETTINGS,
ACCOUNT_INVOICE_DESIGN, ACCOUNT_INVOICE_DESIGN,
ACCOUNT_CLIENT_PORTAL,
ACCOUNT_EMAIL_SETTINGS, ACCOUNT_EMAIL_SETTINGS,
ACCOUNT_CLIENT_PORTAL,
ACCOUNT_TEMPLATES_AND_REMINDERS, ACCOUNT_TEMPLATES_AND_REMINDERS,
ACCOUNT_CHARTS_AND_REPORTS, ACCOUNT_CHARTS_AND_REPORTS,
ACCOUNT_DATA_VISUALIZATIONS, ACCOUNT_DATA_VISUALIZATIONS,

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

@ -122,32 +122,46 @@
<div role="tabpanel" class="tab-pane active" id="generalSettings"> <div role="tabpanel" class="tab-pane active" id="generalSettings">
<div class="panel-body"> <div class="panel-body">
@if (!Utils::isPro() || \App\Models\InvoiceDesign::count() == COUNT_FREE_DESIGNS_SELF_HOST) <div class="row">
{!! Former::select('invoice_design_id') <div class="col-md-6">
->style('display:inline; width:300px')
->fromQuery($invoiceDesigns, 'name', 'id')
->addOption(trans('texts.more_designs') . '...', '-1') !!}
@else
{!! Former::select('invoice_design_id')
->style('display:inline; width:300px')
->fromQuery($invoiceDesigns, 'name', 'id') !!}
@endif
{!! Former::select('header_font_id')
->style('display:inline; width:300px')
->fromQuery($invoiceFonts, 'name', 'id') !!}
{!! Former::select('body_font_id')
->style('display:inline; width:300px')
->fromQuery($invoiceFonts, 'name', 'id') !!}
{!! Former::text('font_size') @if (!Utils::isPro() || \App\Models\InvoiceDesign::count() == COUNT_FREE_DESIGNS_SELF_HOST)
->style('width:300px') {!! Former::select('invoice_design_id')
->type('number') ->fromQuery($invoiceDesigns, 'name', 'id')
->min('0') ->addOption(trans('texts.more_designs') . '...', '-1') !!}
->step('1') !!} @else
{!! Former::select('invoice_design_id')
->fromQuery($invoiceDesigns, 'name', 'id') !!}
@endif
{!! Former::select('body_font_id')
->fromQuery($invoiceFonts, 'name', 'id') !!}
{!! Former::select('header_font_id')
->fromQuery($invoiceFonts, 'name', 'id') !!}
{!! Former::text('primary_color') !!} </div>
{!! Former::text('secondary_color') <div class="col-md-6">
->help('<br/>'.trans('texts.color_font_help')) !!}
{{ Former::setOption('TwitterBootstrap3.labelWidths.large', 6) }}
{{ Former::setOption('TwitterBootstrap3.labelWidths.small', 6) }}
{!! Former::text('font_size')
->type('number')
->min('0')
->step('1') !!}
{!! Former::text('primary_color') !!}
{!! Former::text('secondary_color') !!}
{{ Former::setOption('TwitterBootstrap3.labelWidths.large', 4) }}
{{ Former::setOption('TwitterBootstrap3.labelWidths.small', 4) }}
</div>
</div>
<div class="help-block">
{{ trans('texts.color_font_help') }}
</div>
</div> </div>
</div> </div>