[WIP] Version 3.0.4 Release

.tx/config

@@ -9,8 +9,11 @@ trans.bn = client/locale/bn.json
 trans.cs = client/locale/cs.json
 trans.de = client/locale/de.json
 trans.es = client/locale/es.json
+trans.fi = client/locale/fi.json
+trans.fa_IR = client/locale/fa_IR.json
 trans.fr = client/locale/fr.json
 trans.hu = client/locale/hu.json
+trans.gl = client/locale/gl.json
 trans.id = client/locale/id.json
 trans.it = client/locale/it.json
 trans.ja = client/locale/ja.json
@@ -22,6 +25,8 @@ trans.pt = client/locale/pt.json
 trans.pt_BR = client/locale/pt_BR.json
 trans.ru = client/locale/ru.json
 trans.sl = client/locale/sl.json
+trans.ta = client/locale/ta.json
 trans.uk = client/locale/uk.json
+trans.vi = client/locale/vi.json
 trans.zh_TW = client/locale/zh_TW.json
 type = KEYVALUEJSON

CONTRIBUTING.md

@@ -18,6 +18,7 @@ There are many ways to contribute to a project, below are some examples:
 1. Report bugs, offer ideas, and/or request features by creating “Issues” in the project repository.
 2. Fork the code and play with it, whether you later choose to make a pull request or not.
 3. Create pull requests for changes that you think are needed. From typos and wording changes, to significant new features or major design flaws, you will find lots of opportunities to contribute improvements. Read more about coding and committing below.
