From 04c517931fa9be12f49f2b9caae563d494c64785 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Thu, 14 Oct 2010 16:04:36 -0700
Subject: [PATCH] Changing around Widget wrappers a little more...

--HG--
branch : dev
---
 .../Modules/Orchard.Widgets/Shapes.cs         |  7 +++----
 .../Views/Widget.ControlWrapper.cshtml        | 19 ++++++++-----------
 .../Views/Widget.Wrapper.cshtml               | 17 +++--------------
 3 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs
index 07fe403c4..54de14d3a 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs
@@ -8,17 +8,16 @@ namespace Orchard.Widgets {
             builder.Describe("Items_Widget")
                 .Configure(descriptor => {
                     // todo: have "alternates" for chrome
-                    descriptor.Wrappers.Add("Widget_Wrapper");
+                    //todo: (heskew) something...this still doesn't feel right
                     descriptor.Wrappers.Add("Widget_ControlWrapper");
+                    descriptor.Wrappers.Add("Widget_Wrapper");
                 })
                 .OnCreated(created => {
                     var widget = created.Shape;
                     widget.Main.Add(created.New.PlaceChildContent(Source: widget));
                 })
                 .OnDisplaying(displaying => {
-                    var widget = displaying.Shape;
-                    widget.Classes.Add("widget");
-                    ContentItem contentItem = widget.ContentItem;
+                    ContentItem contentItem = displaying.Shape.ContentItem;
                     if (contentItem != null) {
                         var zoneName = contentItem.As<WidgetPart>().Zone;
                         displaying.ShapeMetadata.Alternates.Add("Items_Widget__" + contentItem.ContentType);
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.ControlWrapper.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.ControlWrapper.cshtml
index ed761ea4e..bf5cab8f6 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.ControlWrapper.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.ControlWrapper.cshtml
@@ -1,14 +1,11 @@
 @using Orchard.ContentManagement;
 @using Orchard.Widgets;
-@{
-    if (AuthorizedFor(Permissions.ManageWidgets)) {
-        Model.Classes.Add("widget-manage");
-    }
-    var tag = Tag(Model, "div");
-}
-@tag.StartElement
-    @if (AuthorizedFor(Permissions.ManageWidgets)) {
-    <div class="manage-actions">@Html.ItemEditLinkWithReturnUrl(T("Edit").Text, (ContentItem)Model.ContentItem)</div>
-    }
+@if (AuthorizedFor(Permissions.ManageWidgets)) {
+    <div class="widget-control">
+        <div class="manage-actions">@Html.ItemEditLinkWithReturnUrl(T("Edit").Text, (ContentItem)Model.ContentItem)</div>
     @Display(Model.Main)
-@tag.EndElement
\ No newline at end of file
+    </div>
+}
+else {
+    @Display(Model.Main)
+}
\ No newline at end of file
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 ed761ea4e..7f4f9b289 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.Wrapper.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.Wrapper.cshtml
@@ -1,14 +1,3 @@
-@using Orchard.ContentManagement;
-@using Orchard.Widgets;
-@{
-    if (AuthorizedFor(Permissions.ManageWidgets)) {
-        Model.Classes.Add("widget-manage");
-    }
-    var tag = Tag(Model, "div");
-}
-@tag.StartElement
-    @if (AuthorizedFor(Permissions.ManageWidgets)) {
-    <div class="manage-actions">@Html.ItemEditLinkWithReturnUrl(T("Edit").Text, (ContentItem)Model.ContentItem)</div>
-    }
-    @Display(Model.Main)
-@tag.EndElement
\ No newline at end of file
+<div class="widget">
+    @Display.PlaceChildContent(Source: Model)
+</div>
\ No newline at end of file