Merge

--HG--
branch : dev

src/Orchard.Web/Modules/Futures.Widgets/Controllers/AdminController.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Web.Mvc;
+using Futures.Widgets.Models;
+using Futures.Widgets.ViewModels;
+using Orchard;
+using Orchard.ContentManagement;
+using Orchard.Core.Common.Models;
+using Orchard.Localization;
+using Orchard.Settings;
+
+namespace Futures.Widgets.Controllers {
+    [ValidateInput(false)]
+    public class AdminController : Controller, IUpdateModel {
+        public AdminController(IOrchardServices services) {
+            Services = services;
+        }
+
+        private IOrchardServices Services { get; set; }
+        protected virtual ISite CurrentSite { get; set; }
+
+        public ActionResult AddWidget() {
+            var hasWidgetsRecord = CurrentSite.As<HasWidgets>().Record;
+
+            var widget = Services.ContentManager.Create<Widget>("HtmlWidget", init => {
+                init.Record.Scope = hasWidgetsRecord;
+                init.Record.Zone = "content";
+                init.Record.Position = "after";
+                init.As<BodyAspect>().Text = "Hello world!";
+            });
+
+            return RedirectToAction("Edit", new {widget.ContentItem.Id });
+        }
+
+        public ActionResult Edit(int id, string returnUrl) {
+            var widget = Services.ContentManager.Get(id);
+            var viewModel = new WidgetEditViewModel {
+                Widget = Services.ContentManager.BuildEditorModel(widget),
+                ReturnUrl = returnUrl,
+            };
+            return View(viewModel);
+        }
+
+        [HttpPost, ActionName("Edit")]
+        public ActionResult EditPOST(int id, string returnUrl) {
+            var widget = Services.ContentManager.Get(id);
+            var viewModel = new WidgetEditViewModel {
+                Widget = Services.ContentManager.UpdateEditorModel(widget, this),
+                ReturnUrl = returnUrl,
+            };
+            if (ModelState.IsValid == false) {
+                return View(viewModel);
+            }
+            if (string.IsNullOrEmpty(returnUrl)) {
+                return RedirectToAction("Edit", new { id });
+            }
+            return Redirect(returnUrl);
+        }
+
+
+        bool IUpdateModel.TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) {
+            return TryUpdateModel(model, prefix, includeProperties, excludeProperties);
+        }
+
+        void IUpdateModel.AddModelError(string key, LocalizedString errorMessage) {
+            ModelState.AddModelError(key, errorMessage.ToString());
+        }
+    }
+}

src/Orchard.Web/Modules/Futures.Widgets/Controllers/WidgetDriver.cs

@@ -0,0 +1,20 @@
+using System.Web.Routing;
+using Futures.Widgets.Models;
+using Orchard.ContentManagement.Drivers;
+
+namespace Futures.Widgets.Controllers {
+    public class WidgetDriver : ContentItemDriver<Widget> {
+        protected override RouteValueDictionary GetEditorRouteValues(Widget item) {
+            return new RouteValueDictionary {
+                                                {"Area", "Futures.Widgets"},
+                                                {"Controller", "Admin"},
+                                                {"Action", "Edit"},
+                                                {"Id", item.ContentItem.Id}
+                                            };
+        }
+
+        protected override bool UseDefaultTemplate {
+            get { return true; }
+        }
+    }
+}

src/Orchard.Web/Modules/Futures.Widgets/Controllers/WidgetHandler.cs

