yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New installer css, js and html files

Browse Source 
[TFS Changeset #81516]
This commit is contained in:
PerPloug
2010-12-06 08:49:38 +00:00
parent cc29cc8067
commit 071d10445d
116 changed files with 3534 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
umbraco/presentation/install/steps/Definitions/Database.cs
View File

@@ -18,7 +18,7 @@ namespace umbraco.presentation.install.steps.Definitions
public override string Name
{
get { return "Database configuration"; }
get { return "Database"; }
}
public override string UserControl
@@ -26,13 +26,6 @@ namespace umbraco.presentation.install.steps.Definitions
get { return SystemDirectories.Install + "/steps/database.ascx"; }
}
public override bool HideNextButtonUntillCompleted
{
get
{
return false;
}
}
public override bool MoveToNextStepAutomaticly
{

12
umbraco/presentation/install/steps/Definitions/DefaultUser.cs
View File

@@ -15,18 +15,10 @@ namespace umbraco.presentation.install.steps.Definitions
public override string Name
{
get { return "Configure the administrator password"; }
get { return "Create User"; }
}
public override bool HideNextButtonUntillCompleted
{
get
{
return true;
}
}
public override string UserControl
public override string UserControl
{
get { return IO.SystemDirectories.Install + "/steps/defaultuser.ascx"; }
}

6
umbraco/presentation/install/steps/Definitions/FilePermissions.cs
View File

@@ -23,6 +23,12 @@ namespace umbraco.presentation.install.steps.Definitions
get { return IO.SystemDirectories.Install + "/steps/validatepermissions.ascx"; }
}
public override bool HideFromNavigation {
get {
return true;
}
}
public override bool Completed()
{
return utills.FilePermissions.RunFilePermissionTestSuite();

29
umbraco/presentation/install/steps/Definitions/License.cs Normal file
View File

@@ -0,0 +1,29 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using umbraco.cms.businesslogic.installer;
namespace umbraco.presentation.install.steps.Definitions {
public class License : InstallerStep {
public override string Alias {
get { return "license"; }
}
public override string Name {
get { return "License"; }
}
public override string UserControl {
get { return IO.SystemDirectories.Install + "/steps/license.ascx"; }
}
public override bool Completed() {
return false;
}
}
}

11
umbraco/presentation/install/steps/Definitions/Skinning.cs
View File

@@ -16,17 +16,10 @@ namespace umbraco.presentation.install.steps.Definitions
public override string Name
{
get { return "Configure your site"; }
}
public override bool HideNextButtonUntillCompleted
{
get
{
return true;
}
get { return "Starter Kit"; }
}
public override string UserControl
{
get { return IO.SystemDirectories.Install + "/steps/skinning.ascx"; }

2
umbraco/presentation/install/steps/Definitions/TheEnd.cs
View File

@@ -15,7 +15,7 @@ namespace umbraco.presentation.install.steps.Definitions
public override string Name
{
get { return "Umbraco " + GlobalSettings.CurrentVersion + " is installed and ready for use"; }
get { return "You’re Done"; }
}
public override string UserControl

6
umbraco/presentation/install/steps/Definitions/WebPi.cs
View File

@@ -19,6 +19,12 @@ namespace umbraco.presentation.install.steps.Definitions
get { return "Hi " + new User(0).Name + " you are running umbraco"; }
}
public override bool HideFromNavigation {
get {
return true;
}
}
public override string UserControl
{
get { return IO.SystemDirectories.Install + "/steps/skinning.ascx"; }

26
umbraco/presentation/install/steps/Definitions/Welcome.cs
View File

@@ -6,29 +6,22 @@ using umbraco.cms.businesslogic.installer;
namespace umbraco.presentation.install.steps.Definitions
{
public class License : InstallerStep
public class Welcome : InstallerStep
{
public override string Alias
{
get { return "license"; }
get { return "welcome"; }
}
public override string Name
{
get { return "License"; }
}
public override bool HideNextButtonUntillCompleted
{
get
{
return false;
}
get { return "Welcome"; }
}
public override string UserControl
{
get { return IO.SystemDirectories.Install + "/steps/license.ascx"; }
get { return IO.SystemDirectories.Install + "/steps/welcome.ascx"; }
}
public override bool Completed()
@@ -36,12 +29,5 @@ namespace umbraco.presentation.install.steps.Definitions
return false;
}
public override string NextButtonText
{
get
{
return "I accept the license";
}
}
}
}
}

18
umbraco/presentation/install/steps/database.ascx
View File

