Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix TheAdmin & TheTheme for RTL languages #14486

Merged
merged 9 commits into from
Oct 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,42 +1,38 @@
@using OrchardCore.Localization
@using OrchardCore.Environment.Shell

@model AdminCulturePickerViewModel
MikeAlhayek marked this conversation as resolved.
Show resolved Hide resolved

@inject ShellSettings ShellSettings

@{
var cookieName = AdminCookieCultureProvider.MakeCookieName(ShellSettings);
var cookiePath = AdminCookieCultureProvider.MakeCookiePath(Context);
var selectedCultureName = Model.CurrentCulture.Name;
}

<li class="nav-item">
<select id="oc-admin-culture-picker" class="form-select me-3"
data-cookie-name="@cookieName"
data-cookie-path="@cookiePath"
data-selected-culture="@selectedCultureName">

@foreach (var culture in Model.SupportedCultures)
{
<option selected="@(culture.Name == selectedCultureName ? "selected" : null)" value="@culture.Name">@culture.NativeName</option>
}
</select>
<div class="dropdown">
<button type="button" class="nav-link dropdown-toggle" id="oc-culture-picker" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-language-current-value="@Model.CurrentCulture.Name" data-cookie-name="@AdminCookieCultureProvider.MakeCookieName(ShellSettings)" data-cookie-path="@AdminCookieCultureProvider.MakeCookiePath(Context)">@Model.CurrentCulture.NativeName</button>
<ul class="dropdown-menu dropdown-menu-end position-absolute" aria-labelledby="oc-culture-picker">
@foreach (var culture in Model.SupportedCultures)
{
if (culture.Name != Model.CurrentCulture.Name)
{
<li>
<div class="language-menu-item dropdown-item" data-language-value="@culture.Name">@culture.NativeName</div>
</li>
}
}
</ul>
</div>
</li>

<script at="Foot" depends-on="jquery">
$(function () {
$('#oc-admin-culture-picker').change(function () {
var $this = $(this);
var culture = $this.val();
var selectedCulture = $this.data('selected-culture');
if (culture != selectedCulture) {
var cookieName = $this.data('cookie-name');
var cookiePath = $this.data('cookie-path');
var cookieValue = `${cookieName}=c=${culture}|uic=${culture};path=${cookiePath}`;
document.cookie = cookieValue;
<script at="Foot" asp-name="AdminCultureSelector" depends-on="js-cookie">
document.addEventListener('DOMContentLoaded', function (e) {
const picker = document.getElementById('oc-culture-picker');
const cookieName = picker.getAttribute('data-cookie-name');
const cookiePath = picker.getAttribute('data-cookie-path');
const items = document.getElementsByClassName('language-menu-item');
for (let i = 0; i < items.length; i++) {
let item = items[i];
let culture = item.getAttribute('data-language-value');
item.addEventListener('click', function () {
Cookies.set(cookieName, `c=${culture}|uic=${culture}`, { path: cookiePath });
window.location = window.location.href;
}
});
});
}
});
</script>
8 changes: 8 additions & 0 deletions src/OrchardCore.Modules/OrchardCore.Resources/Assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
],
"output": "wwwroot/Styles/bootstrap.css"
},
{
"generateRTL": false,
"generateSourceMaps": false,
"inputs": [
"node_modules/bootstrap/dist/css/bootstrap.rtl.css"
],
"output": "wwwroot/Styles/bootstrap.rtl.css"
},
{
"inputs": [
"node_modules/bootstrap/dist/js/bootstrap.js"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,13 @@ ResourceManifest BuildManifest()
.SetCdnIntegrity("sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN", "sha384-8dbpXuP2nso7zrhApj0aSxeb0ZitbTeO0hTKxRcXavYE0vv4nhBEqvv+o+0X94A8")
.SetVersion("5.3.2");

manifest
.DefineStyle("bootstrap-rtl")
.SetUrl("~/OrchardCore.Resources/Styles/bootstrap.rtl.min.css", "~/OrchardCore.Resources/Styles/bootstrap.rtl.css")
.SetCdn("https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.rtl.min.css", "https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.rtl.css")
.SetCdnIntegrity("sha384-nU14brUcp6StFntEOOEBvcJm4huWjB0OcIeQ3fltAfSmuZFrkAif0T+UtNGlKKQv", "sha384-CEku08bnqQAT/vzi6/zxMQmSyxoOTK1jx7mbT8P7etf/YhPbxASCX5BIVuAK9sfy")
.SetVersion("5.3.2");

manifest
.DefineStyle("bootstrap-select")
.SetUrl("~/OrchardCore.Resources/Styles/bootstrap-select.min.css", "~/OrchardCore.Resources/Styles/bootstrap-select.css")
Expand Down
Loading