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

merge

Browse Source
This commit is contained in:
Stephan
2012-09-18 08:55:39 -02:00
parent 2c204d9d9e 8307da1a87
commit aa633bbbb2
4 changed files with 56 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View File

@@ -88,6 +88,7 @@
<key alias="itemNotPublished">This item is not published</key>
<key alias="lastPublished">Last published</key>
<key alias="mediatype">Media Type</key>
<key alias="mediaLinks">Link to media item(s)</key>
<key alias="membergroup">Member Group</key>
<key alias="memberrole">Role</key>
<key alias="membertype">Member Type</key>

51
src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs
View File

@@ -2,11 +2,15 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using Umbraco.Core.IO;
using umbraco.BasePages;
using umbraco.cms.businesslogic;
using umbraco.cms.businesslogic.datatype.controls;
using umbraco.cms.businesslogic.media;
using umbraco.cms.businesslogic.property;
using umbraco.cms.businesslogic.propertytype;
using umbraco.cms.businesslogic.web;
@@ -14,7 +18,7 @@ using umbraco.interfaces;
using umbraco.uicontrols;
using Content = umbraco.cms.businesslogic.Content;
using System.Linq;
using umbraco.IO;
using SystemDirectories = umbraco.IO.SystemDirectories;
namespace umbraco.controls
{
@@ -212,9 +216,46 @@ namespace umbraco.controls
ltt.Text = _content.Id.ToString();
PropertiesPane.addProperty("Id", ltt);
tpProp.Controls.AddAt(0, PropertiesPane);
tpProp.Style.Add("text-align", "center");
//tpProp.Style.Add("padding", "10px");
if (_content is Media)
{
PropertiesPane.addProperty(ui.Text("content", "mediatype"), new LiteralControl(_content.ContentType.Alias));
var uploadField = new Factory().GetNewObject(new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c"));
try
{
var uploadProperties = _content.GenericProperties
.Where(p => p.PropertyType.DataTypeDefinition.DataType.Id == uploadField.Id
&& p.Value.ToString() != ""
&& File.Exists(IOHelper.MapPath(p.Value.ToString())));
var properties = uploadProperties as List<Property> ?? uploadProperties.ToList();
if (properties.Any())
{
var linkProperties = new Pane();
var literal = new LiteralControl { Text = String.Empty };
literal.Text += "<table>";
foreach (var property in properties)
literal.Text += string.Format("<tr><td>{0}&nbsp;</td><td><a href=\"{1}\" target=\"_blank\">{1}</a></td></tr>", property.PropertyType.Name, property.Value);
literal.Text += "</table>";
linkProperties.addProperty(ui.Text("content", "mediaLinks"), literal);
tpProp.Controls.AddAt(1, linkProperties);
}
}
catch
{
//the data type definition may not exist anymore at this point because another thread may
//have deleted it.
}
tpProp.Controls.AddAt(0, PropertiesPane);
tpProp.Style.Add("text-align", "center");
}
}
}
@@ -245,7 +286,7 @@ namespace umbraco.controls
df.Save();
}
if(!string.IsNullOrEmpty(NameTxt.Text))
if (!string.IsNullOrEmpty(NameTxt.Text))
_content.Text = NameTxt.Text;
Save(this, new EventArgs());

7
src/umbraco.editorControls/XPathCheckBoxList/XPathCheckBoxListPreValueEditor.cs
View File

@@ -65,7 +65,7 @@ namespace umbraco.editorControls.XPathCheckBoxList
if (this.options == null)
{
// Create a new Options data object with the default values
this.options = new XPathCheckBoxListOptions();
this.options = new XPathCheckBoxListOptions(true);
}
}
return this.options;
@@ -178,7 +178,10 @@ namespace umbraco.editorControls.XPathCheckBoxList
protected override void RenderContents(HtmlTextWriter writer)
{
//writer.AddPrevalueRow("Database Type", this.dbTypeDropDownList);
writer.AddPrevalueRow("XPath Expression", this.xPathTextBox, this.xPathRequiredFieldValidator, this.xPathCustomValidator);
writer.AddPrevalueRow("XPath Expression", @"can use the tokens <strong>$ancestorOrSelf</strong>, <strong>$parentPage</strong> and <strong>$currentPage</strong>, eg.<br />
<br />
all siblings: $parentPage//*[@id != $currentPage/@id] <br />
", this.xPathTextBox, this.xPathRequiredFieldValidator, this.xPathCustomValidator);
writer.AddPrevalueRow("Storage Type", this.storageTypeRadioButtonList);
writer.AddPrevalueRow("Values", this.valueTypeDropDownList);
}

5
src/umbraco.editorControls/XPathDropDownList/XPathDropDownListPreValueEditor.cs
View File

@@ -153,7 +153,10 @@ namespace umbraco.editorControls.XPathDropDownList
/// <param name="writer"></param>
protected override void RenderContents(HtmlTextWriter writer)
{
writer.AddPrevalueRow("XPath Expression", this.xPathTextBox, this.xPathRequiredFieldValidator, this.xPathCustomValidator);
writer.AddPrevalueRow("XPath Expression", @"can use the tokens <strong>$ancestorOrSelf</strong>, <strong>$parentPage</strong> and <strong>$currentPage</strong>, eg.<br />
<br />
all siblings: $parentPage//*[@id != $currentPage/@id] <br />
", this.xPathTextBox, this.xPathRequiredFieldValidator, this.xPathCustomValidator);
writer.AddPrevalueRow("Value", this.valueTypeDropDownList);
}