mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-02-09 09:16:41 +08:00
Merge
--HG-- branch : dev
This commit is contained in:
@@ -6,9 +6,9 @@ html.dyn input.hinted {
|
|||||||
color:#ccc;
|
color:#ccc;
|
||||||
font-style:italic;
|
font-style:italic;
|
||||||
}
|
}
|
||||||
input#ScheduledPublishUtcDate {
|
input#CommonAspect_ScheduledPublishUtcDate {
|
||||||
width:56%;
|
width:56%;
|
||||||
}
|
}
|
||||||
input#ScheduledPublishUtcTime {
|
input#CommonAspect_ScheduledPublishUtcTime {
|
||||||
width:36%;
|
width:36%;
|
||||||
}
|
}
|
||||||
@@ -39,9 +39,5 @@ namespace Orchard.Core.Localization.Drivers {
|
|||||||
|
|
||||||
return ContentPartTemplate(model, "Parts/Localization.ContentTranslations").LongestMatch(displayType, "Summary", "SummaryAdmin").Location("primary", "5");
|
return ContentPartTemplate(model, "Parts/Localization.ContentTranslations").LongestMatch(displayType, "Summary", "SummaryAdmin").Location("primary", "5");
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override DriverResult Editor(Localized part) {
|
|
||||||
return ContentPartTemplate(new SelectLocalizationsViewModel(part), "Parts/Localization.ContentTranslations").Location("secondary", "5");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.Localization.ViewModels.SelectLocalizationsViewModel>" %>
|
|
||||||
<fieldset class="localization translations">
|
|
||||||
<legend>Publish also in</legend>
|
|
||||||
[translations to publish]
|
|
||||||
</fieldset>
|
|
||||||
@@ -266,7 +266,6 @@
|
|||||||
<Content Include="Localization\Styles\base.css" />
|
<Content Include="Localization\Styles\base.css" />
|
||||||
<Content Include="Localization\Views\DisplayTemplates\Parts\Localization.ContentTranslations.Summary.ascx" />
|
<Content Include="Localization\Views\DisplayTemplates\Parts\Localization.ContentTranslations.Summary.ascx" />
|
||||||
<Content Include="Localization\Views\DisplayTemplates\Parts\Localization.ContentTranslations.ascx" />
|
<Content Include="Localization\Views\DisplayTemplates\Parts\Localization.ContentTranslations.ascx" />
|
||||||
<Content Include="Localization\Views\EditorTemplates\Parts\Localization.ContentTranslations.ascx" />
|
|
||||||
<Content Include="Reports\Module.txt" />
|
<Content Include="Reports\Module.txt" />
|
||||||
<Content Include="Reports\Views\Admin\Display.aspx" />
|
<Content Include="Reports\Views\Admin\Display.aspx" />
|
||||||
<Content Include="Reports\Views\Admin\Index.aspx" />
|
<Content Include="Reports\Views\Admin\Index.aspx" />
|
||||||
|
|||||||
Reference in New Issue
Block a user