diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings.cs b/src/Umbraco.Core/Configuration/UmbracoSettings.cs index c441f64944..ebb2e971da 100644 --- a/src/Umbraco.Core/Configuration/UmbracoSettings.cs +++ b/src/Umbraco.Core/Configuration/UmbracoSettings.cs @@ -1214,6 +1214,12 @@ namespace Umbraco.Core.Configuration } return _defaultRenderingEngine.Value; } + //internal set + //{ + // _defaultRenderingEngine = value; + // var node = UmbracoSettingsXmlDoc.DocumentElement.SelectSingleNode("/settings/templates/defaultRenderingEngine"); + // node.InnerText = value.ToString(); + //} } diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index e3510ce322..d5682139c1 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -318,6 +318,13 @@ renaming.ascx + + RenderingEngine.ascx + ASPXCodeBehind + + + RenderingEngine.ascx + loadStarterKitDesigns.ascx @@ -536,6 +543,7 @@ UI.xml + diff --git a/src/Umbraco.Web.UI/install/steps/RenderingEngine.ascx b/src/Umbraco.Web.UI/install/steps/RenderingEngine.ascx new file mode 100644 index 0000000000..1b94e7ebd9 --- /dev/null +++ b/src/Umbraco.Web.UI/install/steps/RenderingEngine.ascx @@ -0,0 +1,27 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="RenderingEngine.ascx.cs" Inherits="Umbraco.Web.UI.Install.Steps.RenderingEngine" %> + +
+
+

+ Chose how you like to work with Templates

+

+ Umbraco works with both ASP.NET WebForms (also known as MasterPages) and ASP.NET MVC (called Views). If you're not sure, we recommend using the MVC templates. You can of course use both but let's select a default one to get started. +

+
+
+
+

+ Choose a default template type: +

+ + MVC + Web forms + +
+
+ +
+
 
+ Continue +
+
diff --git a/src/Umbraco.Web.UI/install/steps/RenderingEngine.ascx.cs b/src/Umbraco.Web.UI/install/steps/RenderingEngine.ascx.cs new file mode 100644 index 0000000000..b47830ecbe --- /dev/null +++ b/src/Umbraco.Web.UI/install/steps/RenderingEngine.ascx.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Umbraco.Core.Configuration; + +namespace Umbraco.Web.UI.Install.Steps +{ + public partial class RenderingEngine : StepUserControl + { + protected override void GotoNextStep(object sender, EventArgs e) + { + ////set the default engine + //UmbracoSettings.DefaultRenderingEngine = Core.RenderingEngine.Mvc; + //UmbracoSettings.Save(); + + base.GotoNextStep(sender, e); + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/install/steps/RenderingEngine.ascx.designer.cs b/src/Umbraco.Web.UI/install/steps/RenderingEngine.ascx.designer.cs new file mode 100644 index 0000000000..44e5bc8d04 --- /dev/null +++ b/src/Umbraco.Web.UI/install/steps/RenderingEngine.ascx.designer.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Umbraco.Web.UI.Install.Steps { + + + public partial class RenderingEngine { + + /// + /// EngineSelection control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RadioButtonList EngineSelection; + + /// + /// btnNext control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton btnNext; + } +} diff --git a/src/Umbraco.Web.UI/install/steps/StepUserControl.cs b/src/Umbraco.Web.UI/install/steps/StepUserControl.cs index 9a87db885b..49a72a5da1 100644 --- a/src/Umbraco.Web.UI/install/steps/StepUserControl.cs +++ b/src/Umbraco.Web.UI/install/steps/StepUserControl.cs @@ -12,7 +12,7 @@ namespace Umbraco.Web.UI.Install.Steps return defaultPage.step.Value; } - protected void GotoNextStep(object sender, EventArgs e) + protected virtual void GotoNextStep(object sender, EventArgs e) { InstallHelper.RedirectToNextStep(Page, GetCurrentStep()); } diff --git a/src/Umbraco.Web.UI/umbraco_client/Installer/css/all.css b/src/Umbraco.Web.UI/umbraco_client/Installer/css/all.css index 46ffeb7e01..c0826f1492 100644 --- a/src/Umbraco.Web.UI/umbraco_client/Installer/css/all.css +++ b/src/Umbraco.Web.UI/umbraco_client/Installer/css/all.css @@ -1166,7 +1166,16 @@ figure{display: block;} { display:none; } -.custom -{ - display: + +.database-hold{ + width:100%; + overflow:hidden; +} + +.step.rendering-engine input[type="radio"] { + margin: 0px 5px 0px 5px; +} + +.step.rendering-engine > div { + line-height: 25px; } \ No newline at end of file diff --git a/src/Umbraco.Web/Install/InstallHelper.cs b/src/Umbraco.Web/Install/InstallHelper.cs index 22914079e3..65de3c8a3c 100644 --- a/src/Umbraco.Web/Install/InstallHelper.cs +++ b/src/Umbraco.Web/Install/InstallHelper.cs @@ -13,6 +13,7 @@ namespace Umbraco.Web.Install new Steps.FilePermissions(), new Steps.Database(), new Steps.DefaultUser(), + //new Steps.RenderingEngine(), new Steps.Skinning(), new Steps.WebPi(), new Steps.TheEnd() diff --git a/src/Umbraco.Web/Install/Steps/RenderingEngine.cs b/src/Umbraco.Web/Install/Steps/RenderingEngine.cs new file mode 100644 index 0000000000..95a3ccaa87 --- /dev/null +++ b/src/Umbraco.Web/Install/Steps/RenderingEngine.cs @@ -0,0 +1,46 @@ +using System; +using Umbraco.Core.IO; + +namespace Umbraco.Web.Install.Steps +{ + internal class RenderingEngine : InstallerStep + { + public RenderingEngine() + { + _moveToNextStepAutomaticly = true; + } + + private bool _moveToNextStepAutomaticly; + + public override string Alias + { + get { return "renderingEngine"; } + } + + public override string Name + { + get { return "Default Rendering Engine"; } + } + + public override string UserControl + { + get { return SystemDirectories.Install + "/steps/renderingengine.ascx"; } + } + + public override bool Completed() + { + return false; + } + + public override bool HideFromNavigation + { + get { return true; } + } + + public override bool MoveToNextStepAutomaticly + { + get { return _moveToNextStepAutomaticly; } + set { _moveToNextStepAutomaticly = value; } + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 42de13bb2b..bc793dc6c6 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -291,6 +291,7 @@ +