From a30b0ad51ecaaa21856a63049cfea20b552f8d63 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebros@microsoft.com>
Date: Mon, 13 Sep 2010 17:44:32 -0700
Subject: [PATCH] Adding Capture method to IOrchardViewPage

--HG--
branch : theming
---
 .../Localization/Views/Admin/Translate.cshtml |  3 ++-
 .../Parts/Messaging.MessageSettings.ascx      | 20 -------------------
 .../Parts/Messaging.MessageSettings.cshtml    | 20 +++++++++++++++++++
 src/Orchard.Web/Core/Orchard.Core.csproj      |  2 +-
 .../Parts/Routable.RoutePart.cshtml           |  2 +-
 src/Orchard/Mvc/Html/HtmlHelperExtensions.cs  | 19 +-----------------
 src/Orchard/Mvc/IOrchardViewPage.cs           |  4 +++-
 .../Mvc/ViewEngines/Razor/WebViewPage.cs      | 19 +++++++++++++++++-
 src/Orchard/Mvc/ViewPage.cs                   |  8 ++++++--
 src/Orchard/Mvc/ViewUserControl.cs            |  7 +++++++
 src/Orchard/WorkContext.cs                    |  5 +----
 11 files changed, 60 insertions(+), 49 deletions(-)
 delete mode 100644 src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.ascx
 create mode 100644 src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.cshtml

diff --git a/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml b/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml
index 30a7cc390..4ea7d6076 100644
--- a/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml
+++ b/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml
@@ -6,7 +6,8 @@ Model.Content.Zones.AddRenderPartial("primary:before", "CultureSelection", Model
     @Html.ValidationSummary()
     @Html.EditorForItem(m=>m.Content)
 }
