Merge 1.x -> default

src/Orchard.Specs/Hosting/RequestExtensions.cs

@@ -23,15 +23,15 @@ namespace Orchard.Specs.Hosting {
 
             var details = new RequestDetails {
                 HostName = webHost.HostName,
-                UrlPath = urlPath,
+                UrlPath = urlPath.Replace('\\', '/'),
             };
 
             int queryIndex = urlPath.IndexOf('?');
             if (queryIndex >= 0) {
-                details.UrlPath = urlPath.Substring(0, queryIndex);
+                details.UrlPath = urlPath.Substring(0, queryIndex).Replace('\\', '/');
                 details.Query = urlPath.Substring(queryIndex + 1);
             }
-            details.Page = (isHomepage ? "" : physicalPath.Combine(details.UrlPath.TrimStart('/', '\\')).GetRelativePath(physicalPath).ToString());
+            details.Page = (isHomepage ? "" : physicalPath.Combine(details.UrlPath.TrimStart('/', '\\')).GetRelativePath(physicalPath).ToString()).Replace('\\','/');
 
             if (!string.IsNullOrEmpty(webHost.Cookies)) {
                 details.RequestHeaders.Add("Cookie", webHost.Cookies);

src/Orchard.Web/Core/Contents/Styles/menu.content-admin.css

@@ -8,9 +8,9 @@ background-position:0 -30px !important;
 background-image:url(images/menu.content.png);
 }
 /* subnav */
-#menu .menu-admin .selected .menuItems a {
+#menu .menu-admin .section-new .menuItems a {
 background-position:0 4px;
 }
-#menu .menu-admin .selected .menuItems a:hover, #menu .menu-admin .selected .menuItems .selected a {
+#menu .menu-admin .section-new .menuItems a:hover, #menu .menu-admin .section-new .menuItems .selected a {
 background-position:0 -28px;
 }

src/Orchard.Web/Core/Orchard.Core.csproj

@@ -197,6 +197,8 @@
     <Compile Include="Scheduling\Services\ScheduledTaskManager.cs" />
     <Compile Include="Scheduling\Services\ScheduledTaskExecutor.cs" />
     <Compile Include="Scheduling\Models\Task.cs" />
+    <Compile Include="Settings\Models\SiteSettings2Part.cs" />
+    <Compile Include="Settings\Models\SiteSettings2PartRecord.cs" />
     <Compile Include="Settings\ResourceManifest.cs" />
     <Compile Include="Settings\Migrations.cs" />
     <Compile Include="Settings\Drivers\SiteSettingsPartDriver.cs" />

src/Orchard.Web/Core/Settings/Handlers/SiteSettingsPartHandler.cs

