diff --git a/umbraco/presentation/install/default.aspx b/umbraco/presentation/install/default.aspx index 0daf690c11..1c632a8428 100644 --- a/umbraco/presentation/install/default.aspx +++ b/umbraco/presentation/install/default.aspx @@ -11,23 +11,23 @@ - - - - + + + + - - - + + + - + @@ -125,9 +125,9 @@
diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx index 945dd94c72..92086109f5 100644 --- a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx +++ b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx @@ -28,8 +28,8 @@
  • - image description - image description + image description + image description
    <%# ((Skin)Container.DataItem).Text %> diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx index 1264d88e1f..8934aa36b8 100644 --- a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx +++ b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx @@ -32,7 +32,7 @@
  • - image description + image description   diff --git a/umbraco/presentation/install/steps/boost.ascx b/umbraco/presentation/install/steps/boost.ascx deleted file mode 100644 index 6e8f458867..0000000000 --- a/umbraco/presentation/install/steps/boost.ascx +++ /dev/null @@ -1,50 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="boost.ascx.cs" Inherits="umbraco.presentation.install.steps.boost" %> -

    Step 5/5: Install a foundation?

    - - - - -
    - -

    Add 'Runway' - a great foundation for building websites
    -Recommended

    - - - -

    Runway makes it easy to build sharp websites using the latest modules from the umbraco community. You'll still have full control of design, markup and document models but with Runway you'll be ready for take off right from the beginning.

    -

    When you click next, you'll get a basic website and then you can choose from the latest and greatest functionality -that's offered by our friendly community with the click of your mouse - from Galleries to FAQs, from RSS fetchers to News, from the necessities to the cream on the top.

    - -
    -
    - - - -
    -

    No foundation, please
    -Only recommended for experienced users

    -If you're an experienced umbraco user and want to setup everything manually this is the right choice. Be aware that -you'll be unable to create content until you've setup your Document Types and Templates (Learn how).
    -
    - -
    - -
    - - -

    Runway is installed

    -

    -Below is our list of recommended modules to get you started. If you fancy some more, toggle the full list of community modules by clicking here.

    -To add modules, simply mark the ones you would like to install and click "Install selected modules" button. -

    - -
    - -
    - -
    \ No newline at end of file diff --git a/umbraco/presentation/install/steps/boost.ascx.cs b/umbraco/presentation/install/steps/boost.ascx.cs deleted file mode 100644 index 047624303c..0000000000 --- a/umbraco/presentation/install/steps/boost.ascx.cs +++ /dev/null @@ -1,110 +0,0 @@ -using System; -using System.Data; -using System.Configuration; -using System.Collections; -using System.Web; -using System.Web.Security; -using System.Web.UI; -using System.Web.UI.WebControls; -using System.Web.UI.WebControls.WebParts; -using System.Web.UI.HtmlControls; -using umbraco.IO; - -namespace umbraco.presentation.install.steps { - public partial class boost : System.Web.UI.UserControl { - - protected override void OnInit(EventArgs e) { - base.OnInit(e); - - //if this is an upgrade, skip this step... - if (!String.IsNullOrEmpty(GlobalSettings.ConfigurationStatus.Trim())) - Response.Redirect("default.aspx?installStep=theend"); - - - if (cms.businesslogic.packager.InstalledPackage.isPackageInstalled("ae41aad0-1c30-11dd-bd0b-0800200c9a66")) { - pl_nitros.Visible = true; - pl_boost.Visible = false; - - ph_nitros.Controls.Add(new UserControl().LoadControl( SystemDirectories.Umbraco + "/developer/packages/LoadNitros.ascx")); - - Button btNext = (Button)Page.FindControl("next"); - btNext.Text = "Continue without installing"; - btNext.OnClientClick = "showProgress(this,'loadingBar'); return true;"; - btNext.Click += btNext_Done; - } else { - pl_nitros.Visible = false; - pl_boost.Visible = true; - Button btNext = (Button)Page.FindControl("next"); - btNext.OnClientClick = "showProgress(this,'loadingBar'); return true;"; - btNext.Click += new EventHandler(btNext_Click); - } - } - - - protected override bool OnBubbleEvent(object source, EventArgs args) { - pl_nitros.Controls.Clear(); - - HtmlGenericControl modulesInstalledHeader = new HtmlGenericControl("h2"); - modulesInstalledHeader.InnerText = "Runway and modules has been installed"; - - uicontrols.Feedback fb = new global::umbraco.uicontrols.Feedback(); - fb.type = global::umbraco.uicontrols.Feedback.feedbacktype.success; - fb.Text = "Modules installed successfully. Each module can be uninstalled under the 'installed packages' section in the umbraco backend"; - - Button btNext = (Button)Page.FindControl("next"); - btNext.Text = "Next »"; - - pl_nitros.Controls.Add(modulesInstalledHeader); - pl_nitros.Controls.Add(fb); - - return base.OnBubbleEvent(source, args); - } - - - protected void Page_Load(object sender, EventArgs e) {} - - void btNext_Done(object sender, EventArgs e) { - Response.Redirect("default.aspx?installStep=theend"); - } - - - void btNext_Click(object sender, EventArgs e) { - if (rb_install.Checked) { - string repoGuid = "65194810-1f85-11dd-bd0b-0800200c9a66"; - string packageGuid = "ae41aad0-1c30-11dd-bd0b-0800200c9a66"; - - cms.businesslogic.packager.Installer p = new cms.businesslogic.packager.Installer(); - cms.businesslogic.packager.repositories.Repository repo = cms.businesslogic.packager.repositories.Repository.getByGuid(repoGuid); - - if (repo.HasConnection()) { - string tempFile = p.Import(repo.fetch(packageGuid)); - p.LoadConfig(tempFile); - int pID = p.CreateManifest(tempFile, packageGuid, repoGuid); - - p.InstallBusinessLogic(pID, tempFile); - p.InstallCleanUp(pID, tempFile); - - //pushing the content to the cache.. - library.RefreshContent(); - - - pl_nitros.Visible = true; - pl_boost.Visible = false; - ph_nitros.Controls.Add(new UserControl().LoadControl(SystemDirectories.Umbraco + "/developer/packages/LoadNitros.ascx")); - - Button btNext = (Button)Page.FindControl("next"); - btNext.Text = "Continue without installing"; - } else { - uicontrols.Feedback fb = new global::umbraco.uicontrols.Feedback(); - fb.type = global::umbraco.uicontrols.Feedback.feedbacktype.error; - fb.Text = "No connection to repository. Runway could not be installed as there was no connection to: '" + repo.RepositoryUrl + "'"; - pl_boost.Controls.Clear(); - pl_boost.Controls.Add(fb); - } - - } else { - Response.Redirect("default.aspx?installStep=theend"); - } - } - } -} \ No newline at end of file diff --git a/umbraco/presentation/install/steps/boost.ascx.designer.cs b/umbraco/presentation/install/steps/boost.ascx.designer.cs deleted file mode 100644 index 12fbdf399c..0000000000 --- a/umbraco/presentation/install/steps/boost.ascx.designer.cs +++ /dev/null @@ -1,61 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:2.0.50727.3053 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace umbraco.presentation.install.steps { - - - public partial class boost { - - /// - /// pl_boost control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel pl_boost; - - /// - /// rb_install control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.RadioButton rb_install; - - /// - /// rb_noInstall control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.RadioButton rb_noInstall; - - /// - /// pl_nitros control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel pl_nitros; - - /// - /// ph_nitros control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder ph_nitros; - } -} diff --git a/umbraco/presentation/install/steps/database.ascx b/umbraco/presentation/install/steps/database.ascx index e3cfc191a0..72b682278b 100644 --- a/umbraco/presentation/install/steps/database.ascx +++ b/umbraco/presentation/install/steps/database.ascx @@ -204,7 +204,7 @@ if (data.percentage == 100) { clearInterval(intervalId); jQuery(".btn-box").show(); - jQuery('.ui-progressbar-value').css("background-image", "url(images/pbar.gif)"); + jQuery('.ui-progressbar-value').css("background-image", "url(../umbraco_client/installer/images/pbar.gif)"); } }); } diff --git a/umbraco/presentation/install/steps/skinning.ascx b/umbraco/presentation/install/steps/skinning.ascx index e6dd460934..4d61d4bff3 100644 --- a/umbraco/presentation/install/steps/skinning.ascx +++ b/umbraco/presentation/install/steps/skinning.ascx @@ -64,7 +64,7 @@ if (data.percentage == 100) { clearInterval(intervalId); jQuery(".btn-box").show(); - jQuery('.ui-progressbar-value').css("background-image", "url(images/pbar.gif)"); + jQuery('.ui-progressbar-value').css("background-image", "url(../umbraco_client/installer/images/pbar.gif)"); } }); } diff --git a/umbraco/presentation/install/steps/upgrade.ascx b/umbraco/presentation/install/steps/upgrade.ascx index f37b22fb14..a0ed0e92a2 100644 --- a/umbraco/presentation/install/steps/upgrade.ascx +++ b/umbraco/presentation/install/steps/upgrade.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="upgrade.ascx.cs" Inherits="umbraco.presentation.install.steps.upgrade" %>
    -Umbraco logo +Umbraco logo

    Upgrading Umbraco

    diff --git a/umbraco/presentation/install/steps/upgrade.ascx.designer.cs b/umbraco/presentation/install/steps/upgrade.ascx.designer.cs index 0aea5f2847..c57c913f2b 100644 --- a/umbraco/presentation/install/steps/upgrade.ascx.designer.cs +++ b/umbraco/presentation/install/steps/upgrade.ascx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3053 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj index 2bf2b5519f..cf3d17d0ff 100644 --- a/umbraco/presentation/umbraco.presentation.csproj +++ b/umbraco/presentation/umbraco.presentation.csproj @@ -272,13 +272,6 @@ default.aspx - - boost.ascx - ASPXCodeBehind - - - boost.ascx - defaultUser.ascx ASPXCodeBehind @@ -1653,103 +1646,103 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1959,7 +1952,6 @@ Component - diff --git a/umbraco/presentation/install/css/all.css b/umbraco/presentation/umbraco_client/Installer/css/all.css similarity index 100% rename from umbraco/presentation/install/css/all.css rename to umbraco/presentation/umbraco_client/Installer/css/all.css diff --git a/umbraco/presentation/install/css/form.css b/umbraco/presentation/umbraco_client/Installer/css/form.css similarity index 100% rename from umbraco/presentation/install/css/form.css rename to umbraco/presentation/umbraco_client/Installer/css/form.css diff --git a/umbraco/presentation/install/css/jquery-ui-1.8.6.custom.css b/umbraco/presentation/umbraco_client/Installer/css/jquery-ui-1.8.6.custom.css similarity index 100% rename from umbraco/presentation/install/css/jquery-ui-1.8.6.custom.css rename to umbraco/presentation/umbraco_client/Installer/css/jquery-ui-1.8.6.custom.css diff --git a/umbraco/presentation/install/css/lt7.css b/umbraco/presentation/umbraco_client/Installer/css/lt7.css similarity index 100% rename from umbraco/presentation/install/css/lt7.css rename to umbraco/presentation/umbraco_client/Installer/css/lt7.css diff --git a/umbraco/presentation/install/css/reset.css b/umbraco/presentation/umbraco_client/Installer/css/reset.css similarity index 100% rename from umbraco/presentation/install/css/reset.css rename to umbraco/presentation/umbraco_client/Installer/css/reset.css diff --git a/umbraco/presentation/install/images/bg-bhuiness-cl.gif b/umbraco/presentation/umbraco_client/Installer/images/bg-bhuiness-cl.gif similarity index 100% rename from umbraco/presentation/install/images/bg-bhuiness-cl.gif rename to umbraco/presentation/umbraco_client/Installer/images/bg-bhuiness-cl.gif diff --git a/umbraco/presentation/install/images/bg-bhuiness-cr.gif b/umbraco/presentation/umbraco_client/Installer/images/bg-bhuiness-cr.gif similarity index 100% rename from umbraco/presentation/install/images/bg-bhuiness-cr.gif rename to umbraco/presentation/umbraco_client/Installer/images/bg-bhuiness-cr.gif diff --git a/umbraco/presentation/install/images/bg-bhuiness.jpg b/umbraco/presentation/umbraco_client/Installer/images/bg-bhuiness.jpg similarity index 100% rename from umbraco/presentation/install/images/bg-bhuiness.jpg rename to umbraco/presentation/umbraco_client/Installer/images/bg-bhuiness.jpg diff --git a/umbraco/presentation/install/images/bg-blog-cl.gif b/umbraco/presentation/umbraco_client/Installer/images/bg-blog-cl.gif similarity index 100% rename from umbraco/presentation/install/images/bg-blog-cl.gif rename to umbraco/presentation/umbraco_client/Installer/images/bg-blog-cl.gif diff --git a/umbraco/presentation/install/images/bg-blog-cr.gif b/umbraco/presentation/umbraco_client/Installer/images/bg-blog-cr.gif similarity index 100% rename from umbraco/presentation/install/images/bg-blog-cr.gif rename to umbraco/presentation/umbraco_client/Installer/images/bg-blog-cr.gif diff --git a/umbraco/presentation/install/images/bg-blog.jpg b/umbraco/presentation/umbraco_client/Installer/images/bg-blog.jpg similarity index 100% rename from umbraco/presentation/install/images/bg-blog.jpg rename to umbraco/presentation/umbraco_client/Installer/images/bg-blog.jpg diff --git a/umbraco/presentation/install/images/bg-drop-b.png b/umbraco/presentation/umbraco_client/Installer/images/bg-drop-b.png similarity index 100% rename from umbraco/presentation/install/images/bg-drop-b.png rename to umbraco/presentation/umbraco_client/Installer/images/bg-drop-b.png diff --git a/umbraco/presentation/install/images/bg-drop-c.gif b/umbraco/presentation/umbraco_client/Installer/images/bg-drop-c.gif similarity index 100% rename from umbraco/presentation/install/images/bg-drop-c.gif rename to umbraco/presentation/umbraco_client/Installer/images/bg-drop-c.gif diff --git a/umbraco/presentation/install/images/bg-drop-t.png b/umbraco/presentation/umbraco_client/Installer/images/bg-drop-t.png similarity index 100% rename from umbraco/presentation/install/images/bg-drop-t.png rename to umbraco/presentation/umbraco_client/Installer/images/bg-drop-t.png diff --git a/umbraco/presentation/install/images/bg-header.png b/umbraco/presentation/umbraco_client/Installer/images/bg-header.png similarity index 100% rename from umbraco/presentation/install/images/bg-header.png rename to umbraco/presentation/umbraco_client/Installer/images/bg-header.png diff --git a/umbraco/presentation/install/images/bg-img-ie.png b/umbraco/presentation/umbraco_client/Installer/images/bg-img-ie.png similarity index 100% rename from umbraco/presentation/install/images/bg-img-ie.png rename to umbraco/presentation/umbraco_client/Installer/images/bg-img-ie.png diff --git a/umbraco/presentation/install/images/bg-img.png b/umbraco/presentation/umbraco_client/Installer/images/bg-img.png similarity index 100% rename from umbraco/presentation/install/images/bg-img.png rename to umbraco/presentation/umbraco_client/Installer/images/bg-img.png diff --git a/umbraco/presentation/install/images/bg-inp-error.png b/umbraco/presentation/umbraco_client/Installer/images/bg-inp-error.png similarity index 100% rename from umbraco/presentation/install/images/bg-inp-error.png rename to umbraco/presentation/umbraco_client/Installer/images/bg-inp-error.png diff --git a/umbraco/presentation/install/images/bg-inp.png b/umbraco/presentation/umbraco_client/Installer/images/bg-inp.png similarity index 100% rename from umbraco/presentation/install/images/bg-inp.png rename to umbraco/presentation/umbraco_client/Installer/images/bg-inp.png diff --git a/umbraco/presentation/install/images/bg-lightbox-b.png b/umbraco/presentation/umbraco_client/Installer/images/bg-lightbox-b.png similarity index 100% rename from umbraco/presentation/install/images/bg-lightbox-b.png rename to umbraco/presentation/umbraco_client/Installer/images/bg-lightbox-b.png diff --git a/umbraco/presentation/install/images/bg-lightbox-t.png b/umbraco/presentation/umbraco_client/Installer/images/bg-lightbox-t.png similarity index 100% rename from umbraco/presentation/install/images/bg-lightbox-t.png rename to umbraco/presentation/umbraco_client/Installer/images/bg-lightbox-t.png diff --git a/umbraco/presentation/install/images/bg-normal-cl.gif b/umbraco/presentation/umbraco_client/Installer/images/bg-normal-cl.gif similarity index 100% rename from umbraco/presentation/install/images/bg-normal-cl.gif rename to umbraco/presentation/umbraco_client/Installer/images/bg-normal-cl.gif diff --git a/umbraco/presentation/install/images/bg-normal-cr.gif b/umbraco/presentation/umbraco_client/Installer/images/bg-normal-cr.gif similarity index 100% rename from umbraco/presentation/install/images/bg-normal-cr.gif rename to umbraco/presentation/umbraco_client/Installer/images/bg-normal-cr.gif diff --git a/umbraco/presentation/install/images/bg-normal.jpg b/umbraco/presentation/umbraco_client/Installer/images/bg-normal.jpg similarity index 100% rename from umbraco/presentation/install/images/bg-normal.jpg rename to umbraco/presentation/umbraco_client/Installer/images/bg-normal.jpg diff --git a/umbraco/presentation/install/images/bg-paging-h.png b/umbraco/presentation/umbraco_client/Installer/images/bg-paging-h.png similarity index 100% rename from umbraco/presentation/install/images/bg-paging-h.png rename to umbraco/presentation/umbraco_client/Installer/images/bg-paging-h.png diff --git a/umbraco/presentation/install/images/bg-paging.png b/umbraco/presentation/umbraco_client/Installer/images/bg-paging.png similarity index 100% rename from umbraco/presentation/install/images/bg-paging.png rename to umbraco/presentation/umbraco_client/Installer/images/bg-paging.png diff --git a/umbraco/presentation/install/images/bg-personal-cl.gif b/umbraco/presentation/umbraco_client/Installer/images/bg-personal-cl.gif similarity index 100% rename from umbraco/presentation/install/images/bg-personal-cl.gif rename to umbraco/presentation/umbraco_client/Installer/images/bg-personal-cl.gif diff --git a/umbraco/presentation/install/images/bg-personal-cr.gif b/umbraco/presentation/umbraco_client/Installer/images/bg-personal-cr.gif similarity index 100% rename from umbraco/presentation/install/images/bg-personal-cr.gif rename to umbraco/presentation/umbraco_client/Installer/images/bg-personal-cr.gif diff --git a/umbraco/presentation/install/images/bg-personal.jpg b/umbraco/presentation/umbraco_client/Installer/images/bg-personal.jpg similarity index 100% rename from umbraco/presentation/install/images/bg-personal.jpg rename to umbraco/presentation/umbraco_client/Installer/images/bg-personal.jpg diff --git a/umbraco/presentation/install/images/bg-simple-cl.gif b/umbraco/presentation/umbraco_client/Installer/images/bg-simple-cl.gif similarity index 100% rename from umbraco/presentation/install/images/bg-simple-cl.gif rename to umbraco/presentation/umbraco_client/Installer/images/bg-simple-cl.gif diff --git a/umbraco/presentation/install/images/bg-simple-cr.gif b/umbraco/presentation/umbraco_client/Installer/images/bg-simple-cr.gif similarity index 100% rename from umbraco/presentation/install/images/bg-simple-cr.gif rename to umbraco/presentation/umbraco_client/Installer/images/bg-simple-cr.gif diff --git a/umbraco/presentation/install/images/bg-simple.jpg b/umbraco/presentation/umbraco_client/Installer/images/bg-simple.jpg similarity index 100% rename from umbraco/presentation/install/images/bg-simple.jpg rename to umbraco/presentation/umbraco_client/Installer/images/bg-simple.jpg diff --git a/umbraco/presentation/install/images/btn-accept.png b/umbraco/presentation/umbraco_client/Installer/images/btn-accept.png similarity index 100% rename from umbraco/presentation/install/images/btn-accept.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-accept.png diff --git a/umbraco/presentation/install/images/btn-blog.png b/umbraco/presentation/umbraco_client/Installer/images/btn-blog.png similarity index 100% rename from umbraco/presentation/install/images/btn-blog.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-blog.png diff --git a/umbraco/presentation/install/images/btn-buisness.png b/umbraco/presentation/umbraco_client/Installer/images/btn-buisness.png similarity index 100% rename from umbraco/presentation/install/images/btn-buisness.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-buisness.png diff --git a/umbraco/presentation/install/images/btn-close.png b/umbraco/presentation/umbraco_client/Installer/images/btn-close.png similarity index 100% rename from umbraco/presentation/install/images/btn-close.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-close.png diff --git a/umbraco/presentation/install/images/btn-continue.png b/umbraco/presentation/umbraco_client/Installer/images/btn-continue.png similarity index 100% rename from umbraco/presentation/install/images/btn-continue.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-continue.png diff --git a/umbraco/presentation/install/images/btn-create-hover.png b/umbraco/presentation/umbraco_client/Installer/images/btn-create-hover.png similarity index 100% rename from umbraco/presentation/install/images/btn-create-hover.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-create-hover.png diff --git a/umbraco/presentation/install/images/btn-create.png b/umbraco/presentation/umbraco_client/Installer/images/btn-create.png similarity index 100% rename from umbraco/presentation/install/images/btn-create.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-create.png diff --git a/umbraco/presentation/install/images/btn-get.png b/umbraco/presentation/umbraco_client/Installer/images/btn-get.png similarity index 100% rename from umbraco/presentation/install/images/btn-get.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-get.png diff --git a/umbraco/presentation/install/images/btn-install-gal.png b/umbraco/presentation/umbraco_client/Installer/images/btn-install-gal.png similarity index 100% rename from umbraco/presentation/install/images/btn-install-gal.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-install-gal.png diff --git a/umbraco/presentation/install/images/btn-install-hover.png b/umbraco/presentation/umbraco_client/Installer/images/btn-install-hover.png similarity index 100% rename from umbraco/presentation/install/images/btn-install-hover.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-install-hover.png diff --git a/umbraco/presentation/install/images/btn-install.png b/umbraco/presentation/umbraco_client/Installer/images/btn-install.png similarity index 100% rename from umbraco/presentation/install/images/btn-install.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-install.png diff --git a/umbraco/presentation/install/images/btn-next.png b/umbraco/presentation/umbraco_client/Installer/images/btn-next.png similarity index 100% rename from umbraco/presentation/install/images/btn-next.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-next.png diff --git a/umbraco/presentation/install/images/btn-no-thanks.png b/umbraco/presentation/umbraco_client/Installer/images/btn-no-thanks.png similarity index 100% rename from umbraco/presentation/install/images/btn-no-thanks.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-no-thanks.png diff --git a/umbraco/presentation/install/images/btn-no.png b/umbraco/presentation/umbraco_client/Installer/images/btn-no.png similarity index 100% rename from umbraco/presentation/install/images/btn-no.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-no.png diff --git a/umbraco/presentation/install/images/btn-personal.png b/umbraco/presentation/umbraco_client/Installer/images/btn-personal.png similarity index 100% rename from umbraco/presentation/install/images/btn-personal.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-personal.png diff --git a/umbraco/presentation/install/images/btn-prev.png b/umbraco/presentation/umbraco_client/Installer/images/btn-prev.png similarity index 100% rename from umbraco/presentation/install/images/btn-prev.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-prev.png diff --git a/umbraco/presentation/install/images/btn-preview-web.png b/umbraco/presentation/umbraco_client/Installer/images/btn-preview-web.png similarity index 100% rename from umbraco/presentation/install/images/btn-preview-web.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-preview-web.png diff --git a/umbraco/presentation/install/images/btn-preview.png b/umbraco/presentation/umbraco_client/Installer/images/btn-preview.png similarity index 100% rename from umbraco/presentation/install/images/btn-preview.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-preview.png diff --git a/umbraco/presentation/install/images/btn-set.png b/umbraco/presentation/umbraco_client/Installer/images/btn-set.png similarity index 100% rename from umbraco/presentation/install/images/btn-set.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-set.png diff --git a/umbraco/presentation/install/images/btn-simple.png b/umbraco/presentation/umbraco_client/Installer/images/btn-simple.png similarity index 100% rename from umbraco/presentation/install/images/btn-simple.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-simple.png diff --git a/umbraco/presentation/install/images/btn-yes.png b/umbraco/presentation/umbraco_client/Installer/images/btn-yes.png similarity index 100% rename from umbraco/presentation/install/images/btn-yes.png rename to umbraco/presentation/umbraco_client/Installer/images/btn-yes.png diff --git a/umbraco/presentation/install/images/bul1.png b/umbraco/presentation/umbraco_client/Installer/images/bul1.png similarity index 100% rename from umbraco/presentation/install/images/bul1.png rename to umbraco/presentation/umbraco_client/Installer/images/bul1.png diff --git a/umbraco/presentation/install/images/bul2.gif b/umbraco/presentation/umbraco_client/Installer/images/bul2.gif similarity index 100% rename from umbraco/presentation/install/images/bul2.gif rename to umbraco/presentation/umbraco_client/Installer/images/bul2.gif diff --git a/umbraco/presentation/install/images/bul3.png b/umbraco/presentation/umbraco_client/Installer/images/bul3.png similarity index 100% rename from umbraco/presentation/install/images/bul3.png rename to umbraco/presentation/umbraco_client/Installer/images/bul3.png diff --git a/umbraco/presentation/install/images/bul4.gif b/umbraco/presentation/umbraco_client/Installer/images/bul4.gif similarity index 100% rename from umbraco/presentation/install/images/bul4.gif rename to umbraco/presentation/umbraco_client/Installer/images/bul4.gif diff --git a/umbraco/presentation/install/images/ico-invalidaing.png b/umbraco/presentation/umbraco_client/Installer/images/ico-invalidaing.png similarity index 100% rename from umbraco/presentation/install/images/ico-invalidaing.png rename to umbraco/presentation/umbraco_client/Installer/images/ico-invalidaing.png diff --git a/umbraco/presentation/install/images/ico-validaing.png b/umbraco/presentation/umbraco_client/Installer/images/ico-validaing.png similarity index 100% rename from umbraco/presentation/install/images/ico-validaing.png rename to umbraco/presentation/umbraco_client/Installer/images/ico-validaing.png diff --git a/umbraco/presentation/install/images/img01.jpg b/umbraco/presentation/umbraco_client/Installer/images/img01.jpg similarity index 100% rename from umbraco/presentation/install/images/img01.jpg rename to umbraco/presentation/umbraco_client/Installer/images/img01.jpg diff --git a/umbraco/presentation/install/images/img02.jpg b/umbraco/presentation/umbraco_client/Installer/images/img02.jpg similarity index 100% rename from umbraco/presentation/install/images/img02.jpg rename to umbraco/presentation/umbraco_client/Installer/images/img02.jpg diff --git a/umbraco/presentation/install/images/img03.jpg b/umbraco/presentation/umbraco_client/Installer/images/img03.jpg similarity index 100% rename from umbraco/presentation/install/images/img03.jpg rename to umbraco/presentation/umbraco_client/Installer/images/img03.jpg diff --git a/umbraco/presentation/install/images/img04.jpg b/umbraco/presentation/umbraco_client/Installer/images/img04.jpg similarity index 100% rename from umbraco/presentation/install/images/img04.jpg rename to umbraco/presentation/umbraco_client/Installer/images/img04.jpg diff --git a/umbraco/presentation/install/images/img05.jpg b/umbraco/presentation/umbraco_client/Installer/images/img05.jpg similarity index 100% rename from umbraco/presentation/install/images/img05.jpg rename to umbraco/presentation/umbraco_client/Installer/images/img05.jpg diff --git a/umbraco/presentation/install/images/img06.jpg b/umbraco/presentation/umbraco_client/Installer/images/img06.jpg similarity index 100% rename from umbraco/presentation/install/images/img06.jpg rename to umbraco/presentation/umbraco_client/Installer/images/img06.jpg diff --git a/umbraco/presentation/install/images/img07.jpg b/umbraco/presentation/umbraco_client/Installer/images/img07.jpg similarity index 100% rename from umbraco/presentation/install/images/img07.jpg rename to umbraco/presentation/umbraco_client/Installer/images/img07.jpg diff --git a/umbraco/presentation/install/images/img08.jpg b/umbraco/presentation/umbraco_client/Installer/images/img08.jpg similarity index 100% rename from umbraco/presentation/install/images/img08.jpg rename to umbraco/presentation/umbraco_client/Installer/images/img08.jpg diff --git a/umbraco/presentation/install/images/img09.jpg b/umbraco/presentation/umbraco_client/Installer/images/img09.jpg similarity index 100% rename from umbraco/presentation/install/images/img09.jpg rename to umbraco/presentation/umbraco_client/Installer/images/img09.jpg diff --git a/umbraco/presentation/install/images/img10.jpg b/umbraco/presentation/umbraco_client/Installer/images/img10.jpg similarity index 100% rename from umbraco/presentation/install/images/img10.jpg rename to umbraco/presentation/umbraco_client/Installer/images/img10.jpg diff --git a/umbraco/presentation/install/images/img11.jpg b/umbraco/presentation/umbraco_client/Installer/images/img11.jpg similarity index 100% rename from umbraco/presentation/install/images/img11.jpg rename to umbraco/presentation/umbraco_client/Installer/images/img11.jpg diff --git a/umbraco/presentation/install/images/loader.gif b/umbraco/presentation/umbraco_client/Installer/images/loader.gif similarity index 100% rename from umbraco/presentation/install/images/loader.gif rename to umbraco/presentation/umbraco_client/Installer/images/loader.gif diff --git a/umbraco/presentation/install/images/logo.gif b/umbraco/presentation/umbraco_client/Installer/images/logo.gif similarity index 100% rename from umbraco/presentation/install/images/logo.gif rename to umbraco/presentation/umbraco_client/Installer/images/logo.gif diff --git a/umbraco/presentation/install/images/none.gif b/umbraco/presentation/umbraco_client/Installer/images/none.gif similarity index 100% rename from umbraco/presentation/install/images/none.gif rename to umbraco/presentation/umbraco_client/Installer/images/none.gif diff --git a/umbraco/presentation/install/images/pbar-ani.gif b/umbraco/presentation/umbraco_client/Installer/images/pbar-ani.gif similarity index 100% rename from umbraco/presentation/install/images/pbar-ani.gif rename to umbraco/presentation/umbraco_client/Installer/images/pbar-ani.gif diff --git a/umbraco/presentation/install/images/select-button.png b/umbraco/presentation/umbraco_client/Installer/images/select-button.png similarity index 100% rename from umbraco/presentation/install/images/select-button.png rename to umbraco/presentation/umbraco_client/Installer/images/select-button.png diff --git a/umbraco/presentation/install/images/select-center.png b/umbraco/presentation/umbraco_client/Installer/images/select-center.png similarity index 100% rename from umbraco/presentation/install/images/select-center.png rename to umbraco/presentation/umbraco_client/Installer/images/select-center.png diff --git a/umbraco/presentation/install/images/select-left-2.png b/umbraco/presentation/umbraco_client/Installer/images/select-left-2.png similarity index 100% rename from umbraco/presentation/install/images/select-left-2.png rename to umbraco/presentation/umbraco_client/Installer/images/select-left-2.png diff --git a/umbraco/presentation/install/images/select-left.png b/umbraco/presentation/umbraco_client/Installer/images/select-left.png similarity index 100% rename from umbraco/presentation/install/images/select-left.png rename to umbraco/presentation/umbraco_client/Installer/images/select-left.png diff --git a/umbraco/presentation/install/images/sep1.png b/umbraco/presentation/umbraco_client/Installer/images/sep1.png similarity index 100% rename from umbraco/presentation/install/images/sep1.png rename to umbraco/presentation/umbraco_client/Installer/images/sep1.png diff --git a/umbraco/presentation/install/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/umbraco/presentation/umbraco_client/Installer/images/ui-bg_diagonals-thick_18_b81900_40x40.png similarity index 100% rename from umbraco/presentation/install/images/ui-bg_diagonals-thick_18_b81900_40x40.png rename to umbraco/presentation/umbraco_client/Installer/images/ui-bg_diagonals-thick_18_b81900_40x40.png diff --git a/umbraco/presentation/install/images/ui-bg_diagonals-thick_20_666666_40x40.png b/umbraco/presentation/umbraco_client/Installer/images/ui-bg_diagonals-thick_20_666666_40x40.png similarity index 100% rename from umbraco/presentation/install/images/ui-bg_diagonals-thick_20_666666_40x40.png rename to umbraco/presentation/umbraco_client/Installer/images/ui-bg_diagonals-thick_20_666666_40x40.png diff --git a/umbraco/presentation/install/images/ui-bg_flat_10_000000_40x100.png b/umbraco/presentation/umbraco_client/Installer/images/ui-bg_flat_10_000000_40x100.png similarity index 100% rename from umbraco/presentation/install/images/ui-bg_flat_10_000000_40x100.png rename to umbraco/presentation/umbraco_client/Installer/images/ui-bg_flat_10_000000_40x100.png diff --git a/umbraco/presentation/install/images/ui-bg_glass_100_f6f6f6_1x400.png b/umbraco/presentation/umbraco_client/Installer/images/ui-bg_glass_100_f6f6f6_1x400.png similarity index 100% rename from umbraco/presentation/install/images/ui-bg_glass_100_f6f6f6_1x400.png rename to umbraco/presentation/umbraco_client/Installer/images/ui-bg_glass_100_f6f6f6_1x400.png diff --git a/umbraco/presentation/install/images/ui-bg_glass_100_fdf5ce_1x400.png b/umbraco/presentation/umbraco_client/Installer/images/ui-bg_glass_100_fdf5ce_1x400.png similarity index 100% rename from umbraco/presentation/install/images/ui-bg_glass_100_fdf5ce_1x400.png rename to umbraco/presentation/umbraco_client/Installer/images/ui-bg_glass_100_fdf5ce_1x400.png diff --git a/umbraco/presentation/install/images/ui-bg_glass_65_ffffff_1x400.png b/umbraco/presentation/umbraco_client/Installer/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from umbraco/presentation/install/images/ui-bg_glass_65_ffffff_1x400.png rename to umbraco/presentation/umbraco_client/Installer/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/umbraco/presentation/install/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/umbraco/presentation/umbraco_client/Installer/images/ui-bg_gloss-wave_35_f6a828_500x100.png similarity index 100% rename from umbraco/presentation/install/images/ui-bg_gloss-wave_35_f6a828_500x100.png rename to umbraco/presentation/umbraco_client/Installer/images/ui-bg_gloss-wave_35_f6a828_500x100.png diff --git a/umbraco/presentation/install/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/umbraco/presentation/umbraco_client/Installer/images/ui-bg_highlight-soft_100_eeeeee_1x100.png similarity index 100% rename from umbraco/presentation/install/images/ui-bg_highlight-soft_100_eeeeee_1x100.png rename to umbraco/presentation/umbraco_client/Installer/images/ui-bg_highlight-soft_100_eeeeee_1x100.png diff --git a/umbraco/presentation/install/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/umbraco/presentation/umbraco_client/Installer/images/ui-bg_highlight-soft_75_ffe45c_1x100.png similarity index 100% rename from umbraco/presentation/install/images/ui-bg_highlight-soft_75_ffe45c_1x100.png rename to umbraco/presentation/umbraco_client/Installer/images/ui-bg_highlight-soft_75_ffe45c_1x100.png diff --git a/umbraco/presentation/install/images/ui-icons_222222_256x240.png b/umbraco/presentation/umbraco_client/Installer/images/ui-icons_222222_256x240.png similarity index 100% rename from umbraco/presentation/install/images/ui-icons_222222_256x240.png rename to umbraco/presentation/umbraco_client/Installer/images/ui-icons_222222_256x240.png diff --git a/umbraco/presentation/install/images/ui-icons_228ef1_256x240.png b/umbraco/presentation/umbraco_client/Installer/images/ui-icons_228ef1_256x240.png similarity index 100% rename from umbraco/presentation/install/images/ui-icons_228ef1_256x240.png rename to umbraco/presentation/umbraco_client/Installer/images/ui-icons_228ef1_256x240.png diff --git a/umbraco/presentation/install/images/ui-icons_ef8c08_256x240.png b/umbraco/presentation/umbraco_client/Installer/images/ui-icons_ef8c08_256x240.png similarity index 100% rename from umbraco/presentation/install/images/ui-icons_ef8c08_256x240.png rename to umbraco/presentation/umbraco_client/Installer/images/ui-icons_ef8c08_256x240.png diff --git a/umbraco/presentation/install/images/ui-icons_ffd27a_256x240.png b/umbraco/presentation/umbraco_client/Installer/images/ui-icons_ffd27a_256x240.png similarity index 100% rename from umbraco/presentation/install/images/ui-icons_ffd27a_256x240.png rename to umbraco/presentation/umbraco_client/Installer/images/ui-icons_ffd27a_256x240.png diff --git a/umbraco/presentation/install/images/ui-icons_ffffff_256x240.png b/umbraco/presentation/umbraco_client/Installer/images/ui-icons_ffffff_256x240.png similarity index 100% rename from umbraco/presentation/install/images/ui-icons_ffffff_256x240.png rename to umbraco/presentation/umbraco_client/Installer/images/ui-icons_ffffff_256x240.png diff --git a/umbraco/presentation/install/js/ie-png.js b/umbraco/presentation/umbraco_client/Installer/js/ie-png.js similarity index 100% rename from umbraco/presentation/install/js/ie-png.js rename to umbraco/presentation/umbraco_client/Installer/js/ie-png.js diff --git a/umbraco/presentation/install/js/jquery.1.4.4.js b/umbraco/presentation/umbraco_client/Installer/js/jquery.1.4.4.js similarity index 100% rename from umbraco/presentation/install/js/jquery.1.4.4.js rename to umbraco/presentation/umbraco_client/Installer/js/jquery.1.4.4.js diff --git a/umbraco/presentation/install/js/jquery.main.js b/umbraco/presentation/umbraco_client/Installer/js/jquery.main.js similarity index 100% rename from umbraco/presentation/install/js/jquery.main.js rename to umbraco/presentation/umbraco_client/Installer/js/jquery.main.js diff --git a/umbraco/presentation/install/js/jquery.ui.selectmenu.js b/umbraco/presentation/umbraco_client/Installer/js/jquery.ui.selectmenu.js similarity index 100% rename from umbraco/presentation/install/js/jquery.ui.selectmenu.js rename to umbraco/presentation/umbraco_client/Installer/js/jquery.ui.selectmenu.js