From 0953fbe7cdee43fe35b8ba37acac6d818c648c02 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 5 Nov 2015 12:02:14 +0200 Subject: [PATCH] Added Quill to email signature --- resources/views/accounts/details.blade.php | 110 ++++++++++++------ resources/views/accounts/template.blade.php | 3 +- .../views/partials/quill_toolbar.blade.php | 4 +- 3 files changed, 80 insertions(+), 37 deletions(-) diff --git a/resources/views/accounts/details.blade.php b/resources/views/accounts/details.blade.php index 0209242e36d3..d7e669d77652 100644 --- a/resources/views/accounts/details.blade.php +++ b/resources/views/accounts/details.blade.php @@ -1,5 +1,12 @@ @extends('header') +@section('head') + @parent + + + +@stop + @section('content') @parent @@ -28,24 +35,24 @@
- {!! Former::text('name') !!} - {!! Former::text('id_number') !!} - {!! Former::text('vat_number') !!} - {!! Former::text('work_email') !!} - {!! Former::text('work_phone') !!} - {!! Former::textarea('email_footer')->label(trans('texts.signature'))->rows(4) !!} - {!! Former::file('logo')->max(2, 'MB')->accept('image')->inlineHelp(trans('texts.logo_help')) !!} + {!! Former::text('name') !!} + {!! Former::text('id_number') !!} + {!! Former::text('vat_number') !!} + {!! Former::text('work_email') !!} + {!! Former::text('work_phone') !!} + {!! Former::file('logo')->max(2, 'MB')->accept('image')->inlineHelp(trans('texts.logo_help')) !!} - @if ($account->hasLogo()) -
- {!! HTML::image($account->getLogoPath().'?no_cache='.time(), 'Logo', ['width' => 200]) !!}   - {{ trans('texts.remove_logo') }} -

- @endif + @if ($account->hasLogo()) +
+ {!! HTML::image($account->getLogoPath().'?no_cache='.time(), 'Logo', ['width' => 200]) !!}   + {{ trans('texts.remove_logo') }} +

+ @endif + + {!! Former::select('size_id')->addOption('','')->fromQuery($sizes, 'name', 'id') !!} + {!! Former::select('industry_id')->addOption('','')->fromQuery($industries, 'name', 'id') !!} - {!! Former::select('size_id')->addOption('','')->fromQuery($sizes, 'name', 'id') !!} - {!! Former::select('industry_id')->addOption('','')->fromQuery($industries, 'name', 'id') !!}
@@ -55,18 +62,33 @@
- {!! Former::text('address1') !!} - {!! Former::text('address2') !!} - {!! Former::text('city') !!} - {!! Former::text('state') !!} - {!! Former::text('postal_code') !!} - {!! Former::select('country_id')->addOption('','') - ->fromQuery($countries, 'name', 'id') !!} + {!! Former::text('address1') !!} + {!! Former::text('address2') !!} + {!! Former::text('city') !!} + {!! Former::text('state') !!} + {!! Former::text('postal_code') !!} + {!! Former::select('country_id')->addOption('','') + ->fromQuery($countries, 'name', 'id') !!}
- - + +
+
+

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

+
+
+ +
+ {!! Former::textarea('email_footer')->style('display:none')->raw() !!} +
+ @include('partials/quill_toolbar', ['name' => 'signature']) +
+ +
+
+ + @@ -82,15 +104,37 @@ diff --git a/resources/views/accounts/template.blade.php b/resources/views/accounts/template.blade.php index 1d451529a5c5..13f080c37f0e 100644 --- a/resources/views/accounts/template.blade.php +++ b/resources/views/accounts/template.blade.php @@ -1,5 +1,5 @@
-
+
@if (isset($isReminder) && $isReminder)
@@ -65,6 +65,7 @@ var html = editors['{{ $field }}'].getHTML(); $('#email_template_{{ $field }}').val(html); refreshPreview(); + NINJA.formIsChanged = true; }); editors['{{ $field }}'] = editor; }); diff --git a/resources/views/partials/quill_toolbar.blade.php b/resources/views/partials/quill_toolbar.blade.php index 20c39fe3c8cc..f20c1d295d0b 100644 --- a/resources/views/partials/quill_toolbar.blade.php +++ b/resources/views/partials/quill_toolbar.blade.php @@ -1,6 +1,5 @@ -
-
+