Added installer step to choose rendering engine but have left it disabled, might make a dashboard instead for that.

This commit is contained in:
Shannon Deminick
2013-03-07 21:25:11 +06:00
parent 2044d1b5db
commit 9b85bc0e64
10 changed files with 157 additions and 4 deletions

View File

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

View File

@@ -318,6 +318,13 @@
<Compile Include="Install\Steps\Renaming.ascx.designer.cs">
<DependentUpon>renaming.ascx</DependentUpon>
</Compile>
<Compile Include="Install\Steps\RenderingEngine.ascx.cs">
<DependentUpon>RenderingEngine.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Install\Steps\RenderingEngine.ascx.designer.cs">
<DependentUpon>RenderingEngine.ascx</DependentUpon>
</Compile>
<Compile Include="Install\Steps\Skinning\loadStarterKitDesigns.ascx.designer.cs">
<DependentUpon>loadStarterKitDesigns.ascx</DependentUpon>
</Compile>
@@ -536,6 +543,7 @@
<DependentUpon>UI.xml</DependentUpon>
</None>
<Content Include="Global.asax" />
<Content Include="Install\Steps\RenderingEngine.ascx" />
<Content Include="Umbraco\Config\Lang\en_us.xml" />
<Content Include="Umbraco\Config\Lang\he.xml" />
<Content Include="Umbraco\Config\Lang\ja.xml" />

View File

@@ -0,0 +1,27 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="RenderingEngine.ascx.cs" Inherits="Umbraco.Web.UI.Install.Steps.RenderingEngine" %>
<div class="tab main-tabinfo">
<div class="container">
<h1>
Chose how you like to work with Templates</h1>
<p>
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.
</p>
</div>
<div class="step rendering-engine">
<div class="container">
<p>
<strong>Choose a default template type:</strong>
</p>
<asp:RadioButtonList runat="server" ID="EngineSelection" RepeatLayout="Flow">
<asp:ListItem Selected="True">MVC</asp:ListItem>
<asp:ListItem>Web forms</asp:ListItem>
</asp:RadioButtonList>
</div>
</div>
<!-- btn box -->
<footer class="btn-box">
<div class="t">&nbsp;</div>
<asp:LinkButton ID="btnNext" CssClass="btn btn-continue" runat="server" OnClick="GotoNextStep"><span>Continue</span></asp:LinkButton>
</footer>
</div>

View File

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

View File

@@ -0,0 +1,33 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace Umbraco.Web.UI.Install.Steps {
public partial class RenderingEngine {
/// <summary>
/// EngineSelection control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.RadioButtonList EngineSelection;
/// <summary>
/// btnNext control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton btnNext;
}
}

View File

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

View File

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

View File

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

View File

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

View File

@@ -291,6 +291,7 @@
<Compile Include="Install\Steps\DefaultUser.cs" />
<Compile Include="Install\Steps\FilePermissions.cs" />
<Compile Include="Install\Steps\License.cs" />
<Compile Include="Install\Steps\RenderingEngine.cs" />
<Compile Include="Install\Steps\Skinning.cs" />
<Compile Include="Install\Steps\TheEnd.cs" />
<Compile Include="Install\Steps\WebPi.cs" />