lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-11-28 17:32:44 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Updating Orchard.Core.Routable for the new shape API

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-10-18 15:20:12 -07:00
parent ec855b5c4e
commit 9e7954104e
5 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Orchard.Web/Core/Orchard.Core.csproj
View File

@@ -293,6 +293,9 @@
<Content Include="Settings\Styles\admin.css" /> <Content Include="Settings\Styles\admin.css" />
<Content Include="Settings\Views\Admin\Index.cshtml" /> <Content Include="Settings\Views\Admin\Index.cshtml" />
<Content Include="Settings\Views\Admin\Culture.cshtml" /> <Content Include="Settings\Views\Admin\Culture.cshtml" />
<None Include="Routable\Placement.info">
<SubType>Designer</SubType>
</None>
<None Include="Settings\Placement.info"> <None Include="Settings\Placement.info">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</None> </None>

8
src/Orchard.Web/Core/Routable/Drivers/RoutePartDriver.cs
View File

@@ -44,7 +44,8 @@ namespace Orchard.Core.Routable.Drivers {
} }
protected override DriverResult Display(RoutePart part, string displayType, dynamic shapeHelper) { protected override DriverResult Display(RoutePart part, string displayType, dynamic shapeHelper) {
return ContentShape("Parts_RoutableTitle", "Header:5", () => shapeHelper.Parts_RoutableTitle(ContentPart: part, Title: part.Title, Path: part.Path)); return ContentShape("Parts_RoutableTitle",
() => shapeHelper.Parts_RoutableTitle(ContentPart: part, Title: part.Title, Path: part.Path));
} }
protected override DriverResult Editor(RoutePart part, dynamic shapeHelper) { protected override DriverResult Editor(RoutePart part, dynamic shapeHelper) {
@@ -69,10 +70,9 @@ namespace Orchard.Core.Routable.Drivers {
: ""; : "";
} }
// TODO: andrerod convert to new shape API. Location code kept for reference.
//var location = part.GetLocation("Editor");
model.PromoteToHomePage = model.Id != 0 && part.Path != null && _routableHomePageProvider != null && CurrentSite.HomePage == _routableHomePageProvider.GetSettingValue(model.Id); model.PromoteToHomePage = model.Id != 0 && part.Path != null && _routableHomePageProvider != null && CurrentSite.HomePage == _routableHomePageProvider.GetSettingValue(model.Id);
return ContentPartTemplate(model, TemplateName, Prefix); //.Location(location); return ContentShape("Parts_Routable_Edit",
() => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
} }
protected override DriverResult Editor(RoutePart part, IUpdateModel updater, dynamic shapeHelper) { protected override DriverResult Editor(RoutePart part, IUpdateModel updater, dynamic shapeHelper) {

4
src/Orchard.Web/Core/Routable/Placement.info Normal file
View File

@@ -0,0 +1,4 @@
<Placement>
<Place Parts_RoutableTitle="Header:5"/>
<Place Parts_Routable_Edit="Primary:before.5"/>
</Placement>

6
src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml
View File

@@ -9,8 +9,10 @@
<fieldset class="permalink"> <fieldset class="permalink">
<label class="sub" for="Slug">@T("Permalink")<br /><span>@Request.ToRootUrlString()/@Model.DisplayLeadingPath</span></label> <label class="sub" for="Slug">@T("Permalink")<br /><span>@Request.ToRootUrlString()/@Model.DisplayLeadingPath</span></label>
<span>@Html.TextBoxFor(m => m.Slug, new { @class = "text" })</span> <span>@Html.TextBoxFor(m => m.Slug, new { @class = "text" })</span>
@Html.EditorFor(m => m.PromoteToHomePage) <span class="checkbox-and-label">
<label for="@ViewData.TemplateInfo.GetFullHtmlFieldId("PromoteToHomePage")" class="forcheckbox">@T("Set as home page")</label> @Html.EditorFor(m => m.PromoteToHomePage)
<label for="@ViewData.TemplateInfo.GetFullHtmlFieldId("PromoteToHomePage")" class="forcheckbox">@T("Set as home page")</label>
</span>
</fieldset> </fieldset>
@using(Script.Foot()){ @using(Script.Foot()){
<script type="text/javascript"> <script type="text/javascript">

3
src/Orchard.Web/Themes/TheAdmin/Styles/site.css
View File

@@ -815,6 +815,9 @@ table .button {
border-color:#666d51; border-color:#666d51;
border-style:solid; border-style:solid;
} }
.permalink .checkbox-and-label {
white-space:nowrap;
}
/* Settings */ /* Settings */
.settings fieldset { .settings fieldset {
margin:.5em 0; margin:.5em 0;