WIP installer refactor, adds image uploader control and sets Image dependency type to use that

[TFS Changeset #77124]
This commit is contained in:
starfighter83
2010-09-13 09:27:27 +00:00
parent 56bfaabc7a
commit a64dff4f6e
3 changed files with 38 additions and 10 deletions

View File

@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web.UI.WebControls;
using ClientDependency.Core;
namespace umbraco.cms.businesslogic.skinning.controls
{
[ClientDependency(ClientDependencyType.Css, "modal/style.css", "UmbracoClient")]
[ClientDependency(500,ClientDependencyType.Javascript, "modal/modal.js", "UmbracoClient")]
public class ImageUploader : TextBox
{
protected override void Render(System.Web.UI.HtmlTextWriter writer)
{
base.Render(writer);
writer.WriteLine(
string.Format(
"&nbsp;<a href=\"#\" onclick=\"{0}\">Upload image</a>",
"Umbraco.Controls.ModalWindow().open('" + this.ResolveUrl(GlobalSettings.Path) + "/LiveEditing/Modules/SkinModule/ImageUploader.aspx?ctrl=" + this.ClientID + "','Upload image',true,700,500,50,0, ['.modalbuton'], null);return false;"));
}
}
}

View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web.UI.WebControls;
using umbraco.cms.businesslogic.skinning.controls;
namespace umbraco.cms.businesslogic.skinning.dependencies
{
@@ -13,16 +14,16 @@ namespace umbraco.cms.businesslogic.skinning.dependencies
public string Width { get; set; }
//currently just returning a textbox, need to replace this with a custom image control
public System.Web.UI.WebControls.TextBox tb;
public ImageUploader iu;
public List<Object> _value;
public Image()
{
this.Name = "Text";
this.Description = "Will render a text input";
tb = new TextBox();
iu = new ImageUploader();
_value = new List<object>();
}
@@ -30,13 +31,14 @@ namespace umbraco.cms.businesslogic.skinning.dependencies
{
get
{
tb.TextMode = System.Web.UI.WebControls.TextBoxMode.SingleLine;
tb.CssClass = "text";
iu.TextMode = System.Web.UI.WebControls.TextBoxMode.SingleLine;
iu.CssClass = "image";
iu.ID = "imageupload";
if (_value.Count > 0)
tb.Text = _value[0].ToString();
return tb;
iu.Text = _value[0].ToString();
return iu;
}
set
{
@@ -48,10 +50,10 @@ namespace umbraco.cms.businesslogic.skinning.dependencies
{
get
{
if (tb.Text != "")
if (iu.Text != "")
{
_value.Clear();
_value.Add(tb.Text);
_value.Add(iu.Text);
}
return _value;
}

View File

@@ -211,6 +211,7 @@
</Compile>
<Compile Include="businesslogic\Property\Properties.cs" />
<Compile Include="businesslogic\skinning\controls\ColorPicker.cs" />
<Compile Include="businesslogic\skinning\controls\ImageUploader.cs" />
<Compile Include="businesslogic\skinning\dependencies\Color.cs" />
<Compile Include="businesslogic\skinning\dependencies\Image.cs" />
<Compile Include="businesslogic\skinning\dependencies\Text.cs" />