From 1eb79931119d2e07c2a1700e6f842ac22fb4118f Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Tue, 20 Sep 2011 16:44:20 -0700 Subject: [PATCH] Enabling Title feature by default --HG-- branch : 1.x --- src/Orchard.Profile/profiling-setup-commands.txt | 2 +- src/Orchard.Specs/Bindings/OrchardSiteFactory.cs | 2 +- src/Orchard.Specs/Setup.feature | 8 ++++---- src/Orchard.Specs/Setup.feature.cs | 10 +++++----- .../Modules/Orchard.Setup/Services/SetupService.cs | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Orchard.Profile/profiling-setup-commands.txt b/src/Orchard.Profile/profiling-setup-commands.txt index 73e51f581..589261ff5 100644 --- a/src/Orchard.Profile/profiling-setup-commands.txt +++ b/src/Orchard.Profile/profiling-setup-commands.txt @@ -1 +1 @@ -setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SQLServer /DatabaseConnectionString:"Data Source=.;Initial Catalog=Orchard;Integrated Security=True" /EnabledFeatures:Profiling,Orchard.Framework,Common,Containers,Contents,Dashboard,Feeds,HomePage,Navigation,Reports,Routable,Scheduling,Settings,Shapes,PackagingServices,Gallery,Orchard.PublishLater,Orchard.Blogs,Orchard.Comments,Orchard.ContentTypes,Orchard.jQuery,Orchard.Lists,Orchard.Media,Orchard.MediaPicker,Orchard.Modules,Orchard.Packaging,Orchard.Pages,Orchard.Recipes,Orchard.Roles,Orchard.Tags,Orchard.Themes,Orchard.Users,Orchard.Scripting,Orchard.Scripting.Lightweight,Orchard.Widgets,TinyMce,TheThemeMachine +setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SQLServer /DatabaseConnectionString:"Data Source=.;Initial Catalog=Orchard;Integrated Security=True" /EnabledFeatures:Profiling,Orchard.Framework,Common,Containers,Contents,Dashboard,Feeds,HomePage,Navigation,Reports,Routable,Scheduling,Settings,Shapes,Title,PackagingServices,Gallery,Orchard.PublishLater,Orchard.Blogs,Orchard.Comments,Orchard.ContentTypes,Orchard.jQuery,Orchard.Lists,Orchard.Media,Orchard.MediaPicker,Orchard.Modules,Orchard.Packaging,Orchard.Pages,Orchard.Recipes,Orchard.Roles,Orchard.Tags,Orchard.Themes,Orchard.Users,Orchard.Scripting,Orchard.Scripting.Lightweight,Orchard.Widgets,TinyMce,TheThemeMachine diff --git a/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs b/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs index e1b2048e9..6f3fc7749 100644 --- a/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs +++ b/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs @@ -24,7 +24,7 @@ namespace Orchard.Specs.Bindings { virtualDirectory, TableData( new { extension = "Module", names = "Orchard.Setup, Orchard.Pages, Orchard.Blogs, Orchard.Messaging, Orchard.Media, Orchard.MediaPicker, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.Lists, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.jQuery, Orchard.Tags, TinyMce, Orchard.Packaging, Orchard.Recipes, Orchard.Warmup" }, - new { extension = "Core", names = "Common, Containers, Dashboard, Feeds, HomePage, Navigation, Contents, Routable, Scheduling, Settings, Shapes, XmlRpc" }, + new { extension = "Core", names = "Common, Containers, Dashboard, Feeds, HomePage, Navigation, Contents, Routable, Scheduling, Settings, Shapes, XmlRpc, Title" }, new { extension = "Theme", names = "SafeMode, TheAdmin, TheThemeMachine" })); webApp.WhenIGoTo("Setup"); diff --git a/src/Orchard.Specs/Setup.feature b/src/Orchard.Specs/Setup.feature index e695fce9a..37a0d6569 100644 --- a/src/Orchard.Specs/Setup.feature +++ b/src/Orchard.Specs/Setup.feature @@ -7,7 +7,7 @@ Scenario: Root request shows setup form Given I have a clean site with | extension | names | | Module | Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Messaging, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard.jQuery, TinyMce | - | Core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc | + | Core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc, Title | | Theme | SafeMode | When I go to "/" Then I should see "Welcome to Orchard" @@ -18,7 +18,7 @@ Scenario: Setup folder also shows setup form Given I have a clean site with | extension | names | | Module | Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Messaging, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard.jQuery, TinyMce | - | Core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc | + | Core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc, Title | | Theme | SafeMode | When I go to "/Setup" Then I should see "Welcome to Orchard" @@ -29,7 +29,7 @@ Scenario: Some of the initial form values are required Given I have a clean site with | extension | names | | Module | Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Messaging, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard.jQuery, TinyMce | - | Core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc | + | Core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc, Title | | Theme | SafeMode | When I go to "/Setup" And I hit "Finish Setup" @@ -40,7 +40,7 @@ Scenario: Calling setup on a brand new install Given I have a clean site with | extension | names | | Module | Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Lists, Orchard.ContentTypes, Orchard.Messaging, Orchard.Media, Orchard.MediaPicker, Orchard.Scripting, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard.Modules, Orchard.Widgets, Orchard.jQuery, TinyMce, Orchard.Blogs, Orchard.Tags, Orchard.Packaging, Orchard.Recipes, Orchard.Warmup | - | Core | Common, Containers, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc | + | Core | Common, Containers, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc, Title | | Theme | SafeMode, TheThemeMachine | And I am on "/Setup" When I fill in diff --git a/src/Orchard.Specs/Setup.feature.cs b/src/Orchard.Specs/Setup.feature.cs index 418479e8c..313d8be1f 100644 --- a/src/Orchard.Specs/Setup.feature.cs +++ b/src/Orchard.Specs/Setup.feature.cs @@ -2,7 +2,7 @@ // // This code was generated by SpecFlow (http://www.specflow.org/). // SpecFlow Version:1.5.0.0 -// Runtime Version:4.0.30319.225 +// Runtime Version:4.0.30319.17011 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -71,7 +71,7 @@ this.ScenarioSetup(scenarioInfo); table1.AddRow(new string[] { "Core", "Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, S" + - "ettings, Shapes, XmlRpc"}); + "ettings, Shapes, XmlRpc, Title"}); table1.AddRow(new string[] { "Theme", "SafeMode"}); @@ -107,7 +107,7 @@ this.ScenarioSetup(scenarioInfo); table2.AddRow(new string[] { "Core", "Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, S" + - "ettings, Shapes, XmlRpc"}); + "ettings, Shapes, XmlRpc, Title"}); table2.AddRow(new string[] { "Theme", "SafeMode"}); @@ -143,7 +143,7 @@ this.ScenarioSetup(scenarioInfo); table3.AddRow(new string[] { "Core", "Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, S" + - "ettings, Shapes, XmlRpc"}); + "ettings, Shapes, XmlRpc, Title"}); table3.AddRow(new string[] { "Theme", "SafeMode"}); @@ -180,7 +180,7 @@ this.ScenarioSetup(scenarioInfo); table4.AddRow(new string[] { "Core", "Common, Containers, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, S" + - "cheduling, Settings, Shapes, XmlRpc"}); + "cheduling, Settings, Shapes, XmlRpc, Title"}); table4.AddRow(new string[] { "Theme", "SafeMode, TheThemeMachine"}); diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs index 2d1767619..49aa208c2 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs @@ -73,7 +73,7 @@ namespace Orchard.Setup.Services { // Framework "Orchard.Framework", // Core - "Common", "Containers", "Contents", "Dashboard", "Feeds", "HomePage", "Navigation", "Reports", "Routable", "Scheduling", "Settings", "Shapes", + "Common", "Containers", "Contents", "Dashboard", "Feeds", "HomePage", "Navigation", "Reports", "Routable", "Scheduling", "Settings", "Shapes", "Title", // Modules "Orchard.Pages", "Orchard.Themes", "Orchard.Users", "Orchard.Roles", "Orchard.Modules", "PackagingServices", "Orchard.Packaging", "Gallery", "Orchard.Recipes",