From d1fd368fddfec4774b23d7d9846acf4cf33b883e Mon Sep 17 00:00:00 2001 From: PerPloug Date: Tue, 7 Dec 2010 15:02:31 +0000 Subject: [PATCH] Small css tweaks to the skin selection [TFS Changeset #81600] --- umbraco/presentation/install/css/all.css | 8 +- umbraco/presentation/install/installer.js | 1 - .../steps/Skinning/loadStarterKitDesigns.ascx | 48 ++++++++- .../Skinning/loadStarterKitDesigns.ascx.cs | 26 ++++- .../steps/Skinning/loadStarterKits.ascx.cs | 15 ++- .../presentation/install/steps/database.ascx | 5 +- .../install/steps/database.ascx.cs | 2 +- .../presentation/install/steps/skinning.ascx | 102 ++++++++---------- .../install/steps/skinning.ascx.cs | 7 +- .../install/steps/skinning.ascx.designer.cs | 18 ---- umbraco/presentation/install/style.css | 86 --------------- umbraco/presentation/install/utills/Helper.cs | 9 +- umbraco/presentation/install/utills/p.aspx.cs | 18 ++-- 13 files changed, 158 insertions(+), 187 deletions(-) delete mode 100644 umbraco/presentation/install/installer.js delete mode 100644 umbraco/presentation/install/style.css diff --git a/umbraco/presentation/install/css/all.css b/umbraco/presentation/install/css/all.css index 8b66799293..71d135340b 100644 --- a/umbraco/presentation/install/css/all.css +++ b/umbraco/presentation/install/css/all.css @@ -181,7 +181,7 @@ figure{display: block;} .tabset ul li{ float:left; padding:0 43px 17px 0; - font:bold 21px/23px Arial, Helvetica, sans-serif; + font:bold 22px Arial, Helvetica, sans-serif; letter-spacing:-1px; color:#f27021; position:relative; @@ -1133,4 +1133,8 @@ figure{display: block;} .ui-selectmenu-menu li { font-weight:normal !important; border: none !important; -} \ No newline at end of file +} + +.summary li{margin-bottom: 20px; display: block} +.summary a{color: White;} + diff --git a/umbraco/presentation/install/installer.js b/umbraco/presentation/install/installer.js deleted file mode 100644 index 5f282702bb..0000000000 --- a/umbraco/presentation/install/installer.js +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx index 1e5ff30bf0..508ba58022 100644 --- a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx +++ b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx @@ -13,18 +13,56 @@ -
prev next
    +
    + prev + next + +
    +
    + +
    +
      + + +
    • +
      + image description + image description - -
    • image description image description
      <%# ((Skin)Container.DataItem).Text %>
      Preview Install
      • +
      + <%# ((Skin)Container.DataItem).Text %> +
      + Preview + Install + +
      +
      +
    + +
+ + +
+
+
+ Pages: + +
+
+
- -
Pages:
+
+
diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs index 2d66b1e232..c69f948fa9 100644 --- a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs +++ b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs @@ -65,31 +65,49 @@ namespace umbraco.presentation.install.steps.Skinning protected void SelectStarterKitDesign(object sender, EventArgs e) { + Helper.clearProgress(); + Guid kitGuid = new Guid(((LinkButton)sender).CommandArgument); + + Helper.setProgress(5, "Fetching starting kit from the repository", ""); + cms.businesslogic.packager.Installer installer = new cms.businesslogic.packager.Installer(); if (repo.HasConnection()) { cms.businesslogic.packager.Installer p = new cms.businesslogic.packager.Installer(); + Helper.setProgress(15, "Connected to repository", ""); + string tempFile = p.Import(repo.fetch(kitGuid.ToString())); p.LoadConfig(tempFile); int pID = p.CreateManifest(tempFile, kitGuid.ToString(), repoGuid); + Helper.setProgress(30, "Installing starter kit files", ""); p.InstallFiles(pID, tempFile); + + Helper.setProgress(50, "Installing starter kit umbraco objects", ""); p.InstallBusinessLogic(pID, tempFile); + + Helper.setProgress(60, "Finishing starter kit instatllation", ""); p.InstallCleanUp(pID, tempFile); library.RefreshContent(); + Helper.setProgress(80, "Retrieving list of skins, compatible with this starter kit", ""); if (cms.businesslogic.skinning.Skinning.GetAllSkins().Count > 0) { cms.businesslogic.skinning.Skinning.ActivateAsCurrentSkin(cms.businesslogic.skinning.Skinning.GetAllSkins()[0]); } + + Helper.setProgress(100, "Starter kit installation has been completed", ""); + try { + + if (string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus)) { GlobalSettings.ConfigurationStatus = GlobalSettings.CurrentVersion; @@ -97,12 +115,10 @@ namespace umbraco.presentation.install.steps.Skinning } } catch{ - _default pa = (_default)this.Page; - pa.GotoNextStep(helper.Request("installStep")); + Helper.RedirectToNextStep(Page); } - - _default page = (_default)this.Page; - page.GotoNextStep(helper.Request("installStep")); + + Helper.RedirectToNextStep(Page); } else { diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs index 8c71595876..68b9f011d8 100644 --- a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs +++ b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs @@ -68,24 +68,37 @@ namespace umbraco.presentation.install.steps.Skinning protected void SelectStarterKit(object sender, EventArgs e) { + Helper.clearProgress(); + Guid kitGuid = new Guid(((LinkButton)sender).CommandArgument); + Helper.setProgress(10, "Connecting to skin repository", ""); + cms.businesslogic.packager.Installer installer = new cms.businesslogic.packager.Installer(); if (repo.HasConnection()) { + + Helper.setProgress(20, "Downloading skin files...", ""); + cms.businesslogic.packager.Installer p = new cms.businesslogic.packager.Installer(); string tempFile = p.Import(repo.fetch(kitGuid.ToString())); p.LoadConfig(tempFile); int pID = p.CreateManifest(tempFile, kitGuid.ToString(), repoGuid); + Helper.setProgress(40, "Installing skin files", ""); p.InstallFiles(pID, tempFile); + + Helper.setProgress(60, "Installing skin system objects", ""); p.InstallBusinessLogic(pID, tempFile); + + Helper.setProgress(80, "Cleaning up after installation", ""); p.InstallCleanUp(pID, tempFile); library.RefreshContent(); - + + Helper.setProgress(100, "Skin has been installed", ""); ((skinning)Parent.Parent.Parent.Parent.Parent).showStarterKitDesigns(kitGuid); } diff --git a/umbraco/presentation/install/steps/database.ascx b/umbraco/presentation/install/steps/database.ascx index 96f5c9bce8..3d341dfb83 100644 --- a/umbraco/presentation/install/steps/database.ascx +++ b/umbraco/presentation/install/steps/database.ascx @@ -156,7 +156,10 @@ -
 
Continue
+
+
 
+ Continue +
+ +

Starter kits

-

To help you get started we have created some basic starter kits each of which has been tailored to meet different requiremejnts.
Hover of the thumbnail to find out what each kit contains.

+

To help you get started we have created some basic starter kits each of which has been tailored to meet different requiremejnts.
+ Hover of the thumbnail to find out what each kit contains.

- - - @@ -74,9 +63,32 @@ - + + + + + + + + + + + + + - - - - - - - - - - - - - -
- -
- - - + + \ No newline at end of file diff --git a/umbraco/presentation/install/steps/skinning.ascx.cs b/umbraco/presentation/install/steps/skinning.ascx.cs index da0e9302ab..c0246e01d0 100644 --- a/umbraco/presentation/install/steps/skinning.ascx.cs +++ b/umbraco/presentation/install/steps/skinning.ascx.cs @@ -41,12 +41,10 @@ namespace umbraco.presentation.install.steps ctrl.ID = "StarterKitDesigns"; ctrl.StarterKitGuid = starterKitGuid; - ph_starterKitDesigns.Controls.Add(ctrl); pl_starterKit.Visible = false; pl_starterKitDesign.Visible = true; - } public void showCustomizeSkin() @@ -56,5 +54,10 @@ namespace umbraco.presentation.install.steps _default p = (_default)this.Page; p.GotoNextStep(helper.Request("installStep")); } + + protected void gotoNextStep(object sender, EventArgs e) + { + Helper.RedirectToNextStep(this.Page); + } } } \ No newline at end of file diff --git a/umbraco/presentation/install/steps/skinning.ascx.designer.cs b/umbraco/presentation/install/steps/skinning.ascx.designer.cs index 962ef228a9..3f3db43b45 100644 --- a/umbraco/presentation/install/steps/skinning.ascx.designer.cs +++ b/umbraco/presentation/install/steps/skinning.ascx.designer.cs @@ -56,23 +56,5 @@ namespace umbraco.presentation.install.steps { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.PlaceHolder ph_starterKitDesigns; - - /// - /// pl_customizeDesign control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel pl_customizeDesign; - - /// - /// ph_customizeDesig control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder ph_customizeDesig; } } diff --git a/umbraco/presentation/install/style.css b/umbraco/presentation/install/style.css deleted file mode 100644 index bf81421ab9..0000000000 --- a/umbraco/presentation/install/style.css +++ /dev/null @@ -1,86 +0,0 @@ -body, input, select - { - font-size: 12px; - font-family: Calibri, "Trebuchet MS" , Verdana, Arial, "Lucida Grande"; - } - - body - { - width: 100%; - text-align: center; - padding-top: 25px; - margin: 0px; - background: no-repeat #fff url(images/logo_type.png) center 20px; - } - - h1,h2,h3,h4,h5{font-weight: normal; } - - h1{font-size: 2.5em; border-bottom: 1px solid #eaeaea; padding-bottom: 7px; margin-bottom: 7px;} - - - #main{text-align: left; width: 900px; margin: auto; margin-top: 120px;} - - #buttons{text-align: center; position: relative; border-top: 1px solid #eaeaea; margin-top: 40px;} - #buttons img{margin: auto; margin-top: 15px;} - #buttons .next{position: absolute; top: 10px; right: 10px;} - - - #starterKits, #starterKitDesigns {list-style: none; margin: 0; padding: 0px;} - #starterKits li, #starterKitDesigns li{float: left; margin: 15px; display: block; width: 20%; padding: 5px; border: 1px solid #efefef; text-align: center;} - #starterKits li a, #starterKitDesigns li a{text-decoration: none; color: #999} - #starterKits li span, #starterKitDesigns li span{display: block; text-align: center; padding-top: 10px;} - #starterKits li div, #starterKitDesigns li div{display: none !Important;} - #starterKits li img, #starterKitDesigns li img{border: none;} - - .declineStarterKits{display: block; text-align: center; font-size: 1.5em; padding: 20px;} - - #starterKitDesc, #starterKitDesignDesc, #installingSkin, #installingStarterKit{clear: both; font-size: 1.5em; font-weight: bold; color: #999; padding: 10px; text-align: center;} - - .webpi #buttons input{display: none !Important;} - - - #loadingBar{display: none;} - - - .error, .notice, .success - { - padding: .8em; - padding-top: 0em; - padding-bottom: 0em; - margin-bottom: .5em; - border: 2px solid #ddd; - } - .error - { - background: #FBE3E4; - color: #8a1f11; - border-color: #FBC2C4; - } - .notice - { - background: #FFF6BF; - color: #514721; - border-color: #FFD324; - } - .success - { - background: #E6EFC2; - color: #264409; - border-color: #C6D880; - } - .error a - { - color: #8a1f11; - } - .notice a - { - color: #514721; - } - .success a - { - color: #264409; - } - .errormessage - { - color: #8a1f11; - } \ No newline at end of file diff --git a/umbraco/presentation/install/utills/Helper.cs b/umbraco/presentation/install/utills/Helper.cs index 370650cad8..377c72e8ce 100644 --- a/umbraco/presentation/install/utills/Helper.cs +++ b/umbraco/presentation/install/utills/Helper.cs @@ -17,7 +17,14 @@ namespace umbraco.presentation.install { public static string Error { get; set; } - public static void setSession(string alias, int percent, string description, string error) + public static void clearProgress() + { + Percentage = 0; + Description = string.Empty; + Error = string.Empty; + } + + public static void setProgress(int percent, string description, string error) { if (percent > 0) Percentage = percent; diff --git a/umbraco/presentation/install/utills/p.aspx.cs b/umbraco/presentation/install/utills/p.aspx.cs index aa1c0a216f..b406b9ee4e 100644 --- a/umbraco/presentation/install/utills/p.aspx.cs +++ b/umbraco/presentation/install/utills/p.aspx.cs @@ -36,13 +36,13 @@ namespace umbraco.presentation.install.utills [System.Web.Script.Services.ScriptMethod] public static string installOrUpgrade() { - string sesssionAlias = "database"; + Helper.clearProgress(); IInstallerUtility m_Installer = BusinessLogic.Application.SqlHelper.Utility.CreateInstaller(); // Build the new connection string //DbConnectionStringBuilder connectionStringBuilder = CreateConnectionString(); - Helper.setSession(sesssionAlias, 5, "Connecting...", ""); + Helper.setProgress( 5, "Connecting...", ""); // Try to connect to the database Exception error = null; @@ -54,12 +54,12 @@ namespace umbraco.presentation.install.utills if (!m_Installer.CanConnect) throw new Exception("The installer cannot connect to the database."); else - Helper.setSession(sesssionAlias, 20, "Connection opened", ""); + Helper.setProgress( 20, "Connection opened", ""); } catch (Exception ex) { error = new Exception("Database connection initialisation failed.", ex); - Helper.setSession(sesssionAlias, -5, "Database connection initialisation failed.", error.Message); + Helper.setProgress( -5, "Database connection initialisation failed.", error.Message); return error.Message; } @@ -68,16 +68,16 @@ namespace umbraco.presentation.install.utills if (m_Installer.CanConnect) { if (m_Installer.IsLatestVersion) - Helper.setSession(sesssionAlias, 100, "Database is up-to-date", ""); + Helper.setProgress( 100, "Database is up-to-date", ""); else { if (m_Installer.IsEmpty) { - Helper.setSession(sesssionAlias, 35, "Installing tables...", ""); + Helper.setProgress( 35, "Installing tables...", ""); //do install m_Installer.Install(); - Helper.setSession(sesssionAlias, 100, "Installation completed!", ""); + Helper.setProgress( 100, "Installation completed!", ""); m_Installer = null; @@ -85,10 +85,10 @@ namespace umbraco.presentation.install.utills } else if (m_Installer.CurrentVersion == DatabaseVersion.None || m_Installer.CanUpgrade) { - Helper.setSession(sesssionAlias, 35, "Updating database tables...", ""); + Helper.setProgress( 35, "Updating database tables...", ""); m_Installer.Install(); - Helper.setSession(sesssionAlias, 100, "Upgrade completed!", ""); + Helper.setProgress( 100, "Upgrade completed!", ""); m_Installer = null;