From 50880a9914082823c456a184a88eaf62673413f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arma=C4=9Fan=20=C3=9Cnl=C3=BC?= <36102404+armgnunlu@users.noreply.github.com> Date: Wed, 9 Oct 2019 10:36:04 +0300 Subject: [PATCH] Resolved #908 --- .../Components/MainNavbar/Default.cshtml | 33 +++++---- .../Basic/Components/Menu/Default.cshtml | 2 +- .../Basic/Components/Menu/_MenuItem.cshtml | 2 +- .../Basic/Components/Toolbar/Default.cshtml | 2 +- .../Toolbar/LanguageSwitch/Default.cshtml | 6 +- .../Toolbar/UserMenu/Default.cshtml | 6 +- .../Themes/Basic/Layouts/Account.cshtml | 50 ++++++++----- .../Themes/Basic/Layouts/Application.cshtml | 4 +- .../wwwroot/themes/basic/layout.css | 73 ++++++++++++------- .../Pages/Account/Login.cshtml | 61 +++++++++------- .../Pages/Account/Manage.cshtml | 66 +++++++++-------- .../Pages/Account/Register.cshtml | 23 ++++-- .../Pages/SettingManagement/Index.cshtml | 6 +- .../Pages/Index.cshtml | 26 ++++--- 14 files changed, 207 insertions(+), 153 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/MainNavbar/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/MainNavbar/Default.cshtml index b734d7057e..81f770f082 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/MainNavbar/Default.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/MainNavbar/Default.cshtml @@ -1,20 +1,21 @@ @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Brand @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Menu @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar - \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml index 61b9ef49ee..0c6b5d8a3b 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml @@ -37,7 +37,7 @@ } @menuItem.DisplayName -
+
@foreach (var childMenuItem in menuItem.Items) { @await Html.PartialAsync("~/Themes/Basic/Components/Menu/_MenuItem.cshtml", childMenuItem) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml index 19c3803408..eaec9fc7c4 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml @@ -33,7 +33,7 @@ else @Model.DisplayName -
+
@foreach (var childMenuItem in Model.Items) { @await Html.PartialAsync("~/Themes/Basic/Components/Menu/_MenuItem.cshtml", childMenuItem) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/Default.cshtml index 87a7a645f0..f23bd11065 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/Default.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/Default.cshtml @@ -2,5 +2,5 @@ @model Toolbar @foreach (var toolbarItem in Model.Items.OrderBy(i => i.Order)) { - @(await Component.InvokeAsync(toolbarItem.ComponentType)) +
  • @(await Component.InvokeAsync(toolbarItem.ComponentType))
    • } \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/Default.cshtml index 53d56ebfa3..266f30c4d5 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/Default.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/Default.cshtml @@ -1,11 +1,11 @@ @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar.LanguageSwitch @model LanguageSwitchViewComponentModel -
    -
    -
    +
    @foreach (var language in Model.OtherLanguages) { @language.DisplayName diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml index 9f8c9856f5..757293ba03 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml @@ -7,14 +7,14 @@ @inject ICurrentTenant CurrentTenant @inject IHtmlLocalizer L @model ApplicationMenu -
    -
    @if (Model.Items.Any()) { -
    +
    @foreach (var menuItem in Model.Items) { var elementId = string.IsNullOrEmpty(menuItem.ElementId) ? string.Empty : $"id=\"{menuItem.ElementId}\""; diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml index eb69a76aba..7e855834da 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml @@ -45,32 +45,42 @@ @await Component.InvokeLayoutHookAsync(LayoutHooks.Head.Last, StandardLayouts.Account) - + @await Component.InvokeLayoutHookAsync(LayoutHooks.Body.First, StandardLayouts.Account) @(await Component.InvokeAsync())
    - - @if (MultiTenancyOptions.Value.IsEnabled && - (TenantResolveResultAccessor.Result?.AppliedResolvers?.Contains(CookieTenantResolveContributor.ContributorName) == true)) - { -
    - @MultiTenancyStringLocalizer["Tenant"]: - - @if (CurrentTenant.Id == null) - { - @MultiTenancyStringLocalizer["NotSelected"] - } - else - { - @(CurrentTenant.Name ?? CurrentTenant.Id.Value.ToString()) - } - - (@MultiTenancyStringLocalizer["Switch"]) -
    - } + +
    +
    +
    +
    + @MultiTenancyStringLocalizer["Tenant"]
    +
    + @if (CurrentTenant.Id == null) + { + + @MultiTenancyStringLocalizer["NotSelected"] + + } + else + { + @(CurrentTenant.Name ?? CurrentTenant.Id.Value.ToString()) + } +
    +
    +
    + @if (MultiTenancyOptions.Value.IsEnabled && + (TenantResolveResultAccessor.Result?.AppliedResolvers?.Contains(CookieTenantResolveContributor.ContributorName) == true)) + { + @MultiTenancyStringLocalizer["Switch"] + } +
    +
    +
    +
    @(await Component.InvokeAsync()) @RenderBody()     diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml index d3fecf9727..5c4f5475a5 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml @@ -49,14 +49,14 @@ @await Component.InvokeLayoutHookAsync(LayoutHooks.Head.Last, StandardLayouts.Application) - + @await Component.InvokeLayoutHookAsync(LayoutHooks.Body.First, StandardLayouts.Application) @(await Component.InvokeAsync())
    @(await Component.InvokeAsync()) -
    +
    @RenderSection("content_toolbar", false)
    @RenderBody() diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.css b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.css index 3b5cc467fc..4f25e603b8 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.css +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.css @@ -1,36 +1,59 @@ -body { - padding-top: 5rem; -} - - body.abp-empty-layout { - padding-top: 0; - } - + #main-navbar-tools a.dropdown-toggle { text-decoration: none; color: #fff; } - -/* Main Menu */ - + .navbar .dropdown-submenu { position: relative; } - - .navbar .dropdown-submenu a { - padding: 0.25rem 1.4rem; +.navbar .dropdown-menu { + margin: 0; + padding: 0; +} + .navbar .dropdown-menu a { + font-size: .9em; + padding: 10px 15px; + display: block; + min-width: 210px; + text-align: left; + border-radius: 0.25rem; + min-height: 44px; } +.navbar .dropdown-submenu a::after { + transform: rotate(-90deg); + position: absolute; + right: 16px; + top: 18px; +} +.navbar .dropdown-submenu .dropdown-menu { + top: 0; + left: 100%; +} + +.card-header .btn { + padding: 2px 6px; +} +.card-header h5 { + margin: 0; +} +.container > .card { + box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075) !important; +} - .navbar .dropdown-submenu a::after { - transform: rotate(-90deg); - position: absolute; - right: 16px; - top: 18px; - } +@media screen and (min-width: 768px) { + .navbar .dropdown:hover > .dropdown-menu { + display: block; + } - .navbar .dropdown-submenu .dropdown-menu { - top: 0; - left: 100%; - margin-left: .1rem; - margin-right: .1rem; + .navbar .dropdown-submenu:hover > .dropdown-menu { + display: block; } +} +.input-validation-error { + border-color: #dc3545; +} +.field-validation-error { + font-size: 0.8em; +} + \ No newline at end of file diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml index 9c438d8141..1703042d42 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml @@ -3,37 +3,44 @@ @model Volo.Abp.Account.Web.Pages.Account.LoginModel @inherits Volo.Abp.Account.Web.Pages.Account.AccountPage @inject Volo.Abp.Settings.ISettingProvider SettingProvider -

    @L["Login"]

    @if (Model.EnableLocalLogin) { -
    - - -
    - - - -
    -
    - - - -
    -
    - +
    +
    +

    @L["Login"]

    + @if (string.Equals(await SettingProvider.GetOrNullAsync(AccountSettingNames.IsSelfRegistrationEnabled), "true", StringComparison.OrdinalIgnoreCase)) + { + + Are you new user? + @L["Register"] + + } + + + +
    + + + +
    +
    + + + +
    +
    + +
    + @L["Login"] +
    - @L["Cancel"] @* TODO: Only show if identity server is used *@ - @L["Login"] - -
    - @if (string.Equals(await SettingProvider.GetOrNullAsync(AccountSettingNames.IsSelfRegistrationEnabled), "true", StringComparison.OrdinalIgnoreCase)) - { - @L["Register"] - } +
    + @L["Cancel"] @* TODO: Only show if identity server is used *@ +
    } diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml index 36c94271d1..1ff0686f55 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml @@ -17,34 +17,38 @@ @section scripts { } - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - -     \ No newline at end of file + + + + +

    @L["ChangePassword"].Value

    + + + + +     + +

    @L["PersonalSettings"].Value

    +
    + + + + + + + + + + + + + + + + + + +
    +     +     +     \ No newline at end of file diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml index dd8b9d0ff0..7b6f090d7f 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml @@ -1,10 +1,19 @@ @page @model Volo.Abp.Account.Web.Pages.Account.RegisterModel @inherits Volo.Abp.Account.Web.Pages.Account.AccountPage -

    @L["Register"]

    -
    - - - - @L["Register"] - \ No newline at end of file + +
    +
    +

    @L["Register"]

    + + Already registered? + @L["Login"] + +
    + + + + @L["Register"] + +
    +
    diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml index edcc541bfe..88645ad20e 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml @@ -19,13 +19,11 @@
    - - + @foreach (var group in Model.SettingPageCreationContext.Groups) { - - +

    @group.DisplayName

    @await Component.InvokeAsync(group.ComponentType) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml index 9324a9891a..e3df314288 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml @@ -11,15 +11,17 @@ } - - @L["Welcome"] - -

    @L["LongWelcomeMessage"]

    - @if (!CurrentUser.IsAuthenticated) - { -

    @L["Login"]

    - } -
    -

    abp.io

    -     -     \ No newline at end of file +
    +

    @L["Welcome"]

    +
    +
    +

    @L["LongWelcomeMessage"]

    +
    +
    +
    + abp.io + @if (!CurrentUser.IsAuthenticated) + { + @L["Login"] + } +
    \ No newline at end of file