merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2968 from rahulcs0082/development 

configuration added for favicon in admin
This commit is contained in:
Jitendra Singh 2020-04-29 16:38:35 +05:30 committed by GitHub
parent 89174f0c39 2753c7b1d5
commit 751d8b88ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Webkul/Admin/src/Config/system.php
View File

@ -99,6 +99,12 @@ return [
'type' => 'image', 'type' => 'image',
'channel_based' => true, 'channel_based' => true,
'validation' => 'mimes:jpeg,bmp,png,jpg', 'validation' => 'mimes:jpeg,bmp,png,jpg',
], [
'name' => 'favicon',
'title' => 'admin::app.admin.system.favicon',
'type' => 'image',
'channel_based' => true,
'validation' => 'mimes:jpeg,bmp,png,jpg',
], ],
], ],
], [ ], [

3
packages/Webkul/Admin/src/Resources/lang/ar/app.php
View File

@ -1304,7 +1304,8 @@ return [
'all-channels' => 'الكل', 'all-channels' => 'الكل',
'all-locales' => 'الكل', 'all-locales' => 'الكل',
'invoice-slip-design' => 'Invoice Slip Design', 'invoice-slip-design' => 'Invoice Slip Design',
'logo' => 'logo' 'logo' => 'logo',
'favicon' => 'Favicon'
] ]
] ]
]; ];

3
packages/Webkul/Admin/src/Resources/lang/en/app.php
View File

@ -1309,7 +1309,8 @@ return [
'all-channels' => 'All', 'all-channels' => 'All',
'all-locales' => 'All', 'all-locales' => 'All',
'invoice-slip-design' => 'Invoice Slip Design', 'invoice-slip-design' => 'Invoice Slip Design',
'logo' => 'logo' 'logo' => 'logo',
'favicon' => 'Favicon'
] ]
] ]
]; ];

3
packages/Webkul/Admin/src/Resources/lang/fa/app.php
View File

@ -1310,7 +1310,8 @@ return [
'all-locales' => 'همه', 'all-locales' => 'همه',
'sandbox' => 'Sandbox', 'sandbox' => 'Sandbox',
'invoice-slip-design' => 'Invoice Slip Design', 'invoice-slip-design' => 'Invoice Slip Design',
'logo' => 'logo' 'logo' => 'logo',
'favicon' => 'Favicon'
] ]
] ]
]; ];

3
packages/Webkul/Admin/src/Resources/lang/nl/app.php
View File

@ -1309,7 +1309,8 @@ return [
'all-channels' => 'Alles', 'all-channels' => 'Alles',
'all-locales' => 'Alles', 'all-locales' => 'Alles',
'invoice-slip-design' => 'Invoice Slip Design', 'invoice-slip-design' => 'Invoice Slip Design',
'logo' => 'logo' 'logo' => 'logo',
'favicon' => 'Favicon'
] ]
] ]
]; ];

3
packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
View File

@ -1313,7 +1313,8 @@ return [
'all-locales' => 'Todos', 'all-locales' => 'Todos',
'sandbox' => 'Sandbox', 'sandbox' => 'Sandbox',
'invoice-slip-design' => 'Design da Nota do Pedido', 'invoice-slip-design' => 'Design da Nota do Pedido',
'logo' => 'logo' 'logo' => 'logo',
'favicon' => 'Favicon'
] ]
] ]
]; ];

7
packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
View File

@ -6,7 +6,12 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="csrf-token" content="{{ csrf_token() }}"> <meta name="csrf-token" content="{{ csrf_token() }}">
<link rel="icon" sizes="16x16" href="{{ asset('vendor/webkul/ui/assets/images/favicon.ico') }}" />
@if ($favicon = core()->getConfigData('general.design.admin_logo.favicon'))
<link rel="icon" sizes="16x16" href="{{ \Illuminate\Support\Facades\Storage::url($favicon) }}" />
@else
<link rel="icon" sizes="16x16" href="{{ asset('vendor/webkul/ui/assets/images/favicon.ico') }}" />
@endif
<link rel="stylesheet" href="{{ asset('vendor/webkul/ui/assets/css/ui.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/webkul/ui/assets/css/ui.css') }}">
<link rel="stylesheet" href="{{ asset('vendor/webkul/admin/assets/css/admin.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/webkul/admin/assets/css/admin.css') }}">