Release v3.6.0 (#370 from ushahidi/release/sprint-11)

Release Sprint 11 changes (v3.6.0)

.travis.yml

@@ -10,8 +10,8 @@ notifications:
     notify: true
   slack:
     secure: MG3wEGLelQgasOVa5SyNbIfGWpvsmKZPF9moTrbLSrDgMptMxThSIDfVuAHvpBGsOw9o+izbTD26sbt1OQE9A9ipJfxUxZ+/LmYvaG0rSWvYEX9dIw9qp84pFyqwuO7nZlReeM7Ye9A2hYTBCZjqUsg8pwUlUUv065X3Qhp2IbY=
-addons:
-  sauce_connect: true
+#addons:
+#  sauce_connect: true
 language: node_js
 matrix:
   include:

app/app.js

@@ -15,21 +15,16 @@ require('angular-filter');
 require('angular-local-storage');
 require('checklist-model');
 require('ngGeolocation/ngGeolocation');
-require('ng-showdown/src/ng-showdown');
+require('ng-showdown');
 window.d3 = require('d3'); // Required for nvd3
 require('./common/wrapper/nvd3-wrapper');
 require('angular-nvd3/src/angular-nvd3');
 require('angular-cache');
 
 // Load ushahidi modules
-require('./frame/frame-module.js');
 require('./common/common-module.js');
-require('./post/post-module.js');
-require('./activity/activity-module.js');
-require('./setting/setting-module.js');
-require('./plans/plans-module.js');
-require('./set/set-module.js');
-require('./user-profile/user-profile-module.js');
+require('./main/main-module.js');
+require('./settings/settings.module.js');
 
 // Stub ngRaven module incase its not configured
 angular.module('ngRaven', []);
@@ -73,19 +68,14 @@ angular.module('app',
         'angular-datepicker',
         'leaflet-directive',
         'angular.filter',
-        'showdown',
+        'ng-showdown',
         'ngGeolocation',
         'nvd3',
         'angular-cache',
         'ngRaven',
-        'ushahidi.frame',
         'ushahidi.common',
-        'ushahidi.posts',
-        'ushahidi.tools',
-        'ushahidi.plans',
-        'ushahidi.sets',
-        'ushahidi.activity',
-        'ushahidi.user-profile'
+        'ushahidi.main',
+        'ushahidi.settings'
     ])
 
     .constant('CONST', {

app/common/auth/authentication-interceptor.config.js

@@ -57,21 +57,21 @@ function AuthInterceptor($rootScope, $injector, $q, CONST, Session, _) {
 
         var accessToken = Session.getSessionDataEntry('accessToken');
 
-        // if we already have an accessToken,
-        // we will set it straight ahead
-        // and resolve the promise for the config hash
         if (accessToken !== undefined && accessToken !== null) {
+            // if we already have an accessToken,
+            // we will set it straight ahead
+            // and resolve the promise for the config hash
             config.headers.Authorization = 'Bearer ' + accessToken;
             deferred.resolve(config);
 
-        // otherwise, we will ask the backend
-        // via the client credentials oauth flow
-        // for an anonymous accessToken
-        // (for some resources, of course,
-        // this authorization level is not enough
-        // and a 403 or 401 will be thrown
-        // which results in showing the login page)
         } else {
+            // otherwise, we will ask the backend
+            // via the client credentials oauth flow
+            // for an anonymous accessToken
+            // (for some resources, of course,
+            // this authorization level is not enough
+            // and a 403 or 401 will be thrown
+            // which results in showing the login page)
             getClientCredsToken(config).then(deferred.resolve, deferred.reject);
         }
         return deferred.promise;

app/common/auth/login.directive.js

@@ -6,7 +6,7 @@ function Login() {
         restrict: 'E',
         scope: {},
         controller: LoginController,
-        templateUrl: 'templates/auth/login.html'
+        templateUrl: 'templates/common/auth/login.html'
     };
 }
 LoginController.$inject = [

server/www/templates/auth/login.html → app/common/auth/login.html

@@ -14,7 +14,8 @@
             <input id="password" type="password" ng-model="password" ng-disabled="processing" required>
             <p><a ng-click="forgotPassword()" translate>nav.forgotyourpassword</a></p>
         </div>
-
+    </div>
+    <div class="modal-actions">
         <div class="form-field">
             <button type="button" class="button-link" ng-click="cancel()" ng-show="showCancel" translate="app.cancel">Cancel</button>
             <button type="submit" class="button-alpha" ng-disabled="loginForm.$invalid || processing" translate="nav.login">Login</button>

app/common/auth/password-reset-confirm.directive.js

@@ -6,7 +6,7 @@ function PasswordResetConfirmDirective() {
         restrict: 'E',
         scope: true,
         controller: PasswordResetConfirmController,
-        templateUrl: 'templates/auth/password-reset-confirm.html'
+        templateUrl: 'templates/common/auth/password-reset-confirm.html'
     };
 }
 PasswordResetConfirmController.$inject = [

app/common/auth/password-reset.directive.js

@@ -6,7 +6,7 @@ function PasswordResetDirective() {
         restrict: 'E',
         scope: true,
         controller: PasswordResetController,
-        templateUrl: 'templates/auth/password-reset.html'
+        templateUrl: 'templates/common/auth/password-reset.html'
     };
 }
 PasswordResetController.$inject = [

app/common/auth/register.directive.js

@@ -6,7 +6,7 @@ function RegisterDirective() {
         restrict: 'E',
         scope: {},
         controller: RegisterController,
-        templateUrl: 'templates/auth/register.html'
+        templateUrl: 'templates/common/auth/register.html'
     };
 }
 RegisterController.$inject = [

server/www/templates/auth/register.html → app/common/auth/register.html

@@ -55,7 +55,9 @@
             </div>
 
         </div>
+    </div>
 
+    <div class="modal-actions">
         <div class="form-field">
             <button type="button" class="button-link" ng-click="cancel()" translate="app.cancel">Cancel</button>
             <button type="submit" class="button-alpha" ng-disabled="form.$invalid || processing" translate="nav.register">Sign up</button>

app/common/common-module.js

@@ -1,12 +1,9 @@
 angular.module('ushahidi.common', [
     'ushahidi.common.adaptive-input',
     'ushahidi.common.dropdown',
-    'ushahidi.common.accordion',
-    'ushahidi.common.offcanvas',
     'ushahidi.common.modal',
     'ushahidi.common.custom-on-change',
-    'ushahidi.common.file-upload',
-    'ushahidi.common.sticky-sidebar'
+    'ushahidi.user-profile'
 ])
 
 // Authentication
@@ -50,9 +47,6 @@ angular.module('ushahidi.common', [
 .service('ViewHelper', require('./services/view-helper.js'))
 .service('Features', require('./services/features.js'))
 .service('Util', require('./services/util.js'))
-.service('DataRetriever', require('./services/data-retriever.js'))
-.service('multiTranslate', require('./services/multi-translate.js'))
-.service('GlobalFilter', require('./services/global-filter.js'))
 .service('Maps', require('./services/maps.js'))
 .service('Geocoding', require('./services/geocoding.js'))
 .service('Languages', require('./services/languages.js'))
@@ -85,6 +79,8 @@ angular.module('ushahidi.common', [
 .directive('filterRole', require('./directives/filter-system/filter-role.js'))
 .directive('overflowToggle', require('./directives/filter-system/overflow-toggle.js'))
 .directive('focus', require('./directives/focus.js'))
+.directive('modeBar', require('./directives/mode-bar/mode-bar.directive.js'))
+.directive('fileUpload', require('./directives/file-upload.directive.js'))
 
 // Event actions
 .constant('EVENT', {
@@ -108,9 +104,6 @@ angular.module('ushahidi.common', [
 // Load submodules
 require('./directives/adaptive-input.js');
 require('./directives/dropdown.js');
-require('./directives/accordion.js');
-require('./directives/offcanvas.js');
 require('./directives/modal.js');
 require('./directives/custom-on-change.js');
-require('./directives/file-upload.js');
-require('./directives/sticky-sidebar.js');
+require('./user-profile/user-profile-module.js');

app/common/common-routes.js

@@ -12,7 +12,7 @@ module.exports = ['$routeProvider', '$locationProvider', function ($routeProvide
         })
         .when('/forbidden', {
             controller: require('./auth/forbidden.controller.js'),
-            templateUrl: 'templates/auth/forbidden.html'
+            templateUrl: 'templates/common/auth/forbidden.html'
         })
         .when('/register', {
             controller: require('./auth/register.controller.js'),

app/common/configs/ui-bootstrap-template-decorators.js

@@ -6,7 +6,7 @@ function (
     $provide.decorator('uibPaginationDirective', ['$delegate', function ($delegate) {
         //we now get an array of all the pagination directives,
         //and use the first one
-        $delegate[0].templateUrl = 'templates/angular-ui-bootstrap/pagination/pagination.html';
+        $delegate[0].templateUrl = 'templates/common/configs/uib-pagination.html';
         return $delegate;
     }]);
 }];

server/www/templates/common/collection-selector/collection-selector.html → app/common/directives/collection-selector.html

@@ -3,5 +3,5 @@
         <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="../../img/iconic-sprite.svg#grid-three-up"></use>
     </svg>
     <span class="button-label" translate>set.add_to_collection</span>
-    <ng-include src="'templates/common/collection-selector/collection-selector-modal.html'" include-replace></ng-include>
+    <ng-include src="'templates/common/directives/collection-selector-modal.html'" include-replace></ng-include>
 </button>

app/common/directives/collection-toggle/collection-toggle-button.js

@@ -22,6 +22,6 @@ function (
                 $rootScope.$emit('collectionToggle:show', selectedPostObjects);
             };
         },
-        templateUrl: 'templates/common/collection-toggle/collection-toggle-button.html'
+        templateUrl: 'templates/common/directives/collection-toggle/collection-toggle-button.html'
     };
 }];

app/common/directives/collection-toggle/collection-toggle-link.js

@@ -15,6 +15,6 @@ function (
                 $rootScope.$emit('collectionToggle:show', [$scope.post]);
             };
         },
-        templateUrl: 'templates/common/collection-toggle/collection-toggle-link.html'
+        templateUrl: 'templates/common/directives/collection-toggle/collection-toggle-link.html'
     };
 }];