diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index ef6c9ad5a8..2217baf276 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -257,10 +257,6 @@ {89C09045-1064-466B-B94A-DB3AFE2A5853} umbraco.MacroEngines - - {52AB8F1F-FB76-4E8C-885F-0747B6CE71EC} - umbraco.macroRenderings - {6EDD2061-82F2-461B-BB6E-879245A832DE} umbraco.controls diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 9cbaeeee55..f73f034e06 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -241,10 +241,6 @@ {31785BC3-256C-4613-B2F5-A1B0BDDED8C1} Umbraco.Core - - {52AB8F1F-FB76-4E8C-885F-0747B6CE71EC} - umbraco.macroRenderings - {6EDD2061-82F2-461B-BB6E-879245A832DE} umbraco.controls diff --git a/src/umbraco.editorControls/PickerRelations/PickerRelationsPreValueEditor.cs b/src/umbraco.editorControls/PickerRelations/PickerRelationsPreValueEditor.cs index 93b95b68de..14d6f20248 100644 --- a/src/umbraco.editorControls/PickerRelations/PickerRelationsPreValueEditor.cs +++ b/src/umbraco.editorControls/PickerRelations/PickerRelationsPreValueEditor.cs @@ -4,7 +4,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using umbraco.cms.businesslogic.datatype; using umbraco.cms.businesslogic.relation; -using umbraco.macroRenderings; + namespace umbraco.editorControls.PickerRelations { @@ -19,7 +19,7 @@ namespace umbraco.editorControls.PickerRelations /// Prepopulated Umbraco Propery Picker, lists all aliases (could refine this by asking for the context in which this relation wire-up will /// be used, and then only listing the aliases for that context) /// - private propertyTypePicker pickerPropertyAliasPicker = new propertyTypePicker(); + private PropertyTypePicker pickerPropertyAliasPicker = new PropertyTypePicker(); /// /// RequiredFieldValidator for the ProperyAliasPicker diff --git a/src/umbraco.macroRenderings/propertyTypePicker.cs b/src/umbraco.editorControls/PropertyTypePicker.cs similarity index 85% rename from src/umbraco.macroRenderings/propertyTypePicker.cs rename to src/umbraco.editorControls/PropertyTypePicker.cs index 3f5e394ad6..3c5aab59bc 100644 --- a/src/umbraco.macroRenderings/propertyTypePicker.cs +++ b/src/umbraco.editorControls/PropertyTypePicker.cs @@ -1,90 +1,83 @@ -using System; -using System.Collections; -using System.Linq; - -namespace umbraco.macroRenderings -{ - /// - /// Summary description for propertyTypePicker. - /// - public class propertyTypePicker : System.Web.UI.WebControls.ListBox, interfaces.IMacroGuiRendering - { - string _value = ""; - bool _multiple = false; - - public bool ShowCaption - { - get {return true;} - } - - public virtual bool Multiple - { - set {_multiple = value;} - get {return _multiple;} - } - - public string Value - { - get - { - string retVal = ""; - foreach(System.Web.UI.WebControls.ListItem i in base.Items) - if (i.Selected) - retVal += i.Value + ","; - - if (retVal != "") - retVal = retVal.Substring(0, retVal.Length-1); - - return retVal; - } - set - { - _value = value; - } - } - - public propertyTypePicker() - { - // - // TODO: Add constructor logic here - // - } - - protected override void OnInit(EventArgs e) - { - base.OnInit (e); - - this.CssClass = "guiInputTextStandard"; - - // Check for multiple choises - if (_multiple) - { - this.SelectionMode = System.Web.UI.WebControls.ListSelectionMode.Multiple; - this.Rows = 5; - this.Multiple =true; - } - else - { - this.Rows = 1; - this.Items.Add(new System.Web.UI.WebControls.ListItem("", "")); - this.SelectionMode = System.Web.UI.WebControls.ListSelectionMode.Single; - } - - Hashtable ht = new Hashtable(); - foreach(cms.businesslogic.propertytype.PropertyType pt in cms.businesslogic.propertytype.PropertyType.GetAll().OrderBy(x => x.Name)) - { - if (!ht.ContainsKey(pt.Alias)) - { - System.Web.UI.WebControls.ListItem li = new System.Web.UI.WebControls.ListItem(pt.Alias); - if (((string) (", "+_value+",")).IndexOf(", "+pt.Alias+",") > -1) - li.Selected = true; - ht.Add(pt.Alias, ""); - - this.Items.Add(li); - } - } - - } - - } -} +using System; +using System.Collections; +using System.Linq; + +namespace umbraco.editorControls +{ + /// + /// Summary description for propertyTypePicker. + /// + public class PropertyTypePicker : System.Web.UI.WebControls.ListBox, interfaces.IMacroGuiRendering + { + string _value = ""; + bool _multiple = false; + + public bool ShowCaption + { + get {return true;} + } + + public virtual bool Multiple + { + set {_multiple = value;} + get {return _multiple;} + } + + public string Value + { + get + { + string retVal = ""; + foreach(System.Web.UI.WebControls.ListItem i in base.Items) + if (i.Selected) + retVal += i.Value + ","; + + if (retVal != "") + retVal = retVal.Substring(0, retVal.Length-1); + + return retVal; + } + set + { + _value = value; + } + } + + protected override void OnInit(EventArgs e) + { + base.OnInit (e); + + this.CssClass = "guiInputTextStandard"; + + // Check for multiple choises + if (_multiple) + { + this.SelectionMode = System.Web.UI.WebControls.ListSelectionMode.Multiple; + this.Rows = 5; + this.Multiple =true; + } + else + { + this.Rows = 1; + this.Items.Add(new System.Web.UI.WebControls.ListItem("", "")); + this.SelectionMode = System.Web.UI.WebControls.ListSelectionMode.Single; + } + + Hashtable ht = new Hashtable(); + foreach(cms.businesslogic.propertytype.PropertyType pt in cms.businesslogic.propertytype.PropertyType.GetAll().OrderBy(x => x.Name)) + { + if (!ht.ContainsKey(pt.Alias)) + { + System.Web.UI.WebControls.ListItem li = new System.Web.UI.WebControls.ListItem(pt.Alias); + if (((string) (", "+_value+",")).IndexOf(", "+pt.Alias+",") > -1) + li.Selected = true; + ht.Add(pt.Alias, ""); + + this.Items.Add(li); + } + } + + } + + } +} diff --git a/src/umbraco.editorControls/imagecropper/PrevalueEditor.cs b/src/umbraco.editorControls/imagecropper/PrevalueEditor.cs index 14334b8357..15328db454 100644 --- a/src/umbraco.editorControls/imagecropper/PrevalueEditor.cs +++ b/src/umbraco.editorControls/imagecropper/PrevalueEditor.cs @@ -5,7 +5,6 @@ using umbraco.BusinessLogic; using umbraco.editorControls; using umbraco.DataLayer; using umbraco.interfaces; -using umbraco.macroRenderings; namespace umbraco.editorControls.imagecropper { @@ -14,7 +13,7 @@ namespace umbraco.editorControls.imagecropper { private readonly umbraco.cms.businesslogic.datatype.BaseDataType _dataType; - private propertyTypePicker imagePropertyTypePicker; // this has replaced txtPropertyAlias (a textbox used to enter a property alias) + private PropertyTypePicker imagePropertyTypePicker; // this has replaced txtPropertyAlias (a textbox used to enter a property alias) private RequiredFieldValidator imagePropertyRequiredFieldValidator; private CheckBox chkGenerateCrops; @@ -48,7 +47,7 @@ namespace umbraco.editorControls.imagecropper public void SetupChildControls() { - this.imagePropertyTypePicker = new propertyTypePicker() { ID = "imagePropertyTypePicker" }; + this.imagePropertyTypePicker = new PropertyTypePicker() { ID = "imagePropertyTypePicker" }; this.imagePropertyRequiredFieldValidator = new RequiredFieldValidator() { ID = "imagePropertyRequiredFieldValidator", diff --git a/src/umbraco.editorControls/umbraco.editorControls.csproj b/src/umbraco.editorControls/umbraco.editorControls.csproj index 35d05d8f27..a958e640ed 100644 --- a/src/umbraco.editorControls/umbraco.editorControls.csproj +++ b/src/umbraco.editorControls/umbraco.editorControls.csproj @@ -170,10 +170,6 @@ {511F6D8D-7717-440A-9A57-A507E9A8B27F} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - {52AB8F1F-FB76-4E8C-885F-0747B6CE71EC} - umbraco.macroRenderings - @@ -330,6 +326,7 @@ Code + Code diff --git a/src/umbraco.macroRenderings/Properties/AssemblyInfo.cs b/src/umbraco.macroRenderings/Properties/AssemblyInfo.cs deleted file mode 100644 index 019e7c51cd..0000000000 --- a/src/umbraco.macroRenderings/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -// -[assembly: AssemblyTitle("umbraco.macroRenderings")] -[assembly: AssemblyDescription("Core assembly containing legacy macro renderings")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyProduct("Umbraco CMS")] \ No newline at end of file diff --git a/src/umbraco.macroRenderings/autoForms.cs b/src/umbraco.macroRenderings/autoForms.cs deleted file mode 100644 index 58d6358797..0000000000 --- a/src/umbraco.macroRenderings/autoForms.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; - -namespace umbraco.macroRenderings -{ - /// - /// Summary description for autoForms. - /// - public class autoForms : System.Web.UI.HtmlControls.HtmlInputHidden, interfaces.IMacroGuiRendering - { - - private string _value; - public autoForms() - { - // - // TODO: Add constructor logic here - // - } - - protected override void Render(System.Web.UI.HtmlTextWriter writer) - { - writer.WriteLine(""); - } - - #region IMacroGuiRendering Members - - public override string Value - { - set - { - _value = value; - } - } - - public bool ShowCaption - { - get - { - return false; - } - } - - #endregion - } -} diff --git a/src/umbraco.macroRenderings/content.cs b/src/umbraco.macroRenderings/content.cs deleted file mode 100644 index 06d71d5a4e..0000000000 --- a/src/umbraco.macroRenderings/content.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Data; -using Microsoft.ApplicationBlocks.Data; -using System.Data.SqlClient; -using System.Web.UI; -using ClientDependency.Core; - -using umbraco.interfaces; -using umbraco.uicontrols.TreePicker; - -namespace umbraco.macroRenderings -{ - - public class content : SimpleContentPicker, IMacroGuiRendering - { - - #region IMacroGuiRendering Members - - string IMacroGuiRendering.Value - { - get - { - return Value; - } - set - { - Value = value; - } - } - - bool IMacroGuiRendering.ShowCaption - { - get { return true; } - } - - #endregion - - } -} diff --git a/src/umbraco.macroRenderings/contentType.cs b/src/umbraco.macroRenderings/contentType.cs deleted file mode 100644 index 0d72c250d5..0000000000 --- a/src/umbraco.macroRenderings/contentType.cs +++ /dev/null @@ -1,89 +0,0 @@ -using System; -using System.Data; -using System.Data.SqlClient; - - -namespace umbraco.macroRenderings -{ - /// - /// Summary description for contentType. - /// - public class contentTypeSingle : System.Web.UI.WebControls.ListBox, interfaces.IMacroGuiRendering - { - string _value = ""; - bool _multiple = false; - - public bool ShowCaption - { - get {return true;} - } - - public virtual bool Multiple - { - set {_multiple = value;} - get {return _multiple;} - } - - public string Value - { - get { - string retVal = ""; - foreach(System.Web.UI.WebControls.ListItem i in base.Items) - if (i.Selected) - retVal += i.Value + ","; - - if (retVal != "") - retVal = retVal.Substring(0, retVal.Length-1); - - return retVal; - } - set - { - _value = value; - } - } - - public contentTypeSingle() - { - // - // TODO: Add constructor logic here - // - } - - protected override void OnInit(EventArgs e) - { - base.OnInit (e); - - int count = 0; - this.CssClass = "guiInputTextStandard"; - - // Check for multiple choises - if (_multiple) - { - this.SelectionMode = System.Web.UI.WebControls.ListSelectionMode.Multiple; - this.Rows = 5; - this.Multiple =true; - } - else - { - this.Rows = 1; - this.Items.Add(new System.Web.UI.WebControls.ListItem("", "")); - this.SelectionMode = System.Web.UI.WebControls.ListSelectionMode.Single; - count = 1; - } - - // This should be replaced by business logic, but right now it would cause a circular reference if - // umbRuntime was added as a reference to this project - foreach(cms.businesslogic.web.DocumentType dt in cms.businesslogic.web.DocumentType.GetAllAsList()) - { - System.Web.UI.WebControls.ListItem li = new System.Web.UI.WebControls.ListItem(dt.Text, dt.Id.ToString()); - if (((string) (", "+_value+",")).IndexOf(", "+dt.Id.ToString()+",") > -1) - li.Selected = true; - - this.Items.Add(li); - count++; - } - } - - } -} diff --git a/src/umbraco.macroRenderings/contentTypeMultiple.cs b/src/umbraco.macroRenderings/contentTypeMultiple.cs deleted file mode 100644 index 7926a352b2..0000000000 --- a/src/umbraco.macroRenderings/contentTypeMultiple.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; - -namespace umbraco.macroRenderings -{ - /// - /// Summary description for contentTypeMultiple. - /// - public class contentTypeMultiple : contentTypeSingle - { - public contentTypeMultiple() - { - // - // TODO: Add constructor logic here - // - } - - protected override void OnInit(EventArgs e) - { - this.Multiple = true; - base.OnInit (e); - } - - } -} diff --git a/src/umbraco.macroRenderings/media.cs b/src/umbraco.macroRenderings/media.cs deleted file mode 100644 index e447195a69..0000000000 --- a/src/umbraco.macroRenderings/media.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Data; -using Microsoft.ApplicationBlocks.Data; -using System.Data.SqlClient; - -using System.Web.UI; -using ClientDependency.Core; -using umbraco.interfaces; -using umbraco.uicontrols.TreePicker; - -namespace umbraco.macroRenderings -{ - - public class media : SimpleMediaPicker, IMacroGuiRendering - { - #region IMacroGuiRendering Members - - string IMacroGuiRendering.Value - { - get - { - return Value; - } - set - { - Value = value; - } - } - - bool IMacroGuiRendering.ShowCaption - { - get { return true; } - } - - #endregion - } -} diff --git a/src/umbraco.macroRenderings/numeric.cs b/src/umbraco.macroRenderings/numeric.cs deleted file mode 100644 index e60219e8af..0000000000 --- a/src/umbraco.macroRenderings/numeric.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; - -namespace umbraco.macroRenderings -{ - /// - /// - /// - public class numeric : System.Web.UI.WebControls.TextBox, interfaces.IMacroGuiRendering - { - string _value = ""; - - public bool ShowCaption - { - get {return true;} - } - - public string Value - { - get { - return base.Text; - } - set - { - this.Text = value; - _value = value; - } - } - - protected override void OnInit(EventArgs e) - { - base.OnInit (e); - this.CssClass = "guiInputTextStandard"; - this.Attributes.Add("style", "width: 30%"); - } - - - public numeric() - { - // - // TODO: Add constructor logic here - // - } - - - } -} diff --git a/src/umbraco.macroRenderings/packages.config b/src/umbraco.macroRenderings/packages.config deleted file mode 100644 index 38a750a6ff..0000000000 --- a/src/umbraco.macroRenderings/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/umbraco.macroRenderings/propertyTypePickerMultiple.cs b/src/umbraco.macroRenderings/propertyTypePickerMultiple.cs deleted file mode 100644 index e2fe1e4591..0000000000 --- a/src/umbraco.macroRenderings/propertyTypePickerMultiple.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; - -namespace umbraco.macroRenderings -{ - /// - /// Summary description for propertyTypePickerMultiple. - /// - public class propertyTypePickerMultiple : propertyTypePicker - { - public propertyTypePickerMultiple() - { - // - // TODO: Add constructor logic here - // - } - protected override void OnInit(EventArgs e) - { - base.Multiple = true; - base.OnInit (e); - } - - } -} diff --git a/src/umbraco.macroRenderings/tabPicker.cs b/src/umbraco.macroRenderings/tabPicker.cs deleted file mode 100644 index e013eb85fe..0000000000 --- a/src/umbraco.macroRenderings/tabPicker.cs +++ /dev/null @@ -1,119 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Data; -using System.Data.SqlClient; -using System.Web; -using umbraco.DataLayer; -using umbraco.interfaces; -using umbraco.BusinessLogic; - - -namespace umbraco.macroRenderings -{ - - /// - /// Summary description for tabPicker. - /// - public class tabPicker : System.Web.UI.WebControls.ListBox, interfaces.IMacroGuiRendering - { - string _value = ""; - bool _multiple = false; - - public bool ShowCaption - { - get {return true;} - } - - public virtual bool Multiple - { - set {_multiple = value;} - get {return _multiple;} - } - - public string Value - { - get - { - string retVal = ""; - foreach(System.Web.UI.WebControls.ListItem i in base.Items) - if (i.Selected) - retVal += i.Value + ","; - - if (retVal != "") - retVal = retVal.Substring(0, retVal.Length-1); - - return retVal; - } - set - { - _value = value; - } - } - - public static ISqlHelper SqlHelper - { - get { return Application.SqlHelper; } - } - - public tabPicker() - { - // - // TODO: Add constructor logic here - // - } - - protected override void OnInit(EventArgs e) - { - base.OnInit (e); - - this.CssClass = "guiInputTextStandard"; - - // Check for multiple choises - if (_multiple) - { - this.SelectionMode = System.Web.UI.WebControls.ListSelectionMode.Multiple; - this.Rows = 5; - this.Multiple =true; - } - else - { - this.Rows = 1; - this.Items.Add(new System.Web.UI.WebControls.ListItem("", "")); - this.SelectionMode = System.Web.UI.WebControls.ListSelectionMode.Single; - } - - //SqlDataReader dr = SqlHelper.ExecuteReader(GlobalSettings.DbDSN, CommandType.Text, "select distinct text from cmsPropertyTypeGroup order by text"); - - - - using (IRecordsReader dr = SqlHelper.ExecuteReader("select distinct text from cmsPropertyTypeGroup order by text")) { - while (dr.Read()) { - - System.Web.UI.WebControls.ListItem li = new System.Web.UI.WebControls.ListItem(dr.GetString("text"), dr.GetString("text").ToLower()); - - if (((string)(", " + _value + ",")).IndexOf(", " + dr.GetString("text").ToLower() + ",") > -1) - li.Selected = true; - - this.Items.Add(li); - - } - } - -/* - while (dr.Read()) - { - System.Web.UI.WebControls.ListItem li = new System.Web.UI.WebControls.ListItem(dr["text"].ToString(), dr["text"].ToString().ToLower()); - if (((string) (", "+_value+",")).IndexOf(", "+dr["text"].ToString().ToLower()+",") > -1) - li.Selected = true; - - this.Items.Add(li); - } - dr.Close();*/ - - } - - } - - -} diff --git a/src/umbraco.macroRenderings/tabPickerMultiple.cs b/src/umbraco.macroRenderings/tabPickerMultiple.cs deleted file mode 100644 index 368342664a..0000000000 --- a/src/umbraco.macroRenderings/tabPickerMultiple.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; - -namespace umbraco.macroRenderings -{ - /// - /// Summary description for tabPickerMultiple. - /// - public class tabPickerMultiple : tabPicker - { - public tabPickerMultiple() - { - // - // TODO: Add constructor logic here - // - } - - protected override void OnInit(EventArgs e) - { - base.Multiple = true; - base.OnInit (e); - } - - } -} diff --git a/src/umbraco.macroRenderings/text.cs b/src/umbraco.macroRenderings/text.cs deleted file mode 100644 index d7391dded7..0000000000 --- a/src/umbraco.macroRenderings/text.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; - -namespace umbraco.macroRenderings -{ - /// - /// - /// - public class text : System.Web.UI.WebControls.TextBox, interfaces.IMacroGuiRendering - { - string _value = ""; - - public bool ShowCaption - { - get {return true;} - } - - public string Value - { - get { - return base.Text; - } - set { - this.Text = value; - _value = value; - } - } - - protected override void OnInit(EventArgs e) - { - base.OnInit (e); - this.CssClass = "guiInputTextStandard"; - } - - - public text() - { - // - // TODO: Add constructor logic here - // - } - - - } -} diff --git a/src/umbraco.macroRenderings/textMultiple.cs b/src/umbraco.macroRenderings/textMultiple.cs deleted file mode 100644 index 92175b1aa3..0000000000 --- a/src/umbraco.macroRenderings/textMultiple.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; - -namespace umbraco.macroRenderings -{ - /// - /// Summary description for textMultiple. - /// - public class textMultiple : text - { - public textMultiple() - { - // - // TODO: Add constructor logic here - // - } - - protected override void OnInit(EventArgs e) - { - base.OnInit (e); - this.TextMode = System.Web.UI.WebControls.TextBoxMode.MultiLine; - this.Rows = 6; - } - - } -} diff --git a/src/umbraco.macroRenderings/umbraco.macroRenderings.csproj b/src/umbraco.macroRenderings/umbraco.macroRenderings.csproj deleted file mode 100644 index 8a261b77a7..0000000000 --- a/src/umbraco.macroRenderings/umbraco.macroRenderings.csproj +++ /dev/null @@ -1,233 +0,0 @@ - - - - Local - 9.0.30729 - 2.0 - {52AB8F1F-FB76-4E8C-885F-0747B6CE71EC} - Debug - AnyCPU - - - - - umbraco.macroRenderings - - - JScript - Grid - IE50 - false - Library - umbraco.macroRenderings - OnBuildSuccess - - - - - - - - - - - - - - - 3.5 - v4.5 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - ..\ - true - - - bin\Debug\ - false - 285212672 - false - - - DEBUG;TRACE - - - true - 4096 - false - - - false - false - false - false - 4 - full - prompt - AllRules.ruleset - false - - - bin\Release\ - false - 285212672 - false - - - TRACE - bin\Release\umbraco.macroRenderings.xml - false - 4096 - false - - - true - false - false - false - 4 - none - prompt - AllRules.ruleset - false - - - - False - ..\packages\ClientDependency.1.7.0.4\lib\ClientDependency.Core.dll - - - False - ..\packages\Microsoft.ApplicationBlocks.Data.1.0.1559.20655\lib\Microsoft.ApplicationBlocks.Data.dll - - - System - - - 3.5 - - - System.Data - - - System.Web - - - 3.5 - - - System.XML - - - umbraco.businesslogic - {E469A9CE-1BEC-423F-AC44-713CD72457EA} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - {ccd75ec3-63db-4184-b49d-51c1dd337230} - umbraco.cms - - - {6edd2061-82f2-461b-bb6e-879245a832de} - umbraco.controls - - - {C7CB79F0-1C97-4B33-BFA7-00731B579AE2} - umbraco.datalayer - - - umbraco.interfaces - {511F6D8D-7717-440A-9A57-A507E9A8B27F} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - - - Properties\SolutionInfo.cs - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/umbraco.macroRenderings/yesNo.cs b/src/umbraco.macroRenderings/yesNo.cs deleted file mode 100644 index b4cf50931a..0000000000 --- a/src/umbraco.macroRenderings/yesNo.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Web.UI; -using System.Web.UI.WebControls; -using System.ComponentModel; - -namespace umbraco.macroRenderings -{ - /// - /// Generates a radiolist of yes and no for boolean fields - /// - [DefaultProperty("Text"), - ToolboxData("<{0}:yesNo runat=server Version=\"\" Alias=\"\">")] - public class yesNo : System.Web.UI.WebControls.CheckBox, interfaces.IMacroGuiRendering - { - string _value = ""; - - public bool ShowCaption - { - get {return true;} - } - - - [Bindable(true), - Category("Umbraco"), - DefaultValue(""), - Browsable(true)] - public String Value - { - get { - if (base.Checked) - return "1"; - - return "0"; - } - - set {_value = value;} - } - - protected override void OnInit(EventArgs e) - { - if (_value != null) - { - if (_value == "1") - this.Checked = true; - else - this.Checked = false; - } - - this.Text = "Yes"; - base.OnInit (e); - } - - } -} diff --git a/src/umbraco.sln b/src/umbraco.sln index 40e367de59..d601679578 100644 --- a/src/umbraco.sln +++ b/src/umbraco.sln @@ -48,8 +48,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.interfaces", "umbra EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.editorControls", "umbraco.editorControls\umbraco.editorControls.csproj", "{255F5DF1-4E43-4758-AC05-7A0B68EB021B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.macroRenderings", "umbraco.macroRenderings\umbraco.macroRenderings.csproj", "{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.providers", "umbraco.providers\umbraco.providers.csproj", "{D7636876-0756-43CB-A192-138C6F0D5E42}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.datalayer", "umbraco.datalayer\umbraco.datalayer.csproj", "{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}" @@ -121,10 +119,6 @@ Global {255F5DF1-4E43-4758-AC05-7A0B68EB021B}.Debug|Any CPU.Build.0 = Debug|Any CPU {255F5DF1-4E43-4758-AC05-7A0B68EB021B}.Release|Any CPU.ActiveCfg = Release|Any CPU {255F5DF1-4E43-4758-AC05-7A0B68EB021B}.Release|Any CPU.Build.0 = Release|Any CPU - {52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}.Release|Any CPU.Build.0 = Release|Any CPU {D7636876-0756-43CB-A192-138C6F0D5E42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D7636876-0756-43CB-A192-138C6F0D5E42}.Debug|Any CPU.Build.0 = Debug|Any CPU {D7636876-0756-43CB-A192-138C6F0D5E42}.Release|Any CPU.ActiveCfg = Release|Any CPU