From 251414503aa6fb02369dce1f664b0d918c422a2f Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Tue, 19 Oct 2010 00:06:47 -0700 Subject: [PATCH] Getting content localization parts hooked back up --HG-- branch : dev --- .../Localization/Drivers/LocalizationPartDriver.cs | 7 +++---- src/Orchard.Web/Core/Localization/Placement.info | 14 +++++++++----- src/Orchard.Web/Core/Localization/Styles/admin.css | 2 +- .../Core/Localization/Views/Admin/Translate.cshtml | 2 +- .../Localization/Views/CultureSelection.cshtml | 5 ++++- .../Localization.ContentTranslations.Edit.cshtml | 1 - ...Localization.ContentTranslations.Summary.cshtml | 10 ++++------ src/Orchard.Web/Themes/TheAdmin/Styles/site.css | 1 - 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/Orchard.Web/Core/Localization/Drivers/LocalizationPartDriver.cs b/src/Orchard.Web/Core/Localization/Drivers/LocalizationPartDriver.cs index 51216e8c1..9b2972d70 100644 --- a/src/Orchard.Web/Core/Localization/Drivers/LocalizationPartDriver.cs +++ b/src/Orchard.Web/Core/Localization/Drivers/LocalizationPartDriver.cs @@ -28,7 +28,7 @@ namespace Orchard.Core.Localization.Drivers { ContentShape("Parts_Localization_ContentTranslations", () => shapeHelper.Parts_Localization_ContentTranslations(ContentPart: part, MasterId: masterId, Localizations: GetDisplayLocalizations(part))), ContentShape("Parts_Localization_ContentTranslations_Summary", - () => shapeHelper.Parts_Localization_ContentTranslations_Summary(ContentPart: part, MasterId: masterId, Localizations: GetDisplayLocalizations(part))) + () => shapeHelper.Parts_Localization_ContentTranslations_Summary(ContentPart: part, MasterId: masterId, Localizations: GetDisplayLocalizations(part))) ); } @@ -42,9 +42,8 @@ namespace Orchard.Core.Localization.Drivers { ContentLocalizations = new ContentLocalizationsViewModel(part) { Localizations = localizations } }; - return ContentShape("Parts_Localization_ContentTranslations_Edit", () => { - return shapeHelper.EditorTemplate(TemplateName: "Parts/Localization.ContentTranslations.Edit", Model: model, Prefix: TemplatePrefix); - }); + return ContentShape("Parts_Localization_ContentTranslations_Edit", + () => shapeHelper.EditorTemplate(TemplateName: "Parts/Localization.ContentTranslations.Edit", Model: model, Prefix: TemplatePrefix)); } protected override DriverResult Editor(LocalizationPart part, IUpdateModel updater, dynamic shapeHelper) { diff --git a/src/Orchard.Web/Core/Localization/Placement.info b/src/Orchard.Web/Core/Localization/Placement.info index 882598dd0..1f48c8adb 100644 --- a/src/Orchard.Web/Core/Localization/Placement.info +++ b/src/Orchard.Web/Core/Localization/Placement.info @@ -1,14 +1,18 @@  - - + + + - + - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Core/Localization/Styles/admin.css b/src/Orchard.Web/Core/Localization/Styles/admin.css index cd7a5d458..1eab4b11d 100644 --- a/src/Orchard.Web/Core/Localization/Styles/admin.css +++ b/src/Orchard.Web/Core/Localization/Styles/admin.css @@ -8,7 +8,7 @@ .content-localization .culture-selected { margin-bottom:.5em; } -.content-localization .content-localizations { +.culture-selection .content-localizations li { font-size:.9em; } .content-localization .content-localizations>* { diff --git a/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml b/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml index 64214837e..31480af52 100644 --- a/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml +++ b/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml @@ -2,7 +2,7 @@ @using Orchard.Core.Localization.ViewModels; @{ dynamic content = Model.Content; - content.Zones.primary.Add(New.Partial(TemplateName: "CultureSelection", Model: Model), "0"); + content.Zones.Primary.Add(New.Partial(TemplateName: "CultureSelection", Model: Model), "0"); }

@Html.TitleForPage(T("Translate Content").ToString())

@using (Html.BeginFormAntiForgeryPost()) { diff --git a/src/Orchard.Web/Core/Localization/Views/CultureSelection.cshtml b/src/Orchard.Web/Core/Localization/Views/CultureSelection.cshtml index 3479e6ca2..5e4f345eb 100644 --- a/src/Orchard.Web/Core/Localization/Views/CultureSelection.cshtml +++ b/src/Orchard.Web/Core/Localization/Views/CultureSelection.cshtml @@ -1,4 +1,7 @@ @model Orchard.Core.Localization.ViewModels.AddLocalizationViewModel +@{ + Style.Require("LocalizationAdmin"); +}
@{ @@ -6,7 +9,7 @@ siteCultures.Insert(0, ""); }
- @T("This is the {0} variation of {1}.", + @T("This is the {0} variation of {1}", Html.DropDownList("SelectedCulture", new SelectList(siteCultures, Model.SelectedCulture)), Html.ItemEditLink(Model.Content))
diff --git a/src/Orchard.Web/Core/Localization/Views/EditorTemplates/Parts/Localization.ContentTranslations.Edit.cshtml b/src/Orchard.Web/Core/Localization/Views/EditorTemplates/Parts/Localization.ContentTranslations.Edit.cshtml index 7b319d552..151a84d18 100644 --- a/src/Orchard.Web/Core/Localization/Views/EditorTemplates/Parts/Localization.ContentTranslations.Edit.cshtml +++ b/src/Orchard.Web/Core/Localization/Views/EditorTemplates/Parts/Localization.ContentTranslations.Edit.cshtml @@ -1,6 +1,5 @@ @model Orchard.Core.Localization.ViewModels.EditLocalizationViewModel @if (Model.ContentItem.ContentItem.Id > 0 && Model.SelectedCulture != null && Model.ContentLocalizations.Localizations.Count() > 0) { -Style.Require("Localization"); Style.Require("LocalizationAdmin");
diff --git a/src/Orchard.Web/Core/Localization/Views/Parts/Localization.ContentTranslations.Summary.cshtml b/src/Orchard.Web/Core/Localization/Views/Parts/Localization.ContentTranslations.Summary.cshtml index a7c4a7c45..391e18523 100644 --- a/src/Orchard.Web/Core/Localization/Views/Parts/Localization.ContentTranslations.Summary.cshtml +++ b/src/Orchard.Web/Core/Localization/Views/Parts/Localization.ContentTranslations.Summary.cshtml @@ -1,11 +1,9 @@ @using Orchard.Core.Contents; @using Orchard.Core.Localization.Models; -@{ - Style.Require("LocalizationAdmin"); - IEnumerable localizations = Model.Localizations; - var localizationLinks = Html.UnorderedList(localizations, (c, i) => Html.ItemEditLink(c.Culture.Culture, c), "localizations"); -} -@if (localizations.Count() > 0 || AuthorizedFor(Permissions.PublishContent)) { +@if (AuthorizedFor(Permissions.PublishContent)) { +Style.Require("LocalizationAdmin"); +IEnumerable localizations = Model.Localizations; +var localizationLinks = Html.UnorderedList(localizations, (c, i) => Html.ItemEditLink(c.Culture.Culture, c), "localizations");
@if (localizations.Count() > 0) {

@T("Translations:")

@localizationLinks
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index 010295d5e..a4f4d3656 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -774,7 +774,6 @@ table .button { } .contentItems.bulk-items .primary { clear:both; - float:left; margin-top:0; } .contentItems .properties li {