Merge branch 'develop' into greenkeeper/url-loader-4.0.0

ushahidi · Mar 30, 2020 · 35a6a85 · 35a6a85
2 parents 92bfc15 + 10297da
commit 35a6a85
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 876 deletions.
diff --git 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">

diff --git a/app/main/posts/views/filters/filter-form.html b/app/main/posts/views/filters/filter-form.html
@@ -1,14 +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-show="forms.length > 5">
+        <label>
+            <input  type="checkbox" name="selectedForms" ng-model="all"><em><span translate="category.select_all"></span></em>
+        </label>
+    </div>
     <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>
 </fieldset>
diff --git 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>
diff --git 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>
 

diff --git 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>

diff --git a/app/settings/plans/plan.html b/app/settings/plans/plan.html
diff --git a/app/settings/plans/plans.controller.js b/app/settings/plans/plans.controller.js
@@ -36,8 +36,9 @@ 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);

diff --git 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';

diff --git 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>
 

diff --git 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": {
@@ -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",
@@ -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": "^4.0.0",
@@ -128,7 +128,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"

diff --git 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'
         }
       },
       {