lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Making the content wrapper not apply to *Admin* display types and making the wrapper zone names containing the child contents consistent (Model.Child)

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-10-15 17:10:34 -07:00
parent 6da2e04ada
commit b53a96d83f
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Web/Core/Contents/Shapes.cs
View File

@@ -5,10 +5,9 @@ namespace Orchard.Core.Contents {
public class Shapes : IShapeTableProvider { public class Shapes : IShapeTableProvider {
public void Discover(ShapeTableBuilder builder) { public void Discover(ShapeTableBuilder builder) {
builder.Describe("Content") builder.Describe("Content")
.Configure(descriptor => descriptor.Wrappers.Add("Content_ControlWrapper"))
.OnCreated(created => { .OnCreated(created => {
var content = created.Shape; var content = created.Shape;
content.Main.Add(created.New.PlaceChildContent(Source: content)); content.Child.Add(created.New.PlaceChildContent(Source: content));
}) })
.OnDisplaying(displaying => { .OnDisplaying(displaying => {
ContentItem contentItem = displaying.Shape.ContentItem; ContentItem contentItem = displaying.Shape.ContentItem;
@@ -21,6 +20,9 @@ namespace Orchard.Core.Contents {
displaying.ShapeMetadata.Alternates.Add("Content_" + displaying.ShapeMetadata.DisplayType); displaying.ShapeMetadata.Alternates.Add("Content_" + displaying.ShapeMetadata.DisplayType);
//Content.Summary-Page //Content.Summary-Page
displaying.ShapeMetadata.Alternates.Add("Content_" + displaying.ShapeMetadata.DisplayType + "__" + contentItem.ContentType); displaying.ShapeMetadata.Alternates.Add("Content_" + displaying.ShapeMetadata.DisplayType + "__" + contentItem.ContentType);
if (!displaying.ShapeMetadata.DisplayType.Contains("Admin"))
displaying.ShapeMetadata.Wrappers.Add("Content_ControlWrapper");
} }
}); });

4
src/Orchard.Web/Core/Contents/Views/Content.ControlWrapper.cshtml
View File

@@ -3,9 +3,9 @@
@if (AuthorizedFor(Permissions.EditContent)) { @if (AuthorizedFor(Permissions.EditContent)) {
<div class="content-control"> <div class="content-control">
<div class="manage-actions">@Html.ItemEditLinkWithReturnUrl(T("Edit").Text, (ContentItem)Model.ContentItem)</div> <div class="manage-actions">@Html.ItemEditLinkWithReturnUrl(T("Edit").Text, (ContentItem)Model.ContentItem)</div>
@Display(Model.Main) @Display(Model.Child)
</div> </div>
} }
else { else {
@Display(Model.Main) @Display(Model.Child)
} }

2
src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs
View File

@@ -14,7 +14,7 @@ namespace Orchard.Widgets {
}) })
.OnCreated(created => { .OnCreated(created => {
var widget = created.Shape; var widget = created.Shape;
widget.Main.Add(created.New.PlaceChildContent(Source: widget)); widget.Child.Add(created.New.PlaceChildContent(Source: widget));
}) })
.OnDisplaying(displaying => { .OnDisplaying(displaying => {
ContentItem contentItem = displaying.Shape.ContentItem; ContentItem contentItem = displaying.Shape.ContentItem;

4
src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.ControlWrapper.cshtml
View File

@@ -3,9 +3,9 @@
@if (AuthorizedFor(Permissions.ManageWidgets)) { @if (AuthorizedFor(Permissions.ManageWidgets)) {
<div class="widget-control"> <div class="widget-control">
<div class="manage-actions">@Html.ItemEditLinkWithReturnUrl(T("Edit").Text, (ContentItem)Model.ContentItem)</div> <div class="manage-actions">@Html.ItemEditLinkWithReturnUrl(T("Edit").Text, (ContentItem)Model.ContentItem)</div>
@Display(Model.Main) @Display(Model.Child)
</div> </div>
} }
else { else {
@Display(Model.Main) @Display(Model.Child)
} }

2
src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.Wrapper.cshtml
View File

@@ -8,7 +8,7 @@
<h1>@title</h1> <h1>@title</h1>
@Display(Model.Header) @Display(Model.Header)
</header> </header>
@Display.PlaceChildContent(Source: Model) @Display(Model.Child)
@if(Model.Footer != null) { @if(Model.Footer != null) {
<footer> <footer>
@Display(Model.Footer) @Display(Model.Footer)