From 9d929e04681005fffcfca88673b24d56ffe18c8b Mon Sep 17 00:00:00 2001
From: himil-vasava <vasava_h@cs.iitr.ac.in>
Date: Tue, 10 Mar 2020 11:51:13 +0530
Subject: [PATCH 01/33] Select all button in the filter

---
 app/main/posts/views/filters/filter-form.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/main/posts/views/filters/filter-form.html b/app/main/posts/views/filters/filter-form.html
index c5de2bc24a..4d51066893 100644
--- a/app/main/posts/views/filters/filter-form.html
+++ b/app/main/posts/views/filters/filter-form.html
@@ -3,12 +3,17 @@
 
     <div class="form-field checkbox" ng-repeat="(index, form) in forms">
         <label>
-            <input checklist-value="form.id" checklist-model="selectedForms" type="checkbox" name="selectedForms"> <bdi>{{ ::form.name }}</bdi>
+            <input checklist-value="form.id" checklist-model="selectedForms" type="checkbox" name="selectedForms" ng-checked="all"> <bdi>{{ ::form.name }}</bdi>
         </label>
     </div>
     <div class="form-field checkbox">
         <label>
-            <input checklist-value="'none'" checklist-model="selectedForms" type="checkbox" name="selectedForms" > <span translate="nav.unknown">Unknown</span>
+            <input checklist-value="'none'" checklist-model="selectedForms" type="checkbox" name="selectedForms" ng-checked="all" > <span translate="nav.unknown">Unknown</span>
+        </label>
+    </div>
+    <div class="form-field checkbox">
+        <label>
+            <input  type="checkbox" name="selectedForms" ng-model="all"> <span >Select/Unselect All</span>
         </label>
     </div>
 </fieldset>

From 13c386d6a284193b1465d466fd50004547fec00c Mon Sep 17 00:00:00 2001
From: Anna <anna@ushahidi.com>
Date: Wed, 11 Mar 2020 12:09:24 +0100
Subject: [PATCH 02/33] revamp of plans-table

---
 app/settings/plans/plans.controller.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/settings/plans/plans.controller.js b/app/settings/plans/plans.controller.js
index 79c901a7d6..c5a9987266 100644
--- a/app/settings/plans/plans.controller.js
+++ b/app/settings/plans/plans.controller.js
@@ -36,6 +36,7 @@ function (
         }
     };
     $rootScope.setLayout('layout-c');
+    window.scrollTo(0, 0);
     $scope.switchTab = switchTab;
     $scope.activeTab = 'demo';
     $translate('nav.plan_settings').then(function (title) {

From 4c8fce09467fc3b3eb44487f793ee6091e3cf5ca Mon Sep 17 00:00:00 2001
From: himil-vasava <vasava_h@cs.iitr.ac.in>
Date: Thu, 12 Mar 2020 00:38:06 +0530
Subject: [PATCH 03/33] Select all option

---
 app/main/posts/views/filters/filter-form.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/main/posts/views/filters/filter-form.html b/app/main/posts/views/filters/filter-form.html
index 4d51066893..8ce707aac6 100644
--- a/app/main/posts/views/filters/filter-form.html
+++ b/app/main/posts/views/filters/filter-form.html
@@ -1,19 +1,19 @@
 <fieldset overflow-toggle has-overflow="forms.length > 1" ng-model-options="{ updateOn: 'default' }">
     <label translate="app.surveys">Survey</label>
-
-    <div class="form-field checkbox" ng-repeat="(index, form) in forms">
+   
+    <div class="form-field checkbox">
         <label>
-            <input checklist-value="form.id" checklist-model="selectedForms" type="checkbox" name="selectedForms" ng-checked="all"> <bdi>{{ ::form.name }}</bdi>
+            <input  type="checkbox" name="selectedForms" ng-model="all"><em><span translate="category.select_all"></span></em>
         </label>
     </div>
-    <div class="form-field checkbox">
+    <div class="form-field checkbox" ng-repeat="(index, form) in forms">
         <label>
-            <input checklist-value="'none'" checklist-model="selectedForms" type="checkbox" name="selectedForms" ng-checked="all" > <span translate="nav.unknown">Unknown</span>
+            <input checklist-value="form.id" checklist-model="selectedForms" type="checkbox" name="selectedForms" ng-checked="all"> <bdi>{{ ::form.name }}</bdi>
         </label>
     </div>
     <div class="form-field checkbox">
         <label>
-            <input  type="checkbox" name="selectedForms" ng-model="all"> <span >Select/Unselect All</span>
+            <input checklist-value="'none'" checklist-model="selectedForms" type="checkbox" name="selectedForms" ng-checked="all" > <span translate="nav.unknown">Unknown</span>
         </label>
     </div>
 </fieldset>

From 1d3d17db959905fac00caaf559be18ad21a2dfe5 Mon Sep 17 00:00:00 2001
From: noone0212 <ssoni@ee.iitr.ac.in>
Date: Fri, 13 Mar 2020 02:32:08 +0530
Subject: [PATCH 04/33] "Added opaque filter actions bar"

---
 app/main/posts/modify/post-data-editor.directive.js | 2 +-
 app/main/posts/views/filters/filters-dropdown.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/main/posts/modify/post-data-editor.directive.js b/app/main/posts/modify/post-data-editor.directive.js
index 975f9ddb9a..6466bcaa8c 100644
--- a/app/main/posts/modify/post-data-editor.directive.js
+++ b/app/main/posts/modify/post-data-editor.directive.js
@@ -407,7 +407,7 @@ function PostDataEditorController(
             });
         });
     }
-        
+
     function cancel() {
         $state.go('posts.data.detail',{postId: $scope.post.id});
     }
diff --git a/app/main/posts/views/filters/filters-dropdown.html b/app/main/posts/views/filters/filters-dropdown.html
index 2f85191e13..3bf0758532 100644
--- a/app/main/posts/views/filters/filters-dropdown.html
+++ b/app/main/posts/views/filters/filters-dropdown.html
@@ -25,6 +25,6 @@ <h4 class="dropdown-menu-title" translate="app.filter_by"></h4>
     <!-- end: filter options -->
 </div>
 <div class="form-field filter-actions">
-    <button type="button" class="button-link" ng-click="clearFilters()" translate>global_filter.restore_defaults</button>
+    <button type="button" class="button-beta" ng-click="clearFilters()" translate>global_filter.restore_defaults</button>
     <button type="submit" class="button-alpha" ng-disabled="disableApplyButton()" translate>app.apply_filters</button>
 </div>

From 5d05748d67fda4041958730619c4fce07d477b47 Mon Sep 17 00:00:00 2001
From: noone0212 <ssoni@ee.iitr.ac.in>
Date: Fri, 13 Mar 2020 02:43:27 +0530
Subject: [PATCH 05/33] "Added UI visualization for important fields in user
 create in platform client."

---
 app/main/posts/modify/post-data-editor.directive.js |  2 +-
 app/settings/users/users-edit.html                  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/main/posts/modify/post-data-editor.directive.js b/app/main/posts/modify/post-data-editor.directive.js
index 975f9ddb9a..6466bcaa8c 100644
--- a/app/main/posts/modify/post-data-editor.directive.js
+++ b/app/main/posts/modify/post-data-editor.directive.js
@@ -407,7 +407,7 @@ function PostDataEditorController(
             });
         });
     }
-        
+
     function cancel() {
         $state.go('posts.data.detail',{postId: $scope.post.id});
     }
diff --git a/app/settings/users/users-edit.html b/app/settings/users/users-edit.html
index 6f5a03090b..75b0c28b9d 100644
--- a/app/settings/users/users-edit.html
+++ b/app/settings/users/users-edit.html
@@ -40,7 +40,7 @@ <h1 class="mode-context-title" ng-show="!user.id" translate>app.add_user</h1>
 
             <form name="form">
                 <div class="form-sheet">
-                    <div class="form-field" ng-class="{ 'error': form.full_name.$invalid && form.full_name.$dirty }">
+                    <div class="form-field init required" ng-class="{ 'error': form.full_name.$invalid && form.full_name.$dirty }">
                         <label translate>user.full_name</label>
                         <input type="text" placeholder="{{'user_create.full_name' | translate}}" ng-maxlength="150" ng-model="user.realname" name="full_name" required>
                         <div ng-repeat="(error, value) in form.full_name.$error"
@@ -53,8 +53,8 @@ <h1 class="mode-context-title" ng-show="!user.id" translate>app.add_user</h1>
                         </div>
                     </div>
 
-                    <div class="form-field" ng-class="{ 'error': form.email.$invalid && form.email.$dirty }">
-                        <label class="hidden" translate>user.email</label>
+                    <div class="form-field init required" ng-class="{ 'error': form.email.$invalid && form.email.$dirty }">
+                        <label translate>user.email</label>
                         <input type="email" placeholder="{{'user_create.email' | translate}}" ng-maxlength="150" ng-model="user.email" name="email" required>
                         <div ng-repeat="(error, value) in form.email.$error"
                             ng-show="form.email.$dirty"
