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

Merge

Browse Source
This commit is contained in:
tg@umbraco.com
2012-10-08 08:43:38 -02:00
parent 775b2192ff 458de6296e
commit 406e3663f6
3 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
View File

@@ -56,14 +56,19 @@ namespace Umbraco.Web.UI.Umbraco.Settings.Views
var li = new ListItem(t.Text, t.Id.ToString());
li.Attributes.Add("id", t.Alias.Replace(" ", ""));
if (t.Id == _template.MasterTemplate)
selectedTemplate = t.Alias.Replace(" ", "");
MasterTemplate.Items.Add(li);
MasterTemplate.Items.Add(li);
}
MasterTemplate.SelectedValue = selectedTemplate;
try
{
if (_template.MasterTemplate > 0)
MasterTemplate.SelectedValue = _template.MasterTemplate.ToString();
}
catch (Exception ex)
{
}
MasterTemplate.SelectedValue = selectedTemplate;
NameTxt.Text = _template.GetRawText();
AliasTxt.Text = _template.Alias;

7
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
View File

@@ -36,12 +36,7 @@ namespace umbraco
protected override void CreateRootNode(ref XmlTreeNode rootNode)
{
if (!Umbraco.Core.Configuration.UmbracoSettings.EnableMvcSupport)
rootNode.NodeType = "init" + TreeAlias;
else
rootNode.NodeType = "initviews";
rootNode.NodeType = "init" + TreeAlias;
rootNode.NodeID = "init";
}

20
src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
View File

@@ -50,19 +50,7 @@ namespace umbraco.cms.presentation.settings
if (t.Id != _template.Id)
{
var li = new ListItem(t.Text, t.Id.ToString());
li.Attributes.Add("id", t.Alias.Replace(" ", ""));
if (t.Id == _template.MasterTemplate)
{
try
{
li.Selected = true;
}
catch
{
}
}
MasterTemplate.Items.Add(li);
}
}
@@ -71,6 +59,14 @@ namespace umbraco.cms.presentation.settings
AliasTxt.Text = _template.Alias;
editorSource.Text = _template.Design;
try
{
if (_template.MasterTemplate > 0)
MasterTemplate.SelectedValue = _template.MasterTemplate.ToString();
}
catch (Exception ex)
{
}
ClientTools
.SetActiveTreeType(TreeDefinitionCollection.Instance.FindTree<loadTemplates>().Tree.Alias)