From 5c8d2f186425c619ae441cbe9586c3ebf6b2f9f1 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Wed, 20 Oct 2010 14:30:49 -0700 Subject: [PATCH] Making the WidgetPart title optional and using the widget type's display name in the widget admin... --HG-- branch : dev --- src/Orchard.Web/Modules/Orchard.Widgets/Models/WidgetPart.cs | 1 - .../Modules/Orchard.Widgets/Views/Admin/Index.cshtml | 2 +- .../Modules/Orchard.Widgets/Views/Widget.Wrapper.cshtml | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Models/WidgetPart.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Models/WidgetPart.cs index 38bb44acf..bc67ce6fa 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Models/WidgetPart.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Models/WidgetPart.cs @@ -10,7 +10,6 @@ namespace Orchard.Widgets.Models { /// /// The widget's title. /// - [Required] public string Title { get { return Record.Title; } set { Record.Title = value; } diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml index 3ed6f7c84..0b1ab3f5b 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml @@ -40,7 +40,7 @@ @{ i++; } - @Html.ActionLink(@widget.Title, "EditWidget", new { @widget.Id }) + @Html.ActionLink(@widget.TypeDefinition.DisplayName, "EditWidget", new { @widget.Id }) } diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.Wrapper.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.Wrapper.cshtml index da87f7453..c9b56bbf3 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.Wrapper.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.Wrapper.cshtml @@ -5,10 +5,14 @@ var tag = Tag(Model, "article"); } @tag.StartElement + @if (HasText(title) || Model.Header != null) {
+ @if (HasText(title)) {

@title

+ } @Display(Model.Header)
+ } @Display(Model.Child) @if(Model.Footer != null) {