@@ -0,0 +1,50 @@
+using System.Linq;
+using System.Web.Routing;
+using Futures.Widgets.Models;
+using Orchard.ContentManagement;
+using Orchard.ContentManagement.Drivers;
+using Orchard.ContentManagement.Handlers;
+using Orchard.Core.Common.Models;
+using Orchard.Data;
+
+namespace Futures.Widgets.Controllers {
+    public class WidgetHandler : ContentHandler {
+        public WidgetHandler(
+            IRepository<HasWidgetsRecord> hasWidgetRepository,
+            IRepository<WidgetRecord> widgetRepository) {
+
+            // marking the "site" content type as a widget container
+            Filters.Add(new ActivatingFilter<HasWidgets>("site"));
+
+            // adding parts to the "HtmlWidget" content type
+            Filters.Add(new ActivatingFilter<Widget>("HtmlWidget"));
+            Filters.Add(new ActivatingFilter<BodyAspect>("HtmlWidget"));
+
+            // providing standard storage support for widget records
+            Filters.Add(StorageFilter.For(hasWidgetRepository));
+            Filters.Add(StorageFilter.For(widgetRepository));
+
+            OnLoaded<HasWidgets>(
+                (ctx, part) => part.WidgetField.Loader(
+                                   () => ctx.ContentManager
+                                             .Query<Widget, WidgetRecord>()
+                                             .Where(x => x.Scope == part.Record)
+                                             .List().ToList()));
+        }
+    }
+
+    public class WidgetDriver : ContentItemDriver<Widget> {
+        protected override RouteValueDictionary GetEditorRouteValues(Widget item) {
+            return new RouteValueDictionary {
+                {"Area", "Futures.Widgets"},
+                {"Controller", "Admin"},
+                {"Action", "Edit"},
+                {"Id", item.ContentItem.Id}
+            };
+        }
+
+        protected override bool UseDefaultTemplate {
+            get { return true; }
+        }
+    }
+}

src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj

@@ -0,0 +1,118 @@
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E65E5633-C0FF-453C-A906-481C14F969D6}</ProjectGuid>
+    <ProjectTypeGuids>{F85E285D-A4E0-4152-9332-AB1D724D3325};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Futures.Widgets</RootNamespace>
+    <AssemblyName>Futures.Widgets</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <MvcBuildViews>false</MvcBuildViews>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.ComponentModel.DataAnnotations">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\Program Files\Microsoft ASP.NET\ASP.NET MVC 2\\Assemblies\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Web.Abstractions" />
+    <Reference Include="System.Web.Routing" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Web.Mobile" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="Controllers\WidgetHandler.cs" />
+    <Compile Include="Models\HasWidgets.cs" />
+    <Compile Include="Models\Widget.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ViewModels\WidgetEditViewModel.cs" />
+    <Compile Include="WidgetFilter.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Module.txt" />
+    <Content Include="Views\Admin\Edit.ascx" />
+    <Content Include="Web.config" />
+    <Content Include="Views\Web.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Orchard\Orchard.csproj">
+      <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
+      <Name>Orchard</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
+      <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
+      <Name>Orchard.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="App_Data\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target> -->
+  <Target Name="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
+    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)" />
+  </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>17593</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>
+          </IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>True</UseCustomServer>
+          <CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>

src/Orchard.Web/Modules/Futures.Widgets/Models/HasWidgets.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using Orchard.ContentManagement;
+using Orchard.ContentManagement.Records;
+using Orchard.Core.Common.Utilities;
+
+namespace Futures.Widgets.Models {
+    public class HasWidgets : ContentPart<HasWidgetsRecord> {
+        public LazyField<IList<Widget>> WidgetField = new LazyField<IList<Widget>>();
+        public IList<Widget> Widgets { get { return WidgetField.Value; } set { WidgetField.Value = value; } }
+    }
+
+    public class HasWidgetsRecord : ContentPartRecord {
+    }
+}

src/Orchard.Web/Modules/Futures.Widgets/Models/Widget.cs

@@ -0,0 +1,13 @@
+using Orchard.ContentManagement;
+using Orchard.ContentManagement.Records;
+
+namespace Futures.Widgets.Models {
+    public class Widget : ContentPart<WidgetRecord> {
+    }
+
+    public class WidgetRecord : ContentPartRecord {
+        public virtual HasWidgetsRecord Scope { get; set; }
+        public virtual string Zone { get; set; }
+        public virtual string Position { get; set; }
+    }
+}

src/Orchard.Web/Modules/Futures.Widgets/Module.txt

@@ -0,0 +1 @@
+name: Widgets

