From c3e4b611a61646d5de6988e29133bbc4107d7bb5 Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Tue, 31 May 2016 11:18:34 +0200 Subject: [PATCH] added subviews --- .../src/less/components/umb-packages.less | 10 +- .../views/packagesNew/overview.controller.js | 19 +++ .../src/views/packagesNew/overview.html | 91 +------------ .../views/install-local.controller.js | 7 + .../packagesNew/views/install-local.html | 7 + .../views/packagesNew/views/installed.html | 1 + .../packagesNew/views/repo.controller.js | 120 ++++++++++++++++++ .../src/views/packagesNew/views/repo.html | 91 +++++++++++++ 8 files changed, 255 insertions(+), 91 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/views/packagesNew/views/install-local.controller.js create mode 100644 src/Umbraco.Web.UI.Client/src/views/packagesNew/views/install-local.html create mode 100644 src/Umbraco.Web.UI.Client/src/views/packagesNew/views/installed.html create mode 100644 src/Umbraco.Web.UI.Client/src/views/packagesNew/views/repo.controller.js create mode 100644 src/Umbraco.Web.UI.Client/src/views/packagesNew/views/repo.html diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less index 658c690f39..6becc6805f 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less @@ -48,6 +48,7 @@ justify-content: center; position: relative; + box-sizing: border-box; height: 100%; width: 100%; @@ -237,7 +238,7 @@ max-width: 25%; - font-size: 13px; + font-size: 14px; font-weight: bold; color: @black; @@ -266,11 +267,8 @@ } .umb-packages-categories.-collapsed .umb-packages-category { - margin-right: 20px; - - &:last-child { - margin-right: 0; - } + margin-right: 15px; + margin-left: 15px; } .-ma0 { 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 index d98212e8fe..166b020a90 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.controller.js @@ -11,6 +11,25 @@ vm.selectCategory = selectCategory; vm.showPackageDetails = showPackageDetails; + vm.page.navigation = [ + { + "name": "Packages", + "icon": "icon-cloud", + "view": "views/packagesNew/views/repo.html", + "active": true + }, + { + "name": "Installed", + "icon": "icon-box", + "view": "views/packagesNew/views/installed.html" + }, + { + "name": "Install local", + "icon": "icon-add", + "view": "views/packagesNew/views/install-local.html" + } + ]; + vm.categories = [ { "id": 1, diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html index 3d18e27411..3f666ffba2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html @@ -11,96 +11,17 @@ name-locked="true" hide-icon="true" hide-description="true" + navigation="vm.page.navigation" hide-alias="true"> - - - - -
- - -
{{ category.name }}
- -
- - - - - -
- -
- - - - -

Popular

-
- -
- - -
- -
- -
-
{{ package.name }}
- -
- - {{ package.downloads }} - - - {{ package.karma }} - -
- -
- -
- -
- - -

Latest

-
- -
- - -
- -
- -
-

- {{ package.name }} -

- -
- - {{ package.downloads }} - - - {{ package.karma }} - -
- -
- -
- -
+ + diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/install-local.controller.js b/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/install-local.controller.js new file mode 100644 index 0000000000..9ac88fe6f9 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/install-local.controller.js @@ -0,0 +1,7 @@ +(function () { + "use strict"; + + + angular.module("umbraco").controller("Umbraco.Editors.Packages.InstallLocalController"); + +})(); diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/install-local.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/install-local.html new file mode 100644 index 0000000000..fa93b06f48 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/install-local.html @@ -0,0 +1,7 @@ +
+ + + + Install Local + +
diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/installed.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/installed.html new file mode 100644 index 0000000000..84376928ca --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/installed.html @@ -0,0 +1 @@ +Installed diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/repo.controller.js b/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/repo.controller.js new file mode 100644 index 0000000000..8286f3ff31 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/repo.controller.js @@ -0,0 +1,120 @@ +(function () { + "use strict"; + + function PackagesRepoController($scope, $route, $location) { + + var vm = this; + + vm.selectCategory = selectCategory; + vm.showPackageDetails = showPackageDetails; + + vm.categories = [ + { + "id": 1, + "icon": "icon-male-and-female", + "name": "All", + "active": true + }, + { + "icon": "icon-male-and-female", + "name": "Collaboration", + "active": false + }, + { + "id": 2, + "icon": "icon-molecular-network", + "name": "Backoffice extensions" + }, + { + "id": 3, + "icon": "icon-brackets", + "name": "Developer tools" + }, + { + "id": 4, + "icon": "icon-wand", + "name": "Starter kits" + }, + { + "id": 5, + "icon": "icon-medal", + "name": "Umbraco Pro" + }, + { + "id": 6, + "icon": "icon-wrench", + "name": "Website utilities" + } + ]; + + vm.packages = [ + { + "id": 1, + "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" + }, + { + "id": 2, + "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" + }, + { + "id": 3, + "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" + }, + { + "id": 4, + "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" + }, + { + "id": 5, + "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" + }, + { + "id": 6, + "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/" + category.id; + $location.path(path); + } + + function showPackageDetails(selectedPackage) { + var section = $route.current.params.section; + var tree = $route.current.params.tree; + var path = "/" + section + "/" + tree + "/details/" + selectedPackage.id; + $location.path(path); + } + + + } + + angular.module("umbraco").controller("Umbraco.Editors.Packages.RepoController", PackagesRepoController); + +})(); diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/repo.html new file mode 100644 index 0000000000..bd2dc96f77 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/repo.html @@ -0,0 +1,91 @@ +
+ + + + + +
+ + +
{{ category.name }}
+ +
+ + + + + + +
+ +
+ + + + + +

Popular

+
+ +
+ + +
+ +
+ +
+
{{ package.name }}
+ +
+ + {{ package.downloads }} + + + {{ package.karma }} + +
+ +
+ +
+ +
+ + +

Latest

+
+ +
+ + +
+ +
+ +
+

+ {{ package.name }} +

+ +
+ + {{ package.downloads }} + + + {{ package.karma }} + +
+ +
+ +
+ +
+ +