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

Completes: U4-2893 Remove the entire umbraco.macroRenderings assembly

Browse Source
This commit is contained in:
Shannon
2013-10-04 10:01:57 +10:00
parent ad6e4ae745
commit ff3aebd4b1
22 changed files with 88 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -257,10 +257,6 @@
<Project>{89C09045-1064-466B-B94A-DB3AFE2A5853}</Project>
<Name>umbraco.MacroEngines</Name>
</ProjectReference>
<ProjectReference Include="..\umbraco.macroRenderings\umbraco.macroRenderings.csproj">
<Project>{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}</Project>
<Name>umbraco.macroRenderings</Name>
</ProjectReference>
<ProjectReference Include="..\umbraco.controls\umbraco.controls.csproj">
<Project>{6EDD2061-82F2-461B-BB6E-879245A832DE}</Project>
<Name>umbraco.controls</Name>

4
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -241,10 +241,6 @@
<Project>{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}</Project>
<Name>Umbraco.Core</Name>
</ProjectReference>
<ProjectReference Include="..\umbraco.macroRenderings\umbraco.macroRenderings.csproj">
<Project>{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}</Project>
<Name>umbraco.macroRenderings</Name>
</ProjectReference>
<ProjectReference Include="..\umbraco.controls\umbraco.controls.csproj">
<Project>{6EDD2061-82F2-461B-BB6E-879245A832DE}</Project>
<Name>umbraco.controls</Name>

4
src/umbraco.editorControls/PickerRelations/PickerRelationsPreValueEditor.cs
View File

@@ -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)
/// </summary>
private propertyTypePicker pickerPropertyAliasPicker = new propertyTypePicker();
private PropertyTypePicker pickerPropertyAliasPicker = new PropertyTypePicker();
/// <summary>
/// RequiredFieldValidator for the ProperyAliasPicker

173
src/umbraco.macroRenderings/propertyTypePicker.cs → src/umbraco.editorControls/PropertyTypePicker.cs
View File

@@ -1,90 +1,83 @@
using System;
using System.Collections;
using System.Linq;
namespace umbraco.macroRenderings
{
/// <summary>
/// Summary description for propertyTypePicker.
/// </summary>
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>
/// Summary description for propertyTypePicker.
/// </summary>
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);
}
}
}
}
}

5
src/umbraco.editorControls/imagecropper/PrevalueEditor.cs
View File

@@ -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",

5
src/umbraco.editorControls/umbraco.editorControls.csproj
View File

@@ -170,10 +170,6 @@
<Project>{511F6D8D-7717-440A-9A57-A507E9A8B27F}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<ProjectReference Include="..\umbraco.macroRenderings\umbraco.macroRenderings.csproj">
<Project>{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}</Project>
<Name>umbraco.macroRenderings</Name>
</ProjectReference>
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
@@ -330,6 +326,7 @@
<SubType>Code</SubType>
</Compile>
<Compile Include="PrevalueEditorExtensions.cs" />
<Compile Include="PropertyTypePicker.cs" />
<Compile Include="radiobuttonlist\radiobox.cs">
<SubType>Code</SubType>
</Compile>

12
src/umbraco.macroRenderings/Properties/AssemblyInfo.cs
View File

@@ -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")]

44
src/umbraco.macroRenderings/autoForms.cs
View File

@@ -1,44 +0,0 @@
using System;
namespace umbraco.macroRenderings
{
/// <summary>
/// Summary description for autoForms.
/// </summary>
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("<input type=\"hidden\" name=\"" + this.ID + "\" value=\"" + this.Value + "\"/>");
}
#region IMacroGuiRendering Members
public override string Value
{
set
{
_value = value;
}
}
public bool ShowCaption
{
get
{
return false;
}
}
#endregion
}
}

39
src/umbraco.macroRenderings/content.cs
View File

@@ -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
}
}

89
src/umbraco.macroRenderings/contentType.cs
View File

@@ -1,89 +0,0 @@
using System;
using System.Data;
using System.Data.SqlClient;
namespace umbraco.macroRenderings
{
/// <summary>
/// Summary description for contentType.
/// </summary>
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++;
}
}
}
}

24
src/umbraco.macroRenderings/contentTypeMultiple.cs
View File

@@ -1,24 +0,0 @@
using System;
namespace umbraco.macroRenderings
{
/// <summary>
/// Summary description for contentTypeMultiple.
/// </summary>
public class contentTypeMultiple : contentTypeSingle
{
public contentTypeMultiple()
{
//
// TODO: Add constructor logic here
//
}
protected override void OnInit(EventArgs e)
{
this.Multiple = true;
base.OnInit (e);
}
}
}

37
src/umbraco.macroRenderings/media.cs
View File

@@ -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
}
}

46
src/umbraco.macroRenderings/numeric.cs
View File

@@ -1,46 +0,0 @@
using System;
namespace umbraco.macroRenderings
{
/// <summary>
///
/// </summary>
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
//
}
}
}

