lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge 1.x -> default

Browse Source
This commit is contained in:
Suha Can
2011-04-08 12:01:40 -07:00
parent 01c483db81 e39a034091
commit ed5b107b7a
13 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Specs/Hosting/RequestExtensions.cs
View File

@@ -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);

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

@@ -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;
}

2
src/Orchard.Web/Core/Orchard.Core.csproj
View File

@@ -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" />

4
src/Orchard.Web/Core/Settings/Handlers/SiteSettingsPartHandler.cs
View File

@@ -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));
}
}
}

5
src/Orchard.Web/Core/Settings/Migrations.cs
View File

@@ -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;

12
src/Orchard.Web/Core/Settings/Models/SiteSettings2Part.cs Normal file
View File

@@ -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; }
}
}
}

9
src/Orchard.Web/Core/Settings/Models/SiteSettings2PartRecord.cs Normal file
View File

@@ -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; }
}
}

11
src/Orchard.Web/Core/Settings/Models/SiteSettingsPart.cs
View File

@@ -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; }
set { Record.BaseUrl = value; }
get {
return this.As<SiteSettings2Part>().BaseUrl;
}
set {
this.As<SiteSettings2Part>().BaseUrl = value;
}
}
}
}

6
src/Orchard.Web/Core/Settings/Models/SiteSettingsPartRecord.cs
View File

@@ -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; }
}
}

2
src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetLayersControl.cshtml
View File

@@ -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) {

2
src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Orphans.cshtml
View File

@@ -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">

2
src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml
View File

@@ -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) {

2
src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.cshtml
View File

@@ -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">