Merge

--HG-- branch : dev
2025-12-02 19:44:02 +08:00 · 2010-10-15 16:00:44 -07:00
parent b7a8219874 2733255b3d
commit 80c96fa5b5
15 changed files with 162 additions and 289 deletions
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
@@ -80,6 +80,10 @@
    <Compile Include="Services\IContentDefinitionService.cs" />
    <Compile Include="ViewModels\AddFieldViewModel.cs" />
    <Compile Include="ViewModels\CreatePartViewModel.cs" />
+    <Compile Include="ViewModels\EditFieldViewModel.cs" />
+    <Compile Include="ViewModels\EditPartFieldViewModel.cs" />
+    <Compile Include="ViewModels\EditPartViewModel.cs" />
+    <Compile Include="ViewModels\EditTypePartViewModel.cs" />
    <Compile Include="ViewModels\ListContentPartsViewModel.cs" />
    <Compile Include="ViewModels\RemoveFieldViewModel.cs" />
    <Compile Include="ViewModels\RemovePartViewModel.cs" />
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditFieldViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditFieldViewModel.cs
@@ -0,0 +1,16 @@
+using Orchard.ContentManagement.MetaData.Models;
+
+namespace Orchard.ContentTypes.ViewModels {
+
+    public class EditFieldViewModel {
+        public EditFieldViewModel() { }
+
+        public EditFieldViewModel(ContentFieldDefinition contentFieldDefinition) {
+            Name = contentFieldDefinition.Name;
+            _Definition = contentFieldDefinition;
+        }
+
+        public string Name { get; set; }
+        public ContentFieldDefinition _Definition { get; private set; }
+    }
+}
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditPartFieldViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditPartFieldViewModel.cs
@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using Orchard.ContentManagement.MetaData.Models;
+using Orchard.ContentManagement.ViewModels;
+
+namespace Orchard.ContentTypes.ViewModels {
+    public class EditPartFieldViewModel {
+
+        public EditPartFieldViewModel() {
+            Settings = new SettingsDictionary();
+        }
+
+        public EditPartFieldViewModel(int index, ContentPartFieldDefinition field) {
+            Index = index;
+            Name = field.Name;
+            FieldDefinition = new EditFieldViewModel(field.FieldDefinition);
+            Settings = field.Settings;
+            _Definition = field;
+        }
+
+        public int Index { get; set; }
+        public string Prefix { get { return "Fields[" + Index + "]"; } }
+        public EditPartViewModel Part { get; set; }
+
+        public string Name { get; set; }
+        public IEnumerable<TemplateViewModel> Templates { get; set; }
+        public EditFieldViewModel FieldDefinition { get; set; }
+        public SettingsDictionary Settings { get; set; }
+        public ContentPartFieldDefinition _Definition { get; private set; }
+    }
+}
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditPartViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditPartViewModel.cs
@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Linq;
+using Orchard.ContentManagement.MetaData.Models;
+using Orchard.ContentManagement.ViewModels;
+using Orchard.Utility.Extensions;
+using Orchard.ContentTypes.Extensions;
+
+namespace Orchard.ContentTypes.ViewModels {
+    public class EditPartViewModel {
+        public EditPartViewModel() {
+            Fields = new List<EditPartFieldViewModel>();
+            Settings = new SettingsDictionary();
+        }
+
+        public EditPartViewModel(ContentPartDefinition contentPartDefinition) {
+            Name = contentPartDefinition.Name;
+            Fields = contentPartDefinition.Fields.Select((f, i) => new EditPartFieldViewModel(i, f) { Part = this }).ToList();
+            Settings = contentPartDefinition.Settings;
+            _Definition = contentPartDefinition;
+        }
+
+        public string Prefix { get { return "PartDefinition"; } }
+        public string Name { get; set; }
+        private string _displayName;
+        public string DisplayName {
+            get { return !string.IsNullOrWhiteSpace(_displayName) ? _displayName : Name.TrimEnd("Part").CamelFriendly(); }
+            set { _displayName = value; }
+        }
+        public IEnumerable<TemplateViewModel> Templates { get; set; }
+        public IEnumerable<EditPartFieldViewModel> Fields { get; set; }
+        public SettingsDictionary Settings { get; set; }
+        public ContentPartDefinition _Definition { get; private set; }
+    }
+}
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypePartViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypePartViewModel.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using Orchard.ContentManagement.MetaData.Models;
+using Orchard.ContentManagement.ViewModels;
+
+namespace Orchard.ContentTypes.ViewModels {
+    public class EditTypePartViewModel {
+        public EditTypePartViewModel() {
+            Settings = new SettingsDictionary();
+        }
+
+        public EditTypePartViewModel(int index, ContentTypePartDefinition part) {
+            Index = index;
+            PartDefinition = new EditPartViewModel(part.PartDefinition);
+            Settings = part.Settings;
+            _Definition = part;
+        }
+
+        public int Index { get; set; }
+        public string Prefix { get { return "Parts[" + Index + "]"; } }
+        public EditPartViewModel PartDefinition { get; set; }
+        public SettingsDictionary Settings { get; set; }
+        public EditTypeViewModel Type { get; set; }
+        public IEnumerable<TemplateViewModel> Templates { get; set; }
+        public ContentTypePartDefinition _Definition { get; private set; }
+    }
+}
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs
@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using Orchard.ContentManagement.MetaData.Models;
 using Orchard.ContentManagement.ViewModels;
