From bf2efd30e91c843c47bf73e561aba2b9841d0bd2 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 24 Mar 2014 09:29:08 +0100 Subject: [PATCH 1/6] U4-4073 Audit Trail is missing from action menu Removed the icons for now as they are missing and should be new style icons anyway --- src/Umbraco.Web/Trees/ContentTreeController.cs | 1 + .../umbraco/dialogs/viewAuditTrail.aspx.cs | 9 ++------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs index 995fba0552..0c0a4e7a27 100644 --- a/src/Umbraco.Web/Trees/ContentTreeController.cs +++ b/src/Umbraco.Web/Trees/ContentTreeController.cs @@ -241,6 +241,7 @@ namespace Umbraco.Web.Trees menu.Items.Add(ui.Text("actions", ActionSort.Instance.Alias), true).ConvertLegacyMenuItem(item, "content", "content"); menu.Items.Add(ui.Text("actions", ActionRollback.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); + menu.Items.Add(ui.Text("actions", ActionAudit.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); menu.Items.Add(ui.Text("actions", ActionPublish.Instance.Alias), true).ConvertLegacyMenuItem(item, "content", "content"); menu.Items.Add(ui.Text("actions", ActionToPublish.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); menu.Items.Add(ui.Text("actions", ActionAssignDomain.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs index aa43f877d7..2a0c5517b4 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs @@ -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 "
" + ui.Text(action) + "
"; - else - return "\"" " + ui.Text(action); - } + return ui.Text(action); } return action; } From 8391c328865cabbac97bfc4aafa869c51e7d4653 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 24 Mar 2014 09:33:57 +0100 Subject: [PATCH 2/6] Fix whitespace --- build/NuSpecs/tools/install.ps1 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/build/NuSpecs/tools/install.ps1 b/build/NuSpecs/tools/install.ps1 index 2060a172ad..8d25ea23bf 100644 --- a/build/NuSpecs/tools/install.ps1 +++ b/build/NuSpecs/tools/install.ps1 @@ -1,8 +1,8 @@ param($rootPath, $toolsPath, $package, $project) -if ($project) { - $dateTime = Get-Date -Format yyyyMMdd-HHmmss - $backupPath = Join-Path (Split-Path $project.FullName -Parent) "\App_Data\NuGetBackup\$dateTime" +if ($project) { + $dateTime = Get-Date -Format yyyyMMdd-HHmmss + $backupPath = Join-Path (Split-Path $project.FullName -Parent) "\App_Data\NuGetBackup\$dateTime" # Create backup folder if it doesn't exist yet New-Item -ItemType Directory -Force -Path $backupPath @@ -19,19 +19,19 @@ if ($project) { # Copy umbraco and umbraco_files from package to project folder # This is only done when these folders already exist because we # only want to do this for upgrades - $umbracoFolder = Join-Path $projectDestinationPath "Umbraco\" + $umbracoFolder = Join-Path $projectDestinationPath "Umbraco\" if(Test-Path $umbracoFolder) { - $umbracoFolderSource = Join-Path $rootPath "UmbracoFiles\Umbraco" + $umbracoFolderSource = Join-Path $rootPath "UmbracoFiles\Umbraco" Copy-Item $umbracoFolder $backupPath -Force - robocopy $umbracoFolderSource $umbracoFolder /e /xf UI.xml - } + robocopy $umbracoFolderSource $umbracoFolder /e /xf UI.xml + } - $umbracoClientFolder = Join-Path $projectDestinationPath "Umbraco_Client" - if(Test-Path $umbracoClientFolder) { - $umbracoClientFolderSource = Join-Path $rootPath "UmbracoFiles\Umbraco_Client" + $umbracoClientFolder = Join-Path $projectDestinationPath "Umbraco_Client" + if(Test-Path $umbracoClientFolder) { + $umbracoClientFolderSource = Join-Path $rootPath "UmbracoFiles\Umbraco_Client" Copy-Item $umbracoClientFolder $backupPath -Force - robocopy $umbracoFolderSource $umbracoClientFolder /e - } + robocopy $umbracoFolderSource $umbracoClientFolder /e + } # Open readme.txt file $DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt') From 4d49268c47f58f116c785bc942182b9ceddc57be Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 24 Mar 2014 15:16:57 +0100 Subject: [PATCH 3/6] U4-4515 GenericProperty.ascx.cs references non-existent lblAlias control, causing YSOD of death when editing certain document types Codebehind file somehow got out of sync --- src/Umbraco.Web/Umbraco.Web.csproj | 4 +++- .../GenericProperties/GenericProperty.ascx.designer.cs | 9 --------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index b5a49e1a55..deff943781 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -1854,7 +1854,9 @@ ASPXCodeBehind - + + ASPXCodeBehind + ASPXCodeBehind diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.designer.cs index 42caa623e6..8c7a0b01b7 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.designer.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.designer.cs @@ -74,15 +74,6 @@ namespace umbraco.controls.GenericProperties { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox tbAlias; - - /// - /// tbAlias control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblAlias; /// /// PropertyPanel2 control. From 14ea374b24f694a5c8b882cf24e6486acfb12bc9 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 24 Mar 2014 15:44:09 +0100 Subject: [PATCH 4/6] Also removing stray semicolons here for U4-4510 nuget targets file creates an invalid path in the property group --- build/NuSpecs/build/net40/UmbracoCms.targets | 76 +++++++++---------- build/NuSpecs/build/net45/UmbracoCms.targets | 76 +++++++++---------- build/NuSpecs/build/net451/UmbracoCms.targets | 76 +++++++++---------- 3 files changed, 108 insertions(+), 120 deletions(-) diff --git a/build/NuSpecs/build/net40/UmbracoCms.targets b/build/NuSpecs/build/net40/UmbracoCms.targets index 02d1ba083f..579b4f062b 100644 --- a/build/NuSpecs/build/net40/UmbracoCms.targets +++ b/build/NuSpecs/build/net40/UmbracoCms.targets @@ -1,56 +1,52 @@ - - - - - - - + + + + + + + - - - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + App_Browsers\%(RecursiveDir)%(Filename)%(Extension) - + App_Code\%(RecursiveDir)%(Filename)%(Extension) - + App_Plugins\%(RecursiveDir)%(Filename)%(Extension) diff --git a/build/NuSpecs/build/net45/UmbracoCms.targets b/build/NuSpecs/build/net45/UmbracoCms.targets index 02d1ba083f..579b4f062b 100644 --- a/build/NuSpecs/build/net45/UmbracoCms.targets +++ b/build/NuSpecs/build/net45/UmbracoCms.targets @@ -1,56 +1,52 @@ - - - - - - - + + + + + + + - - - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + App_Browsers\%(RecursiveDir)%(Filename)%(Extension) - + App_Code\%(RecursiveDir)%(Filename)%(Extension) - + App_Plugins\%(RecursiveDir)%(Filename)%(Extension) diff --git a/build/NuSpecs/build/net451/UmbracoCms.targets b/build/NuSpecs/build/net451/UmbracoCms.targets index 02d1ba083f..579b4f062b 100644 --- a/build/NuSpecs/build/net451/UmbracoCms.targets +++ b/build/NuSpecs/build/net451/UmbracoCms.targets @@ -1,56 +1,52 @@ - - - - - - - + + + + + + + - - - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + App_Browsers\%(RecursiveDir)%(Filename)%(Extension) - + App_Code\%(RecursiveDir)%(Filename)%(Extension) - + App_Plugins\%(RecursiveDir)%(Filename)%(Extension) From 6ccce4d914b323e7279e30a0ed0ae70cc67778ee Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 24 Mar 2014 16:01:47 +0100 Subject: [PATCH 5/6] U4-4515 GenericProperty.ascx.cs references non-existent lblAlias control, causing YSOD of death when editing certain document types Whoops, missed some references --- .../umbraco/controls/GenericProperties/GenericProperty.ascx.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs index 2e75f8e968..7ec152f5db 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs @@ -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; From f8a7b453c767ff09d4188704dee7050dd5089ddc Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 24 Mar 2014 17:26:04 +0100 Subject: [PATCH 6/6] Sync the en and en_us translations --- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index f6434a19b5..5236e29248 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -666,9 +666,11 @@ To manage your website, simply open the umbraco back office and start adding con If you just want to setup simple protection using a single login and password - + + ]]> +