diff --git a/AzurePackage.proj b/AzurePackage.proj index 41afd884f..77f1ee952 100644 --- a/AzurePackage.proj +++ b/AzurePackage.proj @@ -15,9 +15,6 @@ $(CompileFolder)\_PublishedWebsites $(BuildFolder)\Stage - x64 - x86 - @@ -51,18 +48,13 @@ + Properties="Configuration=Release;OutputPath=$(CompileFolder);PlatformTarget=x64" /> + Properties="Configuration=Release;OutputPath=$(CompileFolder);PlatformTarget=x64" /> - - @@ -96,22 +88,27 @@ - - - - - - - + + + + + - + + + + + + + + - @@ -122,26 +119,24 @@ - - - - - - - + --> + + + + @@ -149,7 +144,7 @@ - + diff --git a/src/Orchard.Azure/Orchard.Azure.CloudService.sln b/src/Orchard.Azure/Orchard.Azure.CloudService.sln index 1d7a4df0e..3036e9ba8 100644 --- a/src/Orchard.Azure/Orchard.Azure.CloudService.sln +++ b/src/Orchard.Azure/Orchard.Azure.CloudService.sln @@ -27,8 +27,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Indexing", "..\Orch EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Media", "..\Orchard.Web\Modules\Orchard.Media\Orchard.Media.csproj", "{D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.MetaData", "..\Orchard.Web\Modules\Orchard.MetaData\Orchard.MetaData.csproj", "{23E04990-2A8D-41B8-9908-6DDB71EA3B23}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Modules", "..\Orchard.Web\Modules\Orchard.Modules\Orchard.Modules.csproj", "{17F86780-9A1F-4AA1-86F1-875EEC2730C7}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.MultiTenancy", "..\Orchard.Web\Modules\Orchard.MultiTenancy\Orchard.MultiTenancy.csproj", "{72457126-E118-4171-A08F-9A709EE4B7FC}" @@ -55,6 +53,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{75E7476C EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard", "..\Tools\Orchard\Orchard.csproj", "{33B1BC8D-E292-4972-A363-22056B207156}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Futures.Modules.Packaging", "..\Orchard.Web\Modules\Futures.Modules.Packaging\Futures.Modules.Packaging.csproj", "{DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lucene", "..\Orchard.Web\Modules\Lucene\Lucene.csproj", "{D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -109,10 +111,6 @@ Global {D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB}.Debug|Any CPU.Build.0 = Debug|Any CPU {D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB}.Release|Any CPU.ActiveCfg = Release|Any CPU {D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB}.Release|Any CPU.Build.0 = Release|Any CPU - {23E04990-2A8D-41B8-9908-6DDB71EA3B23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {23E04990-2A8D-41B8-9908-6DDB71EA3B23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {23E04990-2A8D-41B8-9908-6DDB71EA3B23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {23E04990-2A8D-41B8-9908-6DDB71EA3B23}.Release|Any CPU.Build.0 = Release|Any CPU {17F86780-9A1F-4AA1-86F1-875EEC2730C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {17F86780-9A1F-4AA1-86F1-875EEC2730C7}.Debug|Any CPU.Build.0 = Debug|Any CPU {17F86780-9A1F-4AA1-86F1-875EEC2730C7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -161,6 +159,14 @@ Global {33B1BC8D-E292-4972-A363-22056B207156}.Debug|Any CPU.Build.0 = Debug|Any CPU {33B1BC8D-E292-4972-A363-22056B207156}.Release|Any CPU.ActiveCfg = Release|Any CPU {33B1BC8D-E292-4972-A363-22056B207156}.Release|Any CPU.Build.0 = Release|Any CPU + {DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059}.Release|Any CPU.Build.0 = Release|Any CPU + {D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -173,7 +179,6 @@ Global {67C1D3AF-A0EC-46B2-BAE1-DF1DA8E0B890} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D} {EA2B9121-EF54-40A6-A53E-6593C86EE696} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D} {D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D} - {23E04990-2A8D-41B8-9908-6DDB71EA3B23} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D} {17F86780-9A1F-4AA1-86F1-875EEC2730C7} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D} {72457126-E118-4171-A08F-9A709EE4B7FC} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D} {4A9C04A6-0986-4A92-A610-5F59FF273FB9} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D} @@ -185,6 +190,8 @@ Global {CDE24A24-01D3-403C-84B9-37722E18DFB7} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D} {79AED36E-ABD0-4747-93D3-8722B042454B} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D} {954CA994-D204-468B-9D69-51F6AD3E1C29} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D} + {DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D} + {D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D} {33B1BC8D-E292-4972-A363-22056B207156} = {75E7476C-C05B-4C41-8E38-081D3EB55659} EndGlobalSection EndGlobal diff --git a/src/Orchard.Azure/Orchard.Azure.CloudService/Properties.txt b/src/Orchard.Azure/Orchard.Azure.CloudService/Properties.txt new file mode 100644 index 000000000..6157c1029 --- /dev/null +++ b/src/Orchard.Azure/Orchard.Azure.CloudService/Properties.txt @@ -0,0 +1 @@ +TargetFrameWorkVersion=v4.0 diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Config/Diagnostics.config b/src/Orchard.Azure/Orchard.Azure.Web/Config/Diagnostics.config index 300bdf236..9fa5b157a 100644 --- a/src/Orchard.Azure/Orchard.Azure.Web/Config/Diagnostics.config +++ b/src/Orchard.Azure/Orchard.Azure.Web/Config/Diagnostics.config @@ -1,5 +1,4 @@  - diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj index 80bec95df..342c94b2e 100644 --- a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj +++ b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj @@ -37,6 +37,7 @@ prompt 4 AllRules.ruleset + AnyCPU @@ -66,7 +67,7 @@ - True + False @@ -164,10 +165,18 @@ {9916839C-39FC-4CEB-A5AF-89CA7E87119F} Orchard.Core + + {DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059} + Futures.Modules.Packaging + {E65E5633-C0FF-453C-A906-481C14F969D6} Futures.Widgets + + {D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D} + Lucene + {63FBD4D9-E1DA-4A7B-AA6A-D6074FE50867} Orchard.Blogs @@ -192,10 +201,6 @@ {D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB} Orchard.Media - - {23E04990-2A8D-41B8-9908-6DDB71EA3B23} - Orchard.MetaData - {17F86780-9A1F-4AA1-86F1-875EEC2730C7} Orchard.Modules @@ -245,17 +250,15 @@ Orchard.Framework False - - {33B1BC8D-E292-4972-A363-22056B207156} - Orchard - {2505AA84-65A6-43D0-9C27-4F44FD576284} Orchard.Azure - + + Designer + diff --git a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs index af4e1c1da..9bbf4d08e 100644 --- a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs +++ b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs @@ -126,17 +126,27 @@ namespace Orchard.Core.Contents.Controllers { public ActionResult Edit(int id) { var contentItem = _contentManager.Get(id, VersionOptions.Latest); + + if (contentItem == null) + return new NotFoundResult(); + var model = new EditItemViewModel { Id = id, Content = _contentManager.BuildEditorModel(contentItem) }; + PrepareEditorViewModel(model.Content); + return View("Edit", model); } [HttpPost] public ActionResult Edit(EditItemViewModel model) { var contentItem = _contentManager.Get(model.Id, VersionOptions.DraftRequired); + + if (contentItem == null) + return new NotFoundResult(); + model.Content = _contentManager.UpdateEditorModel(contentItem, this); if (!ModelState.IsValid) { _transactionManager.Cancel(); diff --git a/src/Orchard.Web/Core/Localization/Services/LocalizationService.cs b/src/Orchard.Web/Core/Localization/Services/LocalizationService.cs index fe79e8902..7f440d22f 100644 --- a/src/Orchard.Web/Core/Localization/Services/LocalizationService.cs +++ b/src/Orchard.Web/Core/Localization/Services/LocalizationService.cs @@ -33,13 +33,15 @@ namespace Orchard.Core.Localization.Services { IEnumerable ILocalizationService.GetLocalizations(IContent content) { var localized = content.As(); + //todo: (heskew) get scheduled content as well + if (localized.MasterContentItem != null) - return _contentManager.Query(content.ContentItem.ContentType).Join() + return _contentManager.Query(VersionOptions.Latest, content.ContentItem.ContentType).Join() .List() .Select(i => i.As()) .Where(l => l.Id != content.ContentItem.Id && (l.Id == localized.MasterContentItem.ContentItem.Id || l.MasterContentItem != null && l.MasterContentItem.ContentItem.Id == localized.MasterContentItem.ContentItem.Id)); - return _contentManager.Query(content.ContentItem.ContentType).Join() + return _contentManager.Query(VersionOptions.Latest, content.ContentItem.ContentType).Join() .List() .Select(i => i.As()) .Where(l => l.MasterContentItem != null && l.MasterContentItem.ContentItem.Id == content.ContentItem.Id); diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index b66a31efb..02a6edfda 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -77,6 +77,7 @@ + @@ -276,7 +277,7 @@ - + diff --git a/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs b/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs index 8db6eb24c..56978fcca 100644 --- a/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs +++ b/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs @@ -18,7 +18,6 @@ namespace Orchard.Core.Routable.Drivers { T = NullLocalizer.Instance; } - private const string TemplateName = "Parts/Routable.IsRoutable"; public Localizer T { get; set; } diff --git a/src/Orchard.Web/Core/Routable/Handlers/RoutableHandler.cs b/src/Orchard.Web/Core/Routable/Handlers/RoutableHandler.cs index 3290854c7..91d7cba57 100644 --- a/src/Orchard.Web/Core/Routable/Handlers/RoutableHandler.cs +++ b/src/Orchard.Web/Core/Routable/Handlers/RoutableHandler.cs @@ -1,11 +1,31 @@ -using Orchard.ContentManagement.Handlers; +using System.Web.Routing; +using Orchard.ContentManagement; +using Orchard.ContentManagement.Handlers; using Orchard.Core.Routable.Models; using Orchard.Data; namespace Orchard.Core.Routable.Handlers { public class RoutableHandler : ContentHandler { - public RoutableHandler(IRepository repository) { + private readonly IRoutablePathConstraint _routablePathConstraint; + + public RoutableHandler(IRepository repository, IRoutablePathConstraint routablePathConstraint) { + _routablePathConstraint = routablePathConstraint; Filters.Add(StorageFilter.For(repository)); + + OnPublished((context, routable) => _routablePathConstraint.AddPath(routable.Record.Path)); + } + } + public class IsRoutableHandler : ContentHandlerBase { + public override void GetContentItemMetadata(GetContentItemMetadataContext context) { + var routable = context.ContentItem.As(); + if (routable != null) { + context.Metadata.DisplayRouteValues = new RouteValueDictionary { + {"Area", "Routable"}, + {"Controller", "Item"}, + {"Action", "Display"}, + {"path", routable.Record.Path} + }; + } } } } diff --git a/src/Orchard.Web/Core/Routable/Services/RoutableHomePageProvider.cs b/src/Orchard.Web/Core/Routable/Services/RoutableHomePageProvider.cs new file mode 100644 index 000000000..4aa54973b --- /dev/null +++ b/src/Orchard.Web/Core/Routable/Services/RoutableHomePageProvider.cs @@ -0,0 +1,44 @@ +using System.Web.Mvc; +using JetBrains.Annotations; +using Orchard.ContentManagement.Aspects; +using Orchard.Core.Routable.Models; +using Orchard.Core.Routable.ViewModels; +using Orchard.Localization; +using Orchard.Mvc.Results; +using Orchard.Services; +using Orchard.ContentManagement; + +namespace Orchard.Core.Routable.Services { + [UsedImplicitly] + public class RoutableHomePageProvider : IHomePageProvider { + private readonly IContentManager _contentManager; + + public RoutableHomePageProvider(IOrchardServices services, IContentManager contentManager) { + _contentManager = contentManager; + Services = services; + T = NullLocalizer.Instance; + } + + public IOrchardServices Services { get; private set; } + public Localizer T { get; set; } + + public string GetProviderName() { + return "RoutableHomePageProvider"; + } + + public ActionResult GetHomePage(int itemId) { + var contentItem = _contentManager.Get(itemId, VersionOptions.Published); + if (contentItem == null || !contentItem.Is()) + return new NotFoundResult(); + + var model = new RoutableDisplayViewModel { + Routable = _contentManager.BuildDisplayModel(contentItem.As(), "Detail") + }; + + return new ViewResult { + ViewName = "~/Core/Routable/Views/Item/Display.ascx", + ViewData = new ViewDataDictionary(model) + }; + } + } +} diff --git a/src/Orchard.Web/Core/Routable/Views/Item/Display.ascx b/src/Orchard.Web/Core/Routable/Views/Item/Display.ascx new file mode 100644 index 000000000..130543d3f --- /dev/null +++ b/src/Orchard.Web/Core/Routable/Views/Item/Display.ascx @@ -0,0 +1,3 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> +<% Html.AddTitleParts(Model.Routable.Item.Title); %> +<%: Html.DisplayForItem(m=>m.Routable) %> diff --git a/src/Orchard.Web/Core/Routable/Views/Item/Display.aspx b/src/Orchard.Web/Core/Routable/Views/Item/Display.aspx deleted file mode 100644 index 6754283e7..000000000 --- a/src/Orchard.Web/Core/Routable/Views/Item/Display.aspx +++ /dev/null @@ -1,3 +0,0 @@ -<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> -<% Html.AddTitleParts(Model.Routable.Item.Title); %> -<%: Html.DisplayForItem(m=>m.Routable) %> diff --git a/src/Orchard.Web/Core/Web.config b/src/Orchard.Web/Core/Web.config index 614bf9c62..e8cbf2dfb 100644 --- a/src/Orchard.Web/Core/Web.config +++ b/src/Orchard.Web/Core/Web.config @@ -1,39 +1,7 @@ - + - - - - - - - - - @@ -45,31 +13,6 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Harvest.ascx b/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Harvest.ascx index 71285a751..5884e4a9d 100644 --- a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Harvest.ascx +++ b/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Harvest.ascx @@ -1,5 +1,4 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Mvc.Html" %>

<%: Html.TitleForPage(T("Packaging").ToString(), T("Harvest Packages").ToString())%>

<%: Html.Partial("_Subnav") %> diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Modules.ascx b/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Modules.ascx index 1231ec337..2b804e594 100644 --- a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Modules.ascx +++ b/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Modules.ascx @@ -1,5 +1,4 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Mvc.Html" %>

<%: Html.TitleForPage(T("Packaging").ToString(), T("Browse Packages").ToString())%>

<%: Html.Partial("_Subnav") %> diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Sources.ascx b/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Sources.ascx index 7d25ac6d9..24eb1d5ef 100644 --- a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Sources.ascx +++ b/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Sources.ascx @@ -1,5 +1,4 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Mvc.Html" %>

<%: Html.TitleForPage(T("Packaging").ToString(), T("Edit Sources").ToString())%>

<%: Html.Partial("_Subnav") %> diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Web.config b/src/Orchard.Web/Modules/Futures.Modules.Packaging/Web.config index 2fe99e592..99f041ba8 100644 --- a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Web.config +++ b/src/Orchard.Web/Modules/Futures.Modules.Packaging/Web.config @@ -1,32 +1,13 @@ - - + + - - - - - - + - - - + @@ -40,23 +21,4 @@ - - - - - - - - - - - - - - - - diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Views/Admin/Edit.ascx b/src/Orchard.Web/Modules/Futures.Widgets/Views/Admin/Edit.ascx index 490ce350f..073edbc77 100644 --- a/src/Orchard.Web/Modules/Futures.Widgets/Views/Admin/Edit.ascx +++ b/src/Orchard.Web/Modules/Futures.Widgets/Views/Admin/Edit.ascx @@ -1,6 +1,5 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Futures.Widgets.ViewModels" %> -<%@ Import Namespace="Orchard.Mvc.Html" %>

<%: Html.TitleForPage(T("Edit Widget").ToString()) %>

<% using (Html.BeginFormAntiForgeryPost()) { %> <%: Html.ValidationSummary() %> diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Web.config b/src/Orchard.Web/Modules/Futures.Widgets/Web.config index 9445e4ba4..99f041ba8 100644 --- a/src/Orchard.Web/Modules/Futures.Widgets/Web.config +++ b/src/Orchard.Web/Modules/Futures.Widgets/Web.config @@ -1,75 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Lucene/Web.config b/src/Orchard.Web/Modules/Lucene/Web.config index c654951f1..99f041ba8 100644 --- a/src/Orchard.Web/Modules/Lucene/Web.config +++ b/src/Orchard.Web/Modules/Lucene/Web.config @@ -1,60 +1,24 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Web.config b/src/Orchard.Web/Modules/Orchard.Blogs/Web.config index 9445e4ba4..99f041ba8 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Web.config @@ -1,75 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Web.config b/src/Orchard.Web/Modules/Orchard.Comments/Web.config index f70e0bb84..99f041ba8 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Comments/Web.config @@ -1,79 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config b/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config index f1065d171..99f041ba8 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config @@ -1,44 +1,13 @@ - - + + - - - - - - - - - @@ -50,31 +19,6 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleWebConfig.txt b/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleWebConfig.txt index 9445e4ba4..87bf40af5 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleWebConfig.txt +++ b/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleWebConfig.txt @@ -1,75 +1,23 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Web.config b/src/Orchard.Web/Modules/Orchard.DevTools/Web.config index deeaa2610..99f041ba8 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Web.config +++ b/src/Orchard.Web/Modules/Orchard.DevTools/Web.config @@ -1,79 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Views/Admin/Index.ascx b/src/Orchard.Web/Modules/Orchard.Indexing/Views/Admin/Index.ascx index c109df5ef..a309350cc 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Views/Admin/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Views/Admin/Index.ascx @@ -1,6 +1,5 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Mvc.Html" %><% -Html.RegisterStyle("admin.css"); %> +<% Html.RegisterStyle("admin.css"); %>

<%:Html.TitleForPage(T("Search Index Management").ToString()) %>

<% using (Html.BeginForm("update", "admin", FormMethod.Post, new {area = "Orchard.Indexing"})) { %>
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Views/DefinitionTemplates/FieldIndexing.ascx b/src/Orchard.Web/Modules/Orchard.Indexing/Views/DefinitionTemplates/FieldIndexing.ascx index 2856e7740..43e69d7e0 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Views/DefinitionTemplates/FieldIndexing.ascx +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Views/DefinitionTemplates/FieldIndexing.ascx @@ -1,5 +1,4 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Mvc.Html" %>
<%:Html.EditorFor(m=>m.Included) %> <%: diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Views/DefinitionTemplates/TypeIndexing.ascx b/src/Orchard.Web/Modules/Orchard.Indexing/Views/DefinitionTemplates/TypeIndexing.ascx index 01e1ef1ab..94a99c004 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Views/DefinitionTemplates/TypeIndexing.ascx +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Views/DefinitionTemplates/TypeIndexing.ascx @@ -1,5 +1,4 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Mvc.Html" %>
<%:Html.EditorFor(m=>m.Included) %> <%: diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Web.config b/src/Orchard.Web/Modules/Orchard.Indexing/Web.config index c654951f1..99f041ba8 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Web.config @@ -1,60 +1,24 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Media/Web.config b/src/Orchard.Web/Modules/Orchard.Media/Web.config index f70e0bb84..99f041ba8 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Media/Web.config @@ -1,79 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.ascx b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.ascx index 6f53ad8cc..f0506b69c 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.ascx +++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.ascx @@ -1,6 +1,5 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Modules.ViewModels" %> -<%@ Import Namespace="Orchard.Mvc.Html" %>

<%: Html.TitleForPage(T("Install a Module").ToString()) %>

<% using (Html.BeginFormAntiForgeryPost(Url.Action("add", new { area = "Orchard.Modules" }), FormMethod.Post, new { enctype = "multipart/form-data" })) { %> <%: Html.ValidationSummary() diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Web.config b/src/Orchard.Web/Modules/Orchard.Modules/Web.config index c654951f1..99f041ba8 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Modules/Web.config @@ -1,60 +1,24 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForDisabled.ascx b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForDisabled.ascx index a2f6330e0..a076e20f0 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForDisabled.ascx +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForDisabled.ascx @@ -1,6 +1,5 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Environment.Configuration" %> -<%@ Import Namespace="Orchard.Mvc.Html" %> <% using(Html.BeginFormAntiForgeryPost(Url.Action("enable", new {area = "Orchard.MultiTenancy"}), FormMethod.Post, new {@class = "inline link"})) { %> <%: Html.HiddenFor(ss => ss.Name) %> <% diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForRunning.ascx b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForRunning.ascx index d6cab1a73..683963c25 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForRunning.ascx +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForRunning.ascx @@ -1,6 +1,5 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Environment.Configuration" %> -<%@ Import Namespace="Orchard.Mvc.Html" %> <% using(Html.BeginFormAntiForgeryPost(Url.Action("disable", new {area = "Orchard.MultiTenancy"}), FormMethod.Post, new {@class = "inline link"})) { %> <%: Html.HiddenFor(ss => ss.Name) %> <% diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config index a498e5467..99f041ba8 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config @@ -1,73 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj b/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj index 84b6d2a1c..7b2d8c609 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj +++ b/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj @@ -122,7 +122,6 @@ Orchard.Core - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Web.config b/src/Orchard.Web/Modules/Orchard.Roles/Web.config index 614bf9c62..99f041ba8 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Roles/Web.config @@ -1,75 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Sandbox/Web.config b/src/Orchard.Web/Modules/Orchard.Sandbox/Web.config index 614bf9c62..99f041ba8 100644 --- a/src/Orchard.Web/Modules/Orchard.Sandbox/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Sandbox/Web.config @@ -1,75 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx index 1b252a887..d51a45cfe 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx @@ -1,6 +1,6 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Mvc.Html" %><% -Html.RegisterStyle("search.css"); %> + +<% Html.RegisterStyle("search.css"); %>

<%:Html.TitleForPage(T("Search").Text)%>

<% Html.Zone("search"); if (!string.IsNullOrWhiteSpace(Model.Query)) { diff --git a/src/Orchard.Web/Modules/Orchard.Search/Web.config b/src/Orchard.Web/Modules/Orchard.Search/Web.config index c654951f1..99f041ba8 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Search/Web.config @@ -1,60 +1,24 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs index 591db0e06..39842565c 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs @@ -83,7 +83,6 @@ namespace Orchard.Setup.Services { "TinyMce", "Orchard.Modules", "Orchard.Themes", - "Orchard.Pages", "Orchard.Blogs", "Orchard.Comments", "Orchard.Tags", @@ -123,8 +122,10 @@ namespace Orchard.Setup.Services { .Column("Version")); var dataMigrationManager = environment.Resolve(); - dataMigrationManager.Update("Orchard.Framework"); - dataMigrationManager.Update("Settings"); + + foreach ( var feature in context.EnabledFeatures ) { + dataMigrationManager.Update(feature); + } environment.Resolve().UpdateShellDescriptor( 0, @@ -179,7 +180,7 @@ namespace Orchard.Setup.Services { var contentDefinitionManager = environment.Resolve(); contentDefinitionManager.AlterTypeDefinition("BlogPost", cfg => cfg.DisplayedAs("Blog Post").WithPart("HasComments").WithPart("HasTags").WithPart("Localized").Indexed()); - contentDefinitionManager.AlterTypeDefinition("Page", cfg => cfg.DisplayedAs("Page").WithPart("HasComments").WithPart("HasTags").WithPart("Localized").Indexed()); + contentDefinitionManager.AlterTypeDefinition("Page", cfg => cfg.DisplayedAs("Page").WithPart("CommonAspect").WithPart("IsRoutable").WithPart("BodyAspect").WithPart("HasComments").WithPart("HasTags").WithPart("Localized").Indexed()); contentDefinitionManager.AlterTypeDefinition("SandboxPage", cfg => cfg.DisplayedAs("Sandbox Page").WithPart("HasComments").WithPart("HasTags").WithPart("Localized").Indexed()); contentDefinitionManager.AlterPartDefinition("BodyAspect", cfg => cfg.WithSetting("BodyPartSettings.FlavorDefault", BodyPartSettings.FlavorDefaultDefault)); @@ -193,7 +194,7 @@ namespace Orchard.Setup.Services { page.As().CommentsShown = false; } contentManager.Publish(page); - siteSettings.Record.HomePage = "PageHomePageProvider;" + page.Id; + siteSettings.Record.HomePage = "RoutableHomePageProvider;" + page.Id; // add a menu item for the shiny new home page var menuItem = contentManager.Create("MenuItem"); diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx index a3204ae81..466e5247c 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx @@ -47,6 +47,6 @@ if (!Model.DatabaseIsPreconfigured) { %>
<% } %>
- " /> + " />
<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Web.config b/src/Orchard.Web/Modules/Orchard.Setup/Web.config index 614bf9c62..99f041ba8 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Setup/Web.config @@ -1,75 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Web.config b/src/Orchard.Web/Modules/Orchard.Tags/Web.config index f70e0bb84..99f041ba8 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Tags/Web.config @@ -1,79 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Web.config b/src/Orchard.Web/Modules/Orchard.Themes/Web.config index c654951f1..99f041ba8 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Themes/Web.config @@ -1,60 +1,24 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Users/Web.config b/src/Orchard.Web/Modules/Orchard.Users/Web.config index 614bf9c62..99f041ba8 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Users/Web.config @@ -1,75 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/TinyMce/Web.config b/src/Orchard.Web/Modules/TinyMce/Web.config index 9445e4ba4..99f041ba8 100644 --- a/src/Orchard.Web/Modules/TinyMce/Web.config +++ b/src/Orchard.Web/Modules/TinyMce/Web.config @@ -1,75 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Themes/Classic/Views/Layout.ascx b/src/Orchard.Web/Themes/Classic/Views/Layout.ascx index de642df91..23f114944 100644 --- a/src/Orchard.Web/Themes/Classic/Views/Layout.ascx +++ b/src/Orchard.Web/Themes/Classic/Views/Layout.ascx @@ -1,10 +1,5 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Mvc.Html" %> <%@ Import Namespace="Orchard.Mvc.ViewModels" %> -<%@ Import Namespace="Orchard.ContentManagement"%> -<%@ Import Namespace="Orchard.Core.Common.Models"%> -<%@ Import Namespace="Orchard.Blogs.Extensions"%> -<%@ Import Namespace="Orchard.Blogs.Models"%> <% Html.RegisterStyle("site.css"); Html.RegisterStyle("blog.css"); diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/Layout.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/Layout.ascx index b0c39f539..64e26a718 100644 --- a/src/Orchard.Web/Themes/ClassicDark/Views/Layout.ascx +++ b/src/Orchard.Web/Themes/ClassicDark/Views/Layout.ascx @@ -1,10 +1,5 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Mvc.Html" %> <%@ Import Namespace="Orchard.Mvc.ViewModels" %> -<%@ Import Namespace="Orchard.ContentManagement"%> -<%@ Import Namespace="Orchard.Core.Common.Models"%> -<%@ Import Namespace="Orchard.Blogs.Extensions"%> -<%@ Import Namespace="Orchard.Blogs.Models"%> <% Html.RegisterStyle("site.css"); Html.RegisterStyle("blog.css"); diff --git a/src/Orchard.Web/Themes/Contoso/Views/Layout.HomePage.ascx b/src/Orchard.Web/Themes/Contoso/Views/Layout.HomePage.ascx index 7fb52ea30..7683c4e69 100644 --- a/src/Orchard.Web/Themes/Contoso/Views/Layout.HomePage.ascx +++ b/src/Orchard.Web/Themes/Contoso/Views/Layout.HomePage.ascx @@ -1,6 +1,5 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> -<%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.RegisterStyle("site.css"); diff --git a/src/Orchard.Web/Themes/Contoso/Views/Layout.ascx b/src/Orchard.Web/Themes/Contoso/Views/Layout.ascx index 2e84e8512..b20b9e9b3 100644 --- a/src/Orchard.Web/Themes/Contoso/Views/Layout.ascx +++ b/src/Orchard.Web/Themes/Contoso/Views/Layout.ascx @@ -1,6 +1,5 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> -<%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.RegisterStyle("site.css"); diff --git a/src/Orchard.Web/Themes/Corporate/Views/Layout.HomePage.ascx b/src/Orchard.Web/Themes/Corporate/Views/Layout.HomePage.ascx index 978a21fe2..a40e27f24 100644 --- a/src/Orchard.Web/Themes/Corporate/Views/Layout.HomePage.ascx +++ b/src/Orchard.Web/Themes/Corporate/Views/Layout.HomePage.ascx @@ -1,6 +1,5 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> -<%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.RegisterStyle("site.css"); diff --git a/src/Orchard.Web/Themes/Corporate/Views/Layout.ascx b/src/Orchard.Web/Themes/Corporate/Views/Layout.ascx index f5fbe6260..88aa7593e 100644 --- a/src/Orchard.Web/Themes/Corporate/Views/Layout.ascx +++ b/src/Orchard.Web/Themes/Corporate/Views/Layout.ascx @@ -1,6 +1,5 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> -<%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.RegisterStyle("site.css"); diff --git a/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx b/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx index ffe097f8d..91b02181f 100644 --- a/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx +++ b/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx @@ -1,6 +1,5 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> -<%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.RegisterStyle("yui.css"); diff --git a/src/Orchard.Web/Themes/Green/Views/Layout.ascx b/src/Orchard.Web/Themes/Green/Views/Layout.ascx index 9e5e539e4..e904b86e0 100644 --- a/src/Orchard.Web/Themes/Green/Views/Layout.ascx +++ b/src/Orchard.Web/Themes/Green/Views/Layout.ascx @@ -1,6 +1,5 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> -<%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.RegisterStyle("yui.css"); diff --git a/src/Orchard.Web/Themes/SafeMode/Styles/site.css b/src/Orchard.Web/Themes/SafeMode/Styles/site.css index 2de026cef..32ddd72ca 100644 --- a/src/Orchard.Web/Themes/SafeMode/Styles/site.css +++ b/src/Orchard.Web/Themes/SafeMode/Styles/site.css @@ -128,25 +128,46 @@ input[type="password"] { width:98%; } -button, .button, .button:visited { - font-size: 102%; - background:#4687ad; - border:1px solid #8f8f8f; - color:#fff; - font-weight:600; +button, .button, .button:link, .button:visited { + font-size: 102%; + font-weight:600; + background:#F5F5F5; + background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#cbcbcb)); + background:-moz-linear-gradient(top , #F5F5F5, #cbcbcb); + border:1px solid #999999; + color:#2D2F25; cursor:pointer; + margin:0 0 20px 20px; + padding:.2em 1.4em; text-align:center; - margin:0 0 20px 20px; - padding:4px 14px; + text-shadow: 0 1px 1px rgba(0,0,0,.2); + box-shadow: 0 4px 4px rgba(231,231,231,.2) inset; + -webkit-box-shadow: 0 4px 4px rgba(231,231,231,.2) inset; + -moz-box-shadow: 0 4px 4px rgba(231,231,231,.2) inset; } - + button:hover, .button:hover, button:active, .button:active, button:focus, .button:focus { - background:#ffac40; border-color:#bb8b2d; color:#fff; - text-decoration:none; + text-decoration:none; + background: #ffac40; + background: -webkit-gradient(linear, left top, left bottom, from(#ffac40), to(#f06015)); + background: -moz-linear-gradient(top, #ffac40, #f9760d); + +} + +button:focus::-moz-focus-inner, .button:focus::-moz-focus-inner { + border-color:#8a8f7a; +} + +.primaryAction, .primaryAction:link, .primaryAction:visited { + background:#4687ad; + background: -webkit-gradient(linear, left top, left bottom, from(#4687AD), to(#366581)); + background:-moz-linear-gradient(top , #4687AD, #366581); + border:1px solid #405f71; + color:#fff; } diff --git a/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx b/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx index f7ee8c90c..2a457a94e 100644 --- a/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx +++ b/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx @@ -1,9 +1,5 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.UI.Resources"%> -<%@ Import Namespace="System.IO"%> -<%@ Import Namespace="Orchard.Mvc.ViewEngines"%> <%@ Import Namespace="Orchard.Mvc.ViewModels" %> -<%@ Import Namespace="Orchard.Mvc.Html" %> <% //todo: (heskew) this should really be using the IResourceManager if it's to be a theme especially for the jquery dep (w/out needing to copy into this theme...) var jquery = ResolveUrl("~/Modules/Orchard.Themes/Scripts/jquery-1.4.2.js"); Model.Zones.AddAction("head:scripts", html => diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index 099076439..633c414b5 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -120,6 +120,7 @@ number of columns: 24; actual width: 946; column width: 26; gutter width:14 display:inline; float:left; width:15.401%; + border-right:1px solid #eaeaea; } .wrapper, .sections { overflow:hidden; @@ -248,13 +249,9 @@ form.link button:hover { padding:0; } #navigation li h3 a, #navigation li h3 span { - border-bottom:1px solid #bdbcbc; display:block; padding:6px 4px 8px 8px; } -#navigation li h3 a, #navigation li h3 a:link, #navigation li h3 a:visited { - color:inherit; -} #navigation li h3 a:hover, #navigation li h3 a:active, #navigation li h3 a:focus { text-decoration:none; } @@ -297,7 +294,7 @@ form.link button:hover { margin:0; } #main h1, #main h2 { - border-bottom:1px solid #bdbcbc; + border-bottom:1px solid #eaeaea; } #main ul h2 { border-bottom:0; diff --git a/src/Orchard/Localization/Text.cs b/src/Orchard/Localization/Text.cs index 30c0442c9..59bd517c3 100644 --- a/src/Orchard/Localization/Text.cs +++ b/src/Orchard/Localization/Text.cs @@ -23,7 +23,7 @@ namespace Orchard.Localization { public LocalizedString Get(string textHint, params object[] args) { Logger.Debug("{0} localizing '{1}'", _scope, textHint); - string currentCulture = _cultureManager.GetCurrentCulture(new HttpContextWrapper(HttpContext.Current)); + string currentCulture = HttpContext.Current == null ? _cultureManager.GetSiteCulture() : _cultureManager.GetCurrentCulture(new HttpContextWrapper(HttpContext.Current)); var localizedFormat = _resourceManager.GetLocalizedString(_scope, textHint, currentCulture); return args.Length == 0