Merge pull request #392 from ushahidi/develop

Release v3.6.1
ushahidi · Oct 28, 2016 · 533401f · 533401f
2 parents 0e78270 + f9b3186
commit 533401f
Show file tree

Hide file tree

Showing 82 changed files with 978 additions and 294 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,6 +14,8 @@ notifications:
 #  sauce_connect: true
 language: node_js
 matrix:
+  allow_failures:
+  - node_js: stable
   include:
   # Run everything with v5 (match production)
   # Skip e2e test during mustang build
@@ -23,8 +25,7 @@ matrix:
     env: TEST_SUITE=lint
   - node_js: 5
     env: TEST_SUITE=unit
-  # Run unit test with 0.12 and current stable too
-  - node_js: 0.12
+  - node_js: 6
     env: TEST_SUITE=unit
   - node_js: stable
     env: TEST_SUITE=unit

diff --git a/app/common/common-module.js b/app/common/common-module.js
@@ -74,6 +74,8 @@ angular.module('ushahidi.common', [
 .directive('ushModalContainer', require('./directives/modal-container.directive.js'))
 .directive('modalBody', require('./directives/modal-body.directive.js'))
 .directive('layoutClass', require('./directives/layout-class.directive.js'))
+.directive('embedOnly', require('./directives/embed-only.directive.js'))
+.directive('ushLogo', require('./directives/ush-logo.directive.js'))
 
 .directive('filterSearchbar', require('./directives/filter-system/filter-searchbar.js'))
 .directive('filterRole', require('./directives/filter-system/filter-role.js'))

diff --git a/app/common/controllers/intercom.js b/app/common/controllers/intercom.js
@@ -14,9 +14,10 @@ function (
     $window
 ) {
     var pattern = /^(?:https?:\/\/)?(?:[^@\/\n]+@)?(?:www\.)?([^:\/\n]+)/g;
-
     $rootScope.$on('event:authentication:login:succeeded', function () {
-        $scope.startIntercom();
+        if ($window.self === $window.top) {
+            $scope.startIntercom();
+        }
     });
 
     $scope.startIntercom = function () {

diff --git a/app/common/controllers/navigation.js b/app/common/controllers/navigation.js
@@ -15,6 +15,7 @@ function NavigationController(Authentication, ConfigEndpoint, BootstrapConfig, $
     $rootScope.$on('event:update:header', reloadSiteConfig);
 
     function activate() {
+
         Features.loadFeatures().then(function () {
             vm.activityIsAvailable = Features.isViewEnabled('activity');
             vm.planIsAvailable = Features.isViewEnabled('plan');

diff --git a/app/common/directives/embed-only.directive.js b/app/common/directives/embed-only.directive.js
@@ -0,0 +1,20 @@
+module.exports = EmbedOnlyDirective;
+
+EmbedOnlyDirective.$inject = [];
+function EmbedOnlyDirective() {
+    return {
+        restrict: 'A',
+        controller: EmbedOnlyController
+    };
+}
+
+EmbedOnlyController.$inject = ['$scope', '$element', '$attrs', '$rootScope', '_', '$window'];
+function EmbedOnlyController($scope, $element, $attrs, $rootScope, _, $window) {
+    var globalEmbed = ($window.self !== $window.top) ? true : false;
+
+    if (globalEmbed && ($attrs.embedOnly === 'false')) {
+        $element.addClass('hidden');
+    } else if (!globalEmbed && ($attrs.embedOnly === 'true')) {
+        $element.addClass('hidden');
+    }
+}
diff --git a/app/common/directives/file-upload.directive.js b/app/common/directives/file-upload.directive.js
@@ -4,18 +4,27 @@ function FileUpload() {
     return {
         restrict: 'E',
         templateUrl: 'templates/common/directives/file-upload.html',
+        replace: true,
         scope: {
-            fileContainer: '='
+            container: '='
         },
-
         controller: [
             '$scope', '$attrs',
             function (
                 $scope, $attrs
             ) {
                 $scope.required = typeof $attrs.required !== 'undefined';
                 $scope.uploadFile = function ($event) {
-                    $scope.fileContainer.file = $event.target.files[0];
+                    $scope.container.file = $event.target.files[0];
+                    var reader = new FileReader();
+                    reader.onload = function () {
+                        var dataURL = reader.result;
+                        $scope.container.dataURI = dataURL;
+                        $scope.container.changed = true;
+                        $scope.$apply();
+                    };
+                    reader.readAsDataURL($event.target.files[0]);
+
                 };
             }]
     };

diff --git a/app/common/directives/file-upload.html b/app/common/directives/file-upload.html
@@ -1,2 +1 @@
-<input id="appearance-header-image" name="file" type="file" custom-on-change='uploadFile' ng-required="{{ required }}" />
-
+<input name="file" type="file" custom-on-change='uploadFile' ng-required="{{ required }}" />
diff --git a/app/common/directives/first-time-config.html b/app/common/directives/first-time-config.html
@@ -33,7 +33,7 @@ <h1 translate>settings.customize_your_new_deployment</h1>
 
         <label class="input-label" for="appearance-header-image" translate>settings.appearance_header_image</label>
         <p class="small" translate>settings.appearance_header_image_instructions</p>
-       <file-upload file-container="fileContainer">
+       <file-upload container="fileContainer">
         </file-upload>
 
         <div class="divider white"></div>

diff --git a/app/common/directives/layout-class.directive.js b/app/common/directives/layout-class.directive.js
@@ -11,7 +11,19 @@ function LayoutClassDirective() {
     };
 }
 
-LayoutClassController.$inject = ['$scope', '$rootScope'];
-function LayoutClassController($scope, $rootScope) {
-    $rootScope.setLayout('layout-' + $scope.layout);
+LayoutClassController.$inject = ['$scope', '$rootScope', '$window', 'Util'];
+function LayoutClassController($scope, $rootScope, $window, Util) {
+    var isEmbed = ($window.self !== $window.top) ? true : false;
+    // In the case of map we omit the layout-a class
+    var isMap = (Util.currentUrl()) ? Util.currentUrl().indexOf('map') > 0 : false;
+
+    if (!isEmbed) {
+        $rootScope.setLayout('layout-' + $scope.layout);
+    } else if (isEmbed && isMap) {
+        $rootScope.setLayout('layout-embed');
+    } else {
+        // If we are in embed mode
+        // we must append the layout to the embed layout
+        $rootScope.setLayout('layout-embed layout-' + $scope.layout);
+    }
 }
diff --git a/app/common/directives/ush-logo.directive.js b/app/common/directives/ush-logo.directive.js
@@ -0,0 +1,15 @@
+module.exports = UshLogoDirective;
+
+UshLogoDirective.$inject = [];
+function UshLogoDirective() {
+    return {
+        restrict: 'E',
+        controller: UshLogoController,
+        replace: true,
+        templateUrl: 'templates/common/directives/ush-logo.html'
+    };
+}
+
+UshLogoController.$inject = [];
+function UshLogoController() {
+}
diff --git a/app/common/directives/ush-logo.html b/app/common/directives/ush-logo.html
@@ -0,0 +1,4 @@
+<a embed-only=true href="https://www.ushahidi.com" class="ushahidi-bug" target="_blank">
+  <ng-include include-replace src="'templates/common/directives/mode-bar/ushahidi-logo.html'"></ng-include>
+  <span class="hidden">Powered by Ushahidi</span>
+</a>
diff --git a/app/common/global/event-handlers.js b/app/common/global/event-handlers.js
@@ -10,7 +10,6 @@ function (
     $rootScope.setLayout = function (layout) {
         $rootScope.globalLayout = layout;
     };
-
     // Setup PL modal visible and switching function
     $rootScope.modalVisible = false;
     $rootScope.toggleModalVisible = function (state) {

diff --git a/app/common/locales/en.json b/app/common/locales/en.json
@@ -3,9 +3,12 @@
         "powered_by_ushahidi" : "Powered by Ushahidi.",
         "support" : "Ushahidi Support",
         "by" : "by",
+        "submit" : "Submit",
+        "submit_another" : "Submit & Add Another",
         "can_see_this" : "can see this",
         "collections" : "Collections",
         "create_collection" : "Create collection",
+        "export_to_csv" : "Export to CSV",
         "create_new" : "Create new",
         "created_by" : "Created by {{author}}",
         "documentation": {
@@ -59,6 +62,7 @@
         "apply_filters" : "Apply filters",
         "show_more_less" : "Show more/less",
         "filters" : "Filters",
+        "filter_by_survey" : "Filter by survey",
         "configure" : "Configure",
         "post" : "Post",
         "name" : "Name",
@@ -248,6 +252,8 @@
             "q": "Keyword",
             "created_after": "Start date",
             "created_before": "End date",
+            "date_after": "Start date",
+            "date_before": "End date",
             "center_point": "Location",
             "tags": "Category",
             "form": "Survey",
@@ -692,6 +698,9 @@
         "continue" : "Continue",
         "current_header" : "Current background image",
         "customize_your_new_deployment" : "Customize your new deployment",
+        "embed" : "Embed",
+        "embed_info" : "To embed your map on another site use the code snippet below.",
+        "embed_code" : "&lt;iframe width=\"500\" height=\"400\" src=\"{{url}}\"&gt;&lt;/iframe&gt;",
         "settings_list": {
             "general" : "General",
             "general_desc" : "Change your deployment's name, description, logo, and other details.",
@@ -923,6 +932,7 @@
             "success" : "Registration complete! You can now log in.."
         },
         "post" : {
+            "delete_image_confirm" : "Are you sure you want to remove this image?",
             "save_success" : "Post {{name}} saved",
             "save_success_review" : "Post {{name}} saved. Your post will be reviewed by a moderator before publishing.",
             "save_error" : "Unable to save post, please try again",
@@ -974,6 +984,7 @@
             "bulk_role_change_success" : "User roles changed to {{role_name}}"
         },
         "form" : {
+            "add_to_survey" : "Add to survey",
             "save_success" : "Survey {{name}} saved",
             "save_stage_success" : "Survey task {{name}} saved",
             "save_attribute_success" : "Field {{name}} added",

diff --git a/app/common/services/endpoints/MediaEndpoint.js b/app/common/services/endpoints/MediaEndpoint.js
@@ -19,7 +19,7 @@ function (
             }
         },
         update: {
-            method: 'POST'
+            method: 'PUT'
         }
     });
 

diff --git a/app/common/services/endpoints/post-endpoint.js b/app/common/services/endpoints/post-endpoint.js
@@ -15,7 +15,7 @@ function (
     var PostEndpoint = $resource(Util.apiUrl('/posts/:id/:extra'), {
         id: '@id',
         order: 'desc',
-        orderby: 'created'
+        orderby: 'post_date'
     }, {
         query: {
             method: 'GET',

diff --git a/app/common/services/maps.js b/app/common/services/maps.js
@@ -11,6 +11,7 @@ module.exports = [
     'MediaEndpoint',
     '$compile',
     '$rootScope',
+    '$window',
     'CONST',
 function (
     $q,
@@ -25,6 +26,7 @@ function (
     MediaEndpoint,
     $compile,
     $rootScope,
+    $window,
     CONST
 ) {
     var layers = {
@@ -115,6 +117,9 @@ function (
     var Maps = {
         maps: {},
         config: undefined,
+        getZoomControlPosition: function () {
+            return $window.self !== $window.top ? 'bottomleft' : 'bottomright';
+        },
         getMap: function (name) {
             if (!this.maps[name]) {
                 this.maps[name] = Object.create(Map).init(name);
@@ -129,7 +134,7 @@ function (
         getInitialScope: function () {
             return {
                 defaults: {
-                    zoomControlPosition: 'bottomright',
+                    zoomControlPosition: this.getZoomControlPosition(),
                     scrollWheelZoom: false
                 },
                 center: { // Default to centered on Nairobi

diff --git a/app/common/services/util.js b/app/common/services/util.js
@@ -1,18 +1,28 @@
 module.exports = [
     '_',
     'CONST',
+    '$window',
 function (
     _,
-    CONST
+    CONST,
+    $window
 ) {
 
     var Util = {
+        currentUrl: function () {
+            return $window.location.href;
+        },
         url: function (relative_url) {
             return CONST.BACKEND_URL + relative_url;
         },
         apiUrl: function (relative_url) {
             return CONST.API_URL + relative_url;
         },
+        deploymentUrl: function (relative_url) {
+            var pattern = /^(?:https?:\/\/)?(?:[^@\/\n]+@)?(?:www\.)?([^:\/\n]+)/g;
+            var deploymentUrl = pattern.exec(this.apiUrl(relative_url));
+            return deploymentUrl[0].replace('api.', '');
+        },
         transformResponse: function (response, omitKeys) {
             omitKeys = (omitKeys || []).concat(['allowed_methods']);
             return _.omit(angular.fromJson(response), omitKeys);

diff --git a/app/main/posts/collections/collections-controller.js b/app/main/posts/collections/collections-controller.js
@@ -39,8 +39,10 @@ module.exports = [
 
         // Extend filters, always adding the current collection id
         var extendFilters = function (filters) {
-            filters = angular.copy(filters, { set : [] });
+            //filters = angular.copy(filters, { set : []});
+            filters.set = [];
             filters.set.push(collection.id);
+
             return filters;
         };
 
@@ -53,7 +55,11 @@ module.exports = [
         }, true);
 
         // Reset GlobalFilter + add set filter
+        // Ensure that ALL posts are visible under collections
+        // Set default collection status filters
         PostFilters.clearFilters();
+        PostFilters.setFilters({ status: ['archived', 'draft', 'published'] });
         $scope.filters = extendFilters(PostFilters.getFilters());
+
     }
 ];
diff --git a/app/main/posts/collections/mode-context.html b/app/main/posts/collections/mode-context.html
@@ -118,6 +118,8 @@ <h1 class="mode-context-title">
             </a>
         </div>
 
+        <mode-context-form-filter></mode-context-form-filter>
+
         <post-active-filters></post-active-filters>
 
     </div>

diff --git a/app/main/posts/common/post-actions.directive.js b/app/main/posts/common/post-actions.directive.js
@@ -49,4 +49,3 @@ function PostActionsDirective(
         }
     }
 }
-
diff --git a/app/main/posts/common/post-actions.html b/app/main/posts/common/post-actions.html
@@ -24,15 +24,10 @@
             <!-- Collection toggle link -->
             <collection-toggle-link post="post"></collection-toggle-link>
         </li>
-        <!-- <li>
-            <a href="" data-modal="share">
-              <svg class="iconic">
-                <use xlink:href="../../img/iconic-sprite.svg#share"></use>
-              </svg>
-              <span class="label">Share</span>
-            </a>
-          </li>
-      <li>
+        <li>
+            <post-share post-id="post.id"></post-share>
+        </li>
+      <!-- <li>
         <a href="">
           <svg class="iconic">
             <use xlink:href="../../img/iconic-sprite.svg#task"></use>

diff --git a/app/main/posts/common/post-metadata.directive.js b/app/main/posts/common/post-metadata.directive.js
@@ -39,17 +39,17 @@ function PostMetadataDirective(
             }
 
             function formatDates() {
-                var created = moment($scope.post.created),
+                var postDate = moment($scope.post.post_date),
                     now = moment();
 
-                if (now.isSame(created, 'day')) {
-                    $scope.displayTime = created.fromNow();
-                } else if (now.isSame(created, 'week') && $scope.hideDateThisWeek) {
-                    $scope.displayTime = created.format('LT');
+                if (now.isSame(postDate, 'day')) {
+                    $scope.displayTime = postDate.fromNow();
+                } else if (now.isSame(postDate, 'week') && $scope.hideDateThisWeek) {
+                    $scope.displayTime = postDate.format('LT');
                 } else {
-                    $scope.displayTime = created.format('LL');
+                    $scope.displayTime = postDate.format('LL');
                 }
-                $scope.displayTimeFull = created.format('LLL');
+                $scope.displayTimeFull = postDate.format('LLL');
             }
 
             function visibleTo(post) {
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		<input id="appearance-header-image" name="file" type="file" custom-on-change='uploadFile' ng-required="{{ required }}" />

		<input name="file" type="file" custom-on-change='uploadFile' ng-required="{{ required }}" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ function ( @@
                 }
             },
             update: {
-                method: 'POST'
+                method: 'PUT'
             }
         });
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,4 +49,3 @@ function PostActionsDirective(
		}
		}
		}