Merge branch 'master' into production-aws

ushahidi · Apr 2, 2020 · bb5b930 · bb5b930
2 parents a2a90f6 + 1b26445
commit bb5b930
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 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/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
@@ -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",
@@ -88,7 +88,7 @@
     "svg-url-loader": "^3.0.3",
     "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"