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

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Dave Reed
2010-10-19 16:03:50 -07:00
parent 35d3835979 3f44927aa2
commit 9775643fbb
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Orchard.Web/Core/Common/Shapes.cs
View File

@@ -2,17 +2,26 @@ using System;
using System.Web; using System.Web;
using System.Web.Mvc; using System.Web.Mvc;
using Orchard.DisplayManagement; using Orchard.DisplayManagement;
using Orchard.DisplayManagement.Descriptors;
using Orchard.Localization; using Orchard.Localization;
using Orchard.Mvc.Html; using Orchard.Mvc.Html;
namespace Orchard.Core.Common { namespace Orchard.Core.Common {
public class Shapes : IDependency { public class Shapes : IShapeTableProvider {
public Shapes() { public Shapes() {
T = NullLocalizer.Instance; T = NullLocalizer.Instance;
} }
public Localizer T { get; set; } public Localizer T { get; set; }
public void Discover(ShapeTableBuilder builder) {
builder.Describe("Fields_Common_Text")
.OnDisplaying(displaying => {
string textFieldName = displaying.Shape.Name;
displaying.ShapeMetadata.Alternates.Add("Fields_Common_Text__" + textFieldName);
});
}
[Shape] [Shape]
public IHtmlString PublishedState(HtmlHelper Html, DateTime? dateTimeUtc) { public IHtmlString PublishedState(HtmlHelper Html, DateTime? dateTimeUtc) {
return Html.DateTime(dateTimeUtc, T("Draft")); return Html.DateTime(dateTimeUtc, T("Draft"));
@@ -20,12 +29,10 @@ namespace Orchard.Core.Common {
[Shape] [Shape]
public IHtmlString PublishedWhen(dynamic Display, DateTime? dateTimeUtc) { public IHtmlString PublishedWhen(dynamic Display, DateTime? dateTimeUtc) {
if (dateTimeUtc == null) { if (dateTimeUtc == null)
return T("as a Draft"); return T("as a Draft");
}
else { return Display.DateTimeRelative(dateTimeUtc: dateTimeUtc);
return Display.DateTimeRelative(dateTimeUtc: dateTimeUtc);
}
} }
} }
} }

4
src/Orchard.Web/Core/Shapes/CoreShapes.cs
View File

@@ -51,7 +51,7 @@ namespace Orchard.Core.Shapes {
.OnCreating(creating => creating.BaseType = typeof(Zone)) .OnCreating(creating => creating.BaseType = typeof(Zone))
.OnDisplaying(displaying => { .OnDisplaying(displaying => {
var zone = displaying.Shape; var zone = displaying.Shape;
zone.Classes.Add("zone-" + zone.ZoneName.ToLower()); zone.Classes.Add("zone-" + zone.ZoneName.HtmlClassify());
zone.Classes.Add("zone"); zone.Classes.Add("zone");
zone.Metadata.Alternates.Add("Zone__" + zone.ZoneName); zone.Metadata.Alternates.Add("Zone__" + zone.ZoneName);
}); });
@@ -59,7 +59,7 @@ namespace Orchard.Core.Shapes {
builder.Describe("Menu") builder.Describe("Menu")
.OnDisplaying(displaying => { .OnDisplaying(displaying => {
var menu = displaying.Shape; var menu = displaying.Shape;
menu.Classes.Add("menu-" + menu.MenuName.ToLower()); menu.Classes.Add("menu-" + menu.MenuName.HtmlClassify());
menu.Classes.Add("menu"); menu.Classes.Add("menu");
menu.Metadata.Alternates.Add("Menu__" + menu.MenuName); menu.Metadata.Alternates.Add("Menu__" + menu.MenuName);
}); });

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

@@ -1,5 +1,6 @@
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.DisplayManagement.Descriptors; using Orchard.DisplayManagement.Descriptors;
using Orchard.Utility.Extensions;
using Orchard.Widgets.Models; using Orchard.Widgets.Models;
namespace Orchard.Widgets { namespace Orchard.Widgets {
@@ -16,8 +17,13 @@ namespace Orchard.Widgets {
widget.Child.Add(created.New.PlaceChildContent(Source: widget)); widget.Child.Add(created.New.PlaceChildContent(Source: widget));
}) })
.OnDisplaying(displaying => { .OnDisplaying(displaying => {
var widget = displaying.Shape;
widget.Classes.Add("widget");
ContentItem contentItem = displaying.Shape.ContentItem; ContentItem contentItem = displaying.Shape.ContentItem;
if (contentItem != null) { if (contentItem != null) {
widget.Classes.Add("widget-" + contentItem.ContentType.HtmlClassify());
var zoneName = contentItem.As<WidgetPart>().Zone; var zoneName = contentItem.As<WidgetPart>().Zone;
displaying.ShapeMetadata.Alternates.Add("Widget__" + contentItem.ContentType); displaying.ShapeMetadata.Alternates.Add("Widget__" + contentItem.ContentType);
displaying.ShapeMetadata.Alternates.Add("Widget__" + zoneName); displaying.ShapeMetadata.Alternates.Add("Widget__" + zoneName);

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

@@ -2,8 +2,9 @@
@using Orchard.Widgets.Models; @using Orchard.Widgets.Models;
@{ @{
var title = ((IContent)Model.ContentItem).As<WidgetPart>().Title; var title = ((IContent)Model.ContentItem).As<WidgetPart>().Title;
var tag = Tag(Model, "article");
} }
<article class="widget"> @tag.StartElement
<header> <header>
<h1>@title</h1> <h1>@title</h1>
@Display(Model.Header) @Display(Model.Header)
@@ -14,4 +15,4 @@
@Display(Model.Footer) @Display(Model.Footer)
</footer> </footer>
} }
</article> @tag.EndElement