Merge

--HG--
branch : dev

src/Orchard.Web/Core/Contents/Extensions/MetaDataExtensions.cs

@@ -6,6 +6,9 @@ namespace Orchard.Core.Contents.Extensions {
         public static ContentTypeDefinitionBuilder Creatable(this ContentTypeDefinitionBuilder builder, bool creatable = true) {
             return builder.WithSetting("ContentTypeSettings.Creatable", creatable.ToString());
         }
+        public static ContentTypeDefinitionBuilder Draftable(this ContentTypeDefinitionBuilder builder, bool draftable = true) {
+            return builder.WithSetting("ContentTypeSettings.Draftable", draftable.ToString());
+        }
         public static ContentPartDefinitionBuilder Attachable(this ContentPartDefinitionBuilder builder, bool attachable = true) {
             return builder.WithSetting("ContentPartSettings.Attachable", attachable.ToString());
         }

src/Orchard.Web/Core/Contents/Settings/ContentTypeSettings.cs

@@ -1,8 +1,12 @@
 namespace Orchard.Core.Contents.Settings {
     public class ContentTypeSettings {
         /// <summary>
-        /// This setting is used to display a Content Type in Content Management menu like
+        /// Used to determine if an instance of this content type can be created through the UI
         /// </summary>
         public bool Creatable { get; set; }
+        /// <summary>
+        /// Used to determine if this content type supports draft versions
+        /// </summary>
+        public bool Draftable { get; set; }
     }
 }

src/Orchard.Web/Core/Properties/AssemblyInfo.cs

@@ -1,5 +1,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -32,3 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Lucene/Lucene.csproj

@@ -80,9 +80,6 @@
   <ItemGroup>
     <Content Include="Module.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Web.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
       <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>

src/Orchard.Web/Modules/Lucene/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Lucene/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.ArchiveLater/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -32,3 +32,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj

@@ -135,7 +135,6 @@
       <SubType>Code</SubType>
     </Content>
     <Content Include="Views\Items\Content-Blog.SummaryAdmin.cshtml" />
-    <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>

src/Orchard.Web/Modules/Orchard.Blogs/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -32,3 +32,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.Blogs/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj

@@ -86,7 +86,6 @@
     <Content Include="CodeGenerationTemplates\ModuleManifest.txt" />
     <Content Include="CodeGenerationTemplates\ModuleWebConfig.txt" />
     <Content Include="CodeGenerationTemplates\ViewsWebConfig.txt" />
-    <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>

src/Orchard.Web/Modules/Orchard.CodeGeneration/Properties/AssemblyInfo.cs

@@ -1,5 +1,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -31,3 +32,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs

@@ -6,7 +6,6 @@ using System.Web.Mvc;
 using JetBrains.Annotations;
 using Orchard.Comments.Models;
 using Orchard.ContentManagement;
-using Orchard.ContentManagement.Records;
 using Orchard.DisplayManagement;
 using Orchard.Localization;
 using Orchard.Logging;
@@ -64,7 +63,11 @@ namespace Orchard.Comments.Controllers {
                 }
 
                 var pagerShape = Shape.Pager(pager).TotalItemCount(comments.Count());
-                var entries = comments.Slice(pager.GetStartIndex(), pager.PageSize).ToList().Select(comment => CreateCommentEntry(comment.Record));
+                var entries = comments
+                    .OrderByDescending<CommentPartRecord, DateTime?>(cpr => cpr.CommentDateUtc)
+                    .Slice(pager.GetStartIndex(), pager.PageSize)
+                    .ToList()
+                    .Select(comment => CreateCommentEntry(comment.Record));
 
                 var model = new CommentsIndexViewModel {
                     Comments = entries.ToList(),
@@ -98,12 +101,12 @@ namespace Orchard.Comments.Controllers {
                             _commentService.MarkCommentAsSpam(entry.Comment.Id);
                         }
                         break;
-                    case CommentIndexBulkAction.Pend:
+                    case CommentIndexBulkAction.Unapprove:
                         if (!Services.Authorizer.Authorize(Permissions.ManageComments, T("Couldn't moderate comment")))
                             return new HttpUnauthorizedResult();
                         //TODO: Transaction
                         foreach (CommentEntry entry in checkedEntries) {
-                            _commentService.PendComment(entry.Comment.Id);
+                            _commentService.UnapproveComment(entry.Comment.Id);
                         }
                         break;
                     case CommentIndexBulkAction.Approve:
@@ -194,12 +197,12 @@ namespace Orchard.Comments.Controllers {
                             _commentService.MarkCommentAsSpam(entry.Comment.Id);
                         }
                         break;
-                    case CommentDetailsBulkAction.Pend:
+                    case CommentDetailsBulkAction.Unapprove:
                         if (!Services.Authorizer.Authorize(Permissions.ManageComments, T("Couldn't moderate comment")))
                             return new HttpUnauthorizedResult();
 
                         foreach (CommentEntry entry in checkedEntries) {
-                            _commentService.PendComment(entry.Comment.Id);
+                            _commentService.UnapproveComment(entry.Comment.Id);
                         }
                         break;
                     case CommentDetailsBulkAction.Approve:
@@ -308,6 +311,75 @@ namespace Orchard.Comments.Controllers {
             }
         }
 
+        [HttpPost]
+        public ActionResult Approve(int id, string returnUrl) {
+            try {
+                if (!Services.Authorizer.Authorize(Permissions.ManageComments, T("Couldn't approve comment")))
+                    return new HttpUnauthorizedResult();
+
+                int commentedOn = _commentService.GetComment(id).Record.CommentedOn;
+                _commentService.ApproveComment(id);
+
+                if (!String.IsNullOrEmpty(returnUrl)) {
+                    return Redirect(returnUrl);
+                }
+                return RedirectToAction("Details", new { id = commentedOn });
+            }
+            catch (Exception exception) {
+                Services.Notifier.Error(T("Approving comment failed: " + exception.Message));
+                if (!String.IsNullOrEmpty(returnUrl)) {
+                    return Redirect(returnUrl);
+                }
+                return RedirectToAction("Index");
+            }
+        }
+
+        [HttpPost]
+        public ActionResult Unapprove(int id, string returnUrl) {
+            try {
+                if (!Services.Authorizer.Authorize(Permissions.ManageComments, T("Couldn't unapprove comment")))
+                    return new HttpUnauthorizedResult();
+
+                int commentedOn = _commentService.GetComment(id).Record.CommentedOn;
+                _commentService.UnapproveComment(id);
+
+                if (!String.IsNullOrEmpty(returnUrl)) {
+                    return Redirect(returnUrl);
+                }
+                return RedirectToAction("Details", new { id = commentedOn });
+            }
+            catch (Exception exception) {
+                Services.Notifier.Error(T("Unapproving comment failed: " + exception.Message));
+                if (!String.IsNullOrEmpty(returnUrl)) {
+                    return Redirect(returnUrl);
+                }
+                return RedirectToAction("Index");
+            }
+        }
+
+        [HttpPost]
+        public ActionResult MarkAsSpam(int id, string returnUrl) {
+            try {
+                if (!Services.Authorizer.Authorize(Permissions.ManageComments, T("Couldn't mark comment as spam")))
+                    return new HttpUnauthorizedResult();
+
+                int commentedOn = _commentService.GetComment(id).Record.CommentedOn;
+                _commentService.MarkCommentAsSpam(id);
+
+                if (!String.IsNullOrEmpty(returnUrl)) {
+                    return Redirect(returnUrl);
+                }
+                return RedirectToAction("Details", new { id = commentedOn });
+            }
+            catch (Exception exception) {
+                Services.Notifier.Error(T("Marking comment as spam failed: " + exception.Message));
+                if (!String.IsNullOrEmpty(returnUrl)) {
+                    return Redirect(returnUrl);
+                }
+                return RedirectToAction("Index");
+            }
+        }
+
         [HttpPost]
         public ActionResult Delete(int id, string returnUrl) {
             try {
@@ -334,7 +406,7 @@ namespace Orchard.Comments.Controllers {
         private CommentEntry CreateCommentEntry(CommentPartRecord commentPart) {
             return new CommentEntry {
                 Comment = commentPart,
-                CommentedOn = _commentService.GetDisplayForCommentedContent(commentPart.CommentedOn).DisplayText,
+                CommentedOn = _commentService.GetCommentedContent(commentPart.CommentedOn),
                 IsChecked = false,
             };
         }

src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj

@@ -110,8 +110,8 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
+    <Content Include="Styles\admin.css" />
     <Content Include="Views\Admin\Details.cshtml" />
-    <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
@@ -139,6 +139,7 @@
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

src/Orchard.Web/Modules/Orchard.Comments/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -32,3 +32,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs

@@ -65,6 +65,10 @@ namespace Orchard.Comments.Services {
             return _contentManager.GetItemMetadata(content);
         }
 
+        public ContentItem GetCommentedContent(int id) {
+            return _contentManager.Get(id);
+        }
+
         public CommentPart CreateComment(CreateCommentContext context, bool moderateComments) {
             var comment = _contentManager.Create<CommentPart>("Comment");
 
@@ -104,7 +108,7 @@ namespace Orchard.Comments.Services {
             commentPart.Record.Status = CommentStatus.Approved;
         }
 
-        public void PendComment(int commentId) {
+        public void UnapproveComment(int commentId) {
             CommentPart commentPart = GetComment(commentId);
             commentPart.Record.Status = CommentStatus.Pending;
         }

src/Orchard.Web/Modules/Orchard.Comments/Services/ICommentService.cs

@@ -9,10 +9,11 @@ namespace Orchard.Comments.Services {
         IContentQuery<CommentPart, CommentPartRecord> GetCommentsForCommentedContent(int id, CommentStatus status);
         CommentPart GetComment(int id);
         ContentItemMetadata GetDisplayForCommentedContent(int id);
+        ContentItem GetCommentedContent(int id);
         CommentPart CreateComment(CreateCommentContext commentRecord, bool moderateComments);
         void UpdateComment(int id, string name, string email, string siteName, string commentText, CommentStatus status);
         void ApproveComment(int commentId);
-        void PendComment(int commentId);
+        void UnapproveComment(int commentId);
         void MarkCommentAsSpam(int commentId);
         void DeleteComment(int commentId);
         bool CommentsClosedForCommentedContent(int id);

src/Orchard.Web/Modules/Orchard.Comments/Styles/admin.css

@@ -0,0 +1,3 @@
+table.items .actions {
+    white-space:nowrap;   
+}

src/Orchard.Web/Modules/Orchard.Comments/ViewModels/CommentsDetailsViewModel.cs

@@ -16,7 +16,7 @@ namespace Orchard.Comments.ViewModels {
 
     public enum CommentDetailsBulkAction {
         None,
-        Pend,
+        Unapprove,
         Approve,
         MarkAsSpam,
         Delete,

src/Orchard.Web/Modules/Orchard.Comments/ViewModels/CommentsIndexViewModel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Orchard.Comments.Models;
+using Orchard.ContentManagement;
 
 namespace Orchard.Comments.ViewModels {
     public class CommentsIndexViewModel {
@@ -10,7 +11,7 @@ namespace Orchard.Comments.ViewModels {
 
     public class CommentEntry {
         public CommentPartRecord Comment { get; set; }
-        public string CommentedOn { get; set; }
+        public ContentItem CommentedOn { get; set; }
         public bool IsChecked { get; set; }
     }
 
@@ -21,7 +22,7 @@ namespace Orchard.Comments.ViewModels {
 
     public enum CommentIndexBulkAction {
         None,
-        Pend,
+        Unapprove,
         Approve,
         MarkAsSpam,
         Delete

src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml

@@ -1,7 +1,12 @@
 @model Orchard.Comments.ViewModels.CommentsIndexViewModel
 @using Orchard.Comments.Models;
 @using Orchard.Comments.ViewModels;
-
+@using Orchard.Mvc.Html;
+@using Orchard.Utility.Extensions;
+@{
+    Style.Include("admin.css");
+    Script.Require("ShapesBase");
+}
 <h1>@Html.TitleForPage(T("Manage Comments").ToString())</h1>
 @using(Html.BeginFormAntiForgeryPost()) { 
 	@Html.ValidationSummary() 
@@ -10,7 +15,7 @@
         <select id="publishActions" name="@Html.NameOf(m => m.Options.BulkAction)">
             @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.None, T("Choose action...").ToString())
             @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Approve, T("Approve").ToString()) 
-            @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Pend, T("Pend").ToString())
+            @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Unapprove, T("Unapprove").ToString())
             @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.MarkAsSpam, T("Mark as Spam").ToString())
             @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Delete, T("Remove").ToString())
         </select>
@@ -35,7 +40,6 @@
 			    <col id="Col4" />
 			    <col id="Col5" />
 			    <col id="Col6" />
-			    <col id="Col7" />
 		    </colgroup>
 		    <thead>
 			    <tr>
@@ -43,39 +47,38 @@
 				    <th scope="col">@T("Status")</th>
 				    <th scope="col">@T("Author")</th>
 				    <th scope="col">@T("Comment")</th>
-				    <th scope="col">@T("Date")</th>
 				    <th scope="col">@T("Commented On")</th>
-			        <th scope="col"></th>
+			        <th scope="col">@T("Actions")</th>
 			    </tr>
 		    </thead>
             @{var commentIndex = 0;}
             @foreach (var commentEntry in Model.Comments) {
-            <tr>
+            <tr itemscope="itemscope" itemid="@Model.Comments[commentIndex].Comment.Id" itemtype="http://orchardproject.net/data/Comment">
                 <td>
                     <input type="hidden" value="@Model.Comments[commentIndex].Comment.Id" name="@Html.NameOf(m => m.Comments[commentIndex].Comment.Id)"/>
                     <input type="checkbox" value="true" name="@Html.NameOf(m => m.Comments[commentIndex].IsChecked)"/>
                 </td>
                 <td>
-                @if (commentEntry.Comment.Status == CommentStatus.Spam) { T("Spam"); } 
+                    @if (commentEntry.Comment.Status == CommentStatus.Spam) { @T("Spam") } 
-                       else if (commentEntry.Comment.Status == CommentStatus.Pending) { T("Pending"); } 
+                    else if (commentEntry.Comment.Status == CommentStatus.Pending) { @T("Pending") } 
-                       else { T("Approved"); }</td>
+                    else { @T("Approved") }
+                </td>
                 <td>@commentEntry.Comment.UserName</td>
                 <td>
-                @if (commentEntry.Comment.CommentText != null) {
+                    @* would ideally have permalinks for individual comments *@
-                    var text = commentEntry.Comment.CommentText.Length > 23 ? commentEntry.Comment.CommentText.Substring(0, 24) : (commentEntry.Comment.CommentText + T(" ..."));
+                    <p><a href="@Url.ItemDisplayUrl(commentEntry.CommentedOn)#comments"><time>@Html.DateTime(commentEntry.Comment.CommentDateUtc.GetValueOrDefault())</time></a></p>
-                    @text
+                    @if (commentEntry.Comment.CommentText != null) {
-                } 
+                        var ellipsized = Html.Ellipsize(commentEntry.Comment.CommentText, 500);
+                        var paragraphed = new HtmlString(ellipsized.ToHtmlString().Replace("\r\n", "</p><p>"));
+                        <p>@paragraphed</p>
+                    }
+                    else {
+                        @T("[Empty]")
+                    }
                 </td>
-                <td>@Html.DateTime(commentEntry.Comment.CommentDateUtc.GetValueOrDefault())</td>
+                <td>@Html.ItemDisplayLink(commentEntry.CommentedOn)</td>
-                <td>@Html.ActionLink(commentEntry.CommentedOn, "Details", new { id = commentEntry.Comment.CommentedOn })</td>
                 <td>
-                    <ul class="actions">
+                    <div class="actions">
                        @if (commentEntry.Comment.Status != CommentStatus.Spam) {
                            <a href="@Url.Action("MarkAsSpam", new {commentEntry.Comment.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="RemoveUrl UnsafeUrl">@T("Spam")</a>@T(" | ")
                        }
                        @if (commentEntry.Comment.Status != CommentStatus.Approved) {
                            <a href="@Url.Action("Approve", new {commentEntry.Comment.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="ApproveUrl UnsafeUrl">@T("Approve")</a>@T(" | ")
                        }
                        else {
                            <a href="@Url.Action("Unapprove", new {commentEntry.Comment.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="UnapproveUrl UnsafeUrl">@("Unapprove")</a>@T(" | ")
                        }
                        <a href="@Url.Action("Edit", new {commentEntry.Comment.Id})" title="@T("Edit")">@T("Edit")</a>@T(" | ")
                        <a href="@Url.Action("Delete", new {commentEntry.Comment.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="RemoveUrl UnsafeUrl">@T("Remove")</a>
                    </div>
                </td>
-                        <li class="construct">
-                            <a href="@Url.Action("Edit", new {commentEntry.Comment.Id})" title="@T("Edit")">@T("Edit")</a>
-                        </li>
-                        <li class="destruct"></li>
-                    </ul>
-                </td>
             </tr>
             commentIndex = commentIndex + 1;
             } 

src/Orchard.Web/Modules/Orchard.Comments/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.ContentQueries/Orchard.ContentQueries.csproj

@@ -54,7 +54,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Drivers\ContentQueryPartDriver.cs" />

src/Orchard.Web/Modules/Orchard.ContentQueries/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.ContentQueries/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-    <system.web>
-        <compilation debug="true" targetFramework="4.0">
-            <assemblies>
-                <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35, processorArchitecture=MSIL"/>
-            </assemblies>
-        </compilation>
-
-        <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-            <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>
-    </system.web>
-    <system.web.extensions/>
-    <runtime>
-        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-            <dependentAssembly>
-                <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-                <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-            </dependentAssembly>
-        </assemblyBinding>
-    </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj

@@ -117,13 +117,6 @@
     <Content Include="Views\EditorTemplates\TypePart.cshtml" />
     <Content Include="Views\EditorTemplates\TypeParts.cshtml" />
     <Content Include="Views\EditorTemplates\Settings.cshtml" />
-    <Content Include="Web.config" />
-    <Content Include="Web.Debug.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </Content>
-    <Content Include="Web.Release.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </Content>
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>

src/Orchard.Web/Modules/Orchard.ContentTypes/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs

@@ -73,7 +73,8 @@ namespace Orchard.ContentTypes.Services {
 
             var contentTypeDefinition = new ContentTypeDefinition(name, typeViewModel.DisplayName);
             _contentDefinitionManager.StoreTypeDefinition(contentTypeDefinition);
-            _contentDefinitionManager.AlterTypeDefinition(name, cfg => cfg.Creatable());
+            _contentDefinitionManager.AlterTypeDefinition(name,
+                cfg => cfg.Creatable().Draftable());
 
             return new EditTypeViewModel(contentTypeDefinition);
         }

src/Orchard.Web/Modules/Orchard.ContentTypes/Web.Debug.config

@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
-
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!--
-    In the example below, the "SetAttributes" transform will change the value of 
-    "connectionString" to use "ReleaseSQLServer" only when the "Match" locator 
-    finds an atrribute "name" that has a value of "MyDB".
-    
-    <connectionStrings>
-      <add name="MyDB" 
-        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True" 
-        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
-    </connectionStrings>
-  -->
-  <system.web>
-    <!--
-      In the example below, the "Replace" transform will replace the entire 
-      <customErrors> section of your web.config file.
-      Note that because there is only one customErrors section under the 
-      <system.web> node, there is no need to use the "xdt:Locator" attribute.
-      
-      <customErrors defaultRedirect="GenericError.htm"
-        mode="RemoteOnly" xdt:Transform="Replace">
-        <error statusCode="500" redirect="InternalError.htm"/>
-      </customErrors>
-    -->
-  </system.web>
-</configuration>

src/Orchard.Web/Modules/Orchard.ContentTypes/Web.Release.config

@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
-
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!--
-    In the example below, the "SetAttributes" transform will change the value of 
-    "connectionString" to use "ReleaseSQLServer" only when the "Match" locator 
-    finds an atrribute "name" that has a value of "MyDB".
-    
-    <connectionStrings>
-      <add name="MyDB" 
-        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True" 
-        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
-    </connectionStrings>
-  -->
-  <system.web>
-    <compilation xdt:Transform="RemoveAttributes(debug)" />
-    <!--
-      In the example below, the "Replace" transform will replace the entire 
-      <customErrors> section of your web.config file.
-      Note that because there is only one customErrors section under the 
-      <system.web> node, there is no need to use the "xdt:Locator" attribute.
-      
-      <customErrors defaultRedirect="GenericError.htm"
-        mode="RemoteOnly" xdt:Transform="Replace">
-        <error statusCode="500" redirect="InternalError.htm"/>
-      </customErrors>
-    -->
-  </system.web>
-</configuration>

src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj

@@ -78,7 +78,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
@@ -99,7 +98,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-      <Content Include="Placement.info" />
+    <Content Include="Placement.info" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

src/Orchard.Web/Modules/Orchard.Email/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.Email/Web.config

@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-	<system.web>
-		<compilation debug="true" targetFramework="4.0">
-			<assemblies>
-				<add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-			</assemblies>
-		</compilation>
-		<pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-			<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>
-	</system.web>
-	<system.web.extensions/>
-</configuration>

src/Orchard.Web/Modules/Orchard.Experimental/Orchard.Experimental.csproj

@@ -102,7 +102,6 @@
     <Content Include="Views\Home\Simple.cshtml" />
     <Content Include="Views\Home\_RenderableAction.cshtml" />
     <Content Include="Views\Metadata\Index.cshtml" />
-    <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>

src/Orchard.Web/Modules/Orchard.Experimental/Properties/AssemblyInfo.cs

@@ -1,5 +1,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -31,3 +32,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.Experimental/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj

@@ -55,7 +55,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />

src/Orchard.Web/Modules/Orchard.Indexing/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.Indexing/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj

@@ -92,7 +92,6 @@
     <Content Include="Content\Admin\images\folder.gif" />
     <Content Include="Module.txt" />
     <Content Include="Styles\admin.css" />
-    <Content Include="Web.config" />
     <Content Include="Content\Site.css" />
     <Content Include="Views\Web.config" />
   </ItemGroup>

src/Orchard.Web/Modules/Orchard.Media/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -32,3 +32,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.Media/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj

@@ -77,7 +77,6 @@
   <ItemGroup>
     <Content Include="Module.txt" />
     <Content Include="Views\DatabaseUpdate\Index.cshtml" />
-    <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup />

src/Orchard.Web/Modules/Orchard.Migrations/Properties/AssemblyInfo.cs

@@ -1,5 +1,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -31,3 +32,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.Migrations/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj

@@ -88,7 +88,6 @@
     <Content Include="Module.txt" />
     <Content Include="Views\Admin\Add.cshtml" />
     <Content Include="Views\Admin\Index.cshtml" />
-    <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">

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

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.Modules/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj

@@ -91,7 +91,6 @@
     <Content Include="Views\Admin\DisplayTemplates\ActionsForInvalid.cshtml" />
     <Content Include="Views\Admin\DisplayTemplates\ActionsForRunning.cshtml" />
     <Content Include="Views\Admin\Index.cshtml" />
-    <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>

src/Orchard.Web/Modules/Orchard.MultiTenancy/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj

@@ -116,9 +116,6 @@
       <Name>Orchard.Framework</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Web.config" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="Views\Gallery\Themes.cshtml" />
   </ItemGroup>

src/Orchard.Web/Modules/Orchard.Packaging/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.Packaging/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.PublishLater/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -32,3 +32,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj

@@ -95,7 +95,6 @@
     <Content Include="Views\Admin\Edit.cshtml" />
     <Content Include="Views\Admin\Index.cshtml" />
     <Content Include="Views\EditorTemplates\Parts\Roles.UserRoles.cshtml" />
-    <Content Include="Web.config" />
     <Content Include="Content\Site.css" />
     <Content Include="Views\Web.config" />
   </ItemGroup>

src/Orchard.Web/Modules/Orchard.Roles/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -32,3 +32,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.Roles/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj

@@ -96,9 +96,6 @@
     <Content Include="Styles\search.css" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Web.config" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="Views\EditorTemplates\Parts\Search.SiteSettings.cshtml" />
     <Content Include="Views\Search\Index.cshtml" />

src/Orchard.Web/Modules/Orchard.Search/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.Search/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj

@@ -87,7 +87,6 @@
     <Content Include="Views\Setup\Index.cshtml">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">

src/Orchard.Web/Modules/Orchard.Setup/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -32,3 +32,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.Setup/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj

@@ -92,7 +92,6 @@
   <ItemGroup>
     <Content Include="Module.txt" />
     <Content Include="Views\Admin\Create.cshtml" />
-    <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
     <Content Include="Views\Admin\Edit.cshtml" />
     <Content Include="Views\Admin\Index.cshtml" />

src/Orchard.Web/Modules/Orchard.Tags/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -32,3 +32,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.Tags/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj

@@ -95,7 +95,6 @@
     <Content Include="Views\Admin\Index.cshtml" />
     <Content Include="Views\Admin\Install.cshtml" />
     <Content Include="Views\ThemePreview.cshtml" />
-    <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />

src/Orchard.Web/Modules/Orchard.Themes/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.Themes/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj

@@ -109,7 +109,6 @@
     <Content Include="Views\Admin\Create.cshtml" />
     <Content Include="Views\Admin\Index.cshtml" />
     <Content Include="Views\EditorTemplates\Parts\Users.RegistrationSettings.cshtml" />
-    <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>

src/Orchard.Web/Modules/Orchard.Users/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -32,3 +32,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.Users/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

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

@@ -94,7 +94,6 @@
     <Content Include="Content\Admin\images\movedown.gif" />
     <Content Include="Module.txt" />
     <Content Include="Styles\admin.css" />
-    <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>

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

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

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

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj

@@ -93,7 +93,6 @@
     <Content Include="Styles\jquery-ui-1.7.2.custom.css" />
     <Content Include="Styles\ui.datepicker.css" />
     <Content Include="Styles\ui.timepickr.css" />
-    <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">

src/Orchard.Web/Modules/Orchard.jQuery/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -32,3 +32,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/Orchard.jQuery/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/TinyMce/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -32,3 +32,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web/Modules/TinyMce/TinyMce.csproj

@@ -157,7 +157,6 @@
     <Content Include="Scripts\plugins\searchreplace\js\searchreplace.js" />
     <Content Include="Scripts\plugins\searchreplace\langs\en_dlg.js" />
     <Content Include="Scripts\plugins\searchreplace\searchreplace.htm" />
-    <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Scripts\Web.config">

src/Orchard.Web/Modules/TinyMce/Web.config

@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0">
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-      </assemblies>
-    </compilation>
-
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <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>
-  </system.web>
-  <system.web.extensions/>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Themes/TheAdmin/Styles/site.css

@@ -689,6 +689,7 @@ table.items thead, table.items th {
 	font-weight:700;
 	overflow:hidden;
 	text-align:left;
+	white-space:nowrap;
 }
 /* todo: (heskew) hook back up */
 table.items tr.hover {
@@ -703,6 +704,10 @@ table.items th, table.items td {
 	padding:8px 12px;
 	vertical-align:middle;
 }
+table.items td 
+{
+    vertical-align:top;
+}
 /* todo: Find a better way to do this. These are a fix for buttons and label fonts becomming too large in a table.*/
 table label {
     font-size:1em;
@@ -711,7 +716,6 @@ table .button {
     font-size:1em;
 }
 
-
 /* Content item lists
 ----------------------------------------------------------*/
 .contentItems {

src/Orchard/Caching/Weak.cs

@@ -1,23 +1,20 @@
 using System;
-using System.Runtime.Serialization;
 
 namespace Orchard.Caching {
-    public class Weak<T> : WeakReference {
+    public class Weak<T> {
-        public Weak(T target)
+        private readonly WeakReference _target;
-            : base(target) {
+
+        public Weak(T target) {
+            _target = new WeakReference(target);
         }
 
-        public Weak(T target, bool trackResurrection)
+        public Weak(T target, bool trackResurrection) {
-            : base(target, trackResurrection) {
+            _target = new WeakReference(target, trackResurrection);
         }
 
-        protected Weak(SerializationInfo info, StreamingContext context)
+        public T Target {
-            : base(info, context) {
+            get { return (T)_target.Target; }
-        }
+            set { _target.Target = value; }
-
-        public new T Target {
-            get { return (T)base.Target; }
-            set { base.Target = value; }
         }
     }
-}
+}

src/Orchard/Environment/IHostEnvironment.cs

@@ -36,7 +36,7 @@ namespace Orchard.Environment {
         }
 
         public bool IsAssemblyLoaded(string name) {
-            return AppDomain.CurrentDomain.GetAssemblies().Any(a => a.GetName().Name == name);
+            return AppDomain.CurrentDomain.GetAssemblies().Any(a => a.FullName.Contains(name));
         }
 
         public void RestartAppDomain() {

src/Orchard/Logging/LoggingModule.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Security;
+using System.Security.Permissions;
 using Autofac;
 using Autofac.Core;
 using Castle.Core.Logging;
@@ -14,11 +16,17 @@ namespace Orchard.Logging {
             // by default, use Orchard's logger that delegates to Castle's logger factory
             moduleBuilder.RegisterType<CastleLoggerFactory>().As<ILoggerFactory>().InstancePerLifetimeScope();
 
-            // by default, use Castle's TraceSource based logger factory
+            try {
-            moduleBuilder.RegisterType<TraceLoggerFactory>().As<Castle.Core.Logging.ILoggerFactory>().InstancePerLifetimeScope();
+                // by default, use Castle's TraceSource based logger factory
+                new SecurityPermission(SecurityPermissionFlag.ControlEvidence | SecurityPermissionFlag.ControlPolicy).Demand();
+                moduleBuilder.RegisterType<TraceLoggerFactory>().As<Castle.Core.Logging.ILoggerFactory>().InstancePerLifetimeScope();
+            } catch (SecurityException) {
+                // if security model does not allow it, fall back to null logger factory
+                moduleBuilder.RegisterType<NullLogFactory>().As<Castle.Core.Logging.ILoggerFactory>().InstancePerLifetimeScope();
+            }
 
             // call CreateLogger in response to the request for an ILogger implementation
-            moduleBuilder.Register((ctx, ps) => CreateLogger(ctx, ps)).As<ILogger>().InstancePerDependency();
+            moduleBuilder.Register(CreateLogger).As<ILogger>().InstancePerDependency();
         }
 
         protected override void AttachToComponentRegistration(IComponentRegistry componentRegistry, IComponentRegistration registration) {
@@ -70,4 +78,4 @@ namespace Orchard.Logging {
             return loggerFactory.CreateLogger(containingType);
         }
     }
-}
+}

src/Orchard/Mvc/Html/ContentItemExtensions.cs

@@ -48,6 +48,26 @@ namespace Orchard.Mvc.Html {
                 metadata.EditorRouteValues.Merge(additionalRouteValues));
         }
 
+        public static string ItemDisplayUrl(this UrlHelper urlHelper, IContent content) {
+            var metadata = content.ContentItem.ContentManager.GetItemMetadata(content);
+            if (metadata.DisplayRouteValues == null)
+                return null;
+
+            return urlHelper.Action(
+                Convert.ToString(metadata.DisplayRouteValues["action"]),
+                metadata.DisplayRouteValues);
+        }
+
+        public static string ItemEditUrl(this UrlHelper urlHelper, IContent content) {
+            var metadata = content.ContentItem.ContentManager.GetItemMetadata(content);
+            if (metadata.DisplayRouteValues == null)
+                return null;
+
+            return urlHelper.Action(
+                Convert.ToString(metadata.EditorRouteValues["action"]),
+                metadata.EditorRouteValues);
+        }
+
         private static string NonNullOrEmpty(params string[] values) {
             foreach (var value in values) {
                 if (!string.IsNullOrEmpty(value))

src/Orchard/Mvc/Html/HtmlHelperExtensions.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
@@ -9,7 +8,6 @@ using System.Web.Mvc.Html;
 using System.Web.Routing;
 using Orchard.Collections;
 using Orchard.Localization;
-using Orchard.Services;
 using Orchard.Settings;
 using Orchard.Utility;
 using Orchard.Utility.Extensions;
@@ -195,6 +193,18 @@ namespace Orchard.Mvc.Html {
 
         #endregion
 
+        #region Ellipsize
+
+        public static IHtmlString Ellipsize(this HtmlHelper htmlHelper, string text, int characterCount) {
+            return new HtmlString(htmlHelper.Encode(text).Ellipsize(characterCount));
+        }
+
+        public static IHtmlString Ellipsize(this HtmlHelper htmlHelper, string text, int characterCount, string ellipsis) {
+            return new HtmlString(htmlHelper.Encode(text).Ellipsize(characterCount, ellipsis));
+        }
+
+        #endregion
+
         #region Excerpt
 
         public static MvcHtmlString Excerpt(this HtmlHelper html, string markup, int length) {

src/Orchard/Properties/AssemblyInfo.cs

@@ -1,5 +1,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -36,3 +37,4 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("0.8.0")]
 [assembly: AssemblyFileVersion("0.8.0")]
+[assembly: AllowPartiallyTrustedCallers]