Catch develop up with master

.gitmodules

@@ -19,3 +19,6 @@
 [submodule "osmtm/static/js/lib/moment"]
 	path = osmtm/static/js/lib/moment
 	url = https://github.com/moment/moment.git
+[submodule "osmtm/static/js/lib/colorselector"]
+	path = osmtm/static/js/lib/colorselector
+	url = https://github.com/flaute/bootstrap-colorselector.git

.travis.yml

@@ -7,10 +7,15 @@ cache:
     - $HOME/.cache/pip
     - $HOME/build/hotosm/osm-tasking-manager2/env
 
-sudo: false
+dist: trusty
+
+addons:
+  postgresql: "9.3"
 
 before_install:
 - deactivate
+- sudo apt-get install --no-install-recommends postgresql-9.3-postgis-2.3
+
 
 install:
 - virtualenv env

README.md

@@ -1,18 +1,18 @@
-# OpenStreetMap Tasking Manager
+# OpenStreetMap Tasking Manager v2
 
 [![Build Status](https://travis-ci.org/hotosm/osm-tasking-manager2.svg?branch=master)](https://travis-ci.org/hotosm/osm-tasking-manager2)
 [![Coverage Status](https://coveralls.io/repos/hotosm/osm-tasking-manager2/badge.png?branch=master)](https://coveralls.io/r/hotosm/osm-tasking-manager2?branch=master)
 
 ## About
 
-OSMTM enables collaborative work on specific areas in OpenStreetMap by defining
+OpenStreetMap Tasking Manager enables collaborative work on specific areas in OpenStreetMap by defining
 clear workflows to be achieved and by breaking tasks down into pieces.
 
-The application is written in Python using the Pyramid framework.
+This is version 2.0 of the Tasking Manager.
+**[Most development work is now taking place on version 3.0](https://github.com/hotosm/tasking-manager/)**
 
-This is the 2.0 version of the Tasking Manager.
-
-See a list of Tasking Manager installations [here](http://wiki.openstreetmap.org/wiki/OSM_Tasking_Manager#Operational_installations_of_the_Tasking_Manager).
+V2 Tasking Manager still powers [many Tasking Manager installations](https://wiki.openstreetmap.org/wiki/OSM_Tasking_Manager#Operational_installations_of_the_Tasking_Manager).
+It is written in Python using the Pyramid framework.
 
 ## Installation
 
@@ -33,8 +33,8 @@ To create a virtual Python environment:
 
 ### Database
 
-OSMTM requires a PostgreSQL/PostGIS database. Version 2.x of PostGIS is
-required.
+OSMTM requires a PostgreSQL/PostGIS database. Version 2.3 or higher of PostGIS
+is required.
 
 First create a database user/role named `www-data`:
 
@@ -45,7 +45,7 @@ Then create a database named `osmtm`:
     sudo -u postgres createdb -T template0 osmtm -E UTF8 -O www-data
     sudo -u postgres psql -d osmtm -c "CREATE EXTENSION postgis;"
 
-### Local settings
+### Local settings
 
 You certainly will need some local specific settings, like the db user or
 password. For this, you can create a `local.ini` file in the project root,
@@ -89,12 +89,12 @@ You need to make the following changes to the osmtm/views/osmauth.py file.
     import httplib2
     httplib2.debuglevel = 4
     PROXY = httplib2.ProxyInfo(httplib2.socks.PROXY_TYPE_HTTP_NO_TUNNEL, 'PROXY-SERVER', PROXY-PORT)
-    
-NOTE: Replace the PROXY-SERVER with your proxy server address and PROXY-PORT with the port number on which your proxy is established. 
-    
-    # then add "proxy_info=PROXY" for every line in oauth.Client. 
+
+NOTE: Replace the PROXY-SERVER with your proxy server address and PROXY-PORT with the port number on which your proxy is established.
+
+    # then add "proxy_info=PROXY" for every line in oauth.Client.
     client = oauth.Client(consumer, proxy_info=PROXY)
-    
+
     client = oauth.Client(consumer, token, proxy_info=PROXY)
 
 Replace the host address in the development.ini file with your IP address of the system.

alembic/versions/11695ee852ff_add_validator_role.py

@@ -0,0 +1,28 @@
+"""Add validator role
+
+Revision ID: 11695ee852ff
+Revises: 4fe2d91d0354
+Create Date: 2017-01-03 16:23:51.667472
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '11695ee852ff'
+down_revision = '4fe2d91d0354'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    users = sa.sql.table('users', sa.sql.column('role'))
+    ''' Project managers are validators by default '''
+    op.execute(users.update().values(role=users.c.role.op('#')(4))
+        .where(users.c.role.op('&')(2)!=0))
+    pass
+
+
+def downgrade():
+    users = sa.sql.table('users', sa.sql.column('role'))
+    op.execute(users.update().values(role=users.c.role.op('#')(4)))
+    pass

alembic/versions/1bdc819ae210_adding_experienced_mapper_role.py

@@ -0,0 +1,22 @@
+"""Adding experienced mapper role
+
+Revision ID: 1bdc819ae210
+Revises: 4a5bf96b558d
+Create Date: 2017-01-19 14:10:58.578127
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '1bdc819ae210'
+down_revision = '4a5bf96b558d'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.add_column('project', sa.Column('requires_experienced_mapper_role', sa.Boolean(), nullable=True))
+
+
+def downgrade():
+    op.drop_column('project', 'requires_experienced_mapper_role')

alembic/versions/4a5bf96b558d_add_project_labels.py

@@ -0,0 +1,47 @@
+"""Add project labels
+
+Revision ID: 4a5bf96b558d
+Revises: 5581aa8a3cd
+Create Date: 2016-06-02 23:42:17.332659
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '4a5bf96b558d'
+down_revision = '5581aa8a3cd'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.create_table(
+        'label',
+        sa.Column('id', sa.Integer, primary_key=True),
+        sa.Column('name', sa.Unicode),
+        sa.Column('color', sa.Unicode),
+    )
+
+
+    project_labels_table = op.create_table(
+        'project_labels',
+        sa.Column('project', sa.Integer),
+        sa.Column('label', sa.Integer),
+        sa.ForeignKeyConstraint(['project'], ['project.id']),
+        sa.ForeignKeyConstraint(['label'], ['label.id'])
+    )
+
+    label_translation_table = op.create_table(
+        'label_translation',
+        sa.Column('id', sa.Integer, nullable=False),
+        sa.Column('locale', sa.String(10), nullable=False),
+        sa.Column('description', sa.String),
+        sa.UniqueConstraint('id', 'locale'),
+        sa.ForeignKeyConstraint(['id'], ['label.id'], ondelete="CASCADE")
+    )
+
+
+def downgrade():
+    op.drop_table('project_labels')
+    op.drop_table('label_translation')
+    op.drop_table('label')

alembic/versions/4fe2d91d0354_update_user_roles.py

@@ -0,0 +1,30 @@
+"""Update user roles
+
+Revision ID: 4fe2d91d0354
+Revises: 5002e75c0604
+Create Date: 2017-01-03 15:24:32.395665
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '4fe2d91d0354'
+down_revision = '5002e75c0604'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    users = sa.sql.table('users', sa.sql.column('role'))
+    ''' No null values for role '''
+    op.execute(users.update().values(role=0).where(users.c.role==None))
+    ''' Admins are also project managers '''
+    op.execute(users.update().values(role=3).where(users.c.role==1))
+    pass
+
+
+def downgrade():
+    users = sa.sql.table('users', sa.sql.column('role'))
+    op.execute(users.update().values(role=None).where(users.c.role==0))
+    op.execute(users.update().values(role=1).where(users.c.role==3))
+    pass

alembic/versions/5581aa8a3cd_add_requires_validator_role_in_project_.py

@@ -0,0 +1,22 @@
+"""Add requires_validator_role in project table
+
+Revision ID: 5581aa8a3cd
+Revises: 11695ee852ff
+Create Date: 2017-01-10 11:18:46.081801
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '5581aa8a3cd'
+down_revision = '11695ee852ff'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.add_column('project', sa.Column('requires_validator_role', sa.Boolean(), nullable=True))
+
+
+def downgrade():
+    op.drop_column('project', 'requires_validator_role')

osmtm/__init__.py

@@ -1,4 +1,6 @@
 import bleach
+import subprocess
+import os
 from pyramid.config import Configurator
 from pyramid.authentication import AuthTktAuthenticationPolicy
 from pyramid.authorization import ACLAuthorizationPolicy
@@ -27,11 +29,19 @@
 scheduler.start()
 
 
+try:
+    version = subprocess.check_output(['git', 'describe', '--always'],
+                                      cwd=os.path.dirname(__file__))
+except Exception as e:
+    version = 'N/A'
+
+
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
     settings['mako.directories'] = 'osmtm:templates'
     load_local_settings(settings)
+    settings.update({'version': version})
 
     engine = engine_from_config(settings, 'sqlalchemy.')
     DBSession.configure(bind=engine)
@@ -106,6 +116,9 @@ def main(global_config, **settings):
     config.add_route('task_validate',
                      '/project/{project:\d+}/task/{task:\d+}/validate',
                      xhr=True)
+    config.add_route('task_cancel_done',
+                     '/project/{project:\d+}/task/{task:\d+}/cancel_done',
+                     xhr=True)
     config.add_route('task_comment',
                      '/project/{project:\d+}/task/{task:\d+}/comment',
                      xhr=True)
@@ -126,13 +139,21 @@ def main(global_config, **settings):
     config.add_route('task_users',
                      '/project/{project:\d+}/task/{task:\d+}/users')
 
+    config.add_route('labels', '/labels')
+    config.add_route('label_new', '/label/new')
+    config.add_route('label_edit', '/label/{label:\d+}/edit')
+    config.add_route('label_delete', '/label/{label:\d+}/delete')
+
     config.add_route('users', '/users')
     config.add_route('users_json', '/users.json')
     config.add_route('user_messages', '/user/messages')
     config.add_route('user_messages_check', '/user/messages/check')
     config.add_route('user', '/user/{username}')
     config.add_route('user_admin', '/user/{id:\d+}/admin')
     config.add_route('user_project_manager', '/user/{id:\d+}/project_manager')
+    config.add_route('user_validator', '/user/{id:\d+}/validator')
+    config.add_route('user_experienced_mapper',
+                     '/user/{id:\d+}/experienced_mapper')
     config.add_route('user_prefered_editor',
                      '/user/prefered_editor/{editor}', xhr=True)
     config.add_route('user_prefered_language',

osmtm/mako_filters.py

@@ -37,3 +37,16 @@ def repl(val):
         return re.sub(p, repl, text)
 
     return d
+
+
+def contrast(color):
+    from colour import Color
+    '''Returns better constrast color between white and black for the given
+       color
+    '''
+    color = Color(color)
+    if (color.red * 256 * 0.299 + color.green * 256 * 0.587 +
+       color.blue * 256 * 0.114) > 186:
+        return 'black'
+    else:
+        return 'white'