@@ -6,9 +6,11 @@ using Orchard.ContentManagement.Handlers;
 namespace Orchard.Core.Settings.Handlers {
     [UsedImplicitly]
     public class SiteSettingsPartHandler : ContentHandler {
-        public SiteSettingsPartHandler(IRepository<SiteSettingsPartRecord> repository){
+        public SiteSettingsPartHandler(IRepository<SiteSettingsPartRecord> repository, IRepository<SiteSettings2PartRecord> repository2) {
             Filters.Add(new ActivatingFilter<SiteSettingsPart>("Site"));
+            Filters.Add(new ActivatingFilter<SiteSettings2Part>("Site"));
             Filters.Add(StorageFilter.For(repository));
+            Filters.Add(StorageFilter.For(repository2));
         }
     }
 }

src/Orchard.Web/Core/Settings/Migrations.cs

@@ -97,9 +97,10 @@ namespace Orchard.Core.Settings {
         }
 
         public int UpdateFrom1() {
-            SchemaBuilder.AlterTable("SiteSettingsPartRecord",
+            SchemaBuilder.CreateTable("SiteSettings2PartRecord",
                 table => table
-                    .AddColumn<string>("BaseUrl", c => c.WithLength(255))
+                    .ContentPartRecord()
+                    .Column<string>("BaseUrl", c => c.Unlimited())
                 );
 
             return 2;

src/Orchard.Web/Core/Settings/Models/SiteSettings2Part.cs

@@ -0,0 +1,12 @@
+using Orchard.ContentManagement;
+using Orchard.Data.Conventions;
+
+namespace Orchard.Core.Settings.Models {
+    public sealed class SiteSettings2Part : ContentPart<SiteSettings2PartRecord> {
+        [StringLengthMax]
+        public string BaseUrl {
+            get { return Record.BaseUrl; }
+            set { Record.BaseUrl = value; }
+        }
+    }
+}

src/Orchard.Web/Core/Settings/Models/SiteSettings2PartRecord.cs

@@ -0,0 +1,9 @@
+using Orchard.ContentManagement.Records;
+using Orchard.Data.Conventions;
+
+namespace Orchard.Core.Settings.Models {
+    public class SiteSettings2PartRecord : ContentPartRecord {
+        [StringLengthMax]
+        public virtual string BaseUrl { get; set; }
+    }
+}

src/Orchard.Web/Core/Settings/Models/SiteSettingsPart.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Orchard.ContentManagement;
+using Orchard.Data.Conventions;
 using Orchard.Settings;
 
 namespace Orchard.Core.Settings.Models {
@@ -44,10 +45,14 @@ namespace Orchard.Core.Settings.Models {
             set { Record.PageSize = value; }
         }
 
-        [StringLength(255)]
+        [StringLengthMax]
         public string BaseUrl {
-            get { return Record.BaseUrl; }
+            get {
-            set { Record.BaseUrl = value; }
+                return this.As<SiteSettings2Part>().BaseUrl;
+            }
+            set {
+                this.As<SiteSettings2Part>().BaseUrl = value;
+            }
         }
     }
 }

src/Orchard.Web/Core/Settings/Models/SiteSettingsPartRecord.cs

@@ -1,5 +1,4 @@
-using System.ComponentModel.DataAnnotations;
+using Orchard.ContentManagement.Records;
-using Orchard.ContentManagement.Records;
 using Orchard.Settings;
 
 namespace Orchard.Core.Settings.Models {
@@ -25,8 +24,5 @@ namespace Orchard.Core.Settings.Models {
         public virtual ResourceDebugMode ResourceDebugMode { get; set; }
 
         public virtual int PageSize { get; set; }
-
-        [StringLength(255)]
-        public virtual string BaseUrl { get; set; }
     }
 }

src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetLayersControl.cshtml

@@ -5,7 +5,7 @@
     Script.Require("Switchable");
     Style.Require("Switchable");
     IEnumerable<LayerPart> layers = Model.Layers;
-    var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString();
+    var returnUrl = Request.RawUrl;
 }
 <div id="widgets-layers-control" class="widgets-container">
     @if (layers.Count() > 0) {

src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Orphans.cshtml

@@ -3,7 +3,7 @@
 @{
     Style.Require("WidgetsAdmin");
     IEnumerable<WidgetPart> widgets = Model.OrphanWidgets;
-    var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString();
+    var returnUrl = Request.RawUrl;
 }
 @if (widgets.Count() > 0) {
 <div id="widgets-orphans" class="widgets-container widgets-listed message-Warning">

src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml

@@ -4,7 +4,7 @@
     Style.Require("WidgetsAdmin");
     IEnumerable<WidgetPart> widgets = Model.Widgets;
     IEnumerable<string> zones = Model.Zones;
-    var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString();
+    var returnUrl = Request.RawUrl;
 }
 <ol>
     @foreach (string zone in zones) {

src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.cshtml

@@ -5,7 +5,7 @@
     IEnumerable<WidgetPart> widgets = Model.Widgets;
     IEnumerable<string> zones = Model.Zones;
     IEnumerable<string> orphanZones = Model.OrphanZones;
-    var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString();
+    var returnUrl = Request.RawUrl;
 }
 <div id="widgets-placement">
     <div id="widgets-layers" class="widgets-container detail-view switchable">