@@ -1,10 +1,8 @@
<%@ Control Language="c#" AutoEventWireup="True" CodeBehind="database.ascx.cs" Inherits="umbraco.presentation.install.steps.detect"
TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %>
<h2>
Database configuration</h2>
<asp:Panel ID="settings" runat="server" Visible="true">
<h2>
Database configuration</h2>
<div runat="server" id="div_info" class="notice">
<p>
To complete this step, you must know some information regarding your database server
@@ -31,6 +29,7 @@
</p>
</div>
</asp:PlaceHolder>
<ol class="form">
<li runat="server" id="DatabaseTypeItem">
<asp:Label runat="server" AssociatedControlID="DatabaseType" ID="DatabaseTypeLabel">Type:</asp:Label>
@@ -89,6 +88,7 @@
</p>
</div>
</asp:PlaceHolder>
<asp:PlaceHolder ID="none" runat="server" Visible="False">
<div class="notice">
<p>
@@ -97,7 +97,8 @@
database</p>
</div>
</asp:PlaceHolder>
<asp:Literal ID="error" runat="server" Visible="False">
<asp:Literal ID="error" runat="server" Visible="False">
<div class="error">
<p>Database not found! Please check that the information in the "connection string" of the “web.config” file is correct.</p>
<p>To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "umbracoDbDSN" and save the file. </p>
@@ -106,16 +107,21 @@ Click the <strong>retry</strong> button when
done.<br /><a href="http://umbraco.org/redir/installWebConfig" target="_blank">
More information on editing web.config here.</a></p>
</div>
</asp:Literal>
</asp:Literal>
</asp:Panel>
<asp:Button ID="upgrade" Text="Upgrade" Visible="False" runat="server" CssClass="button"
OnClientClick="showProgress(this,'loadingBar'); return true;" OnClick="upgrade_Click">
</asp:Button>
<asp:Button ID="install" Text="Install" Visible="False" runat="server" CssClass="button"
OnClientClick="showProgress(this,'loadingBar'); return true;" OnClick="install_Click">
</asp:Button>
<asp:Button ID="retry" Text="Retry" Visible="False" runat="server" OnClientClick="showProgress(this,'loadingBar'); return true;"
CssClass="button" />
<asp:Panel ID="confirms" runat="server" Visible="False">
<asp:PlaceHolder ID="installConfirm" runat="server" Visible="False">
<div class="success">

60
umbraco/presentation/install/steps/license.ascx
View File

@@ -1,38 +1,26 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="license.ascx.cs" Inherits="umbraco.presentation.install.steps.license" %>
<h2>
Accept the license for umbraco CMS</h2>
<!-- licence box -->
<div class="tab main-tabinfo">
<div class="container">
<h1>Licence</h1>
<div class="accept-hold">
<h2>Accept the licence for Umbraco CMS</h2>
<p>By clicking the next button (or modifying the Umbraco Configuration Status in web config), you accept the licence for this software as specidied in the text below.</p>
</div>
<h3>The Licence (MIT):</h3>
<div class="box-software">
<p>Copyright (c) 2002 - <%=DateTime.Now.Year %> Umbraco I/S</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
<p>The above copyright and this permisson notice shall be included in all copies or substantial postions of the software.</p>
<p><span>THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRENTY OF ANY KIND, EPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USER OR OTHER DEALINGS IN THE SOFTWARE.</span></p>
</div>
<p>That’s all. That didn’t hert did it?</p>
</div>
<!-- btn box -->
<footer class="btn-box">
<div class="t">&nbsp;</div>
<asp:LinkButton ID="btnNext" CssClass="btn btn-accept" runat="server" OnClick="gotoNextStep"><span>Accept and Continue</span></asp:LinkButton>
</footer>
</div>
<div class="abstract">
<p>
By clicking the next button (or modifying the umbracoConfigurationStatus in web.config),
you accept the license for this software as specified in the box below.</p>
</div>
<div id="licenseText">
<a name="mit"></a>
<h3>
The License (MIT):</h3>
<p>
Copyright (c)
2002 - <%=DateTime.Now.Year %>
Umbraco I/S</p>
<p>
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in the
Software without restriction, including without limitation the rights to use, copy,
modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
and to permit persons to whom the Software is furnished to do so, subject to the
following conditions:</p>
<p>
The above copyright notice and this permission notice shall be included in all copies
or substantial portions of the Software.</p>
<p>
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
<p>That's all. That didn't hurt, did it?)</p>
</div>

4
umbraco/presentation/install/steps/license.ascx.cs
View File

@@ -17,5 +17,9 @@ namespace umbraco.presentation.install.steps
{
}
protected void gotoNextStep(object sender, EventArgs e) {
Helper.RedirectToNextStep(this.Page);
}
}
}

9
umbraco/presentation/install/steps/license.ascx.designer.cs generated
View File

@@ -11,5 +11,14 @@ namespace umbraco.presentation.install.steps {
public partial class license {
/// <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;
}
}

70
umbraco/presentation/install/steps/welcome.ascx
View File

