From 43f7a18eb67edfbbade376f79a450afc742fddd7 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 1 Jun 2016 10:06:09 +0200 Subject: [PATCH] move details view into repo sub view --- .../src/less/components/umb-packages.less | 10 + .../packagesNew/views/repo.controller.js | 99 ++++++- .../src/views/packagesNew/views/repo.html | 260 +++++++++++++----- 3 files changed, 303 insertions(+), 66 deletions(-) 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 a225454ffa..9a3cde7ebd 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 @@ -310,6 +310,16 @@ display: flex; } +.umb-package-details__back-link { + font-weight: bold; + color: @grayMed; +} + +.umb-package-details__back-link:hover { + color: @black; + text-decoration: none; +} + .umb-package-details__main-content { flex: 1 1 auto; margin-right: 40px; 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 index 5ed5ffb087..16186512be 100644 --- 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 @@ -5,8 +5,11 @@ var vm = this; + vm.packageViewState = "packageList"; + vm.selectCategory = selectCategory; vm.showPackageDetails = showPackageDetails; + vm.setPackageViewState = setPackageViewState; vm.categories = [ { @@ -129,6 +132,92 @@ } ]; + vm.package = { + "name": "Merchello", + "description": "<p>Merchello is a high performance, designer friendly, open source Umbraco ecommerce package built for the store owner.</p> <p><strong>What Merchello does for you</strong></p> <p>In version 1, Merchello supports a large variety of products with options that can be attached to a single warehouse, processes orders, manages taxes and shipping, and sends out email notifications to your customers. The beauty of Merchello is that while it oversees all of your products, orders, and store settings, it allows Umbraco to maintain your content. This seamless integration gives you the flexibility to build your store in any way imagineable on a robust platform capable of handling a wide variety of store sizes.</p> <p><strong>Find out more on our website</strong></p> <p><strong><a href="https://merchello.com">https://merchello.com</a></strong></p> <p><strong>Contribute</strong></p> <p>We would love and need your help. If you want to contribute to Merchello's core, the easiest way to get started is to fork the project on https://github.com/merchello/Merchello and open src/Merchello.sln in Visual Studio. We're excited to see what you do!</p> <p><strong>Starter Kit</strong></p> <p>We have built a simple starter kit for Merchello called Bazaar, and you can download it below in the package files tab.</p>", + "compatibility": [ + { + "version": "7.4.x", + "percentage": "100" + }, + { + "version": "7.3.x", + "percentage": "86" + }, + { + "version": "7.2.x", + "percentage": "93" + }, + { + "version": "7.1.x", + "percentage": "100" + } + ], + "information": { + "owner": "Rusty Swayne", + "ownerAvatar": "https://our.umbraco.org/media/upload/d476d257-a494-46d9-9a00-56c2f94a55c8/our-profile.jpg?width=200&height=200&mode=crop", + "ownerKarma": "2673", + "contributors": [ + { + "name": "Lee" + }, + { + "name": "Jason Prothero" + } + ], + "created": "18/12/2013", + "currentVersion": "2.0.0", + "netVersion": "4.5", + "license": "MIT", + "downloads": "4198", + "karma": "53" + }, + "externalSources": [ + { + "name": "Source code", + "url": "https://github.com/merchello/Merchello" + }, + { + "name": "Issue tracker", + "url": "http://issues.merchello.com/youtrack/oauth?state=%2Fyoutrack%2FrootGo" + } + ], + "images": [ + { + "thumbnail": "https://our.umbraco.org/media/wiki/104946/635591947547374885_Product-Listpng.png?bgcolor=fff&height=154&width=281&format=png", + "source": "https://our.umbraco.org/media/wiki/104946/635591947547374885_Product-Listpng.png" + }, + { + "thumbnail": "https://our.umbraco.org/media/wiki/104946/635591947547374885_Product-Listpng.png?bgcolor=fff&height=154&width=281&format=png", + "source": "https://our.umbraco.org/media/wiki/104946/635591947547374885_Product-Listpng.png" + }, + { + "thumbnail": "https://our.umbraco.org/media/wiki/104946/635591947547374885_Product-Listpng.png?bgcolor=fff&height=154&width=281&format=png", + "source": "https://our.umbraco.org/media/wiki/104946/635591947547374885_Product-Listpng.png" + }, + { + "thumbnail": "https://our.umbraco.org/media/wiki/104946/635591947547374885_Product-Listpng.png?bgcolor=fff&height=154&width=281&format=png", + "source": "https://our.umbraco.org/media/wiki/104946/635591947547374885_Product-Listpng.png" + }, + { + "thumbnail": "https://our.umbraco.org/media/wiki/104946/635591947547374885_Product-Listpng.png?bgcolor=fff&height=154&width=281&format=png", + "source": "https://our.umbraco.org/media/wiki/104946/635591947547374885_Product-Listpng.png" + }, + { + "thumbnail": "https://our.umbraco.org/media/wiki/104946/635591947547374885_Product-Listpng.png?bgcolor=fff&height=154&width=281&format=png", + "source": "https://our.umbraco.org/media/wiki/104946/635591947547374885_Product-Listpng.png" + }, + { + "thumbnail": "https://our.umbraco.org/media/wiki/104946/635591947547374885_Product-Listpng.png?bgcolor=fff&height=154&width=281&format=png", + "source": "https://our.umbraco.org/media/wiki/104946/635591947547374885_Product-Listpng.png" + }, + { + "thumbnail": "https://our.umbraco.org/media/wiki/104946/635591947547374885_Product-Listpng.png?bgcolor=fff&height=154&width=281&format=png", + "source": "https://our.umbraco.org/media/wiki/104946/635591947547374885_Product-Listpng.png" + } + ] + }; + function selectCategory(selectedCategory, categories) { for (var i = 0; i < categories.length; i++) { var category = categories[i]; @@ -138,12 +227,14 @@ } 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); + vm.packageViewState = "packageDetails"; } + function setPackageViewState(state) { + if(state) { + vm.packageViewState = state; + } + } } 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 index fd808175c9..19195716bc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/repo.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/repo.html @@ -1,84 +1,220 @@ -
+
-
-
- + +
+ +
+
+ +
+ +
+
+ +
{{ category.name }}
+ +
+
+ +
+

Popular

+
+ +
+ + +
+ +
+ +
+
{{ package.name }}
+
{{ package.description | limitTo: 40 }}...
+ +
+ + {{ package.downloads }} + + + {{ package.karma }} + +
+ +
+ +
+ +
+
+ +
+

Latest

+
+ +
+ + +
+ +
+ +
+
{{ package.name }}
+
{{ package.description | limitTo: 40 }}...
+ +
+ + {{ package.downloads }} + + + {{ package.karma }} + +
+ +
+ +
+ +
+
+
-
-
- -
{{ category.name }}
+ + +
+ +
+ + ← Take me back
-
-
-

Popular

-
+
-
- +
-
- +
{{ vm.package.name }}
+ +
+ +
+
+ + +
+
-
-
{{ package.name }}
-
{{ package.description | limitTo: 40 }}...
+
-
- - {{ package.downloads }} - - - {{ package.karma }} - +
+ +
+ +
+ +
+
+
+ +
+
+
{{ vm.package.information.owner }}
+
+ {{ vm.package.information.owner }} has {{ vm.package.information.ownerKarma }} karma points +
+
+
+
+ +
+
Information
+
+ +
+
Owner:
+
{{vm.package.information.owner}}
+
+ +
+
Contributors:
+ +
+ +
+
Created:
+
{{vm.package.information.created}}
+
+ +
+
Current version:
+
{{vm.package.information.created}}
+
+ +
+
.Net Version:
+
{{vm.package.information.netVersion}}
+
+ +
+
License:
+
{{vm.package.information.license}}
+
+ +
+
Downloads:
+
{{vm.package.information.downloads}}
+
+ +
+
Karma:
+
{{vm.package.information.karma}}
- -
+
-
-
- -
-

Latest

-
- -
- - -
- -
- -
-
{{ package.name }}
-
{{ package.description | limitTo: 40 }}...
- -
- - {{ package.downloads }} - - - {{ package.karma }} - +
+
Compatibility
+
This project is compatible with the following versions as reported by community members who have downloaded this package:
+
+
+ {{compatibility.version}} + ({{compatibility.percentage}}%) +
+
+
-
- -
+
+ +
+
External sources
+ + +
+ +
+ +
+ -