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 6cc077a663..2e7e7f3f4c 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
@@ -2,6 +2,10 @@
@model ApplicationMenu
@foreach (var menuItem in Model.Items)
{
+ var elementId = string.IsNullOrEmpty(menuItem.ElementId) ? string.Empty : $"id=\"{menuItem.ElementId}\"";
+ var cssClass = string.IsNullOrEmpty(menuItem.CssClass) ? string.Empty : menuItem.CssClass;
+ var disabled = menuItem.IsDisabled ? "disabled" : string.Empty;
+
if (menuItem.IsLeaf)
{
if (menuItem.Url == null)
@@ -9,7 +13,7 @@
continue;
}
-
@if (menuItem.Icon != null)
{
@@ -29,7 +33,9 @@
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 8ba998785e..c30c7b6a0b 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
@@ -11,16 +11,20 @@
-
+
@if (Model.Items.Any())
{
}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs
index 354cfd3b00..aa4003c5f0 100644
--- a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs
+++ b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs
@@ -37,7 +37,7 @@ namespace Volo.Abp.UI.Navigation
/// Default value: 1000.
///
public int Order { get; set; }
-
+
///
/// The URL to navigate when this menu item is selected.
///
@@ -65,7 +65,7 @@ namespace Volo.Abp.UI.Navigation
/// Can be used to disable this menu item.
///
public bool IsDisabled { get; set; }
-
+
///
[NotNull]
public IList Items { get; }
@@ -75,14 +75,27 @@ namespace Volo.Abp.UI.Navigation
///
public object CustomData { get; set; }
+ ///
+ /// Can be used to render the element with a specific Id for DOM selections.
+ ///
+ public string ElementId { get; set; }
+
+ ///
+ /// Can be used to render the element with extra CSS classes.
+ ///
+ public string CssClass { get; set; }
+
+
public ApplicationMenuItem(
- [NotNull] string name,
+ [NotNull] string name,
[NotNull] string displayName,
string url = null,
string icon = null,
int order = DefaultOrder,
object customData = null,
- string target = null)
+ string target = null,
+ string elementId = null,
+ string cssClass = null)
{
Check.NotNullOrWhiteSpace(name, nameof(name));
Check.NotNullOrWhiteSpace(displayName, nameof(displayName));
@@ -94,6 +107,8 @@ namespace Volo.Abp.UI.Navigation
Order = order;
CustomData = customData;
Target = target;
+ ElementId = elementId;
+ CssClass = cssClass;
Items = new List();
}
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json
index c324d667ea..9c8944176b 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json
@@ -33,6 +33,7 @@
"PagerNext": "Next",
"PagerPrevious": "Previous",
"PagerInfo": "Showing {0} to {1} of {2} entries.",
- "DatatableActionDropdownDefaultText": "Actions"
+ "DatatableActionDropdownDefaultText": "Actions",
+ "ChangePassword": "Change password"
}
}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json
index 7086210144..f85e255058 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json
@@ -33,6 +33,7 @@
"PagerNext": "Sonraki",
"PagerPrevious": "Önceki",
"PagerInfo": "{2} kayıttan {0} ile {1} arası gösteriliyor.",
- "DatatableActionDropdownDefaultText": "İşlemler"
+ "DatatableActionDropdownDefaultText": "İşlemler",
+ "ChangePassword": "Şifre değiştir"
}
}
\ No newline at end of file
diff --git a/modules/account/src/Volo.Abp.Account.Web/AbpAccountUserMenuContributor.cs b/modules/account/src/Volo.Abp.Account.Web/AbpAccountUserMenuContributor.cs
index ef5e661771..d021cbabe1 100644
--- a/modules/account/src/Volo.Abp.Account.Web/AbpAccountUserMenuContributor.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/AbpAccountUserMenuContributor.cs
@@ -10,7 +10,7 @@ namespace Volo.Abp.Account.Web
{
public AbpAccountUserMenuContributor()
{
-
+
}
public Task ConfigureMenuAsync(MenuConfigurationContext context)
@@ -22,6 +22,8 @@ namespace Volo.Abp.Account.Web
var l = context.ServiceProvider.GetRequiredService>();
+ context.Menu.AddItem(new ApplicationMenuItem("Account.ChangePassword", l["ChangePassword"], icon: "fa fa-key", url: "#", elementId: "abp-account-change-password"));
+
context.Menu.AddItem(new ApplicationMenuItem("Account.Logout", l["Logout"], url: "/Account/Logout", icon: "fa fa-power-off", order: int.MaxValue - 1000));
return Task.CompletedTask;
diff --git a/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/tr.json b/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/tr.json
index a318da87a2..b56354053c 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/tr.json
+++ b/modules/account/src/Volo.Abp.Account.Web/Localization/Resources/AbpAccount/Web/tr.json
@@ -9,7 +9,7 @@
"UseAnotherServiceToLogin": "Başka bir servisle giriş yap",
"UserLockedOutMessage": "Kullanıcı hesabı hatalı giriş denemeleri nedeniyle kilitlenmiştir. Lütfen bir süre bekleyip tekrar deneyin.",
"InvalidUserNameOrPassword": "Kullanıcı adı ya da şifre geçersiz!",
- "LoginIsNotAllowed": "You are not allowed to login! E-posta adresinizi ya da telefon numaranızı doğrulamanız gerekiyor.",
+ "LoginIsNotAllowed": "Giriş yapamazsınız! E-posta adresinizi ya da telefon numaranızı doğrulamanız gerekiyor.",
"SelfRegistrationDisabledMessage": "Bu uygulama için kullanıcıların kendi kendilerine kaydolmaları engellenmiştir. Yeni bir kullanıcı kaydetmek için lütfen uygulama yöneticisi ile iletişime geçin."
}
}
\ No newline at end of file
diff --git a/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/en.json b/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/en.json
index 72c8e0fbd5..e1821cab21 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/en.json
+++ b/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/en.json
@@ -26,6 +26,7 @@
"BlogDeletionWarningMessage": "Blog will be deleted.",
"AreYouSure": "Are you sure?",
"Comment": "{0} Comment",
+ "ShareOnTwitter": "Share On Twitter",
"CoverImage": "Cover Image",
"CreateANewPost": "Create A New Post",
"CreateANewBlog": "Create A New Blog",
diff --git a/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/tr.json b/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/tr.json
index 351439e0b7..8680bb9fa4 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/tr.json
+++ b/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/tr.json
@@ -17,6 +17,7 @@
"SeeAll": "Hepsini Gör",
"PopularTags": "Popüler Etiketler",
"ReadWithCount": "{0} Okunma",
+ "ShareOnTwitter": "Twitter'da paylaş",
"LastPosts": "Son Yazılar",
"LeaveComment": "Yorum Bırak",
"TagsInThisArticle": "Makalenin Etiketleri",
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml
index 549d581f0b..a165d46b4d 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml
@@ -155,31 +155,34 @@
}
-
+
+ @L["ShareOnTwitter"]
-
@L["LeaveComment"]
-@L["LeaveComment"]
+