From 924f5d24629b9e0518e0492c328351285854fbdd Mon Sep 17 00:00:00 2001 From: PoorbandTony Date: Wed, 23 May 2012 14:44:43 -0100 Subject: [PATCH 01/33] Work item:26577 --- umbraco/cms/businesslogic/workflow/Notification.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/umbraco/cms/businesslogic/workflow/Notification.cs b/umbraco/cms/businesslogic/workflow/Notification.cs index 8d1e7c07a2..515917ff5f 100644 --- a/umbraco/cms/businesslogic/workflow/Notification.cs +++ b/umbraco/cms/businesslogic/workflow/Notification.cs @@ -114,7 +114,7 @@ namespace umbraco.cms.businesslogic.workflow { summary.Append(""); summary.Append("" + p.PropertyType.Name + ""); - summary.Append("" + p.Value.ToString() + ""); + summary.Append("" + p.Value.ToString() + ""); summary.Append(""); } summary.Append(" "); From b9624fbe7ed7477f70a3bf415627d6a82b9d17b2 Mon Sep 17 00:00:00 2001 From: "agrath@gmail.com" Date: Mon, 11 Jun 2012 16:43:51 -0100 Subject: [PATCH 02/33] Add new UmbracoClientManager function to set appSection and right frame url --- .../Application/UmbracoClientManager.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/umbraco/presentation/umbraco_client/Application/UmbracoClientManager.js b/umbraco/presentation/umbraco_client/Application/UmbracoClientManager.js index 2f277a9c00..0f26a376b5 100644 --- a/umbraco/presentation/umbraco_client/Application/UmbracoClientManager.js +++ b/umbraco/presentation/umbraco_client/Application/UmbracoClientManager.js @@ -94,6 +94,10 @@ Umbraco.Sys.registerNamespace("Umbraco.Application"); // windowMgr: function() // return null; // }, + contentFrameAndSection: function(app, rightFrameUrl){ + this.appActions().shiftApp(app, this.uiKeys()['sections_' + app]); + this.contentFrame(rightFrameUrl); + }, contentFrame: function(strLocation) { /// /// This will return the reference to the right content frame if strLocation is null or empty, @@ -101,6 +105,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Application"); /// this._debug("contentFrame: " + strLocation); + if (strLocation == null || strLocation == "") { if (typeof this.mainWindow().right != "undefined") { return this.mainWindow().right; @@ -121,12 +126,13 @@ Umbraco.Sys.registerNamespace("Umbraco.Application"); } this._debug("contentFrame: parsed location: " + strLocation); + var self = this; window.setTimeout(function(){ - if (typeof this.mainWindow().right != "undefined") { - this.mainWindow().right.location.href = strLocation; + if (typeof self.mainWindow().right != "undefined") { + self.mainWindow().right.location.href = strLocation; } else { - this.mainWindow().location.href = strLocation; //set the current windows location if the right frame doesn't exist int he current context + self.mainWindow().location.href = strLocation; //set the current windows location if the right frame doesn't exist int he current context } },200); } From cded3fa060b76d3de3ac250c3ef57d102b89d7a4 Mon Sep 17 00:00:00 2001 From: "agrath@gmail.com" Date: Mon, 11 Jun 2012 16:44:31 -0100 Subject: [PATCH 03/33] Change DeepLink class so it can return internal or external links and add GetAnchor method (renaming Get to GetUrl) --- umbraco/cms/helpers/DeepLink.cs | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/umbraco/cms/helpers/DeepLink.cs b/umbraco/cms/helpers/DeepLink.cs index f5ed0c6f82..e66a458146 100644 --- a/umbraco/cms/helpers/DeepLink.cs +++ b/umbraco/cms/helpers/DeepLink.cs @@ -23,7 +23,23 @@ namespace umbraco.cms.helpers string sPath = string.Join(",", treePath.ToArray()); return sPath; } - public static string Get(DeepLinkType type, string idOrFilePath) + public static string GetAnchor(DeepLinkType type, string idOrFilePath, bool useJavascript) + { + string url = GetUrl(type, idOrFilePath, useJavascript); + if (!string.IsNullOrEmpty(url)) + { + if (!useJavascript) + { + return string.Format("Edit >", url); + } + else + { + return string.Format("Edit >", url); + } + } + return null; + } + public static string GetUrl(DeepLinkType type, string idOrFilePath, bool useJavascript) { string basePath = "/umbraco/umbraco.aspx"; @@ -98,7 +114,15 @@ namespace umbraco.cms.helpers if (currentUser.Applications.Any(app => app.alias == section)) { string rightAction = string.Format("{0}?{1}={2}", editorUrl, idKey, idOrFilePath); - return string.Format("{0}?app={1}&rightAction={2}#{1}", basePath, section, HttpContext.Current.Server.UrlEncode(rightAction)); + if (!useJavascript) + { + string rightActionEncoded = HttpContext.Current.Server.UrlEncode(rightAction); + return string.Format("{0}?app={1}&rightAction={2}#{1}", basePath, section, rightActionEncoded); + } + else + { + return string.Format("javascript:UmbClientMgr.contentFrameAndSection('{0}','{1}');", section, rightAction); + } } } } From 7f7d8b85659772419c1af92982dc84003d2e66ef Mon Sep 17 00:00:00 2001 From: "agrath@gmail.com" Date: Mon, 11 Jun 2012 16:45:02 -0100 Subject: [PATCH 04/33] Add Link from Document Type's template list to templates --- .../umbraco/settings/EditNodeTypeNew.aspx.cs | 79 +++++++++---------- 1 file changed, 37 insertions(+), 42 deletions(-) diff --git a/umbraco/presentation/umbraco/settings/EditNodeTypeNew.aspx.cs b/umbraco/presentation/umbraco/settings/EditNodeTypeNew.aspx.cs index d113683502..c5a8ff579f 100644 --- a/umbraco/presentation/umbraco/settings/EditNodeTypeNew.aspx.cs +++ b/umbraco/presentation/umbraco/settings/EditNodeTypeNew.aspx.cs @@ -10,6 +10,8 @@ using System.Web.UI.WebControls; using System.Web.UI.HtmlControls; using umbraco.cms.presentation.Trees; using umbraco.cms.businesslogic.web; +using System.Linq; +using umbraco.cms.helpers; namespace umbraco.settings { @@ -49,59 +51,52 @@ namespace umbraco.settings } + private void bindTemplates() { - cms.businesslogic.template.Template[] selectedTemplates = dt.allowedTemplates; - - DataTable dtAllowedTemplates = new DataTable(); - dtTemplates.Columns.Add("name"); - dtTemplates.Columns.Add("id"); - dtTemplates.Columns.Add("selected"); - - - ddlTemplates.Items.Add(new ListItem("Ingen template", "0")); - foreach (cms.businesslogic.template.Template t in cms.businesslogic.template.Template.GetAllAsList()) - { - DataRow dr = dtTemplates.NewRow(); - dr["name"] = t.Text; - dr["id"] = t.Id; - dr["selected"] = false; - foreach (cms.businesslogic.template.Template t1 in selectedTemplates) - if (t1 != null && t1.Id == t.Id) - dr["selected"] = true; - - dtTemplates.Rows.Add(dr); - - } + var templates = (from t in cms.businesslogic.template.Template.GetAllAsList() + join at in dt.allowedTemplates on t.Id equals at.Id into at_l + from at in at_l.DefaultIfEmpty() + select new + { + Id = t.Id, + Name = t.Text, + Selected = at != null + }).ToList(); templateList.Items.Clear(); - - foreach (DataRow dr in dtTemplates.Rows) + templateList.Items.AddRange(templates.ConvertAll(item => { - ListItem li = new ListItem(dr["name"].ToString(), dr["id"].ToString()); - if (bool.Parse(dr["selected"].ToString())) - li.Selected = true; - templateList.Items.Add(li); - } + string anchor = DeepLink.GetAnchor(DeepLinkType.Template, item.Id.ToString(), true); + ListItem li = new ListItem(); + if (!string.IsNullOrEmpty(anchor)) + { + li.Text = string.Format("{0} {1}", item.Name, anchor); + } + else + { + li.Text = item.Name; + } + li.Value = item.Id.ToString(); + li.Selected = item.Selected; + return li; + }).ToArray()); + + ddlTemplates.Enabled = templates.Any(); ddlTemplates.Items.Clear(); - foreach (DataRow dr in dtTemplates.Rows) - { - ListItem li = new ListItem(dr["name"].ToString(), dr["id"].ToString()); - if (li.Value == dt.DefaultTemplate.ToString()) - li.Selected = true; - if (bool.Parse(dr["selected"].ToString())) - ddlTemplates.Items.Add(li); - } - if (ddlTemplates.Items.Count > 0) ddlTemplates.Enabled = true; - else ddlTemplates.Enabled = false; - - // Add choose to ddlTemplates ddlTemplates.Items.Insert(0, new ListItem(ui.Text("choose") + "...", "0")); + ddlTemplates.Items.AddRange(templates.ConvertAll(item => + { + ListItem li = new ListItem(); + li.Text = item.Name; + li.Value = item.Id.ToString(); + li.Selected = item.Selected; + return li; + }).ToArray()); } - protected override bool OnBubbleEvent(object source, EventArgs args) { bool handled = false; From de2d8eb53809b717d0bb3916b7c6e5a208a047e3 Mon Sep 17 00:00:00 2001 From: "agrath@gmail.com" Date: Mon, 11 Jun 2012 17:50:39 -0100 Subject: [PATCH 05/33] Fix EditDocumentType default template selection in rewritten codebehind --- umbraco/presentation/umbraco/settings/EditNodeTypeNew.aspx.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/umbraco/presentation/umbraco/settings/EditNodeTypeNew.aspx.cs b/umbraco/presentation/umbraco/settings/EditNodeTypeNew.aspx.cs index c5a8ff579f..075b6a82ee 100644 --- a/umbraco/presentation/umbraco/settings/EditNodeTypeNew.aspx.cs +++ b/umbraco/presentation/umbraco/settings/EditNodeTypeNew.aspx.cs @@ -91,10 +91,12 @@ namespace umbraco.settings ListItem li = new ListItem(); li.Text = item.Name; li.Value = item.Id.ToString(); - li.Selected = item.Selected; return li; }).ToArray()); + var ddlTemplatesSelect = ddlTemplates.Items.FindByValue(dt.DefaultTemplate.ToString()); + if (ddlTemplatesSelect != null) ddlTemplatesSelect.Selected = true; + } protected override bool OnBubbleEvent(object source, EventArgs args) From 2a0216d47b79d914b4ebba93951c778bd470a0b8 Mon Sep 17 00:00:00 2001 From: "agrath@gmail.com" Date: Mon, 11 Jun 2012 17:51:01 -0100 Subject: [PATCH 06/33] Handle a null reference in scrollingmenu --- .../umbraco_client/scrollingmenu/javascript.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/umbraco/presentation/umbraco_client/scrollingmenu/javascript.js b/umbraco/presentation/umbraco_client/scrollingmenu/javascript.js index f78e0aa5c2..48ec85f905 100644 --- a/umbraco/presentation/umbraco_client/scrollingmenu/javascript.js +++ b/umbraco/presentation/umbraco_client/scrollingmenu/javascript.js @@ -81,9 +81,12 @@ function scrollL(elId, elHid, InnerWidth) { doScroll = true; - el = document.getElementById(elId); - FromLeftMax = (InnerWidth - document.getElementById(elHid).offsetWidth)*-1; - scrollHorisontal(0); + el = document.getElementById(elId); + var hiddenEl = document.getElementById(elHid); + if (hiddenEl) { + FromLeftMax = (InnerWidth - hiddenEl.offsetWidth) * -1; + scrollHorisontal(0); + } } function scrollStop() { From 08a7285fda90961339e9a105888bd1346594ea32 Mon Sep 17 00:00:00 2001 From: "agrath@gmail.com" Date: Mon, 11 Jun 2012 17:51:36 -0100 Subject: [PATCH 07/33] Add a copy of the document type icon for use in the toolbar --- .../umbraco/images/editor/documentType.gif | Bin 0 -> 607 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 umbraco/presentation/umbraco/images/editor/documentType.gif diff --git a/umbraco/presentation/umbraco/images/editor/documentType.gif b/umbraco/presentation/umbraco/images/editor/documentType.gif new file mode 100644 index 0000000000000000000000000000000000000000..0fb441068af570201a2919e4d736291e8e427baf GIT binary patch literal 607 zcmZ?wbhEHb6krfwc$UquaN)uwOO`%+_H5z8#S0cJTC!xxqD702pEx;h-hw&v=Fgrx z@95E^&8=-sEiG%-uC1-Aoiusc^ck}jFJAoi?c3S&=D&IKX6N4BFJ8WwIde``b=}+11~>e8r0Hp8ln)R?eHhFgv$s`N~z#odfg`bLSm7di21dLzk{zU9@P) z%a<>6^NSWN1TvR4H?`I^HXl2Aa@&sW6DLoNiBAj;k2-z!{Nck#jvYU~Z26LuwCp8I zftIh!&o4ZE=JeV%YmT2hed_e-^o;BkE0;fi{(RQ#`91x8=gyt)?wzoHsJo$N>(ygOd(;{t**^M;SUHqSpCx-7IiTzYDX=Z JBgw&F4FJ<48@&Jk literal 0 HcmV?d00001 From fe39c7d93eeb713824a4ada31fae9643f777313b Mon Sep 17 00:00:00 2001 From: "agrath@gmail.com" Date: Mon, 11 Jun 2012 17:52:03 -0100 Subject: [PATCH 08/33] Add new method to Template that fetches the DocumentTypes that reference it --- umbraco/cms/businesslogic/template/Template.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/umbraco/cms/businesslogic/template/Template.cs b/umbraco/cms/businesslogic/template/Template.cs index f5c6585d80..979dcc1cfa 100644 --- a/umbraco/cms/businesslogic/template/Template.cs +++ b/umbraco/cms/businesslogic/template/Template.cs @@ -326,7 +326,10 @@ namespace umbraco.cms.businesslogic.template } } - + public IEnumerable GetDocumentTypes() + { + return DocumentType.GetAllAsList().Where(x => x.allowedTemplates.Select(t => t.Id).Contains(this.Id)); + } public static Template MakeNew(string Name, BusinessLogic.User u, Template master) { From b890ba88990714c3521612bc5f94ea25464ddc74 Mon Sep 17 00:00:00 2001 From: "agrath@gmail.com" Date: Mon, 11 Jun 2012 17:52:21 -0100 Subject: [PATCH 09/33] Project commit for addition of new graphic --- umbraco/presentation/umbraco.presentation.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj index f905943e1d..dd4bd24dd9 100644 --- a/umbraco/presentation/umbraco.presentation.csproj +++ b/umbraco/presentation/umbraco.presentation.csproj @@ -1725,6 +1725,7 @@ + From 93482fe52878cc448209c40606065a1d57e064f7 Mon Sep 17 00:00:00 2001 From: "agrath@gmail.com" Date: Mon, 11 Jun 2012 17:52:51 -0100 Subject: [PATCH 10/33] Add link from Template to DocumentType into toolbar --- .../umbraco/settings/editTemplate.aspx | 30 +++++++++++++++++++ .../umbraco/settings/editTemplate.aspx.cs | 13 +++++++- .../settings/editTemplate.aspx.designer.cs | 18 +++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) diff --git a/umbraco/presentation/umbraco/settings/editTemplate.aspx b/umbraco/presentation/umbraco/settings/editTemplate.aspx index c4b4eb6f24..8b9b03685b 100644 --- a/umbraco/presentation/umbraco/settings/editTemplate.aspx +++ b/umbraco/presentation/umbraco/settings/editTemplate.aspx @@ -13,6 +13,8 @@ jQuery(document).ready(function() { + + //macro split button jQuery('#sbMacro').splitbutton({menu:'#macroMenu'}); @@ -98,6 +100,9 @@ }); } + //document types split button + jQuery('#sbDocType').splitbutton({menu:'#docTypeMenu'}); + jQuery("#splitButtonDocType").appendTo("#splitButtonDocTypePlaceHolder"); //razor macro split button jQuery('#sb').splitbutton({menu:'#codeTemplateMenu'}); @@ -110,6 +115,8 @@ insertCodeBlockFromTemplate(jQuery(this).attr("rel")); }); + + }); function doSubmit() { @@ -291,6 +298,29 @@ + +
+ + Document Types that Use this Template + +
+
+
+ Document Types that Use this Template +
+
+ None +
+ + +
+ <%# DataBinder.Eval(Container, "DataItem.Text")%> +   + <%#umbraco.cms.helpers.DeepLink.GetAnchor(umbraco.cms.helpers.DeepLinkType.DocumentType, string.Format("{0}",DataBinder.Eval(Container,"DataItem.Id")), true)%> +
+ +
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; } } From 13504963fe9404cb4c11bd21eb04ac3cdb61b181 Mon Sep 17 00:00:00 2001 From: "agrath@gmail.com" Date: Tue, 12 Jun 2012 04:42:17 -0100 Subject: [PATCH 19/33] Add Umbraco.sdf to the umbraco.presentation project --- umbraco/presentation/umbraco.presentation.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj index 0fc6bccbff..65989f2025 100644 --- a/umbraco/presentation/umbraco.presentation.csproj +++ b/umbraco/presentation/umbraco.presentation.csproj @@ -1721,6 +1721,7 @@ True Reference.map + @@ -3317,7 +3318,6 @@ - From 82cad651fcafd21b9acd4149f571979f7a5848c2 Mon Sep 17 00:00:00 2001 From: "agrath@gmail.com" Date: Tue, 12 Jun 2012 04:44:37 -0100 Subject: [PATCH 20/33] Roll Umbraco.sdf back to previous version from 4.7.2 --- umbraco/presentation/App_Data/Umbraco.sdf | Bin 20480 -> 20480 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/umbraco/presentation/App_Data/Umbraco.sdf b/umbraco/presentation/App_Data/Umbraco.sdf index a4ad7651d4afc3d00ec7d63952aff739fd78e400..90935a7f0b42847f1a5892b30dcfce1d172cf218 100644 GIT binary patch delta 59 zcmZozz}T>WkwxZlXTU@j6Gn!Omd6<Wk;T14pk^YA2_xf1%j1lu-`f}&5-k}Rc%m5?qL~>OQZ9QlOy^->ID5>S q0R%woYB2_eNT8goBm;vpkiC6kpfKBSKX-<8`!@>;Y~o!c-~a$1ixzVL From c58a1e2d97f8f55adf5b734058d6e8bedd533f40 Mon Sep 17 00:00:00 2001 From: "agrath@gmail.com" Date: Tue, 12 Jun 2012 07:20:23 -0100 Subject: [PATCH 21/33] Changed the selection criteria for Content Items used by this template to only be published content and added a limit of 100 records returned --- umbraco/cms/businesslogic/template/Template.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/umbraco/cms/businesslogic/template/Template.cs b/umbraco/cms/businesslogic/template/Template.cs index 1c2c0900f1..b6b622da61 100644 --- a/umbraco/cms/businesslogic/template/Template.cs +++ b/umbraco/cms/businesslogic/template/Template.cs @@ -331,14 +331,20 @@ namespace umbraco.cms.businesslogic.template { return DocumentType.GetAllAsList().Where(x => x.allowedTemplates.Select(t => t.Id).Contains(this.Id)); } - public IEnumerable GetContent() + public IEnumerable> GetContent() { List> list = new List>(); - using (IRecordsReader dr = SqlHelper.ExecuteReader("Select nodeid, text from cmsDocument where templateId = " + this.Id)) + using (IRecordsReader dr = SqlHelper.ExecuteReader("Select nodeid, text from cmsDocument where published = 1 and templateId = " + this.Id)) { + int i = 0; while (dr.Read()) { list.Add(new System.Tuple(dr.GetInt("nodeid"), dr.GetString("text"))); + i++; + if (i >= 100) + { + break; + } } dr.Close(); } From 4600123f06274bd41656a08945100ed349b5dde5 Mon Sep 17 00:00:00 2001 From: "agrath@gmail.com" Date: Tue, 12 Jun 2012 07:21:03 -0100 Subject: [PATCH 22/33] Finished content drop down binding and refactored split button overflow panels into a function so it can be used multiple times --- .../umbraco/settings/editTemplate.aspx | 137 +++++++----------- .../umbraco/settings/editTemplate.aspx.cs | 15 ++ 2 files changed, 67 insertions(+), 85 deletions(-) diff --git a/umbraco/presentation/umbraco/settings/editTemplate.aspx b/umbraco/presentation/umbraco/settings/editTemplate.aspx index ad4e45a5e5..038d607c9a 100644 --- a/umbraco/presentation/umbraco/settings/editTemplate.aspx +++ b/umbraco/presentation/umbraco/settings/editTemplate.aspx @@ -9,25 +9,13 @@ + diff --git a/umbraco/presentation/umbraco/settings/EditNodeTypeNew.aspx.designer.cs b/umbraco/presentation/umbraco/settings/EditNodeTypeNew.aspx.designer.cs index 19f03326bd..46f4e80c35 100644 --- a/umbraco/presentation/umbraco/settings/EditNodeTypeNew.aspx.designer.cs +++ b/umbraco/presentation/umbraco/settings/EditNodeTypeNew.aspx.designer.cs @@ -12,6 +12,24 @@ namespace umbraco.settings { public partial class EditContentTypeNew { + /// + /// CssInclude1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.CssInclude CssInclude1; + + /// + /// JsInclude control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.JsInclude JsInclude; + /// /// tmpPane control. /// From 53f549826ecd8b7bf2f55df39e25bb92d8ae8465 Mon Sep 17 00:00:00 2001 From: "agrath@gmail.com" Date: Thu, 14 Jun 2012 08:41:50 -0100 Subject: [PATCH 29/33] Add content using this DocumentType dropdown to the toolbar --- .../controls/ContentTypeControlNew.ascx | 24 +++++++++++++++- .../controls/ContentTypeControlNew.ascx.cs | 28 ++++++++++++++++++- .../ContentTypeControlNew.ascx.designer.cs | 18 ++++++++++++ 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx b/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx index 740afbbed2..90ca8ab241 100644 --- a/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx +++ b/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx @@ -94,7 +94,29 @@ - + +
+
+ Content that Uses this Document Type +
+
+ None +
+ + +
+ +   + +
+ + +