From 30ac4e94be2acd6f49c2072fd3a69447485ed2eb Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 26 May 2016 13:12:05 +0200 Subject: [PATCH 01/47] hacked new packages tree --- .../Trees/NewPackagesTreeController.cs | 48 +++++++++++++++++++ src/Umbraco.Web/Umbraco.Web.csproj | 1 + 2 files changed, 49 insertions(+) create mode 100644 src/Umbraco.Web/Trees/NewPackagesTreeController.cs diff --git a/src/Umbraco.Web/Trees/NewPackagesTreeController.cs b/src/Umbraco.Web/Trees/NewPackagesTreeController.cs new file mode 100644 index 0000000000..c6c4e67841 --- /dev/null +++ b/src/Umbraco.Web/Trees/NewPackagesTreeController.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Net; +using System.Net.Http.Formatting; +using System.Web.Http; +using Umbraco.Core; +using Umbraco.Core.Models; +using Umbraco.Web.Models.Trees; +using Umbraco.Web.Mvc; +using Umbraco.Web.WebApi.Filters; +using umbraco; +using umbraco.BusinessLogic.Actions; +using Umbraco.Core.Models.EntityBase; +using Umbraco.Core.Services; +using Constants = Umbraco.Core.Constants; + +namespace Umbraco.Web.Trees +{ + [UmbracoTreeAuthorize(Constants.Trees.DataTypes)] + [Tree(Constants.Applications.Developer, "packagesNew")] + [PluginController("UmbracoTrees")] + [CoreTree] + public class NewPackagesTreeController : TreeController + { + protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings) + { + var nodes = new TreeNodeCollection(); + + var node = CreateTreeNode("1", id, queryStrings, "Name", "icon-folder", false, ""); + node.Path = "path"; + //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);"; + + nodes.Add(node); + + return nodes; + } + + protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings) + { + var menu = new MenuItemCollection(); + return menu; + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index de4b49bc77..5102416548 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -376,6 +376,7 @@ + From 05746c7b7c7e4be08b78365e937d9e6e35868f48 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 26 May 2016 13:12:41 +0200 Subject: [PATCH 02/47] added editor scaffold --- .../src/views/packagesNew/edit.controller.js | 16 +++++++++++ .../src/views/packagesNew/edit.html | 27 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js create mode 100644 src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js new file mode 100644 index 0000000000..345846fdb9 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js @@ -0,0 +1,16 @@ +(function () { + "use strict"; + + function PackagesEditController($scope) { + + var vm = this; + + vm.page = {}; + vm.page.name = "Packages"; + + + } + + angular.module("umbraco").controller("Umbraco.Editors.Packages.EditController", PackagesEditController); + +})(); diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html new file mode 100644 index 0000000000..9af94dc739 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html @@ -0,0 +1,27 @@ +
+ + + +
+ + + + + + + + This is my new package repository + + + + +
+ +
From f876b6b7280cdc41507d54111fac8253264752dd Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Thu, 26 May 2016 13:39:01 +0200 Subject: [PATCH 03/47] added umb-packages.less, added repeater for packages + minimal styling --- src/Umbraco.Web.UI.Client/src/less/belle.less | 1 + .../src/less/components/umb-packages.less | 42 +++++++++++ .../src/views/packagesNew/edit.controller.js | 33 ++++++++- .../src/views/packagesNew/edit.html | 69 ++++++++++++++----- 4 files changed, 127 insertions(+), 18 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less index 9d01cae4b9..d00bc6021e 100644 --- a/src/Umbraco.Web.UI.Client/src/less/belle.less +++ b/src/Umbraco.Web.UI.Client/src/less/belle.less @@ -108,6 +108,7 @@ @import "components/umb-empty-state.less"; @import "components/umb-property-editor.less"; @import "components/umb-iconpicker.less"; +@import "components/umb-packages.less"; @import "components/buttons/umb-button.less"; @import "components/buttons/umb-button-group.less"; 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 new file mode 100644 index 0000000000..581b6da16d --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less @@ -0,0 +1,42 @@ +.umb-packages { + display: flex; + flex-wrap: wrap; +} + +.umb-package { + flex: 0 0 25%; + + padding-left: 20px; + padding-right: 20px; + + box-sizing: border-box; +} + +.umb-package-link { + display: flex; + flex-wrap: wrap; + flex-direction: column; + + padding: 20px; + + background: whitesmoke; + border: 2px solid #ececec; + border-radius: 3px; + + text-decoration: none !important; +} + + +.umb-package-icon { + padding: 20px; + text-align: center; +} + +.umb-package-name { + font-weight: bold; +} + +.umb-package-numbers { + display: flex; + flex-wrap: wrap; +} diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js index 345846fdb9..9279d1916e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js @@ -7,7 +7,38 @@ vm.page = {}; vm.page.name = "Packages"; - + + vm.packages = [ + { + "name": "Test App", + "description": "lorem flaxis slk asjasd ks", + "karma": "1", + "downloads": "2", + "icon": "flax" + }, + { + "name": "Tessti flaxi", + "description": "loremlaksjd lkajs dasjasd ks", + "karma": "10", + "downloads": "22", + "icon": "flaxo" + }, + { + "name": "Walla", + "description": "lorem flaxis slk asjasd ks", + "karma": "1", + "downloads": "2", + "icon": "flax" + }, + { + "name": "Walla", + "description": "lorem flaxis slk asjasd ks", + "karma": "1", + "downloads": "2", + "icon": "flax" + } + ]; + } diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html index 9af94dc739..f0c54febaa 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html @@ -1,27 +1,62 @@
- + -
+ - + - - + + - - This is my new package repository - + - +
- +
+ +
+ +
+ +
+ +
+ +
+ {{ package.icon }} +
+ +
+
+ {{ package.name }} +
+ +
+
+ {{ package.downloads }} +
+
+ {{ package.karma }} +
+
+ +
+ + +
+ +
+ + + +
+ +
From 259ccd653e6444bad5110b5401b8b4c1f5e149bd Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Thu, 26 May 2016 14:13:55 +0200 Subject: [PATCH 04/47] Added dummy data to packages --- .../src/less/components/umb-packages.less | 121 +++++++++++++++++- .../src/views/packagesNew/edit.controller.js | 28 ++++ .../src/views/packagesNew/edit.html | 20 +-- src/Umbraco.Web.UI/config/trees.config | 1 + 4 files changed, 158 insertions(+), 12 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 581b6da16d..fd9880f016 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 @@ -4,12 +4,33 @@ } .umb-package { - flex: 0 0 25%; + flex: 0 0 100%; padding-left: 20px; padding-right: 20px; + padding-bottom: 20px; box-sizing: border-box; + + @media (min-width: 768px) { + flex: 0 0 50%; + } + + @media (min-width: 1024px) { + flex: 0 0 33.33%; + } + + @media (min-width: 1260px) { + flex: 0 0 25%; + } + + @media (min-width: 1600px) { + flex: 0 0 20%; + } + + @media (min-width: 2000px) { + flex: 0 0 16.66%; + } } .umb-package-link { @@ -17,8 +38,6 @@ flex-wrap: wrap; flex-direction: column; - padding: 20px; - background: whitesmoke; border: 2px solid #ececec; border-radius: 3px; @@ -28,15 +47,109 @@ .umb-package-icon { - padding: 20px; + display: flex; + + justify-content: center; + align-items: center; + + padding: 10px; text-align: center; + border-bottom: 2px solid #ececec; + background-color: white; + + min-height: 120px; } +.umb-package-icon img { + opacity: .1; +} + +.umb-package-info { + padding-top: 10px; + padding-right: 20px; + padding-bottom: 20px; + padding-left: 20px; +} + + .umb-package-name { font-weight: bold; + margin-bottom: 10px; } .umb-package-numbers { display: flex; flex-wrap: wrap; + + margin-bottom: 20px; + + opacity: .6; +} + +.umb-package-link:hover .umb-package-numbers { + opacity: 1; +} + +.umb-package-link:hover .umb-era-button { + background: #2e8aea; + color: white; + + &:hover { + background-color: #287dd6; + } +} + +/* umb-buttons-era */ +.umb-era-button { + display: flex; + justify-content: center; + align-items: center; + + font-size: 14px; + font-weight: bold; + text-transform: capitalize; + + height: 38px; + line-height: 38px; + + + max-width: 100%; + padding: 0 18px; + + color: #484848; + background-color: #e0e0e0; + + text-decoration: none !important; + user-select: none; + + white-space: nowrap; + overflow: hidden; + + border-radius: 3px; + border: 0 none; + + transition: background-color 80ms ease, color 80ms ease; +} + + +.umb-era-button:hover, +.umb-era-button:active { + color: #484848; + background-color: #d3d3d3; + outline: none; + text-decoration: none; +} + + +.umb-era-button:focus { + outline: none; +} + +.umb-era-button.-blue { + background: #2e8aea; + color: white; +} + +.umb-era-button.-blue:hover { + background-color: #287dd6; } diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js index 9279d1916e..9c41d98d3a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js @@ -9,6 +9,34 @@ vm.page.name = "Packages"; vm.packages = [ + { + "name": "Test App", + "description": "lorem flaxis slk asjasd ks", + "karma": "1", + "downloads": "2", + "icon": "flax" + }, + { + "name": "Tessti flaxi", + "description": "loremlaksjd lkajs dasjasd ks", + "karma": "10", + "downloads": "22", + "icon": "flaxo" + }, + { + "name": "Walla", + "description": "lorem flaxis slk asjasd ks", + "karma": "1", + "downloads": "2", + "icon": "flax" + }, + { + "name": "Walla", + "description": "lorem flaxis slk asjasd ks", + "karma": "1", + "downloads": "2", + "icon": "flax" + }, { "name": "Test App", "description": "lorem flaxis slk asjasd ks", diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html index f0c54febaa..e01fe89161 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html @@ -26,30 +26,34 @@
-
+
+
- {{ package.icon }} + +
-
+

{{ package.name }} -

+
- {{ package.downloads }} + Downloads {{ package.downloads }}
- {{ package.karma }} + Karma {{ package.karma }}
+
+ Install +
- -
+
diff --git a/src/Umbraco.Web.UI/config/trees.config b/src/Umbraco.Web.UI/config/trees.config index 91c216c727..6c9fb153b6 100644 --- a/src/Umbraco.Web.UI/config/trees.config +++ b/src/Umbraco.Web.UI/config/trees.config @@ -42,4 +42,5 @@ + \ No newline at end of file From 7bb8430022b0a539d7315f603809acee622ecc82 Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Thu, 26 May 2016 14:50:11 +0200 Subject: [PATCH 05/47] =?UTF-8?q?Packages=20=F0=9F=93=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/less/components/umb-packages.less | 14 ++++++++++---- .../src/views/packagesNew/edit.html | 2 +- 2 files changed, 11 insertions(+), 5 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 fd9880f016..6840376703 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 @@ -43,6 +43,12 @@ border-radius: 3px; text-decoration: none !important; + + transition: border-color 100ms ease; + + &:hover { + border-color: @blue; + } } @@ -91,11 +97,11 @@ } .umb-package-link:hover .umb-era-button { - background: #2e8aea; + background: @blue; color: white; &:hover { - background-color: #287dd6; + background-color: @blueDark; } } @@ -146,10 +152,10 @@ } .umb-era-button.-blue { - background: #2e8aea; + background: @blue; color: white; } .umb-era-button.-blue:hover { - background-color: #287dd6; + background-color: @blueDark; } diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html index e01fe89161..e7e46528a8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html @@ -31,7 +31,7 @@
- +
From 098eb32ef61fbe3ec6994e5dd1243541c6bd38ed Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 26 May 2016 14:57:38 +0200 Subject: [PATCH 06/47] added categories --- .../src/less/components/umb-packages.less | 39 +++++++++++++++++++ .../src/views/packagesNew/edit.controller.js | 27 +++++++++++++ .../src/views/packagesNew/edit.html | 5 ++- 3 files changed, 70 insertions(+), 1 deletion(-) 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 6840376703..4d4d443b09 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 @@ -159,3 +159,42 @@ .umb-era-button.-blue:hover { background-color: @blueDark; } + + + +/* CATEGORIES */ + +.umb-packages-categories { + display: flex; + user-select: center; + flex-wrap: wrap; + margin-bottom: 30px; +} + +.umb-packages-category { + display: flex; + align-items: center; + flex: 1 0 auto; + max-width: 25%; + background-color: @blue; + padding: 10px; + font-size: 12px; + border-radius: 3px; + color: @white; + font-weight: bold; + box-sizing: border-box; + flex: 1 0 auto; + margin: 5px; + justify-content: center; +} + +.umb-packages-category:hover, +.umb-packages-category:focus { + text-decoration: none; + color: @white; +} + +.umb-packages-category-icon { + font-size: 20px; + margin-right: 5px; +} diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js index 9c41d98d3a..4ce5597429 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js @@ -8,6 +8,33 @@ vm.page = {}; vm.page.name = "Packages"; + 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": "Test App", diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html index e7e46528a8..8f98ba8712 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html @@ -21,7 +21,10 @@
- + + +
{{ category.name }}
+
From 8a744b52fe42097d2031cd8dd18f76af0f7f7121 Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Thu, 26 May 2016 15:21:12 +0200 Subject: [PATCH 07/47] Removed install button, better spacing --- .../src/less/components/umb-packages.less | 25 +++++++++++-------- .../src/views/packagesNew/edit.html | 12 +++------ 2 files changed, 18 insertions(+), 19 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 4d4d443b09..bca3d7cbd7 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 @@ -1,13 +1,17 @@ .umb-packages { display: flex; flex-wrap: wrap; + + margin: 0 -5px; } + +// List .umb-package { flex: 0 0 100%; - padding-left: 20px; - padding-right: 20px; + padding-left: 10px; + padding-right: 10px; padding-bottom: 20px; box-sizing: border-box; @@ -33,6 +37,8 @@ } } + +// Link (Wrapper) .umb-package-link { display: flex; flex-wrap: wrap; @@ -52,6 +58,8 @@ } + +// Icon .umb-package-icon { display: flex; @@ -70,6 +78,8 @@ opacity: .1; } + +// Info .umb-package-info { padding-top: 10px; padding-right: 20px; @@ -78,17 +88,17 @@ } +// Name .umb-package-name { font-weight: bold; margin-bottom: 10px; } +// Numbers .umb-package-numbers { display: flex; flex-wrap: wrap; - margin-bottom: 20px; - opacity: .6; } @@ -96,14 +106,7 @@ opacity: 1; } -.umb-package-link:hover .umb-era-button { - background: @blue; - color: white; - &:hover { - background-color: @blueDark; - } -} /* umb-buttons-era */ .umb-era-button { diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html index 8f98ba8712..c34c9487f2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html @@ -43,16 +43,12 @@
-
+ Downloads {{ package.downloads }} -
-
+ + Karma {{ package.karma }} -
-
- -
- Install +
From 3cc8a71a60fa12158ffb28c70e7ea0ed5fdac306 Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Thu, 26 May 2016 16:31:56 +0200 Subject: [PATCH 08/47] added button back --- .../src/less/components/umb-packages.less | 103 ++++++++++++------ .../src/views/packagesNew/edit.controller.js | 82 ++++++-------- .../src/views/packagesNew/edit.html | 45 +++++++- 3 files changed, 143 insertions(+), 87 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 bca3d7cbd7..b226517bbf 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 @@ -1,3 +1,25 @@ +.umb-packages-search { + width: 100%; + + margin-top: 40px; + margin-bottom: 30px; +} + +.umb-packages-search input { + border-width: 2px; + border-radius: 3px; + min-height: 44px; + + padding: 4px 10px; + font-size: 16px; + border-color: #ececec; + + &:hover, &:focus { + border-color: @grayLight; + } +} + + .umb-packages { display: flex; flex-wrap: wrap; @@ -8,33 +30,10 @@ // List .umb-package { - flex: 0 0 100%; + height: 260px; + width: 200px; - padding-left: 10px; - padding-right: 10px; - padding-bottom: 20px; - - box-sizing: border-box; - - @media (min-width: 768px) { - flex: 0 0 50%; - } - - @media (min-width: 1024px) { - flex: 0 0 33.33%; - } - - @media (min-width: 1260px) { - flex: 0 0 25%; - } - - @media (min-width: 1600px) { - flex: 0 0 20%; - } - - @media (min-width: 2000px) { - flex: 0 0 16.66%; - } + padding: 20px; } @@ -43,8 +42,11 @@ display: flex; flex-wrap: wrap; flex-direction: column; + justify-content: center; + + height: 100%; + width: 100%; - background: whitesmoke; border: 2px solid #ececec; border-radius: 3px; @@ -66,40 +68,62 @@ justify-content: center; align-items: center; - padding: 10px; + padding-top: 10px; + padding-right: 10px; + padding-left: 10px; + text-align: center; - border-bottom: 2px solid #ececec; background-color: white; - min-height: 120px; + min-height: 80px; } .umb-package-icon img { - opacity: .1; + max-width: 70px; + height: auto; } // Info .umb-package-info { - padding-top: 10px; padding-right: 20px; padding-bottom: 20px; padding-left: 20px; + + text-align: center; } // Name .umb-package-name { + max-width: 250px; + font-weight: bold; + margin-bottom: 10px; + + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + + line-height: normal; } // Numbers .umb-package-numbers { display: flex; flex-wrap: wrap; + flex-direction: column; + justify-content: center; opacity: .6; + + margin-bottom: 20px; +} + +.umb-package-numbers small { + padding: 0 5px; + display: block; } .umb-package-link:hover .umb-package-numbers { @@ -180,15 +204,22 @@ flex: 1 0 auto; max-width: 25%; background-color: @blue; - padding: 10px; - font-size: 12px; + padding: 40px 10px; + font-size: 13px; border-radius: 3px; color: @white; - font-weight: bold; box-sizing: border-box; flex: 1 0 auto; margin: 5px; justify-content: center; + + text-transform: uppercase; + letter-spacing: 1.3px; + + &:hover { + background-color: @blueDark; + box-shadow: 0 3px 8px rgba(0,0,0,0.2); + } } .umb-packages-category:hover, @@ -200,4 +231,6 @@ .umb-packages-category-icon { font-size: 20px; margin-right: 5px; + + display: none; } diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js index 4ce5597429..e082448933 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js @@ -37,60 +37,46 @@ vm.packages = [ { - "name": "Test App", - "description": "lorem flaxis slk asjasd ks", + "name": "uSightly", + "description": "An HTML5 audio player based on jPlayer", "karma": "1", - "downloads": "2", - "icon": "flax" + "downloads": "1672", + "icon":"https://our.umbraco.org/media/wiki/150283/635768313097111400_usightlylogopng.png?bgcolor=fff&height=154&width=281&format=png" }, { - "name": "Tessti flaxi", - "description": "loremlaksjd lkajs dasjasd ks", - "karma": "10", - "downloads": "22", - "icon": "flaxo" + "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": "Walla", - "description": "lorem flaxis slk asjasd ks", + "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": "2", - "icon": "flax" - }, - { - "name": "Walla", - "description": "lorem flaxis slk asjasd ks", - "karma": "1", - "downloads": "2", - "icon": "flax" - }, - { - "name": "Test App", - "description": "lorem flaxis slk asjasd ks", - "karma": "1", - "downloads": "2", - "icon": "flax" - }, - { - "name": "Tessti flaxi", - "description": "loremlaksjd lkajs dasjasd ks", - "karma": "10", - "downloads": "22", - "icon": "flaxo" - }, - { - "name": "Walla", - "description": "lorem flaxis slk asjasd ks", - "karma": "1", - "downloads": "2", - "icon": "flax" - }, - { - "name": "Walla", - "description": "lorem flaxis slk asjasd ks", - "karma": "1", - "downloads": "2", - "icon": "flax" + "downloads": "70", + "icon":"https://our.umbraco.org/media/wiki/151028/635810233171153461_logopng.png?bgcolor=fff&height=154&width=281&format=png" } ]; diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html index c34c9487f2..cf9c68e7d9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html @@ -17,7 +17,7 @@
- +
@@ -27,14 +27,15 @@
+ +
Popular
- - +
@@ -50,11 +51,47 @@ Karma {{ package.karma }}
+ +
+ Install +
+
- + + + +
Latest
+
+ +
+ + +
+ +
+ +
+

+ {{ package.name }} +

+ +
+ + Downloads {{ package.downloads }} + + + Karma {{ package.karma }} + +
+ +
+ +
+ +
From 140218b0ed83a2a9e4ff01daa6e66ac5c6ab981d Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 27 May 2016 10:32:55 +0200 Subject: [PATCH 09/47] remove install button + make categories smaller --- .../src/less/components/umb-packages.less | 44 +++++++++---------- .../src/views/packagesNew/edit.html | 19 +++----- 2 files changed, 28 insertions(+), 35 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 b226517bbf..f68db092a1 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 @@ -2,7 +2,11 @@ width: 100%; margin-top: 40px; - margin-bottom: 30px; + margin-bottom: 40px; + background: @grayLighter; + border-radius: 3px; + padding: 30px; + box-sizing: border-box; } .umb-packages-search input { @@ -13,6 +17,8 @@ padding: 4px 10px; font-size: 16px; border-color: #ececec; + margin-bottom: 0; + border-color: @grayLight; &:hover, &:focus { border-color: @grayLight; @@ -21,19 +27,16 @@ .umb-packages { - display: flex; - flex-wrap: wrap; - - margin: 0 -5px; + margin: 0 -10px; } // List .umb-package { - height: 260px; - width: 200px; - - padding: 20px; + float: left; + padding: 10px; + box-sizing: border-box; + width: 20%; } @@ -71,6 +74,7 @@ padding-top: 10px; padding-right: 10px; padding-left: 10px; + padding-bottom: 10px; text-align: center; background-color: white; @@ -86,27 +90,28 @@ // Info .umb-package-info { - padding-right: 20px; - padding-bottom: 20px; - padding-left: 20px; - + padding-right: 15px; + padding-bottom: 15px; + padding-left: 15px; text-align: center; } // Name .umb-package-name { + font-size: 15px; max-width: 250px; + margin-bottom: 5px; font-weight: bold; - margin-bottom: 10px; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; line-height: normal; + margin-left: auto; + margin-right: auto; } // Numbers @@ -117,8 +122,6 @@ justify-content: center; opacity: .6; - - margin-bottom: 20px; } .umb-package-numbers small { @@ -204,7 +207,7 @@ flex: 1 0 auto; max-width: 25%; background-color: @blue; - padding: 40px 10px; + padding: 10px; font-size: 13px; border-radius: 3px; color: @white; @@ -213,12 +216,9 @@ margin: 5px; justify-content: center; - text-transform: uppercase; - letter-spacing: 1.3px; - &:hover { background-color: @blueDark; - box-shadow: 0 3px 8px rgba(0,0,0,0.2); + //box-shadow: 0 3px 8px rgba(0,0,0,0.2); } } diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html index cf9c68e7d9..0901a58827 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html @@ -28,21 +28,18 @@ -
Popular
-
+

Popular

+
- +
-

- {{ package.name }} -

- +
{{ package.name }}
Downloads {{ package.downloads }} @@ -52,10 +49,6 @@
-
- Install -
-
@@ -63,8 +56,8 @@
-
Latest
-
+

Latest

+
From db21aef15091f7b7a98a2ec609e95d1e8d88ac9b Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Fri, 27 May 2016 11:59:19 +0200 Subject: [PATCH 10/47] added icons and versions --- .../src/less/components/umb-packages.less | 28 +++++++++++++++++-- .../src/views/packagesNew/edit.controller.js | 18 ++++++++---- .../src/views/packagesNew/edit.html | 9 +++--- 3 files changed, 43 insertions(+), 12 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 f68db092a1..e07e6f69f2 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 @@ -47,6 +47,8 @@ flex-direction: column; justify-content: center; + position: relative; + height: 100%; width: 100%; @@ -118,22 +120,44 @@ .umb-package-numbers { display: flex; flex-wrap: wrap; - flex-direction: column; + flex-direction: row; justify-content: center; opacity: .6; + + margin-top: 10px; } .umb-package-numbers small { padding: 0 5px; - display: block; + + display: flex; + align-items: center; + justify-content: center; +} + +.umb-package-numbers i { + font-size: 14px; } .umb-package-link:hover .umb-package-numbers { opacity: 1; } +.umb-package-link:hover .umb-package-numbers .icon-hearts { + color: red !important; +} +// Version +.umb-package-version { + display: inline-flex; + font-size: 11px; + font-weight: bold; + padding: 1px 5px; + background: #ececec; + border-radius: 3px; + color: black; +} /* umb-buttons-era */ .umb-era-button { diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js index e082448933..be816bb62a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.controller.js @@ -41,42 +41,48 @@ "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" + "icon":"https://our.umbraco.org/media/wiki/150283/635768313097111400_usightlylogopng.png?bgcolor=fff&height=154&width=281&format=png", + "version":"No good" }, { "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" + "icon":"https://our.umbraco.org/media/wiki/9138/634697622367666000_offroadcode-100x100.png?bgcolor=fff&height=154&width=281&format=png", + "version":"Fits perfectly" }, { "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" + "icon":"https://our.umbraco.org/media/wiki/50703/634782902373558000_cogworks.jpg?bgcolor=fff&height=154&width=281&format=png", + "version":"Fits perfectly" }, { "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" + "icon":"https://our.umbraco.org/media/wiki/154472/635997115126742822_logopng.png?bgcolor=fff&height=154&width=281&format=png", + "version":"Fits perfectly" }, { "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" + "icon":"https://our.umbraco.org/media/wiki/152476/635917291068518788_pipeline-crm-logopng.png?bgcolor=fff&height=154&width=281&format=png", + "version":"Fits perfectly" }, { "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" + "icon":"https://our.umbraco.org/media/wiki/151028/635810233171153461_logopng.png?bgcolor=fff&height=154&width=281&format=png", + "version":"No good" } ]; diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html index 0901a58827..24f919a4e9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/edit.html @@ -40,12 +40,13 @@
{{ package.name }}
+
- Downloads {{ package.downloads }} + {{ package.downloads }} - Karma {{ package.karma }} + {{ package.karma }}
@@ -73,10 +74,10 @@
- Downloads {{ package.downloads }} + {{ package.downloads }} - Karma {{ package.karma }} + {{ package.karma }}
From d77986fb180c34e1b34d857a55c7db436b071c9d Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 27 May 2016 13:11:03 +0200 Subject: [PATCH 11/47] open overview html instead of edit html.. add category html and link the two views --- ...t.controller.js => category.controller.js} | 30 +++--- .../src/views/packagesNew/category.html | 35 +++++++ .../views/packagesNew/overview.controller.js | 97 +++++++++++++++++++ .../packagesNew/{edit.html => overview.html} | 4 +- .../Trees/NewPackagesTreeController.cs | 3 + 5 files changed, 152 insertions(+), 17 deletions(-) rename src/Umbraco.Web.UI.Client/src/views/packagesNew/{edit.controller.js => category.controller.js} (86%) create mode 100644 src/Umbraco.Web.UI.Client/src/views/packagesNew/category.html create mode 100644 src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.controller.js rename src/Umbraco.Web.UI.Client/src/views/packagesNew/{edit.html => overview.html} (96%) 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);"; From a04cb1d97010f9b86581683a66f2494d8823546e Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 27 May 2016 14:29:30 +0200 Subject: [PATCH 12/47] added details view --- .../views/packagesNew/details.controller.js | 92 +++++++++++++++++++ .../src/views/packagesNew/details.html | 35 +++++++ .../views/packagesNew/overview.controller.js | 8 ++ .../src/views/packagesNew/overview.html | 4 +- 4 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/views/packagesNew/details.controller.js create mode 100644 src/Umbraco.Web.UI.Client/src/views/packagesNew/details.html diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.controller.js b/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.controller.js new file mode 100644 index 0000000000..9b4313b743 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.controller.js @@ -0,0 +1,92 @@ +(function () { + "use strict"; + + function PackageDetailsController($scope) { + + var vm = this; + + vm.page = {}; + + vm.package = { + "name": "Merchello", + "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur dignissim purus pulvinar odio iaculis, sit amet euismod arcu volutpat. Sed ut hendrerit sem. Vestibulum enim nisl, luctus quis cursus et, porttitor a ligula. Donec sed congue urna. Integer tincidunt ultrices lorem vitae suscipit. Sed non turpis massa. Donec et velit ante. Sed interdum lectus id lorem congue, sit amet lacinia ex placerat. In id orci sed augue cursus sodales.", + "compatibility": [ + { + "version": "7.4.x", + "compatibility": "100%" + }, + { + "version": "7.3.x", + "compatibility": "86%" + }, + { + "version": "7.2.x", + "compatibility": "93%" + }, + { + "version": "7.1.x", + "compatibility": "100%" + }, + { + "version": "7.0.x", + "compatibility": "untested" + }, + { + "version": "6.1.x", + "compatibility": "untested" + }, + { + "version": "6.0.x", + "compatibility": "untested" + }, + { + "version": "4.11.x", + "compatibility": "untested" + }, + { + "version": "4.10.x", + "compatibility": "untested" + }, + { + "version": "4.9.1", + "compatibility": "untested" + }, + { + "version": "4.9.0", + "compatibility": "untested" + } + ], + "information": { + "owner": "Rusty Swayne", + "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" + } + ] + }; + + } + + angular.module("umbraco").controller("Umbraco.Editors.Packages.DetailsController", PackageDetailsController); + +})(); diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.html new file mode 100644 index 0000000000..595dc03868 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.html @@ -0,0 +1,35 @@ +
+ + + +
+ + + + + + + + + 
{{ vm.package | json }}
+ + + + + + + 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 index d50249dafd..820e1d2cf1 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 @@ -9,6 +9,7 @@ vm.page.name = "Packages"; vm.selectCategory = selectCategory; + vm.showPackageDetails = showPackageDetails; vm.categories = [ { @@ -89,6 +90,13 @@ $location.path(path); } + function showPackageDetails(selectedPackage) { + var section = $route.current.params.section; + var tree = $route.current.params.tree; + var path = "/" + section + "/" + tree + "/details"; + $location.path(path); + } + } 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 837f3b32b2..724ea7af84 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html @@ -32,7 +32,7 @@
- +
@@ -61,7 +61,7 @@
- +
From 5b9d0638084f81c71a644233fa2a1e864b098896 Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Fri, 27 May 2016 14:52:31 +0200 Subject: [PATCH 13/47] Changed categories --- .../src/less/components/umb-packages.less | 54 +++++++++---- .../views/packagesNew/category.controller.js | 8 +- .../src/views/packagesNew/category.html | 78 ++++++++++++++++++- .../views/packagesNew/overview.controller.js | 8 +- .../src/views/packagesNew/overview.html | 21 ++++- 5 files changed, 147 insertions(+), 22 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 e07e6f69f2..658c690f39 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 @@ -27,7 +27,7 @@ .umb-packages { - margin: 0 -10px; + // margin: 0 -10px; } @@ -225,31 +225,32 @@ margin-bottom: 30px; } + + .umb-packages-category { display: flex; align-items: center; flex: 1 0 auto; - max-width: 25%; - background-color: @blue; - padding: 10px; - font-size: 13px; - border-radius: 3px; - color: @white; - box-sizing: border-box; - flex: 1 0 auto; - margin: 5px; justify-content: center; - &:hover { - background-color: @blueDark; - //box-shadow: 0 3px 8px rgba(0,0,0,0.2); - } + opacity: .6; + + max-width: 25%; + + font-size: 13px; + font-weight: bold; + color: @black; + + box-sizing: border-box; + + justify-content: center; } + .umb-packages-category:hover, .umb-packages-category:focus { text-decoration: none; - color: @white; + opacity: 1; } .umb-packages-category-icon { @@ -258,3 +259,26 @@ display: none; } + +// Collapsed +.umb-packages-categories.-collapsed { + margin-bottom: 0; +} + +.umb-packages-categories.-collapsed .umb-packages-category { + margin-right: 20px; + + &:last-child { + margin-right: 0; + } +} + +.-ma0 { + margin: 0 !important; +} + +.-collapsed .umb-packages-category.-active { + color: @black; + opacity: 1; + border-bottom: 2px solid @black; +} diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.controller.js b/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.controller.js index 1030266e23..3dbf0403a0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.controller.js @@ -13,7 +13,13 @@ vm.categories = [ { "icon": "icon-male-and-female", - "name": "Collaboration" + "name": "All", + "active": false + }, + { + "icon": "icon-male-and-female", + "name": "Collaboration", + "active": true }, { "icon": "icon-molecular-network", diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.html index 0262b2c8ae..a012264d75 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.html @@ -1,4 +1,4 @@ -
+
@@ -16,7 +16,81 @@ - This is my category + + + + + +
+ + +
{{ 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/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.controller.js index 820e1d2cf1..e01f818cb0 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 @@ -14,7 +14,13 @@ vm.categories = [ { "icon": "icon-male-and-female", - "name": "Collaboration" + "name": "All", + "active": true + }, + { + "icon": "icon-male-and-female", + "name": "Collaboration", + "active": false }, { "icon": "icon-molecular-network", 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 724ea7af84..3d18e27411 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html @@ -1,4 +1,4 @@ -
+
@@ -16,16 +16,31 @@ + + + + +
+ + +
{{ category.name }}
+ +
+ + + + +
-
+

Popular

From 521329feaca483edadcb793c6531b092d499e01b Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 May 2016 09:15:28 +0200 Subject: [PATCH 14/47] send id to category and details view --- .../src/views/packagesNew/category.controller.js | 2 +- .../src/views/packagesNew/details.controller.js | 2 +- .../src/views/packagesNew/overview.controller.js | 16 ++++++++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.controller.js b/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.controller.js index 3dbf0403a0..61332e850f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.controller.js @@ -1,7 +1,7 @@ (function () { "use strict"; - function PackagesCategoryController($scope) { + function PackagesCategoryController($scope, $routeParams) { var vm = this; diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.controller.js b/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.controller.js index 9b4313b743..834c894c0c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.controller.js @@ -1,7 +1,7 @@ (function () { "use strict"; - function PackageDetailsController($scope) { + function PackageDetailsController($scope, $routeParams) { var vm = this; 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 e01f818cb0..d98212e8fe 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 @@ -13,6 +13,7 @@ vm.categories = [ { + "id": 1, "icon": "icon-male-and-female", "name": "All", "active": true @@ -23,22 +24,27 @@ "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" } @@ -46,6 +52,7 @@ vm.packages = [ { + "id": 1, "name": "uSightly", "description": "An HTML5 audio player based on jPlayer", "karma": "1", @@ -53,6 +60,7 @@ "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", @@ -60,6 +68,7 @@ "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", @@ -67,6 +76,7 @@ "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", @@ -74,6 +84,7 @@ "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", @@ -81,6 +92,7 @@ "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", @@ -92,14 +104,14 @@ function selectCategory(category) { var section = $route.current.params.section; var tree = $route.current.params.tree; - var path = "/" + section + "/" + tree + "/category"; + 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"; + var path = "/" + section + "/" + tree + "/details/" + selectedPackage.id; $location.path(path); } From c3e4b611a61646d5de6988e29133bbc4107d7bb5 Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Tue, 31 May 2016 11:18:34 +0200 Subject: [PATCH 15/47] 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 @@ + From 5ba2967c15b839ecf9101302e543c63b3f37dea2 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 31 May 2016 14:02:07 +0200 Subject: [PATCH 16/47] added design for package details --- .../src/less/components/umb-packages.less | 158 ++++++++++++++++++ .../views/packagesNew/details.controller.js | 76 +++++---- .../src/views/packagesNew/details.html | 126 ++++++++++++-- 3 files changed, 316 insertions(+), 44 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 6becc6805f..46516c48d4 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 @@ -215,6 +215,11 @@ background-color: @blueDark; } +.umb-era-button.-full-width { + display: block; + width: 100%; +} + /* CATEGORIES */ @@ -280,3 +285,156 @@ opacity: 1; border-bottom: 2px solid @black; } + +/* PACKAGE DETAILS */ + +.umb-package-details { + display: flex; +} + +.umb-package-details__main-content { + flex: 1 1 auto; + margin-right: 40px; +} + +.umb-package-details__sidebar { + flex: 0 0 350px; +} + +.umb-package-details__section { + background: @grayLighter; + padding: 20px; + margin-bottom: 20px; + border-radius: 3px; +} + +.umb-package-details__section-title { + font-size: 17px; + font-weight: bold; + color: black; + margin-top: 0; + margin-bottom: 15px; +} + +.umb-package-details__section-description { + font-size: 12px; + line-height: 1.6em; + margin-bottom: 15px; +} + +.umb-package-details__information-item { + display: flex; + margin-bottom: 5px; + font-size: 13px; +} + +.umb-package-details__information-item-label { + color: black; + font-weight: bold; + margin-right: 3px; +} + +.umb-package-details__information-item-label-2 { + font-size: 12px; + color: @grayMed; +} + +.umb-package-details__compatability { + margin-bottom: 15px; +} + +.umb-package-details__compatability-label { + margin-bottom: 3px; +} + +.umb-package-details__description { + margin-bottom: 20px; + line-height: 1.6em; +} + +.umb-package-details__description p { + margin-bottom: 20px; +} + +/* Links */ + +.umb-package-details__link { + color: #DA3287; +} + +.umb-package-details__link:hover { + color: #B32D71; + text-decoration: none; +} + +/* Owner profile */ + +.umb-package-details__owner-profile { + display: flex; + align-items: center; +} +.umb-package-details__owner-profile-avatar { + margin-right: 15px; +} + +.umb-package-details__owner-profile-name { + font-size: 15px; + color: #000000; + font-weight: bold; +} + +.umb-package-details__owner-profile-karma { + font-size: 12px; + color: @grayMed; +} + +/* gallery */ + +.umb-gallery__thumbnails { + display: flex; + flex-wrap: wrap; +} + +.umb-gallery__thumbnail { + flex: 1 1 100px; + border: 1px solid @grayLight; + border-radius: 3px; + margin: 5px; + padding: 10px; + box-sizing: border-box; +} + +.umb-gallery__thumbnail:hover { + cursor: pointer; + border-color: @blue; +} + +/* Avatar */ + +.umb-avatar { + border-radius: 50%; + width: 50px; +} + +/* Progress bar */ + +.umb-progress-bar { + background: @grayLight; + width: 100%; + display: block; + height: 10px; + border-radius: 10px; + box-sizing: border-box; + position: relative; + overflow: hidden; +} + +.umb-progress-bar__progress { + background: #50C878; + position: absolute; + left: 0; + top: 0; + bottom: 0; + width: 100%; + border-radius: 10px; +} diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.controller.js b/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.controller.js index 834c894c0c..7f4a48ebb9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.controller.js @@ -9,55 +9,29 @@ vm.package = { "name": "Merchello", - "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur dignissim purus pulvinar odio iaculis, sit amet euismod arcu volutpat. Sed ut hendrerit sem. Vestibulum enim nisl, luctus quis cursus et, porttitor a ligula. Donec sed congue urna. Integer tincidunt ultrices lorem vitae suscipit. Sed non turpis massa. Donec et velit ante. Sed interdum lectus id lorem congue, sit amet lacinia ex placerat. In id orci sed augue cursus sodales.", + "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", - "compatibility": "100%" + "percentage": "100" }, { "version": "7.3.x", - "compatibility": "86%" + "percentage": "86" }, { "version": "7.2.x", - "compatibility": "93%" + "percentage": "93" }, { "version": "7.1.x", - "compatibility": "100%" - }, - { - "version": "7.0.x", - "compatibility": "untested" - }, - { - "version": "6.1.x", - "compatibility": "untested" - }, - { - "version": "6.0.x", - "compatibility": "untested" - }, - { - "version": "4.11.x", - "compatibility": "untested" - }, - { - "version": "4.10.x", - "compatibility": "untested" - }, - { - "version": "4.9.1", - "compatibility": "untested" - }, - { - "version": "4.9.0", - "compatibility": "untested" + "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" @@ -68,7 +42,7 @@ ], "created": "18/12/2013", "currentVersion": "2.0.0", - ".netVersion": "4.5", + "netVersion": "4.5", "license": "MIT", "downloads": "4198", "karma": "53" @@ -82,6 +56,40 @@ "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" + } ] }; diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.html b/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.html index 595dc03868..fa69f55407 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.html @@ -4,7 +4,7 @@
- + - 
{{ vm.package | json }}
+
+ +
+ +
+ +
+
+ + + +
+
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+
+
{{ 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}}
+
+ +
+
+ +
+
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
+ + +
+ +
+ +
- - - - Breadcrumbs here - - - - From 8b3160cd79ece8f1768567904dbbf401c768742e Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 31 May 2016 15:56:56 +0200 Subject: [PATCH 17/47] remove unused model --- src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 3f666ffba2..d5ec07db74 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html @@ -19,8 +19,7 @@ + sub-views="vm.page.navigation"> From c36db267ce2415401f64bec18a80a45aa7637466 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 31 May 2016 15:57:34 +0200 Subject: [PATCH 18/47] add val-form-manager to fix js errors --- src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d5ec07db74..f698580e14 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html @@ -2,7 +2,7 @@ -
+ From 4545e8353401ed48e80804d6183eeba45e9c67b4 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 31 May 2016 16:00:23 +0200 Subject: [PATCH 19/47] added list for installed packages --- .../src/less/components/umb-packages.less | 61 ++++++++++++++++ .../packagesNew/views/installed.controller.js | 69 +++++++++++++++++++ .../views/packagesNew/views/installed.html | 27 +++++++- 3 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 src/Umbraco.Web.UI.Client/src/views/packagesNew/views/installed.controller.js 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 46516c48d4..12c4b3794b 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 @@ -1,3 +1,14 @@ +.umb-packages-view-title { + font-size: 20px; + font-weight: bold; + color: @black; + margin-bottom: 30px; +} + +.umb-packages-view-wrapper { + padding: 20px 60px; +} + .umb-packages-search { width: 100%; @@ -215,6 +226,11 @@ background-color: @blueDark; } +.umb-era-button.-red-orange { + background-color: #FF3F34; + color: white; +} + .umb-era-button.-full-width { display: block; width: 100%; @@ -438,3 +454,48 @@ width: 100%; border-radius: 10px; } + +/* PACKAGE LIST */ + +.umb-package-list { + display: flex; + flex-direction: column; +} + +.umb-package-list__item { + display: flex; + flex-direction: row; + background: @grayLighter; + margin-bottom: 10px; + border-radius: 3px; + padding: 20px; + align-items: center; +} + +.umb-package-list__item-icon { + flex: 0 0 50px; + margin-right: 20px; +} + +.umb-package-list__item-content { + flex: 1 1 auto; + margin-right: 20px; +} + +.umb-package-list__item-name { + font-size: 16px; + margin-bottom: 5px; + color: @black; + font-weight: bold; +} + +.umb-package-list__item-description { + font-size: 14px; + color: @grayMed; +} + +.umb-package-list__item-actions { + flex: 1 1 auto; + display: flex; + justify-content: flex-end; +} diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/installed.controller.js b/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/installed.controller.js new file mode 100644 index 0000000000..a4348df277 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/installed.controller.js @@ -0,0 +1,69 @@ +(function () { + "use strict"; + + function PackagesInstalledController($scope, $route, $location) { + + var vm = this; + + vm.installedPackages = [ + { + "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" + } + ]; + + vm.uninstallPackage = uninstallPackage; + + function uninstallPackage(installedPackage) { + console.log(installedPackage); + } + + } + + angular.module("umbraco").controller("Umbraco.Editors.Packages.InstalledController", PackagesInstalledController); + +})(); 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 index 84376928ca..8550cfb00f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/installed.html +++ b/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/installed.html @@ -1 +1,26 @@ -Installed +
+ +
Installed packages
+ +
+ +
+ +
+ +
+ +
+
{{ installedPackage.name }}
+
{{ installedPackage.description }}
+
+ +
+ +
+ +
+ +
+ +
From c66de2298b9177712876f82cff4d4ea20fb58314 Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Tue, 31 May 2016 16:18:41 +0200 Subject: [PATCH 20/47] Added local installer --- .../src/less/components/umb-packages.less | 116 +++++++++++++++++- .../views/install-local.controller.js | 26 +++- .../packagesNew/views/install-local.html | 81 +++++++++++- 3 files changed, 213 insertions(+), 10 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 12c4b3794b..983a59364c 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 @@ -179,12 +179,10 @@ font-size: 14px; font-weight: bold; - text-transform: capitalize; height: 38px; line-height: 38px; - max-width: 100%; padding: 0 18px; @@ -200,6 +198,8 @@ border-radius: 3px; border: 0 none; + cursor: pointer; + transition: background-color 80ms ease, color 80ms ease; } @@ -226,18 +226,34 @@ background-color: @blueDark; } -.umb-era-button.-red-orange { - background-color: #FF3F34; - color: white; +.umb-era-button.-link { + padding: 0; + background: transparent; } +.umb-era-button.-link:hover { + background-color: transparent; + opacity: .6; +} + +.umb-era-button.-inactive { + cursor: not-allowed; + background: whitesmoke; + color: @grayMed; +} + +.umb-era-button.-inactive:hover { + background: whitesmoke; + color: @grayMed; +} + + .umb-era-button.-full-width { display: block; width: 100%; } - /* CATEGORIES */ .umb-packages-categories { @@ -499,3 +515,91 @@ display: flex; justify-content: flex-end; } + + + +// Install local package + +// Accept terms +.umb-accept-terms { + margin-bottom: 40px; + display: flex; + align-items: center; + + font-size: 13px; +} + +.umb-package-installer-label .label-text { + margin-left: 5px; +} + +.umb-package-installer-label input[type="radio"], +.umb-package-installer-label input[type="checkbox"] { + margin-top: 0px; +} + +.umb-package-installer-label { + display: flex; + align-items: center; + + font-size: 13px; + user-select: none; +} + +// Install local package +.umb-center-allthings { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + + max-width: 640px; + margin: 0 auto; + text-align: center; +} + + +// Upload state +.umb-upload-local input[type="file"] { + display: none; +} + +.umb-upload-local { + display: flex; + flex-direction: row; + align-items: flex-start; + + margin: 40px auto; +} + +.umb-upload-local .loaded { + margin-left: 10px; +} + +.umb-upload-local .upload i { + font-size: 20px; + line-height: 1; +} + +.umb-upload-local .-large { + font-size: 18px; +} + +.uploaded-file-name { + margin-left: 10px; +} + + +// Info state +.umb-info-local { + +} + +.umb-info-local-item { + margin: 10px 0; 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 index 9ac88fe6f9..56a67db062 100644 --- 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 @@ -1,7 +1,31 @@ (function () { "use strict"; + function PackagesInstallLocalController($scope, $route, $location) { - angular.module("umbraco").controller("Umbraco.Editors.Packages.InstallLocalController"); + var vm = this; + + vm.state = "upload"; + vm.localPackage = { + "packageName": "SvgIconPicker Version: 0.1.0", + "packageAuthor": "Søren Kottal", + "packageAuthorLink": "https://github.com/skttl/", + "packageInfo": "https://github.com/skttl/Umbraco.SvgIconPicker", + "packageLicens": "GPLv3", + "packageLicensLink": "http://www.gnu.org/licenses/quick-guide-gplv3.en.html", + "packageLicensAccept": false, + "packageReadme": false, + "filePath": "", + "riskAccept": false + }; + + vm.loadPackage = loadPackage; + + function loadPackage(){ + vm.state = "packageDetails"; + } + } + + angular.module("umbraco").controller("Umbraco.Editors.Packages.InstallLocalController", PackagesInstallLocalController); })(); 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 index fa93b06f48..93fb7d17ff 100644 --- 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 @@ -1,7 +1,82 @@ -
+
- - Install Local + +
+ +

Install local package

+

Browse for local packages, they usally have a ".zip" extension. You can find trusted packages on our.umbraco.com or in the package tab in Umbraco

+ + +
+ +
+ + + + + + +
+ + + +
+

{{ vm.localPackage.packageName }}

+ +
+ Author + {{ vm.localPackage.packageAuthor }} +
+ +
+ Repository + {{ vm.localPackage.packageInfo }} +
+ +
+ License + {{ vm.localPackage.packageLicens }} +
+ +
+ Accept license + +
+ +
+ Read me +
+ + +
+ + 
+        {{ vm.localPackage | json }}
+
+
From 86eaacc5d216687205e8c35101b6dd4b6f7172ca Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 31 May 2016 21:10:52 +0200 Subject: [PATCH 21/47] tighten repo overview a bit --- .../src/less/components/umb-packages.less | 65 ++++++------------- .../packagesNew/views/repo.controller.js | 43 ++++++++++-- .../src/views/packagesNew/views/repo.html | 31 +++------ 3 files changed, 67 insertions(+), 72 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 983a59364c..e58019553a 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 @@ -11,8 +11,6 @@ .umb-packages-search { width: 100%; - - margin-top: 40px; margin-bottom: 40px; background: @grayLighter; border-radius: 3px; @@ -38,11 +36,10 @@ .umb-packages { - // margin: 0 -10px; + margin: 0 -10px; } - -// List +// Cards .umb-package { float: left; padding: 10px; @@ -50,8 +47,6 @@ width: 20%; } - -// Link (Wrapper) .umb-package-link { display: flex; flex-wrap: wrap; @@ -64,7 +59,7 @@ height: 100%; width: 100%; - border: 2px solid #ececec; + border: 1px solid #ececec; border-radius: 3px; text-decoration: none !important; @@ -93,7 +88,7 @@ text-align: center; background-color: white; - min-height: 80px; + min-height: 60px; } .umb-package-icon img { @@ -107,13 +102,16 @@ padding-right: 15px; padding-bottom: 15px; padding-left: 15px; + padding-top: 15px; text-align: center; + background: @grayLighter; + border-top: 1px solid #ececec; } // Name .umb-package-name { - font-size: 15px; + font-size: 14px; max-width: 250px; margin-bottom: 5px; @@ -263,59 +261,37 @@ margin-bottom: 30px; } - - .umb-packages-category { display: flex; align-items: center; flex: 1 0 auto; justify-content: center; - - opacity: .6; - max-width: 25%; - font-size: 14px; font-weight: bold; color: @black; - box-sizing: border-box; - justify-content: center; + border-top: 1px solid @grayLight; + border-bottom: 1px solid @grayLight; + border-right: 1px solid @grayLight; + padding: 5px; } - .umb-packages-category:hover, -.umb-packages-category:focus { +.umb-packages-category.-active { text-decoration: none; - opacity: 1; + color: @blue; } -.umb-packages-category-icon { - font-size: 20px; - margin-right: 5px; - - display: none; +.umb-packages-category.-first { + border-left: 1px solid @grayLight; + border-radius: 3px 0 0 3px; } -// Collapsed -.umb-packages-categories.-collapsed { - margin-bottom: 0; -} - -.umb-packages-categories.-collapsed .umb-packages-category { - margin-right: 15px; - margin-left: 15px; -} - -.-ma0 { - margin: 0 !important; -} - -.-collapsed .umb-packages-category.-active { - color: @black; - opacity: 1; - border-bottom: 2px solid @black; +.umb-packages-category.-last { + border-right: 1px solid @grayLight; + border-radius: 0 3px 3px 0; } /* PACKAGE DETAILS */ @@ -603,3 +579,4 @@ .umb-info-local-item { margin: 10px 0; +} 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 8286f3ff31..5217b0d20c 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 @@ -17,8 +17,7 @@ }, { "icon": "icon-male-and-female", - "name": "Collaboration", - "active": false + "name": "Collaboration" }, { "id": 2, @@ -90,11 +89,43 @@ }, { "id": 6, - "name": "CodeMirror", - "description": "CodeMirror Editor for Umbraco", + "name": "uSightly", + "description": "An HTML5 audio player based on jPlayer", "karma": "1", - "downloads": "70", - "icon":"https://our.umbraco.org/media/wiki/151028/635810233171153461_logopng.png?bgcolor=fff&height=154&width=281&format=png" + "downloads": "1672", + "icon":"https://our.umbraco.org/media/wiki/150283/635768313097111400_usightlylogopng.png?bgcolor=fff&height=154&width=281&format=png" + }, + { + "id": 7, + "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": 8, + "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": 9, + "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": 10, + "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" } ]; 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 bd2dc96f77..714be5c0d6 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,33 +1,20 @@ -
- - - - - -
- - -
{{ category.name }}
- -
- - - - +
- - - +

Popular

From 5858823252a08d2bd40397a2c0af483e35871776 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 31 May 2016 21:29:00 +0200 Subject: [PATCH 22/47] add even spacing to sections + a bit more padding to category nav --- .../src/less/components/umb-packages.less | 8 +- .../src/views/packagesNew/views/repo.html | 120 +++++++++--------- 2 files changed, 68 insertions(+), 60 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 e58019553a..a5916fa14e 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 @@ -9,9 +9,12 @@ padding: 20px 60px; } +.umb-packages-section { + margin-bottom: 40px; +} + .umb-packages-search { width: 100%; - margin-bottom: 40px; background: @grayLighter; border-radius: 3px; padding: 30px; @@ -258,7 +261,6 @@ display: flex; user-select: center; flex-wrap: wrap; - margin-bottom: 30px; } .umb-packages-category { @@ -275,7 +277,7 @@ border-top: 1px solid @grayLight; border-bottom: 1px solid @grayLight; border-right: 1px solid @grayLight; - padding: 5px; + padding: 10px 0; } .umb-packages-category:hover, 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 714be5c0d6..7aacb9a010 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,78 +1,84 @@
- -
- +
+
+ +
-
- -
{{ category.name }}
- +
+
+ +
{{ category.name }}
+ +
-

Popular

-
+
+

Popular

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

Latest

-
+
+
-
- +
+

Latest

+
-
- -
+
+ -
-

- {{ package.name }} -

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

+ {{ package.name }} +

-
+
+ + {{ package.downloads }} + + + {{ package.karma }} + +
+ +
+ +
+ +
+
From 05cdc066ab2390c314b026f09db589c1a008e517 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 31 May 2016 21:29:23 +0200 Subject: [PATCH 23/47] do not redirect when changing category --- .../src/views/packagesNew/views/repo.controller.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 5217b0d20c..5ed5ffb087 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 @@ -129,11 +129,12 @@ } ]; - 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 selectCategory(selectedCategory, categories) { + for (var i = 0; i < categories.length; i++) { + var category = categories[i]; + category.active = false; + } + selectedCategory.active = true; } function showPackageDetails(selectedPackage) { From 41bef87365b591be7d8c641ecac5f55d387b4e8c Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 31 May 2016 21:56:33 +0200 Subject: [PATCH 24/47] add description to package --- .../src/less/components/umb-packages.less | 12 ++++++++++-- .../src/views/packagesNew/views/repo.html | 6 +++--- 2 files changed, 13 insertions(+), 5 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 a5916fa14e..a225454ffa 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 @@ -40,14 +40,15 @@ .umb-packages { margin: 0 -10px; + display: flex; + flex-wrap: wrap; } // Cards .umb-package { - float: left; padding: 10px; box-sizing: border-box; - width: 20%; + width: 25%; } .umb-package-link { @@ -129,6 +130,13 @@ margin-right: auto; } +.umb-package-description { + font-size: 11px; + color: @grayMed; + word-wrap: break-word; + line-height: 1.1rem; +} + // Numbers .umb-package-numbers { display: flex; 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 7aacb9a010..fd808175c9 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 @@ -32,6 +32,7 @@
{{ package.name }}
+
{{ package.description | limitTo: 40 }}...
@@ -61,9 +62,8 @@
-

- {{ package.name }} -

+
{{ package.name }}
+
{{ package.description | limitTo: 40 }}...
From 43f7a18eb67edfbbade376f79a450afc742fddd7 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 1 Jun 2016 10:06:09 +0200 Subject: [PATCH 25/47] 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
+ + +
+ +
+ +
+ -
From 0d99e1d9a222b16cd75d5fc57710ef725641b4f8 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 1 Jun 2016 11:12:34 +0200 Subject: [PATCH 26/47] added pagination --- .../src/less/components/umb-packages.less | 4 ++++ .../packagesNew/views/repo.controller.js | 19 +++++++++++++++++++ .../src/views/packagesNew/views/repo.html | 12 ++++++++++++ 3 files changed, 35 insertions(+) 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 9a3cde7ebd..903b94772a 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 @@ -37,6 +37,10 @@ } } +.umb-packages__pagination { + display: flex; + justify-content: center; +} .umb-packages { margin: 0 -10px; 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 16186512be..1587a16f99 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 @@ -6,10 +6,17 @@ var vm = this; vm.packageViewState = "packageList"; + vm.pagination = { + pageNumber: 1, + totalPages: 10 + }; vm.selectCategory = selectCategory; vm.showPackageDetails = showPackageDetails; vm.setPackageViewState = setPackageViewState; + vm.nextPage = nextPage; + vm.prevPage = prevPage; + vm.goToPage = goToPage; vm.categories = [ { @@ -236,6 +243,18 @@ } } + function nextPage(pageNumber) { + console.log(pageNumber); + } + + function prevPage(pageNumber) { + console.log(pageNumber); + } + + function goToPage(pageNumber) { + console.log(pageNumber); + } + } 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 index 19195716bc..ebe60a65d1 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 @@ -84,6 +84,18 @@
+
+ + + + +
+
From a39150a98c27e783816b8499ebed05dc4c347bf1 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 1 Jun 2016 12:57:53 +0200 Subject: [PATCH 27/47] added auto focus to search field --- src/Umbraco.Web.UI.Client/src/views/packagesNew/views/repo.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ebe60a65d1..07475c2f34 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 @@ -5,7 +5,7 @@
- +
From 2ce2a03072e49607739800c2963999a6f8a2fd12 Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Wed, 1 Jun 2016 13:03:14 +0200 Subject: [PATCH 28/47] Local installer --- src/Umbraco.Web.UI.Client/src/less/belle.less | 1 + .../components/umb-package-local-install.less | 150 ++++++++++++++++++ .../src/less/components/umb-packages.less | 100 +----------- .../views/install-local.controller.js | 19 +-- .../packagesNew/views/install-local.html | 120 +++++++------- .../config/ClientDependency.config | 2 +- 6 files changed, 228 insertions(+), 164 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less index d00bc6021e..6be0decac3 100644 --- a/src/Umbraco.Web.UI.Client/src/less/belle.less +++ b/src/Umbraco.Web.UI.Client/src/less/belle.less @@ -109,6 +109,7 @@ @import "components/umb-property-editor.less"; @import "components/umb-iconpicker.less"; @import "components/umb-packages.less"; +@import "components/umb-package-local-install.less"; @import "components/buttons/umb-button.less"; @import "components/buttons/umb-button-group.less"; diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less new file mode 100644 index 0000000000..46fe9e2eeb --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less @@ -0,0 +1,150 @@ +// +// Install local package +// + +// Helpers +.faded { + color: @grayMed; +} + +.inline-flex { + display: inline-flex; +} + +.mt-3 { + margin-top: 30px; +} + +// Upload state + +.umb-upload-local, +.umb-info-local { + display: flex; + justify-content: center; + align-items: center; + + text-align: center; + + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; +} + +.umb-upload-local form, +.umb-info-local-items { + display: flex; + flex-direction: column; + + justify-content: center; + align-items: center; + + margin: 0; + + max-width: 640px; +} + +.umb-upload-field { + width: 500px; + height: 300px; + border: 2px dashed @grayLight; + border-radius: 3px; + background: @grayLighter; + + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + + margin-bottom: 30px; + + transition: 100ms box-shadow ease, 100ms border ease; + + &:hover { + border-color: @blue; + border-style: solid; + box-shadow: 0 3px 8px rgba(0,0,0, .1); + transition: 100ms box-shadow ease, 100ms border ease; + } +} + +.umb-upload-field i { + color: @grayLight; + font-size: 110px; + line-height: 1; +} + + +// Accept terms +.umb-accept-terms { + display: flex; + align-items: center; + + font-size: 13px; +} + +.umb-package-installer-label .label-text { + margin-left: 5px; +} + +.umb-package-installer-label input[type="radio"], +.umb-package-installer-label input[type="checkbox"] { + margin-top: 0px; +} + +.umb-package-installer-label { + display: inline-flex; + align-items: center; + + font-size: 13px; + user-select: none; +} + + +// Info state +.umb-info-local-items { + border: 2px solid @grayLight; + border-radius: 3px; + background: @grayLighter; + + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + + margin: 0 20px; + max-width: 540px; +} + +.umb-info-local-items a { + text-decoration: underline; + + &:hover { + text-decoration: none; + } +} + +.umb-info-local-item { + margin-bottom: 20px; +} + +.umb-info-local-items .umb-package-icon { + width: 100%; + box-sizing: border-box; + min-height: 150px; +} + +.umb-info-local-items .umb-package-icon img { + max-width: 100px; +} + +.umb-info-local-items .umb-package-info { + width: 100%; + box-sizing: border-box; + padding: 20px 40px; +} + +.umb-info-local-items .umb-package-installer-label { + margin-left: 10px; +} 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 903b94772a..0a6fa82315 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 @@ -194,7 +194,7 @@ font-weight: bold; height: 38px; - line-height: 38px; + line-height: 1; max-width: 100%; padding: 0 18px; @@ -210,6 +210,7 @@ border-radius: 3px; border: 0 none; + box-sizing: border-box; cursor: pointer; @@ -251,13 +252,13 @@ .umb-era-button.-inactive { cursor: not-allowed; - background: whitesmoke; - color: @grayMed; + color: #BBB; + background: #EAE7E7; } .umb-era-button.-inactive:hover { - background: whitesmoke; - color: @grayMed; + color: #BBB; + background: #EAE7E7; } @@ -515,92 +516,3 @@ display: flex; justify-content: flex-end; } - - - -// Install local package - -// Accept terms -.umb-accept-terms { - margin-bottom: 40px; - display: flex; - align-items: center; - - font-size: 13px; -} - -.umb-package-installer-label .label-text { - margin-left: 5px; -} - -.umb-package-installer-label input[type="radio"], -.umb-package-installer-label input[type="checkbox"] { - margin-top: 0px; -} - -.umb-package-installer-label { - display: flex; - align-items: center; - - font-size: 13px; - user-select: none; -} - -// Install local package -.umb-center-allthings { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - - max-width: 640px; - margin: 0 auto; - text-align: center; -} - - -// Upload state -.umb-upload-local input[type="file"] { - display: none; -} - -.umb-upload-local { - display: flex; - flex-direction: row; - align-items: flex-start; - - margin: 40px auto; -} - -.umb-upload-local .loaded { - margin-left: 10px; -} - -.umb-upload-local .upload i { - font-size: 20px; - line-height: 1; -} - -.umb-upload-local .-large { - font-size: 18px; -} - -.uploaded-file-name { - margin-left: 10px; -} - - -// Info state -.umb-info-local { - -} - -.umb-info-local-item { - margin: 10px 0; -} 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 index 56a67db062..39e4f47236 100644 --- 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 @@ -4,17 +4,18 @@ function PackagesInstallLocalController($scope, $route, $location) { var vm = this; - vm.state = "upload"; + vm.localPackage = { - "packageName": "SvgIconPicker Version: 0.1.0", - "packageAuthor": "Søren Kottal", - "packageAuthorLink": "https://github.com/skttl/", - "packageInfo": "https://github.com/skttl/Umbraco.SvgIconPicker", - "packageLicens": "GPLv3", - "packageLicensLink": "http://www.gnu.org/licenses/quick-guide-gplv3.en.html", - "packageLicensAccept": false, - "packageReadme": false, + "icon":"https://our.umbraco.org/media/wiki/154472/635997115126742822_logopng.png?bgcolor=fff&height=154&width=281&format=png", + "name": "SvgIconPicker Version: 0.1.0", + "author": "Søren Kottal", + "authorLink": "https://github.com/skttl/", + "info": "https://github.com/skttl/Umbraco.SvgIconPicker", + "licens": "GPLv3", + "licensLink": "http://www.gnu.org/licenses/quick-guide-gplv3.en.html", + "licensAccept": false, + "readme": "Color Palettes is a simple property editor that let you define different color palettes (or get them from Adobe Kuler or COLOURlovers) and present them to the editor as a list of radio buttons.", "filePath": "", "riskAccept": false }; 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 index 93fb7d17ff..3b3c247aa2 100644 --- 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 @@ -1,82 +1,82 @@ -
- +
-
-

Install local package

-

Browse for local packages, they usally have a ".zip" extension. You can find trusted packages on our.umbraco.com or in the package tab in Umbraco

+ -
- +
+ + Drop to upload
+

Upload package

+

+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam +

-
-
-

{{ vm.localPackage.packageName }}

+
+
+ +
+
+ +
+ + +
+

{{ vm.localPackage.name }}

+ +
+ Author + {{ vm.localPackage.author }} +
+ +
+ Repository + {{ vm.localPackage.info }} +
+ +
+ License + {{ vm.localPackage.licens }} +
+ +
+ Read me +
+ {{ vm.localPackage.readme }} +
+ +
+ + + +
+ +
+
-
- Author - {{ vm.localPackage.packageAuthor }}
- -
- Repository - {{ vm.localPackage.packageInfo }} -
- -
- License - {{ vm.localPackage.packageLicens }} -
- -
- Accept license - -
- -
- Read me -
- -
- 
-        {{ vm.localPackage | json }}
-
-
diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config index 2115c540b7..8663cfeae6 100644 --- a/src/Umbraco.Web.UI/config/ClientDependency.config +++ b/src/Umbraco.Web.UI/config/ClientDependency.config @@ -10,7 +10,7 @@ NOTES: * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config * A new version will invalidate both client and server cache and create new persisted files --> - + -
+
@@ -100,7 +102,7 @@ -
+
From 08ae541bd873b40b90a1733873ef53a9435ee36f Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 1 Jun 2016 13:47:03 +0200 Subject: [PATCH 32/47] center icons in header --- src/Umbraco.Web.UI.Client/src/less/panel.less | 10 +++++----- .../src/views/components/editor/umb-editor-header.html | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less index a1776bf12d..83b61e48a5 100644 --- a/src/Umbraco.Web.UI.Client/src/less/panel.less +++ b/src/Umbraco.Web.UI.Client/src/less/panel.less @@ -366,17 +366,17 @@ flex: 1; } -.umb-panel-header-content.-top-position { - position: relative; - top: -12px; -} - .umb-panel-header-left-side { display: flex; flex: 1; flex-direction: row; } +.umb-panel-header-left-side.-top-position { + position: relative; + top: -12px; +} + .umb-panel-header-icon { cursor: pointer; margin-right: 5px; diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html index fd112a018a..46c666b8cc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html @@ -2,9 +2,9 @@
-
+
-
+
From ae7c145fcd21c6325c3b9cd13c634ff79ecbca89 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Sun, 12 Jun 2016 11:45:57 +0200 Subject: [PATCH 33/47] add scrollable header to details page --- .../editor/subheader/umb-editor-sub-header.less | 4 ++-- .../src/views/packagesNew/views/repo.html | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less index 3a5367c7c9..9cd9d541a3 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less @@ -13,8 +13,8 @@ box-shadow: 0 5px 0 rgba(0, 0, 0, 0.08), 0 1px 0 rgba(0, 0, 0, 0.16); transition: box-shadow 1s; top: 100px; - transform: translate(0, 50%); - + margin-top: 0; + margin-bottom: 0; } .umb-group-builder__property-preview .umb-editor-sub-header { 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 f6f79c4b05..0074eb8e9c 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 @@ -104,11 +104,11 @@
-
- - ← Take me back - -
+ + + ← Take me back + +
From cba91145eed1262b2afcb4829bb262710d8b6a9d Mon Sep 17 00:00:00 2001 From: Shannon Date: Sun, 12 Jun 2016 15:19:42 +0200 Subject: [PATCH 34/47] Updates new packages tree, obsoletes old one, have the package UI running for root node and sub nodes only for created packages. --- src/Umbraco.Core/Constants-Applications.cs | 5 + .../category.controller.js | 0 .../{packagesNew => packager}/category.html | 0 .../details.controller.js | 0 .../{packagesNew => packager}/details.html | 0 .../overview.controller.js | 6 +- .../{packagesNew => packager}/overview.html | 0 .../views/install-local.controller.js | 0 .../views/install-local.html | 0 .../views/installed.controller.js | 0 .../views/installed.html | 0 .../views/repo.controller.js | 0 .../{packagesNew => packager}/views/repo.html | 0 src/Umbraco.Web.UI/config/trees.config | 4 +- .../Trees/NewPackagesTreeController.cs | 51 ---------- .../Trees/PackagesTreeController.cs | 97 +++++++++++++++++++ src/Umbraco.Web/Umbraco.Web.csproj | 2 +- .../umbraco/Trees/loadPackager.cs | 3 +- .../umbraco/Trees/loadPackages.cs | 3 +- .../developer/Packages/editPackage.aspx.cs | 5 +- 20 files changed, 116 insertions(+), 60 deletions(-) rename src/Umbraco.Web.UI.Client/src/views/{packagesNew => packager}/category.controller.js (100%) rename src/Umbraco.Web.UI.Client/src/views/{packagesNew => packager}/category.html (100%) rename src/Umbraco.Web.UI.Client/src/views/{packagesNew => packager}/details.controller.js (100%) rename src/Umbraco.Web.UI.Client/src/views/{packagesNew => packager}/details.html (100%) rename src/Umbraco.Web.UI.Client/src/views/{packagesNew => packager}/overview.controller.js (83%) rename src/Umbraco.Web.UI.Client/src/views/{packagesNew => packager}/overview.html (100%) rename src/Umbraco.Web.UI.Client/src/views/{packagesNew => packager}/views/install-local.controller.js (100%) rename src/Umbraco.Web.UI.Client/src/views/{packagesNew => packager}/views/install-local.html (100%) rename src/Umbraco.Web.UI.Client/src/views/{packagesNew => packager}/views/installed.controller.js (100%) rename src/Umbraco.Web.UI.Client/src/views/{packagesNew => packager}/views/installed.html (100%) rename src/Umbraco.Web.UI.Client/src/views/{packagesNew => packager}/views/repo.controller.js (100%) rename src/Umbraco.Web.UI.Client/src/views/{packagesNew => packager}/views/repo.html (100%) delete mode 100644 src/Umbraco.Web/Trees/NewPackagesTreeController.cs create mode 100644 src/Umbraco.Web/Trees/PackagesTreeController.cs diff --git a/src/Umbraco.Core/Constants-Applications.cs b/src/Umbraco.Core/Constants-Applications.cs index 12f7076fc4..fb1fb42044 100644 --- a/src/Umbraco.Core/Constants-Applications.cs +++ b/src/Umbraco.Core/Constants-Applications.cs @@ -73,6 +73,11 @@ /// public const string DataTypes = "dataTypes"; + /// + /// alias for the packages tree + /// + public const string Packages = "packager"; + /// /// alias for the dictionary tree. /// diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/category.controller.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/packagesNew/category.controller.js rename to src/Umbraco.Web.UI.Client/src/views/packager/category.controller.js diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/category.html b/src/Umbraco.Web.UI.Client/src/views/packager/category.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/packagesNew/category.html rename to src/Umbraco.Web.UI.Client/src/views/packager/category.html diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/details.controller.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/packagesNew/details.controller.js rename to src/Umbraco.Web.UI.Client/src/views/packager/details.controller.js diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/details.html b/src/Umbraco.Web.UI.Client/src/views/packager/details.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/packagesNew/details.html rename to src/Umbraco.Web.UI.Client/src/views/packager/details.html diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/overview.controller.js similarity index 83% rename from src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.controller.js rename to src/Umbraco.Web.UI.Client/src/views/packager/overview.controller.js index 3a45f42761..487a715042 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packager/overview.controller.js @@ -1,7 +1,7 @@ (function () { "use strict"; - function PackagesOverviewController($scope, $route, $location) { + function PackagesOverviewController($scope, $route, $location, navigationService, $timeout) { var vm = this; @@ -26,6 +26,10 @@ } ]; + $timeout(function() { + navigationService.syncTree({ tree: "packager", path: "-1" }); + }); + } angular.module("umbraco").controller("Umbraco.Editors.Packages.OverviewController", PackagesOverviewController); diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html b/src/Umbraco.Web.UI.Client/src/views/packager/overview.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/packagesNew/overview.html rename to src/Umbraco.Web.UI.Client/src/views/packager/overview.html diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/install-local.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/packagesNew/views/install-local.controller.js rename to src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/install-local.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/packagesNew/views/install-local.html rename to src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/installed.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/packagesNew/views/installed.controller.js rename to src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/installed.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/packagesNew/views/installed.html rename to src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/repo.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/packagesNew/views/repo.controller.js rename to src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js diff --git a/src/Umbraco.Web.UI.Client/src/views/packagesNew/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/packagesNew/views/repo.html rename to src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html diff --git a/src/Umbraco.Web.UI/config/trees.config b/src/Umbraco.Web.UI/config/trees.config index 6c9fb153b6..456a72cecb 100644 --- a/src/Umbraco.Web.UI/config/trees.config +++ b/src/Umbraco.Web.UI/config/trees.config @@ -19,8 +19,6 @@ - - @@ -42,5 +40,5 @@ - + \ No newline at end of file diff --git a/src/Umbraco.Web/Trees/NewPackagesTreeController.cs b/src/Umbraco.Web/Trees/NewPackagesTreeController.cs deleted file mode 100644 index 9d3726540a..0000000000 --- a/src/Umbraco.Web/Trees/NewPackagesTreeController.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Net; -using System.Net.Http.Formatting; -using System.Web.Http; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Web.Models.Trees; -using Umbraco.Web.Mvc; -using Umbraco.Web.WebApi.Filters; -using umbraco; -using umbraco.BusinessLogic.Actions; -using Umbraco.Core.Models.EntityBase; -using Umbraco.Core.Services; -using Constants = Umbraco.Core.Constants; - -namespace Umbraco.Web.Trees -{ - [UmbracoTreeAuthorize(Constants.Trees.DataTypes)] - [Tree(Constants.Applications.Developer, "packagesNew")] - [PluginController("UmbracoTrees")] - [CoreTree] - public class NewPackagesTreeController : TreeController - { - 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);"; - - nodes.Add(node); - - return nodes; - } - - protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings) - { - var menu = new MenuItemCollection(); - return menu; - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Web/Trees/PackagesTreeController.cs b/src/Umbraco.Web/Trees/PackagesTreeController.cs new file mode 100644 index 0000000000..4f8b70693e --- /dev/null +++ b/src/Umbraco.Web/Trees/PackagesTreeController.cs @@ -0,0 +1,97 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Net; +using System.Net.Http.Formatting; +using System.Web.Http; +using Umbraco.Core; +using Umbraco.Core.Models; +using Umbraco.Web.Models.Trees; +using Umbraco.Web.Mvc; +using Umbraco.Web.WebApi.Filters; +using umbraco; +using umbraco.BusinessLogic.Actions; +using umbraco.cms.businesslogic.packager; +using Umbraco.Core.Models.EntityBase; +using Umbraco.Core.Services; +using Constants = Umbraco.Core.Constants; + +namespace Umbraco.Web.Trees +{ + [UmbracoTreeAuthorize(Constants.Trees.Packages)] + [Tree(Constants.Applications.Developer, Constants.Trees.Packages, null, sortOrder: 3)] + [PluginController("UmbracoTrees")] + [CoreTree] + [LegacyBaseTree(typeof(loadPackager))] + 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"; + + return root; + } + + protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings) + { + var baseUrl = Constants.Applications.Developer + "/packages/"; + + var nodes = new TreeNodeCollection(); + + 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); + + + + //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); + } + + + + return nodes; + } + + protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings) + { + var menu = new MenuItemCollection(); + return menu; + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 5102416548..f0e4b82aa3 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -376,7 +376,7 @@ - + diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs index 5df6cc6f2a..5470d530ad 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs @@ -30,7 +30,8 @@ namespace umbraco /// /// Handles loading of the packager application into the developer application tree /// - [Tree(Constants.Applications.Developer, "packager", "Packages", sortOrder: 3)] + //[Tree(Constants.Applications.Developer, "packager", "Packages", sortOrder: 3)] + [Obsolete("This is no longer used and will be removed from the codebase in the future")] public class loadPackager : BaseTree { #region TreeI Members diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs index 7bbf789981..154f995618 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs @@ -12,7 +12,8 @@ using umbraco.interfaces; namespace umbraco { - [Tree(Constants.Applications.Developer, "packagerPackages", "Packager Packages", initialize: false, sortOrder: 1)] + //[Tree(Constants.Applications.Developer, "packagerPackages", "Packager Packages", initialize: false, sortOrder: 1)] + [Obsolete("This is no longer used and will be removed from the codebase in the future")] public class loadPackages : BaseTree { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs index ceae3d5659..f9835223be 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs @@ -12,6 +12,7 @@ using umbraco.cms.businesslogic.template; using umbraco.cms.businesslogic.web; using umbraco.cms.presentation.Trees; using umbraco.controls; +using Umbraco.Core; using Umbraco.Core.IO; namespace umbraco.presentation.developer.packages @@ -65,8 +66,8 @@ namespace umbraco.presentation.developer.packages if (Page.IsPostBack == false) { ClientTools - .SetActiveTreeType(TreeDefinitionCollection.Instance.FindTree().Tree.Alias) - .SyncTree("-1,init," + loadPackages.PACKAGE_TREE_PREFIX + createdPackage.Data.Id, false); + .SetActiveTreeType(Constants.Trees.Packages) + .SyncTree("-1,created," + createdPackage.Data.Id, false); packageAuthorName.Text = pack.Author; packageAuthorUrl.Text = pack.AuthorUrl; From 5a32e1a2945b31479bf12eb2bdfcbd4f928ce23a Mon Sep 17 00:00:00 2001 From: Shannon Date: Sun, 12 Jun 2016 21:39:29 +0200 Subject: [PATCH 35/47] package tree is basically done, got the editor updated to work with the server data to display the initial screen and details --- .../ourpackagerrepository.resource.js | 48 ++ .../src/views/packager/category.html | 4 +- .../src/views/packager/overview.controller.js | 8 +- .../views/packager/views/repo.controller.js | 442 +++++++++--------- .../src/views/packager/views/repo.html | 31 +- .../Trees/PackagesTreeController.cs | 12 + .../developer/Packages/editPackage.aspx.cs | 4 +- 7 files changed, 315 insertions(+), 234 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/common/resources/ourpackagerrepository.resource.js diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/ourpackagerrepository.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/ourpackagerrepository.resource.js new file mode 100644 index 0000000000..fec6a75925 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/common/resources/ourpackagerrepository.resource.js @@ -0,0 +1,48 @@ +/** + * @ngdoc service + * @name umbraco.resources.ourPackageRepositoryResource + * @description handles data for package installations + **/ +function ourPackageRepositoryResource($q, $http, umbDataFormatter, umbRequestHelper) { + + var baseurl = "http://localhost:24292/webapi/packages/v1"; + + return { + + getDetails: function (packageId) { + + return umbRequestHelper.resourcePromise( + $http.get(baseurl + "/getdetails/" + packageId), + 'Failed to get package details'); + }, + + getCategories: function () { + + return umbRequestHelper.resourcePromise( + $http.get(baseurl + "/getcategories"), + 'Failed to query packages'); + }, + + getPopular: function (maxResults) { + + if (maxResults === undefined) { + maxResults = 10; + } + + return umbRequestHelper.resourcePromise( + $http.get(baseurl + "/GetPopular?maxResults=" + maxResults), + 'Failed to query packages'); + }, + + getLatest: function (pageIndex, pageSize, category) { + + return umbRequestHelper.resourcePromise( + $http.get(baseurl + "/GetLatest?pageIndex=" + pageIndex + "&pageSize=" + pageSize + "&category=" + category), + 'Failed to query packages'); + } + + + }; +} + +angular.module('umbraco.resources').factory('ourPackageRepositoryResource', ourPackageRepositoryResource); diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/category.html b/src/Umbraco.Web.UI.Client/src/views/packager/category.html index a012264d75..d408b21cd9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/category.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/category.html @@ -51,7 +51,7 @@ {{ package.downloads }} - {{ package.karma }} + {{ package.ownerInfo.karma }}
@@ -82,7 +82,7 @@ {{ package.downloads }} - {{ package.karma }} + {{ package.ownerInfo.karma }}
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/overview.controller.js index 487a715042..5cf6e6bc07 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/overview.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packager/overview.controller.js @@ -11,22 +11,22 @@ { "name": "Packages", "icon": "icon-cloud", - "view": "views/packagesNew/views/repo.html", + "view": "views/packager/views/repo.html", "active": true }, { "name": "Installed", "icon": "icon-box", - "view": "views/packagesNew/views/installed.html" + "view": "views/packager/views/installed.html" }, { "name": "Install local", "icon": "icon-add", - "view": "views/packagesNew/views/install-local.html" + "view": "views/packager/views/install-local.html" } ]; - $timeout(function() { + $timeout(function () { navigationService.syncTree({ tree: "packager", path: "-1" }); }); diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js index a69cd3f175..61383b12bf 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js @@ -1,7 +1,7 @@ (function () { "use strict"; - function PackagesRepoController($scope, $route, $location, $timeout) { + function PackagesRepoController($scope, $route, $location, $timeout, ourPackageRepositoryResource, $q) { var vm = this; @@ -9,7 +9,8 @@ vm.loading = false; vm.pagination = { pageNumber: 1, - totalPages: 10 + totalPages: 10, + pageSize: 12 }; vm.selectCategory = selectCategory; @@ -19,221 +20,235 @@ vm.prevPage = prevPage; vm.goToPage = goToPage; + //vm.categories = [ + // { + // "id": 1, + // "icon": "icon-male-and-female", + // "name": "All", + // "active": true + // }, + // { + // "icon": "icon-male-and-female", + // "name": "Collaboration" + // }, + // { + // "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.categories = [ - { - "id": 1, - "icon": "icon-male-and-female", - "name": "All", - "active": true - }, - { - "icon": "icon-male-and-female", - "name": "Collaboration" - }, - { - "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": "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": 7, + // "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": 8, + // "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": 9, + // "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": 10, + // "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" + // } + //]; - 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": "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": 7, - "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": 8, - "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": 9, - "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": 10, - "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" - } - ]; - - 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" - } - ] - }; + //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 init() { vm.loading = true; - $timeout(function () { - vm.loading = false; - }, 500); + $q.all([ + ourPackageRepositoryResource.getCategories() + .then(function(cats) { + vm.categories = cats; + }), + ourPackageRepositoryResource.getPopular(10) + .then(function(pack) { + vm.popular = pack; + }), + ourPackageRepositoryResource.getLatest(vm.pagination.pageNumber - 1, vm.pagination.pageSize, "") + .then(function(pack) { + vm.packages = pack.packages; + vm.pagination.totalPages = Math.ceil(pack.total / vm.pagination.pageSize); + }) + ]) + .then(function() { + vm.loading = false; + }); } @@ -246,7 +261,12 @@ } function showPackageDetails(selectedPackage) { - vm.packageViewState = "packageDetails"; + ourPackageRepositoryResource.getDetails(selectedPackage.id) + .then(function(pack) { + vm.package = pack; + vm.packageViewState = "packageDetails"; + }); + } function setPackageViewState(state) { diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html index 0074eb8e9c..77a4ad6d33 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html @@ -4,7 +4,8 @@
- + +
@@ -28,7 +29,7 @@

Popular

-
+
@@ -39,12 +40,12 @@
{{ package.name }}
{{ package.description | limitTo: 40 }}...
-
+
{{ package.downloads }} - {{ package.karma }} + {{ package.ownerInfo.karma }}
@@ -75,7 +76,7 @@ {{ package.downloads }} - {{ package.karma }} + {{ package.ownerInfo.karma }}
@@ -137,12 +138,12 @@
- +
-
{{ vm.package.information.owner }}
+
{{ vm.package.ownerInfo.owner }}
- {{ vm.package.information.owner }} has {{ vm.package.information.ownerKarma }} karma points + {{ vm.package.ownerInfo.owner }} has {{ vm.package.ownerInfo.karma }} karma points
@@ -154,24 +155,24 @@
Owner:
-
{{vm.package.information.owner}}
+
{{vm.package.ownerInfo.owner}}
Contributors:
-
Created:
-
{{vm.package.information.created}}
+
{{vm.package.created}}
Current version:
-
{{vm.package.information.created}}
+
{{vm.package.latestVersion}}
@@ -181,17 +182,17 @@
License:
-
{{vm.package.information.license}}
+
{{vm.package.licenseName}}
Downloads:
-
{{vm.package.information.downloads}}
+
{{vm.package.downloads}}
Karma:
-
{{vm.package.information.karma}}
+
{{vm.package.ownerInfo.karma}}
diff --git a/src/Umbraco.Web/Trees/PackagesTreeController.cs b/src/Umbraco.Web/Trees/PackagesTreeController.cs index 4f8b70693e..5e39a2b278 100644 --- a/src/Umbraco.Web/Trees/PackagesTreeController.cs +++ b/src/Umbraco.Web/Trees/PackagesTreeController.cs @@ -16,6 +16,7 @@ using umbraco.cms.businesslogic.packager; using Umbraco.Core.Models.EntityBase; using Umbraco.Core.Services; using Constants = Umbraco.Core.Constants; +using Umbraco.Core.Services; namespace Umbraco.Web.Trees { @@ -91,6 +92,17 @@ namespace Umbraco.Web.Trees protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings) { var menu = new MenuItemCollection(); + + // Root actions + menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))) + .ConvertLegacyMenuItem(null, Constants.Trees.Packages, queryStrings.GetValue("application")); + + if (id == "created") + { + menu.Items.Add( + Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true); + } + return menu; } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs index f9835223be..af26a25efe 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs @@ -183,8 +183,8 @@ namespace umbraco.presentation.developer.packages else { ClientTools - .SetActiveTreeType(TreeDefinitionCollection.Instance.FindTree().Tree.Alias) - .SyncTree("-1,init," + loadPackages.PACKAGE_TREE_PREFIX + createdPackage.Data.Id, true); + .SetActiveTreeType(Constants.Trees.Packages) + .SyncTree("-1,created," + createdPackage.Data.Id, true); } } } From 441ea0cfaf4a652b810788fcc3bf3d6b4801822e Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 13 Jun 2016 13:10:26 +0200 Subject: [PATCH 36/47] Got the package search/filter/etc.. all working --- .../ourpackagerrepository.resource.js | 28 +- .../views/packager/views/repo.controller.js | 307 ++++++------------ .../src/views/packager/views/repo.html | 139 ++++---- 3 files changed, 184 insertions(+), 290 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/ourpackagerrepository.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/ourpackagerrepository.resource.js index fec6a75925..8d27b69dc6 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/ourpackagerrepository.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/ourpackagerrepository.resource.js @@ -12,32 +12,48 @@ function ourPackageRepositoryResource($q, $http, umbDataFormatter, umbRequestHel getDetails: function (packageId) { return umbRequestHelper.resourcePromise( - $http.get(baseurl + "/getdetails/" + packageId), + $http.get(baseurl + "/" + packageId), 'Failed to get package details'); }, getCategories: function () { return umbRequestHelper.resourcePromise( - $http.get(baseurl + "/getcategories"), + $http.get(baseurl), 'Failed to query packages'); }, - getPopular: function (maxResults) { + getPopular: function (maxResults, category) { if (maxResults === undefined) { maxResults = 10; } + if (category === undefined) { + category = ""; + } return umbRequestHelper.resourcePromise( - $http.get(baseurl + "/GetPopular?maxResults=" + maxResults), + $http.get(baseurl + "?pageIndex=0&pageSize=" + maxResults + "&category=" + category + "&order=Popular"), 'Failed to query packages'); }, + + search: function (pageIndex, pageSize, category, query, canceler) { - getLatest: function (pageIndex, pageSize, category) { + var httpConfig = {}; + if (canceler) { + httpConfig["timeout"] = canceler; + } + + if (category === undefined) { + category = ""; + } + if (query === undefined) { + query = ""; + } return umbRequestHelper.resourcePromise( - $http.get(baseurl + "/GetLatest?pageIndex=" + pageIndex + "&pageSize=" + pageSize + "&category=" + category), + $http.get(baseurl + "?pageIndex=" + pageIndex + "&pageSize=" + pageSize + "&category=" + category + "&query=" + query), + httpConfig, 'Failed to query packages'); } diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js index 61383b12bf..0c75244ba4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js @@ -6,12 +6,14 @@ var vm = this; vm.packageViewState = "packageList"; + vm.categories = []; vm.loading = false; vm.pagination = { pageNumber: 1, totalPages: 10, - pageSize: 12 + pageSize: 2 }; + vm.searchQuery = ""; vm.selectCategory = selectCategory; vm.showPackageDetails = showPackageDetails; @@ -20,212 +22,20 @@ vm.prevPage = prevPage; vm.goToPage = goToPage; - //vm.categories = [ - // { - // "id": 1, - // "icon": "icon-male-and-female", - // "name": "All", - // "active": true - // }, - // { - // "icon": "icon-male-and-female", - // "name": "Collaboration" - // }, - // { - // "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": "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": 7, - // "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": 8, - // "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": 9, - // "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": 10, - // "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" - // } - //]; - - //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" - // } - // ] - //}; + //used to cancel any request in progress if another one needs to take it's place + var canceler = null; + + function getActiveCategory() { + if (vm.searchQuery !== "") { + return ""; + } + for (var i = 0; i < vm.categories.length; i++) { + if (vm.categories[i].active === true) { + return vm.categories[i].name; + } + } + return ""; + } function init() { @@ -236,11 +46,11 @@ .then(function(cats) { vm.categories = cats; }), - ourPackageRepositoryResource.getPopular(10) + ourPackageRepositoryResource.getPopular(8) .then(function(pack) { - vm.popular = pack; + vm.popular = pack.packages; }), - ourPackageRepositoryResource.getLatest(vm.pagination.pageNumber - 1, vm.pagination.pageSize, "") + ourPackageRepositoryResource.search(vm.pagination.pageNumber - 1, vm.pagination.pageSize) .then(function(pack) { vm.packages = pack.packages; vm.pagination.totalPages = Math.ceil(pack.total / vm.pagination.pageSize); @@ -250,6 +60,44 @@ vm.loading = false; }); + $scope.$watch(function() { + return vm.searchQuery; + }, _.debounce(function (newVal, oldVal) { + $scope.$apply(function () { + if (vm.searchQuery) { + if (newVal !== null && newVal !== undefined && newVal !== oldVal) { + vm.loading = true; + + //a canceler exists, so perform the cancelation operation and reset + if (canceler) { + canceler.resolve(); + canceler = $q.defer(); + } + else { + canceler = $q.defer(); + } + + ourPackageRepositoryResource.search(vm.pagination.pageNumber - 1, + vm.pagination.pageSize, + "", + vm.searchQuery, + canceler) + .then(function(pack) { + vm.packages = pack.packages; + vm.pagination.totalPages = Math.ceil(pack.total / vm.pagination.pageSize); + vm.pagination.pageNumber = 1; + vm.loading = false; + //set back to null so it can be re-created + canceler = null; + }); + } + } + else { + vm.loading = false; + } + }); + }, 200)); + } function selectCategory(selectedCategory, categories) { @@ -257,7 +105,26 @@ var category = categories[i]; category.active = false; } - selectedCategory.active = true; + + vm.loading = true; + vm.searchQuery = ""; + + $q.all([ + ourPackageRepositoryResource.getPopular(8, selectedCategory.name) + .then(function(pack) { + vm.popular = pack.packages; + }), + ourPackageRepositoryResource.search(vm.pagination.pageNumber - 1, vm.pagination.pageSize, selectedCategory.name, vm.searchQuery) + .then(function(pack) { + vm.packages = pack.packages; + vm.pagination.totalPages = Math.ceil(pack.total / vm.pagination.pageSize); + vm.pagination.pageNumber = 1; + }) + ]) + .then(function() { + vm.loading = false; + selectedCategory.active = true; + }); } function showPackageDetails(selectedPackage) { @@ -276,15 +143,27 @@ } function nextPage(pageNumber) { - console.log(pageNumber); + ourPackageRepositoryResource.search(pageNumber - 1, vm.pagination.pageSize, getActiveCategory(), vm.searchQuery) + .then(function (pack) { + vm.packages = pack.packages; + vm.pagination.totalPages = Math.ceil(pack.total / vm.pagination.pageSize); + }); } function prevPage(pageNumber) { - console.log(pageNumber); + ourPackageRepositoryResource.search(pageNumber - 1, vm.pagination.pageSize, getActiveCategory(), vm.searchQuery) + .then(function (pack) { + vm.packages = pack.packages; + vm.pagination.totalPages = Math.ceil(pack.total / vm.pagination.pageSize); + }); } function goToPage(pageNumber) { - console.log(pageNumber); + ourPackageRepositoryResource.search(pageNumber - 1, vm.pagination.pageSize, getActiveCategory(), vm.searchQuery) + .then(function (pack) { + vm.packages = pack.packages; + vm.pagination.totalPages = Math.ceil(pack.total / vm.pagination.pageSize); + }); } init(); diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html index 77a4ad6d33..8f45dd90a9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html @@ -3,100 +3,99 @@ -
+
-
- +
-
-
- -
{{ category.name }}
- + -
-

Popular

-
+
+

Popular

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

Latest

-
+
+ +
-
- +
+
-
- -
+
+

Latest

+
-
-
{{ package.name }}
-
{{ package.description | limitTo: 40 }}...
+
+ -
- - {{ package.downloads }} - - - {{ package.ownerInfo.karma }} - +
+
-
- -
+
+
{{ package.name }}
+
{{ package.description | limitTo: 40 }}...
-
-
+
+ + {{ package.downloads }} + + + {{ package.ownerInfo.karma }} + +
-
+
+ +
- - +
+
+
+ + + + +
From f5d3f9087f17cc7122ba287ba55aa4109337b63d Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 13 Jun 2016 13:29:51 +0200 Subject: [PATCH 37/47] updates to package filtering to unselect a category --- .../src/views/packager/views/repo.controller.js | 15 ++++++++++++--- .../src/views/packager/views/repo.html | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js index 0c75244ba4..f632d69e62 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js @@ -101,20 +101,29 @@ } function selectCategory(selectedCategory, categories) { + var reset = false; for (var i = 0; i < categories.length; i++) { var category = categories[i]; + if (category.name === selectedCategory.name && category.active === true) { + //it's already selected, let's unselect to show all again + reset = true; + } category.active = false; } vm.loading = true; vm.searchQuery = ""; + var searchCategory = selectedCategory.name; + if (reset === true) { + searchCategory = ""; + } $q.all([ - ourPackageRepositoryResource.getPopular(8, selectedCategory.name) + ourPackageRepositoryResource.getPopular(8, searchCategory) .then(function(pack) { vm.popular = pack.packages; }), - ourPackageRepositoryResource.search(vm.pagination.pageNumber - 1, vm.pagination.pageSize, selectedCategory.name, vm.searchQuery) + ourPackageRepositoryResource.search(vm.pagination.pageNumber - 1, vm.pagination.pageSize, searchCategory, vm.searchQuery) .then(function(pack) { vm.packages = pack.packages; vm.pagination.totalPages = Math.ceil(pack.total / vm.pagination.pageSize); @@ -123,7 +132,7 @@ ]) .then(function() { vm.loading = false; - selectedCategory.active = true; + selectedCategory.active = reset === false; }); } diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html index 8f45dd90a9..506ee3efca 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html @@ -86,7 +86,7 @@
-
+
Date: Mon, 13 Jun 2016 18:28:56 +0200 Subject: [PATCH 38/47] Gets local package installation 'working', now needs a little UI work. --- .../views/install-local.controller.js | 130 +++++++++++++++-- .../views/packager/views/install-local.html | 56 +++++-- .../src/views/packager/views/repo.html | 8 +- src/Umbraco.Web/Editors/MediaController.cs | 20 +-- .../Editors/PackageInstallController.cs | 138 +++++++++++++++++- .../Models/ContentEditing/PostedFiles.cs | 23 +++ .../Models/LocalPackageInstallModel.cs | 75 ++++++++++ src/Umbraco.Web/Models/PackageInstallModel.cs | 5 +- src/Umbraco.Web/Umbraco.Web.csproj | 2 + 9 files changed, 405 insertions(+), 52 deletions(-) create mode 100644 src/Umbraco.Web/Models/ContentEditing/PostedFiles.cs create mode 100644 src/Umbraco.Web/Models/LocalPackageInstallModel.cs diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js index 39e4f47236..2777303aa0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js @@ -1,29 +1,127 @@ (function () { "use strict"; - function PackagesInstallLocalController($scope, $route, $location) { + function PackagesInstallLocalController($scope, $route, $location, Upload, umbRequestHelper, packageResource, $cookieStore) { var vm = this; vm.state = "upload"; - vm.localPackage = { - "icon":"https://our.umbraco.org/media/wiki/154472/635997115126742822_logopng.png?bgcolor=fff&height=154&width=281&format=png", - "name": "SvgIconPicker Version: 0.1.0", - "author": "Søren Kottal", - "authorLink": "https://github.com/skttl/", - "info": "https://github.com/skttl/Umbraco.SvgIconPicker", - "licens": "GPLv3", - "licensLink": "http://www.gnu.org/licenses/quick-guide-gplv3.en.html", - "licensAccept": false, - "readme": "Color Palettes is a simple property editor that let you define different color palettes (or get them from Adobe Kuler or COLOURlovers) and present them to the editor as a list of radio buttons.", - "filePath": "", - "riskAccept": false + vm.localPackage = {}; + vm.loadPackage = loadPackage; + vm.installPackage = installPackage; + vm.installState = { + status: "" + }; + vm.zipFile = { + uploadStatus: "idle", + uploadProgress: 0, + serverErrorMessage: null }; - vm.loadPackage = loadPackage; + $scope.handleFiles = function (files, event) { + for (var i = 0; i < files.length; i++) { + upload(files[i]); + } + }; - function loadPackage(){ - vm.state = "packageDetails"; + function upload(file) { + + Upload.upload({ + url: umbRequestHelper.getApiUrl("packageInstallApiBaseUrl", "UploadLocalPackage"), + fields: {}, + file: file + }).progress(function (evt) { + + // calculate progress in percentage + var progressPercentage = parseInt(100.0 * evt.loaded / evt.total, 10); + + // set percentage property on file + vm.zipFile.uploadProgress = progressPercentage; + + // set uploading status on file + vm.zipFile.uploadStatus = "uploading"; + + }).success(function (data, status, headers, config) { + + if (data.notifications && data.notifications.length > 0) { + + // set error status on file + vm.zipFile.uploadStatus = "error"; + + // Throw message back to user with the cause of the error + vm.zipFile.serverErrorMessage = data.notifications[0].message; + + //TODO: Handle the error in UI + + } else { + + // set done status on file + vm.zipFile.uploadStatus = "done"; + + vm.localPackage = data; + } + + }).error(function (evt, status, headers, config) { + + //TODO: Handle the error in UI + + // set status done + vm.zipFile.uploadStatus = "error"; + + //if the service returns a detailed error + if (evt.InnerException) { + vm.zipFile.serverErrorMessage = evt.InnerException.ExceptionMessage; + + //Check if its the common "too large file" exception + if (evt.InnerException.StackTrace && evt.InnerException.StackTrace.indexOf("ValidateRequestEntityLength") > 0) { + vm.zipFile.serverErrorMessage = "File too large to upload"; + } + + } else if (evt.Message) { + file.serverErrorMessage = evt.Message; + } + + // If file not found, server will return a 404 and display this message + if (status === 404) { + vm.zipFile.serverErrorMessage = "File not found"; + } + + }); + } + + function loadPackage() { + if (vm.zipFile.uploadStatus === "done") { + vm.state = "packageDetails"; + } + } + + function installPackage() { + vm.installState.status = "Installing"; + + //TODO: If any of these fail, will they keep calling the next one? + packageResource + .installFiles(vm.localPackage) + .then(function(pack) { + vm.installState.status = "Restarting, please hold..."; + return packageResource.installData(pack); + }, + installError) + .then(function(pack) { + vm.installState.status = "All done, your browser will now refresh"; + return packageResource.cleanUp(pack); + }, + installError) + .then(installComplete, installError); + } + + function installComplete() { + var url = window.location.href + "?installed=" + vm.localPackage.packageGuid; + $cookieStore.put("umbPackageInstallId", vm.localPackage.packageGuid); + window.location.reload(true); + } + + function installError() { + } } diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html index 3b3c247aa2..c1ff80bad6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html @@ -6,10 +6,43 @@
- - Drop to upload -
+ + + +
+ +
+ + + + Drop to upload + + +
+ - or click here to choose files +
+
+
+ +
+

Upload package

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam @@ -18,6 +51,8 @@ @@ -49,7 +84,7 @@

License - {{ vm.localPackage.licens }} + {{ vm.localPackage.license }}
@@ -58,18 +93,21 @@ {{ vm.localPackage.readme }}
-
+
-
+
+

{{vm.installState.status}}

diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html index 506ee3efca..7a0abd6dc5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html @@ -12,7 +12,7 @@
-
+
{{ package.name }}
-
{{ package.description | limitTo: 40 }}...
+
{{ package.excerpt | limitTo: 40 }}...
@@ -68,7 +68,7 @@
{{ package.name }}
-
{{ package.description | limitTo: 40 }}...
+
{{ package.excerpt | limitTo: 40 }}...
@@ -86,7 +86,7 @@
-
+
- /// This is used for the response of PostAddFile so that we can analyze the response in a filter and remove the - /// temporary files that were created. - /// - [DataContract] - private class PostedFiles : IHaveUploadedFiles, INotificationModel - { - public PostedFiles() - { - UploadedFiles = new List(); - Notifications = new List(); - } - public List UploadedFiles { get; private set; } - - [DataMember(Name = "notifications")] - public List Notifications { get; private set; } - } - + /// /// Ensures the item can be moved/copied to the new location /// diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs index 0b1c1a56dd..96068d859d 100644 --- a/src/Umbraco.Web/Editors/PackageInstallController.cs +++ b/src/Umbraco.Web/Editors/PackageInstallController.cs @@ -4,6 +4,7 @@ using System.Globalization; using System.IO; using System.IO.Compression; using System.Linq; +using System.Net; using System.Net.Http; using System.Text; using System.Threading.Tasks; @@ -13,11 +14,16 @@ using System.Xml.Linq; using Umbraco.Core.Auditing; using umbraco.BusinessLogic; using umbraco.cms.businesslogic.packager.repositories; +using Umbraco.Core; +using Umbraco.Core.Configuration; using Umbraco.Core.IO; using Umbraco.Core.Packaging.Models; using Umbraco.Core.Services; using Umbraco.Web.Models; +using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Mvc; +using Umbraco.Web.UI; +using Umbraco.Web.WebApi; using Umbraco.Web.WebApi.Filters; namespace Umbraco.Web.Editors @@ -26,7 +32,117 @@ namespace Umbraco.Web.Editors [UmbracoApplicationAuthorize(Core.Constants.Applications.Developer)] public class PackageInstallController : UmbracoAuthorizedJsonController { + [HttpPost] + [FileUploadCleanupFilter(false)] + public async Task UploadLocalPackage() + { + if (Request.Content.IsMimeMultipartContent() == false) + { + throw new HttpResponseException(HttpStatusCode.UnsupportedMediaType); + } + var root = IOHelper.MapPath("~/App_Data/TEMP/FileUploads"); + //ensure it exists + Directory.CreateDirectory(root); + var provider = new MultipartFormDataStreamProvider(root); + + var result = await Request.Content.ReadAsMultipartAsync(provider); + + //must have a file + if (result.FileData.Count == 0) + { + throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound)); + } + + //TODO: App/Tree Permissions? + var model = new LocalPackageInstallModel + { + PackageGuid = Guid.NewGuid() + }; + + //get the files + foreach (var file in result.FileData) + { + var fileName = file.Headers.ContentDisposition.FileName.Trim(new[] { '\"' }); + var ext = fileName.Substring(fileName.LastIndexOf('.') + 1).ToLower(); + + //TODO: Only allow .zip + if (ext.InvariantEquals("zip") || ext.InvariantEquals("umb")) + { + //TODO: Currently it has to be here, it's not ideal but that's the way it is right now + var packageTempDir = IOHelper.MapPath(SystemDirectories.Data); + + //ensure it's there + Directory.CreateDirectory(packageTempDir); + + //copy it - must always be '.umb' for the installer thing to work + //the file name must be a GUID - this is what the packager expects (strange yes) + //because essentially this is creating a temporary package Id that will be used + //for unpacking/installing/etc... + var packageTempFileName = model.PackageGuid + ".umb"; + var packageTempFileLocation = Path.Combine(packageTempDir, packageTempFileName); + File.Copy(file.LocalFileName, packageTempFileLocation, true); + + try + { + var ins = new global::umbraco.cms.businesslogic.packager.Installer(Security.CurrentUser.Id); + //this will load in all the metadata too + var tempDir = ins.Import(packageTempFileName); + model.TemporaryDirectoryPath = Path.Combine(SystemDirectories.Data, tempDir); + model.Id = ins.CreateManifest( + IOHelper.MapPath(model.TemporaryDirectoryPath), + model.PackageGuid.ToString(), + //TODO: Does this matter? we're installing a local package + string.Empty); + + model.Name = ins.Name; + model.Author = ins.Author; + model.AuthorUrl = ins.AuthorUrl; + model.License = ins.License; + model.LicenseUrl = ins.LicenseUrl; + model.ReadMe = ins.ReadMe; + model.ConflictingMacroAliases = ins.ConflictingMacroAliases; + model.ConflictingStyleSheetNames = ins.ConflictingStyleSheetNames; + model.ConflictingTemplateAliases = ins.ConflictingTemplateAliases; + model.ContainsBinaryFileErrors = ins.ContainsBinaryFileErrors; + model.ContainsLegacyPropertyEditors = ins.ContainsLegacyPropertyEditors; + model.ContainsMacroConflict = ins.ContainsMacroConflict; + model.ContainsStyleSheetConflicts = ins.ContainsStyleSheeConflicts; + model.ContainsTemplateConflicts = ins.ContainsTemplateConflicts; + model.ContainsUnsecureFiles = ins.ContainsUnsecureFiles; + + model.Url = ins.Url; + model.Version = ins.Version; + //TODO: We need to add the 'strict' requirement to the installer + } + finally + { + //Cleanup file + if (File.Exists(packageTempFileLocation)) + { + File.Delete(packageTempFileLocation); + } + } + } + else + { + model.Notifications.Add(new Notification( + Services.TextService.Localize("speechBubbles/operationFailedHeader"), + Services.TextService.Localize("media/disallowedFileType"), + SpeechBubbleIcon.Warning)); + } + + } + + return model; + + } + + /// + /// Gets the package from Our to install + /// + /// + /// [HttpGet] public PackageInstallModel Fetch(string packageGuid) { @@ -50,6 +166,11 @@ namespace Umbraco.Web.Editors return p; } + /// + /// Extracts the package zip and gets the packages information + /// + /// + /// [HttpPost] public PackageInstallModel Import(PackageInstallModel model) { @@ -60,6 +181,11 @@ namespace Umbraco.Web.Editors return model; } + /// + /// Installs the package files + /// + /// + /// [HttpPost] public PackageInstallModel InstallFiles(PackageInstallModel model) { @@ -69,7 +195,11 @@ namespace Umbraco.Web.Editors return model; } - + /// + /// Installs the packages data/business logic + /// + /// + /// [HttpPost] public PackageInstallModel InstallData(PackageInstallModel model) { @@ -79,7 +209,11 @@ namespace Umbraco.Web.Editors return model; } - + /// + /// Cleans up the package installation + /// + /// + /// [HttpPost] public PackageInstallModel CleanUp(PackageInstallModel model) { diff --git a/src/Umbraco.Web/Models/ContentEditing/PostedFiles.cs b/src/Umbraco.Web/Models/ContentEditing/PostedFiles.cs new file mode 100644 index 0000000000..7793787670 --- /dev/null +++ b/src/Umbraco.Web/Models/ContentEditing/PostedFiles.cs @@ -0,0 +1,23 @@ +using System.Collections.Generic; +using System.Runtime.Serialization; + +namespace Umbraco.Web.Models.ContentEditing +{ + /// + /// This is used for the response of PostAddFile so that we can analyze the response in a filter and remove the + /// temporary files that were created. + /// + [DataContract] + internal class PostedFiles : IHaveUploadedFiles, INotificationModel + { + public PostedFiles() + { + UploadedFiles = new List(); + Notifications = new List(); + } + public List UploadedFiles { get; private set; } + + [DataMember(Name = "notifications")] + public List Notifications { get; private set; } + } +} \ No newline at end of file diff --git a/src/Umbraco.Web/Models/LocalPackageInstallModel.cs b/src/Umbraco.Web/Models/LocalPackageInstallModel.cs new file mode 100644 index 0000000000..4f076675f4 --- /dev/null +++ b/src/Umbraco.Web/Models/LocalPackageInstallModel.cs @@ -0,0 +1,75 @@ +using System.Collections.Generic; +using System.Runtime.Serialization; +using Umbraco.Web.Models.ContentEditing; + +namespace Umbraco.Web.Models +{ + /// + /// A model that represents uploading a local package + /// + [DataContract(Name = "localPackageInstallModel")] + public class LocalPackageInstallModel : PackageInstallModel, IHaveUploadedFiles, INotificationModel + { + public LocalPackageInstallModel() + { + UploadedFiles = new List(); + Notifications = new List(); + } + + public List UploadedFiles { get; private set; } + + [DataMember(Name = "notifications")] + public List Notifications { get; private set; } + + [DataMember(Name = "name")] + public string Name { get; set; } + + [DataMember(Name = "url")] + public string Url { get; set; } + + [DataMember(Name = "version")] + public string Version { get; set; } + + [DataMember(Name = "containsUnsecureFiles")] + public bool ContainsUnsecureFiles { get; set; } + + [DataMember(Name = "containsTemplateConflicts")] + public bool ContainsTemplateConflicts { get; set; } + + [DataMember(Name = "containsStyleSheetConflicts")] + public bool ContainsStyleSheetConflicts { get; set; } + + [DataMember(Name = "containsMacroConflict")] + public bool ContainsMacroConflict { get; set; } + + [DataMember(Name = "containsLegacyPropertyEditors")] + public bool ContainsLegacyPropertyEditors { get; set; } + + [DataMember(Name = "containsBinaryFileErrors")] + public bool ContainsBinaryFileErrors { get; set; } + + [DataMember(Name = "conflictingTemplateAliases")] + public IDictionary ConflictingTemplateAliases { get; set; } + + [DataMember(Name = "conflictingStyleSheetNames")] + public IDictionary ConflictingStyleSheetNames { get; set; } + + [DataMember(Name = "conflictingMacroAliases")] + public IDictionary ConflictingMacroAliases { get; set; } + + [DataMember(Name = "readMe")] + public string ReadMe { get; set; } + + [DataMember(Name = "licenseUrl")] + public string LicenseUrl { get; set; } + + [DataMember(Name = "license")] + public string License { get; set; } + + [DataMember(Name = "authorUrl")] + public string AuthorUrl { get; set; } + + [DataMember(Name = "author")] + public string Author { get; set; } + } +} \ No newline at end of file diff --git a/src/Umbraco.Web/Models/PackageInstallModel.cs b/src/Umbraco.Web/Models/PackageInstallModel.cs index 34b28843b6..f903fc1880 100644 --- a/src/Umbraco.Web/Models/PackageInstallModel.cs +++ b/src/Umbraco.Web/Models/PackageInstallModel.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; using System.Text; @@ -10,7 +9,7 @@ namespace Umbraco.Web.Models [DataContract(Name = "packageInstallModel")] public class PackageInstallModel { - [DataMember(Name="id")] + [DataMember(Name = "id")] public int Id { get; set; } [DataMember(Name = "packageGuid")] @@ -24,5 +23,7 @@ namespace Umbraco.Web.Models [DataMember(Name = "zipFilePath")] public string ZipFilePath { get; set; } + + } } diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index f0e4b82aa3..285c076baa 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -336,9 +336,11 @@ + + From 2d9010caf4212363a55667ba6ee60964e7eb0ba5 Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 13 Jun 2016 19:43:04 +0200 Subject: [PATCH 39/47] I can haz package uninstallation --- .../src/common/resources/package.resource.js | 25 +++ .../packager/views/installed.controller.js | 69 ++----- .../src/views/packager/views/installed.html | 7 +- .../Editors/PackageInstallController.cs | 188 ++++++++++++++++++ .../ContentEditing/InstalledPackageModel.cs | 27 +++ src/Umbraco.Web/Umbraco.Web.csproj | 1 + 6 files changed, 261 insertions(+), 56 deletions(-) create mode 100644 src/Umbraco.Web/Models/ContentEditing/InstalledPackageModel.cs diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/package.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/package.resource.js index c1d95861eb..33889e35e4 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/package.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/package.resource.js @@ -7,6 +7,31 @@ function packageResource($q, $http, umbDataFormatter, umbRequestHelper) { return { + /** + * @ngdoc method + * @name umbraco.resources.packageInstallResource#getInstalled + * @methodOf umbraco.resources.packageInstallResource + * + * @description + * Gets a list of installed packages + */ + getInstalled: function() { + return umbRequestHelper.resourcePromise( + $http.get( + umbRequestHelper.getApiUrl( + "packageInstallApiBaseUrl", + "GetInstalled")), + 'Failed to get installed packages'); + }, + + uninstall: function(packageId) { + return umbRequestHelper.resourcePromise( + $http.post( + umbRequestHelper.getApiUrl( + "packageInstallApiBaseUrl", + "Uninstall", { packageId: packageId })), + 'Failed to uninstall package'); + }, /** * @ngdoc method diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js index a4348df277..1912d0a347 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js @@ -1,67 +1,28 @@ (function () { "use strict"; - function PackagesInstalledController($scope, $route, $location) { + function PackagesInstalledController($scope, $route, $location, packageResource) { var vm = this; - vm.installedPackages = [ - { - "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" - } - ]; - vm.uninstallPackage = uninstallPackage; - function uninstallPackage(installedPackage) { - console.log(installedPackage); + function init() { + packageResource.getInstalled() + .then(function (packs) { + vm.installedPackages = packs; + }); } + function uninstallPackage(installedPackage) { + packageResource.uninstall(installedPackage.id) + .then(function() { + init(); + }); + } + + init(); + } angular.module("umbraco").controller("Umbraco.Editors.Packages.InstalledController", PackagesInstalledController); diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html index 8550cfb00f..70c7a4f42f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html @@ -7,12 +7,15 @@
- + +
{{ installedPackage.name }}
-
{{ installedPackage.description }}
+
+ {{ installedPackage.version }} | {{ installedPackage.url }}| {{ installedPackage.author }} +
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs index 96068d859d..f4bf33eb5f 100644 --- a/src/Umbraco.Web/Editors/PackageInstallController.cs +++ b/src/Umbraco.Web/Editors/PackageInstallController.cs @@ -9,14 +9,23 @@ using System.Net.Http; using System.Text; using System.Threading.Tasks; using System.Web.Http; +using System.Web.UI.WebControls; using System.Xml; using System.Xml.Linq; +using umbraco; using Umbraco.Core.Auditing; using umbraco.BusinessLogic; +using umbraco.cms.businesslogic.packager; using umbraco.cms.businesslogic.packager.repositories; +using umbraco.cms.businesslogic.web; +using umbraco.cms.presentation.Trees; +using umbraco.presentation.developer.packages; +using umbraco.webservices; using Umbraco.Core; using Umbraco.Core.Configuration; using Umbraco.Core.IO; +using Umbraco.Core.Logging; +using Umbraco.Core.Models; using Umbraco.Core.Packaging.Models; using Umbraco.Core.Services; using Umbraco.Web.Models; @@ -25,6 +34,9 @@ using Umbraco.Web.Mvc; using Umbraco.Web.UI; using Umbraco.Web.WebApi; using Umbraco.Web.WebApi.Filters; +using File = System.IO.File; +using Notification = Umbraco.Web.Models.ContentEditing.Notification; +using Settings = umbraco.cms.businesslogic.packager.Settings; namespace Umbraco.Web.Editors { @@ -32,6 +44,182 @@ namespace Umbraco.Web.Editors [UmbracoApplicationAuthorize(Core.Constants.Applications.Developer)] public class PackageInstallController : UmbracoAuthorizedJsonController { + [HttpPost] + public IHttpActionResult Uninstall(int packageId) + { + var pack = InstalledPackage.GetById(packageId); + if (pack == null) return NotFound(); + + PerformUninstall(pack); + + return Ok(); + } + + /// + /// SORRY :( I didn't have time to put this in a service somewhere - the old packager did this all manually too + /// + /// + protected void PerformUninstall(InstalledPackage pack) + { + if (pack == null) throw new ArgumentNullException("pack"); + + var refreshCache = false; + + //Uninstall templates + foreach (var item in pack.Data.Templates.ToArray()) + { + int nId; + if (int.TryParse(item, out nId) == false) continue; + var found = Services.FileService.GetTemplate(nId); + if (found != null) + { + ApplicationContext.Services.FileService.DeleteTemplate(found.Alias, Security.GetUserId()); + } + pack.Data.Templates.Remove(nId.ToString()); + } + + //Uninstall macros + foreach (var item in pack.Data.Macros.ToArray()) + { + int nId; + if (int.TryParse(item, out nId) == false) continue; + var macro = Services.MacroService.GetById(nId); + if (macro != null) + { + Services.MacroService.Delete(macro); + } + pack.Data.Macros.Remove(nId.ToString()); + } + + //Remove Document Types + var contentTypes = new List(); + var contentTypeService = Services.ContentTypeService; + foreach (var item in pack.Data.Documenttypes.ToArray()) + { + int nId; + if (int.TryParse(item, out nId) == false) continue; + var contentType = contentTypeService.GetContentType(nId); + if (contentType == null) continue; + contentTypes.Add(contentType); + pack.Data.Documenttypes.Remove(nId.ToString(CultureInfo.InvariantCulture)); + // refresh content cache when document types are removed + refreshCache = true; + } + + //Order the DocumentTypes before removing them + if (contentTypes.Any()) + { + var orderedTypes = from contentType in contentTypes + orderby contentType.ParentId descending, contentType.Id descending + select contentType; + foreach (var contentType in orderedTypes) + { + contentTypeService.Delete(contentType); + } + } + + //Remove Dictionary items + foreach (var item in pack.Data.DictionaryItems.ToArray()) + { + int nId; + if (int.TryParse(item, out nId) == false) continue; + var di = Services.LocalizationService.GetDictionaryItemById(nId); + if (di != null) + { + Services.LocalizationService.Delete(di); + } + pack.Data.DictionaryItems.Remove(nId.ToString()); + } + + //Remove Data types + foreach (var item in pack.Data.DataTypes.ToArray()) + { + int nId; + if (int.TryParse(item, out nId) == false) continue; + var dtd = Services.DataTypeService.GetDataTypeDefinitionById(nId); + if (dtd != null) + { + Services.DataTypeService.Delete(dtd); + } + pack.Data.DataTypes.Remove(nId.ToString()); + } + + pack.Save(); + + // uninstall actions + //TODO: We should probably report errors to the UI!! + // This never happened before though, but we should do something now + if (pack.Data.Actions.IsNullOrWhiteSpace() == false) + { + try + { + var actionsXml = new XmlDocument(); + actionsXml.LoadXml("" + pack.Data.Actions + ""); + + LogHelper.Debug("executing undo actions: {0}", () => actionsXml.OuterXml); + + foreach (XmlNode n in actionsXml.DocumentElement.SelectNodes("//Action")) + { + try + { + global::umbraco.cms.businesslogic.packager.PackageAction + .UndoPackageAction(pack.Data.Name, n.Attributes["alias"].Value, n); + } + catch (Exception ex) + { + LogHelper.Error("An error occurred running undo actions", ex); + } + } + } + catch (Exception ex) + { + LogHelper.Error("An error occurred running undo actions", ex); + } + } + + //moved remove of files here so custom package actions can still undo + //Remove files + foreach (var item in pack.Data.Files.ToArray()) + { + //here we need to try to find the file in question as most packages does not support the tilde char + var file = IOHelper.FindFile(item); + if (file != null) + { + var filePath = IOHelper.MapPath(file); + if (File.Exists(filePath)) + { + File.Delete(filePath); + + } + } + pack.Data.Files.Remove(file); + } + pack.Save(); + pack.Delete(Security.GetUserId()); + + //TODO: Legacy - probably not needed + if (refreshCache) + { + library.RefreshContent(); + } + TreeDefinitionCollection.Instance.ReRegisterTrees(); + global::umbraco.BusinessLogic.Actions.Action.ReRegisterActionsAndHandlers(); + } + + + public IEnumerable GetInstalled() + { + return data.GetAllPackages(IOHelper.MapPath(Settings.InstalledPackagesSettings)) + .Select(pack => new InstalledPackageModel + { + Name = pack.Name, + Id = pack.Id, + Author = pack.Author, + Version = pack.Version, + Url = pack.Url + }).ToList(); + } + [HttpPost] [FileUploadCleanupFilter(false)] public async Task UploadLocalPackage() diff --git a/src/Umbraco.Web/Models/ContentEditing/InstalledPackageModel.cs b/src/Umbraco.Web/Models/ContentEditing/InstalledPackageModel.cs new file mode 100644 index 0000000000..67cdd28180 --- /dev/null +++ b/src/Umbraco.Web/Models/ContentEditing/InstalledPackageModel.cs @@ -0,0 +1,27 @@ +using System.Collections.Generic; +using System.Runtime.Serialization; + +namespace Umbraco.Web.Models.ContentEditing +{ + [DataContract] + public class InstalledPackageModel + { + [DataMember(Name = "id")] + public int Id { get; set; } + + [DataMember(Name = "name")] + public string Name { get; set; } + + [DataMember(Name = "author")] + public string Author { get; set; } + + [DataMember(Name = "files")] + public IEnumerable Files { get; set; } + + [DataMember(Name = "version")] + public string Version { get; set; } + + [DataMember(Name = "url")] + public string Url { get; set; } + } +} \ No newline at end of file diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 285c076baa..6a093bc55c 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -330,6 +330,7 @@ + From 3d2fe3c9daeeddbd1b067433deda1ab0e0043848 Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 13 Jun 2016 20:10:31 +0200 Subject: [PATCH 40/47] Install/uninstall working - just need a few ui updates and then get the repo install working --- .../views/install-local.controller.js | 4 +- .../views/packager/views/install-local.html | 17 +--- .../packager/views/installed.controller.js | 15 ++- .../src/views/packager/views/installed.html | 96 +++++++++++++++---- .../Editors/PackageInstallController.cs | 4 +- .../ContentEditing/InstalledPackageModel.cs | 6 ++ 6 files changed, 108 insertions(+), 34 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js index 2777303aa0..94f02ed9c6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js @@ -7,7 +7,6 @@ vm.state = "upload"; vm.localPackage = {}; - vm.loadPackage = loadPackage; vm.installPackage = installPackage; vm.installState = { status: "" @@ -57,6 +56,7 @@ // set done status on file vm.zipFile.uploadStatus = "done"; + loadPackage(); vm.localPackage = data; } @@ -102,7 +102,7 @@ packageResource .installFiles(vm.localPackage) .then(function(pack) { - vm.installState.status = "Restarting, please hold..."; + vm.installState.status = "Restarting, please wait..."; return packageResource.installData(pack); }, installError) diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html index c1ff80bad6..042aa61c70 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html @@ -47,14 +47,7 @@

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam

- - - +
@@ -78,13 +71,13 @@
- Repository - {{ vm.localPackage.info }} + Version + {{ vm.package.version }}
License - {{ vm.localPackage.license }} + {{ vm.localPackage.license }}
@@ -103,7 +96,7 @@
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js index 1912d0a347..279ebd3bb2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js @@ -5,7 +5,13 @@ var vm = this; + vm.confirmUninstall = confirmUninstall; vm.uninstallPackage = uninstallPackage; + vm.state = "list"; + vm.installState = { + status: "" + }; + vm.package = {}; function init() { packageResource.getInstalled() @@ -14,10 +20,17 @@ }); } + function confirmUninstall(pck) { + vm.state = "packageDetails"; + vm.package = pck; + } + function uninstallPackage(installedPackage) { + vm.installState.status = "Uninstalling package..."; packageResource.uninstall(installedPackage.id) .then(function() { - init(); + var url = window.location.href + "?uninstalled=" + vm.package.packageGuid; + window.location.reload(true); }); } diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html index 70c7a4f42f..7cd49c638e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html @@ -1,29 +1,89 @@
+ + +
+
Installed packages
-
Installed packages
+
-
+
-
- -
- - -
- -
-
{{ installedPackage.name }}
-
- {{ installedPackage.version }} | {{ installedPackage.url }}| {{ installedPackage.author }} +
+ +
+ +
+
{{ installedPackage.name }}
+
+ {{ installedPackage.version }} | {{ installedPackage.url }}| {{ installedPackage.author }} +
+
+ +
+ +
+
-
- -
+
+
+ + +
+
+ +
+
+ +
+ + +
+

{{ vm.package.name }}

+ +
+ Author + {{ vm.package.author }} +
+ +
+ Version + {{ vm.package.version }} +
+ +
+ License + {{ vm.package.license }} +
+ +
+ Read me +
+ {{ vm.package.readme }} +
+ +
+ + +
+
+

{{vm.installState.status}}

+
+ +
+
-
-
+
\ No newline at end of file diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs index f4bf33eb5f..b31e87edb4 100644 --- a/src/Umbraco.Web/Editors/PackageInstallController.cs +++ b/src/Umbraco.Web/Editors/PackageInstallController.cs @@ -216,7 +216,9 @@ namespace Umbraco.Web.Editors Id = pack.Id, Author = pack.Author, Version = pack.Version, - Url = pack.Url + Url = pack.Url, + License = pack.License, + LicenseUrl = pack.LicenseUrl }).ToList(); } diff --git a/src/Umbraco.Web/Models/ContentEditing/InstalledPackageModel.cs b/src/Umbraco.Web/Models/ContentEditing/InstalledPackageModel.cs index 67cdd28180..0bf6986e47 100644 --- a/src/Umbraco.Web/Models/ContentEditing/InstalledPackageModel.cs +++ b/src/Umbraco.Web/Models/ContentEditing/InstalledPackageModel.cs @@ -23,5 +23,11 @@ namespace Umbraco.Web.Models.ContentEditing [DataMember(Name = "url")] public string Url { get; set; } + + [DataMember(Name = "license")] + public string License { get; set; } + + [DataMember(Name = "licenseUrl")] + public string LicenseUrl { get; set; } } } \ No newline at end of file From c0625a7853620579a567caca6228c7b5b43a80f1 Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 13 Jun 2016 20:15:11 +0200 Subject: [PATCH 41/47] adds small icon to packages without them --- .../src/views/packager/views/install-local.html | 3 ++- .../src/views/packager/views/installed.html | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html index 042aa61c70..9beb4aae2d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html @@ -58,7 +58,8 @@
- + +
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html index 7cd49c638e..d9202d6598 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html @@ -35,7 +35,8 @@
- + +
From 1a7993b9d7393cec78e2bdbbbab2b1c260cdb442 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 13 Jun 2016 20:46:40 +0200 Subject: [PATCH 42/47] set bigger font icon on uninstall dashboard --- src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less | 2 ++ 1 file changed, 2 insertions(+) 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 0a6fa82315..41ea5e5fd1 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 @@ -492,6 +492,8 @@ .umb-package-list__item-icon { flex: 0 0 50px; margin-right: 20px; + font-size: 30px; + text-align: center; } .umb-package-list__item-content { From e38d4b7e88c40e33b02b755427f99e743fdc6040 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 13 Jun 2016 20:57:00 +0200 Subject: [PATCH 43/47] increase icon font size --- .../src/less/components/umb-package-local-install.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less index 46fe9e2eeb..aa3dcb33d4 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less @@ -133,6 +133,7 @@ width: 100%; box-sizing: border-box; min-height: 150px; + font-size: 60px; } .umb-info-local-items .umb-package-icon img { From 67d71908bf0e55f442abfbabd121a49a5e230beb Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 13 Jun 2016 22:45:42 +0200 Subject: [PATCH 44/47] add back button when uninstalling package --- .../components/umb-package-local-install.less | 7 -- .../src/views/packager/views/installed.html | 110 ++++++++++-------- 2 files changed, 61 insertions(+), 56 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less index aa3dcb33d4..16abb46247 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less @@ -22,14 +22,7 @@ display: flex; justify-content: center; align-items: center; - text-align: center; - - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; } .umb-upload-local form, diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html index d9202d6598..d4c810d641 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html @@ -1,7 +1,8 @@ -
- +
+ -
+
+
Installed packages
@@ -26,65 +27,76 @@
-
+
- + -
-
+
- -
- - -
+ + + ← Take me back + + +
-
-

{{ vm.package.name }}

+
-
- Author - {{ vm.package.author }} + +
+ +
-
- Version - {{ vm.package.version }} -
-
- License - {{ vm.package.license }} -
+
+

{{ vm.package.name }}

-
- Read me -
- {{ vm.package.readme }} -
+
+ Author + {{ vm.package.author }} +
-
- - -
-
-

{{vm.installState.status}}

-
+
+ Version + {{ vm.package.version }} +
-
- +
+ License + {{ vm.package.license }} +
+ +
+ Read me +
+ {{ vm.package.readme }} +
+ +
+ + +
+
+

{{vm.installState.status}}

+
+ +
+ + +
-
\ No newline at end of file +
From a8c71e52ecfad82c110af4952a9d9f1889b6d449 Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 13 Jun 2016 23:35:09 +0200 Subject: [PATCH 45/47] Ensures the min umbraco version is checked when installing packages that have the strict flag set. --- .../Configuration/UmbracoVersion.cs | 2 +- .../src/common/services/util.service.js | 58 ++++ .../views/install-local.controller.js | 42 ++- .../views/packager/views/install-local.html | 2 +- .../config/trees.Release.config | 7 +- src/Umbraco.Web.UI/config/trees.config | 5 +- .../Editors/PackageInstallController.cs | 29 +- .../Models/LocalPackageInstallModel.cs | 8 +- .../Models/PackageInstallResult.cs | 14 + .../Trees/DataTypeTreeController.cs | 2 +- .../Trees/PackagesTreeController.cs | 2 +- src/Umbraco.Web/Umbraco.Web.csproj | 1 + .../businesslogic/Packager/Installer.cs | 91 +++-- .../PackageInstance/PackageInstance.cs | 328 ++++-------------- 14 files changed, 286 insertions(+), 305 deletions(-) create mode 100644 src/Umbraco.Web/Models/PackageInstallResult.cs diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs index 762d3da59c..8c2fe08dfd 100644 --- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs +++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs @@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration /// Gets the version comment (like beta or RC). /// /// The version comment. - public static string CurrentComment { get { return ""; } } + public static string CurrentComment { get { return "beta"; } } // Get the version of the umbraco.dll by looking at a class in that dll // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx diff --git a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js index 9fbf2947af..30815027b0 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js @@ -1,4 +1,62 @@ /*Contains multiple services for various helper tasks */ +function versionHelper() { + + return { + + //see: https://gist.github.com/TheDistantSea/8021359 + versionCompare: function(v1, v2, options) { + var lexicographical = options && options.lexicographical, + zeroExtend = options && options.zeroExtend, + v1parts = v1.split('.'), + v2parts = v2.split('.'); + + function isValidPart(x) { + return (lexicographical ? /^\d+[A-Za-z]*$/ : /^\d+$/).test(x); + } + + if (!v1parts.every(isValidPart) || !v2parts.every(isValidPart)) { + return NaN; + } + + if (zeroExtend) { + while (v1parts.length < v2parts.length) { + v1parts.push("0"); + } + while (v2parts.length < v1parts.length) { + v2parts.push("0"); + } + } + + if (!lexicographical) { + v1parts = v1parts.map(Number); + v2parts = v2parts.map(Number); + } + + for (var i = 0; i < v1parts.length; ++i) { + if (v2parts.length === i) { + return 1; + } + + if (v1parts[i] === v2parts[i]) { + continue; + } + else if (v1parts[i] > v2parts[i]) { + return 1; + } + else { + return -1; + } + } + + if (v1parts.length !== v2parts.length) { + return -1; + } + + return 0; + } + }; +} +angular.module('umbraco.services').factory('versionHelper', versionHelper); function packageHelper(assetsService, treeService, eventsService, $templateCache) { diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js index 94f02ed9c6..5c1bf8584c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js @@ -1,7 +1,7 @@ (function () { "use strict"; - function PackagesInstallLocalController($scope, $route, $location, Upload, umbRequestHelper, packageResource, $cookieStore) { + function PackagesInstallLocalController($scope, $route, $location, Upload, umbRequestHelper, packageResource, $cookieStore, versionHelper) { var vm = this; vm.state = "upload"; @@ -59,6 +59,28 @@ loadPackage(); vm.localPackage = data; + vm.localPackage.allowed = true; + + //now we need to determine if this package is compatible to be installed + if (vm.localPackage.umbracoVersion) { + //0 if the versions are equal + //a negative integer iff v1 < v2 + //a positive integer iff v1 > v2 + + //ensure we aren't comparing the pre-release value + var versionNumber = Umbraco.Sys.ServerVariables.application.version.split("-")[0]; + + var compare = versionHelper.versionCompare( + versionNumber, + vm.localPackage.umbracoVersion); + if (compare < 0) { + //this is not compatible! + vm.localPackage.allowed = false; + vm.installState.status = + "This package cannot be installed, it requires a minimum Umbraco version of " + + vm.localPackage.umbracoVersion; + } + } } }).error(function (evt, status, headers, config) { @@ -111,17 +133,21 @@ return packageResource.cleanUp(pack); }, installError) - .then(installComplete, installError); - } + .then(function (result) { - function installComplete() { - var url = window.location.href + "?installed=" + vm.localPackage.packageGuid; - $cookieStore.put("umbPackageInstallId", vm.localPackage.packageGuid); - window.location.reload(true); + if (result.postInstallationPath) { + window.location.href = url; + } + else { + var url = window.location.href + "?installed=" + vm.localPackage.packageGuid; + window.location.reload(true); + } + + }, installError); } function installError() { - + //TODO: Need to do something about this? } } diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html index 9beb4aae2d..75a8101ace 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html @@ -87,7 +87,7 @@ {{ vm.localPackage.readme }}
-
+
-
+
+ This package cannot be installed, it requires a minimum Umbraco version of {{vm.localPackage.umbracoVersion}} +
+

{{vm.installState.status}}

diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js index 279ebd3bb2..e2b5fb4de8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js @@ -18,6 +18,8 @@ .then(function (packs) { vm.installedPackages = packs; }); + vm.installState.status = ""; + vm.state = "list"; } function confirmUninstall(pck) { @@ -28,9 +30,16 @@ function uninstallPackage(installedPackage) { vm.installState.status = "Uninstalling package..."; packageResource.uninstall(installedPackage.id) - .then(function() { - var url = window.location.href + "?uninstalled=" + vm.package.packageGuid; - window.location.reload(true); + .then(function () { + if (installedPackage.files.length > 0) { + vm.installState.status = "All done, your browser will now refresh"; + + var url = window.location.href + "?uninstalled=" + vm.package.packageGuid; + window.location.reload(true); + } + else { + init(); + } }); } diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html index d4c810d641..403406545c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html @@ -83,11 +83,11 @@ Uninstall package
-
+

{{vm.installState.status}}

diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js index f632d69e62..e87a4a2426 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js @@ -1,26 +1,30 @@ (function () { "use strict"; - function PackagesRepoController($scope, $route, $location, $timeout, ourPackageRepositoryResource, $q) { + function PackagesRepoController($scope, $route, $location, $timeout, ourPackageRepositoryResource, $q, packageResource, $cookieStore) { var vm = this; vm.packageViewState = "packageList"; vm.categories = []; - vm.loading = false; + vm.loading = true; vm.pagination = { pageNumber: 1, totalPages: 10, - pageSize: 2 + pageSize: 8 }; vm.searchQuery = ""; - + vm.installState = { + status: "" + }; vm.selectCategory = selectCategory; vm.showPackageDetails = showPackageDetails; vm.setPackageViewState = setPackageViewState; vm.nextPage = nextPage; vm.prevPage = prevPage; vm.goToPage = goToPage; + vm.installPackage = installPackage; + vm.downloadPackage = downloadPackage; //used to cancel any request in progress if another one needs to take it's place var canceler = null; @@ -91,10 +95,7 @@ canceler = null; }); } - } - else { - vm.loading = false; - } + } }); }, 200)); @@ -175,6 +176,61 @@ }); } + function downloadPackage(selectedPackage) { + vm.loading = true; + + packageResource + .fetch(selectedPackage.id) + .then(function(pack) { + vm.packageViewState = "packageInstall"; + vm.loading = false; + vm.localPackage = pack; + vm.localPackage.allowed = true; + }, + error); + } + + function error(e, args) { + + } + + function installPackage(selectedPackage) { + + vm.installState.status = "importing..."; + + packageResource + .import(selectedPackage) + .then(function(pack) { + vm.installState.status = "Installing..."; + return packageResource.installFiles(pack); + }, + error) + .then(function(pack) { + vm.installState.status = "Restarting, please wait..."; + return packageResource.installData(pack); + }, + error) + .then(function(pack) { + vm.installState.status = "All done, your browser will now refresh"; + return packageResource.cleanUp(pack); + }, + error) + .then(function(result) { + + if (result.postInstallationPath) { + //Put the redirect Uri in a cookie so we can use after reloading + window.localStorage.setItem("packageInstallUri", result.postInstallationPath); + } + + //reload on next digest (after cookie) + $timeout(function () { + window.location.reload(true); + }); + + }, + error); + } + init(); } diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html index 7a0abd6dc5..d42e955b4f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html @@ -7,7 +7,7 @@
- +
@@ -131,13 +131,13 @@
- +
- +
{{ vm.package.ownerInfo.owner }}
@@ -227,8 +227,67 @@
+
+ + +
+
+ +
+
+ + +
+
+

{{ vm.localPackage.name }}

+ +
+ Author + {{ vm.localPackage.author }} +
+ +
+ Version + {{ vm.localPackage.version }} +
+ +
+ License + {{ vm.localPackage.license }} +
+ +
+ Read me +
+ +
+ +
+ + +
+
+ This package cannot be installed, it requires a minimum Umbraco version of {{vm.localPackage.umbracoVersion}} +
+
+

{{vm.installState.status}}

+
+ +
+
+ +
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs index b8ffbe3572..41f183eb8c 100644 --- a/src/Umbraco.Web/Editors/PackageInstallController.cs +++ b/src/Umbraco.Web/Editors/PackageInstallController.cs @@ -218,10 +218,52 @@ namespace Umbraco.Web.Editors Version = pack.Version, Url = pack.Url, License = pack.License, - LicenseUrl = pack.LicenseUrl + LicenseUrl = pack.LicenseUrl, + Files = pack.Files }).ToList(); } + private void PopulateFromPackageData(LocalPackageInstallModel model) + { + var ins = new global::umbraco.cms.businesslogic.packager.Installer(Security.CurrentUser.Id); + //this will load in all the metadata too + var tempDir = ins.Import(model.ZipFilePath, false); + + model.TemporaryDirectoryPath = Path.Combine(SystemDirectories.Data, tempDir); + model.Name = ins.Name; + model.Author = ins.Author; + model.AuthorUrl = ins.AuthorUrl; + model.License = ins.License; + model.LicenseUrl = ins.LicenseUrl; + model.ReadMe = ins.ReadMe; + model.ConflictingMacroAliases = ins.ConflictingMacroAliases; + model.ConflictingStyleSheetNames = ins.ConflictingStyleSheetNames; + model.ConflictingTemplateAliases = ins.ConflictingTemplateAliases; + model.ContainsBinaryFileErrors = ins.ContainsBinaryFileErrors; + model.ContainsLegacyPropertyEditors = ins.ContainsLegacyPropertyEditors; + model.ContainsMacroConflict = ins.ContainsMacroConflict; + model.ContainsStyleSheetConflicts = ins.ContainsStyleSheeConflicts; + model.ContainsTemplateConflicts = ins.ContainsTemplateConflicts; + model.ContainsUnsecureFiles = ins.ContainsUnsecureFiles; + model.Url = ins.Url; + model.Version = ins.Version; + + model.UmbracoVersion = ins.RequirementsType == RequirementsType.Strict + ? string.Format("{0}.{1}.{2}", ins.RequirementsMajor, ins.RequirementsMinor, ins.RequirementsPatch) + : string.Empty; + + //now we need to check for version comparison + model.IsCompatible = true; + if (ins.RequirementsType == RequirementsType.Strict) + { + var packageMinVersion = new System.Version(ins.RequirementsMajor, ins.RequirementsMinor, ins.RequirementsPatch); + if (UmbracoVersion.Current < packageMinVersion) + { + model.IsCompatible = false; + } + } + } + [HttpPost] [FileUploadCleanupFilter(false)] public async Task UploadLocalPackage() @@ -269,65 +311,14 @@ namespace Umbraco.Web.Editors //the file name must be a GUID - this is what the packager expects (strange yes) //because essentially this is creating a temporary package Id that will be used //for unpacking/installing/etc... - var packageTempFileName = model.PackageGuid + ".umb"; - var packageTempFileLocation = Path.Combine(packageTempDir, packageTempFileName); + model.ZipFilePath = model.PackageGuid + ".umb"; + var packageTempFileLocation = Path.Combine(packageTempDir, model.ZipFilePath); File.Copy(file.LocalFileName, packageTempFileLocation, true); - try - { - var ins = new global::umbraco.cms.businesslogic.packager.Installer(Security.CurrentUser.Id); - //this will load in all the metadata too - var tempDir = ins.Import(packageTempFileName); + //Populate the model from the metadata in the package file (zip file) + PopulateFromPackageData(model); - //now we need to check for version comparison - if (ins.RequirementsType == RequirementsType.Strict) - { - var packageMinVersion = new System.Version(ins.RequirementsMajor, ins.RequirementsMinor, ins.RequirementsPatch); - if (UmbracoVersion.Current < packageMinVersion) - { - throw new HttpResponseException(Request.CreateNotificationValidationErrorResponse("This package cannot be installed, it requires a minimum Umbraco version of " + packageMinVersion)); - } - } - - model.TemporaryDirectoryPath = Path.Combine(SystemDirectories.Data, tempDir); - model.Id = ins.CreateManifest( - IOHelper.MapPath(model.TemporaryDirectoryPath), - model.PackageGuid.ToString(), - //TODO: Does this matter? we're installing a local package - string.Empty); - - model.Name = ins.Name; - model.Author = ins.Author; - model.AuthorUrl = ins.AuthorUrl; - model.License = ins.License; - model.LicenseUrl = ins.LicenseUrl; - model.ReadMe = ins.ReadMe; - model.ConflictingMacroAliases = ins.ConflictingMacroAliases; - model.ConflictingStyleSheetNames = ins.ConflictingStyleSheetNames; - model.ConflictingTemplateAliases = ins.ConflictingTemplateAliases; - model.ContainsBinaryFileErrors = ins.ContainsBinaryFileErrors; - model.ContainsLegacyPropertyEditors = ins.ContainsLegacyPropertyEditors; - model.ContainsMacroConflict = ins.ContainsMacroConflict; - model.ContainsStyleSheetConflicts = ins.ContainsStyleSheeConflicts; - model.ContainsTemplateConflicts = ins.ContainsTemplateConflicts; - model.ContainsUnsecureFiles = ins.ContainsUnsecureFiles; - model.Url = ins.Url; - model.Version = ins.Version; - - model.UmbracoVersion = ins.RequirementsType == RequirementsType.Strict - ? string.Format("{0}.{1}.{2}", ins.RequirementsMajor, ins.RequirementsMinor, ins.RequirementsPatch) - : string.Empty; - - //TODO: We need to add the 'strict' requirement to the installer - } - finally - { - //Cleanup file - if (File.Exists(packageTempFileLocation)) - { - File.Delete(packageTempFileLocation); - } - } + //TODO: We need to add the 'strict' requirement to the installer } else { @@ -349,7 +340,7 @@ namespace Umbraco.Web.Editors /// /// [HttpGet] - public PackageInstallModel Fetch(string packageGuid) + public LocalPackageInstallModel Fetch(string packageGuid) { //Default path string path = Path.Combine("packages", packageGuid + ".umb"); @@ -361,14 +352,18 @@ namespace Umbraco.Web.Editors path = our.fetch(packageGuid, Security.CurrentUser.Id); } } - - var p = new PackageInstallModel(); - p.PackageGuid = Guid.Parse(packageGuid); - p.RepositoryGuid = Guid.Parse("65194810-1f85-11dd-bd0b-0800200c9a66"); - p.ZipFilePath = path; - //p.ZipFilePath = Path.Combine("temp", "package.umb"); - return p; + var model = new LocalPackageInstallModel + { + PackageGuid = Guid.Parse(packageGuid), + RepositoryGuid = Guid.Parse("65194810-1f85-11dd-bd0b-0800200c9a66"), + ZipFilePath = path + }; + + //Populate the model from the metadata in the package file (zip file) + PopulateFromPackageData(model); + + return model; } /// @@ -380,7 +375,19 @@ namespace Umbraco.Web.Editors public PackageInstallModel Import(PackageInstallModel model) { var ins = new global::umbraco.cms.businesslogic.packager.Installer(Security.CurrentUser.Id); - model.TemporaryDirectoryPath = Path.Combine(SystemDirectories.Data, ins.Import(model.ZipFilePath)); + + var tempPath = ins.Import(model.ZipFilePath); + //now we need to check for version comparison + if (ins.RequirementsType == RequirementsType.Strict) + { + var packageMinVersion = new System.Version(ins.RequirementsMajor, ins.RequirementsMinor, ins.RequirementsPatch); + if (UmbracoVersion.Current < packageMinVersion) + { + throw new HttpResponseException(Request.CreateNotificationValidationErrorResponse("This package cannot be installed, it requires a minimum Umbraco version of " + packageMinVersion)); + } + } + + model.TemporaryDirectoryPath = Path.Combine(SystemDirectories.Data, tempPath); model.Id = ins.CreateManifest( IOHelper.MapPath(model.TemporaryDirectoryPath), model.PackageGuid.ToString(), model.RepositoryGuid.ToString()); return model; @@ -423,6 +430,7 @@ namespace Umbraco.Web.Editors public PackageInstallResult CleanUp(PackageInstallModel model) { var ins = new global::umbraco.cms.businesslogic.packager.Installer(Security.CurrentUser.Id); + var tempDir = IOHelper.MapPath(model.TemporaryDirectoryPath); ins.LoadConfig(IOHelper.MapPath(model.TemporaryDirectoryPath)); ins.InstallCleanUp(model.Id, IOHelper.MapPath(model.TemporaryDirectoryPath)); @@ -435,6 +443,20 @@ namespace Umbraco.Web.Editors global::umbraco.BusinessLogic.Actions.Action.ReRegisterActionsAndHandlers(); + var redirectUrl = ""; + if (ins.Control.IsNullOrWhiteSpace()) + { + redirectUrl = string.Format("/developer/framed/{0}", + Uri.EscapeDataString( + string.Format("/umbraco/developer/Packages/installer.aspx?installing=custominstaller&dir={0}&pId={1}&customUrl={2}", tempDir, model.Id, ins.Url))); + } + else + { + redirectUrl = string.Format("/developer/framed/{0}", + Uri.EscapeDataString( + string.Format("/umbraco/developer/Packages/installer.aspx?installing=custominstaller&dir={0}&pId={1}&customControl={2}&customUrl={3}", tempDir, model.Id, ins.Control, ins.Url))); + } + return new PackageInstallResult { Id = model.Id, @@ -442,8 +464,9 @@ namespace Umbraco.Web.Editors PackageGuid = model.PackageGuid, RepositoryGuid = model.RepositoryGuid, TemporaryDirectoryPath = model.TemporaryDirectoryPath, - + PostInstallationPath = redirectUrl }; + } diff --git a/src/Umbraco.Web/Models/LocalPackageInstallModel.cs b/src/Umbraco.Web/Models/LocalPackageInstallModel.cs index 20cf359ae1..abb7c85cec 100644 --- a/src/Umbraco.Web/Models/LocalPackageInstallModel.cs +++ b/src/Umbraco.Web/Models/LocalPackageInstallModel.cs @@ -21,6 +21,12 @@ namespace Umbraco.Web.Models [DataMember(Name = "notifications")] public List Notifications { get; private set; } + /// + /// A flag to determine if this package is compatible to be installed + /// + [DataMember(Name = "isCompatible")] + public bool IsCompatible { get; set; } + /// /// The minimum umbraco version that this package is pinned to /// diff --git a/src/Umbraco.Web/Models/PackageInstallResult.cs b/src/Umbraco.Web/Models/PackageInstallResult.cs index bffc1240cf..bb76bc663b 100644 --- a/src/Umbraco.Web/Models/PackageInstallResult.cs +++ b/src/Umbraco.Web/Models/PackageInstallResult.cs @@ -9,6 +9,6 @@ namespace Umbraco.Web.Models public class PackageInstallResult : PackageInstallModel { [DataMember(Name = "postInstallationPath")] - public Guid PostInstallationPath { get; set; } + public string PostInstallationPath { get; set; } } } \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/content.cs b/src/Umbraco.Web/umbraco.presentation/content.cs index 1e013da452..6c4eef7862 100644 --- a/src/Umbraco.Web/umbraco.presentation/content.cs +++ b/src/Umbraco.Web/umbraco.presentation/content.cs @@ -331,6 +331,9 @@ namespace umbraco using (var safeXml = GetSafeXmlWriter(false)) { + //TODO: This can be null: safeXml.Xml!!!! + + var node = safeXml.Xml.GetElementById(c.Id.ToString(CultureInfo.InvariantCulture)); if (node == null) return; var attr = node.GetAttributeNode("sortOrder"); diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs index fc3da251fd..fc3c866327 100644 --- a/src/umbraco.cms/businesslogic/Packager/Installer.cs +++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs @@ -178,24 +178,25 @@ namespace umbraco.cms.businesslogic.packager /// /// Imports the specified package /// - /// Filename of the umbracopackage + /// Filename of the umbracopackage + /// true if the input file should be deleted after import /// - public string Import(string InputFile) + public string Import(string inputFile, bool deleteFile) { using (DisposableTimer.DebugDuration( - () => "Importing package file " + InputFile, - () => "Package file " + InputFile + "imported")) + () => "Importing package file " + inputFile, + () => "Package file " + inputFile + "imported")) { var tempDir = ""; - if (File.Exists(IOHelper.MapPath(SystemDirectories.Data + Path.DirectorySeparatorChar + InputFile))) + if (File.Exists(IOHelper.MapPath(SystemDirectories.Data + Path.DirectorySeparatorChar + inputFile))) { - var fi = new FileInfo(IOHelper.MapPath(SystemDirectories.Data + Path.DirectorySeparatorChar + InputFile)); + var fi = new FileInfo(IOHelper.MapPath(SystemDirectories.Data + Path.DirectorySeparatorChar + inputFile)); // Check if the file is a valid package if (fi.Extension.ToLower() == ".umb") { try { - tempDir = UnPack(fi.FullName); + tempDir = UnPack(fi.FullName, deleteFile); LoadConfig(tempDir); } catch (Exception unpackE) @@ -207,9 +208,20 @@ namespace umbraco.cms.businesslogic.packager throw new Exception("Error - file isn't a package (doesn't have a .umb extension). Check if the file automatically got named '.zip' upon download."); } else - throw new Exception("Error - file not found. Could find file named '" + IOHelper.MapPath(SystemDirectories.Data + Path.DirectorySeparatorChar + InputFile) + "'"); + throw new Exception("Error - file not found. Could find file named '" + IOHelper.MapPath(SystemDirectories.Data + Path.DirectorySeparatorChar + inputFile) + "'"); return tempDir; } + + } + + /// + /// Imports the specified package + /// + /// Filename of the umbracopackage + /// + public string Import(string inputFile) + { + return Import(inputFile, true); } public int CreateManifest(string tempDir, string guid, string repoGuid) @@ -713,7 +725,8 @@ namespace umbraco.cms.businesslogic.packager return path + fileName; return path + Path.DirectorySeparatorChar + fileName; } - private static string UnPack(string zipName) + + private static string UnPack(string zipName, bool deleteFile) { // Unzip @@ -762,7 +775,12 @@ namespace umbraco.cms.businesslogic.packager // Clean up s.Close(); - File.Delete(zipName); + + if (deleteFile) + { + File.Delete(zipName); + } + return tempDir;