From c01b2c58073a5af2d5431721211c3399396d2a05 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 8 Jun 2021 07:51:08 +0200
Subject: [PATCH 1/6] Removed the "Umbraco Pro" category.

---
 .../src/views/packages/views/repo.controller.js             | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.controller.js
index 4a2a3f29a7..90cfc9d2f7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function PackagesRepoController($scope, $route, $location, $timeout, ourPackageRepositoryResource, $q, packageResource, localStorageService, localizationService) {
+    function PackagesRepoController($scope, $timeout, ourPackageRepositoryResource, $q, packageResource, localStorageService, localizationService) {
 
         var vm = this;
 
@@ -75,7 +75,9 @@
             $q.all([
                 ourPackageRepositoryResource.getCategories()
                     .then(function (cats) {
-                        vm.categories = cats;
+                        vm.categories = cats.filter(function (cat) {
+                            return cat.name !== "Umbraco Pro";
+                        });
                     }),
                 ourPackageRepositoryResource.getPopular(8)
                     .then(function (pack) {

From 97bc301bf8943c96119a5c762e79ce4359ed0673 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 8 Jun 2021 10:08:27 +0200
Subject: [PATCH 2/6] Adds the "works on Cloud" indicator to the package list
 and details screen in the back-office.

---
 .../src/less/components/umb-packages.less        | 10 ++++++++++
 .../src/views/packages/views/repo.html           | 16 ++++++++++++++++
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml    |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml |  1 +
 4 files changed, 28 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 0045bed140..f660da8f8b 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
@@ -157,6 +157,16 @@
     color: @red !important;
 }
 
+.umb-package-link .umb-package-cloud {
+    margin-top: 8px;
+    font-size: 11px;
+    height: 11px; // ensures vertical space is taken up even if "works on cloud" isn't visible
+}
+
+.umb-package-link .umb-package-cloud .icon-cloud {
+    color: #2eadaf !important;
+}
+
 // Version
 .umb-package-version {
     display: inline-flex;
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
index 42b538f9ad..e92bd73535 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
@@ -62,6 +62,12 @@
                                             <strong>{{package.likes}}</strong>
                                         </small>
                                     </div>
+                                    <div class="umb-package-cloud">
+                                        <div ng-if="package.certifiedToWorkOnUmbracoCloud">
+                                            <i class="icon-cloud" aria-hidden="true"></i>
+                                            <span><localize key="packager_certifiedToWorkOnUmbracoCloud">Certified to work on Umbraco Cloud</localize></span>
+                                        </div>
+                                    </div>
 
                                 </div>
                             </div>
@@ -101,6 +107,12 @@
                                             <strong>{{ package.likes }}</strong>
                                         </small>
                                     </div>
+                                    <div class="umb-package-cloud">
+                                        <div ng-if="package.certifiedToWorkOnUmbracoCloud">
+                                            <i class="icon-cloud" aria-hidden="true"></i>
+                                            <span><localize key="packager_certifiedToWorkOnUmbracoCloud">Certified to work on Umbraco Cloud</localize></span>
+                                        </div>
+                                    </div>
 
                                 </div>
                             </div>
@@ -269,6 +281,10 @@
                                     <div class="umb-package-details__information-item-content">{{vm.package.likes}}</div>
                                 </div>
 
+                                <div class="umb-package-details__information-item" ng-if="vm.package.certifiedToWorkOnUmbracoCloud">
+                                    <div class="umb-package-details__information-item-label"><localize key="packager_certifiedToWorkOnUmbracoCloud">Certified to work on Umbraco CLoud</localize></div>
+                                </div>
+
                             </div>
                         </umb-box-content>
                     </umb-box>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index c76747c5a0..3ecafd1d67 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1288,6 +1288,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="installStateComplete">All done, your browser will now refresh, please wait...</key>
     <key alias="installStateCompleted">Please click 'Finish' to complete installation and reload the page.</key>
     <key alias="installStateUploading">Uploading package...</key>
+    <key alias="certifiedToWorkOnUmbracoCloud">Certified to work on Umbraco Cloud</key>
   </area>
   <area alias="paste">
     <key alias="doNothing">Paste with full formatting (Not recommended)</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index ba7586dde2..ec56665a9c 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1294,6 +1294,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="installStateComplete">All done, your browser will now refresh, please wait...</key>
     <key alias="installStateCompleted">Please click 'Finish' to complete installation and reload the page.</key>
     <key alias="installStateUploading">Uploading package...</key>
+    <key alias="certifiedToWorkOnUmbracoCloud">Certified to work on Umbraco Cloud</key>
   </area>
   <area alias="paste">
     <key alias="doNothing">Paste with full formatting (Not recommended)</key>

From dfae0adf3d5b6d4b2d3ffffed5711c1f7b1c7a20 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 8 Jun 2021 11:50:16 +0200
Subject: [PATCH 3/6] Amended phrase for Cloud confirmed packages from
 "certified" to "verified".

---
 src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html | 4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml                | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
index e92bd73535..c59d2ee3e2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
@@ -110,7 +110,7 @@
                                     <div class="umb-package-cloud">
                                         <div ng-if="package.certifiedToWorkOnUmbracoCloud">
                                             <i class="icon-cloud" aria-hidden="true"></i>
-                                            <span><localize key="packager_certifiedToWorkOnUmbracoCloud">Certified to work on Umbraco Cloud</localize></span>
+                                            <span><localize key="packager_certifiedToWorkOnUmbracoCloud">Verified to work on Umbraco Cloud</localize></span>
                                         </div>
                                     </div>
 
@@ -282,7 +282,7 @@
                                 </div>
 
                                 <div class="umb-package-details__information-item" ng-if="vm.package.certifiedToWorkOnUmbracoCloud">
-                                    <div class="umb-package-details__information-item-label"><localize key="packager_certifiedToWorkOnUmbracoCloud">Certified to work on Umbraco CLoud</localize></div>
+                                    <div class="umb-package-details__information-item-label"><localize key="packager_certifiedToWorkOnUmbracoCloud">Verified to work on Umbraco CLoud</localize></div>
                                 </div>
 
                             </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 3ecafd1d67..727ca31dab 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1288,7 +1288,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="installStateComplete">All done, your browser will now refresh, please wait...</key>
     <key alias="installStateCompleted">Please click 'Finish' to complete installation and reload the page.</key>
     <key alias="installStateUploading">Uploading package...</key>
-    <key alias="certifiedToWorkOnUmbracoCloud">Certified to work on Umbraco Cloud</key>
+    <key alias="certifiedToWorkOnUmbracoCloud">Verified to work on Umbraco Cloud</key>
   </area>
   <area alias="paste">
     <key alias="doNothing">Paste with full formatting (Not recommended)</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index ec56665a9c..4fc6fb7cdb 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1294,7 +1294,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="installStateComplete">All done, your browser will now refresh, please wait...</key>
     <key alias="installStateCompleted">Please click 'Finish' to complete installation and reload the page.</key>
     <key alias="installStateUploading">Uploading package...</key>
-    <key alias="certifiedToWorkOnUmbracoCloud">Certified to work on Umbraco Cloud</key>
+    <key alias="certifiedToWorkOnUmbracoCloud">Verified to work on Umbraco Cloud</key>
   </area>
   <area alias="paste">
     <key alias="doNothing">Paste with full formatting (Not recommended)</key>

From 87eb224e5c5b6d036eefb0b4e32d3dd332464832 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 8 Jun 2021 11:55:58 +0200
Subject: [PATCH 4/6] Updated package listing to use umb-icon directive.

---
 .../src/views/packages/views/repo.html           | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
index c59d2ee3e2..c29a914763 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
@@ -54,17 +54,17 @@
 
                                     <div class="umb-package-numbers">
                                         <small class="umb-package-downloads">
-                                            <i class="icon-download-alt" aria-hidden="true"></i>
+                                            <umb-icon icon="icon-download-alt"></umb-icon>
                                             <strong>{{package.downloads}}</strong>
                                         </small>
                                         <small class="umb-package-likes">
-                                            <i class="icon-hearts" aria-hidden="true"></i>
+                                            <umb-icon icon="icon-hearts" class="icon-hearts"></umb-icon>
                                             <strong>{{package.likes}}</strong>
                                         </small>
                                     </div>
                                     <div class="umb-package-cloud">
                                         <div ng-if="package.certifiedToWorkOnUmbracoCloud">
-                                            <i class="icon-cloud" aria-hidden="true"></i>
+                                            <umb-icon icon="icon-cloud" class="icon-cloud"></umb-icon>
                                             <span><localize key="packager_certifiedToWorkOnUmbracoCloud">Certified to work on Umbraco Cloud</localize></span>
                                         </div>
                                     </div>
@@ -99,17 +99,17 @@
 
                                     <div class="umb-package-numbers">
                                         <small class="umb-package-downloads">
-                                            <i class="icon-download-alt" aria-hidden="true"></i>
-                                            <strong>{{ package.downloads }}</strong>
+                                            <umb-icon icon="icon-download-alt"></umb-icon>
+                                            <strong>{{package.downloads}}</strong>
                                         </small>
                                         <small class="umb-package-likes">
-                                            <i class="icon-hearts" aria-hidden="true"></i>
-                                            <strong>{{ package.likes }}</strong>
+                                            <umb-icon icon="icon-hearts" class="icon-hearts"></umb-icon>
+                                            <strong>{{package.likes}}</strong>
                                         </small>
                                     </div>
                                     <div class="umb-package-cloud">
                                         <div ng-if="package.certifiedToWorkOnUmbracoCloud">
-                                            <i class="icon-cloud" aria-hidden="true"></i>
+                                            <umb-icon icon="icon-cloud" class="icon-cloud"></umb-icon>
                                             <span><localize key="packager_certifiedToWorkOnUmbracoCloud">Verified to work on Umbraco Cloud</localize></span>
                                         </div>
                                     </div>

From b5dad01fdcad3d769de89fd5df33928376c802f8 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 8 Jun 2021 12:09:55 +0200
Subject: [PATCH 5/6] Update localisation alias to match default phrase.

---
 src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html | 4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml                | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
index c29a914763..18fd7c55f5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
@@ -65,7 +65,7 @@
                                     <div class="umb-package-cloud">
                                         <div ng-if="package.certifiedToWorkOnUmbracoCloud">
                                             <umb-icon icon="icon-cloud" class="icon-cloud"></umb-icon>
-                                            <span><localize key="packager_certifiedToWorkOnUmbracoCloud">Certified to work on Umbraco Cloud</localize></span>
+                                            <span><localize key="packager_verifiedToWorkOnUmbracoCloud">Certified to work on Umbraco Cloud</localize></span>
                                         </div>
                                     </div>
 
@@ -110,7 +110,7 @@
                                     <div class="umb-package-cloud">
                                         <div ng-if="package.certifiedToWorkOnUmbracoCloud">
                                             <umb-icon icon="icon-cloud" class="icon-cloud"></umb-icon>
-                                            <span><localize key="packager_certifiedToWorkOnUmbracoCloud">Verified to work on Umbraco Cloud</localize></span>
+                                            <span><localize key="packager_verifiedToWorkOnUmbracoCloud">Verified to work on Umbraco Cloud</localize></span>
                                         </div>
                                     </div>
 
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 727ca31dab..6c684d2413 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1288,7 +1288,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="installStateComplete">All done, your browser will now refresh, please wait...</key>
     <key alias="installStateCompleted">Please click 'Finish' to complete installation and reload the page.</key>
     <key alias="installStateUploading">Uploading package...</key>
-    <key alias="certifiedToWorkOnUmbracoCloud">Verified to work on Umbraco Cloud</key>
+    <key alias="verifiedToWorkOnUmbracoCloud">Verified to work on Umbraco Cloud</key>
   </area>
   <area alias="paste">
     <key alias="doNothing">Paste with full formatting (Not recommended)</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 4fc6fb7cdb..f56024dacd 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -1294,7 +1294,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="installStateComplete">All done, your browser will now refresh, please wait...</key>
     <key alias="installStateCompleted">Please click 'Finish' to complete installation and reload the page.</key>
     <key alias="installStateUploading">Uploading package...</key>
-    <key alias="certifiedToWorkOnUmbracoCloud">Verified to work on Umbraco Cloud</key>
+    <key alias="verifiedToWorkOnUmbracoCloud">Verified to work on Umbraco Cloud</key>
   </area>
   <area alias="paste">
     <key alias="doNothing">Paste with full formatting (Not recommended)</key>

From ed79bd65f2d9f4217df4dee35279d7d675e01b6a Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Mon, 21 Jun 2021 13:38:49 +0200
Subject: [PATCH 6/6] Fix certified to verified refactoring

---
 .../src/views/packages/views/repo.html                      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
index 18fd7c55f5..d467c513ec 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
@@ -65,7 +65,7 @@
                                     <div class="umb-package-cloud">
                                         <div ng-if="package.certifiedToWorkOnUmbracoCloud">
                                             <umb-icon icon="icon-cloud" class="icon-cloud"></umb-icon>
-                                            <span><localize key="packager_verifiedToWorkOnUmbracoCloud">Certified to work on Umbraco Cloud</localize></span>
+                                            <span><localize key="packager_verifiedToWorkOnUmbracoCloud">Verified to work on Umbraco Cloud</localize></span>
                                         </div>
                                     </div>
 
@@ -116,7 +116,7 @@
 
                                 </div>
                             </div>
-                            
+
                         </button>
                     </div> <!-- end package -->
 
@@ -282,7 +282,7 @@
                                 </div>
 
                                 <div class="umb-package-details__information-item" ng-if="vm.package.certifiedToWorkOnUmbracoCloud">
-                                    <div class="umb-package-details__information-item-label"><localize key="packager_certifiedToWorkOnUmbracoCloud">Verified to work on Umbraco CLoud</localize></div>
+                                    <div class="umb-package-details__information-item-label"><localize key="packager_verifiedToWorkOnUmbracoCloud">Verified to work on Umbraco CLoud</localize></div>
                                 </div>
 
                             </div>