From e2eaa1b9ddc9b1a81265efca5e2b2da7f8d64962 Mon Sep 17 00:00:00 2001 From: elitsa Date: Tue, 2 Oct 2018 14:08:45 +0200 Subject: [PATCH 01/11] Change the location of the Developer section's dashboards markups and controllers into the respective Settings folder . --- .../{developer => settings}/developerdashboardvideos.html | 0 .../dashboard/{developer => settings}/examinemanagement.html | 0 .../dashboard/{developer => settings}/examinemgmt.controller.js | 0 .../dashboard/{developer => settings}/healthcheck.controller.js | 0 .../src/views/dashboard/{developer => settings}/healthcheck.html | 0 .../views/dashboard/{developer => settings}/nucache.controller.js | 0 .../src/views/dashboard/{developer => settings}/nucache.html | 0 .../{developer => settings}/publishedstatus.controller.js | 0 .../views/dashboard/{developer => settings}/publishedstatus.html | 0 .../{developer => settings}/xmldataintegrityreport.controller.js | 0 .../dashboard/{developer => settings}/xmldataintegrityreport.html | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename src/Umbraco.Web.UI.Client/src/views/dashboard/{developer => settings}/developerdashboardvideos.html (100%) rename src/Umbraco.Web.UI.Client/src/views/dashboard/{developer => settings}/examinemanagement.html (100%) rename src/Umbraco.Web.UI.Client/src/views/dashboard/{developer => settings}/examinemgmt.controller.js (100%) rename src/Umbraco.Web.UI.Client/src/views/dashboard/{developer => settings}/healthcheck.controller.js (100%) rename src/Umbraco.Web.UI.Client/src/views/dashboard/{developer => settings}/healthcheck.html (100%) rename src/Umbraco.Web.UI.Client/src/views/dashboard/{developer => settings}/nucache.controller.js (100%) rename src/Umbraco.Web.UI.Client/src/views/dashboard/{developer => settings}/nucache.html (100%) rename src/Umbraco.Web.UI.Client/src/views/dashboard/{developer => settings}/publishedstatus.controller.js (100%) rename src/Umbraco.Web.UI.Client/src/views/dashboard/{developer => settings}/publishedstatus.html (100%) rename src/Umbraco.Web.UI.Client/src/views/dashboard/{developer => settings}/xmldataintegrityreport.controller.js (100%) rename src/Umbraco.Web.UI.Client/src/views/dashboard/{developer => settings}/xmldataintegrityreport.html (100%) diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/developerdashboardvideos.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html rename to src/Umbraco.Web.UI.Client/src/views/dashboard/settings/developerdashboardvideos.html diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemanagement.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemanagement.html rename to src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemgmt.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemgmt.controller.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemgmt.controller.js rename to src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemgmt.controller.js diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.controller.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.controller.js rename to src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.controller.js diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html rename to src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/nucache.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/nucache.controller.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/dashboard/developer/nucache.controller.js rename to src/Umbraco.Web.UI.Client/src/views/dashboard/settings/nucache.controller.js diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/nucache.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/nucache.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/dashboard/developer/nucache.html rename to src/Umbraco.Web.UI.Client/src/views/dashboard/settings/nucache.html diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/publishedstatus.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedstatus.controller.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/dashboard/developer/publishedstatus.controller.js rename to src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedstatus.controller.js diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/publishedstatus.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedstatus.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/dashboard/developer/publishedstatus.html rename to src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedstatus.html diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/xmldataintegrityreport.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/xmldataintegrityreport.controller.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/dashboard/developer/xmldataintegrityreport.controller.js rename to src/Umbraco.Web.UI.Client/src/views/dashboard/settings/xmldataintegrityreport.controller.js diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/xmldataintegrityreport.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/xmldataintegrityreport.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/dashboard/developer/xmldataintegrityreport.html rename to src/Umbraco.Web.UI.Client/src/views/dashboard/settings/xmldataintegrityreport.html From 4e87abcc1e11d29dab99789a61e4f91a1710af12 Mon Sep 17 00:00:00 2001 From: elitsa Date: Tue, 2 Oct 2018 14:11:48 +0200 Subject: [PATCH 02/11] Update references to the right sections. --- src/Umbraco.Web/Editors/PublishedStatusController.cs | 4 ++-- src/Umbraco.Web/HealthCheck/HealthCheckController.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web/Editors/PublishedStatusController.cs b/src/Umbraco.Web/Editors/PublishedStatusController.cs index 087b96a241..937d3f3137 100644 --- a/src/Umbraco.Web/Editors/PublishedStatusController.cs +++ b/src/Umbraco.Web/Editors/PublishedStatusController.cs @@ -18,13 +18,13 @@ namespace Umbraco.Web.Editors public string GetPublishedStatusUrl() { if (_publishedSnapshotService is PublishedCache.XmlPublishedCache.PublishedSnapshotService) - return "views/dashboard/developer/xmldataintegrityreport.html"; + return "views/dashboard/settings/xmldataintegrityreport.html"; //if (service is PublishedCache.PublishedNoCache.PublishedSnapshotService) // return "views/dashboard/developer/nocache.html"; if (_publishedSnapshotService is PublishedCache.NuCache.PublishedSnapshotService) - return "views/dashboard/developer/nucache.html"; + return "views/dashboard/settings/nucache.html"; throw new NotSupportedException("Not supported: " + _publishedSnapshotService.GetType().FullName); } diff --git a/src/Umbraco.Web/HealthCheck/HealthCheckController.cs b/src/Umbraco.Web/HealthCheck/HealthCheckController.cs index 6412409488..ac64706292 100644 --- a/src/Umbraco.Web/HealthCheck/HealthCheckController.cs +++ b/src/Umbraco.Web/HealthCheck/HealthCheckController.cs @@ -15,7 +15,7 @@ namespace Umbraco.Web.HealthCheck /// /// The API controller used to display the health check info and execute any actions /// - [UmbracoApplicationAuthorize(Core.Constants.Applications.Developer)] + [UmbracoApplicationAuthorize(Core.Constants.Applications.Settings)] public class HealthCheckController : UmbracoAuthorizedJsonController { private readonly HealthCheckCollection _checks; From 0e8d4eed63f7ac0f98d936f323acf081f774a56d Mon Sep 17 00:00:00 2001 From: elitsa Date: Tue, 2 Oct 2018 14:12:53 +0200 Subject: [PATCH 03/11] Move dashboards from the Developer's section into Settings one. --- .../DashboardSettings/Dashboard.config | 208 +++++++-------- src/Umbraco.Web.UI/config/Dashboard.config | 245 +++++++++--------- 2 files changed, 224 insertions(+), 229 deletions(-) diff --git a/src/Umbraco.Tests/Configurations/DashboardSettings/Dashboard.config b/src/Umbraco.Tests/Configurations/DashboardSettings/Dashboard.config index 37f2723c81..4040412603 100644 --- a/src/Umbraco.Tests/Configurations/DashboardSettings/Dashboard.config +++ b/src/Umbraco.Tests/Configurations/DashboardSettings/Dashboard.config @@ -1,114 +1,114 @@  -
- - settings - - - - views/dashboard/settings/settingsdashboardintro.html - - - views/dashboard/settings/settingsdashboardvideos.html - - -
+
+ + settings + + + + views/dashboard/settings/settingsdashboardintro.html + + + views/dashboard/settings/settingsdashboardvideos.html + + + + dashboard/ExamineManagement.ascx + +
-
- - developer - - - - views/dashboard/developer/developerdashboardintro.html - - - views/dashboard/developer/developerdashboardvideos.html - - - - dashboard/ExamineManagement.ascx - -
+
+ + developer + + + + views/dashboard/developer/developerdashboardintro.html + + + views/dashboard/developer/developerdashboardvideos.html + + +
-
- - media - - - - views/dashboard/media/mediafolderbrowser.html - - - - - admin - - - views/dashboard/media/mediadashboardintro.html - - - views/dashboard/media/desktopmediauploader.html - - - views/dashboard/media/mediadashboardvideos.html - - -
+
+ + media + + + + views/dashboard/media/mediafolderbrowser.html + + + + + admin + + + views/dashboard/media/mediadashboardintro.html + + + views/dashboard/media/desktopmediauploader.html + + + views/dashboard/media/mediadashboardvideos.html + + +
-
- - translator - hello - world - - - content - - - - admin - - - views/dashboard/default/startupdashboardintro.html - - - views/dashboard/default/startupdashboardkits.html +
- editor - writer + translator + hello + world - - - views/dashboard/default/startupdashboardvideos.html - - - - dashboard/latestEdits.ascx - - - - views/dashboard/changepassword.html - - -
+ + content + + + + admin + + + views/dashboard/default/startupdashboardintro.html + + + views/dashboard/default/startupdashboardkits.html + + editor + writer + + + + views/dashboard/default/startupdashboardvideos.html + + + + dashboard/latestEdits.ascx + + + + views/dashboard/changepassword.html + + +
-
- - default - member - - - - views/dashboard/members/membersdashboardintro.html - - - members/membersearch.ascx - - - views/dashboard/members/membersdashboardvideos.html - - -
+
+ + default + member + + + + views/dashboard/members/membersdashboardintro.html + + + members/membersearch.ascx + + + views/dashboard/members/membersdashboardvideos.html + + +
diff --git a/src/Umbraco.Web.UI/config/Dashboard.config b/src/Umbraco.Web.UI/config/Dashboard.config index afb83ae7f3..857b3fd7bd 100644 --- a/src/Umbraco.Web.UI/config/Dashboard.config +++ b/src/Umbraco.Web.UI/config/Dashboard.config @@ -1,127 +1,122 @@  -
- - settings - - - - views/dashboard/settings/settingsdashboardintro.html - - -
-
- - forms - - - - views/dashboard/forms/formsdashboardintro.html - - -
-
- - developer - - - - views/dashboard/developer/developerdashboardvideos.html - - - - - views/dashboard/developer/examinemanagement.html - - - - - views/dashboard/developer/publishedstatus.html - - -
-
- - media - - - - views/dashboard/media/mediafolderbrowser.html - - -
-
- - forms - - - - views/dashboard/forms/formsdashboardintro.html - - -
-
- - translator - - - content - - - - admin - - - views/dashboard/default/startupdashboardintro.html - - -
-
- - member - - - - views/dashboard/members/membersdashboardvideos.html - - -
-
- - contour - - - plugins/umbracocontour/formsdashboard.ascx - -
-
- - developer - - - - views/dashboard/developer/healthcheck.html - - -
-
- - content - - - - views/dashboard/developer/redirecturls.html - - -
-
- - developer - - - - /App_Plugins/ModelsBuilder/modelsbuilder.htm - - -
- \ No newline at end of file +
+ + settings + + + + views/dashboard/settings/settingsdashboardintro.html + + + + + views/dashboard/settings/developerdashboardvideos.html + + + + + views/dashboard/settings/examinemanagement.html + + + + + views/dashboard/settings/publishedstatus.html + + +
+
+ + forms + + + + views/dashboard/forms/formsdashboardintro.html + + +
+
+ + media + + + + views/dashboard/media/mediafolderbrowser.html + + +
+
+ + forms + + + + views/dashboard/forms/formsdashboardintro.html + + +
+
+ + translator + + + content + + + + admin + + + views/dashboard/default/startupdashboardintro.html + + +
+
+ + member + + + + views/dashboard/members/membersdashboardvideos.html + + +
+
+ + contour + + + plugins/umbracocontour/formsdashboard.ascx + +
+
+ + settings + + + + views/dashboard/settings/healthcheck.html + + +
+
+ + content + + + + views/dashboard/developer/redirecturls.html + + +
+
+ + settings + + + + /App_Plugins/ModelsBuilder/modelsbuilder.htm + + +
+ From 0ec789ca06cba9ccd3011c7872b5b41be6f29aaf Mon Sep 17 00:00:00 2001 From: elitsa Date: Tue, 2 Oct 2018 14:14:25 +0200 Subject: [PATCH 04/11] Enable PackagesTreeController while disabling the custom UI for the Packages dashboard. --- .../Trees/PackagesTreeController.cs | 180 +++++++++--------- 1 file changed, 89 insertions(+), 91 deletions(-) diff --git a/src/Umbraco.Web/Trees/PackagesTreeController.cs b/src/Umbraco.Web/Trees/PackagesTreeController.cs index 31283acebf..ab47d21803 100644 --- a/src/Umbraco.Web/Trees/PackagesTreeController.cs +++ b/src/Umbraco.Web/Trees/PackagesTreeController.cs @@ -1,107 +1,105 @@ -//using System; -//using System.Linq; -//using System.Net.Http.Formatting; -//using Umbraco.Web.Models.Trees; -//using Umbraco.Web.Mvc; -//using Umbraco.Web.WebApi.Filters; -//using umbraco; -//using umbraco.cms.businesslogic.packager; -//using Umbraco.Core.Services; -//using Umbraco.Web._Legacy.Actions; -//using Constants = Umbraco.Core.Constants; +using System; +using System.Linq; +using System.Net.Http.Formatting; +using Umbraco.Web.Models.Trees; +using Umbraco.Web.Mvc; +using Umbraco.Web.WebApi.Filters; +using umbraco; +using umbraco.cms.businesslogic.packager; +using Umbraco.Core.Services; +using Umbraco.Web._Legacy.Actions; +using Constants = Umbraco.Core.Constants; -//namespace Umbraco.Web.Trees -//{ -// [UmbracoTreeAuthorize(Constants.Trees.Packages)] -// [Tree(Constants.Applications.Developer, Constants.Trees.Packages, null, sortOrder: 0)] -// [PluginController("UmbracoTrees")] -// [CoreTree] -// public class PackagesTreeController : TreeController -// { -// /// -// /// Helper method to create a root model for a tree -// /// -// /// -// protected override TreeNode CreateRootNode(FormDataCollection queryStrings) -// { -// var root = base.CreateRootNode(queryStrings); +namespace Umbraco.Web.Trees +{ + [UmbracoTreeAuthorize(Constants.Trees.Packages)] + [Tree(Constants.Applications.Developer, Constants.Trees.Packages, null, sortOrder: 0)] + [PluginController("UmbracoTrees")] + [CoreTree] + public class PackagesTreeController : TreeController + { + /// + /// Helper method to create a root model for a tree + /// + /// + protected override TreeNode CreateRootNode(FormDataCollection queryStrings) + { + var root = base.CreateRootNode(queryStrings); -// //this will load in a custom UI instead of the dashboard for the root node -// root.RoutePath = string.Format("{0}/{1}/{2}", Constants.Applications.Developer, Constants.Trees.Packages, "overview"); -// root.Icon = "icon-box"; + root.Icon = "icon-box"; -// return root; -// } -// protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings) -// { -// var nodes = new TreeNodeCollection(); + return root; + } + protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings) + { + var nodes = new TreeNodeCollection(); -// var createdPackages = CreatedPackage.GetAllCreatedPackages(); + var createdPackages = CreatedPackage.GetAllCreatedPackages(); -// if (id == "created") -// { -// nodes.AddRange( -// createdPackages -// .OrderBy(entity => entity.Data.Name) -// .Select(dt => -// { -// var node = CreateTreeNode(dt.Data.Id.ToString(), id, queryStrings, dt.Data.Name, "icon-inbox", false, -// string.Format("/{0}/framed/{1}", -// queryStrings.GetValue("application"), -// Uri.EscapeDataString("developer/Packages/EditPackage.aspx?id=" + dt.Data.Id))); -// return node; -// })); -// } -// else -// { -// //must be root -// var node = CreateTreeNode( -// "created", -// id, -// queryStrings, -// Services.TextService.Localize("treeHeaders/createdPackages"), -// "icon-folder", -// createdPackages.Count > 0, -// string.Empty); + if (id == "created") + { + nodes.AddRange( + createdPackages + .OrderBy(entity => entity.Data.Name) + .Select(dt => + { + var node = CreateTreeNode(dt.Data.Id.ToString(), id, queryStrings, dt.Data.Name, "icon-inbox", false, + string.Format("/{0}/framed/{1}", + queryStrings.GetValue("application"), + Uri.EscapeDataString("developer/Packages/EditPackage.aspx?id=" + dt.Data.Id))); + return node; + })); + } + else + { + //must be root + var node = CreateTreeNode( + "created", + id, + queryStrings, + Services.TextService.Localize("treeHeaders/createdPackages"), + "icon-folder", + createdPackages.Count > 0, + string.Empty); -// //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now. -// node.AdditionalData["jsClickCallback"] = "javascript:void(0);"; + //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now. + node.AdditionalData["jsClickCallback"] = "javascript:void(0);"; -// nodes.Add(node); -// } + nodes.Add(node); + } -// return nodes; -// } + return nodes; + } -// protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings) -// { -// var menu = new MenuItemCollection(); + protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings) + { + var menu = new MenuItemCollection(); -// // Root actions -// if (id == "-1") -// { -// menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))) -// .ConvertLegacyMenuItem(null, Constants.Trees.Packages, queryStrings.GetValue("application")); -// } -// else if (id == "created") -// { -// menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))) -// .ConvertLegacyMenuItem(null, Constants.Trees.Packages, queryStrings.GetValue("application")); + // Root actions + if (id == "-1") + { + menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))) + .ConvertLegacyMenuItem(null, Constants.Trees.Packages, queryStrings.GetValue("application")); + } + else if (id == "created") + { + menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))) + .ConvertLegacyMenuItem(null, Constants.Trees.Packages, queryStrings.GetValue("application")); -// menu.Items.Add( -// Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true); -// } -// else -// { -// //it's a package node -// menu.Items.Add(Services.TextService.Localize("actions", ActionDelete.Instance.Alias)); -// } + menu.Items.Add( + Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true); + } + else + { + //it's a package node + menu.Items.Add(Services.TextService.Localize("actions", ActionDelete.Instance.Alias)); + } -// return menu; -// } -// } -//} + return menu; + } + } +} From cda24b4fba01def0d56a36750199b2eb6468d0a6 Mon Sep 17 00:00:00 2001 From: elitsa Date: Tue, 2 Oct 2018 14:19:00 +0200 Subject: [PATCH 05/11] Updating the right path to the Packages dashboard subviews. Adding new properties and attribute to meet the new implementation standards of a section. --- .../src/views/packages/overview.controller.js | 17 ++++++++++------- .../src/views/packages/overview.html | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/overview.controller.js index 369d919b7d..42fcddaa56 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packages/overview.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packages/overview.controller.js @@ -27,25 +27,28 @@ { "name": "Packages", "icon": "icon-cloud", - "view": "views/packager/views/repo.html", - "active": !installPackageUri || installPackageUri === "navigation" + "view": "views/packages/views/repo.html", + "active": !installPackageUri || installPackageUri === "navigation", + "alias": "umbPackages" }, { "name": "Installed", "icon": "icon-box", - "view": "views/packager/views/installed.html", - "active": installPackageUri === "installed" + "view": "views/packages/views/installed.html", + "active": installPackageUri === "installed", + "alias": "umbInstalled" }, { "name": "Install local", "icon": "icon-add", - "view": "views/packager/views/install-local.html", - "active": installPackageUri === "local" + "view": "views/packages/views/install-local.html", + "active": installPackageUri === "local", + "alias": "umbInstallLocal" } ]; $timeout(function () { - navigationService.syncTree({ tree: "packager", path: "-1" }); + navigationService.syncTree({ tree: "packages", path: "-1" }); }); } diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/overview.html b/src/Umbraco.Web.UI.Client/src/views/packages/overview.html index 43f08a9882..250dc889d6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packages/overview.html +++ b/src/Umbraco.Web.UI.Client/src/views/packages/overview.html @@ -16,7 +16,7 @@ + sub-views="vm.page.navigation" model="vm.page"> From ce2cf7caa3cba066e284b554b4ebe04277b21d7a Mon Sep 17 00:00:00 2001 From: elitsa Date: Tue, 2 Oct 2018 14:21:28 +0200 Subject: [PATCH 06/11] Updating the count of classes meeting the condition, due to uncommenting PackagesTreeController.cs --- src/Umbraco.Tests/Composing/TypeFinderTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Tests/Composing/TypeFinderTests.cs b/src/Umbraco.Tests/Composing/TypeFinderTests.cs index 955f6f94c8..a8624e8871 100644 --- a/src/Umbraco.Tests/Composing/TypeFinderTests.cs +++ b/src/Umbraco.Tests/Composing/TypeFinderTests.cs @@ -90,7 +90,7 @@ namespace Umbraco.Tests.Composing Assert.AreEqual(0, typesFound.Count()); // 0 classes in _assemblies are marked with [Tree] typesFound = TypeFinder.FindClassesWithAttribute(new[] { typeof (UmbracoContext).Assembly }); - Assert.AreEqual(21, typesFound.Count()); // + classes in Umbraco.Web are marked with [Tree] + Assert.AreEqual(22, typesFound.Count()); // + classes in Umbraco.Web are marked with [Tree] } private static ProfilingLogger GetTestProfilingLogger() From f2825a6308cd021dfab12be1caa39322e7854c99 Mon Sep 17 00:00:00 2001 From: elitsa Date: Wed, 3 Oct 2018 14:12:18 +0200 Subject: [PATCH 07/11] Adding back wrongly deleted code. --- src/Umbraco.Web/Trees/PackagesTreeController.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Trees/PackagesTreeController.cs b/src/Umbraco.Web/Trees/PackagesTreeController.cs index ab47d21803..235f249509 100644 --- a/src/Umbraco.Web/Trees/PackagesTreeController.cs +++ b/src/Umbraco.Web/Trees/PackagesTreeController.cs @@ -25,7 +25,9 @@ namespace Umbraco.Web.Trees protected override TreeNode CreateRootNode(FormDataCollection queryStrings) { var root = base.CreateRootNode(queryStrings); - + + root.RoutePath = string.Format("{0}/{1}/{2}", Constants.Applications.Developer, Constants.Trees.Packages, "overview"); + root.Icon = "icon-box"; return root; From 2fca4579e7eb110becebe36ef07365ee202cb580 Mon Sep 17 00:00:00 2001 From: elitsa Date: Wed, 3 Oct 2018 14:16:06 +0200 Subject: [PATCH 08/11] Relocate "Redirect URLs" markup and controller into a newly created 'content' folder. --- .../dashboard/{developer => content}/redirecturls.controller.js | 0 .../src/views/dashboard/{developer => content}/redirecturls.html | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/Umbraco.Web.UI.Client/src/views/dashboard/{developer => content}/redirecturls.controller.js (100%) rename src/Umbraco.Web.UI.Client/src/views/dashboard/{developer => content}/redirecturls.html (100%) diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.controller.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.controller.js rename to src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.controller.js diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html rename to src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html From 83c66730e2c31a9d3836d229356b5dd962bd88f8 Mon Sep 17 00:00:00 2001 From: elitsa Date: Wed, 3 Oct 2018 14:19:35 +0200 Subject: [PATCH 09/11] Updating tabs into Settings section. --- .../config/Dashboard.Release.config | 31 ++++++++----------- src/Umbraco.Web.UI/config/Dashboard.config | 12 +++---- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/src/Umbraco.Web.UI/config/Dashboard.Release.config b/src/Umbraco.Web.UI/config/Dashboard.Release.config index d4ffc41de8..0a39395213 100644 --- a/src/Umbraco.Web.UI/config/Dashboard.Release.config +++ b/src/Umbraco.Web.UI/config/Dashboard.Release.config @@ -10,6 +10,16 @@ views/dashboard/settings/settingsdashboardintro.html + + + views/dashboard/settings/examinemanagement.html + + + + + views/dashboard/settings/publishedstatus.html + +
@@ -27,21 +37,6 @@ developer - - - views/dashboard/developer/developerdashboardvideos.html - - - - - views/dashboard/developer/examinemanagement.html - - - - - views/dashboard/developer/publishedstatus.html - -
@@ -99,11 +94,11 @@
- developer + settings - views/dashboard/developer/healthcheck.html + views/dashboard/settings/healthcheck.html
@@ -113,7 +108,7 @@ - views/dashboard/developer/redirecturls.html + views/dashboard/content/redirecturls.html
diff --git a/src/Umbraco.Web.UI/config/Dashboard.config b/src/Umbraco.Web.UI/config/Dashboard.config index 857b3fd7bd..c1a1d8815a 100644 --- a/src/Umbraco.Web.UI/config/Dashboard.config +++ b/src/Umbraco.Web.UI/config/Dashboard.config @@ -9,11 +9,6 @@ views/dashboard/settings/settingsdashboardintro.html - - - views/dashboard/settings/developerdashboardvideos.html - - views/dashboard/settings/examinemanagement.html @@ -35,6 +30,11 @@ +
+ + developer + +
media @@ -105,7 +105,7 @@ - views/dashboard/developer/redirecturls.html + views/dashboard/content/redirecturls.html
From 7468c4ab0442d6866ee468fc0088788fad7652e7 Mon Sep 17 00:00:00 2001 From: elitsa Date: Wed, 3 Oct 2018 14:20:46 +0200 Subject: [PATCH 10/11] Disabling packages section dashboard. --- src/Umbraco.Web/Editors/DashboardHelper.cs | 69 +++++++++++----------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/src/Umbraco.Web/Editors/DashboardHelper.cs b/src/Umbraco.Web/Editors/DashboardHelper.cs index b40f289d04..85f0bc8a28 100644 --- a/src/Umbraco.Web/Editors/DashboardHelper.cs +++ b/src/Umbraco.Web/Editors/DashboardHelper.cs @@ -46,49 +46,52 @@ namespace Umbraco.Web.Editors var tabs = new List>(); var i = 1; - // The dashboard config can contain more than one area inserted by a package. - foreach (var dashboardSection in UmbracoConfig.For.DashboardSettings().Sections.Where(x => x.Areas.Contains(section))) - { - //we need to validate access to this section - if (DashboardSecurity.AuthorizeAccess(dashboardSection, currentUser, _sectionService) == false) - continue; + //disable packages section dashboard + if (section != "packages") - //User is authorized - foreach (var tab in dashboardSection.Tabs) + // The dashboard config can contain more than one area inserted by a package. + foreach (var dashboardSection in UmbracoConfig.For.DashboardSettings().Sections.Where(x => x.Areas.Contains(section))) { - //we need to validate access to this tab - if (DashboardSecurity.AuthorizeAccess(tab, currentUser, _sectionService) == false) + //we need to validate access to this section + if (DashboardSecurity.AuthorizeAccess(dashboardSection, currentUser, _sectionService) == false) continue; - var dashboardControls = new List(); - - foreach (var control in tab.Controls) + //User is authorized + foreach (var tab in dashboardSection.Tabs) { - if (DashboardSecurity.AuthorizeAccess(control, currentUser, _sectionService) == false) + //we need to validate access to this tab + if (DashboardSecurity.AuthorizeAccess(tab, currentUser, _sectionService) == false) continue; - var dashboardControl = new DashboardControl(); - var controlPath = control.ControlPath.Trim(); - dashboardControl.Caption = control.PanelCaption; - dashboardControl.Path = IOHelper.FindFile(controlPath); - if (controlPath.ToLowerInvariant().EndsWith(".ascx".ToLowerInvariant())) - dashboardControl.ServerSide = true; + var dashboardControls = new List(); - dashboardControls.Add(dashboardControl); + foreach (var control in tab.Controls) + { + if (DashboardSecurity.AuthorizeAccess(control, currentUser, _sectionService) == false) + continue; + + var dashboardControl = new DashboardControl(); + var controlPath = control.ControlPath.Trim(); + dashboardControl.Caption = control.PanelCaption; + dashboardControl.Path = IOHelper.FindFile(controlPath); + if (controlPath.ToLowerInvariant().EndsWith(".ascx".ToLowerInvariant())) + dashboardControl.ServerSide = true; + + dashboardControls.Add(dashboardControl); + } + + tabs.Add(new Tab + { + Id = i, + Alias = tab.Caption.ToSafeAlias(), + IsActive = i == 1, + Label = tab.Caption, + Properties = dashboardControls + }); + + i++; } - - tabs.Add(new Tab - { - Id = i, - Alias = tab.Caption.ToSafeAlias(), - IsActive = i == 1, - Label = tab.Caption, - Properties = dashboardControls - }); - - i++; } - } //In case there are no tabs or a user doesn't have access the empty tabs list is returned return tabs; From f3d1cc29bb5a80bb6c668b58f473fbc7e24b714c Mon Sep 17 00:00:00 2001 From: elitsa Date: Wed, 3 Oct 2018 14:21:41 +0200 Subject: [PATCH 11/11] Remove file related to old Developer's dashboard. --- .../settings/developerdashboardvideos.html | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/views/dashboard/settings/developerdashboardvideos.html diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/developerdashboardvideos.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/developerdashboardvideos.html deleted file mode 100644 index 1e72968f46..0000000000 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/developerdashboardvideos.html +++ /dev/null @@ -1,21 +0,0 @@ - - - -

Hours of Umbraco training videos are only a click away

-

Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco, then visit umbraco.tv for even more Umbraco videos.

- - - -