+4. Review or submit language translations in the [Transifex TM3 project](https://transifex.com/hotosm/tasking-manager-3). These are later synchronized with the GitHub repository by code and project leads.
 
 #### Issue or bug reports should include:
 
@@ -32,7 +33,7 @@ When creating an issue through the GitHub issue tracker, please include the foll
   * The user need being addressed
 
 #### Development issues should include:
-  * Specific code that needs improvement or dependancies to be investigated
+  * Specific code that needs improvement or dependencies to be investigated
   * Rational for recommendations
   * Use checklists (via - [ ]) to keep track of sub-items wherever possible
 

README.md

@@ -58,11 +58,12 @@ Following must be available locally:
 ### Environment vars:
 As the project is open source we have to keep secrets out of the repo.  You will need to setup the following env vars locally:
 
-* **TM_DB** - This is the for the PostGIS connection string.  If you can't access an existing DB refer to DevOps page to [set up a local DB in Docker](https://github.com/hotosm/tasking-manager/wiki/Dev-Ops#creating-a-local-postgis-database-with-docker)
+* **TM_DB** - This is for the PostGIS connection string.  If you can't access an existing DB refer to DevOps page to [set up a local DB in Docker](https://github.com/hotosm/tasking-manager/wiki/Dev-Ops#creating-a-local-postgis-database-with-docker)
 * **TM_SECRET** - This is secret key for the TM app used by itsdangerous and flask-oauthlib for entropy
 * **TM_CONSUMER_KEY** - This is the OAUTH Consumer Key used for authenticating the Tasking Manager App in OSM
 * **TM_CONSUMER_SECRET** - This is the OAUTH Consumer Secret used for authenticating the Tasking Manager App in OSM
 * **TM_SMTP_HOST** - The hostname for the SMTP server that is used to send email alerts
+* **TM_SMTP_PORT** - The port number for the SMTP server that is used to send email alerts
 * **TM_SMTP_USER** - The user for the SMTP server that is used to send email alerts
 * **TM_SMTP_PASSWORD** - The password for the SMTP server that is used to send email alerts
 
@@ -73,6 +74,7 @@ As the project is open source we have to keep secrets out of the repo.  You will
     * ```export TM_CONSUMER_KEY=oauth-consumer-key-goes-here```
     * ```export TM_CONSUMER_SECRET=oauth-consumer-secret-key-goes-here```
     * ```export TM_SMTP_HOST=smtp-server-host-here```
+    * ```export TM_SMTP_PORT=smtp-server-port-here```
     * ```export TM_SMTP_USER=smtp-server-user-here```
     * ```export TM_SMTP_PASSWORD=smtp-server-password-here```
 * Windows:
@@ -81,6 +83,7 @@ As the project is open source we have to keep secrets out of the repo.  You will
     * ```setx TM_CONSUMER_KEY "oauth-consumer-key-goes-here"```
     * ```setx TM_CONSUMER_SECRET "oauth-consumer-secret-key-goes-here"```
     * ```setx TM_SMTP_HOST "smtp-server-host-here"```
+    * ```setx TM_SMTP_PORT "smtp-server-port-here"```
     * ```setx TM_SMTP_USER "smtp-server-user-here"```
     * ```setx TM_SMTP_PASSWORD "smtp-server-password-here"```
 

client/.eslintrc.json

@@ -0,0 +1,25 @@
+{
+  "env": {
+    "browser": true
+  },
+  "globals": {
+    "ol": true,
+    "require": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "angular"
+  ],
+  "rules": {
+    "semi": [
+      "error",
+      "always"
+    ],
+    "no-console": "error",
+    "no-debugger": "error",
+    "angular/di": [
+      "error",
+      "$inject"
+    ]
+  }
+}

client/app/about/faq.html

@@ -6,7 +6,7 @@ <h1 class="section__title">
                     {{ "Frequently Asked Questions" | translate }}
                 </h1>
                 <p>
-                    Have questions about the new Tasking Manager? Read more below for answers to some of the most frequently asked questions by the community. If you want to know more about the new improvements to the Tasking Manger, <a href="/what-is-new">read more in the what is new section.</a>
+                    Have questions about the new Tasking Manager? Read more below for answers to some of the most frequently asked questions by the community. If you want to know more about the new improvements to the Tasking Manager, <a href="/what-is-new">read more in the what is new section.</a>
                 </p>
             </div>
         </header>

client/app/admin/create-project/create-project.controller.js

@@ -108,7 +108,7 @@
         }
 
         /**
-         * Move the wizard to appropiate step for type of tasks selected
+         * Move the wizard to appropriate step for type of tasks selected
          */
         vm.setWizardStepAfterTaskTypeSelection = function () {
             if (vm.taskType === 'square-grid') {
@@ -258,7 +258,7 @@
         };
 
         /**
-         * Create arbitary tasks
+         * Create arbitrary tasks
          */
         vm.createArbitaryTasks = function () {
             if (vm.isImportedAOI) {

client/app/admin/create-project/create-project.html

@@ -46,10 +46,10 @@ <h4>{{ 'Step 1: Define Area' | translate }}</h4>
                                 </dd>
                             </dl>
                             <div>
-                                <span class="error" ng-show="createProjectCtrl.AOIValidationMessage == 'NO_FEATURES'">
+                                <span class="error" style="float:left;margin-top:10px" ng-show="createProjectCtrl.AOIValidationMessage == 'NO_FEATURES'">
                                     {{ 'No Area of Interest has been drawn.' | translate }}
                                 </span>
-                                <span class="error"
+                                <span class="error" style="float:left;margin-top:10px"
                                       ng-show="createProjectCtrl.AOIValidationMessage == 'SELF_INTERSECTIONS'">
                                     {{ 'The Area of Interest contains self intersections.' | translate }}
                                 </span>

client/app/components/project-chat/project-chat.html

@@ -4,8 +4,8 @@
             <p class="space-bottom--none">
                 <strong>
                     <a href="./user/{{ message.username }}" target="_blank"/>{{ message.username }}</a>
-                </strong> <span class="metadata" am-time-ago="message.timestamp | amUtc | amLocal"></span></p>
-            <p ng-bind-html="message.message"></p>
+                </strong> <span class="metadata" am-time-ago="message.timestamp | amUtc | amLocal" title="{{ message.timestamp }}"></span></p>
+            <p markdown-to-html="message.message"></p>
         </div>
         <div ng-show="projectChatCtrl.messages.length < 1">
             {{ 'No project discussion yet' | translate }}

client/app/home/home.controller.js

@@ -11,6 +11,7 @@
 
     function homeController(statsService) {
         var vm = this;
+        vm.hasLoaded = false;
         vm.mappersOnline = 0;
         vm.tasksMapped = 0;
         vm.totalMappers = 0;
@@ -29,11 +30,12 @@
             resultsPromise.then(function (data) {
                 vm.stats = data;
                 console.log(vm.stats);
+                vm.hasLoaded = true;
                 vm.mappersOnline = data.mappersOnline;
                 vm.tasksMapped = data.tasksMapped;
                 vm.totalMappers = data.totalMappers;
             }, function (data) {
-                // Swallow error counters will show 0 but not catastrophic
+                // Swallow error counters will show loading animation but not catastrophic
             });
         }
     }

client/app/home/home.html

@@ -13,20 +13,29 @@ <h1 class="section__title">
         <div class="inner">
             <ul class="homepage-stats__cards">
                 <li id="homepage-stats-1" class="homepage-stats__card">
-                    <div class="stats-card__amount">
-                        <strong>{{ homeCtrl.mappersOnline | number }}</strong>
+                    <div class="stats-card__container">
+                        <div class="stats-card__loading" ng-if="!homeCtrl.hasLoaded"></div>
+                        <div class="stats-card__amount" ng-if="homeCtrl.hasLoaded">
+                            <strong>{{ homeCtrl.mappersOnline | number }}</strong>
+                        </div>
                     </div>
                     <div class="stats-card__title">Mappers Online</div>
                 </li>
                 <li id="homepage-stats-2" class="homepage-stats__card">
-                    <div class="stats-card__amount">
-                        <strong>{{ homeCtrl.tasksMapped | number }}</strong>
+                    <div class="stats-card__container">
+                        <div class="stats-card__loading" ng-if="!homeCtrl.hasLoaded"></div>
+                        <div class="stats-card__amount" ng-if="homeCtrl.hasLoaded">
+                            <strong>{{ homeCtrl.tasksMapped | number }}</strong>
+                        </div>
                     </div>
                     <div class="stats-card__title">Tasks Mapped</div>
                 </li>
                 <li id="homepage-stats-3" class="homepage-stats__card">
-                    <div class="stats-card__amount">
-                        <strong>{{ homeCtrl.totalMappers | number }}</strong>
+                    <div class="stats-card__container">
+                        <div class="stats-card__loading" ng-if="!homeCtrl.hasLoaded"></div>
+                        <div class="stats-card__amount" ng-if="homeCtrl.hasLoaded">
+                            <strong>{{ homeCtrl.totalMappers | number }}</strong>
+                        </div>
                     </div>
                     <div class="stats-card__title">Total Mappers</div>
                 </li>

client/app/profile/profile.controller.js

@@ -20,10 +20,12 @@
         vm.projects = [];
         vm.map = null;
         vm.highlightSource = null;
+        vm.savingExpertMode = false;
 
         // Errors - for displaying messages when API calls were not successful
         vm.errorSetRole = false;
         vm.errorSetLevel = false;
+        vm.errorSetExpertMode = false;
         vm.errorSetContactDetails = false;
         vm.errorVerificationEmailSent = false;
 
@@ -115,6 +117,22 @@
             });
         };
 
