diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.controller.js similarity index 86% rename from src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js rename to src/Umbraco.Web.UI.Client/src/views/packagesNew/category.controller.js index be816bb62a..1030266e23 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.controller.js @@ -1,12 +1,14 @@ (function () { "use strict"; - function PackagesEditController($scope) { + function PackagesCategoryController($scope) { var vm = this; vm.page = {}; - vm.page.name = "Packages"; + vm.page.name = "Category"; + + vm.selectCategory = selectCategory; vm.categories = [ { @@ -41,54 +43,52 @@ "description": "An HTML5 audio player based on jPlayer", "karma": "1", "downloads": "1672", - "icon":"https://our.umbraco.org/media/wiki/150283/635768313097111400_usightlylogopng.png?bgcolor=fff&height=154&width=281&format=png", - "version":"No good" + "icon":"https://our.umbraco.org/media/wiki/150283/635768313097111400_usightlylogopng.png?bgcolor=fff&height=154&width=281&format=png" }, { "name": "Kill IE6", "description": "A simple port of the IE6 warning script (http://code.google.com/p/ie6-upgrade-warning/) to use in your Umbraco websites.", "karma": "11", "downloads": "688", - "icon":"https://our.umbraco.org/media/wiki/9138/634697622367666000_offroadcode-100x100.png?bgcolor=fff&height=154&width=281&format=png", - "version":"Fits perfectly" + "icon":"https://our.umbraco.org/media/wiki/9138/634697622367666000_offroadcode-100x100.png?bgcolor=fff&height=154&width=281&format=png" }, { "name": "Examine Media Indexer", "description": "CogUmbracoExamineMediaIndexer", "karma": "3", "downloads": "1329", - "icon":"https://our.umbraco.org/media/wiki/50703/634782902373558000_cogworks.jpg?bgcolor=fff&height=154&width=281&format=png", - "version":"Fits perfectly" + "icon":"https://our.umbraco.org/media/wiki/50703/634782902373558000_cogworks.jpg?bgcolor=fff&height=154&width=281&format=png" }, { "name": "SVG Icon Picker", "description": "A picker, for picking icons from an SVG spritesheet.", "karma": "5", "downloads": "8", - "icon":"https://our.umbraco.org/media/wiki/154472/635997115126742822_logopng.png?bgcolor=fff&height=154&width=281&format=png", - "version":"Fits perfectly" + "icon":"https://our.umbraco.org/media/wiki/154472/635997115126742822_logopng.png?bgcolor=fff&height=154&width=281&format=png" }, { "name": "Pipeline CRM", "description": "Pipeline is a social CRM that lives in Umbraco back-office. It tracks opportunities and helps teams collaborate with timelines and tasks. It stores information about your customers and your interactions with them. It integrates with your website, capturing opportunities from forms and powering personal portals.", "karma": "3", "downloads": "105", - "icon":"https://our.umbraco.org/media/wiki/152476/635917291068518788_pipeline-crm-logopng.png?bgcolor=fff&height=154&width=281&format=png", - "version":"Fits perfectly" + "icon":"https://our.umbraco.org/media/wiki/152476/635917291068518788_pipeline-crm-logopng.png?bgcolor=fff&height=154&width=281&format=png" }, { "name": "CodeMirror", "description": "CodeMirror Editor for Umbraco", "karma": "1", "downloads": "70", - "icon":"https://our.umbraco.org/media/wiki/151028/635810233171153461_logopng.png?bgcolor=fff&height=154&width=281&format=png", - "version":"No good" + "icon":"https://our.umbraco.org/media/wiki/151028/635810233171153461_logopng.png?bgcolor=fff&height=154&width=281&format=png" } ]; + function selectCategory(category) { + + } + } - angular.module("umbraco").controller("Umbraco.Editors.Packages.EditController", PackagesEditController); + angular.module("umbraco").controller("Umbraco.Editors.Packages.CategoryController", PackagesCategoryController); })(); diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.html new file mode 100644 index 0000000000..0262b2c8ae --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.html @@ -0,0 +1,35 @@ +
+ + + +
+ + + + + + + + + This is my category + + + + + + + Breadcrumbs here + + + + + + +
+ +
diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.controller.js new file mode 100644 index 0000000000..d50249dafd --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.controller.js @@ -0,0 +1,97 @@ +(function () { + "use strict"; + + function PackagesOverviewController($scope, $route, $location) { + + var vm = this; + + vm.page = {}; + vm.page.name = "Packages"; + + vm.selectCategory = selectCategory; + + vm.categories = [ + { + "icon": "icon-male-and-female", + "name": "Collaboration" + }, + { + "icon": "icon-molecular-network", + "name": "Backoffice extensions" + }, + { + "icon": "icon-brackets", + "name": "Developer tools" + }, + { + "icon": "icon-wand", + "name": "Starter kits" + }, + { + "icon": "icon-medal", + "name": "Umbraco Pro" + }, + { + "icon": "icon-wrench", + "name": "Website utilities" + } + ]; + + vm.packages = [ + { + "name": "uSightly", + "description": "An HTML5 audio player based on jPlayer", + "karma": "1", + "downloads": "1672", + "icon":"https://our.umbraco.org/media/wiki/150283/635768313097111400_usightlylogopng.png?bgcolor=fff&height=154&width=281&format=png" + }, + { + "name": "Kill IE6", + "description": "A simple port of the IE6 warning script (http://code.google.com/p/ie6-upgrade-warning/) to use in your Umbraco websites.", + "karma": "11", + "downloads": "688", + "icon":"https://our.umbraco.org/media/wiki/9138/634697622367666000_offroadcode-100x100.png?bgcolor=fff&height=154&width=281&format=png" + }, + { + "name": "Examine Media Indexer", + "description": "CogUmbracoExamineMediaIndexer", + "karma": "3", + "downloads": "1329", + "icon":"https://our.umbraco.org/media/wiki/50703/634782902373558000_cogworks.jpg?bgcolor=fff&height=154&width=281&format=png" + }, + { + "name": "SVG Icon Picker", + "description": "A picker, for picking icons from an SVG spritesheet.", + "karma": "5", + "downloads": "8", + "icon":"https://our.umbraco.org/media/wiki/154472/635997115126742822_logopng.png?bgcolor=fff&height=154&width=281&format=png" + }, + { + "name": "Pipeline CRM", + "description": "Pipeline is a social CRM that lives in Umbraco back-office. It tracks opportunities and helps teams collaborate with timelines and tasks. It stores information about your customers and your interactions with them. It integrates with your website, capturing opportunities from forms and powering personal portals.", + "karma": "3", + "downloads": "105", + "icon":"https://our.umbraco.org/media/wiki/152476/635917291068518788_pipeline-crm-logopng.png?bgcolor=fff&height=154&width=281&format=png" + }, + { + "name": "CodeMirror", + "description": "CodeMirror Editor for Umbraco", + "karma": "1", + "downloads": "70", + "icon":"https://our.umbraco.org/media/wiki/151028/635810233171153461_logopng.png?bgcolor=fff&height=154&width=281&format=png" + } + ]; + + function selectCategory(category) { + var section = $route.current.params.section; + var tree = $route.current.params.tree; + var path = "/" + section + "/" + tree + "/category"; + $location.path(path); + } + + + } + + angular.module("umbraco").controller("Umbraco.Editors.Packages.OverviewController", PackagesOverviewController); + +})(); diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html similarity index 96% rename from src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html rename to src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html index 24f919a4e9..837f3b32b2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html @@ -1,4 +1,4 @@ -
+
@@ -21,7 +21,7 @@
- +
{{ category.name }}
 diff --git a/src/Umbraco.Web/Trees/NewPackagesTreeController.cs b/src/Umbraco.Web/Trees/NewPackagesTreeController.cs index c6c4e67841..9d3726540a 100644 --- a/src/Umbraco.Web/Trees/NewPackagesTreeController.cs +++ b/src/Umbraco.Web/Trees/NewPackagesTreeController.cs @@ -26,10 +26,13 @@ namespace Umbraco.Web.Trees { protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings) { + var baseUrl = Constants.Applications.Developer + "/packagesNew/"; + var nodes = new TreeNodeCollection(); var node = CreateTreeNode("1", id, queryStrings, "Name", "icon-folder", false, ""); node.Path = "path"; + node.RoutePath = baseUrl + "overview"; //node.NodeType = "container"; //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);";