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

Small css tweaks to the skin selection

Browse Source 
[TFS Changeset #81600]
This commit is contained in:
PerPloug
2010-12-07 15:02:31 +00:00
parent 41c3db56a0
commit d1fd368fdd
13 changed files with 158 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
umbraco/presentation/install/css/all.css
View File

@@ -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;
}
}
.summary li{margin-bottom: 20px; display: block}
.summary a{color: White;}

1
umbraco/presentation/install/installer.js
View File

@@ -1 +0,0 @@

48
umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx
View File

@@ -13,18 +13,56 @@
<asp:Repeater ID="rep_starterKitDesigns" runat="server">
<HeaderTemplate>
<!-- gallery -->
<div class="gallery">
<div class="gallery">
<a href="#" class="btn-prev"><span>prev</span></a>
<a href="#" class="btn-next"><span>next</span></a>
<div class="hold">
<div class="gal-box">
<div class="box zoom-list2">
<ul>
</HeaderTemplate>
<ItemTemplate>
<li>
<div class="image-hold">
<img class="faik-mask" src="images/bg-img.png" alt="image description" width="152" height="129">
<img class="faik-mask-ie6" src="images/bg-img-ie.png" alt="image description" width="201" height="178">
<div class="hold">
<div class="gal-box">
<div class="image">
<img class="zoom-img" src="<%# ((Skin)Container.DataItem).Thumbnail %>" alt="<%# ((Skin)Container.DataItem).Text %>" width="134" height="103">
<div class="gal-drop">
<a href="#lightbox" class="btn-preview"><span>Preview</span></a>
<asp:LinkButton CssClass="single-tab btn-install-gal" ID="bt_selectKit" runat="server" onclick="SelectStarterKitDesign" CommandArgument="<%# ((Skin)Container.DataItem).RepoGuid %>"><span>Install</span></asp:LinkButton>
<div class="gal-desc" style="display: none"><%# ((Skin)Container.DataItem).Description %></div>
</div>
</div>
</div>
</li>
</ItemTemplate>
<FooterTemplate>
</ul>
</div>
<!-- paging -->
<div class="paging">
<div class="w1">
<div class="w2">
<span>Pages:</span>
<ul class="swicher">
<li class="active"><a href="#">1</a></li>
<li><a href="#">2</a></li>
<li><a href="#">3</a></li>
<li><a href="#">4</a></li>
</ul>
</div>
</div>
</div>
<ItemTemplate>
</div>
</FooterTemplate>
</asp:Repeater>
</div>

26
umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs
View File

