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

WIP skinning updates

Browse Source 
[TFS Changeset #80465]
This commit is contained in:
starfighter83
2010-11-23 09:52:13 +00:00
parent ccd89bef07
commit c59c66bc33
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
umbraco/cms/businesslogic/skinning/tasks/ModifyPageProperty.cs
View File

@@ -23,19 +23,25 @@ namespace umbraco.cms.businesslogic.skinning.tasks
{
TaskExecutionDetails d = new TaskExecutionDetails();
string id = HttpContext.Current.Items["pageID"].ToString();
Document doc = new Document(Convert.ToInt32(id));
if (doc.getProperty(PropertyAlias) != null)
if (HttpContext.Current != null && HttpContext.Current.Items["pageID"] != null)
{
d.OriginalValue = doc.getProperty(PropertyAlias).Value.ToString();
string id = HttpContext.Current.Items["pageID"].ToString();
doc.getProperty(PropertyAlias).Value = Value;
doc.Publish(new BusinessLogic.User(0));
Document doc = new Document(Convert.ToInt32(id));
if (doc.getProperty(PropertyAlias) != null)
{
d.OriginalValue = doc.getProperty(PropertyAlias).Value.ToString();
doc.getProperty(PropertyAlias).Value = Value;
doc.Publish(new BusinessLogic.User(0));
d.NewValue = Value;
d.TaskExecutionStatus = TaskExecutionStatus.Completed;
}
else
d.TaskExecutionStatus = TaskExecutionStatus.Cancelled;
d.NewValue = Value;
d.TaskExecutionStatus = TaskExecutionStatus.Completed;
}
else
d.TaskExecutionStatus = TaskExecutionStatus.Cancelled;

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

@@ -3,7 +3,7 @@
<asp:Panel id="pl_CustomizeSkin" runat="server" Visible="false">
<h3>Starter kit and skin have been installed</h3>
<p><a target="_blank" href="<%= umbraco.GlobalSettings.Path %>/canvas.aspx?redir=<%= this.ResolveUrl("~/") %>&umbSkinning=true&umbSkinningConfigurator=true" target="_blank">Browse and customize your new site</a></p>
<p id="customizelink"><a target="_blank" href="<%= umbraco.GlobalSettings.Path %>/canvas.aspx?redir=<%= this.ResolveUrl("~/") %>&umbSkinning=true&umbSkinningConfigurator=true" target="_blank">Browse and customize your new site</a></p>
</asp:Panel>

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

@@ -110,7 +110,9 @@ namespace umbraco.presentation.install.steps.Skinning
pl_CustomizeSkin.Visible = true;
pl_loadStarterKitDesigns.Visible = false;
Page.FindControl("next").Visible = true;
if(Page.FindControl("next") != null)
Page.FindControl("next").Visible = true;
}
else

2
umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx
View File

@@ -20,7 +20,7 @@
}
</script>
<style type="text/css">
.declineStarterKits
.declineStarterKits, #customizelink
{
display:none;
}