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

[TFS Changeset #77696]

Browse Source
This commit is contained in:
PerPloug
2010-10-01 10:27:48 +00:00
parent 6b3ef0e3bf
commit 72fb76e4e0
10 changed files with 57 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
umbraco/presentation/install/steps/chooseStarterKit.ascx
View File

@@ -1 +0,0 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="chooseStarterKit.ascx.cs" Inherits="umbraco.presentation.install.steps.chooseStarterKit" %>

17
umbraco/presentation/install/steps/chooseStarterKit.ascx.cs
View File

@@ -1,17 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace umbraco.presentation.install.steps
{
public partial class chooseStarterKit : System.Web.UI.UserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}

17
umbraco/presentation/install/steps/chooseStarterKit.ascx.designer.cs generated
View File

@@ -1,17 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.presentation.install.steps
{
public partial class chooseStarterKit
{
}
}

1
umbraco/presentation/install/steps/chooseStarterKitDesign.ascx
View File

@@ -1 +0,0 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="chooseStarterKitDesign.ascx.cs" Inherits="umbraco.presentation.install.steps.chooseStarterKitDesign" %>

17
umbraco/presentation/install/steps/chooseStarterKitDesign.ascx.cs
View File

@@ -1,17 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace umbraco.presentation.install.steps
{
public partial class chooseStarterKitDesign : System.Web.UI.UserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}

17
umbraco/presentation/install/steps/chooseStarterKitDesign.ascx.designer.cs generated
View File

@@ -1,17 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.presentation.install.steps
{
public partial class chooseStarterKitDesign
{
}
}

1
umbraco/presentation/umbraco.presentation.csproj
View File

@@ -1627,6 +1627,7 @@
<Content Include="umbraco\images\aboutNew.png" />
<Content Include="umbraco\images\loginBg.png" />
<Content Include="umbraco\images\umbracoSplash.png" />
<Content Include="umbraco\images\umbraco\settingSkin.gif" />
<Content Include="umbraco\LiveEditing\Modules\SkinModule\ImageUploader.aspx" />
<Content Include="umbraco\LiveEditing\Modules\SkinModule\js\disableInstallButtonsOnClick.js" />
<Content Include="umbraco\LiveEditing\Modules\SkinModule\js\SkinModuleShowOnStartup.js" />

4
umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs
View File

@@ -114,7 +114,7 @@ namespace umbraco.presentation.LiveEditing.Modules.SkinModule
nodeFactory.Node n = nodeFactory.Node.GetCurrent();
ActiveSkin = Skin.CreateFromAlias(Skinning.GetCurrentSkinAlias(n.template));
ActiveSkin = Skin.CreateFromAlias( Skinning.GetCurrentSkinAlias(n.template) );
pnl_connectionerror.Visible = false;
@@ -171,7 +171,7 @@ namespace umbraco.presentation.LiveEditing.Modules.SkinModule
if (((Button)sender).CommandName == "apply")
{
Skinning.ActivateAsCurrentSkin(Skin.CreateFromName(((Button)sender).CommandArgument));
this.Page.Response.Redirect(library.NiceUrl(int.Parse(UmbracoContext.Current.PageId.ToString())));
this.Page.Response.Redirect(library.NiceUrl(int.Parse(UmbracoContext.Current.PageId.ToString())) + "?umbSkinning=true");
}
else if (((Button)sender).CommandName == "remove")
{

BIN
umbraco/presentation/umbraco/images/umbraco/settingSkin.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

108
umbraco/presentation/umbraco/settings/editTemplate.aspx.cs
View File

@@ -23,20 +23,20 @@ namespace umbraco.cms.presentation.settings
{
private cms.businesslogic.template.Template _template;
protected override void OnPreRender(EventArgs e) {
base.OnPreRender(e);
protected override void OnPreRender(EventArgs e) {
base.OnPreRender(e);
ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference( IOHelper.ResolveUrl( SystemDirectories.Webservices + "/codeEditorSave.asmx") ));
ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference( IOHelper.ResolveUrl( SystemDirectories.Webservices + "/legacyAjaxCalls.asmx") ));
}
ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference( IOHelper.ResolveUrl( SystemDirectories.Webservices + "/codeEditorSave.asmx") ));
ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference( IOHelper.ResolveUrl( SystemDirectories.Webservices + "/legacyAjaxCalls.asmx") ));
}
protected void Page_Load(object sender, System.EventArgs e)
{
MasterTemplate.Attributes.Add("onchange", "changeMasterPageFile()");
MasterTemplate.Attributes.Add("onchange", "changeMasterPageFile()");
if (!IsPostBack) {
if (!IsPostBack) {
MasterTemplate.Items.Add(new ListItem(ui.Text("none"),"0"));
foreach (cms.businesslogic.template.Template t in cms.businesslogic.template.Template.GetAllAsList())
@@ -45,7 +45,7 @@ namespace umbraco.cms.presentation.settings
{
ListItem li = new ListItem(t.Text,t.Id.ToString());
li.Attributes.Add("id", t.Alias.Replace(" ", ""));
li.Attributes.Add("id", t.Alias.Replace(" ", ""));
if (t.Id == _template.MasterTemplate)
{
@@ -61,20 +61,20 @@ namespace umbraco.cms.presentation.settings
NameTxt.Text = _template.GetRawText();
AliasTxt.Text = _template.Alias;
editorSource.Text = _template.Design;
editorSource.Text = _template.Design;
ClientTools
.SetActiveTreeType(TreeDefinitionCollection.Instance.FindTree<loadTemplates>().Tree.Alias)
.SyncTree(_template.Id.ToString(), false);
}
}
}
override protected void OnInit(EventArgs e)
{
_template = new cms.businesslogic.template.Template(int.Parse(Request.QueryString["templateID"]));
_template = new cms.businesslogic.template.Template(int.Parse(Request.QueryString["templateID"]));
//
// CODEGEN: This call is required by the ASP.NET Web Form Designer.
//
@@ -82,67 +82,67 @@ namespace umbraco.cms.presentation.settings
base.OnInit(e);
Panel1.hasMenu = true;
uicontrols.MenuIconI save = Panel1.Menu.NewIcon();
save.ImageURL = SystemDirectories.Umbraco + "/images/editor/save.gif";
save.OnClickCommand = "doSubmit()";
save.AltText = ui.Text("save");
uicontrols.MenuIconI save = Panel1.Menu.NewIcon();
save.ImageURL = SystemDirectories.Umbraco + "/images/editor/save.gif";
save.OnClickCommand = "doSubmit()";
save.AltText = ui.Text("save");
Panel1.Text = ui.Text("edittemplate");
pp_name.Text = ui.Text("name", base.getUser());
pp_alias.Text = ui.Text("alias", base.getUser());
pp_masterTemplate.Text = ui.Text("mastertemplate", base.getUser());
pp_name.Text = ui.Text("name", base.getUser());
pp_alias.Text = ui.Text("alias", base.getUser());
pp_masterTemplate.Text = ui.Text("mastertemplate", base.getUser());
// Editing buttons
Panel1.Menu.InsertSplitter();
uicontrols.MenuIconI umbField = Panel1.Menu.NewIcon();
umbField.ImageURL = UmbracoPath + "/images/editor/insField.gif";
umbField.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" + editorSource.ClientID + "&tagName=UMBRACOGETDATA", ui.Text("template", "insertPageField"), 640, 550);
umbField.AltText = ui.Text("template", "insertPageField");
umbField.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" + editorSource.ClientID + "&tagName=UMBRACOGETDATA", ui.Text("template", "insertPageField"), 640, 550);
umbField.AltText = ui.Text("template", "insertPageField");
// TODO: Update icon
uicontrols.MenuIconI umbDictionary = Panel1.Menu.NewIcon();
umbDictionary.ImageURL = GlobalSettings.Path + "/images/editor/dictionaryItem.gif";
umbDictionary.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" + editorSource.ClientID + "&tagName=UMBRACOGETDICTIONARY", ui.Text("template", "insertDictionaryItem"), 640, 550);
umbDictionary.AltText = "Insert umbraco dictionary item";
uicontrols.MenuIconI umbMacro = Panel1.Menu.NewIcon();
umbMacro.ImageURL = UmbracoPath + "/images/editor/insMacro.gif";
umbMacro.AltText = ui.Text("template", "insertMacro");
umbMacro.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/editMacro.aspx?objectId=" + editorSource.ClientID, ui.Text("template", "insertMacro"), 470, 530);
// TODO: Update icon
uicontrols.MenuIconI umbDictionary = Panel1.Menu.NewIcon();
umbDictionary.ImageURL = GlobalSettings.Path + "/images/editor/dictionaryItem.gif";
umbDictionary.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" + editorSource.ClientID + "&tagName=UMBRACOGETDICTIONARY", ui.Text("template", "insertDictionaryItem"), 640, 550);
umbDictionary.AltText = "Insert umbraco dictionary item";
uicontrols.MenuIconI umbMacro = Panel1.Menu.NewIcon();
umbMacro.ImageURL = UmbracoPath + "/images/editor/insMacro.gif";
umbMacro.AltText = ui.Text("template", "insertMacro");
umbMacro.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/editMacro.aspx?objectId=" + editorSource.ClientID, ui.Text("template", "insertMacro"), 470, 530);
if (UmbracoSettings.UseAspNetMasterPages) {
if (UmbracoSettings.UseAspNetMasterPages) {
Panel1.Menu.InsertSplitter();
Panel1.Menu.InsertSplitter();
uicontrols.MenuIconI umbContainer = Panel1.Menu.NewIcon();
umbContainer.ImageURL = UmbracoPath + "/images/editor/masterpagePlaceHolder.gif";
umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder");
umbContainer.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/insertMasterpagePlaceholder.aspx?&id=" + _template.Id.ToString(), ui.Text("template", "insertContentAreaPlaceHolder"), 470, 320);
uicontrols.MenuIconI umbContent = Panel1.Menu.NewIcon();
umbContent.ImageURL = UmbracoPath + "/images/editor/masterpageContent.gif";
umbContent.AltText = ui.Text("template", "insertContentArea");
umbContent.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/insertMasterpageContent.aspx?id=" + _template.Id.ToString(), ui.Text("template", "insertContentArea"), 470, 300);
}
uicontrols.MenuIconI umbContainer = Panel1.Menu.NewIcon();
umbContainer.ImageURL = UmbracoPath + "/images/editor/masterpagePlaceHolder.gif";
umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder");
umbContainer.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/insertMasterpagePlaceholder.aspx?&id=" + _template.Id.ToString(), ui.Text("template", "insertContentAreaPlaceHolder"), 470, 320);
uicontrols.MenuIconI umbContent = Panel1.Menu.NewIcon();
umbContent.ImageURL = UmbracoPath + "/images/editor/masterpageContent.gif";
umbContent.AltText = ui.Text("template", "insertContentArea");
umbContent.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/insertMasterpageContent.aspx?id=" + _template.Id.ToString(), ui.Text("template", "insertContentArea"), 470, 300);
}
if (Skinning.StarterKitGuid(_template.Id).HasValue)
{
Panel1.Menu.InsertSplitter();
uicontrols.MenuIconI umbContainer = Panel1.Menu.NewIcon();
umbContainer.ImageURL = UmbracoPath + "/images/editor/masterpagePlaceHolder.gif";
umbContainer.AltText = ui.Text("template", "modifyTemplateSkin");
//umbContainer.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/TemplateSkinning.aspx?&id=" + _template.Id.ToString(), ui.Text("template", "modifyTemplateSkin"), 570, 420);
umbContainer.OnClickCommand = "parent.window.location = '" + GlobalSettings.Path + "/canvas.aspx?redir=" + this.ResolveUrl("~/") + "&umbSkinning=true&umbSkinningConfigurator=true" + "'";
}
if (Skinning.StarterKitGuid(_template.Id).HasValue)
{
Panel1.Menu.InsertSplitter();
uicontrols.MenuIconI umbContainer = Panel1.Menu.NewIcon();
umbContainer.ImageURL = UmbracoPath + "/images/editor/skin.gif";
umbContainer.AltText = ui.Text("template", "modifyTemplateSkin");
//umbContainer.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/TemplateSkinning.aspx?&id=" + _template.Id.ToString(), ui.Text("template", "modifyTemplateSkin"), 570, 420);
umbContainer.OnClickCommand = "window.open('" + GlobalSettings.Path + "/canvas.aspx?redir=" + this.ResolveUrl("~/") + "&umbSkinning=true&umbSkinningConfigurator=true" + "','canvas')";
}
// Help
Panel1.Menu.InsertSplitter();
uicontrols.MenuIconI helpIcon = Panel1.Menu.NewIcon();
helpIcon.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/settings/modals/showumbracotags.aspx?alias=" + _template.Alias, ui.Text("template", "quickGuide"), 600, 580);
helpIcon.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/settings/modals/showumbracotags.aspx?alias=" + _template.Alias, ui.Text("template", "quickGuide"), 600, 580);
helpIcon.ImageURL = UmbracoPath + "/images/editor/help.png";
helpIcon.AltText = ui.Text("template", "quickGuide");
helpIcon.AltText = ui.Text("template", "quickGuide");
}
/// <summary>