From 2f54d1dfa3e6fd8a644c83de64c36b269d753022 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 6 Sep 2016 14:54:53 +0300 Subject: [PATCH] Enable iframe feature for self host users --- .../views/accounts/email_settings.blade.php | 61 +++++++++---------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/resources/views/accounts/email_settings.blade.php b/resources/views/accounts/email_settings.blade.php index ac660e89753b..79d8dc6e571d 100644 --- a/resources/views/accounts/email_settings.blade.php +++ b/resources/views/accounts/email_settings.blade.php @@ -10,7 +10,7 @@ @stop -@section('content') +@section('content') @parent @include('accounts.nav', ['selected' => ACCOUNT_EMAIL_SETTINGS, 'advanced' => true]) @@ -29,35 +29,34 @@
{!! Former::checkbox('pdf_email_attachment')->text(trans('texts.enable')) !!} {!! Former::checkbox('document_email_attachment')->text(trans('texts.enable')) !!} - +   - + {{-- Former::select('recurring_hour')->options($recurringHours) --}} - @if (Utils::isNinja()) - {!! Former::inline_radios('custom_invoice_link') - ->onchange('onCustomLinkChange()') - ->label(trans('texts.invoice_link')) - ->radios([ - trans('texts.subdomain') => ['value' => 'subdomain', 'name' => 'custom_link'], - trans('texts.website') => ['value' => 'website', 'name' => 'custom_link'], - ])->check($account->iframe_url ? 'website' : 'subdomain') !!} - {{ Former::setOption('capitalize_translations', false) }} - - {!! Former::text('subdomain') - ->placeholder(trans('texts.www')) - ->onchange('onSubdomainChange()') - ->addGroupClass('subdomain') - ->label(' ') - ->help(trans('texts.subdomain_help')) !!} + {!! Former::inline_radios('custom_invoice_link') + ->onchange('onCustomLinkChange()') + ->label(trans('texts.invoice_link')) + ->radios([ + trans('texts.subdomain') => ['value' => 'subdomain', 'name' => 'custom_link'], + trans('texts.website') => ['value' => 'website', 'name' => 'custom_link'], + ])->check($account->iframe_url ? 'website' : 'subdomain') !!} + {{ Former::setOption('capitalize_translations', false) }} + + {!! Former::text('subdomain') + ->placeholder(trans('texts.www')) + ->onchange('onSubdomainChange()') + ->addGroupClass('subdomain') + ->label(' ') + ->help(trans('texts.subdomain_help')) !!} + + {!! Former::text('iframe_url') + ->placeholder('https://www.example.com/invoice') + ->appendIcon('question-sign') + ->addGroupClass('iframe_url') + ->label(' ') + ->help(trans('texts.subdomain_help')) !!} - {!! Former::text('iframe_url') - ->placeholder('https://www.example.com/invoice') - ->appendIcon('question-sign') - ->addGroupClass('iframe_url') - ->label(' ') - ->help(trans('texts.subdomain_help')) !!} - @endif
@@ -66,7 +65,7 @@

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

- + {!! Former::select('email_design_id') ->appendIcon('question-sign') ->addGroupClass('email_design_id') @@ -79,7 +78,7 @@ @if (Utils::isNinja()) {!! Former::checkbox('enable_email_markup') - ->text(trans('texts.enable') . + ->text(trans('texts.enable') . '' . Icon::create('question-sign') . ' ') ->help(trans('texts.enable_email_markup_help')) !!} @endif @@ -107,7 +106,7 @@ <center> <script language="javascript"> var iframe = document.getElementById('invoiceIFrame'); - iframe.src = '{{ SITE_URL }}/view/' + iframe.src = '{{ SITE_URL }}/view/' + window.location.search.substring(1); </script>

{{ trans('texts.iframe_url_help2') }}

@@ -186,7 +185,7 @@ $('#designHelpModal').modal('show'); }); - $(function() { + $(function() { onCustomLinkChange(); $('#subdomain').change(function() { @@ -198,4 +197,4 @@ }); -@stop \ No newline at end of file +@stop