diff --git a/umbraco/presentation/umbraco/images/editor/doc.gif b/umbraco/presentation/umbraco/images/editor/doc.gif
new file mode 100644
index 0000000000..1d70fcc88d
Binary files /dev/null and b/umbraco/presentation/umbraco/images/editor/doc.gif differ
diff --git a/umbraco/presentation/umbraco/settings/editTemplate.aspx b/umbraco/presentation/umbraco/settings/editTemplate.aspx
index 8b9b03685b..ad4e45a5e5 100644
--- a/umbraco/presentation/umbraco/settings/editTemplate.aspx
+++ b/umbraco/presentation/umbraco/settings/editTemplate.aspx
@@ -104,6 +104,11 @@
jQuery('#sbDocType').splitbutton({menu:'#docTypeMenu'});
jQuery("#splitButtonDocType").appendTo("#splitButtonDocTypePlaceHolder");
+ //content split button
+ jQuery('#sbContent').splitbutton({menu:'#contentMenu'});
+ jQuery("#splitButtonContent").appendTo("#splitButtonContentPlaceHolder");
+
+
//razor macro split button
jQuery('#sb').splitbutton({menu:'#codeTemplateMenu'});
@@ -322,9 +327,33 @@
-
diff --git a/umbraco/presentation/umbraco/settings/editTemplate.aspx.cs b/umbraco/presentation/umbraco/settings/editTemplate.aspx.cs
index c06abae2a1..e0663cd279 100644
--- a/umbraco/presentation/umbraco/settings/editTemplate.aspx.cs
+++ b/umbraco/presentation/umbraco/settings/editTemplate.aspx.cs
@@ -79,10 +79,24 @@ namespace umbraco.cms.presentation.settings
LoadScriptingTemplates();
LoadMacros();
LoadDocTypes();
+ LoadContent();
}
}
-
+ protected void splitButtonDocumentTypesRepeater_ItemDataBound(object sender, RepeaterItemEventArgs e)
+ {
+ if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem)
+ {
+ Tuple item = e.Item.DataItem as Tuple;
+ if (item != null)
+ {
+ Literal uxName = e.Item.FindControl("uxName") as Literal;
+ PlaceHolder uxLink = e.Item.FindControl("uxLink") as PlaceHolder;
+ uxName.Text = item.Item2;
+ uxLink.Controls.Add(new LiteralControl(umbraco.cms.helpers.DeepLink.GetAnchor(helpers.DeepLinkType.Content, item.Item1.ToString(), true)));
+ }
+ }
+ }
protected override void OnInit(EventArgs e)
{
_template = new Template(int.Parse(Request.QueryString["templateID"]));
@@ -173,6 +187,9 @@ namespace umbraco.cms.presentation.settings
Panel1.Menu.InsertSplitter();
Panel1.Menu.NewElement("div", "splitButtonDocTypePlaceHolder", "sbPlaceHolder", 40);
+ Panel1.Menu.InsertSplitter();
+ Panel1.Menu.NewElement("div", "splitButtonContentPlaceHolder", "sbPlaceHolder", 40);
+
// Help
Panel1.Menu.InsertSplitter();
@@ -230,7 +247,13 @@ namespace umbraco.cms.presentation.settings
splitButtonDocumentTypesRepeater.DataBind();
uxNoDocumentTypes.Visible = !data.Any();
}
-
+ private void LoadContent()
+ {
+ var data = _template.GetContent();
+ splitButtonContentRepeater.DataSource = data;
+ splitButtonContentRepeater.DataBind();
+ uxNoContent.Visible = !data.Any();
+ }
public string DoesMacroHaveSettings(string macroId)
{
if (
diff --git a/umbraco/presentation/umbraco/settings/editTemplate.aspx.designer.cs b/umbraco/presentation/umbraco/settings/editTemplate.aspx.designer.cs
index fb7403ee8a..f624db48c3 100644
--- a/umbraco/presentation/umbraco/settings/editTemplate.aspx.designer.cs
+++ b/umbraco/presentation/umbraco/settings/editTemplate.aspx.designer.cs
@@ -155,5 +155,23 @@ namespace umbraco.cms.presentation.settings {
/// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.Repeater splitButtonDocumentTypesRepeater;
+
+ ///
+ /// uxNoContent control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl uxNoContent;
+
+ ///
+ /// splitButtonContentRepeater control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Repeater splitButtonContentRepeater;
}
}