Merge branch 'develop' into remove_toggle_button

ushahidi · Apr 10, 2020 · ed1b222 · ed1b222
2 parents 8504425 + 58a7f35
commit ed1b222
Show file tree

Hide file tree

Showing 21 changed files with 96 additions and 897 deletions.
diff --git 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
 

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

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

diff --git a/app/main/posts/modify/video.html b/app/main/posts/modify/video.html
@@ -2,15 +2,9 @@
 <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-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/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="{'ng-hide': $parent.$parent.bulkActionsSelected || editMode()}">
         <svg class="iconic">
             <use xlink:href="/img/iconic-sprite.svg#plus"></use>
             <foreignObject>

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/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

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/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>