-using Orchard.ContentTypes.Extensions;
-using Orchard.Utility.Extensions;

 namespace Orchard.ContentTypes.ViewModels {
    public class EditTypeViewModel  {
@@ -46,87 +44,4 @@ namespace Orchard.ContentTypes.ViewModels {
        }
    }

-    public class EditTypePartViewModel {
-        public EditTypePartViewModel() {
-            Settings = new SettingsDictionary();
-        }
-
-        public EditTypePartViewModel(int index, ContentTypePartDefinition part) {
-            Index = index;
-            PartDefinition = new EditPartViewModel(part.PartDefinition);
-            Settings = part.Settings;
-            _Definition = part;
-        }
-
-        public int Index { get; set; }
-        public string Prefix { get { return "Parts[" + Index + "]"; } }
-        public EditPartViewModel PartDefinition { get; set; }
-        public SettingsDictionary Settings { get; set; }
-        public EditTypeViewModel Type { get; set; }
-        public IEnumerable<TemplateViewModel> Templates { get; set; }
-        public ContentTypePartDefinition _Definition { get; private set; }
-    }
-
-    public class EditPartViewModel {
-        public EditPartViewModel() {
-            Fields = new List<EditPartFieldViewModel>();
-            Settings = new SettingsDictionary();
-        }
-
-        public EditPartViewModel(ContentPartDefinition contentPartDefinition) {
-            Name = contentPartDefinition.Name;
-            Fields = contentPartDefinition.Fields.Select((f, i) => new EditPartFieldViewModel(i, f) { Part = this }).ToList();
-            Settings = contentPartDefinition.Settings;
-            _Definition = contentPartDefinition;
-        }
-
-        public string Prefix { get { return "PartDefinition"; } }
-        public string Name { get; set; }
-        private string _displayName;
-        public string DisplayName {
-            get { return !string.IsNullOrWhiteSpace(_displayName) ? _displayName : Name.TrimEnd("Part").CamelFriendly(); }
-            set { _displayName = value; }
-        }
-        public IEnumerable<TemplateViewModel> Templates { get; set; }
-        public IEnumerable<EditPartFieldViewModel> Fields { get; set; }
-        public SettingsDictionary Settings { get; set; }
-        public ContentPartDefinition _Definition { get; private set; }
-    }
-
-    public class EditPartFieldViewModel {
-
-        public EditPartFieldViewModel() {
-            Settings = new SettingsDictionary();
-        }
-
-        public EditPartFieldViewModel(int index, ContentPartFieldDefinition field) {
-            Index = index;
-            Name = field.Name;
-            FieldDefinition = new EditFieldViewModel(field.FieldDefinition);
-            Settings = field.Settings;
-            _Definition = field;
-        }
-
-        public int Index { get; set; }
-        public string Prefix { get { return "Fields[" + Index + "]"; } }
-        public EditPartViewModel Part { get; set; }
-
-        public string Name { get; set; }
-        public IEnumerable<TemplateViewModel> Templates { get; set; }
-        public EditFieldViewModel FieldDefinition { get; set; }
-        public SettingsDictionary Settings { get; set; }
-        public ContentPartFieldDefinition _Definition { get; private set; }
-    }
-
-    public class EditFieldViewModel {
-        public EditFieldViewModel() { }
-
-        public EditFieldViewModel(ContentFieldDefinition contentFieldDefinition) {
-            Name = contentFieldDefinition.Name;
-            _Definition = contentFieldDefinition;
-        }
-
-        public string Name { get; set; }
-        public ContentFieldDefinition _Definition { get; private set; }
-    }
 }
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.cshtml
@@ -1,4 +1,5 @@
@model Orchard.ContentTypes.ViewModels.EditPartViewModel
+@{ Style.Require("ContentTypesAdmin"); }

 <h1>@Html.TitleForPage(T("Edit Part").ToString())</h1>
 <p class="breadcrumb">@Html.ActionLink(T("Content Types").Text, "index")@T(" &#62; ")@Html.ActionLink(T("Content Parts").Text, "listparts")@T(" &#62; ")@T("Edit Part")</p>