src/Orchard.Web/Modules/Futures.Widgets/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Futures.Widgets")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft IT")]
+[assembly: AssemblyProduct("Futures.Widgets")]
+[assembly: AssemblyCopyright("Copyright © Microsoft IT 2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("8c179868-e814-4277-a0af-b71707c3bff4")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

src/Orchard.Web/Modules/Futures.Widgets/ViewModels/WidgetEditViewModel.cs

@@ -0,0 +1,8 @@
+using Orchard.Mvc.ViewModels;
+
+namespace Futures.Widgets.ViewModels {
+    public class WidgetEditViewModel : BaseViewModel {
+        public ContentItemViewModel Widget { get; set; }
+        public string ReturnUrl { get; set;}
+    }
+}

src/Orchard.Web/Modules/Futures.Widgets/Views/Admin/Edit.ascx

@@ -0,0 +1,12 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<WidgetEditViewModel>" %>
+<%@ Import Namespace="Futures.Widgets.ViewModels" %>
+<%@ Import Namespace="Orchard.Mvc.Html" %>
+<h1><%=Html.TitleForPage(T("Edit Widget").ToString()) %></h1>
+<% using (Html.BeginFormAntiForgeryPost()) { %>
+    <%= Html.ValidationSummary() %>
+    <%= Html.EditorForItem(m => m.Widget) %>
+    <fieldset>
+        <%= Html.HiddenFor(m => m.ReturnUrl) %>
+        <input class="button primaryAction" type="submit" name="submit.Save" value="Save"/>
+    </fieldset>
+<%} %>

src/Orchard.Web/Modules/Futures.Widgets/Views/Web.config

@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <add path="*" verb="*"
+          type="System.Web.HttpNotFoundHandler"/>
+    </httpHandlers>
+
+    <!--
+        Enabling request validation in view pages would cause validation to occur
+        after the input has already been processed by the controller. By default
+        MVC performs request validation before a controller processes the input.
+        To change this behavior apply the ValidateInputAttribute to a
+        controller or action.
+    -->
+    <pages
+        validateRequest="false"
+        pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+        pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+        userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+      <controls>
+        <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
+      </controls>
+    </pages>
+  </system.web>
+
+  <system.webServer>
+    <validation validateIntegratedModeConfiguration="false"/>
+    <handlers>
+      <remove name="BlockViewHandler"/>
+      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
+    </handlers>
+  </system.webServer>
+</configuration>

src/Orchard.Web/Modules/Futures.Widgets/Web.config

@@ -0,0 +1,154 @@
+<?xml version="1.0"?>
+<!-- 
+    Note: As an alternative to hand editing this file you can use the 
+    web admin tool to configure settings for your application. Use
+    the Website->Asp.Net Configuration option in Visual Studio.
+    A full list of settings and comments can be found in 
+    machine.config.comments usually located in 
+    \Windows\Microsoft.Net\Framework\v2.x\Config 
+-->
+<configuration>
+
+  <configSections>
+    <sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+      <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+        <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+        <sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+          <section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
+          <section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
+          <section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
+          <section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
+        </sectionGroup>
+      </sectionGroup>
+    </sectionGroup>
+  </configSections>
+
+
+  <system.web>
+
+    <!-- 
+            Set compilation debug="true" to insert debugging 
+            symbols into the compiled page. Because this 
+            affects performance, set this value to true only 
+            during development.
+    -->
+    <compilation debug="true">
+      <assemblies>
+        <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+        <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+        <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+        <add assembly="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+        <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+        <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+        <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+        <add assembly="System.Data.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+      </assemblies>
+    </compilation>
+
+
+
+    <!--
+            The <customErrors> section enables configuration 
+            of what to do if/when an unhandled error occurs 
+            during the execution of a request. Specifically, 
+            it enables developers to configure html error pages 
+            to be displayed in place of a error stack trace.
+
+        <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
+            <error statusCode="403" redirect="NoAccess.htm" />
+            <error statusCode="404" redirect="FileNotFound.htm" />
+        </customErrors>
+    -->
+
+    <pages>
+      <controls>
+        <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+        <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      </controls>
+
+      <namespaces>
+        <add namespace="System.Web.Mvc"/>
+        <add namespace="System.Web.Mvc.Ajax"/>
+        <add namespace="System.Web.Mvc.Html"/>
+        <add namespace="System.Web.Routing"/>
+        <add namespace="System.Linq"/>
+        <add namespace="System.Collections.Generic"/>
+        <add namespace="Orchard.Mvc.Html" />
+      </namespaces>
+    </pages>
+
+    <httpHandlers>
+      <remove verb="*" path="*.asmx"/>
+      <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
+      <add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+    </httpHandlers>
+
+    <httpModules>
+      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add name="UrlRoutingModule" type="System.Web.Routing.UrlRoutingModule, System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+    </httpModules>
+
+  </system.web>
+
+  <system.codedom>
+    <compilers>
+      <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4"
+                type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <providerOption name="CompilerVersion" value="v3.5"/>
+        <providerOption name="WarnAsError" value="false"/>
+      </compiler>
+
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" warningLevel="4"
+                type="Microsoft.VisualBasic.VBCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <providerOption name="CompilerVersion" value="v3.5"/>
+        <providerOption name="OptionInfer" value="true"/>
+        <providerOption name="WarnAsError" value="false"/>
+      </compiler>
+    </compilers>
+  </system.codedom>
+
+  <system.web.extensions/>
+
+  <!-- 
+        The system.webServer section is required for running ASP.NET AJAX under Internet
+        Information Services 7.0.  It is not necessary for previous version of IIS.
+  -->
+  <system.webServer>
+    <validation validateIntegratedModeConfiguration="false"/>
+
+    <modules runAllManagedModulesForAllRequests="true">
+      <remove name="ScriptModule" />
+      <remove name="UrlRoutingModule" />
+      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add name="UrlRoutingModule" type="System.Web.Routing.UrlRoutingModule, System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+    </modules>
+
+    <handlers>
+      <remove name="WebServiceHandlerFactory-Integrated"/>
+      <remove name="ScriptHandlerFactory" />
+      <remove name="ScriptHandlerFactoryAppServices" />
+      <remove name="ScriptResource" />
+      <remove name="MvcHttpHandler" />
+      <remove name="UrlRoutingHandler" />
+      <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode"
+           type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode"
+           type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add name="UrlRoutingHandler" preCondition="integratedMode" verb="*" path="UrlRouting.axd" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    </handlers>
+  </system.webServer>
+
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="1.0.0.0" newVersion="2.0.0.0"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+
+</configuration>

src/Orchard.Web/Modules/Futures.Widgets/WidgetFilter.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Linq;
+using System.Web.Mvc;
+using Futures.Widgets.Models;
+using Orchard.ContentManagement;
+using Orchard.Mvc.Filters;
+using Orchard.Mvc.ViewModels;
+using Orchard.Settings;
+using Orchard.UI.Admin;
+
+namespace Futures.Widgets {
+    public class WidgetFilter : FilterProvider, IActionFilter {
+        private readonly IContentManager _contentManager;
+
+        public WidgetFilter(IContentManager contentManager) {
+            _contentManager = contentManager;
+        }
+
+        public virtual ISite CurrentSite { get; set; }
+
+        public void OnActionExecuting(ActionExecutingContext filterContext) {
+        }
+
+        public void OnActionExecuted(ActionExecutedContext filterContext) {
+            var model = BaseViewModel.From(filterContext.Result);
+            if (model == null || AdminFilter.IsApplied(filterContext.RequestContext)) {
+                return;
+            }
+
+            var siteWidgets = CurrentSite.As<HasWidgets>();
+            if (siteWidgets == null) {
+                return;
+            }
+
+            var zones = model.Zones;
+            foreach (var widget in siteWidgets.Widgets) {
+                zones.AddDisplayItem(
+                    widget.Record.Zone + ":" + widget.Record.Position,
+                    _contentManager.BuildDisplayModel(widget, "Widget"));
+            }
+        }
+    }
+}

src/Orchard.Web/Modules/Orchard.DevTools/Views/DisplayTemplates/Parts/DevTools.ShowDebugLink.ascx

@@ -1,6 +1,6 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ShowDebugLink>" %>
 <%@ Import Namespace="Orchard.DevTools.Models" %>
 <div class="debug message"><%=T(
-    "DevTools: editing {0}",
+    "DevTools: displaying {0}",
     Html.ActionLink(T("{0} #{1} v{2}", Model.ContentItem.ContentType, Model.ContentItem.Id, Model.ContentItem.Version).ToString(), "details", "content", new { area = "Orchard.DevTools", Model.ContentItem.Id, Model.ContentItem.Version }, new { })
     ) %></div>

src/Orchard.Web/Orchard.Web.csproj

@@ -102,6 +102,10 @@
       <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
       <Name>Orchard.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="Modules\Futures.Widgets\Futures.Widgets.csproj">
+      <Project>{E65E5633-C0FF-453C-A906-481C14F969D6}</Project>
+      <Name>Futures.Widgets</Name>
+    </ProjectReference>
     <ProjectReference Include="Modules\Orchard.Blogs\Orchard.Blogs.csproj">
       <Project>{63FBD4D9-E1DA-4A7B-AA6A-D6074FE50867}</Project>
       <Name>Orchard.Blogs</Name>