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

fixing custom drop downs for doc type icons

Browse Source 
[TFS Changeset #65919]
This commit is contained in:
slace
2010-05-03 01:36:31 +00:00
parent 5f825d624c
commit c1fbd6953d
3 changed files with 8 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx
View File

@@ -59,10 +59,10 @@
<cc2:Pane runat="server">
<cc2:PropertyPanel ID="pp_icon" runat="server" Text="Icon">
<asp:DropDownList ID="ddlIcons" CssClass="guiInputText guiInputStandardSize umbIconDropdownList" runat="server" style="width:250px;"/>
<asp:DropDownList ID="ddlIcons" CssClass="guiInputText guiInputStandardSize umbIconDropdownList" runat="server"/>
</cc2:PropertyPanel>
<cc2:PropertyPanel ID="pp_thumbnail" runat="server" Text="Thumbnail">
<asp:DropDownList ID="ddlThumbnails" CssClass="guiInputText guiInputStandardSize" runat="server" style="width:250px;"/>
<asp:DropDownList ID="ddlThumbnails" CssClass="guiInputText guiInputStandardSize" runat="server"/>
</cc2:PropertyPanel>
<cc2:PropertyPanel ID="pp_description" runat="server" Text="Description">
<asp:TextBox ID="description" runat="server" CssClass="guiInputText guiInputStandardSize" TextMode="MultiLine" Rows="3"/>

46
umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
View File

@@ -8,16 +8,16 @@ using System.Web.UI;
using System.Web.UI.HtmlControls;
using System.Web.UI.WebControls;
using ClientDependency.Core;
using umbraco.cms.helpers;
using umbraco.IO;
using umbraco.presentation;
using umbraco.cms.helpers;
namespace umbraco.controls
{
[ClientDependency(ClientDependencyType.Javascript, "ui/jqueryui.js", "UmbracoClient")]
//[ClientDependency(ClientDependencyType.Javascript, "ui/jquery.dd.js", "UmbracoClient")]
//[ClientDependency(ClientDependencyType.Css, "ui/dd.css", "UmbracoClient")]
[ClientDependency(ClientDependencyType.Javascript, "ui/jquery.dd.js", "UmbracoClient")]
[ClientDependency(ClientDependencyType.Css, "ui/dd.css", "UmbracoClient")]
[ClientDependency(ClientDependencyType.Css, "Tree/treeIcons.css", "UmbracoClient")]
[ClientDependency(ClientDependencyType.Css, "Tree/Themes/umbraco/style.css", "UmbracoClient")]
public partial class ContentTypeControlNew : System.Web.UI.UserControl
@@ -156,7 +156,7 @@ namespace umbraco.controls
ddlIcons.Items.AddRange(listOfIcons.OrderBy(o => o.Text).ToArray());
//Page.ClientScript.RegisterStartupScript(this.GetType(), "iconsDropDown", "jQuery(function() { jQuery('#" + ddlIcons.ClientID + "').msDropDown({ showIcon: false }); });", true);
Page.ClientScript.RegisterStartupScript(this.GetType(), "iconsDropDown", "jQuery(function() { jQuery('#" + ddlIcons.ClientID + "').msDropDown({ showIcon: true, style: 'width:250px;' }); });", true);
// Get thumbnails
dirInfo = new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Umbraco + "/images/thumbnails"));
@@ -169,7 +169,7 @@ namespace umbraco.controls
ddlThumbnails.Items.Add(li);
}
//Page.ClientScript.RegisterStartupScript(this.GetType(), "thumbnailsDropDown", "jQuery(function() { jQuery('#" + ddlThumbnails.ClientID + "').msDropDown({ showIcon: false, rowHeight: '130', visibleRows: '2' }); });", true);
Page.ClientScript.RegisterStartupScript(this.GetType(), "thumbnailsDropDown", "jQuery(function() { jQuery('#" + ddlThumbnails.ClientID + "').msDropDown({ showIcon: false, rowHeight: '130', visibleRows: '2', style: 'width:250px;' }); });", true);
txtName.Text = cType.GetRawText();
txtAlias.Text = cType.Alias;
@@ -210,7 +210,6 @@ namespace umbraco.controls
}
dualAllowedContentTypes.Value = chosenContentTypeIDs;
}
// PlaceHolderAllowedContentTypes.Controls.Add(dualAllowedContentTypes);
}
private void SaveAllowedChildTypes()
@@ -584,41 +583,6 @@ namespace umbraco.controls
}
}
}
/*
foreach (DataListItem dli in dlTabs.Items)
{
DataGrid dg = (DataGrid)dli.FindControl("dgGenericPropertiesOfTab");
foreach (DataGridItem dgi in dg.Items)
{
int propertyTypeId = int.Parse(dgi.Cells[0].Text);
cms.businesslogic.propertytype.PropertyType editPropertyType = new cms.businesslogic.propertytype.PropertyType(propertyTypeId);
string tbName = ((TextBox) dgi.FindControl("txtPName")).Text.Replace("'","''");
string tbAlias = ((TextBox) dgi.FindControl("txtPAlias")).Text.Replace("'","''");
int TypeId = int.Parse(((DropDownList) dgi.FindControl("ddlType")).SelectedValue);
int TabId = int.Parse(((DropDownList) dgi.FindControl("dllTab")).SelectedValue);
if (TypeId != editPropertyType.DataTypeDefinition.Id)
editPropertyType.DataTypeDefinition = new cms.businesslogic.datatype.DataTypeDefinition(TypeId);
if (tbName != editPropertyType.Name)
editPropertyType.Name = tbName;
if (tbAlias != editPropertyType.Alias)
editPropertyType.Alias = tbAlias;
if (TabId == 0)
cType.removePropertyTypeFromTab(editPropertyType);
else
cType.SetTabOnPropertyType(editPropertyType,TabId);
}
}
*/
}
public bool HasRows(System.Data.DataView dv)

2
umbraco/presentation/umbraco_client/ui/jquery.dd.js
View File

@@ -160,7 +160,7 @@
var titletextid = getPostID("postTitleTextID");
var childid = getPostID("postChildID");
var arrowid = getPostID("postArrowID");
var iWidth = $("#" + elementid).css('width'); //had to change this from .width()
var iWidth = $("#" + elementid).width();
var sStyle = options.style;
if ($("#" + id).length > 0) {
$("#" + id).remove();