+        /**
+         * Set the user's expert mode
+         * @param isExpert
+         */
+        vm.setExpertMode = function(isExpert){
+            vm.errorSetExpertMode = false;
+            vm.savingExpertMode = true;
+            userService.setExpertMode(isExpert).then(function(data) {
+                getUser();
+                vm.savingExpertMode = false;
+            }, function(){
+                vm.errorSetExpertMode = true;
+                vm.savingExpertMode = false;
+            });
+        };
+
         /**
          * Get the user's details from the account service
          */

client/app/profile/profile.html

@@ -262,6 +262,16 @@ <h4>{{ 'Set mapper level' | translate }}</h4>
                                     <p ng-show="profileCtrl.errorSetLevel" class="error">{{ 'An error occurred when setting the level.' | translate }}</p>
                                 </div>
                             </div>
+                            <div>
+                                <h4>{{ 'Expert Mode' | translate }}</h4>
+                                <p>{{ 'Expert mode makes advanced and experimental features available. Most users should leave this off.' | translate }}</p>
+                                <label class="form__option">
+                                    <i ng-show="profileCtrl.savingExpertMode" class="fa fa-spinner fa-spin fa-lg fa-fw"></i>
+                                    <input ng-show="!profileCtrl.savingExpertMode" type="checkbox" ng-model="profileCtrl.userDetails.isExpert" ng-change="profileCtrl.setExpertMode(profileCtrl.userDetails.isExpert)"/>
+                                    {{ 'Expert Mode' | translate }}
+                                </label>
+                                <p ng-show="profileCtrl.errorSetExpertMode" class="error">{{ 'An error occurred when altering expert mode setting.' | translate }}</p>
+                            </div>
                         </div>
                     </div>
                 </div>

client/app/project/comment-box.html

@@ -0,0 +1,14 @@
+<div>
+    <textarea class="form__control space-bottom--none" type="text" mentio
+              rows="4"
+              maxlength="{{ projectCtrl.maxlengthComment }}"
+              placeholder="{{ 'Leave a comment' | translate }}"
+              mentio-typed-text="typedTerm"
+              mentio-search="projectCtrl.searchUser(term)"
+              mentio-select="projectCtrl.formatUserTag(item)"
+              mentio-items="projectCtrl.suggestedUsers"
+              mentio-template-url="/app/project/user-suggestions-menu.html"
+              ng-model="projectCtrl.comment"></textarea>
+    <p>{{ projectCtrl.maxlengthComment - projectCtrl.comment.length }}
+        {{ 'characters remaining' | translate }}</p>
+</div>