Skip to content

Commit a2a917b

Browse files
committed
Deleted "include_font_awesome" configuration setting
1 parent c5d6d64 commit a2a917b

10 files changed

Lines changed: 2 additions & 72 deletions

File tree

src/Controllers/ConfigurationsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function index()
3030
'email.color_button_bg', 'email.account.name', 'email.account.mailbox' ];
3131
$tickets_section = ['default_priority_id', 'default_status_id', 'default_close_status_id', 'default_reopen_status_id', 'subject_content_column', 'paginate_items', 'attachments_ticket_max_size', 'attachments_ticket_max_files_num', 'attachments_mimes', 'attachments_path', 'thumbnails_path', 'oldest_year', 'user_route', 'html_replacements'];
3232
$perms_section = ['agent_restrict', 'close_ticket_perm', 'reopen_ticket_perm'];
33-
$editor_section = ['editor_enabled', 'include_font_awesome', 'editor_html_highlighter', 'codemirror_theme',
33+
$editor_section = ['editor_enabled', 'editor_html_highlighter', 'codemirror_theme',
3434
'summernote_locale', 'summernote_options_json_file', 'summernote_options_user', 'purifier_config', ];
3535

3636
// Split them into configurations sections for tabs

src/PanicHDServiceProvider.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,6 @@ public function boot()
117117
$view->with(compact('master', 'email', 'tools', 'editor_enabled', 'codemirror_enabled', 'codemirror_theme'));
118118
});
119119

120-
// Include font awesome css or not
121-
view()->composer('panichd::shared.assets', function ($view) {
122-
$include_font_awesome = Setting::grab('include_font_awesome');
123-
$view->with(compact('include_font_awesome'));
124-
});
125-
126120
// Include $n_notices in shared.nav and tickets.createedit templates
127121
view()->composer(['panichd::shared.nav', 'panichd::tickets.createedit'], function ($view) {
128122
$n_notices = Setting::grab('departments_notices_feature') ? Ticket::active()->notHidden()->whereIn('user_id', \PanicHDMember::find(auth()->user()->id)->getMyNoticesUsers())->count() : 0;

src/Seeds/SettingsTableSeeder.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -304,12 +304,6 @@ public function getDefaults()
304304
*/
305305
'editor_enabled' => 'yes',
306306

307-
/*
308-
* If Font-awesome css is included outside Panic Help Desk, this should be set to 'no'
309-
* Default: 'yes'
310-
*/
311-
'include_font_awesome' => 'yes',
312-
313307
/*
314308
* Which language should summernote js texteditor use
315309
* If value is 'laravel', locale set in config/app.php will be used

src/Translations/ar/settings.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,6 @@
7777
</p>
7878
ENDHTML
7979

80-
, 'include_font_awesome' => <<<'ENDHTML'
81-
<p>If Font-awesome css is included outside Panic Help Desk, this should be set to <code>0</code></p>
82-
83-
<p>
84-
Don't include: <code>0</code><br>
85-
Include: <code>1</code>
86-
</p>
87-
ENDHTML
88-
8980
, 'summernote_locale' => <<<"ENDHTML"
9081
<p>
9182
Which language should summernote js texteditor use<br>

src/Translations/ca/settings.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,6 @@
7777
</p>
7878
ENDHTML
7979

80-
, 'include_font_awesome' => <<<'ENDHTML'
81-
<p>If Font-awesome css is included outside Panic Help Desk, this should be set to <code>0</code></p>
82-
83-
<p>
84-
Don't include: <code>0</code><br>
85-
Include: <code>1</code>
86-
</p>
87-
ENDHTML
88-
8980
, 'summernote_locale' => <<<'ENDHTML'
9081
<p>
9182
Which language should summernote js texteditor use<br>

src/Translations/en/settings.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,6 @@
7777
</p>
7878
ENDHTML
7979

80-
, 'include_font_awesome' => <<<'ENDHTML'
81-
<p>If Font-awesome css is included outside Panic Help Desk, this should be set to <code>0</code></p>
82-
83-
<p>
84-
Don't include: <code>0</code><br>
85-
Include: <code>1</code>
86-
</p>
87-
ENDHTML
88-
8980
, 'summernote_locale' => <<<"ENDHTML"
9081
<p>
9182
Which language should summernote js texteditor use<br>

src/Translations/es/settings.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,6 @@
7676
</p>
7777
ENDHTML
7878

79-
, 'include_font_awesome' => <<<'ENDHTML'
80-
<p>Si Font-awesome css se incluyo fuera de Panic Help Desk, deberías configurar esto como <code>0</code></p>
81-
82-
<p>
83-
No incluir: <code>0</code><br>
84-
Incluir: <code>1</code>
85-
</p>
86-
ENDHTML
87-
8879
, 'summernote_locale' => <<<"ENDHTML"
8980
<p>
9081
¿Qué lenguaje debería usar el editor de texto summernote js?<br>

src/Translations/it/settings.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,6 @@
7777
</p>
7878
ENDHTML
7979

80-
, 'include_font_awesome' => <<<'ENDHTML'
81-
<p>If Font-awesome css is included outside Panic Help Desk, this should be set to <code>0</code></p>
82-
83-
<p>
84-
Don't include: <code>0</code><br>
85-
Include: <code>1</code>
86-
</p>
87-
ENDHTML
88-
8980
, 'summernote_locale' => <<<"ENDHTML"
9081
<p>
9182
Which language should summernote js texteditor use<br>

src/Translations/ru/settings.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,6 @@
112112
HTML
113113
,
114114

115-
'include_font_awesome' => <<<'HTML'
116-
<p>Подключать Font-awesome css. Выставьте <code>0</code>, если он уже используется на страницах</p>
117-
118-
<p>
119-
Не подключать: <code>0</code><br>
120-
Подключать: <code>1</code>
121-
</p>
122-
HTML
123-
,
124-
125115
'summernote_locale' => <<<'HTML'
126116
<p>
127117
Какой язык должен использовать summernote<br>

src/Views/shared/assets.blade.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<link rel="StyleSheet" href="{{asset('vendor/panichd/css/bootstrap/bootstrap-4.1.3.min.css')}}">
2-
@if($include_font_awesome)
3-
<link rel="StyleSheet" href="{{asset('vendor/panichd/font-awesome/css/all-5.2.0.min.css')}}">
4-
@endif
5-
2+
<link rel="StyleSheet" href="{{asset('vendor/panichd/font-awesome/css/all-5.2.0.min.css')}}">
63
<link rel="StyleSheet" href="{{asset('vendor/panichd/css/select2.min.css')}}">
74
<style type="text/css">
85
.select2-selection__choice {

0 commit comments

Comments
 (0)