-@using (Html.RenderFootContent() ) {
+
+@using(Html.Capture(script => WorkContext.Page.Tail.Add(script) ){
 <script type="text/javascript">
     (function ($) {
         // grab the slug input
diff --git a/src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.ascx b/src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.ascx
deleted file mode 100644
index 2d4734df4..000000000
--- a/src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.ascx
+++ /dev/null
@@ -1,20 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentSubscriptionPartViewModel>" %>
-<%@ Import Namespace="Orchard.Core.Messaging.Models"%>
-<%@ Import Namespace="Orchard.Core.Messaging.ViewModels"%>
-<fieldset>
-    <legend><%: T("Messaging")%></legend>
-    <div>
-        <label for="<%: Html.FieldIdFor(m => m.MessageSettings.DefaultChannelService)%>"><%: T("Default channel service for messages")%></label>
-        <% if ( Model.ChannelServices.Any() ) { %>
-            <select id="<%:Html.FieldIdFor(m => m.MessageSettings.DefaultChannelService) %>" name="<%:Html.FieldNameFor(m => m.MessageSettings.DefaultChannelService) %>">
-            <% foreach ( var service in Model.ChannelServices ) {%>
-                <option <%: Model.MessageSettings.DefaultChannelService == service ? "selected=\"selected\"" : "" %> value="<%: service %>"><%: service%></option>
-            <% }
-           }
-           else {%>
-           <span class="hint"><%: T("You must enable a messaging channel (e.g., Orchard.Email) before being able to send messages.") %></span>
-        <% }%>
-
-    </select> 
-    </div>
-</fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.cshtml b/src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.cshtml
new file mode 100644
index 000000000..b0f53d634
--- /dev/null
+++ b/src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.cshtml
@@ -0,0 +1,20 @@
+@model ContentSubscriptionPartViewModel
+@using Orchard.Core.Messaging.Models
+@using Orchard.Core.Messaging.ViewModels
+<fieldset>
+    <legend>@T("Messaging")</legend>
+    <div>
+        <label for="@Html.FieldIdFor(m => m.MessageSettings.DefaultChannelService)">@T("Default channel service for messages")</label>
+        @if ( Model.ChannelServices.Any() ) {
+            <select id="@Html.FieldIdFor(m => m.MessageSettings.DefaultChannelService)" name="@Html.FieldNameFor(m => m.MessageSettings.DefaultChannelService)">
+            @foreach ( var service in Model.ChannelServices ) {
+                <option @{ if(Model.MessageSettings.DefaultChannelService == service) { <text>selected="selected"</text> } } value="@service">@service</option>
+             }
+           }
+           else {
+           <span class="hint">@T("You must enable a messaging channel (e.g., Orchard.Email) before being able to send messages.")</span>
+        }
+
+    </select> 
+    </div>
+</fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index e59315bc0..b25d6e4ed 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -255,7 +255,7 @@
     <None Include="Contents\Views\Admin\List.cshtml" />
     <None Include="Localization\Views\EditorTemplates\Parts\Localization.Translation.cshtml" />
     <Content Include="Messaging\Module.txt" />
-    <Content Include="Messaging\Views\EditorTemplates\Parts\Messaging.MessageSettings.ascx" />
+    <None Include="Messaging\Views\EditorTemplates\Parts\Messaging.MessageSettings.cshtml" />
     <Content Include="PublishLater\Content\Admin\images\draft.gif" />
     <Content Include="PublishLater\Content\Admin\images\offline.gif" />
     <Content Include="PublishLater\Content\Admin\images\online.gif" />
diff --git a/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml b/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml
index 7811d5229..b937315e9 100644
--- a/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml
+++ b/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml
@@ -13,7 +13,7 @@
 </fieldset>
 
 	@Html.RegisterFootScript("jquery.slugify.js");
-    @using(Html.RenderFootContent()){
+    @using(Capture(script => WorkContext.Page.Tail.Add(script))){
 		<script type="text/javascript">
 			$(function(){
 				//pull slug input from tab order
diff --git a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs
index 23b18aa38..b609a7809 100644
--- a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs
+++ b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
@@ -8,7 +9,6 @@ using System.Web.Mvc.Html;
 using System.Web.Routing;
 using Orchard.Collections;
 using Orchard.Localization;
-using Orchard.Mvc.Spooling;
 using Orchard.Services;
 using Orchard.Settings;
 using Orchard.Utility;
@@ -18,23 +18,6 @@ using System.Web;
 namespace Orchard.Mvc.Html {
     public static class HtmlHelperExtensions {
 
-        private class FootContentRenderer : IDisposable {
-            readonly dynamic _model;
-
-            public FootContentRenderer(HtmlHelper html) {
-                _model = html.ViewDataContainer;
-                _model.OutputStack.Push(new HtmlStringWriter());
-            }
-            public void Dispose() {
-                var script = _model.OutputStack.Pop();
-                _model.WorkContext.Page.Tail.Add(script);
-            }
-        }
-
-        public static IDisposable RenderFootContent(this HtmlHelper html) {
-            return new FootContentRenderer(html);
-        }
-
         public static string NameOf<T>(this HtmlHelper<T> html, Expression<Action<T>> expression) {
             return Reflect.NameOf(html.ViewData.Model, expression);
         }
diff --git a/src/Orchard/Mvc/IOrchardViewPage.cs b/src/Orchard/Mvc/IOrchardViewPage.cs
index 8853dc93d..651b93147 100644
--- a/src/Orchard/Mvc/IOrchardViewPage.cs
+++ b/src/Orchard/Mvc/IOrchardViewPage.cs
@@ -1,4 +1,5 @@
-using System.Web;
+using System;
+using System.Web;
 using Orchard.Localization;
 
 namespace Orchard.Mvc {
@@ -11,5 +12,6 @@ namespace Orchard.Mvc {
         dynamic Display { get; }
         IHtmlString DisplayChildren(object shape);
         WorkContext WorkContext { get; }
+        IDisposable Capture(Action<IHtmlString> callback);
     }
 }
diff --git a/src/Orchard/Mvc/ViewEngines/Razor/WebViewPage.cs b/src/Orchard/Mvc/ViewEngines/Razor/WebViewPage.cs
index 7abae8ab8..6b7f2fe55 100644
--- a/src/Orchard/Mvc/ViewEngines/Razor/WebViewPage.cs
+++ b/src/Orchard/Mvc/ViewEngines/Razor/WebViewPage.cs
@@ -19,7 +19,6 @@ namespace Orchard.Mvc.ViewEngines.Razor {
         public Localizer T { get { return _localizer; } }
         public dynamic Display { get { return _display; } }
         public WorkContext WorkContext { get { return _workContext; } }
-        
 
         public dynamic New { get { return _new; } }
         public IDisplayHelperFactory DisplayHelperFactory { get; set; }
@@ -51,9 +50,27 @@ namespace Orchard.Mvc.ViewEngines.Razor {
             return writer;
         }
 
+        public IDisposable Capture(Action<IHtmlString> callback) {
+            return new ViewContextSubstitution(this, callback);
+        }
     }
 
     public abstract class WebViewPage : WebViewPage<dynamic> {
     }
 
+    public class ViewContextSubstitution : IDisposable {
+        public dynamic _viewPage;
+        private readonly Action<IHtmlString> _callback;
+
+        public ViewContextSubstitution(dynamic viewPage, Action<IHtmlString> callback) {
+            _viewPage = viewPage;
+            _callback = callback;
+            _viewPage.OutputStack.Push(new HtmlStringWriter());
+        }
+
+        public void Dispose() {
+            var script = _viewPage.OutputStack.Pop().ToString();
+            _callback(new HtmlString(script));
+        }
+    }
 }
diff --git a/src/Orchard/Mvc/ViewPage.cs b/src/Orchard/Mvc/ViewPage.cs
index a4d379c99..9ed73ffbc 100644
--- a/src/Orchard/Mvc/ViewPage.cs
+++ b/src/Orchard/Mvc/ViewPage.cs
@@ -1,11 +1,10 @@
 using System;
+using System.IO;
 using System.Web;
 using System.Web.Mvc;
 using Autofac;
 using Orchard.DisplayManagement;
-using Orchard.DisplayManagement.Implementation;
 using Orchard.Localization;
-using Orchard.Mvc.Html;
 using Orchard.Mvc.Spooling;
 using Orchard.Security;
 using Orchard.Security.Permissions;
@@ -19,6 +18,7 @@ namespace Orchard.Mvc {
         public Localizer T { get { return _localizer; } }
         public dynamic Display { get { return _display; } }
         public WorkContext WorkContext { get { return _workContext; } }
+
         public IDisplayHelperFactory DisplayHelperFactory { get; set; }
 
         public IAuthorizer Authorizer { get; set; }
@@ -49,6 +49,10 @@ namespace Orchard.Mvc {
             return writer;
         }
 
+        public IDisposable Capture(Action<IHtmlString> callback) {
+            throw new NotImplementedException();
+        }
+
     }
 
     public class ViewPage : ViewPage<dynamic> {
diff --git a/src/Orchard/Mvc/ViewUserControl.cs b/src/Orchard/Mvc/ViewUserControl.cs
index a7d17c1b4..13b386d2b 100644
--- a/src/Orchard/Mvc/ViewUserControl.cs
+++ b/src/Orchard/Mvc/ViewUserControl.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Web;
 using System.Web.Mvc;
 using Autofac;
@@ -18,6 +19,7 @@ namespace Orchard.Mvc {
         public dynamic Display { get { return _display; } }
         public dynamic New { get { return _new; } }
         public WorkContext WorkContext { get { return _workContext; } }
+        
         public IDisplayHelperFactory DisplayHelperFactory { get; set; }
         public IShapeHelperFactory ShapeHelperFactory { get; set; }
 
@@ -49,6 +51,11 @@ namespace Orchard.Mvc {
             }
             return writer;
         }
+
+        public IDisposable Capture(Action<IHtmlString> callback) {
+            throw new NotImplementedException();
+        }
+
     }
 
     public class ViewUserControl : ViewUserControl<dynamic> {
diff --git a/src/Orchard/WorkContext.cs b/src/Orchard/WorkContext.cs
index 080f75f68..842cdb837 100644
--- a/src/Orchard/WorkContext.cs
+++ b/src/Orchard/WorkContext.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Web;
-using Autofac;
+using System.Web;
 using Orchard.Security;
 using Orchard.Settings;
 using Orchard.Themes;
-using Orchard.UI;
 
 namespace Orchard {
     public abstract class WorkContext {