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

Fixed Locale Issue

This commit is contained in:
Deepak Singh Gusain 2022-01-19 17:52:13 +05:30
parent df3b88e79d
commit e475f8a05c
5 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/css/admin.css
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Admin/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=94da304c8b02ad3ba649",
"/css/admin.css": "/css/admin.css?id=cc2c43f23ee0703db2d4"
"/css/admin.css": "/css/admin.css?id=a6d49861c786caa6ae00"
}

4
packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss
View File

@ -104,10 +104,6 @@ body {
display: block;
text-align: left;
}
i.icon {
margin-left: 10px;
}
}
.notifications {

19
packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php
View File

@ -63,25 +63,6 @@
@endif
</li>
@endforeach
<li class="menu-item">
<a class="menubar-ancor" href="#">
<span class="icon-menu icon locale-icon"></span>
<span class="menu-label"> {{ __('admin::app.datagrid.locale') }} {{ $allLocales[$currentLocaleCode] }} </span>
<span class="icon arrow-icon"></span>
</a>
<ul class="sub-menubar">
@foreach ($allLocales as $code => $name)
<li class="sub-menu-item">
<a href="{{ url()->current() . '?' . http_build_query(array_merge(request()->all(), ['admin_locale' => $code])) }}">
<span class="menu-label">{{ $name }}</span>
</a>
</li>
@endforeach
</ul>
</li>
</ul>
</script>

27
packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
View File

@ -6,6 +6,10 @@
'completed'=> trans('admin::app.notification.order-status-messages.completed'),
'processing' => trans('admin::app.notification.order-status-messages.processing')
];
$allLocales = core()->getAllLocales()->pluck('name', 'code');
$currentLocaleCode = core()->getRequestedLocaleCode('admin_locale');
@endphp
<div class="navbar-top">
@ -53,6 +57,29 @@
read-all-title="{{ __('admin::app.notification.read-all') }}">
</notification>
<div class="profile-info">
<div class="dropdown-toggle">
<i class="icon locale-icon" style="height:34px;width:34px"></i>
</div>
<div class="dropdown-list bottom-right">
<div class="dropdown-container">
<ul>
@foreach ($allLocales as $code => $name)
<li>
<a href="{{ url()->current() . '?' . http_build_query(array_merge(request()->all(), ['admin_locale' => $code])) }}"
style="{{ $code == $currentLocaleCode ? 'color:blue' : '' }}">
{{ $name }}
</a>
</li>
@endforeach
</ul>
</div>
</div>
</div>
<div class="profile-info">
<div class="dropdown-toggle">
<div style="display: inline-block; vertical-align: middle;">