5
src/umbraco.macroRenderings/packages.config
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ClientDependency" version="1.7.0.4" targetFramework="net40" />
<package id="Microsoft.ApplicationBlocks.Data" version="1.0.1559.20655" targetFramework="net40" />
</packages>

23
src/umbraco.macroRenderings/propertyTypePickerMultiple.cs
View File

@@ -1,23 +0,0 @@
using System;
namespace umbraco.macroRenderings
{
/// <summary>
/// Summary description for propertyTypePickerMultiple.
/// </summary>
public class propertyTypePickerMultiple : propertyTypePicker
{
public propertyTypePickerMultiple()
{
//
// TODO: Add constructor logic here
//
}
protected override void OnInit(EventArgs e)
{
base.Multiple = true;
base.OnInit (e);
}
}
}

119
src/umbraco.macroRenderings/tabPicker.cs
View File

@@ -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>
/// Summary description for tabPicker.
/// </summary>
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();*/
}
}
}

24
src/umbraco.macroRenderings/tabPickerMultiple.cs
View File

@@ -1,24 +0,0 @@
using System;
namespace umbraco.macroRenderings
{
/// <summary>
/// Summary description for tabPickerMultiple.
/// </summary>
public class tabPickerMultiple : tabPicker
{
public tabPickerMultiple()
{
//
// TODO: Add constructor logic here
//
}
protected override void OnInit(EventArgs e)
{
base.Multiple = true;
base.OnInit (e);
}
}
}

44
src/umbraco.macroRenderings/text.cs
View File

@@ -1,44 +0,0 @@
using System;
namespace umbraco.macroRenderings
{
/// <summary>
///
/// </summary>
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
//
}
}
}

25
src/umbraco.macroRenderings/textMultiple.cs
View File

@@ -1,25 +0,0 @@
using System;
namespace umbraco.macroRenderings
{
/// <summary>
/// Summary description for textMultiple.
/// </summary>
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;
}
}
}

233
src/umbraco.macroRenderings/umbraco.macroRenderings.csproj
View File

@@ -1,233 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon>
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>umbraco.macroRenderings</AssemblyName>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
<RootNamespace>umbraco.macroRenderings</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<SccProjectName>
</SccProjectName>
<SccLocalPath>
</SccLocalPath>
<SccAuxPath>
</SccAuxPath>
<SccProvider>
</SccProvider>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants>
<DocumentationFile>bin\Release\umbraco.macroRenderings.xml</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>true</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="ClientDependency.Core, Version=1.7.0.4, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ClientDependency.1.7.0.4\lib\ClientDependency.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.ApplicationBlocks.Data.1.0.1559.20655\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
</Reference>
<Reference Include="System">
<Name>System</Name>
</Reference>
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
<Reference Include="System.Web">
<Name>System.Web</Name>
</Reference>
<Reference Include="System.Web.Extensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Xml">
<Name>System.XML</Name>
</Reference>
<ProjectReference Include="..\umbraco.businesslogic\umbraco.businesslogic.csproj">
<Name>umbraco.businesslogic</Name>
<Project>{E469A9CE-1BEC-423F-AC44-713CD72457EA}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<ProjectReference Include="..\umbraco.cms\umbraco.cms.csproj">
<Project>{ccd75ec3-63db-4184-b49d-51c1dd337230}</Project>
<Name>umbraco.cms</Name>
</ProjectReference>
<ProjectReference Include="..\umbraco.controls\umbraco.controls.csproj">
<Project>{6edd2061-82f2-461b-bb6e-879245a832de}</Project>
<Name>umbraco.controls</Name>
</ProjectReference>
<ProjectReference Include="..\umbraco.datalayer\umbraco.datalayer.csproj">
<Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
<Name>umbraco.datalayer</Name>
</ProjectReference>
<ProjectReference Include="..\umbraco.interfaces\umbraco.interfaces.csproj">
<Name>umbraco.interfaces</Name>
<Project>{511F6D8D-7717-440A-9A57-A507E9A8B27F}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\SolutionInfo.cs">
<Link>Properties\SolutionInfo.cs</Link>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="autoForms.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="content.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="contentType.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="contentTypeMultiple.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="media.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="numeric.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="propertyTypePicker.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="propertyTypePickerMultiple.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="tabPicker.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="tabPickerMultiple.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="text.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="textMultiple.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="yesNo.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
</Project>

54
src/umbraco.macroRenderings/yesNo.cs
View File

@@ -1,54 +0,0 @@
using System;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.ComponentModel;
namespace umbraco.macroRenderings
{
/// <summary>
/// Generates a radiolist of yes and no for boolean fields
/// </summary>
[DefaultProperty("Text"),
ToolboxData("<{0}:yesNo runat=server Version=\"\" Alias=\"\"></{0}:numberField>")]
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);
}
}
}

6
src/umbraco.sln
View File

@@ -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