tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix for the RTL UI

pull/4031/head
Halil İbrahim Kalkan 6 years ago
parent
202479ddd0
commit
faa38d45cf
3 changed files with 7 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Bootstrap/BootstrapStyleContributor.cs
  2. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml
  3. 7
      framework/src/Volo.Abp.Core/Volo/Abp/Localization/CultureHelper.cs

6
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Bootstrap/BootstrapStyleContributor.cs
View File

@ -8,10 +8,14 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Bootstrap
{ {
public override void ConfigureBundle(BundleConfigurationContext context) public override void ConfigureBundle(BundleConfigurationContext context)
{ {
if(CultureHelper.IsRtl) if (CultureHelper.IsRtl)
{
context.Files.AddIfNotContains("/libs/bootstrap/css/bootstrap-rtl.css"); context.Files.AddIfNotContains("/libs/bootstrap/css/bootstrap-rtl.css");
}
else else
{
context.Files.AddIfNotContains("/libs/bootstrap/css/bootstrap.css"); context.Files.AddIfNotContains("/libs/bootstrap/css/bootstrap.css");
}
} }
} }
} }

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml
View File

@ -24,13 +24,11 @@
Layout = null; Layout = null;
AbpAntiForgeryManager.SetCookie(); AbpAntiForgeryManager.SetCookie();
var containerClass = ViewBag.FluidLayout == true ? "container-fluid" : "container"; //TODO: Better and type-safe options var containerClass = ViewBag.FluidLayout == true ? "container-fluid" : "container"; //TODO: Better and type-safe options
} }
<!DOCTYPE html> <!DOCTYPE html>
<html lang="@CultureInfo.CurrentCulture.Name" dir=@(CultureHelper.IsRtl ? "rtl" : "")> <html lang="@CultureInfo.CurrentCulture.Name" dir=@(CultureHelper.IsRtl ? "rtl" : "")>
<!--<![endif]-->">
<head> <head>
@await Component.InvokeLayoutHookAsync(LayoutHooks.Head.First, StandardLayouts.Account) @await Component.InvokeLayoutHookAsync(LayoutHooks.Head.First, StandardLayouts.Account)

7
framework/src/Volo.Abp.Core/Volo/Abp/Localization/CultureHelper.cs
View File

@ -1,6 +1,5 @@
using System; using System;
using System.Globalization; using System.Globalization;
using System.Threading;
using JetBrains.Annotations; using JetBrains.Annotations;
namespace Volo.Abp.Localization namespace Volo.Abp.Localization
@ -36,10 +35,8 @@ namespace Volo.Abp.Localization
}); });
} }
public static bool IsRtl public static bool IsRtl => CultureInfo.CurrentUICulture.TextInfo.IsRightToLeft;
{
get { return CultureInfo.CurrentUICulture.TextInfo.IsRightToLeft; }
}
public static bool IsValidCultureCode(string cultureCode) public static bool IsValidCultureCode(string cultureCode)
{ {
if (cultureCode.IsNullOrWhiteSpace()) if (cultureCode.IsNullOrWhiteSpace())

Write Preview
Loading…
Cancel
Save