From b8744db366ec36a53056b593b6218ce6dabcfe52 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 8 Dec 2017 13:57:46 +0200 Subject: [PATCH] Standardize UI's --- resources/views/accounts/product.blade.php | 42 ++++++++++--------- .../views/expense_categories/edit.blade.php | 3 -- resources/views/projects/edit.blade.php | 3 -- 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/resources/views/accounts/product.blade.php b/resources/views/accounts/product.blade.php index e2adacb0e4d6..c426f1a1c806 100644 --- a/resources/views/accounts/product.blade.php +++ b/resources/views/accounts/product.blade.php @@ -18,33 +18,35 @@ {!! Former::text('action') !!} -
-
-

{!! $title !!}

-
-
+
+
- {!! Former::text('product_key')->label('texts.product') !!} - {!! Former::textarea('notes')->rows(6) !!} +
+
- @if ($account->hasFeature(FEATURE_INVOICE_SETTINGS)) - @if ($account->custom_invoice_item_label1) - {!! Former::text('custom_value1')->label(e($account->custom_invoice_item_label1)) !!} - @endif - @if ($account->custom_invoice_item_label2) - {!! Former::text('custom_value2')->label(e($account->custom_invoice_item_label2)) !!} - @endif - @endif + {!! Former::text('product_key')->label('texts.product') !!} + {!! Former::textarea('notes')->rows(6) !!} - {!! Former::text('cost') !!} + @if ($account->hasFeature(FEATURE_INVOICE_SETTINGS)) + @if ($account->custom_invoice_item_label1) + {!! Former::text('custom_value1')->label(e($account->custom_invoice_item_label1)) !!} + @endif + @if ($account->custom_invoice_item_label2) + {!! Former::text('custom_value2')->label(e($account->custom_invoice_item_label2)) !!} + @endif + @endif - @if ($account->invoice_item_taxes) - @include('partials.tax_rates') - @endif + {!! Former::text('cost') !!} + @if ($account->invoice_item_taxes) + @include('partials.tax_rates') + @endif + +
+
- +
{!! Button::normal(trans('texts.cancel'))->large()->asLinkTo(HTMLUtils::previousUrl('/products'))->appendIcon(Icon::create('remove-circle')) !!} {!! Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk')) !!} diff --git a/resources/views/expense_categories/edit.blade.php b/resources/views/expense_categories/edit.blade.php index 71327071a668..618af8928570 100644 --- a/resources/views/expense_categories/edit.blade.php +++ b/resources/views/expense_categories/edit.blade.php @@ -21,9 +21,6 @@
-
-

{!! trans('texts.category') !!}

-
{!! Former::text('name') !!} diff --git a/resources/views/projects/edit.blade.php b/resources/views/projects/edit.blade.php index 1960fd3a8062..75e6897c0a3a 100644 --- a/resources/views/projects/edit.blade.php +++ b/resources/views/projects/edit.blade.php @@ -24,9 +24,6 @@
-
-

{!! trans('texts.project') !!}

-
@if ($project)