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

Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0

Browse Source
This commit is contained in:
Shannon
2014-03-25 10:45:14 +11:00
parent ab586a49ce f8a7b453c7
commit 1628ac917c
10 changed files with 130 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -666,9 +666,11 @@ To manage your website, simply open the umbraco back office and start adding con
<key alias="paSimpleHelp">If you just want to setup simple protection using a single login and password</key>
</area>
<area alias="publish">
<key alias="contentPublishedFailedAwaitingRelease"><![CDATA[
<key alias="contentPublishedFailedAwaitingRelease">
<![CDATA[
%0% could not be published because the item is scheduled for release.
]]></key>
]]>
</key>
<key alias="contentPublishedFailedInvalid"><![CDATA[
%0% could not be published because these properties: %1% did not pass validation rules.
]]></key>

1
src/Umbraco.Web/Trees/ContentTreeController.cs
View File

@@ -241,6 +241,7 @@ namespace Umbraco.Web.Trees
menu.Items.Add<ActionSort>(ui.Text("actions", ActionSort.Instance.Alias), true).ConvertLegacyMenuItem(item, "content", "content");
menu.Items.Add<ActionRollback>(ui.Text("actions", ActionRollback.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content");
menu.Items.Add<ActionAudit>(ui.Text("actions", ActionAudit.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content");
menu.Items.Add<ActionPublish>(ui.Text("actions", ActionPublish.Instance.Alias), true).ConvertLegacyMenuItem(item, "content", "content");
menu.Items.Add<ActionToPublish>(ui.Text("actions", ActionToPublish.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content");
menu.Items.Add<ActionAssignDomain>(ui.Text("actions", ActionAssignDomain.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content");

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

@@ -1854,7 +1854,9 @@
<Content Include="umbraco.presentation\umbraco\controls\ProgressBar.ascx">
<SubType>ASPXCodeBehind</SubType>
</Content>
<Content Include="umbraco.presentation\umbraco\controls\GenericProperties\GenericProperty.ascx" />
<Content Include="umbraco.presentation\umbraco\controls\GenericProperties\GenericProperty.ascx">
<SubType>ASPXCodeBehind</SubType>
</Content>
<Content Include="umbraco.presentation\umbraco\controls\Images\ImageViewerUpdater.asmx" />
<Content Include="umbraco.presentation\umbraco\controls\Images\UploadMediaImage.ascx">
<SubType>ASPXCodeBehind</SubType>

3
src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs
View File

@@ -100,7 +100,6 @@ namespace umbraco.controls.GenericProperties
{
tbName.Text = "";
tbAlias.Text = "";
lblAlias.Text = "";
tbValidation.Text = "";
tbDescription.Text = "";
ddlTab.SelectedIndex = 0;
@@ -141,7 +140,6 @@ namespace umbraco.controls.GenericProperties
//form.Attributes.Add("style", "display: none;");
tbName.Text = PropertyType.GetRawName();
tbAlias.Text = PropertyType.Alias;
lblAlias.Text = PropertyType.Alias;
FullHeader.Text = PropertyType.GetRawName() + " (" + PropertyType.Alias + "), Type: " + PropertyType.DataTypeDefinition.Text;;
Header.Text = PropertyType.GetRawName();
@@ -154,7 +152,6 @@ namespace umbraco.controls.GenericProperties
DeleteButton.Visible = AllowPropertyEdit;
DeleteButton2.Visible = AllowPropertyEdit;
tbAlias.Visible = AllowPropertyEdit;
lblAlias.Visible = AllowPropertyEdit == false;
PropertyPanel5.Visible = AllowPropertyEdit;
PropertyPanel6.Visible = AllowPropertyEdit;
PropertyPanel3.Visible = AllowPropertyEdit;

9
src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.designer.cs generated
View File

@@ -74,15 +74,6 @@ namespace umbraco.controls.GenericProperties {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox tbAlias;
/// <summary>
/// tbAlias control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblAlias;
/// <summary>
/// PropertyPanel2 control.

9
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs
View File

@@ -38,14 +38,9 @@ namespace umbraco.presentation.umbraco.dialogs
if (action == "new")
action = "create";
ArrayList actions = BusinessLogic.Actions.Action.GetAll();
foreach (interfaces.IAction a in actions)
foreach (interfaces.IAction a in actions)
{
if (string.Compare(a.Alias, action, true) == 0) {
if(a.Icon.StartsWith("."))
return "<div class=\"menuSpr " + a.Icon.Trim('.') + "\"><span>" + ui.Text(action) + "</span></div>";
else
return "<img alt=\"" + ui.Text(a.Alias) + "\" src=\"../images/" + a.Icon + " width=\"16\" height=\"16\"/> " + ui.Text(action);
}
return ui.Text(action);
}
return action;
}