Merge branch 'develop'

app/common/directives/ush-logo.html

@@ -1,4 +1,4 @@
-<a embed-only=true href="https://www.ushahidi.com" class="ushahidi-bug" target="_blank">
+<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>

app/common/services/maps.js

@@ -118,7 +118,7 @@ function (
         maps: {},
         config: undefined,
         getZoomControlPosition: function () {
-            return $window.self !== $window.top ? 'bottomleft' : 'bottomright';
+            return 'bottomleft';
         },
         getMap: function (name) {
             if (!this.maps[name]) {

app/main/posts/views/filter-by-survey.html

@@ -1,3 +1,3 @@
-<div class="toolbox hide-when-medium">
+<div embed-only="true" class="toolbox hide-when-medium">
     <button ng-click="openFilters()" class="button-beta button-plain mode-context-trigger" translate="app.filter_by_survey">Filter by survey</button>
 </div>

app/main/posts/views/post-toolbar.html

@@ -4,19 +4,14 @@
     <!-- floating action button -->
     <add-post-button></add-post-button>
 
-    <filter-posts filters="filters" embed-only=false></filter-posts>
+    <filter-posts filters="filters" embed-only="false"></filter-posts>
 
     <filter-by-survey></filter-by-survey>
 
-    <div class="button-group hide-until-medium">
-      <!-- share button
-      <button type="button">
-        <svg class="iconic">
-          <use xlink:href="../../img/iconic-sprite.svg#share"></use>
-        </svg>
-        <span class="button-label">Share</span>
-      </button>
-      -->
+    <div class="button-group hide-until-medium" embed-only="true">
+      <post-share filters="filters" button="true"></post-share>
+    </div>
+    <div class="button-group" embed-only="false">
       <post-share filters="filters" button="true"></post-share>
     </div>
     <!-- toolbar -->

app/main/posts/views/share/post-share.html

@@ -1,4 +1,4 @@
-<a ng-class="{ 'button' : isButton(), 'button-flat': isAdd()}"ng-click="openShareMenu()">
+<a ng-class="{ 'button' : isButton(), 'button-flat': isAdd()}" ng-click="openShareMenu()">
 		<div class="loading" ng-if="loading">
 			<div class="line"></div>
 			<div class="line"></div>

codeship-steps.yml

@@ -5,7 +5,7 @@
 - name: "Build client"
   service: build
   command: build
-  tag: '^(v[0-9]\.[0-9]+.[0-9]+(-[a-zA-Z0-9\.]+)?)|(develop)|(production)$'
+  #tag: '^(v[0-9]\.[0-9]+.[0-9]+(-[a-zA-Z0-9\.]+)?)|(develop)|(production)$'
 
 - type: parallel
   steps:
@@ -16,8 +16,23 @@
   - name: "Deploy staging"
     service: deploy
     tag: develop
-    command: ansible-playbook -vv -i hosts/rackspace_staging platform-client-update-rsync.yml -e PLATFORM_CLIENT_DEPLOY_SRC="/vols/last_build"
+    command: >
+      ansible-playbook -vv -i hosts/rackspace_staging platform-client-update-rsync.yml
+        -e PLATFORM_CLIENT_DEPLOY_SRC="/vols/last_build"
   - name: "Deploy Production"
     service: deploy
     tag: production
-    command: "ansible-playbook -vv -i hosts/rackspace_prod platform-client-update.yml -e=\"PLATFORM_CLIENT_VERSION=$CI_COMMIT_ID\""
+    command: >
+      ansible-playbook -vv -i hosts/rackspace_prod platform-client-update-rsync.yml
+        -e PLATFORM_CLIENT_DEPLOY_SRC="/vols/last_build"
+  - name: "Deploy other branches"
+    service: deploy
+    command: >
+      ansible-playbook -vv -i hosts/rackspace_pr platform-client-branches-deploy.yml
+        -e BRANCH_NAME="$CI_BRANCH"
+        -e DEPLOYMENTS_API_DOMAIN="api.ushahididev.com"
+        -e PLATFORM_CLIENT_DEPLOY_SRC="/vols/last_build"
+        -e PLATFORM_CLIENT_REPO="$CI_REPO_NAME"
+        -e PLATFORM_CLIENT_VERSION="$CI_COMMIT_ID"
+        -e COMMIT_STATUS_CONTEXT="continuous-deployment/${CI_NAME}"
+        -e DEPLOYMENT_LOG_URL="http://app.codeship.com/projects/${CI_PROJECT_ID}/builds/${CI_BUILD_ID}"

deployment.env.encrypted

@@ -1 +1 @@
-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
+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

docker/deploy.Dockerfile

@@ -1,8 +1,8 @@
 # ==> Import latest ubuntu/ansible build
 FROM williamyeh/ansible:ubuntu14.04
 
-# ==> Install git
-RUN apt-get update && apt-get install git -y
+# ==> Install git and utils
+RUN apt-get update && apt-get install git gettext -y
 
 # ==> Set workging directory to /opt
 WORKDIR /opt

docker/deploy.run.sh

@@ -23,5 +23,15 @@ EOM
 # ==> Get latest deployment code from github
 ansible-galaxy install -r roles.yml
 
-exec $*
-
+# Perform variable substitution on parameters
+#   i.e. if we get a parameter myvar="$CI_BRANCH" we substitute $CI_BRANCH for
+#        its actual value in the environment, and get i.e. myvar="master"
+args=()
+for p in $@; do
+    args+=(`printf '%s\n' $p | envsubst`)
+done
+
+# Execute parameter passed in arguments
+echo executing: "${args[@]}"
+
+exec "${args[@]}"

package.json

@@ -103,7 +103,7 @@
     "nvd3": "^1.8.4",
     "selection-model": "jtrussell/angular-selection-model.git",
     "underscore": "^1.7.0",
-    "ushahidi-platform-pattern-library": "3.6.1"
+    "ushahidi-platform-pattern-library": "3.6.2"
   },
   "engines": {
     "node": ">=4.0"

test/unit/common/directives/file-upload.directive.spec.js

@@ -0,0 +1,46 @@
+var ROOT_PATH = '../../../../';
+
+describe('file upload directive', function () {
+
+    var $rootScope,
+        $compile,
+        $scope,
+        $window,
+        element;
+
+    beforeEach(function () {
+        fixture.setBase('mocked_backend/api/v3');
+
+        require(ROOT_PATH + 'test/unit/mock/mock-modules.js');
+
+        var testApp = angular.module('testApp', [
+            'ushahidi.mock'
+        ]);
+
+        testApp.directive('fileUpload', require(ROOT_PATH + 'app/common/directives/file-upload.directive'));
+
+        require(ROOT_PATH + 'test/unit/simple-test-app-config')(testApp);
+
+        angular.mock.module('testApp');
+    });
+
+    beforeEach(angular.mock.module('client-templates'));
+
+    beforeEach(inject(function (_$rootScope_, _$compile_, _Notify_, _GlobalFilter_, _$window_) {
+        $rootScope = _$rootScope_;
+        $compile = _$compile_;
+        $window = _$window_;
+        $scope = _$rootScope_.$new();
+        $rootScope.globalLayout = 'layout-a';
+        $window.self = 'frame';
+        $rootScope.setLayout = function () {};
+        spyOn($rootScope, 'setLayout').and.callThrough();
+    }));
+
+    it('should set the layout', function () {
+        element = '<file-upload></file-upload>';
+        element = $compile(element)($scope);
+        $scope.$digest();
+
+    });
+});