@@ -1,38 +1,34 @@
<%@ Control Language="c#" AutoEventWireup="True" Codebehind="welcome.ascx.cs" Inherits="presentation.install.steps.welcome" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
<p style="font-size: 80%; position: absolute; top: 3px; left: 15px; display: none; "><a href="#" style="color: #000; font-weight: bold" onClick="javascript:document.getElementById('detailsPane').style.display = 'block';">Where's my site?</a></p>
<%@ Control Language="c#" AutoEventWireup="True" CodeBehind="welcome.ascx.cs" Inherits="umbraco.presentation.install.welcome"
TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %>
<!-- welcome box -->
<div class="tab main-tabinfo">
<div class="container">
<h1>
Welcome to the Umbraco installation</h1>
<h2>
Thanks a lot for downloading the Umbraco CMS installer.
</h2>
<p>
You are just a few minutes away from getting up and running. The installer will
take you through the following process:-</p>
<ul class="text-list">
<li><strong>1.</strong><span>Accept the easy to read License</span></li>
<li><strong>2.</strong><span>Set up a database. There are a number of options available
such as MS SQL Server, MS SQL Express Edition and MYSQL or you may wish to use the
Microsoft SQL CE 4 database. You may need to consult your ISP or System Admin.</span></li>
<li><strong>3.</strong><span>Set an Umbraco Admin password</span></li>
<li><strong>4.</strong><span>You can then choose to install one of our great starter
kits and a skin</span></li>
<li><strong>5.</strong><span>But whatever you do don't forget to become part of the
Umbraco community, one of the friendliest developer communites you will find. Its
what makes Umbraco such a great product and great much fun to use.</span></li>
</ul>
<span class="enjoy">Enjoy!</span>
</div>
<!-- btn box -->
<footer class="btn-box">
<div class="t">&nbsp;</div>
<asp:LinkButton ID="btnNext" CssClass="btn btn-get" runat="server" OnClick="gotoNextStep"><span>Lets get started!</span></asp:LinkButton>
</footer>
<div style="text-align: center; padding: 15px;">
<img src="images/logo.png" align="middle" title="Umbraco logo" alt="Umbraco logo" />
<h1>Thank you for choosing umbraco</h1>
<div id="detailsPane" class="notice" style="DISPLAY: none">
<p>
If you have successfully upgraded from a previous version of umbraco, you can skip this wizard by editing the “web.config” file by inserting a line of code (shown below) between the “appSettings” tags (please notice, that by changing this setting you accept the license for running this software as specified in the next step): <br/>
<code>
&lt;add key="umbracoConfigurationStatus" value="<%=umbraco.GlobalSettings.CurrentVersion %>"/&gt;
</code>
</p>
</div>
<p>This wizard will guide you through the process of configuring <strong>umbraco <%=umbraco.GlobalSettings.CurrentVersion%></strong> for a fresh install or upgrading from version 3.0.</p>
<p>Press <b>"next"</b> to start the wizard.</p>
<h2>Get a great start, watch our introduction videos</h2>
<table id="videos">
<tr>
<td>
<a href="http://umbraco.org/documentation/videos/getting-started/installing-umbraco" target="_blank">
<img src="images/welcomeVid1.png" />
<span>Watch: How to install Umbraco.</span>
</a>
</td>
<td>
<a href="http://umbraco.org/documentation/videos/getting-started/what-is-umbraco" target="_blank">
<img src="images/welcomeVid2.png" />
<span>Watch: What is Umbraco?</span>
</a>
</td>
</tr>
</table>
</div>
</div>

14
umbraco/presentation/install/steps/welcome.ascx.cs
View File

@@ -1,6 +1,6 @@
using umbraco;
namespace presentation.install.steps
namespace umbraco.presentation.install
{
using System;
using System.Data;
@@ -19,16 +19,20 @@ namespace presentation.install.steps
{
// Check for config!
if (GlobalSettings.Configured)
{
if (GlobalSettings.Configured)
{
Application.Lock();
Application["umbracoNeedConfiguration"] = null;
Application.UnLock();
Response.Redirect(Request.QueryString["url"] ?? "/", true);
}
}
}
protected void gotoNextStep(object sender, EventArgs e) {
Helper.RedirectToNextStep(this.Page);
}
#region Web Form Designer generated code
override protected void OnInit(EventArgs e)
{
@@ -48,4 +52,6 @@ namespace presentation.install.steps
}
#endregion
}
}

20
umbraco/presentation/install/steps/welcome.ascx.designer.cs generated
View File

@@ -1,22 +1,24 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.1434
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace presentation.install.steps {
namespace umbraco.presentation.install {
/// <summary>
/// welcome class.
/// </summary>
/// <remarks>
/// Auto-generated class.
/// </remarks>
public partial class welcome {
/// <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;
}
}