@@ -66,8 +66,8 @@ <h1 class="mode-context-title" ng-show="!user.id" translate>app.add_user</h1>
                         </div>
                     </div>
 
-                    <div class="form-field" ng-class="{ 'error': form.password.$invalid && form.password.$dirty }">
-                        <label class="hidden" translate>user.password</label>
+                    <div class="form-field init required" ng-class="{ 'error': form.password.$invalid && form.password.$dirty }">
+                        <label translate>user.password</label>
 
                         <a class="button button-flat" ng-show="!passwordShown" ng-click="showPassword()" translate>user.update_password</a>
 

From 9e50f9ea784eeb715ef85d349522ffb9cfcd9b4a Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2020 12:33:20 +0000
Subject: [PATCH 06/33] chore(package): update file-loader to version 6.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2d9c561496..00c10c05ac 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "dotenv": "^8.2.0",
     "eslint": "^6.7.1",
     "fancy-log": "^1.3.3",
-    "file-loader": "^5.0.2",
+    "file-loader": "^6.0.0",
     "fs-walk": "0.0.2",
     "gulp": "^4.0.2",
     "gulp-eslint": "^6.0.0",

From 92bfc154b5aca6f9ddb63c30da6d1c37b156a32b Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2020 12:56:27 +0000
Subject: [PATCH 07/33] chore(package): update url-loader to version 4.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2d9c561496..c1b87b33da 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "svg-url-loader": "^4.0.0",
     "transifex": "^1.6.6",
     "uglifyjs-webpack-plugin": "^2.2.0",
-    "url-loader": "^3.0.0",
+    "url-loader": "^4.0.0",
     "webpack": "^4.41.4",
     "webpack-dev-middleware": "^3.7.2",
     "webpack-hot-middleware": "^2.25.0"

From 2d8ac4859e4433bf0d80995e1e41ba5726497c30 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2020 21:20:53 +0000
Subject: [PATCH 08/33] chore(package): update svg-url-loader to version 5.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2d9c561496..2087f6a1a5 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "sass-loader": "^8.0.0",
     "style-loader": "^1.1.2",
     "supports-color": "^3.1.2",
-    "svg-url-loader": "^4.0.0",
+    "svg-url-loader": "^5.0.0",
     "transifex": "^1.6.6",
     "uglifyjs-webpack-plugin": "^2.2.0",
     "url-loader": "^3.0.0",

From 6d2ab693abfd550d018b739c00b6d210f1285d99 Mon Sep 17 00:00:00 2001
From: noone0212 <ssoni@ee.iitr.ac.in>
Date: Wed, 18 Mar 2020 03:38:16 +0530
Subject: [PATCH 09/33] "Enabling User to type rather than only pasting."

---
 app/main/posts/modify/video.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/main/posts/modify/video.html b/app/main/posts/modify/video.html
index 5f1724e0d0..de2d1e3b58 100644
--- a/app/main/posts/modify/video.html
+++ b/app/main/posts/modify/video.html
@@ -10,7 +10,7 @@
       <img src="/img/vimeo.png" class="wordmark-replace">
       <span translate="post.video.video_url"> video URL</span>
     </p>
-    <input type="text" ng-model="videoUrl" ng-change="constructIframe(videoUrl)" placeholder="https://youtu.be/123456">
+    <input type="text" ng-model="videoUrl" ng-blur="constructIframe(videoUrl)" placeholder="https://youtu.be/123456">
 
     <div id="{{previewId}}" class="form-field-preview" ng-show="videoUrl">
       <div class="video_embed-fluid">

From e163ab5883b091cab4d0dba0980b3f88abbef03b Mon Sep 17 00:00:00 2001
From: Anna <anna@ushahidi.com>
Date: Wed, 18 Mar 2020 09:17:12 +0100
Subject: [PATCH 10/33] bringing back svg-url-loader to 3.0.3

---
 package.json      | 2 +-
 webpack.config.js | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 2d9c561496..d63f30352e 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "sass-loader": "^8.0.0",
     "style-loader": "^1.1.2",
     "supports-color": "^3.1.2",
-    "svg-url-loader": "^4.0.0",
+    "svg-url-loader": "^3.0.3",
     "transifex": "^1.6.6",
     "uglifyjs-webpack-plugin": "^2.2.0",
     "url-loader": "^3.0.0",