@@ -6,19 +7,30 @@
    @Html.ValidationSummary()
    <fieldset>
        <label for="Name">@T("Name")</label>
-        @* has unintended consequences (renamging the part) - changing the name creates a new part of that name  *@
+        @* has unintended consequences (renaming the part) - changing the name creates a new part of that name  *@
        @Html.TextBoxFor(m => m.Name, new {@class = "textMedium", disabled = "disabled"})
        @Html.HiddenFor(m => m.Name)
    </fieldset>
    <div class="manage-part">
        <div class="settings">
-        @DisplayChildren(Model.Templates)
+        @{ Html.RenderTemplates(Model.Templates); }
        </div>
        <h2>@T("Fields")</h2>
        <div class="manage add-to-type">@Html.ActionLink(T("Add").Text, "AddFieldTo", new { area = "Orchard.ContentTypes", id = Model.Name }, new { @class = "button" })</div>
-        @DisplayChildren(Model.Fields)
+        @Html.EditorFor(m => m.Fields, "Fields", "")
    </div>
    <fieldset class="action">
        <button class="primaryAction" type="submit">@T("Save")</button>
    </fieldset>
 }
+
+@using(Script.Foot()){
+<script type="text/javascript">
+//<![CDATA[
+    (function ($) {
+        $(".manage-field h3,.manage-part h3").expandoControl(function (controller) { return controller.nextAll(".details"); }, { collapse: true, remember: false });
+        $(".manage-field h4").expandoControl(function (controller) { return controller.nextAll(".settings"); }, { collapse: true, remember: false });
+    })(jQuery);
+//]]>
+</script>
+}
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartField.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartField.cshtml
@@ -1,7 +1,7 @@
@model Orchard.ContentTypes.ViewModels.EditPartFieldViewModel
    <fieldset class="manage-field">
        <h4>@Model.Name <span>(@Model.FieldDefinition.Name)</span></h4>@if (Model.Templates.Any()) {
-        <div class="settings">@Html.RenderTemplates(Model.Templates);
+        <div class="settings">@{Html.RenderTemplates(Model.Templates);}
        </div>}
        @Html.HiddenFor(m => m.Name)@Html.HiddenFor(m => m.FieldDefinition.Name)@Html.HiddenFor(m => m.Index)
    </fieldset>
