From 44a56126a496af3c9eb96b8bc0b247822708a485 Mon Sep 17 00:00:00 2001 From: jowall Date: Wed, 23 Feb 2011 16:45:45 -0800 Subject: [PATCH 1/2] Small update to ratings alignment. --HG-- branch : dev --- .../Orchard.Packaging/Styles/orchard-packaging-admin.css | 8 ++++++-- .../Orchard.Packaging/Views/Gallery/Modules.cshtml | 3 +-- .../Modules/Orchard.Packaging/Views/Gallery/Themes.cshtml | 7 +++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Styles/orchard-packaging-admin.css b/src/Orchard.Web/Modules/Orchard.Packaging/Styles/orchard-packaging-admin.css index f9f37c3aa..24122cbf2 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Styles/orchard-packaging-admin.css +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Styles/orchard-packaging-admin.css @@ -1,4 +1,7 @@ -.extensionName { +.orchard-packaging #main .contentItems p { + margin:0; +} +.extensionName { float:left; } .contentItems .related { @@ -50,13 +53,14 @@ .properties li p { float: left; } +.rating {width:130px;} .ratings { float: right; background:url(../Content/Images/stars.png) repeat-x; height: 14px; width: 75px; display: block; - margin:4px 0 0 4px; + margin:3px 0 0 0; } .score { background: url(../Content/Images/stars.png) repeat-x 0 -14px; diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml index 080b55d43..2bc61eff8 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml @@ -86,11 +86,10 @@
  •  | @T("Website: ") @if (!string.IsNullOrEmpty(item.ProjectUrl)) { @item.ProjectUrl } else { @T("Unknown").ToString() }
    • -
  •  | @T("Rating: ") +
  •  | @T("Rating: ")
     
    -
    • diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Themes.cshtml b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Themes.cshtml index ba2744120..1342bc955 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Themes.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Themes.cshtml @@ -91,11 +91,10 @@
  •  | @T("Website: ") @if (!string.IsNullOrEmpty(item.ProjectUrl)) { @item.ProjectUrl } else { @T("Unknown").ToString() }
    • -
  •  | @T("Rating: ") -
    -
     
    +
  •  | @T("Rating: ") +
    +
     
    -
    • From 13f3ca08bdda91680f04720344fa5eeb0bcfdd73 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Wed, 23 Feb 2011 16:56:14 -0800 Subject: [PATCH 2/2] More admin menu adjustments. --HG-- branch : dev --- src/Orchard.Web/Core/Settings/AdminMenu.cs | 1 - .../Handlers/CommentSettingsPartHandler.cs | 2 ++ .../Orchard.Email/Drivers/SmtpSettingsPartDriver.cs | 13 ++++++++++--- .../Handlers/SmtpSettingsPartHandler.cs | 12 ++++++++++++ .../Modules/Orchard.Indexing/AdminMenu.cs | 5 ++--- .../Handlers/MediaSettingsPartHandler.cs | 2 ++ .../Drivers/SearchSettingsPartDriver.cs | 10 ++++++++-- .../Handlers/SearchSettingsPartHandler.cs | 12 ++++++++++++ .../Handlers/RegistrationSettingsPartHandler.cs | 2 ++ src/Orchard/UI/Navigation/NavigationManager.cs | 8 +++++++- 10 files changed, 57 insertions(+), 10 deletions(-) diff --git a/src/Orchard.Web/Core/Settings/AdminMenu.cs b/src/Orchard.Web/Core/Settings/AdminMenu.cs index 8a4613def..e669b1a09 100644 --- a/src/Orchard.Web/Core/Settings/AdminMenu.cs +++ b/src/Orchard.Web/Core/Settings/AdminMenu.cs @@ -1,5 +1,4 @@ using Orchard.ContentManagement; -using Orchard.ContentManagement.Handlers; using Orchard.Localization; using Orchard.Security; using Orchard.Settings; diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentSettingsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentSettingsPartHandler.cs index a54356379..6c27cb257 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentSettingsPartHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentSettingsPartHandler.cs @@ -17,6 +17,8 @@ namespace Orchard.Comments.Handlers { public Localizer T { get; set; } protected override void GetItemMetadata(GetContentItemMetadataContext context) { + if (context.ContentItem.ContentType != "Site") + return; base.GetItemMetadata(context); context.Metadata.EditorGroupInfo.Add(new GroupInfo(T("Comments"))); } diff --git a/src/Orchard.Web/Modules/Orchard.Email/Drivers/SmtpSettingsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Email/Drivers/SmtpSettingsPartDriver.cs index 64c59f9a7..ec6281954 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/Drivers/SmtpSettingsPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Email/Drivers/SmtpSettingsPartDriver.cs @@ -1,4 +1,5 @@ -using Orchard.ContentManagement; +using System; +using Orchard.ContentManagement; using Orchard.ContentManagement.Drivers; using Orchard.Email.Models; using Orchard.Localization; @@ -19,12 +20,18 @@ namespace Orchard.Email.Drivers { protected override string Prefix { get { return "SmtpSettings"; } } - protected override DriverResult Editor(SmtpSettingsPart part, dynamic shapeHelper) { + protected override DriverResult Editor(SmtpSettingsPart part, string groupInfoId, dynamic shapeHelper) { + if (!string.Equals(groupInfoId, "email", StringComparison.OrdinalIgnoreCase)) + return null; + return ContentShape("Parts_SmtpSettings_Edit", () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: part, Prefix: Prefix)); } - protected override DriverResult Editor(SmtpSettingsPart part, IUpdateModel updater, dynamic shapeHelper) { + protected override DriverResult Editor(SmtpSettingsPart part, IUpdateModel updater, string groupInfoId, dynamic shapeHelper) { + if (!string.Equals(groupInfoId, "email", StringComparison.OrdinalIgnoreCase)) + return null; + var previousPassword = part.Password; updater.TryUpdateModel(part, Prefix, null, null); diff --git a/src/Orchard.Web/Modules/Orchard.Email/Handlers/SmtpSettingsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Email/Handlers/SmtpSettingsPartHandler.cs index c7a2e1e20..b4971703e 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/Handlers/SmtpSettingsPartHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Email/Handlers/SmtpSettingsPartHandler.cs @@ -1,9 +1,11 @@ using System; using System.Text; using JetBrains.Annotations; +using Orchard.ContentManagement; using Orchard.Email.Models; using Orchard.Data; using Orchard.ContentManagement.Handlers; +using Orchard.Localization; using Orchard.Security; namespace Orchard.Email.Handlers { @@ -12,6 +14,7 @@ namespace Orchard.Email.Handlers { private readonly IEncryptionService _encryptionService; public SmtpSettingsPartHandler(IRepository repository, IEncryptionService encryptionService) { + T = NullLocalizer.Instance; _encryptionService = encryptionService; Filters.Add(new ActivatingFilter("Site")); Filters.Add(StorageFilter.For(repository)); @@ -23,5 +26,14 @@ namespace Orchard.Email.Handlers { part.PasswordField.Getter(() => String.IsNullOrWhiteSpace(part.Record.Password) ? String.Empty : Encoding.UTF8.GetString(_encryptionService.Decode(Convert.FromBase64String(part.Record.Password)))); part.PasswordField.Setter(value => part.Record.Password = String.IsNullOrWhiteSpace(value) ? String.Empty : Convert.ToBase64String(_encryptionService.Encode(Encoding.UTF8.GetBytes(value)))); } + + public Localizer T { get; set; } + + protected override void GetItemMetadata(GetContentItemMetadataContext context) { + if (context.ContentItem.ContentType != "Site") + return; + base.GetItemMetadata(context); + context.Metadata.EditorGroupInfo.Add(new GroupInfo(T("Email"))); + } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Indexing/AdminMenu.cs index e3fc9378d..dc02fac2d 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Indexing/AdminMenu.cs @@ -8,9 +8,8 @@ namespace Orchard.Indexing { public string MenuName { get { return "admin"; } } public void GetNavigation(NavigationBuilder builder) { - builder.AddImageSet("search") - .Add(T("Settings"), - menu => menu.Add(T("Search"), "15", item => item.Action("Index", "Admin", new {area = "Orchard.Indexing"}) + builder.Add(T("Settings"), + menu => menu.Add(T("Search Index"), "5", item => item.Action("Index", "Admin", new {area = "Orchard.Indexing"}) .Permission(StandardPermissions.SiteOwner))); } } diff --git a/src/Orchard.Web/Modules/Orchard.Media/Handlers/MediaSettingsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Media/Handlers/MediaSettingsPartHandler.cs index c47b5a602..b0fbd66f2 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Handlers/MediaSettingsPartHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Media/Handlers/MediaSettingsPartHandler.cs @@ -18,6 +18,8 @@ namespace Orchard.Media.Handlers { public Localizer T { get; set; } protected override void GetItemMetadata(GetContentItemMetadataContext context) { + if (context.ContentItem.ContentType != "Site") + return; base.GetItemMetadata(context); context.Metadata.EditorGroupInfo.Add(new GroupInfo(T("Media"))); } diff --git a/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs index 54e214495..52950b567 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs @@ -23,7 +23,10 @@ namespace Orchard.Search.Drivers { protected override string Prefix { get { return "SearchSettings"; } } - protected override DriverResult Editor(SearchSettingsPart part, dynamic shapeHelper) { + protected override DriverResult Editor(SearchSettingsPart part, string groupInfoId, dynamic shapeHelper) { + if (!string.Equals(groupInfoId, "search", StringComparison.OrdinalIgnoreCase)) + return null; + SearchSettingsViewModel model = new SearchSettingsViewModel(); String [] searchedFields = part.SearchedFields; @@ -38,7 +41,10 @@ namespace Orchard.Search.Drivers { () => shapeHelper.EditorTemplate(TemplateName: "Parts/Search.SiteSettings", Model: model, Prefix: Prefix)); } - protected override DriverResult Editor(SearchSettingsPart part, IUpdateModel updater, dynamic shapeHelper) { + protected override DriverResult Editor(SearchSettingsPart part, IUpdateModel updater, string groupInfoId, dynamic shapeHelper) { + if (!string.Equals(groupInfoId, "search", StringComparison.OrdinalIgnoreCase)) + return null; + SearchSettingsViewModel model = new SearchSettingsViewModel(); if (updater.TryUpdateModel(model, Prefix, null, null)) { diff --git a/src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsPartHandler.cs index 12da0a748..6671e4b80 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsPartHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsPartHandler.cs @@ -1,4 +1,6 @@ using JetBrains.Annotations; +using Orchard.ContentManagement; +using Orchard.Localization; using Orchard.Search.Models; using Orchard.Data; using Orchard.ContentManagement.Handlers; @@ -7,8 +9,18 @@ namespace Orchard.Search.Handlers { [UsedImplicitly] public class SearchSettingsPartHandler : ContentHandler { public SearchSettingsPartHandler(IRepository repository) { + T = NullLocalizer.Instance; Filters.Add(new ActivatingFilter("Site")); Filters.Add(StorageFilter.For(repository)); } + + public Localizer T { get; set; } + + protected override void GetItemMetadata(GetContentItemMetadataContext context) { + if (context.ContentItem.ContentType != "Site") + return; + base.GetItemMetadata(context); + context.Metadata.EditorGroupInfo.Add(new GroupInfo(T("Search"))); + } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Users/Handlers/RegistrationSettingsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Users/Handlers/RegistrationSettingsPartHandler.cs index b28d95eae..ecf685525 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Handlers/RegistrationSettingsPartHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Handlers/RegistrationSettingsPartHandler.cs @@ -18,6 +18,8 @@ namespace Orchard.Users.Handlers { public Localizer T { get; set; } protected override void GetItemMetadata(GetContentItemMetadataContext context) { + if (context.ContentItem.ContentType != "Site") + return; base.GetItemMetadata(context); context.Metadata.EditorGroupInfo.Add(new GroupInfo(T("Users"))); } diff --git a/src/Orchard/UI/Navigation/NavigationManager.cs b/src/Orchard/UI/Navigation/NavigationManager.cs index 4366aa6b7..927703868 100644 --- a/src/Orchard/UI/Navigation/NavigationManager.cs +++ b/src/Orchard/UI/Navigation/NavigationManager.cs @@ -110,8 +110,14 @@ namespace Orchard.UI.Navigation { var orderer = new FlatPositionComparer(); return sources.SelectMany(x => x).ToArray() + // group same menus .GroupBy(key => key, (key, items) => Join(items), comparer) - .OrderBy(item => item.Position, orderer); + // group same position + .GroupBy(item => item.Position) + // order position groups by position + .OrderBy(positionGroup => positionGroup.Key, orderer) + // ordered by item text in the postion group + .SelectMany(positionGroup => positionGroup.OrderBy(item => item.Text)); } static MenuItem Join(IEnumerable items) {