@@ -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
{

15
umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs
View File

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

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

@@ -156,7 +156,10 @@
</div>
</div>
<!-- btn box -->
<footer class="btn-box">
<footer class="btn-box" style="display: none;">
<div class="t">&nbsp;</div>
<asp:LinkButton class="btn-step btn btn-continue" runat="server" OnClick="gotoNextStep"><span>Continue</span></asp:LinkButton>
</footer>
</div>
<script type="text/javascript">

2
umbraco/presentation/install/steps/database.ascx.cs
View File

@@ -155,7 +155,7 @@ namespace umbraco.presentation.install.steps
catch (Exception ex)
{
Exception error = new Exception("Could not save the web.config file. Please modify the connection string manually.", ex);
Helper.setSession("database", -1, "Could not save the web.config file. Please modify the connection string manually.", error.InnerException.Message);
Helper.setProgress(-1, "Could not save the web.config file. Please modify the connection string manually.", error.InnerException.Message);
}
settings.Visible = false;

102
umbraco/presentation/install/steps/skinning.ascx
View File

@@ -8,59 +8,48 @@
<script type="text/javascript">
jQuery(document).ready(function () {
jQuery('.zoom-list a.selectStarterKit').click(function () {
jQuery('.tab main-tabinfo').hide();
jQuery('#starterkitname').html(jQuery('span', this).html());
jQuery('.main-tabinfo').hide();
jQuery('#starterkitname').html( jQuery('span', this).html() );
jQuery('#single-tab1').show();
return true;
});
jQuery('.btn-install-gal').click(function () {
jQuery('#browseSkins').hide();
jQuery('#skinname').html(jQuery('span', this).html());
jQuery('#installingSkin').show();
return true;
});
});
function pageLoad(sender, args) {
if (args.get_isPartialLoad()) {
jQuery('#single-tab1').hide();
initZoomList2();
initSlide();
initLightBox();
jQuery('.btn-install-gal').click(function () {
jQuery('#browseSkins').hide();
jQuery('#installingSkin').show();
jQuery('#skinname').html(jQuery('span', this).html());
return true;
});
}
}
</script>
<asp:Placeholder ID="pl_starterKit" Runat="server" Visible="True">
<!-- starter box -->
<div class="tab main-tabinfo">
<div class="container">
<h1>Starter kits</h1>
<p>To help you get started we have created some basic starter kits each of which has been tailored to meet different requiremejnts.<br /> Hover of the thumbnail to find out what each kit contains.</p>
<p>To help you get started we have created some basic starter kits each of which has been tailored to meet different requiremejnts.<br />
Hover of the thumbnail to find out what each kit contains.</p>
</div>
<!-- menu -->
<asp:PlaceHolder ID="ph_starterKits" runat="server" />
</div>
<!-- itstall starter kit -->
<div class="tab install-tab" id="single-tab1" style="display: none">
<div class="container">
<h1>Installing Starter Kit</h1>
<h2><strong id="starterkitname">Your starter kit</strong> is installing. </h2>
<div class="loader alt">
<div class="hold">
<div class="progress-bar"></div>
<span class="progress-bar-value">56%</span>
</div>
<strong>Installation complete</strong>
</div>
</div>
<!-- btn box -->
<footer class="btn-box">
<div class="t">&nbsp;</div>
<a href="#single-tab2" class="single-tab btn btn-continue"><span>Continue</span></a>
</footer>
</div>
</asp:Placeholder>
@@ -74,9 +63,32 @@
</div>
</div>
<!-- skins -->
<asp:PlaceHolder ID="ph_starterKitDesigns" runat="server" />
<asp:Placeholder ID="ph_starterKitDesigns" runat="server" />
</div>
</asp:Placeholder>
</ContentTemplate>
</asp:UpdatePanel>
<!-- itstall starter kit -->
<div class="tab install-tab" id="single-tab1" style="display: none">
<div class="container">
<h1>Installing Starter Kit</h1>
<h2><strong id="starterkitname">Your starter kit</strong> is installing. </h2>
<div class="loader alt">
<div class="hold">
<div class="progress-bar"></div>
<span class="progress-bar-value">56%</span>
</div>
<strong>Starting installation...</strong>
</div>
</div>
</div>
<!-- itstall skin -->
<div class="tab install-tab" id="installingSkin" style="display: none">
<div class="container">
<h1>Installing Skin</h1>
@@ -87,27 +99,7 @@
<div class="progress-bar"></div>
<span class="progress-bar-value">56%</span>
</div>
<strong>Installation complete</strong>
<strong>Starting installation...</strong>
</div>
</div>
<footer class="btn-box">
<div class="t">&nbsp;</div>
<a href="youre-done.html" class="btn btn-continue"><span>Continue</span></a>
</footer>
</div>
</asp:Placeholder>
</ContentTemplate>
</asp:UpdatePanel>
<!-- Customize skin -->
<asp:Panel ID="pl_customizeDesign" Runat="server" Visible="True">
<div id="customizeSkin">
<asp:PlaceHolder ID="ph_customizeDesig" runat="server" />
</div>
</asp:Panel>
</div>
</div>

7
umbraco/presentation/install/steps/skinning.ascx.cs
View File

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

18
umbraco/presentation/install/steps/skinning.ascx.designer.cs generated
View File

@@ -56,23 +56,5 @@ namespace umbraco.presentation.install.steps {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.PlaceHolder ph_starterKitDesigns;
/// <summary>
/// pl_customizeDesign 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.Panel pl_customizeDesign;
/// <summary>
/// ph_customizeDesig 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.PlaceHolder ph_customizeDesig;
}
}

86
umbraco/presentation/install/style.css
View File

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

9
umbraco/presentation/install/utills/Helper.cs
View File

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

18
umbraco/presentation/install/utills/p.aspx.cs
View File

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