Kimirock/freescout
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:freescout-helpdesk/freescout into dist

Browse Source
This commit is contained in:
FreeScout
2018-10-24 07:21:32 -07:00
parent 5ecd684b01 7e5bb33248
commit 47637c7bf1
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/MailboxesController.php
View File

@@ -300,14 +300,14 @@ class MailboxesController extends Controller
if (Route::currentRouteName() != 'mailboxes.connection' && !$mailbox->isOutActive()) {
$flashes[] = [
'type' => 'warning',
'text' => __('Sending emails need to be configured for the mailbox in order to send emails to customers and support agents').' (<a href="'.route('mailboxes.connection', ['id' => $mailbox->id]).'">'.__('Connection Settings » Sending Emails').'</a>)',
'text' => __('Sending emails need to be configured for the mailbox in order to send emails to customers and support agents').' ('.__('Connection Settings').' » <a href="'.route('mailboxes.connection', ['id' => $mailbox->id]).'">'.__('Sending Emails').'</a>)',
'unescaped' => true,
];
}
if (Route::currentRouteName() != 'mailboxes.connection.incoming' && !$mailbox->isInActive()) {
$flashes[] = [
'type' => 'warning',
'text' => __('Receiving emails need to be configured for the mailbox in order to fetch emails from your support email address').' (<a href="'.route('mailboxes.connection.incoming', ['id' => $mailbox->id]).'">'.__('Connection Settings » Receiving Emails').'</a>)',
'text' => __('Receiving emails need to be configured for the mailbox in order to fetch emails from your support email address').' ('.__('Connection Settings').' » <a href="'.route('mailboxes.connection.incoming', ['id' => $mailbox->id]).'">'.__('Receiving Emails').'</a>)',
'unescaped' => true,
];
}

7
resources/views/mailboxes/connection.blade.php
View File

@@ -197,15 +197,16 @@
</div>
<div class="form-group">
<label for="send_test" class="col-sm-2 control-label">{{ __('Test Email') }}</label>
<label for="send_test" class="col-sm-2 control-label">{{ __('Send Test To') }}</label>
<div class="col-sm-6">
<div class="input-group input-sized">
<input id="send_test" type="email" class="form-control" value="{{ old('email', \App\Option::get('send_test_to', $mailbox->email)) }}" maxlength="128" @if (!$mailbox->isInActive()) disabled="disabled" @endif>
<input id="send_test" type="email" class="form-control" value="{{ old('email', \App\Option::get('send_test_to', $mailbox->email)) }}" maxlength="128" @if (!$mailbox->isOutActive()) disabled="disabled" @endif>
<span class="input-group-btn">
<button id="send-test-trigger" class="btn btn-default" type="button" data-loading-text="{{ __('Sending') }}…" @if (!$mailbox->isOutActive()) disabled="disabled" @endif>{{ __('Send Test') }}</button>
<button id="send-test-trigger" class="btn btn-default" type="button" data-loading-text="{{ __('Sending') }}…" @if (!$mailbox->isOutActive()) disabled="disabled" @endif>{{ __('Send Test') }}</button>
</span>
</div>
<div class="form-help">{!! __("Make sure to save settings before testing.") !!}</div>
</div>
</div>

6
resources/views/mailboxes/connection_incoming.blade.php
View File

@@ -25,6 +25,10 @@
<form class="form-horizontal" method="POST" action="">
{{ csrf_field() }}
<div class="descr-block">
{!! __("You can read more about fetching emails :%a_begin%here:%a_end%.", ['%a_begin%' => '<a href="https://github.com/freescout-helpdesk/freescout/wiki/Fetching-Emails" target="_blank">', '%a_end%' =>'</a>']) !!}
</div>
<div class="form-group margin-top">
<label for="email" class="col-sm-2 control-label">{{ __('Fetch From') }}</label>
@@ -100,6 +104,8 @@
</select>
@include('partials/field_error', ['field'=>'in_encryption'])
<div class="form-help">{!! __("Make sure to save settings before checkig connection.") !!}</div>
</div>
</div>

2
resources/views/settings/emails.blade.php
View File

@@ -94,7 +94,7 @@
</div>
<div class="form-group">
<label for="send_test" class="col-sm-2 control-label">{{ __('Test Email') }}</label>
<label for="send_test" class="col-sm-2 control-label">{{ __('Send Test To') }}</label>
<div class="col-sm-6">
<div class="input-group input-sized">