--- a/src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesPartDriver.cs
@@ -18,6 +18,7 @@ namespace Orchard.Roles.Drivers {
        private readonly INotifier _notifier;
        private readonly IAuthenticationService _authenticationService;
        private readonly IAuthorizationService _authorizationService;
+        private const string TemplateName = "Parts/Roles.UserRoles";

        public UserRolesPartDriver(
            IRepository<UserRolesPartRecord> userRolesRepository, 
@@ -46,20 +47,19 @@ namespace Orchard.Roles.Drivers {
            if (!_authorizationService.TryCheckAccess(Permissions.ApplyRoles, _authenticationService.GetAuthenticatedUser(), userRolesPart))
                return null;

-            var roles =
-                _roleService.GetRoles().Select(
-                    x => new UserRoleEntry {
-                                               RoleId = x.Id,
-                                               Name = x.Name,
-                                               Granted = userRolesPart.Roles.Contains(x.Name)
-                                           });
-
-            var model = new UserRolesViewModel {
-                                                   User = userRolesPart.As<IUser>(),
-                                                   UserRoles = userRolesPart,
-                                                   Roles = roles.ToList(),
-                                               };
-            return ContentPartTemplate(model, "Parts/Roles.UserRoles");
+            return ContentShape("Parts_Roles_UserRoles_Edit",
+                    () => {
+                       var roles =_roleService.GetRoles().Select(x => new UserRoleEntry {
+                                                                          RoleId = x.Id,
+                                                                          Name = x.Name,
+                                                                          Granted = userRolesPart.Roles.Contains(x.Name)});
+                       var model = new UserRolesViewModel {
+                           User = userRolesPart.As<IUser>(),
+                           UserRoles = userRolesPart,
+                           Roles = roles.ToList(),
+                       };
+                       return shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix);
+                    });
        }

        protected override DriverResult Editor(UserRolesPart userRolesPart, IUpdateModel updater, dynamic shapeHelper) {
@@ -67,29 +67,26 @@ namespace Orchard.Roles.Drivers {
            if (!_authorizationService.TryCheckAccess(Permissions.ApplyRoles, _authenticationService.GetAuthenticatedUser(), userRolesPart))
                return null;

-            var model = new UserRolesViewModel {
-                                                   User = userRolesPart.As<IUser>(),
-                                                   UserRoles = userRolesPart,
-                                               };
-
+            var model = BuildEditorViewModel(userRolesPart);
            if (updater.TryUpdateModel(model, Prefix, null, null)) {
-
                var currentUserRoleRecords = _userRolesRepository.Fetch(x => x.UserId == model.User.Id);
                var currentRoleRecords = currentUserRoleRecords.Select(x => x.Role);
                var targetRoleRecords = model.Roles.Where(x => x.Granted).Select(x => _roleService.GetRole(x.RoleId));
-
                foreach (var addingRole in targetRoleRecords.Where(x => !currentRoleRecords.Contains(x))) {
                    _notifier.Warning(T("Adding role {0} to user {1}", addingRole.Name, userRolesPart.As<IUser>().UserName));
                    _userRolesRepository.Create(new UserRolesPartRecord { UserId = model.User.Id, Role = addingRole });
                }
-
                foreach (var removingRole in currentUserRoleRecords.Where(x => !targetRoleRecords.Contains(x.Role))) {
                    _notifier.Warning(T("Removing role {0} from user {1}", removingRole.Role.Name, userRolesPart.As<IUser>().UserName));
                    _userRolesRepository.Delete(removingRole);
                }
-
            }
-            return ContentPartTemplate(model, "Parts/Roles.UserRoles");
+            return ContentShape("Parts_Roles_UserRoles_Edit",
+                                () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
+        }
+
+        private static UserRolesViewModel BuildEditorViewModel(UserRolesPart userRolesPart) {
+            return new UserRolesViewModel { User = userRolesPart.As<IUser>(), UserRoles = userRolesPart };
        }
    }
 }
--- a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
@@ -39,6 +39,7 @@
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
    <Reference Include="System" />
    <Reference Include="System.Data" />
    <Reference Include="System.ComponentModel.DataAnnotations">
@@ -108,6 +109,9 @@
      <Name>Orchard.Core</Name>
    </ProjectReference>
  </ItemGroup>
+  <ItemGroup>
+    <None Include="Placement.info" />
+  </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. 
--- a/src/Orchard.Web/Modules/Orchard.Roles/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Placement.info
@@ -0,0 +1,3 @@
+<Placement>
+    <Place Parts_Roles_UserRoles_Edit="Primary:10"/>
+</Placement>
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -125,29 +125,9 @@
    <Content Include="Default.aspx" />
    <Content Include="Global.asax" />
    <Content Include="Refresh.html" />
-    <None Include="Themes\Classic\Placement.info">
-      <SubType>Designer</SubType>
-    </None>
-    <Content Include="Themes\Contoso\Styles\search.css" />
-    <Content Include="Themes\Contoso\Zones\Footer.html" />
-    <Content Include="Themes\Corporate\Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" />
-    <Content Include="Themes\Green\Views\Orchard.Search\Search\Index.ascx" />
-    <Content Include="Themes\TheAdmin\Scripts\admin.js" />
-    <Content Include="Themes\TheAdmin\Styles\ie.css" />
-    <Content Include="Themes\TheAdmin\Styles\images\menuClosed.gif" />
-    <Content Include="Themes\TheAdmin\Styles\images\menuClosedHover.gif" />
-    <Content Include="Themes\TheAdmin\Styles\images\menuOpen.gif" />
-    <Content Include="Themes\TheAdmin\Styles\images\menuOpenHover.gif" />
-    <Content Include="Themes\TheThemeMachine\draft.html" />
-    <Content Include="Themes\TheThemeMachine\Styles\Site.css" />
-    <Content Include="Themes\TheThemeMachine\Theme.png" />
-    <Content Include="Themes\TheThemeMachine\Theme.txt" />
-    <None Include="Themes\Classic\App_Data\Localization\fr-FR\orchard.theme.po" />
-    <Content Include="Themes\TheThemeMachine\Views\Items\Widget-HtmlWidget.cshtml" />
    <Content Include="Web.config">
      <SubType>Designer</SubType>
    </Content>
-    <Content Include="Themes\TheThemeMachine\Views\User.cshtml" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Orchard\Orchard.Framework.csproj">
@@ -167,163 +147,12 @@
    <Content Include="Config\Diagnostics.config">
      <SubType>Designer</SubType>
    </Content>
-    <Content Include="Themes\TheAdmin\Styles\images\icons.png" />
-    <Content Include="Themes\TheAdmin\Styles\images\tableHeaderBackgroundRed.gif" />
-    <Content Include="Themes\TheAdmin\Styles\site.css" />
-    <Content Include="Themes\TheAdmin\Theme.txt" />
-    <Content Include="Themes\SafeMode\Views\Document.cshtml" />
-    <Content Include="Themes\TheAdmin\Views\Layout.cshtml" />
  </ItemGroup>
  <ItemGroup>
    <Content Include="Config\Sample.Host.config" />
-    <Content Include="Themes\ClassicDark\Views\Footer.cshtml" />
-    <Content Include="Themes\ClassicDark\Views\Layout.cshtml" />
-    <None Include="Themes\TheAdmin\Styles\images\icons.psd" />
-    <Content Include="Themes\ClassicDark\Content\Images\bodyBackgroundgrey.gif" />
-    <Content Include="Themes\ClassicDark\Content\Images\sidebarBackground.gif" />
-    <Content Include="Themes\ClassicDark\Styles\blog.css" />
-    <Content Include="Themes\ClassicDark\Styles\site.css" />
-    <Content Include="Themes\ClassicDark\Theme.png" />
-    <Content Include="Themes\ClassicDark\Theme.txt" />
-    <Content Include="Themes\ClassicDark\Zones\Sidebar.html" />
-    <Content Include="Themes\Classic\Content\Images\sidebarBackground.gif" />
-    <Content Include="Themes\Classic\Zones\Sidebar.html" />
-    <Content Include="Themes\Classic\Styles\blog.css" />
-    <Content Include="Themes\Classic\Styles\site.css" />
-    <Content Include="Themes\Classic\Theme.png" />
-    <Content Include="Themes\Classic\Theme.txt" />
-    <Content Include="Themes\Classic\Views\Footer.cshtml" />
-    <Content Include="Themes\Classic\Views\Layout.cshtml" />
-    <Content Include="Themes\Contoso\Content\Images\bkg.jpg" />
-    <Content Include="Themes\Contoso\Content\Images\comment-arrow.png" />
-    <Content Include="Themes\Contoso\Content\Images\content-bkg.png" />
-    <Content Include="Themes\Contoso\Content\Images\content-bottom.png" />
-    <Content Include="Themes\Contoso\Content\Images\content-top.png" />
-    <Content Include="Themes\Contoso\Content\Images\feature-bkg-bottom.png" />
-    <Content Include="Themes\Contoso\Content\Images\feature-bkg-top.png" />
-    <Content Include="Themes\Contoso\Content\Images\Gallery\feature01.jpg" />
-    <Content Include="Themes\Contoso\Content\Images\Gallery\feature02.jpg" />
-    <Content Include="Themes\Contoso\Content\Images\Gallery\feature03.jpg" />
-    <Content Include="Themes\Contoso\Content\Images\icon-location.png" />
-    <Content Include="Themes\Contoso\Content\Images\menu-divider.png" />
-    <Content Include="Themes\Contoso\Content\Images\menu-hover-left.png" />
-    <Content Include="Themes\Contoso\Content\Images\menu-hover.png" />
-    <Content Include="Themes\Contoso\Content\Images\menu-left.png" />
-    <Content Include="Themes\Contoso\Content\Images\menu-right.png" />
-    <Content Include="Themes\Contoso\Content\Images\nav-arrow-left.png" />
-    <Content Include="Themes\Contoso\Content\Images\nav-arrow-right.png" />
-    <Content Include="Themes\Contoso\Content\Images\sub-header.png" />
-    <Content Include="Themes\Contoso\Zones\Sidebar-w2.html" />
-    <Content Include="Themes\Contoso\Zones\Sidebar-w3.html" />
-    <Content Include="Themes\Contoso\Zones\Highlights.html" />
-    <Content Include="Themes\Contoso\Zones\Home-Headline.html" />
-    <Content Include="Themes\Contoso\Zones\Home-Hero-Gallery.html" />
-    <Content Include="Themes\Contoso\Zones\Home-Hero.html" />
-    <Content Include="Themes\Contoso\Zones\Sidebar-w1.html" />
-    <Content Include="Themes\Contoso\Scripts\easySlider.js" />
-    <Content Include="Themes\Contoso\Styles\site.css" />
-    <Content Include="Themes\Contoso\Theme.png" />
-    <Content Include="Themes\Contoso\Theme.txt" />
-    <Content Include="Themes\Corporate\Content\Images\bkg.jpg" />
-    <Content Include="Themes\Corporate\Content\Images\consult-bkg.png" />
-    <Content Include="Themes\Corporate\Content\Images\content-bkg.png" />
-    <Content Include="Themes\Corporate\Content\Images\content-bottom.png" />
-    <Content Include="Themes\Corporate\Content\Images\content-top.png" />
-    <Content Include="Themes\Corporate\Content\Images\footer-bkg.jpg" />
-    <Content Include="Themes\Corporate\Content\Images\footer-bkg.png" />
-    <Content Include="Themes\Corporate\Content\Images\hm-divider.png" />
-    <Content Include="Themes\Corporate\Content\Images\hm-header.png" />
-    <Content Include="Themes\Corporate\Content\Images\icons\icon-5.png" />
-    <Content Include="Themes\Corporate\Content\Images\icons\icon-4.png" />
-    <Content Include="Themes\Corporate\Content\Images\icons\icon-3.png" />
-    <Content Include="Themes\Corporate\Content\Images\icons\icon-2.png" />
-    <Content Include="Themes\Corporate\Content\Images\icons\icon-1.png" />
-    <Content Include="Themes\Corporate\Content\Images\jumping-people.jpg" />
-    <Content Include="Themes\Corporate\Content\Images\logo.png" />
-    <Content Include="Themes\Corporate\Content\Images\menu-left-over.png" />
-    <Content Include="Themes\Corporate\Content\Images\menu-left.png" />
-    <Content Include="Themes\Corporate\Content\Images\menu-right-over.png" />
-    <Content Include="Themes\Corporate\Content\Images\menu-right.png" />
-    <Content Include="Themes\Corporate\Content\Images\menu_bkg.jpg" />
-    <Content Include="Themes\Corporate\Content\Images\notepad.png" />
-    <Content Include="Themes\Corporate\Scripts\easySlider.js" />
-    <Content Include="Themes\Corporate\Styles\site.css" />
-    <Content Include="Themes\Corporate\Theme.png" />
-    <Content Include="Themes\Corporate\Theme.txt" />
-    <Content Include="Themes\Corporate\Views\DisplayTemplates\Items\Blogs.Blog.ascx" />
-    <Content Include="Themes\Corporate\Views\DisplayTemplates\Items\Blogs.BlogPost.ascx" />
-    <Content Include="Themes\Corporate\Views\DisplayTemplates\Items\Blogs.BlogPost.ListByArchive.ascx" />
-    <Content Include="Themes\Corporate\Views\DisplayTemplates\Items\Contents.Item.ascx" />
-    <Content Include="Themes\Corporate\Views\DisplayTemplates\Parts\Comments.Comments.ascx" />
-    <Content Include="Themes\Corporate\Views\DisplayTemplates\Parts\Common.Metadata.ascx" />
-    <Content Include="Themes\Corporate\Views\DisplayTemplates\Parts\Tags.ShowTags.ascx" />
-    <Content Include="Themes\Corporate\Views\Footer.ascx" />
-    <Content Include="Themes\Corporate\Views\Header.ascx" />
-    <Content Include="Themes\Corporate\Views\Layout.ascx" />
-    <Content Include="Themes\Corporate\Views\Layout.HomePage.ascx" />
-    <Content Include="Themes\Corporate\Views\ListOfComments.ascx" />
-    <Content Include="Themes\Corporate\Views\LogOn.ascx" />
-    <Content Include="Themes\Corporate\Views\User.ascx" />
-    <Content Include="Themes\Corporate\Zones\Home-Headline.html" />
-    <Content Include="Themes\Corporate\Zones\Home-Hero.html" />
-    <Content Include="Themes\Corporate\Zones\Sidebar-w1.html" />
-    <Content Include="Themes\Corporate\Zones\Sidebar-w2.html" />
-    <Content Include="Themes\Corporate\Zones\Sidebar-w3.html" />
-    <Content Include="Themes\Green\Content\Images\bodyBackground.gif" />
-    <Content Include="Themes\Green\Content\Images\bodyBackground.png" />
-    <Content Include="Themes\Green\Content\Images\commentpointer.gif" />
-    <Content Include="Themes\Green\Content\Images\logo.gif" />
-    <Content Include="Themes\Green\Content\Images\logo.png" />
-    <Content Include="Themes\Green\Content\Images\tabLeftOff.gif" />
-    <Content Include="Themes\Green\Content\Images\tabLeftOn.gif" />
-    <Content Include="Themes\Green\Content\Images\tabRightOff.gif" />
-    <Content Include="Themes\Green\Content\Images\tabRightOn.gif" />
-    <Content Include="Themes\Green\Views\Archives.ascx" />
-    <Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.BlogPost.ascx" />
-    <Content Include="Themes\Green\Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" />
-    <Content Include="Themes\Green\Zones\sideBarZone1.html" />
-    <Content Include="Themes\Green\Zones\sideBarZone2.html" />
-    <Content Include="Themes\Green\Zones\User2.html" />
-    <Content Include="Themes\Green\Zones\User3.html" />
-    <Content Include="Themes\Green\Zones\User1.html" />
-    <Content Include="Themes\Green\Styles\blog.css" />
-    <Content Include="Themes\Green\Styles\site.css" />
-    <Content Include="Themes\Green\Styles\yui.css" />
-    <Content Include="Themes\Green\Theme.png" />
-    <Content Include="Themes\Green\Theme.txt" />
-    <Content Include="Themes\Green\Views\DisplayTemplates\Parts\Common.Metadata.ascx" />
-    <Content Include="Themes\Green\Views\Layout.HomePage.ascx" />
-    <Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.Blog.ascx" />
-    <Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.Blog.Summary.ascx" />
-    <Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.BlogPost.Summary.ascx" />
-    <Content Include="Themes\Green\Views\Footer.ascx" />
-    <Content Include="Themes\Green\Views\Layout.ascx" />
-    <Content Include="Themes\Green\Views\ListOfComments.ascx" />
-    <Content Include="Themes\SafeMode\Content\orchard.ico" />
-    <Content Include="Themes\SafeMode\Styles\ie6.css" />
-    <Content Include="Themes\SafeMode\Styles\images\backgroundHeader.gif" />
-    <Content Include="Themes\SafeMode\Styles\images\backgroundVines.gif" />
-    <Content Include="Themes\SafeMode\Styles\images\orchardLogo.gif" />
-    <Content Include="Themes\SafeMode\Styles\site.css" />
-    <Content Include="Themes\SafeMode\Theme.png" />
-    <Content Include="Themes\SafeMode\Theme.txt" />
-    <Content Include="Themes\SafeMode\Views\Layout.cshtml" />
-    <Content Include="Themes\TheAdmin\Styles\ie6.css" />
-    <Content Include="Themes\TheAdmin\Styles\images\backgroundGradient.gif" />
-    <Content Include="Themes\TheAdmin\Styles\images\backgroundHeader.gif" />
-    <Content Include="Themes\TheAdmin\Styles\images\orchardLogo.gif" />
-    <Content Include="Themes\TheAdmin\Theme.png" />
-    <Content Include="Themes\TheAdmin\Views\User.cshtml" />
-    <Content Include="Themes\TheAdmin\Views\Header.cshtml" />
-    <Content Include="Themes\TheThemeMachine\Web.config" />
-    <Content Include="Themes\TheThemeMachine\Views\Items\Content.Blog.cshtml" />
-    <Content Include="Themes\TheThemeMachine\Views\Items\Widget-Content.cshtml" />
-    <None Include="Themes\TheThemeMachine\Views\Layout.cshtml" />
  </ItemGroup>
  <ItemGroup>
    <Folder Include="App_Data\" />
-    <Folder Include="Themes\ClassicDark\DesignerNotes\" />
-    <Folder Include="Themes\SafeMode\Content\Images\" />
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
--- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
@@ -259,13 +259,13 @@ nav ul
 ***************************************************************/

 /* Has Aside */
-.has-aside #layout-content
+.has-aside-two #layout-content
 {
 	width: 600px;
 	float: left;
 }

-.has-aside .aside-second 
+.has-aside-two .aside-second 
 {
    width: 360px;
 	float: right;
@@ -276,6 +276,11 @@ nav ul
 	float: right;
 }

+.has-aside-one .aside-first {
+	width: 360px;
+	float: left;
+}
+
 .has-asides #layout-content
 {
 	width: 600px;
@@ -412,7 +417,6 @@ button:focus, .button:focus {
 }

 ul.comments, form.comment {
-    margin:1.2em 0 1.2em 1.8em;
    list-style: none;
 }

--- a/src/Orchard/ContentManagement/Handlers/ContentItemTemplates.cs
+++ b/src/Orchard/ContentManagement/Handlers/ContentItemTemplates.cs
@@ -6,7 +6,7 @@ namespace Orchard.ContentManagement.Handlers {
    public class ContentItemTemplates<TContent> : TemplateFilterBase<TContent> where TContent : class, IContent {
        private readonly string _templateName;
        // todo: (heskew) use _prefix?
-        private readonly string _prefix;
+        //private readonly string _prefix;
        private readonly string[] _displayTypes;
        private Action<UpdateEditorContext, IContent> _updater;

--- a/src/Orchard/InvokeExtensions.cs
+++ b/src/Orchard/InvokeExtensions.cs
@@ -42,7 +42,6 @@ namespace Orchard {
                ex is StackOverflowException ||
                ex is AccessViolationException ||
                ex is AppDomainUnloadedException ||
-                ex is ExecutionEngineException ||
                ex is ThreadAbortException ||
                ex is SecurityException ||
                ex is SEHException;