diff --git a/webpack.config.js b/webpack.config.js
index c0c5e04a53..035edcc03f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -64,8 +64,7 @@ module.exports = {
       {
         test: /\.svg/,
         use: {
-          loader: 'svg-url-loader?limit=1',
-          options: {esModule: false }
+          loader: 'svg-url-loader?limit=1'
         }
       },
       {

From 8ab22478278c6c6421ee3396f2e6cafb06a87734 Mon Sep 17 00:00:00 2001
From: Anna <anna@ushahidi.com>
Date: Wed, 18 Mar 2020 10:28:49 +0100
Subject: [PATCH 11/33] removing demo and multiple-enterprise

---
 app/settings/plans/plan.html | 893 ++---------------------------------
 1 file changed, 39 insertions(+), 854 deletions(-)

diff --git a/app/settings/plans/plan.html b/app/settings/plans/plan.html
index 4f0d8d8826..d767f3804a 100644
--- a/app/settings/plans/plan.html
+++ b/app/settings/plans/plan.html
@@ -18,18 +18,18 @@ <h1 class="mode-context-title" translate>app.plans</h1>
     </div>
 
     <main role="main">
-
+        <div class="main-col">
+            <div class="form-sheet">
+                <div class="form-field">
+                    <h3 class="new">We are revamping our pricing plans.</h3>
+                    <p>In the meantime, you can take advantage of a limited time discount of 90% off Ushahidi Basic for new subscriptions</p>
+                    <em>*COVID19 Update: For the next 90 days, we will be waiving the fee for our basic plan, and offering it at $0.</em>
+                </div>
+            </div>
         <div class="wrapper">
             <div class="tiers" role="article">
                 <nav class="tabs-menu init" data-tabs="pricing-tabs">
                     <ul>
-                        <li id="demo-li" class="active">
-                            <a href="#" ng-click="switchTab('demo')">
-                                Ushahidi Demo
-                                <span class="tabs-label">Self Service</span>
-                            </a>
-
-                        </li>
                         <li id="basic-li" >
                             <a href="#" ng-click="switchTab('basic')">
                                 Ushahidi Basic
@@ -39,891 +39,74 @@ <h1 class="mode-context-title" translate>app.plans</h1>
                         </li>
                         <li id="enterprise-single-li" >
                             <a href="#" ng-click="switchTab('enterprise-single')">
-                                Single Deployment
+                                Enterprise
                                 <span class="tabs-label alt">Enterprise</span>
                             </a>
 
                         </li>
-                        <li id="enterprise-multiple-li" >
-                            <a href="#" ng-click="switchTab('enterprise-multiple')">
-                                Multiple Deployment
-                                <span class="tabs-label alt">Enterprise</span>
-                            </a>
-                        </li>
                     </ul>
                 </nav>
 
-                <div class="tier pricing-tabs active tabs-target" id="demo">
+                <div class="tier pricing-tabs tabs-target" id="basic">
                     <span class="tier-label">Self Service</span>
-
                     <div class="tier-summary">
-                        <h2 class="tier-name">Ushahidi Demo</h2>
-                        <p class="small">limited use - 1 month</p>
-                        <p>Test out the Ushahidi crowdsourcing and situation awareness platform.</p>
-                        <strong class="tier-price">Free</strong>
-                        <a class="button button-alpha" disabled ng-show="tier == 'demo_1'">&check; Subscribed</a>
-                        <a href="//{{ cloudDomain }}/settings/login?subdomain={{ subdomain }}&username={{ username }}&tier=demo_1" class="button button-alpha" ng-hide="tier == 'demo_1'">Sign up</a>
-                    </div>
-
-                    <div class="show-on-mobile">
-                        <div class="tier-features">
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">Free Software, Hosting, and Maintenance</h3>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">Embeddable web form, email, SMSsync, data collection online/offline iOS and Android App. Map and Timeline data visualization <br> Roles/Permissions. Email, SMS, Twitter. Private Deployments. Analytics Visualization Page. Import/Export Data.</h3>
-                                <a href="#5355">Find out more about data collection</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">1 Deployment</h3>
-                                <a href="#5348">What’s a deployment?</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">25 admins and/or custom roles</h3>
-                                <a href="#5349">What’s an admin?</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">25 posts maximum</h3>
-                                <a href="#5352">What’s a post?</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">Deployments appear in Ushahidi iOS/Android App</h3>
-                                <a href="#5728">Learn more about our app</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">Crowdsourced surveys</h3>
-                                <a href="#5350">What’s a crowdsourced survey?</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">No targeted surveys</h3>
-                                <a href="#5351">What’s a targeted survey?</a>
-                            </div>
+                        <div class="tier-description">
+                            <h2 class="tier-name">Ushahidi Basic</h2>
+                            <p>Collect, monitor, analyze, and respond to real time incidents and engage with stakeholders.</p>
                         </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">One-time Support Services not available for demo</h3>
+                        <div class="tier-highlight">
+                            <strong class="tier-price new">$0<em>/mo</em></strong>
+                            <span>for the next 90 days, then $49.9/mo.</span>
                         </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">On-going support services not available for demo</h3>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Custom feature development  not available for demo</h3>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="tier pricing-tabs tabs-target" id="basic">
-                    <span class="tier-label">Self Service</span>
-                    <div class="tier-summary">
-                        <h2 class="tier-name">Ushahidi Basic</h2>
-                        <p class="small hide-on-mobile" style="visibility: hidden;">this is a line break hack</p>
-                        <p>Collect, monitor, analyze, and respond to real time incidents and engage with stakeholders.</p>
-                        <strong class="tier-price">$499 <em>/mo</em></strong>
                         <a class="button button-alpha" ng-show="tier == 'level_1'" disabled ng-show="tier == 'level_1'">&check; Subscribed</a>
                         <a href="//{{ cloudDomain }}/settings/login?subdomain={{ subdomain }}&username={{ username }}&tier=level_1" class="button button-alpha" ng-hide="tier == 'level_1'">Sign up</a>
                     </div>
-
-                    <div class="show-on-mobile">
-                        <div class="tier-features">
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">$499/month for Software, Hosting, and Maintenance</h3>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">Embeddable web form, email, SMSsync, data collection online/offline iOS and Android App. Map and Timeline data visualization <br> Roles/Permissions. Email, SMS, Twitter. Private Deployments. Analytics Visualization Page. Import/Export Data.</h3>
-                                <a href="#5355">Find out more about data collection</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">1 Deployment</h3>
-                                <a href="#5348">What’s a deployment?</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">25 admins and/or custom roles</h3>
-                                <a href="#5349">What’s an admin?</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">Unlimited posts</h3>
-                                <a href="#5352">What’s a post?</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">Deployments appear in Ushahidi iOS/Android App</h3>
-                                <a href="#5728">Learn more about our app</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">Crowdsourced surveys</h3>
-                                <a href="#5350">What’s a crowdsourced survey?</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">No targeted surveys</h3>
-                                <a href="#5351">What’s a targeted survey?</a>
-                            </div>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">One-time Support Services not available for basic</h3>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">On-going support services not available for basic</h3>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Custom feature development  not available for basic</h3>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="tier pricing-tabs tabs-target" id="enterprise-single">
-                    <span class="tier-label alt">Enterprise</span>
-                    <div class="tier-summary">
-                        <h2 class="tier-name">Ushahidi Enterprise: Single Deployment</h2>
-                        <p>Ushahidi platform capabilities, technical expertise, ongoing support, and customizations.</p>
-                        <p class="hide-on-mobile" style="visibility: hidden;"> this is a line break hack. this is a line break hack. this is a line break hack. this is a line break hack.</p>
-                        <p class="form-heading">Contact us about Enterprise Services for your organization</p>
-
-                    </div>
-
-                    <form id="form7" name="form7" class="wufoo topLabel" accept-charset="UTF-8" autocomplete="off" enctype="multipart/form-data" method="post" novalidate="" action="https://ushah.wufoo.com/forms/pb6wq340260j75/#public">
-
-                        <div class="form-field">
-                            <label class="desc" id="title1" for="Field1">Your name <span id="req_1" class="req">*</span></label>
-                            <input placeholder="Your name" id="Field1" name="Field1" type="text" class="field text medium" value="" maxlength="255" tabindex="1" onkeyup="" required="">
-                        </div>
-
-                        <div class="form-field">
-                            <label class="desc nodisplay" id="title2" for="Field2">Your email <span id="req_2" class="req">*</span></label>
-                            <input placeholder="you@organization.com" id="Field2" name="Field2" type="email" spellcheck="false" class="field text medium" value="" maxlength="255" tabindex="2" required="">
-                        </div>
-
-                        <div class="form-field">
-                            <label class="desc nodisplay" id="title3" for="Field5">Phone number <span id="req_5" class="req">*</span></label>
-                            <input id="Field5" class="field text medium" name="Field5" tabindex="3" onkeyup="handleInput(this);" onchange="handleInput(this);" required="" type="tel" maxlength="255" value="" style="display: block; width: 100%;">
-                        </div>
-
-                        <div class="form-field">
-                            <label class="desc nodisplay" id="title3" for="Field3">Your organization</label>
-                            <input placeholder="Your organization" id="Field3" name="Field3" type="text" class="field text medium" value="" maxlength="255" tabindex="3" onkeyup="">
-                        </div>
-
-                        <div class="form-field">
-                            <button id="saveForm" name="saveForm" class="button btTxt submit" type="submit" onclick="ga('send','event','links','contact', 'plan-solutions',1);">Continue</button>
-                        </div>
-
-                        <div class="nodisplay">
-                            <label for="comment">Do Not Fill This Out</label>
-                            <textarea name="comment" id="comment" rows="1" cols="1"></textarea>
-                            <input type="hidden" id="idstamp" name="idstamp" value="zkhl5vdgevIPMx9QV0j5WIpon8aq8lW5GuXOYyAWb/k=">
-                        </div>
-                    </form>
-
                     <div class="tier-features">
-                        <div class="tier-feature">
-                            <strong class="tier-price">Base Pricing</strong>
-                            <p class="small">(1 Deployment)</p>
-                            <h3 class="tier-heading">
-                                Set-up
-                                <br>
-                                $15,000+
-                                <br><br>
-                                1 Remote Training
-                                <br>
-                                $1,500+
-                                <br><br>
-                                Software, Hosting &amp; Maintenance
-                                <br>
-                                $999+/month
-                                <br><br>
-                                Ongoing Technical Support
-                                <br>
-                                $1500+/month
-                                <br><br>
-                                <p class="small">*pricing modified based upon circumstances and customizations</p>
-                            </h3>
-                        </div>
-                    </div>
-
-                    <div class="show-on-mobile">
-                        <div class="tier-features">
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">$999+/month for Software, Hosting, and Maintenance</h3>
-                                <p class="small">*subject to increase with customizations</p>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">All of Ushahidi Basic + 25 admins. SMS targeted surveys. Automated sorting capabilities.</h3>
-                                <a href="#5355">Find out more about data collection</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">1 Deployment</h3>
-                                <a href="#5348">What’s a deployment?</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">25 admins and/or custom roles</h3>
-                                <a href="#5349">What’s an admin?</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">Unlimited posts</h3>
-                                <a href="#5352">What’s a post?</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">Deployments appear in Ushahidi iOS/Android App</h3>
-                                <a href="#5728">Learn more about our app</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">Crowdsourced surveys</h3>
-                                <a href="#5350">What’s a crowdsourced survey?</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">Access to targeted surveys and the ability to gather and upload contacts and send multi-question SMS surveys. Contact for pricing based on country location and survey sizes</h3>
-                                <a href="#5351">What’s a targeted survey?</a>
-                            </div>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">One-time Support Services</h3>
-                            <a href="#5729">Find out more about one-time services</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">On-going support services</h3>
-                            <a href="#5730">Find out more about on-going services</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Custom feature development</h3>
-                            <p class="small">*contact for scoping and pricing</p>
-                            <a href="#5731">Find out more about custom feature development</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Collaborative Discovery Session</h3>
-                            <p class="small">*contact for pricing</p>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">
-                                Platform set-up
-                                <br>
-                                $15,000+
-                            </h3>
-                            <p class="small">*required for base Enterprise Partnership</p>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Survey configuration - Contact for pricing</h3>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">
-                                Training of project administrators
-                                <br>
-                                $1500+
-                            </h3>
-                            <p class="small">*required for base Enterprise Partnership</p>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Training of trainers, Training of monitors or field staff, Stakeholder Engagement Toolkit, White Labeling, Translation</h3>
-                            <p class="small">*contact for pricing</p>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">
-                                Ongoing technical support account manager
-                                <br>
-                                $1500+/month
-                            </h3>
-                            <p class="small">*required for base Enterprise Partnership</p>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Long-term embedded Ushahidi platform administrator(s)</h3>
-                            <p class="small">*contact for pricing</p>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Long-term embedded Ushahidi platform community engagement officer(s)</h3>
-                            <p class="small">*contact for pricing</p>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="tier pricing-tabs tabs-target" id="enterprise-multiple">
-                    <span class="tier-label alt">Enterprise</span>
-                    <div class="tier-summary">
-                        <h2 class="tier-name">Ushahidi Enterprise: Multiple Deployments</h2>
-                        <p>Ushahidi platform capabilities, technical expertise, ongoing support, and customizations.</p>
-                        <p>Integrate Ushahidi across your organization or project activities by using multiple Ushahidi platform deployments.</p>
-                        <p class="form-heading">Contact us about Enterprise Services for your organization</p>
-
-                    </div>
-
-                    <form id="form7" name="form7" class="wufoo topLabel" accept-charset="UTF-8" autocomplete="off" enctype="multipart/form-data" method="post" novalidate="" action="https://ushah.wufoo.com/forms/pb6wq340260j75/#public">
-
-                        <div class="form-field">
-                            <label class="desc" id="title1" for="Field1">Your name <span id="req_1" class="req">*</span></label>
-                            <input placeholder="Your name" id="Field1" name="Field1" type="text" class="field text medium" value="" maxlength="255" tabindex="1" onkeyup="" required="">
-                        </div>
-
-                        <div class="form-field">
-                            <label class="desc nodisplay" id="title2" for="Field2">Your email <span id="req_2" class="req">*</span></label>
-                            <input placeholder="you@organization.com" id="Field2" name="Field2" type="email" spellcheck="false" class="field text medium" value="" maxlength="255" tabindex="2" required="">
-                        </div>
-
-                        <div class="form-field">
-                            <label class="desc nodisplay" id="title3" for="Field5">Phone number <span id="req_5" class="req">*</span></label>
-                            <input id="Field5" class="field text medium" name="Field5" tabindex="3" onkeyup="handleInput(this);" onchange="handleInput(this);" required="" type="tel" maxlength="255" value="" style="display: block; width: 100%;">
-                        </div>
-
-                        <div class="form-field">
-                            <label class="desc nodisplay" id="title3" for="Field3">Your organization</label>
-                            <input placeholder="Your organization" id="Field3" name="Field3" type="text" class="field text medium" value="" maxlength="255" tabindex="3" onkeyup="">
-                        </div>
-
-                        <div class="form-field">
-                            <button id="saveForm" name="saveForm" class="button btTxt submit" type="submit" onclick="ga('send','event','links','contact', 'plan-solutions',1);">Continue</button>
-                        </div>
-
-                        <div class="nodisplay">
-                            <label for="comment">Do Not Fill This Out</label>
-                            <textarea name="comment" id="comment" rows="1" cols="1"></textarea>
-                            <input type="hidden" id="idstamp" name="idstamp" value="zkhl5vdgevIPMx9QV0j5WIpon8aq8lW5GuXOYyAWb/k=">
-                        </div>
-                    </form>
-
-                    <div class="tier-features">
-                        <div class="tier-feature">
-                            <strong class="tier-price">Base Pricing</strong>
-                            <p class="small">(5 Deployments)</p>
-                            <p class="small">*contact us for pricing for 10, 25, or custom deployment packages</p>
-                            <h3 class="tier-heading">
-                                Set-up
-                                <br>
-                                $50,000+
-                                <br><br>
-                                5 Remote Trainings
-                                <br>
-                                $6,000+
-                                <br><br>
-                                Software, Hosting &amp; Maintenance
-                                <br>
-                                $2000+/month
-                                <br><br>
-                                Ongoing Technical Support
-                                <br>
-                                $3,000+/month
-                                <br><br>
-                                <p class="small">*pricing modified based upon circumstances and customizations</p>
-                            </h3>
-                        </div>
-                    </div>
-
-                    <div class="show-on-mobile">
-                        <div class="tier-features">
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">$2000+/month for Software, Hosting, and Maintenance</h3>
-                                <p class="small">*subject to increase with customizations</p>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">All of Ushahidi Basic + Unlimited admins. SMS targeted surveys. Automated sorting capabilities.</h3>
-                                <a href="#5355">Find out more about data collection</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">5 Deployments</h3>
-                                <p class="small">*contact us for pricing for 10, 25, or custom deployment packages</p>
-                                <a href="#5348">What’s a deployment?</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">Unlimited admins</h3>
-                                <a href="#5349">What’s an admin?</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">Unlimited posts</h3>
-                                <a href="#5352">What’s a post?</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">Deployments appear in Ushahidi iOS/Android App</h3>
-                                <a href="#5728">Learn more about our app</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">Crowdsourced surveys</h3>
-                                <a href="#5350">What’s a crowdsourced survey?</a>
-                            </div>
-
-                            <div class="tier-feature">
-                                <h3 class="tier-heading">Access to targeted surveys and the ability to gather and upload contacts and send multi-question SMS surveys. Contact for pricing based on country location and survey sizes</h3>
-                                <a href="#5351">What’s a targeted survey?</a>
-                            </div>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">One-time Support Services</h3>
-                            <a href="#5729">Find out more about one-time services</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">On-going support services</h3>
-                            <a href="#5730">Find out more about on-going services</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Custom feature development</h3>
-                            <p class="small">*contact for scoping and pricing</p>
-                            <a href="#5731">Find out more about custom feature development</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Collaborative Discovery Session</h3>
-                            <p class="small">*contact for pricing</p>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">
-                                Platform set-up
-                                <br>
-                                $50,000+
-                            </h3>
-                            <p class="small">*required for base Enterprise Partnership</p>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Survey configuration - Contact for pricing</h3>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">
-                                Training of project administrators
-                                <br>
-                                $7500+
-                            </h3>
-                            <p class="small">*required for base Enterprise Partnership</p>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Training of trainers, Training of monitors or field staff, Stakeholder Engagement Toolkit, White Labeling, Translation</h3>
-                            <p class="small">*contact for pricing</p>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">
-                                Ongoing technical support account manager
-                                <br>
-                                $3000+/month
-                            </h3>
-                            <p class="small">*required for base Enterprise Partnership</p>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Long-term embedded Ushahidi platform administrator(s)</h3>
-                            <p class="small">*contact for pricing</p>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Long-term embedded Ushahidi platform community engagement officer(s)</h3>
-                            <p class="small">*contact for pricing</p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="tiers hide-on-mobile" role="article">
-
-                <div class="tier-label">Platform Technology</div>
-
-                <div class="tier">
-                    <div class="tier-features">
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Free Software, Hosting, and Maintenance</h3>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Embeddable web form, email, SMSsync, data collection online/offline iOS and Android App. Map and Timeline data visualization <br> Roles/Permissions. Email, SMS, Twitter. Private Deployments. Analytics Visualization Page. Import/Export Data.</h3>
-                            <a href="#5355">Find out more about data collection</a>
-                        </div>
-
                         <div class="tier-feature">
                             <h3 class="tier-heading">1 Deployment</h3>
-                            <a href="#5348">What’s a deployment?</a>
                         </div>
 
                         <div class="tier-feature">
                             <h3 class="tier-heading">25 admins and/or custom roles</h3>
-                            <a href="#5349">What’s an admin?</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">25 posts maximum</h3>
-                            <a href="#5352">What’s a post?</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Deployments appear in Ushahidi iOS/Android App</h3>
-                            <a href="#5728">Learn more about our app</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Crowdsourced surveys</h3>
-                            <a href="#5350">What’s a crowdsourced survey?</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">No targeted surveys</h3>
-                            <a href="#5351">What’s a targeted survey?</a>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="tier">
-                    <div class="tier-features">
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">$499/month for Software, Hosting, and Maintenance</h3>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Embeddable web form, email, SMSsync, data collection online/offline iOS and Android App. Map and Timeline data visualization <br> Roles/Permissions. Email, SMS, Twitter. Private Deployments. Analytics Visualization Page. Import/Export Data.</h3>
-                            <a href="#5355">Find out more about data collection</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">1 Deployment</h3>
-                            <a href="#5348">What’s a deployment?</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">25 admins and/or custom roles</h3>
-                            <a href="#5349">What’s an admin?</a>
                         </div>
 
                         <div class="tier-feature">
                             <h3 class="tier-heading">Unlimited posts</h3>
-                            <a href="#5352">What’s a post?</a>
                         </div>
-
                         <div class="tier-feature">
-                            <h3 class="tier-heading">Deployments appear in Ushahidi iOS/Android App</h3>
-                            <a href="#5728">Learn more about our app</a>
+                            <h3 class="tier-heading">Web, Email, SMS, & Twitter data collection </h3>
                         </div>
 
                         <div class="tier-feature">
-                            <h3 class="tier-heading">Crowdsourced surveys</h3>
-                            <a href="#5350">What’s a crowdsourced survey?</a>
+                            <h3 class="tier-heading">Map, timeline, bar chart, & line chart data visualization</h3>
                         </div>
 
                         <div class="tier-feature">
-                            <h3 class="tier-heading">No targeted surveys</h3>
-                            <a href="#5351">What’s a targeted survey?</a>
+                            <h3 class="tier-heading">Import & Export data</h3>
                         </div>
                     </div>
                 </div>
 
-                <div class="tier">
-                    <div class="tier-features">
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">$999+/month for Software, Hosting, and Maintenance</h3>
-                            <p class="small">*subject to increase with customizations</p>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">All of Ushahidi Basic + 25 admins. SMS targeted surveys. Automated sorting capabilities.</h3>
-                            <a href="#5355">Find out more about data collection</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">1 Deployment</h3>
-                            <a href="#5348">What’s a deployment?</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">25 admins and/or custom roles</h3>
-                            <a href="#5349">What’s an admin?</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Unlimited posts</h3>
-                            <a href="#5352">What’s a post?</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Deployments appear in Ushahidi iOS/Android App</h3>
-                            <a href="#5728">Learn more about our app</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Crowdsourced surveys</h3>
-                            <a href="#5350">What’s a crowdsourced survey?</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Access to targeted surveys and the ability to gather and upload contacts and send multi-question SMS surveys. Contact for pricing based on country location and survey sizes</h3>
-                            <a href="#5351">What’s a targeted survey?</a>
+                <div class="tier pricing-tabs tabs-target" id="enterprise-single">
+                    <span class="tier-label alt">Enterprise</span>
+                    <div class="tier-summary">
+                        <div class="tier-description">
+                            <h2 class="tier-name">Ushahidi Enterprise</h2>
+                            <p>Ushahidi platform capabilities, technical expertise, ongoing support, and customizations.</p>
                         </div>
+                    <div class="tier-highlight">
+                        <p>Enterprise plans starts at $5,000.</p>
                     </div>
-                </div>
-
-                <div class="tier">
                     <div class="tier-features">
                         <div class="tier-feature">
-                            <h3 class="tier-heading">$2000+/month for Software, Hosting, and Maintenance</h3>
-                            <p class="small">*subject to increase with customizations</p>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">All of Ushahidi Basic + Unlimited admins. SMS targeted surveys. Automated sorting capabilities.</h3>
-                            <a href="#5355">Find out more about data collection</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">5 Deployments</h3>
-                            <p class="small">*contact us for pricing for 10, 25, or custom deployment packages</p>
-                            <a href="#5348">What’s a deployment?</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Unlimited admins</h3>
-                            <a href="#5349">What’s an admin?</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Unlimited posts</h3>
-                            <a href="#5352">What’s a post?</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Deployments appear in Ushahidi iOS/Android App</h3>
-                            <a href="#5728">Learn more about our app</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Crowdsourced surveys</h3>
-                            <a href="#5350">What’s a crowdsourced survey?</a>
-                        </div>
-
-                        <div class="tier-feature">
-                            <h3 class="tier-heading">Access to targeted surveys and the ability to gather and upload contacts and send multi-question SMS surveys. Contact for pricing based on country location and survey sizes</h3>
-                            <a href="#5351">What’s a targeted survey?</a>
+                            <h3 class="tier-heading">Projects include all Basic features and much more, contact us to find out about the full a catalogue of technical services on offer.</h3>
                         </div>
                     </div>
                 </div>
+                <a href="https://ushahidi.com/enterprise-partnerships" class="button button-alpha">Contact us</a>
 
-                <div class="tier-label">Cataloug of Services</div>
-
-                <div class="tier-label blank">One-time Support Services</div>
-
-                <div class="tier">
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">One-time Support Services not available for demo</h3>
-                    </div>
                 </div>
-
-                <div class="tier">
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">One-time Support Services not available for basic</h3>
-                    </div>
-                </div>
-
-                <div class="tier">
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">One-time Support Services</h3>
-                        <a href="#5729">Find out more about one-time services</a>
-                    </div>
-
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">Collaborative Discovery Session</h3>
-                        <p class="small">*contact for pricing</p>
-                    </div>
-
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">
-                            Platform set-up
-                            <br>
-                            $15,000+
-                        </h3>
-                        <p class="small">*required for base Enterprise Partnership</p>
-                    </div>
-
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">Survey configuration - Contact for pricing</h3>
-                    </div>
-
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">
-                            Training of project administrators
-                            <br>
-                            $1500+
-                        </h3>
-                        <p class="small">*required for base Enterprise Partnership</p>
-                    </div>
-
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">Training of trainers, Training of monitors or field staff, Stakeholder Engagement Toolkit, White Labeling, Translation</h3>
-                        <p class="small">*contact for pricing</p>
-                    </div>
-                </div>
-
-                <div class="tier">
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">One-time Support Services</h3>
-                        <a href="#5729">Find out more about one-time services</a>
-                    </div>
-
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">Collaborative Discovery Session</h3>
-                        <p class="small">*contact for pricing</p>
-                    </div>
-
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">
-                            Platform set-up
-                            <br>
-                            $50,000+
-                        </h3>
-                        <p class="small">*required for base Enterprise Partnership</p>
-                    </div>
-
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">Survey configuration - Contact for pricing</h3>
-                    </div>
-
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">
-                            Training of project administrators
-                            <br>
-                            $7500+
-                        </h3>
-                        <p class="small">*required for base Enterprise Partnership</p>
-                    </div>
-
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">Training of trainers, Training of monitors or field staff, Stakeholder Engagement Toolkit, White Labeling, Translation</h3>
-                        <p class="small">*contact for pricing</p>
-                    </div>
-                </div>
-
-                <div class="tier-label blank">Ongoing support services</div>
-
-                <div class="tier">
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">Ongoing support services not available for demo</h3>
-                    </div>
-                </div>
-
-                <div class="tier">
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">Ongoing support services not available for demo</h3>
-                    </div>
-                </div>
-
-                <div class="tier">
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">Ongoing support services</h3>
-                        <a href="#5730">Find out more about ongoing services</a>
-                    </div>
-
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">
-                            Ongoing technical support account manager
-                            <br>
-                            $1500+/month
-                        </h3>
-                        <p class="small">*required for base Enterprise Partnership</p>
-                    </div>
-
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">Long-term embedded Ushahidi platform administrator(s)</h3>
-                        <p class="small">*contact for pricing</p>
-                    </div>
-
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">Long-term embedded Ushahidi platform community engagement officer(s)</h3>
-                        <p class="small">*contact for pricing</p>
-                    </div>
-                </div>
-
-                <div class="tier">
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">Ongoing support services</h3>
-                        <a href="#5730">Find out more about ongoing services</a>
-                    </div>
-
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">
-                            Ongoing technical support account manager
-                            <br>
-                            $3000+/month
-                        </h3>
-                        <p class="small">*required for base Enterprise Partnership</p>
-                    </div>
-
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">Long-term embedded Ushahidi platform administrator(s)</h3>
-                        <p class="small">*contact for pricing</p>
-                    </div>
-
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">Long-term embedded Ushahidi platform community engagement officer(s)</h3>
-                        <p class="small">*contact for pricing</p>
-                    </div>
-                </div>
-
-                <div class="tier-label blank">Custom feature development</div>
-
-                <div class="tier">
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">Custom feature development  not available for demo</h3>
-                    </div>
-                </div>
-
-                <div class="tier">
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">Custom feature development  not available for basic</h3>
-                    </div>
-                </div>
-
-                <div class="tier">
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">Custom feature development</h3>
-                        <p class="small">*contact for scoping and pricing</p>
-                        <a href="#5731">Find out more about custom feature development</a>
-                    </div>
-                </div>
-
-                <div class="tier">
-                    <div class="tier-feature">
-                        <h3 class="tier-heading">Custom feature development</h3>
-                        <p class="small">*contact for scoping and pricing</p>
-                        <a href="#5731">Find out more about custom feature development</a>
-                    </div>
-                </div>
-            </div>
         </div>
-
         <section>
             <div class="wrapper">
                 <div class="case-studies-group">
@@ -932,21 +115,21 @@ <h2 class="section-heading">Grassroots projects</h2>
                         <p><em>Apply for a free Basic plan</em></p>
                         <p>Small non profits and grassroots organizations that are aligned with Ushahidi's mission and can demonstrate a yearly operating budget of less than $250k USD per year are invited to apply for a free Basic plan.</p>
                         <p>You can still try out Ushahidi platform by signing up for the free Ushahidi Demo version.</p>
-                        <a href="pricing/apply-for-free" class="button" onclick="ga('send','event','links','select','social impact',1);">Continue</a>
+                        <a href="https://ushahidi.com/pricing/apply-for-free" class="button" onclick="ga('send','event','links','select','social impact',1);" target="_blank">Continue</a>
                     </div>
 
                     <div class="case-studies-item">
                         <h2 class="section-heading">Ushahidi code</h2>
                         <p><em>Self-host &amp; customize Ushahidi on your own</em></p>
                         <p>Ushahidi is an open source product, meaning that all the code that runs it is available for all admins to download and modify. If you'd like to download Ushahidi, customize it, and host it on your own servers, it is available on GitHub.</p>
-                        <a href="https://ushah.wufoo.com/forms/make-ushahidi-even-better/" class="button" onclick="ga('send','event','links','download', 'ushahidi',1);">Continue</a>
+                        <a href="https://github.com/ushahidi/platform" class="button" onclick="ga('send','event','links','download', 'ushahidi',1);" target="_blank">Continue</a>
                     </div>
 
                     <div class="case-studies-item">
                         <h2 class="section-heading">International Development, Humanitarian, University or Research Organization</h2>
                         <p><em>On Enterprise a catalogue of technical services is on offer</em></p>
                         <p>We can assist with the technical set-up, survey design, a variety of targeted trainings, metrics and analysis, programmatic management, ongoing technical support, and custom feature development. We want you to be able to focus on your project goals and impact and let us stress about the technology.</p>
-                        <a href="enterprise-partnerships" class="button">Continue</a>
+                        <a href="https://www.ushahidi.com/enterprise-partnerships" class="button" target="_blank">Continue</a>
                     </div>
 
                     <div class="case-studies-item">
@@ -954,12 +137,13 @@ <h2 class="section-heading">Foundation or Potential Funder</h2>
                         <p><em>We have loads of ideas for how to improve the Ushahidi platform - so let’s talk!</em></p>
                         <p>From incorporating machine learning, automation, and new data sources, to making the platform more secure in high-risk situations and reaching last-mile users - we’re constantly working to improve our core services and functionality.</p>
                         <p>We’re also always seeking core funding for sustainability from organizations who believe in our mission and impact.</p>
-                        <a href="impact-report" class="button">Continue</a>
+                        <a href="https://www.ushahidi.com/impact-report" class="button" target="_blank">Continue</a>
                     </div>
+                    <p class="small hide-on-mobile" style="visibility: hidden;">this is a line break hack</p>
+                    <p class="small hide-on-mobile" style="visibility: hidden;">this is a line break hack</p>
                 </div>
             </div>
         </section>
-
         <section class="section-faq">
             <h1 class="section-title">Frequently asked questions</h1>
             <div class="wrapper">
@@ -967,8 +151,8 @@ <h1 class="section-title">Frequently asked questions</h1>
                     <div id="5727" class="faq">
                         <h3>How is Ushahidi funded?</h3>
                         <p class="small lt-color"></p><p>Ushahidi is a nonprofit, open source, software as a service (SaaS) organization, but we operate as a social enterprise. We are both grant funded and revenue generating.
-                        </p><p>We build and sell a replicable, scalable, and sustainable software platform called Ushahidi. (And a new emergency management check-in product called TenFour) to both grassroots organizations and international development and humanitarian agencies, but also make the code base to the Ushahidi platform available open source.
-                        </p><p></p>
+                    </p><p>We build and sell a replicable, scalable, and sustainable software platform called Ushahidi. (And a new emergency management check-in product called TenFour) to both grassroots organizations and international development and humanitarian agencies, but also make the code base to the Ushahidi platform available open source.
+                    </p><p></p>
                     </div>
                     <div id="5348" class="faq">
                         <h3>What is a deployment?</h3>
@@ -1037,5 +221,6 @@ <h3>What is Custom feature development?</h3>
                 </div>
             </div>
         </section>
-    </main>
+    </div>
+</main>
 </div>

From 5589d30331a71c68f12f75fc437bcb5f6953ec8b Mon Sep 17 00:00:00 2001
From: Anna <anna@ushahidi.com>
Date: Wed, 18 Mar 2020 10:35:14 +0100
Subject: [PATCH 12/33] pl-version 4.4.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e7a6b12458..f09952d2e7 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
     "sortablejs": "1.10.0",
     "tui-editor": "^1.4.7",
     "underscore": "^1.7.0",
-    "ushahidi-platform-pattern-library": "^4.2.0"
+    "ushahidi-platform-pattern-library": "^4.4.1"
   },
   "engines": {
     "node": ">=10.0"

From 76dbd144d5b3c4e8ee7d60284ffd38e7ea0f544e Mon Sep 17 00:00:00 2001
From: Anna <anna@ushahidi.com>
Date: Wed, 18 Mar 2020 15:13:38 +0100
Subject: [PATCH 13/33] adding demo and basic to tier-names

---
 app/settings/settings-list.controller.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/settings/settings-list.controller.js b/app/settings/settings-list.controller.js
index 5c7a0f5480..f15edac6c1 100644
--- a/app/settings/settings-list.controller.js
+++ b/app/settings/settings-list.controller.js
@@ -27,7 +27,9 @@ function (
         'surveyor': 'Surveyor',
         'responder': 'Responder',
         'free-pre-jun-2016': 'Mapper (Legacy)',
-        'zerorated': 'Social Impact'
+        'zerorated': 'Social Impact',
+        'demo_1' : 'Ushahidi Demo',
+        'level_1': 'Ushahidi Basic'
     };
     $scope.dataExportTitle = 'settings.settings_list.export';
     $scope.dataExportDescription = 'settings.settings_list.export_desc';

From b154353ffe249f5462c3e9b3e1835a18a89e0ed0 Mon Sep 17 00:00:00 2001
From: Anna <anna@ushahidi.com>
Date: Wed, 18 Mar 2020 15:39:06 +0100
Subject: [PATCH 14/33] fixing tabs in plans-table

---
 app/settings/plans/plan.html           | 4 ++--
 app/settings/plans/plans.controller.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/settings/plans/plan.html b/app/settings/plans/plan.html
index d767f3804a..b1a3bd3974 100644
--- a/app/settings/plans/plan.html
+++ b/app/settings/plans/plan.html
@@ -30,7 +30,7 @@ <h3 class="new">We are revamping our pricing plans.</h3>
             <div class="tiers" role="article">
                 <nav class="tabs-menu init" data-tabs="pricing-tabs">
                     <ul>
-                        <li id="basic-li" >
+                        <li id="basic-li" class="active" >
                             <a href="#" ng-click="switchTab('basic')">
                                 Ushahidi Basic
                                 <span class="tabs-label">Self Service</span>
@@ -47,7 +47,7 @@ <h3 class="new">We are revamping our pricing plans.</h3>
                     </ul>
                 </nav>
 
-                <div class="tier pricing-tabs tabs-target" id="basic">
+                <div class="tier pricing-tabs tabs-target active" id="basic">
                     <span class="tier-label">Self Service</span>
                     <div class="tier-summary">
                         <div class="tier-description">
diff --git a/app/settings/plans/plans.controller.js b/app/settings/plans/plans.controller.js
index c5a9987266..8007977e14 100644
--- a/app/settings/plans/plans.controller.js
+++ b/app/settings/plans/plans.controller.js
@@ -38,7 +38,7 @@ function (
     $rootScope.setLayout('layout-c');
     window.scrollTo(0, 0);
     $scope.switchTab = switchTab;
-    $scope.activeTab = 'demo';
+    $scope.activeTab = 'basic';
     $translate('nav.plan_settings').then(function (title) {
         $scope.title = title;
         $rootScope.$emit('setPageTitle', title);

From 2d7119a9861265a298d19aa854ff1504fbbb2331 Mon Sep 17 00:00:00 2001
From: noone0212 <ssoni@ee.iitr.ac.in>
Date: Thu, 19 Mar 2020 07:31:28 +0530
Subject: [PATCH 15/33] Search field cleared

---
 app/common/directives/filter-system/filter-searchbar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/common/directives/filter-system/filter-searchbar.html b/app/common/directives/filter-system/filter-searchbar.html
index d97c0b55de..477564c75b 100644
--- a/app/common/directives/filter-system/filter-searchbar.html
+++ b/app/common/directives/filter-system/filter-searchbar.html
@@ -11,7 +11,7 @@
                 ng-model="model.q"
                 ng-focus="showSearchResults()"
                 ng-keyup="detectSubmit($event)"
-                ng-value="model.q"
+                ng-value="model.q=''"
             >
             <svg class="iconic" ng-show="!form.q.$viewValue.length">
               <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#magnifying-glass"></use>

From 23c4d97af2a6282e103f16f8faf3b82c482b83de Mon Sep 17 00:00:00 2001
From: Anna <anna@ushahidi.com>
Date: Thu, 19 Mar 2020 10:56:13 +0100
Subject: [PATCH 16/33] V4.4.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5482013794..b50e11b85b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ushahidi-platform-client",
-  "version": "3.10.0",
+  "version": "4.4.1",
   "description": "Ushahidi Platform Official Web Client",
   "main": "gulpfile.js",
   "repository": {

From d18c7aee8a81d5682f49f6426844f351596999d5 Mon Sep 17 00:00:00 2001
From: Romina Suarez <rowasc@gmail.com>
Date: Thu, 19 Mar 2020 10:14:15 -0300
Subject: [PATCH 17/33] HDX: fix links to documentation

---
 app/settings/data-export/data-export.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/settings/data-export/data-export.html b/app/settings/data-export/data-export.html
index 41f3a56d0f..5bfff1bc6d 100644
--- a/app/settings/data-export/data-export.html
+++ b/app/settings/data-export/data-export.html
@@ -35,13 +35,13 @@ <h2 class="form-sheet-title" translate>
                     <!-- TODO: Revisit and condense below structure of translations when migrating to react -->
                     <p ng-show="!showProgress && hxlEnabled">
                         {{'data_export.description_hxl' | translate}}
-                        <a href="http://hxlstandard.org/tagging/" class="link-blue" target="_blank">
+                        <a href="https://hxlstandard.org/standard/1-1final/tagging/" class="link-blue" target="_blank">
                             <svg class="iconic">
                                 <use xlink:href="/img/iconic-sprite.svg#external-link"></use>
                             </svg>
                             {{'data_export.hxl_tags' | translate}}
                         </a>,
-                        <a href="http://hxlstandard.org/dictionary/" class="link-blue" target="_blank">
+                        <a href="https://hxlstandard.org/standard/1-1final/dictionary/" class="link-blue" target="_blank">
                             <svg class="iconic">
                                 <use xlink:href="/img/iconic-sprite.svg#external-link"></use>
                             </svg>

From ea80e84b40496def8bdbf5718697127da04b5063 Mon Sep 17 00:00:00 2001
From: noone0212 <ssoni@ee.iitr.ac.in>
Date: Sun, 22 Mar 2020 04:33:52 +0530
Subject: [PATCH 18/33] updated selected user count

---
 app/settings/users/users.controller.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/settings/users/users.controller.js b/app/settings/users/users.controller.js
index daeb906a95..a74cf9d7f7 100644
--- a/app/settings/users/users.controller.js
+++ b/app/settings/users/users.controller.js
@@ -93,6 +93,7 @@ function (
             $q.all(calls).then(function () {
                 Notify.notify('notify.user.bulk_destroy_success');
                 $scope.getUsersForPagination();
+                $scope.selectedUsers.length = 0;
             }, handleResponseErrors)
             .finally($scope.filterRole);
         }, function () {});

From 2a2423dbe09c9ced2ebafeb73080ce15858449ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Sun, 22 Mar 2020 13:40:11 +0100
Subject: [PATCH 19/33] Fix "Share with Twitter" button

Currently the link to share with twitter does not work because the url is wrong. I have solved the problem by changing the url, following the Twitter documentation at https://developer.twitter.com/en/docs/twitter-for-websites/tweet-button/overview
---
 app/main/posts/views/share/share-menu.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/main/posts/views/share/share-menu.html b/app/main/posts/views/share/share-menu.html
index de1dbf0492..32a4932fea 100644
--- a/app/main/posts/views/share/share-menu.html
+++ b/app/main/posts/views/share/share-menu.html
@@ -31,7 +31,7 @@ <h2 class="listing-item-title">
                 <div class="listing-item-image">
                     <img class="icon" src="/img/twitter.png" alt="">
                 </div>
-                <h2 class="listing-item-title"><a target="_blank" ng-href="https://twitter.com/home?status={{shareUrlEncoded}}">Twitter</a></h2>
+                <h2 class="listing-item-title"><a target="_blank" ng-href="https://twitter.com/intent/tweet?url={{shareUrlEncoded}}">Twitter</a></h2>
             </div>
         </div>
 

From c2bb127a68e87766212ec62edb10321d788a095f Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2020 11:46:55 +0000
Subject: [PATCH 20/33] chore(package): update html-webpack-plugin to version
 4.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b50e11b85b..2d9afc0b42 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "gulp-rename": "^1.4.0",
     "gulp-tar": "^3.1.0",
     "html-loader": "^0.5.5",
-    "html-webpack-plugin": "^3.2.0",
+    "html-webpack-plugin": "^4.0.0",
     "imports-loader": "^0.8.0",
     "is-url": "^1.2.4",
     "jasmine-core": "^3.5.0",

From 7a5671f83c7c1b34157868a499c108766754715c Mon Sep 17 00:00:00 2001
From: Himil Vasava <55590415+himil-vasava@users.noreply.github.com>
Date: Mon, 23 Mar 2020 17:58:25 +0530
Subject: [PATCH 21/33] Select all option for surveys

---
 app/main/posts/views/filters/filter-form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/main/posts/views/filters/filter-form.html b/app/main/posts/views/filters/filter-form.html
index 8ce707aac6..2a25257bc7 100644
--- a/app/main/posts/views/filters/filter-form.html
+++ b/app/main/posts/views/filters/filter-form.html
@@ -1,7 +1,7 @@
 <fieldset overflow-toggle has-overflow="forms.length > 1" ng-model-options="{ updateOn: 'default' }">
     <label translate="app.surveys">Survey</label>
    
-    <div class="form-field checkbox">
+    <div class="form-field checkbox" ng-show="forms.length > 5">
         <label>
             <input  type="checkbox" name="selectedForms" ng-model="all"><em><span translate="category.select_all"></span></em>
         </label>

From 9bd2fe48a3bac211f226c43f3322d52cfd8440de Mon Sep 17 00:00:00 2001
From: Artur Neumann <artur@jankaritech.com>
Date: Tue, 24 Mar 2020 11:05:12 +0545
Subject: [PATCH 22/33] fix: loading correct amount of posts after deleting

---
 app/main/posts/views/post-view-data.directive.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/main/posts/views/post-view-data.directive.js b/app/main/posts/views/post-view-data.directive.js
index 91f1ec0558..4adce776cc 100644
--- a/app/main/posts/views/post-view-data.directive.js
+++ b/app/main/posts/views/post-view-data.directive.js
@@ -326,7 +326,7 @@ function PostViewDataController(
             limit: $scope.itemsPerPage
         });
         if (useOffset === true) {
-            postQuery.offset = ($scope.currentPage - 1) * $scope.itemsPerPage;
+            postQuery.offset = $scope.posts.length;
         }
         PostEndpoint.query(postQuery).$promise.then(function (postsResponse) {
             //Clear posts

From 0075bf123a73042434ef28530fa6ad4fa9af343a Mon Sep 17 00:00:00 2001
From: Artur Neumann <artur@jankaritech.com>
Date: Fri, 27 Mar 2020 12:11:46 +0545
Subject: [PATCH 23/33] fix: typo

---
 .../user-profile/directives/user-profile-directive-spec.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/common/user-profile/directives/user-profile-directive-spec.js b/test/unit/common/user-profile/directives/user-profile-directive-spec.js
index 31797073b5..9fe48e7d7c 100644
--- a/test/unit/common/user-profile/directives/user-profile-directive-spec.js
+++ b/test/unit/common/user-profile/directives/user-profile-directive-spec.js
@@ -44,7 +44,7 @@ describe('user profile directive', function () {
     });
 
     describe('saveUser', function () {
-        describe('with a successfull backend call', function () {
+        describe('with a successful backend call', function () {
             beforeEach(function () {
                 spyOn(UserEndpoint, 'update').and.callThrough();
             });

From b6820484c295339d3cf6a941fc00f8456b825e5a Mon Sep 17 00:00:00 2001
From: Artur Neumann <artur@jankaritech.com>
Date: Fri, 27 Mar 2020 13:40:29 +0545
Subject: [PATCH 24/33] fix: csv column titles not shown in FF

---
 app/settings/data-import/data-import.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/settings/data-import/data-import.html b/app/settings/data-import/data-import.html
index 9e99cc2f40..27fd6c61c5 100644
--- a/app/settings/data-import/data-import.html
+++ b/app/settings/data-import/data-import.html
@@ -150,7 +150,9 @@ <h2 class="stepper-heading">
                                 <div class="form-field select" data-fieldgroup-target="status-model-columns" ng-show="isStatusOption('defined_column')">
                                     <div class="custom-select">
                                       <select ng-model="selectedStatus">
-                                         <option ng-repeat="column in csv.columns track by $index" value="{{$index}}" label="{{column}}" >
+                                          <option ng-repeat="column in csv.columns track by $index" value="{{$index}}">
+                                              {{column}}
+                                          </option>
                                       </select>
                                     </div>
                                     <p><em translate="data_import.status_explanation">Ushahidi recognizes one of three post statuses: Published, Under review, and Archived. So be sure that each entry in the column you select has one of those three values.</em></p>
@@ -183,7 +185,9 @@ <h2 class="stepper-heading">
                                                 <option selected="selected" value="" translate="data_import.leave_empty">
                                                     Leave empty
                                                 </option>
-                                                 <option ng-repeat="column in csv.columns track by $index" value="{{$index}}" label="{{column}}" >
+                                                <option ng-repeat="column in csv.columns track by $index" value="{{$index}}">
+                                                      {{column}}
+                                                </option>
                                               </select>
                                           </div>
                                       </td>

From ae973426ffe6a087ea73f7887fe5b0210054ede8 Mon Sep 17 00:00:00 2001
From: noone0212 <ssoni@ee.iitr.ac.in>
Date: Tue, 31 Mar 2020 13:39:00 +0530
Subject: [PATCH 25/33] cleaning secondary toolbar

---
 app/main/posts/views/add-post-button.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/main/posts/views/add-post-button.html b/app/main/posts/views/add-post-button.html
index 9dd628a496..f5c429e6b3 100644
--- a/app/main/posts/views/add-post-button.html
+++ b/app/main/posts/views/add-post-button.html
@@ -1,5 +1,5 @@
 <div class="fab" ng-class="{'upgrade-button': upgradeButton}" data-message="add-post">
-    <button type="button" class="button-alpha button-fab" ng-click="handleClick()" ng-disabled="disabled" ng-class="{'disabled': $parent.$parent.bulkActionsSelected}">
+    <button type="button" class="button-alpha button-fab" ng-click="handleClick()" ng-disabled="disabled" ng-class="{'disabled': $parent.$parent.bulkActionsSelected || editMode()}">
         <svg class="iconic">
             <use xlink:href="/img/iconic-sprite.svg#plus"></use>
             <foreignObject>

From dcbe4516df0221b0d63e3f10c607899b14cd7519 Mon Sep 17 00:00:00 2001
From: noone0212 <ssoni@ee.iitr.ac.in>
Date: Tue, 31 Mar 2020 18:50:55 +0530
Subject: [PATCH 26/33] hide add-post-button

---
 app/main/posts/views/add-post-button.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/main/posts/views/add-post-button.html b/app/main/posts/views/add-post-button.html
index f5c429e6b3..253f17335d 100644
--- a/app/main/posts/views/add-post-button.html
+++ b/app/main/posts/views/add-post-button.html
@@ -1,5 +1,5 @@
 <div class="fab" ng-class="{'upgrade-button': upgradeButton}" data-message="add-post">
-    <button type="button" class="button-alpha button-fab" ng-click="handleClick()" ng-disabled="disabled" ng-class="{'disabled': $parent.$parent.bulkActionsSelected || editMode()}">
+    <button type="button" class="button-alpha button-fab" ng-click="handleClick()" ng-disabled="disabled" ng-class="{'ng-hide': $parent.$parent.bulkActionsSelected || editMode()}">
         <svg class="iconic">
             <use xlink:href="/img/iconic-sprite.svg#plus"></use>
             <foreignObject>

From 413fd4621e363df0395d44e877d0cb4c301580e1 Mon Sep 17 00:00:00 2001
From: Anna <anna@ushahidi.com>
Date: Thu, 2 Apr 2020 15:55:39 +0200
Subject: [PATCH 27/33] disabling esModules for url-loader

---
 webpack.config.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/webpack.config.js b/webpack.config.js
index 035edcc03f..88da5e6b0f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -58,7 +58,10 @@ module.exports = {
       {
         test: /\.png/,
         use: {
-          loader: 'url-loader?limit=10000'
+          loader: 'url-loader?limit=10000',
+          options: {
+            esModule:false
+          }
         }
       },
       {

From ba7b49fbaac987f7aac77b1b24ed33ea6a43be54 Mon Sep 17 00:00:00 2001
From: Anna <anna@ushahidi.com>
Date: Thu, 2 Apr 2020 15:56:49 +0200
Subject: [PATCH 28/33] removing images for Youtube and Vimeo

---
 app/common/locales/en.json       | 5 +----
 app/main/posts/modify/video.html | 8 +-------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/common/locales/en.json b/app/common/locales/en.json
index c0012a864e..308be80158 100644
--- a/app/common/locales/en.json
+++ b/app/common/locales/en.json
@@ -844,10 +844,7 @@
             "error_in_upload": "Your image is too large (maximum size is 1MB) or has the wrong format (allowed formats are gif, png, jpg and jpeg), please check and try again!"
         },
         "video" : {
-            "enter_a" : "Enter a",
-            "or" : " or ",
-            "vimeo" : " Vimeo",
-            "video_url" : " video URL"
+            "enter_a_url": "Enter a video URL from Youtube or Vimeo."
         },
         "unstructured" : {
             "add_survey" : {
diff --git a/app/main/posts/modify/video.html b/app/main/posts/modify/video.html
index de2d1e3b58..5320c0f50e 100644
--- a/app/main/posts/modify/video.html
+++ b/app/main/posts/modify/video.html
@@ -2,13 +2,7 @@
 <form>
   <div class="form-field video_embed">
     <label>{{label}}</label>
-    <p>
-      <span translate="post.video.enter_a">Enter a</span>
-
-      <img src="/img/youtube.png" class="wordmark-replace">
-      <span translate="post.video.or"> or </span>
-      <img src="/img/vimeo.png" class="wordmark-replace">
-      <span translate="post.video.video_url"> video URL</span>
+    <p translate="post.video.enter_a_url">Enter a video URL from Youtube or Vimeo.
     </p>
     <input type="text" ng-model="videoUrl" ng-blur="constructIframe(videoUrl)" placeholder="https://youtu.be/123456">
 

From 26d978f248dc84f425a44da6deaf7d3f7ec0770f Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com>
Date: Thu, 2 Apr 2020 22:53:09 +0000
Subject: [PATCH 29/33] fix(package): update leaflet.locatecontrol to version
 0.71.1

Closes #1471
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c37cf2834f..f8f06feb02 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,7 @@
     "angular-ui-bootstrap": "^2.5.0",
     "checklist-model": "~0.11.0",
     "d3": "^3.5.17",
-    "leaflet.locatecontrol": "^0.70.0",
+    "leaflet.locatecontrol": "^0.71.1",
     "leaflet": "^1.6.0",
     "leaflet-easybutton": "^2.4.0",
     "leaflet.markercluster": "1.0.5",

From bd348731eca7371ee5bdbfad9d400ddade0043f0 Mon Sep 17 00:00:00 2001
From: Romina <rowasc@gmail.com>
Date: Fri, 3 Apr 2020 14:00:07 -0300
Subject: [PATCH 30/33] Add cross-fetch (ponyfill) rather than node-fetch so
 that we support browsers correctly

---
 app/common/verifier/verifier.js | 2 +-
 package.json                    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/common/verifier/verifier.js b/app/common/verifier/verifier.js
index 9b47dd9863..2bce1eb6ed 100644
--- a/app/common/verifier/verifier.js
+++ b/app/common/verifier/verifier.js
@@ -1,5 +1,5 @@
 import isUrl from 'is-url';
-import fetch from 'node-fetch';
+import fetch from 'cross-fetch';
 import * as forms from '../../../mocked_backend/api/v3/forms.json';
 import * as tags from '../../../mocked_backend/api/v3/tags.json';
 import * as features from '../../../mocked_backend/api/v3/config/features.json';
diff --git a/package.json b/package.json
index c37cf2834f..5a3be25d1b 100644
--- a/package.json
+++ b/package.json
@@ -111,10 +111,11 @@
     "angular-translate-loader-static-files": "^2.11.0",
     "angular-ui-bootstrap": "^2.5.0",
     "checklist-model": "~0.11.0",
+    "cross-fetch": "^3.0.4",
     "d3": "^3.5.17",
-    "leaflet.locatecontrol": "^0.70.0",
     "leaflet": "^1.6.0",
     "leaflet-easybutton": "^2.4.0",
+    "leaflet.locatecontrol": "^0.70.0",
     "leaflet.markercluster": "1.0.5",
     "libphonenumber-js": "^1.0.24",
     "moment": "2.19.3",

From d0b073023b004726eb5925a9a4c77747c68d1987 Mon Sep 17 00:00:00 2001
From: Romina Suarez <rowasc@gmail.com>
Date: Fri, 3 Apr 2020 16:11:48 -0300
Subject: [PATCH 31/33] Add link to report issues

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 594926102f..d5e3f4aeae 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,9 @@ Ushahidi Platform Web Client
 [![Dependency Status](https://david-dm.org/ushahidi/platform-client/dev-status.svg?style=flat)](https://david-dm.org/ushahidi/platform-client#info=devDependencies)
 
 ___
+## Report and find Ushahidi Platform V3 issues
+
+All our issues live in https://github.com/ushahidi/platform/issues . 
 
 ## Try it out on Heroku
 

From cc9c7c81b9671d65ae43ea95ec064664267964bb Mon Sep 17 00:00:00 2001
From: Anna <anna@ushahidi.com>
Date: Mon, 6 Apr 2020 16:45:38 +0200
Subject: [PATCH 32/33] disabling esModules for svg-url-loader

---
 webpack.config.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/webpack.config.js b/webpack.config.js
index 88da5e6b0f..bbcf30a336 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -67,7 +67,10 @@ module.exports = {
       {
         test: /\.svg/,
         use: {
-          loader: 'svg-url-loader?limit=1'
+          loader: 'svg-url-loader?limit=1',
+          options: {
+            esModule: false
+          }
         }
       },
       {

From 0bbf932f3838d0f873dce2bca7022e37ffcc15c4 Mon Sep 17 00:00:00 2001
From: Romina Suarez <rowasc@gmail.com>
Date: Fri, 10 Apr 2020 00:54:52 -0300
Subject: [PATCH 33/33] Revert "Removed share button from post creation page"

---
 app/main/posts/modify/post-editor.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/main/posts/modify/post-editor.html b/app/main/posts/modify/post-editor.html
index 49fbe656a9..e34ac8e77a 100644
--- a/app/main/posts/modify/post-editor.html
+++ b/app/main/posts/modify/post-editor.html
@@ -35,6 +35,7 @@ <h1 class="mode-context-title"><bdi>{{post.form.name}}</bdi></h1>
               </button>
           </div>
           <div class="button-group" ng-show="!post.id">
+              <post-share button="true" ng-show="!post.id"></post-share>
               <button type="submit" class="button-alpha"  ng-if="!saving_post">{{submit}}</button>
               <button type="submit" class="button-alpha"  disabled ng-if="saving_post">{{submitting}}
                 <div class="loading">