v3.64

Thanks to vjrj !

Closes #2218

.devcontainer/Dockerfile

@@ -0,0 +1,162 @@
+FROM ubuntu:disco
+LABEL maintainer="sgr"
+
+ENV BUILD_DEPS="gnupg gosu bsdtar wget curl bzip2 g++ build-essential python git ca-certificates iproute2"
+ENV DEBIAN_FRONTEND=noninteractive
+
+ENV \
+    DEBUG=false \
+    NODE_VERSION=8.17.0 \
+    METEOR_RELEASE=1.8.1 \
+    USE_EDGE=false \
+    METEOR_EDGE=1.5-beta.17 \
+    NPM_VERSION=latest \
+    FIBERS_VERSION=4.0.1 \
+    ARCHITECTURE=linux-x64 \
+    SRC_PATH=./ \
+    WITH_API=true \
+    ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE=3 \
+    ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD=60 \
+    ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW=15 \
+    ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE=3 \
+    ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD=60 \
+    ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW=15 \
+    RICHER_CARD_COMMENT_EDITOR=true \
+    MAX_IMAGE_PIXEL="" \
+    IMAGE_COMPRESS_RATIO="" \
+    BIGEVENTS_PATTERN="" \
+    NOTIFY_DUE_DAYS_BEFORE_AND_AFTER="" \
+    NOTIFY_DUE_AT_HOUR_OF_DAY="" \
+    EMAIL_NOTIFICATION_TIMEOUT=30000 \
+    MATOMO_ADDRESS="" \
+    MATOMO_SITE_ID="" \
+    MATOMO_DO_NOT_TRACK=true \
+    MATOMO_WITH_USERNAME=false \
+    BROWSER_POLICY_ENABLED=true \
+    TRUSTED_URL="" \
+    WEBHOOKS_ATTRIBUTES="" \
+    OAUTH2_ENABLED=false \
+    OAUTH2_LOGIN_STYLE=redirect \
+    OAUTH2_CLIENT_ID="" \
+    OAUTH2_SECRET="" \
+    OAUTH2_SERVER_URL="" \
+    OAUTH2_AUTH_ENDPOINT="" \
+    OAUTH2_USERINFO_ENDPOINT="" \
+    OAUTH2_TOKEN_ENDPOINT="" \
+    OAUTH2_ID_MAP="" \
+    OAUTH2_USERNAME_MAP="" \
+    OAUTH2_FULLNAME_MAP="" \
+    OAUTH2_ID_TOKEN_WHITELIST_FIELDS="" \
+    OAUTH2_REQUEST_PERMISSIONS='openid profile email' \
+    OAUTH2_EMAIL_MAP="" \
+    LDAP_ENABLE=false \
+    LDAP_PORT=389 \
+    LDAP_HOST="" \
+    LDAP_BASEDN="" \
+    LDAP_LOGIN_FALLBACK=false \
+    LDAP_RECONNECT=true \
+    LDAP_TIMEOUT=10000 \
+    LDAP_IDLE_TIMEOUT=10000 \
+    LDAP_CONNECT_TIMEOUT=10000 \
+    LDAP_AUTHENTIFICATION=false \
+    LDAP_AUTHENTIFICATION_USERDN="" \
+    LDAP_AUTHENTIFICATION_PASSWORD="" \
+    LDAP_LOG_ENABLED=false \
+    LDAP_BACKGROUND_SYNC=false \
+    LDAP_BACKGROUND_SYNC_INTERVAL="" \
+    LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false \
+    LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false \
+    LDAP_ENCRYPTION=false \
+    LDAP_CA_CERT="" \
+    LDAP_REJECT_UNAUTHORIZED=false \
+    LDAP_USER_AUTHENTICATION=false \
+    LDAP_USER_AUTHENTICATION_FIELD=uid \
+    LDAP_USER_SEARCH_FILTER="" \
+    LDAP_USER_SEARCH_SCOPE="" \
+    LDAP_USER_SEARCH_FIELD="" \
+    LDAP_SEARCH_PAGE_SIZE=0 \
+    LDAP_SEARCH_SIZE_LIMIT=0 \
+    LDAP_GROUP_FILTER_ENABLE=false \
+    LDAP_GROUP_FILTER_OBJECTCLASS="" \
+    LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE="" \
+    LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE="" \
+    LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT="" \
+    LDAP_GROUP_FILTER_GROUP_NAME="" \
+    LDAP_UNIQUE_IDENTIFIER_FIELD="" \
+    LDAP_UTF8_NAMES_SLUGIFY=true \
+    LDAP_USERNAME_FIELD="" \
+    LDAP_FULLNAME_FIELD="" \
+    LDAP_MERGE_EXISTING_USERS=false \
+    LDAP_EMAIL_FIELD="" \
+    LDAP_EMAIL_MATCH_ENABLE=false \
+    LDAP_EMAIL_MATCH_REQUIRE=false \
+    LDAP_EMAIL_MATCH_VERIFIED=false \
+    LDAP_SYNC_USER_DATA=false \
+    LDAP_SYNC_USER_DATA_FIELDMAP="" \
+    LDAP_SYNC_GROUP_ROLES="" \
+    LDAP_DEFAULT_DOMAIN="" \
+    LDAP_SYNC_ADMIN_STATUS="" \
+    LDAP_SYNC_ADMIN_GROUPS="" \
+    HEADER_LOGIN_ID="" \
+    HEADER_LOGIN_FIRSTNAME="" \
+    HEADER_LOGIN_LASTNAME="" \
+    HEADER_LOGIN_EMAIL="" \
+    LOGOUT_WITH_TIMER=false \
+    LOGOUT_IN="" \
+    LOGOUT_ON_HOURS="" \
+    LOGOUT_ON_MINUTES="" \
+    CORS="" \
+    CORS_ALLOW_HEADERS="" \
+    CORS_EXPOSE_HEADERS="" \
+    DEFAULT_AUTHENTICATION_METHOD=""
+
+# Install OS
+RUN set -o xtrace \
+  && useradd --user-group -m --system --home-dir /home/wekan wekan \
+  && apt-get update \
+	&& apt-get install --assume-yes --no-install-recommends apt-utils apt-transport-https ca-certificates 2>&1 \
+	&& apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS}
+
+# Install NodeJS
+RUN set -o xtrace \
+  && cd /tmp \
+  && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-$ARCHITECTURE.tar.xz" \
+  && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
+  && grep " node-v$NODE_VERSION-$ARCHITECTURE.tar.xz\$" SHASUMS256.txt.asc | sha256sum -c - \
+  && tar -xJf "node-v$NODE_VERSION-$ARCHITECTURE.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
+  && rm "node-v$NODE_VERSION-$ARCHITECTURE.tar.xz" SHASUMS256.txt.asc \
+  && ln -s /usr/local/bin/node /usr/local/bin/nodejs \
+  && mkdir -p /usr/local/lib/node_modules/fibers/.node-gyp /root/.node-gyp/${NODE_VERSION} /home/wekan/.config \
+  && npm install -g npm@${NPM_VERSION} \
+  && chown wekan:wekan --recursive /home/wekan/.config
+
+ENV DEBIAN_FRONTEND=dialog
+
+USER wekan
+
+# Install Meteor
+RUN set -o xtrace \
+  && cd /home/wekan \
+  && curl https://install.meteor.com/?release=$METEOR_VERSION --output /home/wekan/install-meteor.sh \
+  # Replace tar with bsdtar in the install script; https://github.com/jshimko/meteor-launchpad/issues/39
+  && sed --in-place "s/tar -xzf.*/bsdtar -xf \"\$TARBALL_FILE\" -C \"\$INSTALL_TMPDIR\"/g" /home/wekan/install-meteor.sh \
+  && sed --in-place 's/VERBOSITY="--silent"/VERBOSITY="--progress-bar"/' /home/wekan/install-meteor.sh \
+  && printf "\n[-] Installing Meteor $METEOR_VERSION...\n\n" \
+  && sh /home/wekan/install-meteor.sh
+
+ENV PATH=$PATH:/home/wekan/.meteor/
+
+# Copy source dir
+USER root
+
+RUN echo "export PATH=$PATH" >> /etc/environment
+
+RUN set -o xtrace \
+  && mkdir /home/wekan/app
+
+COPY ${SRC_PATH} /home/wekan/app/
+
+RUN set -o xtrace \
+  && chown -R wekan:wekan /home/wekan/app /home/wekan/.meteor
+
+USER wekan

.devcontainer/build.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+cd /home/wekan/app
+rm -rf node_modules
+/home/wekan/.meteor/meteor npm install
+rm -rf .build
+/home/wekan/.meteor/meteor build .build --directory
+cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
+cd .build/bundle/programs/server
+rm -rf node_modules
+/home/wekan/.meteor/meteor npm install
+cd /home/wekan/app

.devcontainer/devcontainer.json

@@ -0,0 +1,17 @@
+// See https://aka.ms/vscode-remote/devcontainer.json for format details.
+{
+  "dockerComposeFile": ["docker-compose.yml", "docker-compose.extend.yml"],
+  "service": "wekan-dev",
+  "workspaceFolder": "/home/wekan/app",
+  "extensions": [
+    "mutantdino.resourcemonitor",
+    "editorconfig.editorconfig",
+    "dbaeumer.vscode-eslint",
+    "codezombiech.gitignore",
+    "eamodio.gitlens",
+    "gruntfuggly.todo-tree",
+    "dotjoshjohnson.xml",
+    "redhat.vscode-yaml",
+    "vuhrmeister.vscode-meteor"
+  ]
+}

.devcontainer/docker-compose.yml

@@ -0,0 +1,50 @@
+version: '3.7'
+
+services:
+
+  wekandb-dev:
+    image: mongo:4.0.12
+    container_name: wekan-dev-db
+    restart: unless-stopped
+    command: mongod --smallfiles --oplogSize 128
+    networks:
+      - wekan-dev-tier
+    expose:
+      - 27017
+    volumes:
+      - wekan-dev-db:/data/db
+      - wekan-dev-db-dump:/dump
+
+  wekan-dev:
+    container_name: wekan-dev-app
+    restart: always
+    networks:
+      - wekan-dev-tier
+    build:
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
+    ports:
+      - 3000:3000
+      - 9229:9229
+    environment:
+      - MONGO_URL=mongodb://wekandb-dev:27017/wekan
+      - ROOT_URL=http://localhost:3000
+      - WITH_API=true
+      - RICHER_CARD_COMMENT_EDITOR=true
+      - BROWSER_POLICY_ENABLED=true
+    depends_on:
+      - wekandb-dev
+    volumes:
+      - ..:/app:delegated
+    command:
+      sleep infinity
+
+volumes:
+  wekan-dev-db:
+    driver: local
+  wekan-dev-db-dump:
+    driver: local
+
+networks:
+  wekan-dev-tier:
+    driver: bridge

.editorconfig

@@ -8,3 +8,20 @@ end_of_line = lf
 insert_final_newline = true
 indent_style = space
 indent_size = 2
+
+[*.{js,html}]
+
+charset = utf-8
+end_of_line = lf
+indent_brace_style = 1TBS
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+max_line_length = 80
+quote_type = auto
+spaces_around_operators = true
+trim_trailing_whitespace = true
+
+[*.md]
+
+trim_trailing_whitespace = false

.eslintignore

@@ -0,0 +1 @@
+packages/*

.eslintrc.json

@@ -1,16 +1,19 @@
 {
-  "extends": "eslint:recommended",
+  "extends": [
+    "eslint:recommended",
+    "plugin:meteor/recommended",
+    "prettier",
+    "prettier/standard"
+  ],
   "env": {
     "es6": true,
     "node": true,
-    "browser": true
+    "browser": true,
+    "meteor": true
   },
   "parserOptions": {
-    "ecmaVersion": 2017,
-    "sourceType": "module",
-    "ecmaFeatures": {
-      "experimentalObjectRestSpread": true
-    }
+    "ecmaVersion": 2018,
+    "sourceType": "module"
   },
   "rules": {
     "strict": 0,
@@ -20,7 +23,7 @@
     "consistent-return": 2,
     "dot-notation": 2,
     "eqeqeq": 2,
-    "indent": [2, 2],
+    "indent": 0,
     "no-cond-assign": 2,
     "no-constant-condition": 2,
     "no-eval": 2,
@@ -28,11 +31,12 @@
     "no-unneeded-ternary": 2,
     "radix": 2,
     "semi": [2, "always"],
-    "camelcase": [2, {"properties": "never"}],
+    "camelcase": [2, { "properties": "never" }],
     "comma-spacing": 2,
     "comma-style": 2,
     "eol-last": 2,
     "linebreak-style": [2, "unix"],
+    "meteor/audit-argument-checks": 0,
     "new-parens": 2,
     "no-lonely-if": 2,
     "no-multiple-empty-lines": 2,
@@ -43,7 +47,6 @@
     "quotes": [2, "single"],
     "semi-spacing": 2,
     "space-unary-ops": 2,
-    "arrow-parens": 2,
     "arrow-spacing": 2,
     "no-class-assign": 2,
     "no-dupe-class-members": 2,
@@ -52,8 +55,27 @@
     "prefer-const": 2,
     "prefer-spread": 2,
     "prefer-template": 2,
-    "no-unused-vars" : "warn"
+    "no-unused-vars": "warn",
+    "prettier/prettier": [
+      "error",
+      {
+        "printWidth": 80,
+        "tabWidth": 2,
+        "useTabs": false,
+        "singleQuote": true,
+        "trailingComma": "all"
+      }
+    ],
+    "meteor/no-session": 0
   },
+  "settings": {
+    "import/resolver": {
+      "meteor": {
+        "extensions": [".js", ".jsx"]
+      }
+    }
+  },
+  "plugins": ["prettier", "meteor"],
   "globals": {
     "Meteor": false,
     "Session": false,
@@ -100,7 +122,7 @@
     "Attachments": true,
     "Boards": true,
     "CardComments": true,
-    "DatePicker" : true,
+    "DatePicker": true,
     "Cards": true,
     "CustomFields": true,
     "Lists": true,
@@ -123,6 +145,7 @@
     "allowIsBoardMemberByCard": true,
     "allowIsBoardMemberCommentOnly": true,
     "allowIsBoardMemberNoComments": true,
+    "allowIsBoardMemberWorker": true,
     "Emoji": true,
     "Checklists": true,
     "Settings": true,

.gitattributes

@@ -0,0 +1,3 @@
+* text=auto eol=lf
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+custom: ['https://wekan.team/commercial-support/']

.github/ISSUE_TEMPLATE.md

@@ -1,15 +1,15 @@
 ## Issue
 
 Add these issues to elsewhere:
-- LDAP: https://github.com/wekan/wekan-ldap/issues
 - Snap: https://github.com/wekan/wekan-snap/issues
 
 Other Wekan issues can be added here.
 
 **Server Setup Information**:
 
+* Note: Please anonymize info, and do not add to this public issue any of your Wekan board URLs, passwords, API tokens etc, do you understand?:
 * Did you test in newest Wekan?:
-* For new Wekan install, did you configure root-url correctly https://github.com/wekan/wekan/wiki/Settings ?
+* For new Wekan install, did you configure root-url correctly so Wekan cards open correctly https://github.com/wekan/wekan/wiki/Settings ?
 * Wekan version:
 * If this is about old version of Wekan, what upgrade problem you have?:
 * Operating System:
@@ -17,12 +17,12 @@ Other Wekan issues can be added here.
 * Http frontend if any (Caddy, Nginx, Apache, see config examples from Wekan GitHub wiki first):
 * Node Version:
 * MongoDB Version:
-* ROOT_URL environment variable http(s)://(subdomain).example.com(/suburl):
+* Wekan only works on newest desktop Firefox/Chromium/Chrome/Edge/Chromium Edge and mobile Chrome. What webbrowser version are you using?
 
 **Problem description**:
 - *REQUIRED: Add recorded animated gif about how it works currently, and screenshot mockups how it should work. Use peek to record animgif in Linux https://github.com/phw/peek*
 - *Explain steps how to reproduce*
 - *In webbrowser, what does show Right Click / Inspect / Console ? Chrome shows more detailed info than Firefox.*
-- *If using Snap, what does show command `sudo snap logs wekan.wekan` ?*
-- *If using Docker, what does show command `sudo docker logs wekan-app` ?*
+- *If using Snap, what does show command `sudo snap logs wekan.wekan` ? Please anonymize logs.* 
+- *If using Docker, what does show command `sudo docker logs wekan-app` ? Please anonymize logs.*
 - *If logs are very long, attach them in .zip file*

.github/workflows/dockerimage.yml

@@ -0,0 +1,17 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Build the Docker image
+      run: docker build . --file Dockerfile --tag wekan:$(date +%s)

.gitignore

@@ -8,8 +8,6 @@ npm-debug.log
 .vscode/
 .idea/
 .build/*
-packages/
-package-lock.json
 **/parts/
 **/stage
 **/prime
@@ -17,3 +15,20 @@ package-lock.json
 snap/.snapcraft/
 .idea
 .DS_Store
+.DS_Store?
+.build*
+*.browserify.js.cached
+*.browserify.js.map
+.build*
+versions.json
+.versions
+.npm
+.build*
+._*
+.Trashes
+Thumbs.db
+ehthumbs.db
+.eslintcache
+.meteor/local
+.meteor-1.6-snap/.meteor/local
+.devcontainer/docker-compose.extend.yml

.meteor/.finished-upgraders

@@ -16,3 +16,5 @@ notices-for-facebook-graph-api-2
 1.4.1-add-shell-server-package
 1.4.3-split-account-service-packages
 1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base
+1.8.3-split-jquery-from-blaze

.meteor/packages

@@ -3,17 +3,16 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor-base@1.2.0
+meteor-base@1.4.0
 
 # Build system
-ecmascript
-stylus@2.513.13
-standard-minifier-css@1.3.5
-standard-minifier-js@2.2.0
+ecmascript@0.13.2
+standard-minifier-css@1.5.4
+standard-minifier-js@2.5.2
 mquandalle:jade
 
 # Polyfills
-es5-shim@4.6.15
+es5-shim@4.8.0
 
 # Collections
 aldeed:collection2
@@ -23,7 +22,7 @@ dburles:collection-helpers
 idmontie:migrations
 matb33:collection-hooks
 matteodem:easy-search
-mongo@1.3.1
+mongo@1.7.0
 mquandalle:collection-mutations
 
 # Account system
@@ -31,17 +30,17 @@ kenton:accounts-sandstorm
 service-configuration@1.0.11
 useraccounts:unstyled
 useraccounts:flow-routing
-wekan:wekan-ldap
-wekan:accounts-cas
+wekan-ldap
+wekan-accounts-cas
 wekan-accounts-oidc
 
 # Utilities
-check@1.2.5
+check@1.3.1
 jquery@1.11.10
-random@1.0.10
-reactive-dict@1.2.0
-session@1.1.7
-tracker@1.1.3
+random@1.1.0
+reactive-dict@1.3.0
+session@1.2.0
+tracker@1.2.0
 underscore@1.0.10
 3stack:presence
 alethes:pages
@@ -49,13 +48,11 @@ arillo:flow-router-helpers
 audit-argument-checks@1.0.7
 kadira:blaze-layout
 kadira:dochead
-meteorhacks:picker
-meteorhacks:subs-manager
 mquandalle:autofocus
 ongoworks:speakingurl
 raix:handlebar-helpers
 tap:i18n
-http@1.3.0
+http@1.4.2
 
 # UI components
 blaze
@@ -66,29 +63,37 @@ mquandalle:jquery-textcomplete
 mquandalle:jquery-ui-drag-drop-sort
 mquandalle:mousetrap-bindglobal
 peerlibrary:blaze-components@=0.15.1
-perak:markdown
 templates:tabs
 verron:autosize
 simple:json-routes
 rajit:bootstrap3-datepicker
-shell-server@0.3.0
+shell-server@0.4.0
 simple:rest-accounts-password
 useraccounts:core
 email@1.2.3
 horka:swipebox
-dynamic-import@0.2.0
+dynamic-import@0.5.1
 staringatlights:fast-render
 
-mixmax:smart-disconnect
-accounts-password@1.5.0
+accounts-password@1.5.2
 cfs:gridfs
 rzymek:fullcalendar
 momentjs:moment@2.22.2
-browser-policy-framing
+browser-policy-framing@1.1.0
 mquandalle:moment
 msavin:usercache
 wekan-scrollbar
 mquandalle:perfect-scrollbar
-mdg:meteor-apm-agent
-meteorhacks:unblock
+mdg:meteor-apm-agent@3.2.0-rc.0!
+coagmano:stylus
 lucasantoniassi:accounts-lockout
+meteorhacks:subs-manager
+meteorhacks:picker
+lamhieu:unblock
+meteorhacks:aggregate@1.3.0
+wekan-markdown
+konecty:mongo-counter
+percolate:synced-cron
+easylogic:summernote
+cfs:filesystem
+ostrio:cookies

.meteor/release

@@ -1 +1 @@
-METEOR@1.6.0.1
+METEOR@1.8.3

.meteor/versions

@@ -1,113 +1,119 @@
 3stack:presence@1.1.2
-accounts-base@1.4.0
-accounts-oauth@1.1.15
-accounts-password@1.5.0
+accounts-base@1.4.5
+accounts-oauth@1.1.16
+accounts-password@1.5.2
 aldeed:collection2@2.10.0
 aldeed:collection2-core@1.2.0
 aldeed:schema-deny@1.1.0
 aldeed:schema-index@1.1.1
-aldeed:simple-schema@1.5.3
+aldeed:simple-schema@1.5.4
 alethes:pages@1.8.6
 allow-deny@1.1.0
 arillo:flow-router-helpers@0.5.2
 audit-argument-checks@1.0.7
-autoupdate@1.3.12
-babel-compiler@6.24.7
-babel-runtime@1.1.1
-base64@1.0.10
-binary-heap@1.0.10
-blaze@2.3.2
+autoupdate@1.6.0
+babel-compiler@7.4.2
+babel-runtime@1.4.0
+base64@1.0.12
+binary-heap@1.0.11
+blaze@2.3.4
 blaze-tools@1.0.10
-boilerplate-generator@1.3.1
+boilerplate-generator@1.6.0
 browser-policy-common@1.0.11
 browser-policy-framing@1.1.0
-caching-compiler@1.1.9
-caching-html-compiler@1.1.2
-callback-hook@1.0.10
+caching-compiler@1.2.1
+caching-html-compiler@1.1.3
+callback-hook@1.2.0
 cfs:access-point@0.1.49
 cfs:base-package@0.0.30
 cfs:collection@0.5.5
 cfs:collection-filters@0.2.4
 cfs:data-man@0.0.6
 cfs:file@0.1.17
+cfs:filesystem@0.1.2
 cfs:gridfs@0.0.34
 cfs:http-methods@0.0.32
 cfs:http-publish@0.0.13
 cfs:power-queue@0.9.11
 cfs:reactive-list@0.0.9
 cfs:reactive-property@0.0.4
-cfs:standard-packages@0.5.9
-cfs:storage-adapter@0.2.3
-cfs:tempstore@0.1.5
+cfs:standard-packages@0.5.10
+cfs:storage-adapter@0.2.4
+cfs:tempstore@0.1.6
 cfs:upload-http@0.0.20
-cfs:worker@0.1.4
-check@1.2.5
+cfs:worker@0.1.5
+check@1.3.1
 chuangbo:cookie@1.1.0
-coffeescript@1.12.7_3
-coffeescript-compiler@1.12.7_3
+coagmano:stylus@2.0.0
+coffeescript@1.0.17
 cottz:publish-relations@2.0.8
 dburles:collection-helpers@1.1.0
 ddp@1.4.0
-ddp-client@2.2.0
-ddp-common@1.3.0
+ddp-client@2.3.3
+ddp-common@1.4.0
 ddp-rate-limiter@1.0.7
-ddp-server@2.1.1
+ddp-server@2.3.0
 deps@1.0.12
-diff-sequence@1.0.7
-dynamic-import@0.2.1
-ecmascript@0.9.0
-ecmascript-runtime@0.5.0
-ecmascript-runtime-client@0.5.0
-ecmascript-runtime-server@0.5.0
-ejson@1.1.0
+diff-sequence@1.1.1
+dynamic-import@0.5.1
+easylogic:summernote@0.8.8
+ecmascript@0.13.2
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.9.0
+ecmascript-runtime-server@0.8.0
+ejson@1.1.1
 email@1.2.3
-es5-shim@4.6.15
+es5-shim@4.8.0
 fastclick@1.0.13
+fetch@0.1.1
 fortawesome:fontawesome@4.7.0
 geojson-utils@1.0.10
 horka:swipebox@1.0.2
 hot-code-push@1.0.4
 html-tools@1.0.11
 htmljs@1.0.11
-http@1.3.0
-id-map@1.0.9
+http@1.4.2
+id-map@1.1.0
 idmontie:migrations@1.0.3
-jquery@1.11.10
+inter-process-messaging@0.1.0
+jquery@1.11.11
 kadira:blaze-layout@2.3.0
 kadira:dochead@1.5.0
 kadira:flow-router@2.12.1
 kenton:accounts-sandstorm@0.7.0
+konecty:mongo-counter@0.0.5_3
+lamhieu:meteorx@2.1.1
+lamhieu:unblock@1.0.0
 launch-screen@1.1.1
 livedata@1.0.18
 localstorage@1.2.0
-logging@1.1.19
+logging@1.1.20
 lucasantoniassi:accounts-lockout@1.0.0
-matb33:collection-hooks@0.8.4
+matb33:collection-hooks@0.9.1
 matteodem:easy-search@1.6.4
-mdg:meteor-apm-agent@3.1.2
+mdg:meteor-apm-agent@3.2.5
 mdg:validation-error@0.5.1
-meteor@1.8.2
-meteor-base@1.2.0
+meteor@1.9.3
+meteor-base@1.4.0
 meteor-platform@1.2.6
 meteorhacks:aggregate@1.3.0
 meteorhacks:collection-utils@1.2.0
-meteorhacks:meteorx@1.4.1
 meteorhacks:picker@1.0.3
 meteorhacks:subs-manager@1.6.4
-meteorhacks:unblock@1.1.0
 meteorspark:util@0.2.0
-minifier-css@1.2.16
-minifier-js@2.2.2
+minifier-css@1.4.3
+minifier-js@2.5.1
 minifiers@1.1.8-faster-rebuild.0
-minimongo@1.4.3
-mixmax:smart-disconnect@0.0.4
+minimongo@1.4.5
 mobile-status-bar@1.0.14
-modules@0.11.0
-modules-runtime@0.9.1
-momentjs:moment@2.22.2
-mongo@1.3.1
+modern-browsers@0.1.4
+modules@0.14.0
+modules-runtime@0.11.0
+momentjs:moment@2.24.0
+mongo@1.7.0
+mongo-decimal@0.1.1
 mongo-dev-server@1.1.0
-mongo-id@1.0.6
+mongo-id@1.0.7
 mongo-livedata@1.0.12
 mousetrap:mousetrap@1.4.6_1
 mquandalle:autofocus@1.0.0
@@ -119,70 +125,74 @@ mquandalle:jquery-ui-drag-drop-sort@0.2.0
 mquandalle:moment@1.0.1
 mquandalle:mousetrap-bindglobal@0.0.1
 mquandalle:perfect-scrollbar@0.6.5_2
-msavin:usercache@1.0.0
+msavin:usercache@1.8.0
 npm-bcrypt@0.9.3
-npm-mongo@2.2.33
-oauth@1.2.1
-oauth2@1.2.0
+npm-mongo@3.2.0
+oauth@1.2.8
+oauth2@1.2.1
 observe-sequence@1.0.16
 ongoworks:speakingurl@1.1.0
-ordered-dict@1.0.9
-peerlibrary:assert@0.2.5
+ordered-dict@1.1.0
+ostrio:cookies@2.5.0
+peerlibrary:assert@0.3.0
 peerlibrary:base-component@0.16.0
 peerlibrary:blaze-components@0.15.1
-peerlibrary:computed-field@0.7.0
-peerlibrary:reactive-field@0.3.0
-perak:markdown@1.0.5
-promise@0.10.0
+peerlibrary:computed-field@0.10.0
+peerlibrary:reactive-field@0.6.0
+percolate:synced-cron@1.3.2
+promise@0.11.2
 raix:eventemitter@0.1.3
 raix:handlebar-helpers@0.2.5
-rajit:bootstrap3-datepicker@1.7.1
-random@1.0.10
-rate-limit@1.0.8
-reactive-dict@1.2.0
+rajit:bootstrap3-datepicker@1.7.1_1
+random@1.1.0
+rate-limit@1.0.9
+reactive-dict@1.3.0
 reactive-var@1.0.11
-reload@1.1.11
-retry@1.0.9
-routepolicy@1.0.12
+reload@1.3.0
+retry@1.1.0
+routepolicy@1.1.0
 rzymek:fullcalendar@3.8.0
+server-render@0.3.1
 service-configuration@1.0.11
-session@1.1.7
+session@1.2.0
 sha@1.0.9
-shell-server@0.3.1
+shell-server@0.4.0
 simple:authenticate-user-by-token@1.0.1
 simple:json-routes@2.1.0
 simple:rest-accounts-password@1.1.2
 simple:rest-bearer-token-parser@1.0.1
 simple:rest-json-error-handler@1.0.1
+socket-stream-client@0.2.2
 softwarerero:accounts-t9n@1.3.11
 spacebars@1.0.15
 spacebars-compiler@1.1.3
-srp@1.0.10
-standard-minifier-css@1.3.5
-standard-minifier-js@2.2.3
-staringatlights:fast-render@2.16.5
-staringatlights:inject-data@2.0.5
-stylus@2.513.13
+srp@1.0.12
+standard-minifier-css@1.5.4
+standard-minifier-js@2.5.2
+staringatlights:fast-render@3.2.0
+staringatlights:inject-data@2.3.0
 tap:i18n@1.8.2
 templates:tabs@2.3.0
 templating@1.3.2
 templating-compiler@1.3.3
 templating-runtime@1.3.2
 templating-tools@1.1.2
-tracker@1.1.3
+tracker@1.2.0
+twbs:bootstrap@3.3.6
 ui@1.0.13
 underscore@1.0.10
-url@1.1.0
+url@1.2.0
 useraccounts:core@1.14.2
 useraccounts:flow-routing@1.14.2
 useraccounts:unstyled@1.14.2
 verron:autosize@3.0.8
-webapp@1.4.0
+webapp@1.7.5
 webapp-hashing@1.0.9
+wekan-accounts-cas@0.1.0
 wekan-accounts-oidc@1.0.10
+wekan-ldap@0.0.2
+wekan-markdown@1.0.7
 wekan-oidc@1.0.12
 wekan-scrollbar@3.1.3
-wekan:accounts-cas@0.1.0
-wekan:wekan-ldap@0.0.2
 yasaricli:slugify@0.0.7
 zimme:active-route@2.3.2

.pkgr.yml

@@ -0,0 +1,13 @@
+dependencies:
+  - libreadline-dev
+  - libssl-dev
+  - bsdtar
+targets:
+  ubuntu-18.04:
+  ubuntu-16.04:
+  ubuntu-14.04:
+  centos-6:
+  centos-7:
+  debian-10:
+  sles-12:
+  sles-11:

.prettierignore

@@ -0,0 +1,7 @@
+packages/
+node_modules/
+.build/
+.meteor/
+.vscode/
+.tx/
+.github/

.prettierrc

@@ -0,0 +1,8 @@
+{
+  "printWidth": 80,
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "all"
+}

.travis.yml

@@ -1,10 +1,10 @@
-dist: trusty
+dist: disco
 sudo: required
 
 env:
-  TRAVIS_DOCKER_COMPOSE_VERSION: 1.17.0
-  TRAVIS_NODE_VERSION: 8.9.3
-  TRAVIS_NPM_VERSION: 5.5.1
+  TRAVIS_DOCKER_COMPOSE_VERSION: 1.24.0
+  TRAVIS_NODE_VERSION: 8.17.0
+  TRAVIS_NPM_VERSION: latest
 
 before_install:
   - sudo apt-get update -y

.tx/config

@@ -39,7 +39,7 @@ host = https://www.transifex.com
 # tap:i18n requires us to use `-` separator in the language identifiers whereas
 # Transifex uses a `_` separator, without an option to customize it on one side
 # or the other, so we need to do a Manual mapping.
-lang_map = bg_BG:bg, en_GB:en-GB, es_AR:es-AR, el_GR:el, fi_FI:fi, hu_HU:hu, id_ID:id, mn_MN:mn, no:nb, lv_LV:lv, pt_BR:pt-BR, ro_RO:ro, zh_CN:zh-CN, zh_TW:zh-TW
+lang_map = bg_BG:bg, en_GB:en-GB, es_AR:es-AR, el_GR:el, fi_FI:fi, hu_HU:hu, id_ID:id, mn_MN:mn, no:nb, lv_LV:lv, pt_BR:pt-BR, ro_RO:ro, sl_SI:sl, zh_CN:zh-CN, zh_TW:zh-TW, zh_HK:zh-HK
 
 [wekan.application]
 file_filter = i18n/<lang>.i18n.json

.vscode/launch.json

@@ -0,0 +1,28 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+      {
+          "type": "chrome",
+          "request": "launch",
+          "name": "Meteor: Chrome",
+          "url": "http://localhost:3000",
+          "webRoot": "${workspaceFolder}"
+      },
+      {
+          "type": "node",
+          "request": "launch",
+          "name": "Meteor: Node",
+          "runtimeExecutable": "/home/wekan/.meteor/meteor",
+          "runtimeArgs": ["run", "--inspect-brk=9229"],
+          "outputCapture": "std",
+          "port": 9229,
+          "timeout": 60000
+      }
+  ],
+  "compounds": [
+      {
+          "name": "Meteor: All",
+          "configurations": ["Meteor: Node", "Meteor: Chrome"]
+      }
+  ]
+}

Dockerfile

@@ -1,111 +1,17 @@
-FROM ubuntu:cosmic
+FROM ubuntu:rolling
 LABEL maintainer="wekan"
 
-# Declare Arguments
-ARG DEBUG
-ARG NODE_VERSION
-ARG METEOR_RELEASE
-ARG METEOR_EDGE
-ARG USE_EDGE
-ARG NPM_VERSION
-ARG FIBERS_VERSION
-ARG ARCHITECTURE
-ARG SRC_PATH
-ARG WITH_API
-ARG ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE
-ARG ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD
-ARG ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW
-ARG ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE
-ARG ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD
-ARG ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW
-ARG EMAIL_NOTIFICATION_TIMEOUT
-ARG MATOMO_ADDRESS
-ARG MATOMO_SITE_ID
-ARG MATOMO_DO_NOT_TRACK
-ARG MATOMO_WITH_USERNAME
-ARG BROWSER_POLICY_ENABLED
-ARG TRUSTED_URL
-ARG WEBHOOKS_ATTRIBUTES
-ARG OAUTH2_ENABLED
-ARG OAUTH2_LOGIN_STYLE
-ARG OAUTH2_CLIENT_ID
-ARG OAUTH2_SECRET
-ARG OAUTH2_SERVER_URL
-ARG OAUTH2_AUTH_ENDPOINT
-ARG OAUTH2_USERINFO_ENDPOINT
-ARG OAUTH2_TOKEN_ENDPOINT
-ARG OAUTH2_ID_MAP
-ARG OAUTH2_USERNAME_MAP
-ARG OAUTH2_FULLNAME_MAP
-ARG OAUTH2_EMAIL_MAP
-ARG LDAP_ENABLE
-ARG LDAP_PORT
-ARG LDAP_HOST
-ARG LDAP_BASEDN
-ARG LDAP_LOGIN_FALLBACK
-ARG LDAP_RECONNECT
-ARG LDAP_TIMEOUT
-ARG LDAP_IDLE_TIMEOUT
-ARG LDAP_CONNECT_TIMEOUT
-ARG LDAP_AUTHENTIFICATION
-ARG LDAP_AUTHENTIFICATION_USERDN
-ARG LDAP_AUTHENTIFICATION_PASSWORD
-ARG LDAP_LOG_ENABLED
-ARG LDAP_BACKGROUND_SYNC
-ARG LDAP_BACKGROUND_SYNC_INTERVAL
-ARG LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED
-ARG LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS
-ARG LDAP_ENCRYPTION
-ARG LDAP_CA_CERT
-ARG LDAP_REJECT_UNAUTHORIZED
-ARG LDAP_USER_SEARCH_FILTER
-ARG LDAP_USER_SEARCH_SCOPE
-ARG LDAP_USER_SEARCH_FIELD
-ARG LDAP_SEARCH_PAGE_SIZE
-ARG LDAP_SEARCH_SIZE_LIMIT
-ARG LDAP_GROUP_FILTER_ENABLE
-ARG LDAP_GROUP_FILTER_OBJECTCLASS
-ARG LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE
-ARG LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE
-ARG LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT
-ARG LDAP_GROUP_FILTER_GROUP_NAME
-ARG LDAP_UNIQUE_IDENTIFIER_FIELD
-ARG LDAP_UTF8_NAMES_SLUGIFY
-ARG LDAP_USERNAME_FIELD
-ARG LDAP_FULLNAME_FIELD
-ARG LDAP_EMAIL_FIELD
-ARG LDAP_EMAIL_MATCH_ENABLE
-ARG LDAP_EMAIL_MATCH_REQUIRE
-ARG LDAP_EMAIL_MATCH_VERIFIED
-ARG LDAP_MERGE_EXISTING_USERS
-ARG LDAP_SYNC_USER_DATA
-ARG LDAP_SYNC_USER_DATA_FIELDMAP
-ARG LDAP_SYNC_GROUP_ROLES
-ARG LDAP_DEFAULT_DOMAIN
-ARG LDAP_SYNC_ADMIN_STATUS
-ARG LDAP_SYNC_ADMIN_GROUPS
-ARG HEADER_LOGIN_ID
-ARG HEADER_LOGIN_FIRSTNAME
-ARG HEADER_LOGIN_LASTNAME
-ARG HEADER_LOGIN_EMAIL
-ARG LOGOUT_WITH_TIMER
-ARG LOGOUT_IN
-ARG LOGOUT_ON_HOURS
-ARG LOGOUT_ON_MINUTES
-ARG CORS
-ARG DEFAULT_AUTHENTICATION_METHOD
-
 # Set the environment variables (defaults where required)
 # DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
 # ENV BUILD_DEPS="paxctl"
-ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential python python3 python3-distutils git ca-certificates gcc-7" \
+ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates python3" \
     DEBUG=false \
-    NODE_VERSION=v8.15.1 \
-    METEOR_RELEASE=1.6.0.1 \
+    NODE_VERSION=v8.17.0 \
+    METEOR_RELEASE=1.8.1 \
     USE_EDGE=false \
     METEOR_EDGE=1.5-beta.17 \
     NPM_VERSION=latest \
-    FIBERS_VERSION=2.0.0 \
+    FIBERS_VERSION=4.0.1 \
     ARCHITECTURE=linux-x64 \
     SRC_PATH=./ \
     WITH_API=true \
@@ -115,6 +21,14 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
     ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE=3 \
     ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD=60 \
     ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW=15 \
+    RICHER_CARD_COMMENT_EDITOR=true \
+    CARD_OPENED_WEBHOOK_ENABLED=false \
+    ATTACHMENTS_STORE_PATH="" \
+    MAX_IMAGE_PIXEL="" \
+    IMAGE_COMPRESS_RATIO="" \
+    BIGEVENTS_PATTERN=NONE \
+    NOTIFY_DUE_DAYS_BEFORE_AND_AFTER="" \
+    NOTIFY_DUE_AT_HOUR_OF_DAY="" \
     EMAIL_NOTIFICATION_TIMEOUT=30000 \
     MATOMO_ADDRESS="" \
     MATOMO_SITE_ID="" \
@@ -134,6 +48,8 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
     OAUTH2_ID_MAP="" \
     OAUTH2_USERNAME_MAP="" \
     OAUTH2_FULLNAME_MAP="" \
+    OAUTH2_ID_TOKEN_WHITELIST_FIELDS="" \
+    OAUTH2_REQUEST_PERMISSIONS='openid profile email' \
     OAUTH2_EMAIL_MAP="" \
     LDAP_ENABLE=false \
     LDAP_PORT=389 \
@@ -149,12 +65,14 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
     LDAP_AUTHENTIFICATION_PASSWORD="" \
     LDAP_LOG_ENABLED=false \
     LDAP_BACKGROUND_SYNC=false \
-    LDAP_BACKGROUND_SYNC_INTERVAL=100 \
+    LDAP_BACKGROUND_SYNC_INTERVAL="" \
     LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false \
     LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false \
     LDAP_ENCRYPTION=false \
     LDAP_CA_CERT="" \
     LDAP_REJECT_UNAUTHORIZED=false \
+    LDAP_USER_AUTHENTICATION=false \
+    LDAP_USER_AUTHENTICATION_FIELD=uid \
     LDAP_USER_SEARCH_FILTER="" \
     LDAP_USER_SEARCH_SCOPE="" \
     LDAP_USER_SEARCH_FIELD="" \
@@ -190,6 +108,8 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
     LOGOUT_ON_HOURS="" \
     LOGOUT_ON_MINUTES="" \
     CORS="" \
+    CORS_ALLOW_HEADERS="" \
+    CORS_EXPOSE_HEADERS="" \
     DEFAULT_AUTHENTICATION_METHOD=""
 
 # Copy the app to the image
@@ -202,6 +122,7 @@ RUN \
     \
     # OS dependencies
     apt-get update -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} && \
+    #pip3 install -U pip setuptools wheel && \
     \
     # Meteor installer doesn't work with the default tar binary, so using bsdtar while installing.
     # https://github.com/coreos/bugs/issues/1095#issuecomment-350574389
@@ -257,76 +178,92 @@ RUN \
     mv node-${NODE_VERSION}-${ARCHITECTURE} /opt/nodejs && \
     ln -s /opt/nodejs/bin/node /usr/bin/node && \
     ln -s /opt/nodejs/bin/npm /usr/bin/npm && \
+    mkdir -p /opt/nodejs/lib/node_modules/fibers/.node-gyp /root/.node-gyp/8.16.1 /home/wekan/.config && \
+    chown wekan --recursive /home/wekan/.config && \
     \
     #DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
     #paxctl -mC `which node` && \
     \
-    # Install Node dependencies
+    # Install Node dependencies. Python path for node-gyp.
     npm install -g npm@${NPM_VERSION} && \
-    npm install -g node-gyp && \
-    npm install -g fibers@${FIBERS_VERSION} && \
+    #npm config set python python2.7 && \
+    #npm install -g node-gyp && \
+    #npm install -g fibers@${FIBERS_VERSION} && \
     \
     # Change user to wekan and install meteor
     cd /home/wekan/ && \
-    chown wekan:wekan --recursive /home/wekan && \
-    curl "https://install.meteor.com" -o /home/wekan/install_meteor.sh && \
+    chown wekan --recursive /home/wekan && \
+    #curl "https://install.meteor.com" -o /home/wekan/install_meteor.sh && \
     #curl "https://install.meteor.com/?release=${METEOR_RELEASE}" -o /home/wekan/install_meteor.sh && \
     # OLD: sed -i "s|RELEASE=.*|RELEASE=${METEOR_RELEASE}\"\"|g" ./install_meteor.sh && \
     # Install Meteor forcing its progress
-    sed -i 's/VERBOSITY="--silent"/VERBOSITY="--progress-bar"/' ./install_meteor.sh && \
+    #sed -i 's/VERBOSITY="--silent"/VERBOSITY="--progress-bar"/' ./install_meteor.sh && \
     echo "Starting meteor ${METEOR_RELEASE} installation...   \n" && \
-    chown wekan:wekan /home/wekan/install_meteor.sh && \
+    gosu wekan:wekan curl https://install.meteor.com/ | /bin/sh && \
+    mv /root/.meteor /home/wekan/ && \
+    chown wekan --recursive /home/wekan/.meteor && \
     \
     # Check if opting for a release candidate instead of major release
-    if [ "$USE_EDGE" = false ]; then \
-      gosu wekan:wekan sh /home/wekan/install_meteor.sh; \
-    else \
-      gosu wekan:wekan git clone --recursive --depth 1 -b release/METEOR@${METEOR_EDGE} git://github.com/meteor/meteor.git /home/wekan/.meteor; \
-    fi; \
-    \
+    #if [ "$USE_EDGE" = false ]; then \
+      #gosu wekan:wekan sh /home/wekan/install_meteor.sh; \
+    #  gosu wekan:wekan curl https://install.meteor.com/ | sh; \
+    #else \
+    #  gosu wekan:wekan git clone --recursive --depth 1 -b release/METEOR@${METEOR_EDGE} https://github.com/meteor/meteor.git /home/wekan/.meteor; \
+    #fi; \
+    #\
     # Get additional packages
-    mkdir -p /home/wekan/app/packages && \
-    chown wekan:wekan --recursive /home/wekan && \
-    cd /home/wekan/app/packages && \
-    gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/flow-router.git kadira-flow-router && \
-    gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \
-    gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-cas.git && \
-    gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git && \
-    gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-scrollbar.git && \
-    gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-oidc.git && \
-    gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc && \
-    gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc && \
-    gosu wekan:wekan rm -rf meteor-accounts-oidc && \
+    #mkdir -p /home/wekan/app/packages && \
+    #chown wekan:wekan --recursive /home/wekan && \
+    # REPOS BELOW ARE INCLUDED TO WEKAN REPO
+    #cd /home/wekan/app/packages && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git && \
+    #gosu wekan:wekan git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git && \
+    #gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan-accounts-oidc && \
+    #gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_oidc wekan-oidc && \
+    #gosu wekan:wekan rm -rf meteor-accounts-oidc && \
     sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js && \
     cd /home/wekan/.meteor && \
     gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \
     \
     # extract the OpenAPI specification
-    npm install -g api2html && \
-    mkdir -p /home/wekan/python && \
-    chown wekan:wekan --recursive /home/wekan/python && \
-    cd /home/wekan/python && \
-    gosu wekan:wekan git clone --depth 1 -b master git://github.com/Kronuz/esprima-python && \
-    cd /home/wekan/python/esprima-python && \
-    python3 setup.py install --record files.txt && \
-    cd /home/wekan/app &&\
-    mkdir -p ./public/api && \
-    python3 ./openapi/generate_openapi.py --release $(git describe --tags --abbrev=0) > ./public/api/wekan.yml && \
-    /opt/nodejs/bin/api2html -c ./public/logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml; \
+    #npm install -g api2html@0.3.3 && \
+    #mkdir -p /home/wekan/python && \
+    #chown wekan --recursive /home/wekan/python && \
+    #cd /home/wekan/python && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/Kronuz/esprima-python && \
+    #cd /home/wekan/python/esprima-python && \
+    #python3 setup.py install --record files.txt && \
+    #cd /home/wekan/app && \
+    #mkdir -p /home/wekan/app/public/api && \
+    #chown wekan --recursive /home/wekan/app && \
+    #gosu wekan:wekan python3 ./openapi/generate_openapi.py --release $(git describe --tags --abbrev=0) > ./public/api/wekan.yml && \
+    #gosu wekan:wekan /opt/nodejs/bin/api2html -c ./public/logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml; \
     # Build app
     cd /home/wekan/app && \
-    gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \
-    gosu wekan:wekan /home/wekan/.meteor/meteor npm install && \
+    mkdir -p /home/wekan/.npm && \
+    chown wekan --recursive /home/wekan/.npm /home/wekan/.config /home/wekan/.meteor && \
+    #gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \
+    gosu wekan:wekan npm install && \
     gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \
     cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \
-    rm /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs && \
-    chown wekan:wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \
+    #rm /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs && \
+    chown wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \
     #Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
     #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
     #https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c
     #cd /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt && \
     #gosu wekan:wekan rm -rf node_modules/bcrypt && \
     #gosu wekan:wekan npm install bcrypt && \
+    #
+    # Delete phantomjs
+    #cd /home/wekan/app_build/bundle && \
+    #find . -name "*phantomjs*" | xargs rm -rf && \
+    #
     cd /home/wekan/app_build/bundle/programs/server/ && \
     gosu wekan:wekan npm install && \
     #gosu wekan:wekan npm install bcrypt && \
@@ -342,10 +279,10 @@ RUN \
     rm -R /var/lib/apt/lists/* && \
     rm -R /home/wekan/.meteor && \
     rm -R /home/wekan/app && \
-    rm -R /home/wekan/app_build && \
-    cat /home/wekan/python/esprima-python/files.txt | xargs rm -R && \
-    rm -R /home/wekan/python && \
-    rm /home/wekan/install_meteor.sh
+    rm -R /home/wekan/app_build
+    #cat /home/wekan/python/esprima-python/files.txt | xargs rm -R && \
+    #rm -R /home/wekan/python
+    #rm /home/wekan/install_meteor.sh
 
 ENV PORT=8080
 EXPOSE $PORT

README.md

@@ -9,6 +9,7 @@
 [![Code Climate](https://codeclimate.com/github/wekan/wekan/badges/gpa.svg "Code Climate")](https://codeclimate.com/github/wekan/wekan)
 [![Project Dependencies](https://david-dm.org/wekan/wekan.svg "Project Dependencies")](https://david-dm.org/wekan/wekan)
 [![Code analysis at Open Hub](https://img.shields.io/badge/code%20analysis-at%20Open%20Hub-brightgreen.svg "Code analysis at Open Hub")](https://www.openhub.net/p/wekan)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwekan%2Fwekan.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwekan%2Fwekan?ref=badge_shield)
 
 ## [Translate Wekan at Transifex](https://transifex.com/wekan/wekan)
 
@@ -53,14 +54,13 @@ that by providing one-click installation on various platforms.
 - [Features][features]: Wekan has real-time user interface.
 - [Platforms][platforms]: Wekan supports many platforms.
   Wekan is critical part of new platforms Wekan is currently being integrated to.
-- [Integrations][integrations]: Current possible integrations and future plans.
 
 ## Requirements
 
 - 64bit: Linux [Snap](https://github.com/wekan/wekan-snap/wiki/Install) or [Sandstorm](https://sandstorm.io) /
   [Mac](https://github.com/wekan/wekan/wiki/Mac) / [Windows](https://github.com/wekan/wekan/wiki/Install-Wekan-from-source-on-Windows).
-  [More Platforms](https://github.com/wekan/wekan/wiki/Platforms). [ARM progress](https://github.com/wekan/wekan/issues/1053#issuecomment-410919264).
-- 1 GB RAM minimum free for Wekan. Production server should have miminum total 4 GB RAM.
+  [More Platforms](https://github.com/wekan/wekan/wiki/Platforms), bundle for RasPi3 ARM and other CPUs where Node.js and MongoDB exists.
+- 1 GB RAM minimum free for Wekan. Production server should have minimum total 4 GB RAM.
   For thousands of users, for example with [Docker](https://github.com/wekan/wekan/blob/devel/docker-compose.yml): 3 frontend servers,
   each having 2 CPU and 2 wekan-app containers. One backend wekan-db server with many CPUs.  
 - Enough disk space and alerts about low disk space. If you run out disk space, MongoDB database gets corrupted.
@@ -73,41 +73,25 @@ that by providing one-click installation on various platforms.
   Bugs, updates, users deleting list or card, harddrive full, harddrive crash etc can eat your data. There is no undo yet.
   Some bug can cause Wekan board to not load at all, requiring manual fixing of database content.
 
-## Roadmap
+## Roadmap and Demo
 
-[Roadmap Milestones](https://github.com/wekan/wekan/milestones)
+[Roadmap][roadmap_wekan] - Public read-only board at Wekan demo.
 
 [Developer Documentation][dev_docs]
 
 - There is many companies and individuals contributing code to Wekan, to add features and bugfixes
   [many times a day](https://github.com/wekan/wekan/blob/devel/CHANGELOG.md).
 - [Please add Add new Feature Requests and Bug Reports immediately](https://github.com/wekan/wekan/issues).
-- [Commercial Support](https://wekan.team).
-- [Bounties](https://wekan.team/bounties/index.html).
+- [Commercial Support](https://wekan.team/commercial-support/).
 
 We also welcome sponsors for features and bugfixes.
 By working directly with Wekan you get the benefit of active maintenance and new features added by growing Wekan developer community.
 
-## Demo
-
-[Wekan demo][roadmap_wefork]
-
 ## Screenshot
 
 [More screenshots at Features page](https://github.com/wekan/wekan/wiki/Features)
 
-[![Screenshot of Wekan][screenshot_wefork]][roadmap_wefork]
-
-## Stable
-
-- master+devel branch. At release, devel is merged to master.
-- Receives fixes and features that have been tested at edge that they work.
-- If you want automatic updates, [use Snap](https://github.com/wekan/wekan-snap/wiki/Install).
-- If you want to test before update, [use Docker quay.io release tags](https://github.com/wekan/wekan/wiki/Docker).
-
-## Edge
-
-- edge branch. All new fixes and features are added to here first. [Testing Edge](https://github.com/wekan/wekan-snap/wiki/Snap-Developer-Docs).
+[![Screenshot of Wekan][screenshot_wekan]][roadmap_wekan]
 
 ## License
 
@@ -116,14 +100,11 @@ with [Meteor](https://www.meteor.com).
 
 [platforms]: https://github.com/wekan/wekan/wiki/Platforms
 [dev_docs]: https://github.com/wekan/wekan/wiki/Developer-Documentation
-[screenshot_wekan]: http://i.imgur.com/cI4jW2h.png
-[screenshot_wefork]: https://wekan.github.io/wekan-markdown.png
+[screenshot_wekan]: https://wekan.github.io/wekan-markdown.png
 [features]: https://github.com/wekan/wekan/wiki/Features
-[integrations]: https://github.com/wekan/wekan/wiki/Integrations
-[roadmap_wekan]: http://try.wekan.io/b/MeSsFJaSqeuo9M6bs/wekan-roadmap
-[roadmap_wefork]: https://wekan.indie.host/b/t2YaGmyXgNkppcFBq/wekan-fork-roadmap
+[roadmap_wekan]: https://boards.wekan.team/b/D2SzJKZDS4Z48yeQH/wekan-open-source-kanban-board-with-mit-license
+[wekan_issues]: https://github.com/wekan/wekan/issues
 [wekan_issues]: https://github.com/wekan/wekan/issues
-[wefork_issues]: https://github.com/wefork/wekan/issues
 [docker_image]: https://hub.docker.com/r/wekanteam/wekan/
 [travis_badge]: https://travis-ci.org/wekan/wekan.svg?branch=devel
 [travis_status]: https://travis-ci.org/wekan/wekan
@@ -133,3 +114,6 @@ with [Meteor](https://www.meteor.com).
 [free_software]: https://en.wikipedia.org/wiki/Free_software
 [vanila_badge]: https://vanila.io/img/join-chat-button2.png
 [wekan_chat]: https://community.vanila.io/wekan
+
+
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwekan%2Fwekan.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwekan%2Fwekan?ref=badge_large)

Stackerfile.yml

@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.52.0"
+appVersion: "v3.64.0"
 files:
   userUploads:
     - README.md

client/components/activities/activities.jade

@@ -201,7 +201,25 @@ template(name="cardActivities")
           .activity-checklist(href="{{ card.absoluteUrl }}")
             +viewer
               = checklistItem.title
+        
+        if(currentData.timeKey)
+          | {{{_ activityType }}}
+          = ' '
+          i(title=currentData.timeValue).activity-meta {{ moment currentData.timeValue 'LLL' }}
+          if (currentData.timeOldValue)
+              = ' '                                                                                    
+              | {{{_ "previous_as" }}}
+              = ' '
+              i(title=currentData.timeOldValue).activity-meta {{ moment currentData.timeOldValue 'LLL' }}
+          = ' @'
+        else if(currentData.timeValue)
+          | {{{_ activityType currentData.timeValue}}}
+        
 
+        if($eq activityType 'deleteComment')
+          | {{{_ 'activity-deleteComment' currentData.commentId}}}.
+        if($eq activityType 'editComment')
+          | {{{_ 'activity-editComment' currentData.commentId}}}.
         if($eq activityType 'addComment')
           +inlinedForm(classNames='js-edit-comment')
             +editor(autofocus=true)

client/components/activities/activities.js

@@ -13,7 +13,7 @@ BlazeComponent.extendComponent({
       let thisId, searchId;
       if (mode === 'linkedcard' || mode === 'linkedboard') {
         thisId = Session.get('currentCard');
-        searchId = Cards.findOne({_id: thisId}).linkedId;
+        searchId = Cards.findOne({ _id: thisId }).linkedId;
         mode = mode.replace('linked', '');
       } else {
         thisId = Session.get(`current${capitalizedMode}`);
@@ -22,8 +22,7 @@ BlazeComponent.extendComponent({
       const limit = this.page.get() * activitiesPerPage;
       const user = Meteor.user();
       const hideSystem = user ? user.hasHiddenSystemMessages() : false;
-      if (searchId === null)
-        return;
+      if (searchId === null) return;
 
       this.subscribe('activities', mode, searchId, limit, hideSystem, () => {
         this.loadNextPageLocked = false;
@@ -50,9 +49,9 @@ BlazeComponent.extendComponent({
     }
   },
 
-  checkItem(){
+  checkItem() {
     const checkItemId = this.currentData().checklistItemId;
-    const checkItem = ChecklistItems.findOne({_id:checkItemId});
+    const checkItem = ChecklistItems.findOne({ _id: checkItemId });
     return checkItem.title;
   },
 
@@ -66,42 +65,58 @@ BlazeComponent.extendComponent({
 
   cardLink() {
     const card = this.currentData().card();
-    return card && Blaze.toHTML(HTML.A({
-      href: card.absoluteUrl(),
-      'class': 'action-card',
-    }, card.title));
+    return (
+      card &&
+      Blaze.toHTML(
+        HTML.A(
+          {
+            href: card.absoluteUrl(),
+            class: 'action-card',
+          },
+          card.title,
+        ),
+      )
+    );
   },
 
-  lastLabel(){
+  lastLabel() {
     const lastLabelId = this.currentData().labelId;
-    if (!lastLabelId)
-      return null;
-    const lastLabel = Boards.findOne(Session.get('currentBoard')).getLabelById(lastLabelId);
-    if(lastLabel.name === undefined || lastLabel.name === ''){
+    if (!lastLabelId) return null;
+    const lastLabel = Boards.findOne(Session.get('currentBoard')).getLabelById(
+      lastLabelId,
+    );
+    if (lastLabel && (lastLabel.name === undefined || lastLabel.name === '')) {
       return lastLabel.color;
-    }else{
+    } else {
       return lastLabel.name;
     }
   },
 
-  lastCustomField(){
-    const lastCustomField = CustomFields.findOne(this.currentData().customFieldId);
-    if (!lastCustomField)
-      return null;
+  lastCustomField() {
+    const lastCustomField = CustomFields.findOne(
+      this.currentData().customFieldId,
+    );
+    if (!lastCustomField) return null;
     return lastCustomField.name;
   },
 
-  lastCustomFieldValue(){
-    const lastCustomField = CustomFields.findOne(this.currentData().customFieldId);
-    if (!lastCustomField)
-      return null;
+  lastCustomFieldValue() {
+    const lastCustomField = CustomFields.findOne(
+      this.currentData().customFieldId,
+    );
+    if (!lastCustomField) return null;
     const value = this.currentData().value;
-    if (lastCustomField.settings.dropdownItems && lastCustomField.settings.dropdownItems.length > 0) {
-      const dropDownValue = _.find(lastCustomField.settings.dropdownItems, (item) => {
-        return item._id === value;
-      });
-      if (dropDownValue)
-        return dropDownValue.name;
+    if (
+      lastCustomField.settings.dropdownItems &&
+      lastCustomField.settings.dropdownItems.length > 0
+    ) {
+      const dropDownValue = _.find(
+        lastCustomField.settings.dropdownItems,
+        item => {
+          return item._id === value;
+        },
+      );
+      if (dropDownValue) return dropDownValue.name;
     }
     return value;
   },
@@ -112,11 +127,16 @@ BlazeComponent.extendComponent({
 
   sourceLink() {
     const source = this.currentData().source;
-    if(source) {
-      if(source.url) {
-        return Blaze.toHTML(HTML.A({
-          href: source.url,
-        }, source.system));
+    if (source) {
+      if (source.url) {
+        return Blaze.toHTML(
+          HTML.A(
+            {
+              href: source.url,
+            },
+            source.system,
+          ),
+        );
       } else {
         return source.system;
       }
@@ -133,38 +153,50 @@ BlazeComponent.extendComponent({
   attachmentLink() {
     const attachment = this.currentData().attachment();
     // trying to display url before file is stored generates js errors
-    return attachment && attachment.url({ download: true }) && Blaze.toHTML(HTML.A({
-      href: attachment.url({ download: true }),
-      target: '_blank',
-    }, attachment.name()));
+    return (
+      attachment &&
+      attachment.url({ download: true }) &&
+      Blaze.toHTML(
+        HTML.A(
+          {
+            href: attachment.url({ download: true }),
+            target: '_blank',
+          },
+          attachment.name(),
+        ),
+      )
+    );
   },
 
   customField() {
     const customField = this.currentData().customField();
-    if (!customField)
-      return null;
+    if (!customField) return null;
     return customField.name;
   },
 
   events() {
-    return [{
-      // XXX We should use Popup.afterConfirmation here
-      'click .js-delete-comment'() {
-        const commentId = this.currentData().commentId;
-        CardComments.remove(commentId);
+    return [
+      {
+        // XXX We should use Popup.afterConfirmation here
+        'click .js-delete-comment'() {
+          const commentId = this.currentData().commentId;
+          CardComments.remove(commentId);
+        },
+        'submit .js-edit-comment'(evt) {
+          evt.preventDefault();
+          const commentText = this.currentComponent()
+            .getValue()
+            .trim();
+          const commentId = Template.parentData().commentId;
+          if (commentText) {
+            CardComments.update(commentId, {
+              $set: {
+                text: commentText,
+              },
+            });
+          }
+        },
       },
-      'submit .js-edit-comment'(evt) {
-        evt.preventDefault();
-        const commentText = this.currentComponent().getValue().trim();
-        const commentId = Template.parentData().commentId;
-        if (commentText) {
-          CardComments.update(commentId, {
-            $set: {
-              text: commentText,
-            },
-          });
-        }
-      },
-    }];
+    ];
   },
 }).register('activities');

client/components/activities/comments.js

@@ -14,45 +14,45 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'click .js-new-comment:not(.focus)'() {
-        commentFormIsOpen.set(true);
+    return [
+      {
+        'submit .js-new-comment-form'(evt) {
+          const input = this.getInput();
+          const text = input.val().trim();
+          const card = this.currentData();
+          let boardId = card.boardId;
+          let cardId = card._id;
+          if (card.isLinkedCard()) {
+            boardId = Cards.findOne(card.linkedId).boardId;
+            cardId = card.linkedId;
+          }
+          if (text) {
+            CardComments.insert({
+              text,
+              boardId,
+              cardId,
+            });
+            resetCommentInput(input);
+            Tracker.flush();
+            autosize.update(input);
+            input.trigger('submitted');
+          }
+          evt.preventDefault();
+        },
+        // Pressing Ctrl+Enter should submit the form
+        'keydown form textarea'(evt) {
+          if (evt.keyCode === 13 && (evt.metaKey || evt.ctrlKey)) {
+            this.find('button[type=submit]').click();
+          }
+        },
       },
-      'submit .js-new-comment-form'(evt) {
-        const input = this.getInput();
-        const text = input.val().trim();
-        const card = this.currentData();
-        let boardId = card.boardId;
-        let cardId = card._id;
-        if (card.isLinkedCard()) {
-          boardId = Cards.findOne(card.linkedId).boardId;
-          cardId = card.linkedId;
-        }
-        if (text) {
-          CardComments.insert({
-            text,
-            boardId,
-            cardId,
-          });
-          resetCommentInput(input);
-          Tracker.flush();
-          autosize.update(input);
-        }
-        evt.preventDefault();
-      },
-      // Pressing Ctrl+Enter should submit the form
-      'keydown form textarea'(evt) {
-        if (evt.keyCode === 13 && (evt.metaKey || evt.ctrlKey)) {
-          this.find('button[type=submit]').click();
-        }
-      },
-    }];
+    ];
   },
 }).register('commentForm');
 
 // XXX This should be a static method of the `commentForm` component
 function resetCommentInput(input) {
-  input.val('');
+  input.val(''); // without manually trigger, input event won't be fired
   input.blur();
   commentFormIsOpen.set(false);
 }
@@ -69,7 +69,8 @@ Tracker.autorun(() => {
   });
 });
 
-EscapeActions.register('inlinedForm',
+EscapeActions.register(
+  'inlinedForm',
   () => {
     const draftKey = {
       fieldName: 'cardComment',
@@ -84,7 +85,10 @@ EscapeActions.register('inlinedForm',
     }
     resetCommentInput(commentInput);
   },
-  () => { return commentFormIsOpen.get(); }, {
+  () => {
+    return commentFormIsOpen.get();
+  },
+  {
     noClickEscapeOn: '.js-new-comment',
-  }
+  },
 );

client/components/boards/boardArchive.js

@@ -4,36 +4,45 @@ BlazeComponent.extendComponent({
   },
 
   archivedBoards() {
-    return Boards.find({ archived: true }, {
-      sort: ['title'],
-    });
+    return Boards.find(
+      { archived: true },
+      {
+        sort: ['title'],
+      },
+    );
   },
 
   events() {
-    return [{
-      'click .js-restore-board'() {
-        // TODO : Make isSandstorm variable global
-        const isSandstorm = Meteor.settings && Meteor.settings.public &&
-          Meteor.settings.public.sandstorm;
-        if (isSandstorm && Session.get('currentBoard')) {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
-          currentBoard.archive();
-        }
-        const board = this.currentData();
-        board.restore();
-        Utils.goBoardId(board._id);
+    return [
+      {
+        'click .js-restore-board'() {
+          // TODO : Make isSandstorm variable global
+          const isSandstorm =
+            Meteor.settings &&
+            Meteor.settings.public &&
+            Meteor.settings.public.sandstorm;
+          if (isSandstorm && Session.get('currentBoard')) {
+            const currentBoard = Boards.findOne(Session.get('currentBoard'));
+            currentBoard.archive();
+          }
+          const board = this.currentData();
+          board.restore();
+          Utils.goBoardId(board._id);
+        },
+        'click .js-delete-board': Popup.afterConfirm('boardDelete', function() {
+          Popup.close();
+          const isSandstorm =
+            Meteor.settings &&
+            Meteor.settings.public &&
+            Meteor.settings.public.sandstorm;
+          if (isSandstorm && Session.get('currentBoard')) {
+            const currentBoard = Boards.findOne(Session.get('currentBoard'));
+            Boards.remove(currentBoard._id);
+          }
+          Boards.remove(this._id);
+          FlowRouter.go('home');
+        }),
       },
-      'click .js-delete-board': Popup.afterConfirm('boardDelete', function() {
-        Popup.close();
-        const isSandstorm = Meteor.settings && Meteor.settings.public &&
-          Meteor.settings.public.sandstorm;
-        if (isSandstorm && Session.get('currentBoard')) {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
-          Boards.remove(currentBoard._id);
-        }
-        Boards.remove(this._id);
-        FlowRouter.go('home');
-      }),
-    }];
+    ];
   },
 }).register('archivedBoards');

client/components/boards/boardBody.jade

@@ -6,8 +6,9 @@ template(name="board")
       else
         +boardBody
     else
-      //- XXX We need a better error message in case the board has been archived
+      //-- XXX We need a better error message in case the board has been archived
       +message(label="board-not-found")
+      //-- | {{goHome}}
   else
     +spinner
 
@@ -30,6 +31,8 @@ template(name="boardBody")
         +listsGroup(currentBoard)
       else if isViewCalendar
         +calendarView
+      else
+        +listsGroup(currentBoard)
 
 template(name="calendarView")
   if isViewCalendar

client/components/boards/boardBody.js

@@ -1,3 +1,5 @@
+import { Cookies } from 'meteor/ostrio:cookies';
+const cookies = new Cookies();
 const subManager = new SubsManager();
 const { calculateIndex, enableClickOnTouch } = Utils;
 const swimlaneWhileSortingHeight = 150;
@@ -12,9 +14,8 @@ BlazeComponent.extendComponent({
     // unfortunatly, Blaze doesn't have this notion.
     this.autorun(() => {
       const currentBoardId = Session.get('currentBoard');
-      if (!currentBoardId)
-        return;
-      const handle = subManager.subscribe('board', currentBoardId);
+      if (!currentBoardId) return;
+      const handle = subManager.subscribe('board', currentBoardId, false);
       Tracker.nonreactive(() => {
         Tracker.autorun(() => {
           this.isBoardReady.set(handle.ready());
@@ -27,6 +28,9 @@ BlazeComponent.extendComponent({
     return Utils.isMiniScreen() && Session.get('currentCard');
   },
 
+  goHome() {
+    FlowRouter.go('home');
+  },
 }).register('board');
 
 BlazeComponent.extendComponent({
@@ -43,7 +47,7 @@ BlazeComponent.extendComponent({
     if (nullSortSwimlanes.count() > 0) {
       const swimlanes = currentBoardData.swimlanes();
       let count = 0;
-      swimlanes.forEach((s) => {
+      swimlanes.forEach(s => {
         Swimlanes.update(s._id, {
           $set: {
             sort: count,
@@ -58,7 +62,7 @@ BlazeComponent.extendComponent({
     if (nullSortLists.count() > 0) {
       const lists = currentBoardData.lists();
       let count = 0;
-      lists.forEach((l) => {
+      lists.forEach(l => {
         Lists.update(l._id, {
           $set: {
             sort: count,
@@ -87,7 +91,6 @@ BlazeComponent.extendComponent({
         helper.append(list.clone());
         return helper;
       },
-      handle: '.js-swimlane-header',
       items: '.swimlane:not(.placeholder)',
       placeholder: 'swimlane placeholder',
       distance: 7,
@@ -106,12 +109,15 @@ BlazeComponent.extendComponent({
         // resize all swimlanes + headers to be a total of 150 px per row
         // this could be achieved by setIsDragging(true) but we want immediate
         // result
-        ui.item.siblings('.js-swimlane').css('height', `${swimlaneWhileSortingHeight - 26}px`);
+        ui.item
+          .siblings('.js-swimlane')
+          .css('height', `${swimlaneWhileSortingHeight - 26}px`);
 
         // set the new scroll height after the resize and insertion of
         // the placeholder. We want the element under the cursor to stay
         // at the same place on the screen
-        ui.item.parent().get(0).scrollTop = ui.placeholder.get(0).offsetTop + parentOffset.top - evt.pageY;
+        ui.item.parent().get(0).scrollTop =
+          ui.placeholder.get(0).offsetTop + parentOffset.top - evt.pageY;
       },
       beforeStop(evt, ui) {
         const parentOffset = ui.item.parent().offset();
@@ -120,7 +126,8 @@ BlazeComponent.extendComponent({
 
         // compute the new scroll height after the resize and removal of
         // the placeholder
-        const scrollTop = ui.placeholder.get(0).offsetTop + parentOffset.top - evt.pageY;
+        const scrollTop =
+          ui.placeholder.get(0).offsetTop + parentOffset.top - evt.pageY;
 
         // then reset the original view of the swimlane
         siblings.removeClass('moving-swimlane');
@@ -150,11 +157,14 @@ BlazeComponent.extendComponent({
       sort(evt, ui) {
         // get the mouse position in the sortable
         const parentOffset = ui.item.parent().offset();
-        const cursorY = evt.pageY - parentOffset.top + ui.item.parent().scrollTop();
+        const cursorY =
+          evt.pageY - parentOffset.top + ui.item.parent().scrollTop();
 
         // compute the intended index of the placeholder (we need to skip the
         // slots between the headers and the list of cards)
-        const newplaceholderIndex = Math.floor(cursorY / swimlaneWhileSortingHeight);
+        const newplaceholderIndex = Math.floor(
+          cursorY / swimlaneWhileSortingHeight,
+        );
         let destPlaceholderIndex = (newplaceholderIndex + 1) * 2;
 
         // if we are scrolling far away from the bottom of the list
@@ -165,9 +175,17 @@ BlazeComponent.extendComponent({
         // update the placeholder position in the DOM tree
         if (destPlaceholderIndex !== ui.placeholder.index()) {
           if (destPlaceholderIndex < boardComponent.origPlaceholderIndex) {
-            ui.placeholder.insertBefore(ui.placeholder.siblings().slice(destPlaceholderIndex - 2, destPlaceholderIndex - 1));
+            ui.placeholder.insertBefore(
+              ui.placeholder
+                .siblings()
+                .slice(destPlaceholderIndex - 2, destPlaceholderIndex - 1),
+            );
           } else {
-            ui.placeholder.insertAfter(ui.placeholder.siblings().slice(destPlaceholderIndex - 1, destPlaceholderIndex));
+            ui.placeholder.insertAfter(
+              ui.placeholder
+                .siblings()
+                .slice(destPlaceholderIndex - 1, destPlaceholderIndex),
+            );
           }
         }
       },
@@ -176,8 +194,40 @@ BlazeComponent.extendComponent({
     // ugly touch event hotfix
     enableClickOnTouch('.js-swimlane:not(.placeholder)');
 
+    this.autorun(() => {
+      let showDesktopDragHandles = false;
+      currentUser = Meteor.user();
+      if (currentUser) {
+        showDesktopDragHandles = (currentUser.profile || {})
+          .showDesktopDragHandles;
+      } else if (cookies.has('showDesktopDragHandles')) {
+        showDesktopDragHandles = true;
+      } else {
+        showDesktopDragHandles = false;
+      }
+      if (
+        Utils.isMiniScreen() ||
+        (!Utils.isMiniScreen() && showDesktopDragHandles)
+      ) {
+        $swimlanesDom.sortable({
+          handle: '.js-swimlane-header-handle',
+        });
+      } else {
+        $swimlanesDom.sortable({
+          handle: '.swimlane-header',
+        });
+      }
+
+      // Disable drag-dropping if the current user is not a board member or is comment only
+      $swimlanesDom.sortable('option', 'disabled', !userIsMember());
+    });
+
     function userIsMember() {
-      return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+      return (
+        Meteor.user() &&
+        Meteor.user().isBoardMember() &&
+        !Meteor.user().isCommentOnly()
+      );
     }
 
     // If there is no data in the board (ie, no lists) we autofocus the list
@@ -189,47 +239,55 @@ BlazeComponent.extendComponent({
   },
 
   isViewSwimlanes() {
-    const currentUser = Meteor.user();
-    if (!currentUser) return false;
-    return (currentUser.profile.boardView === 'board-view-swimlanes');
+    currentUser = Meteor.user();
+    if (currentUser) {
+      return (currentUser.profile || {}).boardView === 'board-view-swimlanes';
+    } else {
+      return cookies.get('boardView') === 'board-view-swimlanes';
+    }
   },
 
   isViewLists() {
-    const currentUser = Meteor.user();
-    if (!currentUser) return true;
-    return (currentUser.profile.boardView === 'board-view-lists');
+    currentUser = Meteor.user();
+    if (currentUser) {
+      return (currentUser.profile || {}).boardView === 'board-view-lists';
+    } else {
+      return cookies.get('boardView') === 'board-view-lists';
+    }
   },
 
   isViewCalendar() {
-    const currentUser = Meteor.user();
-    if (!currentUser) return false;
-    return (currentUser.profile.boardView === 'board-view-cal');
+    currentUser = Meteor.user();
+    if (currentUser) {
+      return (currentUser.profile || {}).boardView === 'board-view-cal';
+    } else {
+      return cookies.get('boardView') === 'board-view-cal';
+    }
   },
 
   openNewListForm() {
     if (this.isViewSwimlanes()) {
       this.childComponents('swimlane')[0]
-        .childComponents('addListAndSwimlaneForm')[0].open();
+        .childComponents('addListAndSwimlaneForm')[0]
+        .open();
     } else if (this.isViewLists()) {
       this.childComponents('listsGroup')[0]
-        .childComponents('addListForm')[0].open();
+        .childComponents('addListForm')[0]
+        .open();
     }
   },
   events() {
-    return [{
-      // XXX The board-overlay div should probably be moved to the parent
-      // component.
-      'mouseenter .board-overlay'() {
-        if (this.mouseHasEnterCardDetails) {
-          this.showOverlay.set(false);
-        }
+    return [
+      {
+        // XXX The board-overlay div should probably be moved to the parent
+        // component.
+        mouseup() {
+          if (this._isDragging) {
+            this._isDragging = false;
+          }
+        },
       },
-      'mouseup'() {
-        if (this._isDragging) {
-          this._isDragging = false;
-        }
-      },
-    }];
+    ];
   },
 
   // XXX Flow components allow us to avoid creating these two setter methods by
@@ -241,23 +299,24 @@ BlazeComponent.extendComponent({
 
   scrollLeft(position = 0) {
     const swimlanes = this.$('.js-swimlanes');
-    swimlanes && swimlanes.animate({
-      scrollLeft: position,
-    });
+    swimlanes &&
+      swimlanes.animate({
+        scrollLeft: position,
+      });
   },
 
   scrollTop(position = 0) {
     const swimlanes = this.$('.js-swimlanes');
-    swimlanes && swimlanes.animate({
-      scrollTop: position,
-    });
+    swimlanes &&
+      swimlanes.animate({
+        scrollTop: position,
+      });
   },
-
 }).register('boardBody');
 
 BlazeComponent.extendComponent({
   onRendered() {
-    this.autorun(function(){
+    this.autorun(function() {
       $('#calendar-view').fullCalendar('refetchEvents');
     });
   },
@@ -269,7 +328,8 @@ BlazeComponent.extendComponent({
       timezone: 'local',
       header: {
         left: 'title   today prev,next',
-        center: 'agendaDay,listDay,timelineDay agendaWeek,listWeek,timelineWeek month,timelineMonth timelineYear',
+        center:
+          'agendaDay,listDay,timelineDay agendaWeek,listWeek,timelineWeek month,timelineMonth timelineYear',
         right: '',
       },
       // height: 'parent', nope, doesn't work as the parent might be small
@@ -279,7 +339,7 @@ BlazeComponent.extendComponent({
       nowIndicator: true,
       businessHours: {
         // days of week. an array of zero-based day of week integers (0=Sunday)
-        dow: [ 1, 2, 3, 4, 5 ], // Monday - Friday
+        dow: [1, 2, 3, 4, 5], // Monday - Friday
         start: '8:00',
         end: '18:00',
       },
@@ -287,19 +347,45 @@ BlazeComponent.extendComponent({
       events(start, end, timezone, callback) {
         const currentBoard = Boards.findOne(Session.get('currentBoard'));
         const events = [];
-        currentBoard.cardsInInterval(start.toDate(), end.toDate()).forEach(function(card){
+        const pushEvent = function(card, title, start, end, extraCls) {
+          start = start || card.startAt;
+          end = end || card.endAt;
+          title = title || card.title;
+          const className =
+            (extraCls ? `${extraCls} ` : '') +
+            (card.color ? `calendar-event-${card.color}` : '');
           events.push({
             id: card._id,
-            title: card.title,
-            start: card.startAt,
-            end: card.endAt,
-            allDay: Math.abs(card.endAt.getTime() - card.startAt.getTime()) / 1000 === 24*3600,
+            title,
+            start,
+            end: end || card.endAt,
+            allDay:
+              Math.abs(end.getTime() - start.getTime()) / 1000 === 24 * 3600,
             url: FlowRouter.url('card', {
               boardId: currentBoard._id,
               slug: currentBoard.slug,
               cardId: card._id,
             }),
+            className,
           });
+        };
+        currentBoard
+          .cardsInInterval(start.toDate(), end.toDate())
+          .forEach(function(card) {
+            pushEvent(card);
+          });
+        currentBoard
+          .cardsDueInBetween(start.toDate(), end.toDate())
+          .forEach(function(card) {
+            pushEvent(
+              card,
+              `${card.title} ${TAPi18n.__('card-due')}`,
+              card.dueAt,
+              new Date(card.dueAt.getTime() + 36e5),
+            );
+          });
+        events.sort(function(first, second) {
+          return first.id > second.id ? 1 : -1;
         });
         callback(events);
       },
@@ -333,8 +419,11 @@ BlazeComponent.extendComponent({
     };
   },
   isViewCalendar() {
-    const currentUser = Meteor.user();
-    if (!currentUser) return false;
-    return (currentUser.profile.boardView === 'board-view-cal');
+    currentUser = Meteor.user();
+    if (currentUser) {
+      return (currentUser.profile || {}).boardView === 'board-view-cal';
+    } else {
+      return cookies.get('boardView') === 'board-view-cal';
+    }
   },
 }).register('calendarView');

client/components/boards/boardBody.styl

@@ -50,6 +50,84 @@ position()
         display: flex
         flex-direction: column
         margin: 0
-        padding: 0 40px 0px 0
+        padding: 0 0px 0px 0
         overflow-x: hidden
         overflow-y: auto
+
+calendar-event-color(background, borderColor, color...)
+  background: background !important
+  border-color: borderColor
+  if color
+    color: color !important //overwrite text for better visibility
+
+.calendar-event-green
+  calendar-event-color(#3cb500, #2a8000, #ffffff) //White text for better visibility
+
+.calendar-event-yellow
+  calendar-event-color(#fad900, #c7ac00, #000) //Black text for better visibility
+
+.calendar-event-orange
+  calendar-event-color(#ff9f19, #cc7c14, #000) //Black text for better visibility
+
+.calendar-event-red
+  calendar-event-color(#eb4646, #b83737, #ffffff) //White text for better visibility
+
+.calendar-event-purple
+  calendar-event-color(#a632db, #7d26a6, #ffffff) //White text for better visibility
+
+.calendar-event-blue
+  calendar-event-color(#0079bf, #005a8a, #ffffff) //White text for better visibility
+
+.calendar-event-pink
+  calendar-event-color(#ff78cb, #cc62a3, #000) //Black text for better visibility
+
+.calendar-event-sky
+  calendar-event-color(#00c2e0, #0094ab, #ffffff) //White text for better visibility
+
+.calendar-event-black
+  calendar-event-color(#4d4d4d, #1a1a1a, #ffffff) //White text for better visibility
+
+.calendar-event-lime
+  calendar-event-color(#51e898, #3eb375, #000) //Black text for better visibility
+
+.calendar-event-silver
+  calendar-event-color(#c0c0c0, #8c8c8c, #000) //Black text for better visibility
+
+.calendar-event-peachpuff
+  calendar-event-color(#ffdab9, #ccaf95, #000) //Black text for better visibility
+
+.calendar-event-crimson
+  calendar-event-color(#dc143c, #a8112f, #ffffff) //White text for better visibility
+
+.calendar-event-plum
+  calendar-event-color(#dda0dd, #a87ba8, #000) //Black text for better visibility
+
+.calendar-event-darkgreen
+  calendar-event-color(#006400, #003000, #ffffff) //White text for better visibility
+
+.calendar-event-slateblue
+  calendar-event-color(#6a5acd, #4f4399, #ffffff) //White text for better visibility
+
+.calendar-event-magenta
+  calendar-event-color(#ff00ff, #cc00cc, #ffffff) //White text for better visibility
+
+.calendar-event-gold
+  calendar-event-color(#ffd700, #ccaa00, #000) //Black text for better visibility
+
+.calendar-event-navy
+  calendar-event-color(#000080, #000033, #ffffff) //White text for better visibility
+
+.calendar-event-gray
+  calendar-event-color(#808080, #333333, #ffffff) //White text for better visibility
+
+.calendar-event-saddlebrown
+  calendar-event-color(#8b4513, #572b0c, #ffffff) //White text for better visibility
+
+.calendar-event-paleturquoise
+  calendar-event-color(#afeeee, #8ababa, #000) //Black text for better visibility
+
+.calendar-event-mistyrose
+  calendar-event-color(#ffe4e1, #ccb8b6, #000) //Black text for better visibility
+
+.calendar-event-indigo
+  calendar-event-color(#4b0082, #2b004d, #ffffff) //White text for better visibility

client/components/boards/boardColors.styl

@@ -87,3 +87,209 @@ setBoardColor(color)
 
 .board-color-pumpkin
   setBoardColor(#E67E22)
+
+.board-color-moderatepink
+  setBoardColor(#CD5A91)
+
+.board-color-strongcyan
+  setBoardColor(#00AECC)
+
+.board-color-limegreen
+  setBoardColor(#4BBF6B)
+
+.board-color-dark
+  setBoardColor(#2C3E51)
+
+  /* Not hidden in dark mode.
+    card fields: received, start, due, end, members, requested, assigned
+  .card-details-item.card-details-item-received,
+  .card-details-item.card-details-item-start,
+  .card-details-item.card-details-item-due,
+  .card-details-item.card-details-item-end,
+  .card-details-item.card-details-item-members,
+  .card-details-item.card-details-item-name { display:none; }
+  .card-details-items:empty { display:none; }
+  */
+
+  // DARK MODE, when dark background mode selected.
+  // Modified version from https://github.com/wekan/wekan/wiki/Custom-CSS-themes#dark-theme
+  // In progress, please send pull requests to fix remaining visibility issues.
+  .ui-sortable,
+  .swimlane,
+  .swimlane >.swimlane-header-wrap,
+  .swimlane >.list.js-list,
+  .swimlane >.list-composer.js-list-composer,
+  .list-body,
+  .list,
+  .list-composer,
+  .sidebar-content,
+  .card-details
+    background-color:#2C3E50
+
+  .card-details h3,
+  .card-details-items,
+  .card-checklist-items .ui-sortable,
+  .card-subtasks-items,
+  .activities,
+  .material-toggle-switch
+    color:#bbbbbb
+
+  .list-header
+    background-color: #888888
+
+  .board-widget,
+  .board-widget-labels,
+  .board-widget-members
+    color: #aaaaaa
+
+  /* popup menu titles (boards, swimlanes, lists, cards, labels) */
+  .pop-over >.header
+    display:none;
+
+  /* HIDE UNTIL HOVER -------------------------------------------------- */
+
+  /* header "+" button */
+  #header-quick-access .fa-plus
+    display:none
+  #header-quick-access:hover .fa-plus
+    display:inherit
+
+  /* "add card" links (use visibility rather than display so items don't jump) */
+  .open-minicard-composer
+    visibility:hidden
+
+  .list.js-list:hover .open-minicard-composer
+    visibility:visible
+
+  .list-header-menu
+    visibility:hidden
+
+  .list.js-list:hover .list-header-menu
+    visibility:visible
+
+  /* "add list/swimlane" links (use visibility rather than display so items don't jump) */
+  .list.js-list-composer       >.list-header
+    visibility:hidden
+
+  .list.js-list-composer:hover >.list-header
+    visibility:visible
+
+  /* headers */
+  #header-quick-access, #header
+    background-color:rgba(0,0,0,.75) !important
+
+  #header .board-header-btn:hover
+    background-color:rgba(255,255,255,0.3) !important
+
+  /* foregrounds: swimlanes, lists */
+  .list >.list-header, .swimlane-header
+    color:rgba(255,255,255,.7)
+
+  /* minicards */
+  .minicard
+    background-color:rgba(255,255,255,.4)
+
+  .minicard-wrapper.is-selected .minicard,
+  .minicard:hover,
+  .minicard-composer.js-composer,
+  .open-minicard-composer:hover
+    background-color:rgba(255,255,255,.8) !important
+    color:#000
+
+  .minicard, .minicard .badge
+    color:#fff
+
+  .minicard:hover .badge, .minicard-wrapper.is-selected .badge
+    color:#000
+
+  /* cards */
+  .card-details .card-details-header
+    background-color:#ccc
+
+  /* sidebar */
+  .sidebar-tongue, .sidebar-shadow
+    background-color:#666 !important
+
+  .sidebar-content h3, .sidebar-content h2, .sidebar-content
+    color:rgba(255,255,255,.7) !important
+
+.board-color-relax
+  setBoardColor(#27AE61)
+
+  // RELAX MODE: light green background, with green background color,
+  // to help this theme users to relax.
+  // Colors and emphasis are specific to this Wekan theme contributor's company.
+  .ui-sortable
+    background-color:#a7e366
+
+  .list-header
+    background-color:#a7e366
+    border-bottom: 6px solid #a7e366
+
+  .list-body
+    background-color:#a7e366
+
+  .list
+    border-left: 1px dotted #000000
+
+  // Card details text emphasis: black border and white background
+  // to make it details text field easier to find for RELAX MODE users,
+  // and focus attention.
+  .card-details .card-details-items
+    & ~ .js-open-inlined-form
+        .viewer
+            background-color #ffffff !important
+            padding 15px !important
+            border 1px solid #000000 !important
+            word-wrap: break-word
+
+  // When card has comment, emphasis on minicard:
+  // bigger red comment icon and number of comments,
+  // to make it easier notice card comments and focus attention.
+  .minicard .badges .badge
+    .badge-icon,
+    .badge-text
+      &.badge-comment
+        display: block
+        border-radius: 4px
+        padding: 1px 3px
+        margin-bottom: 0.3rem
+        color: #ff0000
+        background-color: #ffffff
+        font-weight: bold
+        font-size: 11pt
+
+.board-color-corteza
+  setBoardColor(#568BA2)
+
+  /*
+    Wekan for Corteza https://cortezaproject.org
+
+    Theme to match Corteza colors from:
+    https://github.com/cortezaproject/corteza-webapp-messaging/blob/master/src/assets/sass/variables.scss
+
+    // Paths
+    $fonts_dir : './assets/fonts/';
+    $icomoon-font-path: $fonts_dir + 'icomoon' !default;
+    $icomoon-font-family: "icomoon" !default;
+
+    // Typography
+    $regular: 'nunito_sansregular';
+    $bold: 'nunito_sansbold';
+    $semibold: 'nunito_sanssemibold';
+
+    // Color system
+    $white:         #fff !default;
+    $black:         #000 !default;
+    $primary:       #568ba2;
+    $secondary:     #90A3B1;
+    $success:       #719430;
+    $warning:       #F5D380;
+    $danger:        #E85568;
+    $light:         #F3F3F5;
+    $dark:          #1e2224;
+    $currentmymessagebgcolor : #a7d0e3;
+  */
+
+  //.header-quick-access
+  //  backgroud-color: #568ba2

client/components/boards/boardHeader.jade

@@ -77,6 +77,11 @@ template(name="boardHeaderBar")
             i.fa.fa-archive
             span {{_ 'archives'}}
 
+      //if showSort
+      //  a.board-header-btn.js-open-sort-view(title="{{_ 'sort-desc'}}")
+      //    i.fa(class="{{directionClass}}")
+      //    span {{_ 'sort'}}{{_ listSortShortDesc}}
+
       a.board-header-btn.js-open-filter-view(
           title="{{#if Filter.isActive}}{{_ 'filter-on-desc'}}{{else}}{{_ 'filter'}}{{/if}}"
           class="{{#if Filter.isActive}}emphasis{{/if}}")
@@ -85,10 +90,6 @@ template(name="boardHeaderBar")
         if Filter.isActive
           a.board-header-btn-close.js-filter-reset(title="{{_ 'filter-clear'}}")
             i.fa.fa-times-thin
-      if currentUser.isAdmin
-        a.board-header-btn.js-open-rules-view(title="{{_ 'rules'}}")
-          i.fa.fa-magic
-          span {{_ 'rules'}}
 
       a.board-header-btn.js-open-search-view(title="{{_ 'search'}}")
         i.fa.fa-search
@@ -97,8 +98,14 @@ template(name="boardHeaderBar")
       unless currentBoard.isTemplatesBoard
         a.board-header-btn.js-toggle-board-view(
           title="{{_ 'board-view'}}")
-          i.fa.fa-th-large
-          span {{_ currentUser.profile.boardView}}
+          i.fa.fa-caret-down
+          if $eq boardView 'board-view-lists'
+            i.fa.fa-trello
+          if $eq boardView 'board-view-swimlanes'
+            i.fa.fa-th-large
+          if $eq boardView 'board-view-cal'
+            i.fa.fa-calendar
+          span {{#if boardView}}{{_ boardView}}{{else}}{{_ 'board-view-lists'}}{{/if}}
 
       if canModifyBoard
         a.board-header-btn.js-multiselection-activate(
@@ -163,6 +170,44 @@ template(name="boardChangeWatchPopup")
             i.fa.fa-check
           span.sub-name {{_ 'muted-info'}}
 
+template(name="boardChangeViewPopup")
+  ul.pop-over-list
+    li
+      with "board-view-lists"
+        a.js-open-lists-view
+          i.fa.fa-trello.colorful
+          | {{_ 'board-view-lists'}}
+          if $eq Utils.boardView "board-view-lists"
+            i.fa.fa-check
+    li
+      with "board-view-swimlanes"
+        a.js-open-swimlanes-view
+          i.fa.fa-th-large.colorful
+          | {{_ 'board-view-swimlanes'}}
+          if $eq Utils.boardView "board-view-swimlanes"
+            i.fa.fa-check
+    li
+      with "board-view-cal"
+        a.js-open-cal-view
+          i.fa.fa-calendar.colorful
+          | {{_ 'board-view-cal'}}
+          if $eq Utils.boardView "board-view-cal"
+            i.fa.fa-check
+    if currentUser.isAdmin
+      hr
+      li
+        with "board-view-rules"
+          a.js-open-rules-view(title="{{_ 'rules'}}")
+            i.fa.fa-magic
+            | {{_ 'rules'}}
+    else if currentUser.isBoardAdmin
+      hr
+      li
+        with "board-view-rules"
+          a.js-open-rules-view(title="{{_ 'rules'}}")
+            i.fa.fa-magic
+            | {{_ 'rules'}}
+
 template(name="createBoard")
   form
     label
@@ -189,14 +234,28 @@ template(name="createBoard")
       | /
       a.js-board-template {{_ 'template'}}
 
+//template(name="listsortPopup")
+//  h2
+//   | {{_ 'list-sort-by'}}
+//  hr
+//  ul.pop-over-list
+//    each value in allowedSortValues
+//     li
+//      a.js-sort-by(name="{{value.name}}")
+//        if $eq sortby value.name
+//           i(class="fa {{Direction}}")
+//        | {{_ value.label }}{{_ value.shortLabel}}
+//        if $eq sortby value.name
+//           i(class="fa fa-check")
+
 template(name="boardChangeTitlePopup")
   form
     label
       | {{_ 'title'}}
-      input.js-board-name(type="text" value=title autofocus)
+      input.js-board-name(type="text" value=title autofocus dir="auto")
     label
       | {{_ 'description'}}
-      textarea.js-board-desc= description
+      textarea.js-board-desc(dir="auto")= description
     input.primary.wide(type="submit" value="{{_ 'rename'}}")
 
 template(name="boardCreateRulePopup")

client/components/boards/boardHeader.js

@@ -1,3 +1,7 @@
+/*
+const DOWNCLS = 'fa-sort-down';
+const UPCLS = 'fa-sort-up';
+*/
 Template.boardMenuPopup.events({
   'click .js-rename-board': Popup.open('boardChangeTitle'),
   'click .js-custom-fields'() {
@@ -45,15 +49,21 @@ Template.boardMenuPopup.helpers({
 });
 
 Template.boardChangeTitlePopup.events({
-  submit(evt, tpl) {
-    const newTitle = tpl.$('.js-board-name').val().trim();
-    const newDesc = tpl.$('.js-board-desc').val().trim();
+  submit(event, templateInstance) {
+    const newTitle = templateInstance
+      .$('.js-board-name')
+      .val()
+      .trim();
+    const newDesc = templateInstance
+      .$('.js-board-desc')
+      .val()
+      .trim();
     if (newTitle) {
       this.rename(newTitle);
       this.setDescription(newDesc);
       Popup.close();
     }
-    evt.preventDefault();
+    event.preventDefault();
   },
 });
 
@@ -74,67 +84,115 @@ BlazeComponent.extendComponent({
     const currentBoard = Boards.findOne(Session.get('currentBoard'));
     return currentBoard && currentBoard.stars >= 2;
   },
-
+  /*
+  showSort() {
+    return Meteor.user().hasSortBy();
+  },
+  directionClass() {
+    return this.currentDirection() === -1 ? DOWNCLS : UPCLS;
+  },
+  changeDirection() {
+    const direction = 0 - this.currentDirection() === -1 ? '-' : '';
+    Meteor.call('setListSortBy', direction + this.currentListSortBy());
+  },
+  currentDirection() {
+    return Meteor.user().getListSortByDirection();
+  },
+  currentListSortBy() {
+    return Meteor.user().getListSortBy();
+  },
+  listSortShortDesc() {
+    return `list-label-short-${this.currentListSortBy()}`;
+  },
+  */
   events() {
-    return [{
-      'click .js-edit-board-title': Popup.open('boardChangeTitle'),
-      'click .js-star-board'() {
-        Meteor.user().toggleBoardStar(Session.get('currentBoard'));
+    return [
+      {
+        'click .js-edit-board-title': Popup.open('boardChangeTitle'),
+        'click .js-star-board'() {
+          Meteor.user().toggleBoardStar(Session.get('currentBoard'));
+        },
+        'click .js-open-board-menu': Popup.open('boardMenu'),
+        'click .js-change-visibility': Popup.open('boardChangeVisibility'),
+        'click .js-watch-board': Popup.open('boardChangeWatch'),
+        'click .js-open-archived-board'() {
+          Modal.open('archivedBoards');
+        },
+        'click .js-toggle-board-view': Popup.open('boardChangeView'),
+        'click .js-toggle-sidebar'() {
+          Sidebar.toggle();
+        },
+        'click .js-open-filter-view'() {
+          Sidebar.setView('filter');
+        },
+        /*
+        'click .js-open-sort-view'(evt) {
+          const target = evt.target;
+          if (target.tagName === 'I') {
+            // click on the text, popup choices
+            this.changeDirection();
+          } else {
+            // change the sort order
+            Popup.open('listsort')(evt);
+          }
+        },
+        */
+        'click .js-filter-reset'(event) {
+          event.stopPropagation();
+          Sidebar.setView();
+          Filter.reset();
+        },
+        'click .js-open-search-view'() {
+          Sidebar.setView('search');
+        },
+        'click .js-multiselection-activate'() {
+          const currentCard = Session.get('currentCard');
+          MultiSelection.activate();
+          if (currentCard) {
+            MultiSelection.add(currentCard);
+          }
+        },
+        'click .js-multiselection-reset'(event) {
+          event.stopPropagation();
+          MultiSelection.disable();
+        },
+        'click .js-log-in'() {
+          FlowRouter.go('atSignIn');
+        },
       },
-      'click .js-open-board-menu': Popup.open('boardMenu'),
-      'click .js-change-visibility': Popup.open('boardChangeVisibility'),
-      'click .js-watch-board': Popup.open('boardChangeWatch'),
-      'click .js-open-archived-board'() {
-        Modal.open('archivedBoards');
-      },
-      'click .js-toggle-board-view'() {
-        const currentUser = Meteor.user();
-        if (currentUser.profile.boardView === 'board-view-swimlanes') {
-          currentUser.setBoardView('board-view-cal');
-        } else if (currentUser.profile.boardView === 'board-view-lists') {
-          currentUser.setBoardView('board-view-swimlanes');
-        } else if (currentUser.profile.boardView === 'board-view-cal') {
-          currentUser.setBoardView('board-view-lists');
-        }
-      },
-      'click .js-toggle-sidebar'() {
-        Sidebar.toggle();
-      },
-      'click .js-open-filter-view'() {
-        Sidebar.setView('filter');
-      },
-      'click .js-filter-reset'(evt) {
-        evt.stopPropagation();
-        Sidebar.setView();
-        Filter.reset();
-      },
-      'click .js-open-search-view'() {
-        Sidebar.setView('search');
-      },
-      'click .js-open-rules-view'() {
-        Modal.openWide('rulesMain');
-      },
-      'click .js-multiselection-activate'() {
-        const currentCard = Session.get('currentCard');
-        MultiSelection.activate();
-        if (currentCard) {
-          MultiSelection.add(currentCard);
-        }
-      },
-      'click .js-multiselection-reset'(evt) {
-        evt.stopPropagation();
-        MultiSelection.disable();
-      },
-      'click .js-log-in'() {
-        FlowRouter.go('atSignIn');
-      },
-    }];
+    ];
   },
 }).register('boardHeaderBar');
 
 Template.boardHeaderBar.helpers({
   canModifyBoard() {
-    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+    return (
+      Meteor.user() &&
+      Meteor.user().isBoardMember() &&
+      !Meteor.user().isCommentOnly()
+    );
+  },
+  boardView() {
+    return Utils.boardView();
+  },
+});
+
+Template.boardChangeViewPopup.events({
+  'click .js-open-lists-view'() {
+    Utils.setBoardView('board-view-lists');
+    Popup.close();
+  },
+  'click .js-open-swimlanes-view'() {
+    Utils.setBoardView('board-view-swimlanes');
+    Popup.close();
+  },
+  'click .js-open-cal-view'() {
+    Utils.setBoardView('board-view-cal');
+    Popup.close();
+  },
+  'click .js-open-rules-view'() {
+    Modal.openWide('rulesMain');
+    Popup.close();
   },
 });
 
@@ -162,15 +220,17 @@ const CreateBoard = BlazeComponent.extendComponent({
     this.visibilityMenuIsOpen.set(!this.visibilityMenuIsOpen.get());
   },
 
-  onSubmit(evt) {
-    evt.preventDefault();
+  onSubmit(event) {
+    event.preventDefault();
     const title = this.find('.js-new-board-title').value;
     const visibility = this.visibility.get();
 
-    this.boardId.set(Boards.insert({
-      title,
-      permission: visibility,
-    }));
+    this.boardId.set(
+      Boards.insert({
+        title,
+        permission: visibility,
+      }),
+    );
 
     Swimlanes.insert({
       title: 'Default',
@@ -181,26 +241,28 @@ const CreateBoard = BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'click .js-select-visibility'() {
-        this.setVisibility(this.currentData());
+    return [
+      {
+        'click .js-select-visibility'() {
+          this.setVisibility(this.currentData());
+        },
+        'click .js-change-visibility': this.toggleVisibilityMenu,
+        'click .js-import': Popup.open('boardImportBoard'),
+        submit: this.onSubmit,
+        'click .js-import-board': Popup.open('chooseBoardSource'),
+        'click .js-board-template': Popup.open('searchElement'),
       },
-      'click .js-change-visibility': this.toggleVisibilityMenu,
-      'click .js-import': Popup.open('boardImportBoard'),
-      submit: this.onSubmit,
-      'click .js-import-board': Popup.open('chooseBoardSource'),
-      'click .js-board-template': Popup.open('searchElement'),
-    }];
+    ];
   },
 }).register('createBoardPopup');
 
 (class HeaderBarCreateBoard extends CreateBoard {
-  onSubmit(evt) {
-    super.onSubmit(evt);
+  onSubmit(event) {
+    super.onSubmit(event);
     // Immediately star boards crated with the headerbar popup.
     Meteor.user().toggleBoardStar(this.boardId.get());
   }
-}).register('headerBarCreateBoardPopup');
+}.register('headerBarCreateBoardPopup'));
 
 BlazeComponent.extendComponent({
   visibilityCheck() {
@@ -216,9 +278,11 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'click .js-select-visibility': this.selectBoardVisibility,
-    }];
+    return [
+      {
+        'click .js-select-visibility': this.selectBoardVisibility,
+      },
+    ];
   },
 }).register('boardChangeVisibilityPopup');
 
@@ -233,13 +297,93 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'click .js-select-watch'() {
-        const level = this.currentData();
-        Meteor.call('watch', 'board', Session.get('currentBoard'), level, (err, ret) => {
-          if (!err && ret) Popup.close();
-        });
+    return [
+      {
+        'click .js-select-watch'() {
+          const level = this.currentData();
+          Meteor.call(
+            'watch',
+            'board',
+            Session.get('currentBoard'),
+            level,
+            (err, ret) => {
+              if (!err && ret) Popup.close();
+            },
+          );
+        },
       },
-    }];
+    ];
   },
 }).register('boardChangeWatchPopup');
+
+/*
+BlazeComponent.extendComponent({
+  onCreated() {
+    //this.sortBy = new ReactiveVar();
+    ////this.sortDirection = new ReactiveVar();
+    //this.setSortBy();
+    this.downClass = DOWNCLS;
+    this.upClass = UPCLS;
+  },
+  allowedSortValues() {
+    const types = [];
+    const pushed = {};
+    Meteor.user()
+      .getListSortTypes()
+      .forEach(type => {
+        const key = type.replace(/^-/, '');
+        if (pushed[key] === undefined) {
+          types.push({
+            name: key,
+            label: `list-label-${key}`,
+            shortLabel: `list-label-short-${key}`,
+          });
+          pushed[key] = 1;
+        }
+      });
+    return types;
+  },
+  Direction() {
+    return Meteor.user().getListSortByDirection() === -1
+      ? this.downClass
+      : this.upClass;
+  },
+  sortby() {
+    return Meteor.user().getListSortBy();
+  },
+
+  setSortBy(type = null) {
+    const user = Meteor.user();
+    if (type === null) {
+      type = user._getListSortBy();
+    } else {
+      let value = '';
+      if (type.map) {
+        // is an array
+        value = (type[1] === -1 ? '-' : '') + type[0];
+      }
+      Meteor.call('setListSortBy', value);
+    }
+    //this.sortBy.set(type[0]);
+    //this.sortDirection.set(type[1]);
+  },
+
+  events() {
+    return [
+      {
+        'click .js-sort-by'(evt) {
+          evt.preventDefault();
+          const target = evt.target;
+          const sortby = target.getAttribute('name');
+          const down = !!target.querySelector(`.${this.upClass}`);
+          const direction = down ? -1 : 1;
+          this.setSortBy([sortby, direction]);
+          if (Utils.isMiniScreen) {
+            Popup.close();
+          }
+        },
+      },
+    ];
+  },
+}).register('listsortPopup');
+*/

client/components/boards/boardsList.jade

@@ -18,17 +18,41 @@ template(name="boardList")
           else
             a.js-open-board.board-list-item(href="{{pathFor 'board' id=_id slug=slug}}")
               span.details
-                span.board-list-item-name= title
+                span.board-list-item-name
+                  +viewer
+                    = title
                 i.fa.js-star-board(
                   class="fa-star{{#if isStarred}} is-star-active{{else}}-o{{/if}}"
                   title="{{_ 'star-board-title'}}")
-
+                p.board-list-item-desc
+                  +viewer
+                    = description
                 if hasSpentTimeCards
                   i.fa.js-has-spenttime-cards(
                     class="fa-circle{{#if hasOvertimeCards}} has-overtime-card-active{{else}} no-overtime-card-active{{/if}}"
                     title="{{#if hasOvertimeCards}}{{_ 'has-overtime-cards'}}{{else}}{{_ 'has-spenttime-cards'}}{{/if}}")
-
-                p.board-list-item-desc= description
+                unless isMiniScreen
+                  if isSandstorm
+                    i.fa.js-clone-board(
+                        class="fa-clone"
+                        title="{{_ 'duplicate-board'}}")
+                    i.fa.js-archive-board(
+                        class="fa-archive"
+                        title="{{_ 'archive-board'}}")
+                  else if currentUser.isBoardAdmin
+                    i.fa.js-clone-board(
+                        class="fa-clone"
+                        title="{{_ 'duplicate-board'}}")
+                    i.fa.js-archive-board(
+                        class="fa-archive"
+                        title="{{_ 'archive-board'}}")
+                  else if currentUser.isAdmin
+                    i.fa.js-clone-board(
+                        class="fa-clone"
+                        title="{{_ 'duplicate-board'}}")
+                    i.fa.js-archive-board(
+                        class="fa-archive"
+                        title="{{_ 'archive-board'}}")
 
 template(name="boardListHeaderBar")
   h1 {{_ 'my-boards'}}

client/components/boards/boardsList.js

@@ -8,10 +8,10 @@ Template.boardListHeaderBar.events({
 
 Template.boardListHeaderBar.helpers({
   templatesBoardId() {
-    return Meteor.user().getTemplatesBoardId();
+    return Meteor.user() && Meteor.user().getTemplatesBoardId();
   },
   templatesBoardSlug() {
-    return Meteor.user().getTemplatesBoardSlug();
+    return Meteor.user() && Meteor.user().getTemplatesBoardSlug();
   },
 });
 
@@ -21,11 +21,14 @@ BlazeComponent.extendComponent({
   },
 
   boards() {
-    return Boards.find({
-      archived: false,
-      'members.userId': Meteor.userId(),
-      type: 'board',
-    }, { sort: ['title'] });
+    return Boards.find(
+      {
+        archived: false,
+        'members.userId': Meteor.userId(),
+        type: 'board',
+      },
+      { sort: ['title'] },
+    );
   },
   isStarred() {
     const user = Meteor.user();
@@ -33,12 +36,12 @@ BlazeComponent.extendComponent({
   },
 
   hasOvertimeCards() {
-    subManager.subscribe('board', this.currentData()._id);
+    subManager.subscribe('board', this.currentData()._id, false);
     return this.currentData().hasOvertimeCards();
   },
 
   hasSpentTimeCards() {
-    subManager.subscribe('board', this.currentData()._id);
+    subManager.subscribe('board', this.currentData()._id, false);
     return this.currentData().hasSpentTimeCards();
   },
 
@@ -48,26 +51,49 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'click .js-add-board': Popup.open('createBoard'),
-      'click .js-star-board'(evt) {
-        const boardId = this.currentData()._id;
-        Meteor.user().toggleBoardStar(boardId);
-        evt.preventDefault();
+    return [
+      {
+        'click .js-add-board': Popup.open('createBoard'),
+        'click .js-star-board'(evt) {
+          const boardId = this.currentData()._id;
+          Meteor.user().toggleBoardStar(boardId);
+          evt.preventDefault();
+        },
+        'click .js-clone-board'(evt) {
+          Meteor.call(
+            'cloneBoard',
+            this.currentData()._id,
+            Session.get('fromBoard'),
+            (err, res) => {
+              if (err) {
+                this.setError(err.error);
+              } else {
+                Session.set('fromBoard', null);
+                Utils.goBoardId(res);
+              }
+            },
+          );
+          evt.preventDefault();
+        },
+        'click .js-archive-board'(evt) {
+          const boardId = this.currentData()._id;
+          Meteor.call('archiveBoard', boardId);
+          evt.preventDefault();
+        },
+        'click .js-accept-invite'() {
+          const boardId = this.currentData()._id;
+          Meteor.call('acceptInvite', boardId);
+        },
+        'click .js-decline-invite'() {
+          const boardId = this.currentData()._id;
+          Meteor.call('quitBoard', boardId, (err, ret) => {
+            if (!err && ret) {
+              Meteor.call('acceptInvite', boardId);
+              FlowRouter.go('home');
+            }
+          });
+        },
       },
-      'click .js-accept-invite'() {
-        const boardId = this.currentData()._id;
-        Meteor.user().removeInvite(boardId);
-      },
-      'click .js-decline-invite'() {
-        const boardId = this.currentData()._id;
-        Meteor.call('quitBoard', boardId, (err, ret) => {
-          if (!err && ret) {
-            Meteor.user().removeInvite(boardId);
-            FlowRouter.go('home');
-          }
-        });
-      },
-    }];
+    ];
   },
 }).register('boardList');

client/components/boards/boardsList.styl

@@ -94,13 +94,41 @@ $spaceBetweenTiles = 16px
   .is-star-active
     color: white
 
+  .fa-clone
+    position: absolute;
+    bottom: 0
+    font-size: 14px
+    height: 18px
+    line-height: 18px
+    opacity: 0
+    right: 0
+    padding: 9px 9px
+    transition-duration: .15s
+    transition-property: color, font-size, background
+
+  .fa-archive
+    position: absolute;
+    bottom: 0
+    font-size: 14px
+    height: 18px
+    line-height: 18px
+    opacity: 0
+    left: 0
+    padding: 9px 9px
+    transition-duration: .15s
+    transition-property: color, font-size, background
+
   li:hover a
     &:hover
       .fa-star,
+      .fa-clone,
+      .fa-archive,
       .fa-star-o
         color: white
 
     .fa-star,
+    .fa-clone,
+    .fa-archive,
     .fa-star-o
       color: white
       opacity: .75
@@ -133,6 +161,7 @@ $spaceBetweenTiles = 16px
       padding-right: 6px
 
     .background-box
+      color: white
       border-radius: 3px
       background-size: cover
       display: block
@@ -154,10 +183,11 @@ $spaceBetweenTiles = 16px
     overflow: scroll
 
     li
-      width: 33.3%
+      width: 50% 
 
     .board-list-item
       overflow: hidden
+      height: 8rem
 
     .board-list-item-sub-name
       position: relative
@@ -166,4 +196,4 @@ $spaceBetweenTiles = 16px
 
 @media screen and (max-width: 360px)
     li
-      width: 50%
+      width: 100%

client/components/cards/attachments.jade

@@ -37,17 +37,21 @@ template(name="attachmentsGalery")
               i.fa.fa-download
               | {{_ 'download'}}
             if currentUser.isBoardMember
-              if isImage
-                a(class="{{#if $eq ../coverId _id}}js-remove-cover{{else}}js-add-cover{{/if}}")
-                  i.fa.fa-thumb-tack
-                  if($eq ../coverId _id)
-                    | {{_ 'remove-cover'}}
-                  else
-                    | {{_ 'add-cover'}}
-              a.js-confirm-delete
-                i.fa.fa-close
-                | {{_ 'delete'}}
+              unless currentUser.isCommentOnly
+                unless currentUser.isWorker
+                  if isImage
+                    a(class="{{#if $eq ../coverId _id}}js-remove-cover{{else}}js-add-cover{{/if}}")
+                      i.fa.fa-thumb-tack
+                      if($eq ../coverId _id)
+                        | {{_ 'remove-cover'}}
+                      else
+                        | {{_ 'add-cover'}}
+                  a.js-confirm-delete
+                    i.fa.fa-close
+                    | {{_ 'delete'}}
 
     if currentUser.isBoardMember
-      li.attachment-item.add-attachment
-        a.js-add-attachment {{_ 'add-attachment' }}
+      unless currentUser.isCommentOnly
+        unless currentUser.isWorker
+          li.attachment-item.add-attachment
+            a.js-add-attachment {{_ 'add-attachment' }}

client/components/cards/attachments.js

@@ -1,10 +1,11 @@
 Template.attachmentsGalery.events({
   'click .js-add-attachment': Popup.open('cardAttachments'),
-  'click .js-confirm-delete': Popup.afterConfirm('attachmentDelete',
+  'click .js-confirm-delete': Popup.afterConfirm(
+    'attachmentDelete',
     function() {
       Attachments.remove(this._id);
       Popup.close();
-    }
+    },
   ),
   // If we let this event bubble, FlowRouter will handle it and empty the page
   // content, see #101.
@@ -17,8 +18,8 @@ Template.attachmentsGalery.events({
   'click .js-remove-cover'() {
     Cards.findOne(this.cardId).unsetCover();
   },
-  'click .js-preview-image'(evt) {
-    Popup.open('previewAttachedImage').call(this, evt);
+  'click .js-preview-image'(event) {
+    Popup.open('previewAttachedImage').call(this, event);
     // when multiple thumbnails, if click one then another very fast,
     // we might get a wrong width from previous img.
     // when popup reused, onRendered() won't be called, so we cannot get there.
@@ -31,81 +32,122 @@ Template.attachmentsGalery.events({
       // if the image is too large, we resize & center the popup.
       if (w > 300) {
         $('div.pop-over').css({
-          width: (w + 20),
+          width: w + 20,
           position: 'absolute',
-          left: (window.innerWidth - w)/2,
-          top: (window.innerHeight - h)/2,
+          left: (window.innerWidth - w) / 2,
+          top: (window.innerHeight - h) / 2,
         });
       }
     };
-    const url = $(evt.currentTarget).attr('src');
-    if (img.src === url && img.complete)
-      rePosPopup();
-    else
-      img.onload = rePosPopup;
+    const url = $(event.currentTarget).attr('src');
+    if (img.src === url && img.complete) rePosPopup();
+    else img.onload = rePosPopup;
   },
 });
 
 Template.previewAttachedImagePopup.events({
-  'click .js-large-image-clicked'(){
+  'click .js-large-image-clicked'() {
     Popup.close();
   },
 });
 
 Template.cardAttachmentsPopup.events({
-  'change .js-attach-file'(evt) {
+  'change .js-attach-file'(event) {
     const card = this;
-    FS.Utility.eachFile(evt, (f) => {
-      const file = new FS.File(f);
-      if (card.isLinkedCard()) {
-        file.boardId = Cards.findOne(card.linkedId).boardId;
-        file.cardId = card.linkedId;
+    const processFile = f => {
+      Utils.processUploadedAttachment(card, f, attachment => {
+        if (attachment && attachment._id && attachment.isImage()) {
+          card.setCover(attachment._id);
+        }
+        Popup.close();
+      });
+    };
+
+    FS.Utility.eachFile(event, f => {
+      if (
+        MAX_IMAGE_PIXEL > 0 &&
+        typeof f.type === 'string' &&
+        f.type.match(/^image/)
+      ) {
+        // is image
+        const reader = new FileReader();
+        reader.onload = function(e) {
+          const dataurl = e && e.target && e.target.result;
+          if (dataurl !== undefined) {
+            Utils.shrinkImage({
+              dataurl,
+              maxSize: MAX_IMAGE_PIXEL,
+              ratio: COMPRESS_RATIO,
+              toBlob: true,
+              callback(blob) {
+                if (blob === false) {
+                  processFile(f);
+                } else {
+                  blob.name = f.name;
+                  processFile(blob);
+                }
+              },
+            });
+          } else {
+            // couldn't process it let other function handle it?
+            processFile(f);
+          }
+        };
+        reader.readAsDataURL(f);
       } else {
-        file.boardId = card.boardId;
-        file.cardId = card._id;
+        processFile(f);
       }
-      file.userId = Meteor.userId();
-
-      const attachment = Attachments.insert(file);
-
-      if (attachment && attachment._id && attachment.isImage()) {
-        card.setCover(attachment._id);
-      }
-
-      Popup.close();
     });
   },
-  'click .js-computer-upload'(evt, tpl) {
-    tpl.find('.js-attach-file').click();
-    evt.preventDefault();
+  'click .js-computer-upload'(event, templateInstance) {
+    templateInstance.find('.js-attach-file').click();
+    event.preventDefault();
   },
   'click .js-upload-clipboard-image': Popup.open('previewClipboardImage'),
 });
 
+const MAX_IMAGE_PIXEL = Utils.MAX_IMAGE_PIXEL;
+const COMPRESS_RATIO = Utils.IMAGE_COMPRESS_RATIO;
 let pastedResults = null;
 
 Template.previewClipboardImagePopup.onRendered(() => {
   // we can paste image from clipboard
-  $(document.body).pasteImageReader((results) => {
+  const handle = results => {
     if (results.dataURL.startsWith('data:image/')) {
-      $('img.preview-clipboard-image').attr('src', results.dataURL);
-      pastedResults = results;
+      const direct = results => {
+        $('img.preview-clipboard-image').attr('src', results.dataURL);
+        pastedResults = results;
+      };
+      if (MAX_IMAGE_PIXEL) {
+        // if has size limitation on image we shrink it before uploading
+        Utils.shrinkImage({
+          dataurl: results.dataURL,
+          maxSize: MAX_IMAGE_PIXEL,
+          ratio: COMPRESS_RATIO,
+          callback(changed) {
+            if (changed !== false && !!changed) {
+              results.dataURL = changed;
+            }
+            direct(results);
+          },
+        });
+      } else {
+        direct(results);
+      }
     }
-  });
+  };
+
+  $(document.body).pasteImageReader(handle);
 
   // we can also drag & drop image file to it
-  $(document.body).dropImageReader((results) => {
-    if (results.dataURL.startsWith('data:image/')) {
-      $('img.preview-clipboard-image').attr('src', results.dataURL);
-      pastedResults = results;
-    }
-  });
+  $(document.body).dropImageReader(handle);
 });
 
 Template.previewClipboardImagePopup.events({
   'click .js-upload-pasted-image'() {
     const results = pastedResults;
     if (results && results.file) {
+      window.oPasted = pastedResults;
       const card = this;
       const file = new FS.File(results.file);
       if (!results.name) {

client/components/cards/cardCustomFields.jade

@@ -4,9 +4,10 @@ template(name="cardCustomFieldsPopup")
             li.item(class="")
                 a.name.js-select-field(href="#")
                     span.full-name
+                      +viewer
                         = name
                     if hasCustomField
-                        i.fa.fa-check
+                      i.fa.fa-check
     hr
     a.quiet-button.full.js-settings
         i.fa.fa-cog
@@ -30,6 +31,10 @@ template(name="cardCustomField-text")
                         = value
                 else
                     | {{_ 'edit'}}
+    else
+      +viewer
+        = value
+
 
 template(name="cardCustomField-number")
     if canModifyCard
@@ -44,6 +49,9 @@ template(name="cardCustomField-number")
                     = value
                 else
                     | {{_ 'edit'}}
+    else
+        if value
+            = value
 
 template(name="cardCustomField-date")
     if canModifyCard
@@ -54,6 +62,11 @@ template(name="cardCustomField-date")
                         | {{showDate}}
             else
                 | {{_ 'edit'}}
+    else
+        if value
+            div.card-date
+                time(datetime="{{showISODate}}")
+                    | {{showDate}}
 
 template(name="cardCustomField-dropdown")
     if canModifyCard
@@ -61,9 +74,13 @@ template(name="cardCustomField-dropdown")
             select.inline
                 each items
                     if($eq data.value this._id)
-                        option(value=_id selected="selected") {{name}}
+                        option(value=_id selected="selected")
+                          +viewer
+                            = name
                     else
-                        option(value=_id) {{name}}
+                        option(value=_id)
+                          +viewer
+                            = name
             .edit-controls.clearfix
                 button.primary(type="submit") {{_ 'save'}}
                 a.fa.fa-times-thin.js-close-inlined-form
@@ -73,4 +90,8 @@ template(name="cardCustomField-dropdown")
                     +viewer
                         = selectedItem
                 else
-                    | {{_ 'edit'}}
+                    | {{_ 'edit'}}
+    else
+        if value
+            +viewer
+                = selectedItem

client/components/cards/cardCustomFields.js

@@ -7,22 +7,21 @@ Template.cardCustomFieldsPopup.helpers({
 });
 
 Template.cardCustomFieldsPopup.events({
-  'click .js-select-field'(evt) {
+  'click .js-select-field'(event) {
     const card = Cards.findOne(Session.get('currentCard'));
     const customFieldId = this._id;
     card.toggleCustomField(customFieldId);
-    evt.preventDefault();
+    event.preventDefault();
   },
-  'click .js-settings'(evt) {
+  'click .js-settings'(event) {
     EscapeActions.executeUpTo('detailsPane');
     Sidebar.setView('customFields');
-    evt.preventDefault();
+    event.preventDefault();
   },
 });
 
 // cardCustomField
 const CardCustomField = BlazeComponent.extendComponent({
-
   getTemplate() {
     return `cardCustomField-${this.data().definition.type}`;
   },
@@ -34,52 +33,55 @@ const CardCustomField = BlazeComponent.extendComponent({
   },
 
   canModifyCard() {
-    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+    return (
+      Meteor.user() &&
+      Meteor.user().isBoardMember() &&
+      !Meteor.user().isCommentOnly()
+    );
   },
 });
 CardCustomField.register('cardCustomField');
 
 // cardCustomField-text
 (class extends CardCustomField {
-
   onCreated() {
     super.onCreated();
   }
 
   events() {
-    return [{
-      'submit .js-card-customfield-text'(evt) {
-        evt.preventDefault();
-        const value = this.currentComponent().getValue();
-        this.card.setCustomField(this.customFieldId, value);
+    return [
+      {
+        'submit .js-card-customfield-text'(event) {
+          event.preventDefault();
+          const value = this.currentComponent().getValue();
+          this.card.setCustomField(this.customFieldId, value);
+        },
       },
-    }];
+    ];
   }
-
-}).register('cardCustomField-text');
+}.register('cardCustomField-text'));
 
 // cardCustomField-number
 (class extends CardCustomField {
-
   onCreated() {
     super.onCreated();
   }
 
   events() {
-    return [{
-      'submit .js-card-customfield-number'(evt) {
-        evt.preventDefault();
-        const value = parseInt(this.find('input').value, 10);
-        this.card.setCustomField(this.customFieldId, value);
+    return [
+      {
+        'submit .js-card-customfield-number'(event) {
+          event.preventDefault();
+          const value = parseInt(this.find('input').value, 10);
+          this.card.setCustomField(this.customFieldId, value);
+        },
       },
-    }];
+    ];
   }
-
-}).register('cardCustomField-number');
+}.register('cardCustomField-number'));
 
 // cardCustomField-date
 (class extends CardCustomField {
-
   onCreated() {
     super.onCreated();
     const self = this;
@@ -108,8 +110,10 @@ CardCustomField.register('cardCustomField');
   }
 
   classes() {
-    if (this.date.get().isBefore(this.now.get(), 'minute') &&
-            this.now.get().isBefore(this.data().value)) {
+    if (
+      this.date.get().isBefore(this.now.get(), 'minute') &&
+      this.now.get().isBefore(this.data().value)
+    ) {
       return 'current';
     }
     return '';
@@ -120,12 +124,13 @@ CardCustomField.register('cardCustomField');
   }
 
   events() {
-    return [{
-      'click .js-edit-date': Popup.open('cardCustomField-date'),
-    }];
+    return [
+      {
+        'click .js-edit-date': Popup.open('cardCustomField-date'),
+      },
+    ];
   }
-
-}).register('cardCustomField-date');
+}.register('cardCustomField-date'));
 
 // cardCustomField-datePopup
 (class extends DatePicker {
@@ -144,11 +149,10 @@ CardCustomField.register('cardCustomField');
   _deleteDate() {
     this.card.setCustomField(this.customFieldId, '');
   }
-}).register('cardCustomField-datePopup');
+}.register('cardCustomField-datePopup'));
 
 // cardCustomField-dropdown
 (class extends CardCustomField {
-
   onCreated() {
     super.onCreated();
     this._items = this.data().definition.settings.dropdownItems;
@@ -160,20 +164,23 @@ CardCustomField.register('cardCustomField');
   }
 
   selectedItem() {
-    const selected = this._items.find((item) => {
+    const selected = this._items.find(item => {
       return item._id === this.data().value;
     });
-    return (selected) ? selected.name : TAPi18n.__('custom-field-dropdown-unknown');
+    return selected
+      ? selected.name
+      : TAPi18n.__('custom-field-dropdown-unknown');
   }
 
   events() {
-    return [{
-      'submit .js-card-customfield-dropdown'(evt) {
-        evt.preventDefault();
-        const value = this.find('select').value;
-        this.card.setCustomField(this.customFieldId, value);
+    return [
+      {
+        'submit .js-card-customfield-dropdown'(event) {
+          event.preventDefault();
+          const value = this.find('select').value;
+          this.card.setCustomField(this.customFieldId, value);
+        },
       },
-    }];
+    ];
   }
-
-}).register('cardCustomField-dropdown');
+}.register('cardCustomField-dropdown'));

client/components/cards/cardDate.js

@@ -11,15 +11,20 @@ BlazeComponent.extendComponent({
   },
 
   onRendered() {
-    const $picker = this.$('.js-datepicker').datepicker({
-      todayHighlight: true,
-      todayBtn: 'linked',
-      language: TAPi18n.getLanguage(),
-    }).on('changeDate', function(evt) {
-      this.find('#date').value = moment(evt.date).format('L');
-      this.error.set('');
-      this.find('#time').focus();
-    }.bind(this));
+    const $picker = this.$('.js-datepicker')
+      .datepicker({
+        todayHighlight: true,
+        todayBtn: 'linked',
+        language: TAPi18n.getLanguage(),
+      })
+      .on(
+        'changeDate',
+        function(evt) {
+          this.find('#date').value = moment(evt.date).format('L');
+          this.error.set('');
+          this.find('#time').focus();
+        }.bind(this),
+      );
 
     if (this.date.get().isValid()) {
       $picker.datepicker('update', this.date.get().toDate());
@@ -27,13 +32,11 @@ BlazeComponent.extendComponent({
   },
 
   showDate() {
-    if (this.date.get().isValid())
-      return this.date.get().format('L');
+    if (this.date.get().isValid()) return this.date.get().format('L');
     return '';
   },
   showTime() {
-    if (this.date.get().isValid())
-      return this.date.get().format('LT');
+    if (this.date.get().isValid()) return this.date.get().format('LT');
     return '';
   },
   dateFormat() {
@@ -44,59 +47,68 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'keyup .js-date-field'() {
-        // parse for localized date format in strict mode
-        const dateMoment = moment(this.find('#date').value, 'L', true);
-        if (dateMoment.isValid()) {
-          this.error.set('');
-          this.$('.js-datepicker').datepicker('update', dateMoment.toDate());
-        }
-      },
-      'keyup .js-time-field'() {
-        // parse for localized time format in strict mode
-        const dateMoment = moment(this.find('#time').value, 'LT', true);
-        if (dateMoment.isValid()) {
-          this.error.set('');
-        }
-      },
-      'submit .edit-date'(evt) {
-        evt.preventDefault();
+    return [
+      {
+        'keyup .js-date-field'() {
+          // parse for localized date format in strict mode
+          const dateMoment = moment(this.find('#date').value, 'L', true);
+          if (dateMoment.isValid()) {
+            this.error.set('');
+            this.$('.js-datepicker').datepicker('update', dateMoment.toDate());
+          }
+        },
+        'keyup .js-time-field'() {
+          // parse for localized time format in strict mode
+          const dateMoment = moment(this.find('#time').value, 'LT', true);
+          if (dateMoment.isValid()) {
+            this.error.set('');
+          }
+        },
+        'submit .edit-date'(evt) {
+          evt.preventDefault();
 
-        // if no time was given, init with 12:00
-        const time = evt.target.time.value || moment(new Date().setHours(12, 0, 0)).format('LT');
+          // if no time was given, init with 12:00
+          const time =
+            evt.target.time.value ||
+            moment(new Date().setHours(12, 0, 0)).format('LT');
 
-        const dateString = `${evt.target.date.value} ${time}`;
-        const newDate = moment(dateString, 'L LT', true);
-        if (newDate.isValid()) {
-          this._storeDate(newDate.toDate());
+          const dateString = `${evt.target.date.value} ${time}`;
+          const newDate = moment(dateString, 'L LT', true);
+          if (newDate.isValid()) {
+            this._storeDate(newDate.toDate());
+            Popup.close();
+          } else {
+            this.error.set('invalid-date');
+            evt.target.date.focus();
+          }
+        },
+        'click .js-delete-date'(evt) {
+          evt.preventDefault();
+          this._deleteDate();
           Popup.close();
-        }
-        else {
-          this.error.set('invalid-date');
-          evt.target.date.focus();
-        }
+        },
       },
-      'click .js-delete-date'(evt) {
-        evt.preventDefault();
-        this._deleteDate();
-        Popup.close();
-      },
-    }];
+    ];
   },
 });
 
 Template.dateBadge.helpers({
   canModifyCard() {
-    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+    return (
+      Meteor.user() &&
+      Meteor.user().isBoardMember() &&
+      !Meteor.user().isCommentOnly() &&
+      !Meteor.user().isWorker()
+    );
   },
 });
 
 // editCardReceivedDatePopup
 (class extends DatePicker {
   onCreated() {
-    super.onCreated();
-    this.data().getReceived() && this.date.set(moment(this.data().getReceived()));
+    super.onCreated(moment().format('YYYY-MM-DD HH:mm'));
+    this.data().getReceived() &&
+      this.date.set(moment(this.data().getReceived()));
   }
 
   _storeDate(date) {
@@ -106,20 +118,22 @@ Template.dateBadge.helpers({
   _deleteDate() {
     this.card.setReceived(null);
   }
-}).register('editCardReceivedDatePopup');
-
+}.register('editCardReceivedDatePopup'));
 
 // editCardStartDatePopup
 (class extends DatePicker {
   onCreated() {
-    super.onCreated();
+    super.onCreated(moment().format('YYYY-MM-DD HH:mm'));
     this.data().getStart() && this.date.set(moment(this.data().getStart()));
   }
 
   onRendered() {
     super.onRendered();
     if (moment.isDate(this.card.getReceived())) {
-      this.$('.js-datepicker').datepicker('setStartDate', this.card.getReceived());
+      this.$('.js-datepicker').datepicker(
+        'setStartDate',
+        this.card.getReceived(),
+      );
     }
   }
 
@@ -130,12 +144,12 @@ Template.dateBadge.helpers({
   _deleteDate() {
     this.card.setStart(null);
   }
-}).register('editCardStartDatePopup');
+}.register('editCardStartDatePopup'));
 
 // editCardDueDatePopup
 (class extends DatePicker {
   onCreated() {
-    super.onCreated();
+    super.onCreated('1970-01-01 17:00:00');
     this.data().getDue() && this.date.set(moment(this.data().getDue()));
   }
 
@@ -153,12 +167,12 @@ Template.dateBadge.helpers({
   _deleteDate() {
     this.card.setDue(null);
   }
-}).register('editCardDueDatePopup');
+}.register('editCardDueDatePopup'));
 
 // editCardEndDatePopup
 (class extends DatePicker {
   onCreated() {
-    super.onCreated();
+    super.onCreated(moment().format('YYYY-MM-DD HH:mm'));
     this.data().getEnd() && this.date.set(moment(this.data().getEnd()));
   }
 
@@ -176,8 +190,7 @@ Template.dateBadge.helpers({
   _deleteDate() {
     this.card.setEnd(null);
   }
-}).register('editCardEndDatePopup');
-
+}.register('editCardEndDatePopup'));
 
 // Display received, start, due & end dates
 const CardDate = BlazeComponent.extendComponent({
@@ -224,17 +237,20 @@ class CardReceivedDate extends CardDate {
     const startAt = this.data().getStart();
     const theDate = this.date.get();
     // if dueAt, endAt and startAt exist & are > receivedAt, receivedAt doesn't need to be flagged
-    if (((startAt) && (theDate.isAfter(dueAt))) ||
-       ((endAt) && (theDate.isAfter(endAt))) ||
-       ((dueAt) && (theDate.isAfter(dueAt))))
+    if (
+      (startAt && theDate.isAfter(startAt)) ||
+      (endAt && theDate.isAfter(endAt)) ||
+      (dueAt && theDate.isAfter(dueAt))
+    )
       classes += 'long-overdue';
-    else
-      classes += 'current';
+    else classes += 'current';
     return classes;
   }
 
   showTitle() {
-    return `${TAPi18n.__('card-received-on')} ${this.date.get().format('LLLL')}`;
+    return `${TAPi18n.__('card-received-on')} ${this.date
+      .get()
+      .format('LLLL')}`;
   }
 
   events() {
@@ -261,13 +277,10 @@ class CardStartDate extends CardDate {
     const theDate = this.date.get();
     const now = this.now.get();
     // if dueAt or endAt exist & are > startAt, startAt doesn't need to be flagged
-    if (((endAt) && (theDate.isAfter(endAt))) ||
-       ((dueAt) && (theDate.isAfter(dueAt))))
+    if ((endAt && theDate.isAfter(endAt)) || (dueAt && theDate.isAfter(dueAt)))
       classes += 'long-overdue';
-    else if (theDate.isBefore(now, 'minute'))
-      classes += 'almost-due';
-    else
-      classes += 'current';
+    else if (theDate.isBefore(now, 'minute')) classes += 'almost-due';
+    else classes += 'current';
     return classes;
   }
 
@@ -298,17 +311,12 @@ class CardDueDate extends CardDate {
     const theDate = this.date.get();
     const now = this.now.get();
     // if the due date is after the end date, green - done early
-    if ((endAt) && (theDate.isAfter(endAt)))
-      classes += 'current';
+    if (endAt && theDate.isAfter(endAt)) classes += 'current';
     // if there is an end date, don't need to flag the due date
-    else if (endAt)
-      classes += '';
-    else if (now.diff(theDate, 'days') >= 2)
-      classes += 'long-overdue';
-    else if (now.diff(theDate, 'minute') >= 0)
-      classes += 'due';
-    else if (now.diff(theDate, 'days') >= -1)
-      classes += 'almost-due';
+    else if (endAt) classes += '';
+    else if (now.diff(theDate, 'days') >= 2) classes += 'long-overdue';
+    else if (now.diff(theDate, 'minute') >= 0) classes += 'due';
+    else if (now.diff(theDate, 'days') >= -1) classes += 'almost-due';
     return classes;
   }
 
@@ -337,12 +345,9 @@ class CardEndDate extends CardDate {
     let classes = 'end-date' + ' ';
     const dueAt = this.data().getDue();
     const theDate = this.date.get();
-    if (theDate.diff(dueAt, 'days') >= 2)
-      classes += 'long-overdue';
-    else if (theDate.diff(dueAt, 'days') >= 0)
-      classes += 'due';
-    else if (theDate.diff(dueAt, 'days') >= -2)
-      classes += 'almost-due';
+    if (!dueAt) classes += '';
+    else if (theDate.isBefore(dueAt)) classes += 'current';
+    else if (theDate.isAfter(dueAt)) classes += 'due';
     return classes;
   }
 
@@ -362,22 +367,22 @@ CardEndDate.register('cardEndDate');
   showDate() {
     return this.date.get().format('l');
   }
-}).register('minicardReceivedDate');
+}.register('minicardReceivedDate'));
 
 (class extends CardStartDate {
   showDate() {
     return this.date.get().format('l');
   }
-}).register('minicardStartDate');
+}.register('minicardStartDate'));
 
 (class extends CardDueDate {
   showDate() {
     return this.date.get().format('l');
   }
-}).register('minicardDueDate');
+}.register('minicardDueDate'));
 
 (class extends CardEndDate {
   showDate() {
     return this.date.get().format('l');
   }
-}).register('minicardEndDate');
+}.register('minicardEndDate'));

client/components/cards/cardDetails.jade

@@ -4,15 +4,20 @@ template(name="cardDetails")
       +inlinedForm(classNames="js-card-details-title")
         +editCardTitleForm
       else
-        a.fa.fa-times-thin.close-card-details.js-close-card-details
-        if currentUser.isBoardMember
-          a.fa.fa-navicon.card-details-menu.js-open-card-details-menu
+        unless isMiniScreen
+          a.fa.fa-times-thin.close-card-details.js-close-card-details
+          if currentUser.isBoardMember
+            a.fa.fa-navicon.card-details-menu.js-open-card-details-menu
+        if isMiniScreen
+          a.fa.fa-times-thin.close-card-details-mobile-web.js-close-card-details
+          if currentUser.isBoardMember
+            a.fa.fa-navicon.card-details-menu-mobile-web.js-open-card-details-menu
         h2.card-details-title.js-card-title(
           class="{{#if canModifyCard}}js-open-inlined-form is-editable{{/if}}")
             +viewer
               = getTitle
-              if isWatching
-                i.fa.fa-eye.card-details-watch
+            if isWatching
+              i.card-details-watch.fa.fa-eye
         .card-details-path
           each parentList
             |   >  
@@ -32,61 +37,98 @@ template(name="cardDetails")
 
     .card-details-items
       .card-details-item.card-details-item-received
-        h3.card-details-item-title {{_ 'card-received'}}
+        h3
+          i.fa.fa-sign-out
+          card-details-item-title {{_ 'card-received'}}
         if getReceived
           +cardReceivedDate
         else
           if canModifyCard
-            a.js-received-date {{_ 'add'}}
+            unless currentUser.isWorker
+              a.js-received-date {{_ 'add'}}
 
       .card-details-item.card-details-item-start
-        h3.card-details-item-title {{_ 'card-start'}}
+        h3
+          i.fa.fa-hourglass-start
+          card-details-item-title {{_ 'card-start'}}
         if getStart
           +cardStartDate
         else
           if canModifyCard
-            a.js-start-date {{_ 'add'}}
+            unless currentUser.isWorker
+              a.js-start-date {{_ 'add'}}
 
       .card-details-item.card-details-item-due
-        h3.card-details-item-title {{_ 'card-due'}}
+        h3
+          i.fa.fa-sign-in
+          card-details-item-title {{_ 'card-due'}}
         if getDue
           +cardDueDate
         else
           if canModifyCard
-            a.js-due-date {{_ 'add'}}
+            unless currentUser.isWorker
+              a.js-due-date {{_ 'add'}}
 
       .card-details-item.card-details-item-end
-        h3.card-details-item-title {{_ 'card-end'}}
+        h3
+          i.fa.fa-hourglass-end
+          card-details-item-title {{_ 'card-end'}}
         if getEnd
           +cardEndDate
         else
           if canModifyCard
-            a.js-end-date {{_ 'add'}}
+            unless currentUser.isWorker
+              a.js-end-date {{_ 'add'}}
 
     .card-details-items
       .card-details-item.card-details-item-members
-        h3.card-details-item-title {{_ 'members'}}
+        h3
+          i.fa.fa-users
+          card-details-item-title {{_ 'members'}}
         each getMembers
           +userAvatar(userId=this cardId=../_id)
           | {{! XXX Hack to hide syntaxic coloration /// }}
         if canModifyCard
-          a.member.add-member.card-details-item-add-button.js-add-members(title="{{_ 'card-members-title'}}")
+          unless currentUser.isWorker
+            a.member.add-member.card-details-item-add-button.js-add-members(title="{{_ 'card-members-title'}}")
+              i.fa.fa-plus
+
+      .card-details-item.card-details-item-assignees
+        h3
+          i.fa.fa-user
+          card-details-item-title {{_ 'assignee'}}
+        each getAssignees
+          +userAvatarAssignee(userId=this cardId=../_id)
+          | {{! XXX Hack to hide syntaxic coloration /// }}
+        if canModifyCard
+          a.assignee.add-assignee.card-details-item-add-button.js-add-assignees(title="{{_ 'assignee'}}")
             i.fa.fa-plus
+        if currentUser.isWorker
+          unless assigneeSelected
+            a.assignee.add-assignee.card-details-item-add-button.js-add-assignees(title="{{_ 'assignee'}}")
+              i.fa.fa-plus
+
 
       .card-details-item.card-details-item-labels
-        h3.card-details-item-title {{_ 'labels'}}
+        h3
+          i.fa.fa-tags
+          card-details-item-title {{_ 'labels'}}
         a(class="{{#if canModifyCard}}js-add-labels{{else}}is-disabled{{/if}}" title="{{_ 'card-labels-title'}}")
           each labels
-            span.card-label(class="card-label-{{color}}" title=name)= name
+            span.card-label(class="card-label-{{color}}" title=name)
+              +viewer
+                = name
         if canModifyCard
-          a.card-label.add-label.js-add-labels(title="{{_ 'card-labels-title'}}")
-            i.fa.fa-plus
+          unless currentUser.isWorker
+            a.card-label.add-label.js-add-labels(title="{{_ 'card-labels-title'}}")
+              i.fa.fa-plus
 
     .card-details-items
       each customFieldsWD
         .card-details-item.card-details-item-customfield
           h3.card-details-item-title
-            = definition.name
+            +viewer
+              = definition.name
           +cardCustomField
 
     .card-details-items
@@ -100,26 +142,29 @@ template(name="cardDetails")
 
     //- XXX We should use "editable" to avoid repetiting ourselves
     if canModifyCard
-      h3.card-details-item-title {{_ 'description'}}
-      +inlinedCardDescription(classNames="card-description js-card-description")
-        +editor(autofocus=true)
-          | {{getUnsavedValue 'cardDescription' _id getDescription}}
-        .edit-controls.clearfix
-          button.primary(type="submit") {{_ 'save'}}
-          a.fa.fa-times-thin.js-close-inlined-form
-      else
-        a.js-open-inlined-form
-          if getDescription
-            +viewer
-              = getDescription
-          else
-            | {{_ 'edit'}}
-        if (hasUnsavedValue 'cardDescription' _id)
-          p.quiet
-            | {{_ 'unsaved-description'}}
-            a.js-open-inlined-form {{_ 'view-it'}}
-            = ' - '
-            a.js-close-inlined-form {{_ 'discard'}}
+      unless currentUser.isWorker
+        h3
+          i.fa.fa-align-left
+          card-details-item-title {{_ 'description'}}
+        +inlinedCardDescription(classNames="card-description js-card-description")
+          +editor(autofocus=true)
+            | {{getUnsavedValue 'cardDescription' _id getDescription}}
+          .edit-controls.clearfix
+            button.primary(type="submit") {{_ 'save'}}
+            a.fa.fa-times-thin.js-close-inlined-form
+        else
+          a.js-open-inlined-form
+            if getDescription
+              +viewer
+                = getDescription
+            else
+              | {{_ 'edit'}}
+          if (hasUnsavedValue 'cardDescription' _id)
+            p.quiet
+              | {{_ 'unsaved-description'}}
+              a.js-open-inlined-form {{_ 'view-it'}}
+              = ' - '
+              a.js-close-inlined-form {{_ 'discard'}}
     else if getDescription
       h3.card-details-item-title {{_ 'description'}}
       +viewer
@@ -127,33 +172,39 @@ template(name="cardDetails")
 
     .card-details-items
       .card-details-item.card-details-item-name
-        h3.card-details-item-title {{_ 'requested-by'}}
+        h3
+          i.fa.fa-shopping-cart
+          card-details-item-title {{_ 'requested-by'}}
         if canModifyCard
-          +inlinedForm(classNames="js-card-details-requester")
-            +editCardRequesterForm
-          else
-            a.js-open-inlined-form
-              if getRequestedBy
-                +viewer
-                  = getRequestedBy
-              else
-                | {{_ 'add'}}
+          unless currentUser.isWorker
+            +inlinedForm(classNames="js-card-details-requester")
+              +editCardRequesterForm
+            else
+              a.js-open-inlined-form
+                if getRequestedBy
+                  +viewer
+                    = getRequestedBy
+                else
+                  | {{_ 'add'}}
         else if getRequestedBy
           +viewer
             = getRequestedBy
 
       .card-details-item.card-details-item-name
-        h3.card-details-item-title {{_ 'assigned-by'}}
+        h3
+          i.fa.fa-user-plus
+          card-details-item-title {{_ 'assigned-by'}}
         if canModifyCard
-          +inlinedForm(classNames="js-card-details-assigner")
-            +editCardAssignerForm
-          else
-            a.js-open-inlined-form
-              if getAssignedBy
-                +viewer
-                  = getAssignedBy
-              else
-                | {{_ 'add'}}
+          unless currentUser.isWorker
+            +inlinedForm(classNames="js-card-details-assigner")
+              +editCardAssignerForm
+            else
+              a.js-open-inlined-form
+                if getAssignedBy
+                  +viewer
+                    = getAssignedBy
+                else
+                  | {{_ 'add'}}
         else if getRequestedBy
           +viewer
             = getAssignedBy
@@ -175,7 +226,9 @@ template(name="cardDetails")
     hr
     unless currentUser.isNoComments
       .activity-title
-        h3 {{ _ 'activity'}}
+        h3
+          i.fa.fa-history
+          | {{ _ 'activity'}}
         if currentUser.isBoardMember
           .material-toggle-switch
             span.toggle-switch-title {{_ 'hide-system-messages'}}
@@ -197,52 +250,99 @@ template(name="cardDetails")
           +activities(card=this mode="card")
 
 template(name="editCardTitleForm")
-  textarea.js-edit-card-title(rows='1' autofocus)
+  textarea.js-edit-card-title(rows='1' autofocus dir="auto")
     = getTitle
   .edit-controls.clearfix
     button.primary.confirm.js-submit-edit-card-title-form(type="submit") {{_ 'save'}}
     a.fa.fa-times-thin.js-close-inlined-form
 
 template(name="editCardRequesterForm")
-  input.js-edit-card-requester(type='text' autofocus value=getRequestedBy)
+  input.js-edit-card-requester(type='text' autofocus value=getRequestedBy dir="auto")
   .edit-controls.clearfix
     button.primary.confirm.js-submit-edit-card-requester-form(type="submit") {{_ 'save'}}
     a.fa.fa-times-thin.js-close-inlined-form
 
 template(name="editCardAssignerForm")
-  input.js-edit-card-assigner(type='text' autofocus value=getAssignedBy)
+  input.js-edit-card-assigner(type='text' autofocus value=getAssignedBy dir="auto")
   .edit-controls.clearfix
     button.primary.confirm.js-submit-edit-card-assigner-form(type="submit") {{_ 'save'}}
     a.fa.fa-times-thin.js-close-inlined-form
 
 template(name="cardDetailsActionsPopup")
   ul.pop-over-list
-    li: a.js-toggle-watch-card {{#if isWatching}}{{_ 'unwatch'}}{{else}}{{_ 'watch'}}{{/if}}
+    li
+      a.js-toggle-watch-card
+        if isWatching
+          i.fa.fa-eye
+          |  {{_ 'unwatch'}}
+        else
+          i.fa.fa-eye-slash
+          |  {{_ 'watch'}}
   if canModifyCard
-    hr
+    unless currentUser.isWorker
+      hr
+      ul.pop-over-list
+        //li: a.js-members {{_ 'card-edit-members'}}
+        //li: a.js-labels {{_ 'card-edit-labels'}}
+        //li: a.js-attachments {{_ 'card-edit-attachments'}}
+        li
+          a.js-custom-fields
+            i.fa.fa-list-alt
+            | {{_ 'card-edit-custom-fields'}}
+        //li: a.js-received-date {{_ 'editCardReceivedDatePopup-title'}}
+        //li: a.js-start-date {{_ 'editCardStartDatePopup-title'}}
+        //li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
+        //li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}
+        li
+          a.js-spent-time
+            i.fa.fa-clock-o
+            | {{_ 'editCardSpentTimePopup-title'}}
+        li
+          a.js-set-card-color
+            i.fa.fa-paint-brush
+            | {{_ 'setCardColorPopup-title'}}
+      hr
     ul.pop-over-list
-      li: a.js-members {{_ 'card-edit-members'}}
-      li: a.js-labels {{_ 'card-edit-labels'}}
-      li: a.js-attachments {{_ 'card-edit-attachments'}}
-      li: a.js-custom-fields {{_ 'card-edit-custom-fields'}}
-      li: a.js-received-date {{_ 'editCardReceivedDatePopup-title'}}
-      li: a.js-start-date {{_ 'editCardStartDatePopup-title'}}
-      li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
-      li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}
-      li: a.js-spent-time {{_ 'editCardSpentTimePopup-title'}}
-      li: a.js-set-card-color {{_ 'setCardColorPopup-title'}}
-    hr
-    ul.pop-over-list
-      li: a.js-move-card-to-top {{_ 'moveCardToTop-title'}}
-      li: a.js-move-card-to-bottom {{_ 'moveCardToBottom-title'}}
-    hr
-    ul.pop-over-list
-      li: a.js-move-card {{_ 'moveCardPopup-title'}}
-      li: a.js-copy-card {{_ 'copyCardPopup-title'}}
-      li: a.js-copy-checklist-cards {{_ 'copyChecklistToManyCardsPopup-title'}}
+      li
+        a.js-move-card-to-top
+          i.fa.fa-arrow-up
+          | {{_ 'moveCardToTop-title'}}
+      li
+        a.js-move-card-to-bottom
+          i.fa.fa-arrow-down
+          | {{_ 'moveCardToBottom-title'}}
+    unless currentUser.isWorker
+      hr
+      ul.pop-over-list
+        li
+          a.js-move-card
+            i.fa.fa-arrow-right
+            | {{_ 'moveCardPopup-title'}}
+        li
+          a.js-copy-card
+            i.fa.fa-copy
+            | {{_ 'copyCardPopup-title'}}
+      hr
+      ul.pop-over-list
+        li
+          a.js-copy-checklist-cards
+            i.fa.fa-list
+            i.fa.fa-copy
+            | {{_ 'copyChecklistToManyCardsPopup-title'}}
       unless archived
-        li: a.js-archive {{_ 'archive-card'}}
-      li: a.js-more {{_ 'cardMorePopup-title'}}
+        hr
+        ul.pop-over-list
+          li
+            a.js-archive
+              i.fa.fa-arrow-right
+              i.fa.fa-archive
+              | {{_ 'archive-card'}}
+      hr
+      ul.pop-over-list
+        li
+          a.js-more
+            i.fa.fa-link
+            | {{_ 'cardMorePopup-title'}}
 
 template(name="moveCardPopup")
   +boardsAndLists
@@ -293,6 +393,67 @@ template(name="cardMembersPopup")
           if isCardMember
             i.fa.fa-check
 
+template(name="cardAssigneesPopup")
+  unless currentUser.isWorker
+    ul.pop-over-list.js-card-assignee-list
+      each board.activeMembers
+        li.item(class="{{#if isCardAssignee}}active{{/if}}")
+          a.name.js-select-assignee(href="#")
+            +userAvatar(userId=user._id)
+            span.full-name
+              = user.profile.fullname
+              | (<span class="username">{{ user.username }}</span>)
+            if isCardAssignee
+              i.fa.fa-check
+  if currentUser.isWorker
+    ul.pop-over-list.js-card-assignee-list
+        li.item(class="{{#if currentUser.isCardAssignee}}active{{/if}}")
+          a.name.js-select-assignee(href="#")
+            +userAvatar(userId=currentUser._id)
+            span.full-name
+              = currentUser.profile.fullname
+              | (<span class="username">{{ currentUser.username }}</span>)
+            if currentUser.isCardAssignee
+              i.fa.fa-check
+
+template(name="userAvatarAssignee")
+  a.assignee.js-assignee(title="{{userData.profile.fullname}} ({{userData.username}})")
+    if userData.profile.avatarUrl
+      img.avatar.avatar-image(src="{{userData.profile.avatarUrl}}")
+    else
+      +userAvatarAssigneeInitials(userId=userData._id)
+
+    if showStatus
+      span.assignee-presence-status(class=presenceStatusClassName)
+      span.member-type(class=memberType)
+
+    unless isSandstorm
+      if showEdit
+        if $eq currentUser._id userData._id
+          a.edit-avatar.js-change-avatar
+            i.fa.fa-pencil
+
+template(name="cardAssigneePopup")
+  .board-assignee-menu
+    .mini-profile-info
+      +userAvatar(userId=user._id showEdit=true)
+      .info
+        h3= user.profile.fullname
+        p.quiet @{{ user.username }}
+    ul.pop-over-list
+      if currentUser.isNotCommentOnly
+        unless currentUser.isWorker
+          li: a.js-remove-assignee {{_ 'remove-member-from-card'}}
+
+      unless currentUser.isWorker
+        if $eq currentUser._id user._id
+          with currentUser
+            li: a.js-edit-profile {{_ 'edit-profile'}}
+
+template(name="userAvatarAssigneeInitials")
+  svg.avatar.avatar-assignee-initials(viewBox="0 0 {{viewPortWidth}} 15")
+    text(x="50%" y="13" text-anchor="middle")= initials
+
 template(name="cardMorePopup")
   p.quiet
     span.clearfix

client/components/cards/cardDetails.js

@@ -27,7 +27,7 @@ BlazeComponent.extendComponent({
   onCreated() {
     this.currentBoard = Boards.findOne(Session.get('currentBoard'));
     this.isLoaded = new ReactiveVar(false);
-    const boardBody =  this.parentComponent().parentComponent();
+    const boardBody = this.parentComponent().parentComponent();
     //in Miniview parent is Board, not BoardBody.
     if (boardBody !== null) {
       boardBody.showOverlay.set(true);
@@ -48,7 +48,12 @@ BlazeComponent.extendComponent({
   },
 
   canModifyCard() {
-    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+    return (
+      Meteor.user() &&
+      Meteor.user().isBoardMember() &&
+      !Meteor.user().isCommentOnly() &&
+      !Meteor.user().isWorker()
+    );
   },
 
   scrollParentContainer() {
@@ -80,18 +85,17 @@ BlazeComponent.extendComponent({
     const cardContainerScrollTop = $cardContainer.scrollTop();
 
     let topOffset = false;
-    if(cardViewStartTop !== 100){
+    if (cardViewStartTop !== 100) {
       topOffset = cardViewStartTop - 100;
     }
-    if(topOffset !== false) {
+    if (topOffset !== false) {
       bodyBoardComponent.scrollTop(cardContainerScrollTop + topOffset);
     }
-
   },
 
   presentParentTask() {
     let result = this.currentBoard.presentParentTask;
-    if ((result === null) || (result === undefined)) {
+    if (result === null || result === undefined) {
       result = 'no-parent';
     }
     return result;
@@ -114,9 +118,50 @@ BlazeComponent.extendComponent({
   },
 
   onRendered() {
+    if (Meteor.settings.public.CARD_OPENED_WEBHOOK_ENABLED) {
+      // Send Webhook but not create Activities records ---
+      const card = this.currentData();
+      const userId = Meteor.userId();
+      const params = {
+        userId,
+        cardId: card._id,
+        boardId: card.boardId,
+        listId: card.listId,
+        user: Meteor.user().username,
+        url: '',
+      };
+
+      const integrations = Integrations.find({
+        boardId: { $in: [card.boardId, Integrations.Const.GLOBAL_WEBHOOK_ID] },
+        enabled: true,
+        activities: { $in: ['CardDetailsRendered', 'all'] },
+      }).fetch();
+
+      if (integrations.length > 0) {
+        integrations.forEach(integration => {
+          Meteor.call(
+            'outgoingWebhooks',
+            integration,
+            'CardSelected',
+            params,
+            () => {
+              return;
+            },
+          );
+        });
+      }
+      //-------------
+    }
+
     if (!Utils.isMiniScreen()) {
       Meteor.setTimeout(() => {
-        $('.card-details').mCustomScrollbar({theme:'minimal-dark', setWidth: false, setLeft: 0, scrollbarPosition: 'outside', mouseWheel: true });
+        $('.card-details').mCustomScrollbar({
+          theme: 'minimal-dark',
+          setWidth: false,
+          setLeft: 0,
+          scrollbarPosition: 'outside',
+          mouseWheel: true,
+        });
         this.scrollParentContainer();
       }, 500);
     }
@@ -212,7 +257,7 @@ BlazeComponent.extendComponent({
   },
 
   onDestroyed() {
-    const parentComponent =  this.parentComponent().parentComponent();
+    const parentComponent = this.parentComponent().parentComponent();
     //on mobile view parent is Board, not board body.
     if (parentComponent === null) return;
     parentComponent.showOverlay.set(false);
@@ -228,59 +273,140 @@ BlazeComponent.extendComponent({
       },
     };
 
-    return [{
-      ...events,
-      'click .js-close-card-details' () {
-        Utils.goBoardId(this.data().boardId);
+    return [
+      {
+        ...events,
+        'click .js-close-card-details'() {
+          Utils.goBoardId(this.data().boardId);
+        },
+        'click .js-open-card-details-menu': Popup.open('cardDetailsActions'),
+        'submit .js-card-description'(event) {
+          event.preventDefault();
+          const description = this.currentComponent().getValue();
+          this.data().setDescription(description);
+        },
+        'submit .js-card-details-title'(event) {
+          event.preventDefault();
+          const title = this.currentComponent()
+            .getValue()
+            .trim();
+          if (title) {
+            this.data().setTitle(title);
+          } else {
+            this.data().setTitle('');
+          }
+        },
+        'submit .js-card-details-assigner'(event) {
+          event.preventDefault();
+          const assigner = this.currentComponent()
+            .getValue()
+            .trim();
+          if (assigner) {
+            this.data().setAssignedBy(assigner);
+          } else {
+            this.data().setAssignedBy('');
+          }
+        },
+        'submit .js-card-details-requester'(event) {
+          event.preventDefault();
+          const requester = this.currentComponent()
+            .getValue()
+            .trim();
+          if (requester) {
+            this.data().setRequestedBy(requester);
+          } else {
+            this.data().setRequestedBy('');
+          }
+        },
+        'click .js-member': Popup.open('cardMember'),
+        'click .js-add-members': Popup.open('cardMembers'),
+        'click .js-assignee': Popup.open('cardAssignee'),
+        'click .js-add-assignees': Popup.open('cardAssignees'),
+        'click .js-add-labels': Popup.open('cardLabels'),
+        'click .js-received-date': Popup.open('editCardReceivedDate'),
+        'click .js-start-date': Popup.open('editCardStartDate'),
+        'click .js-due-date': Popup.open('editCardDueDate'),
+        'click .js-end-date': Popup.open('editCardEndDate'),
+        'mouseenter .js-card-details'() {
+          const parentComponent = this.parentComponent().parentComponent();
+          //on mobile view parent is Board, not BoardBody.
+          if (parentComponent === null) return;
+          parentComponent.showOverlay.set(true);
+          parentComponent.mouseHasEnterCardDetails = true;
+        },
+        'mousedown .js-card-details'() {
+          Session.set('cardDetailsIsDragging', false);
+          Session.set('cardDetailsIsMouseDown', true);
+        },
+        'mousemove .js-card-details'() {
+          if (Session.get('cardDetailsIsMouseDown')) {
+            Session.set('cardDetailsIsDragging', true);
+          }
+        },
+        'mouseup .js-card-details'() {
+          Session.set('cardDetailsIsDragging', false);
+          Session.set('cardDetailsIsMouseDown', false);
+        },
+        'click #toggleButton'() {
+          Meteor.call('toggleSystemMessages');
+        },
       },
-      'click .js-open-card-details-menu': Popup.open('cardDetailsActions'),
-      'submit .js-card-description' (evt) {
-        evt.preventDefault();
-        const description = this.currentComponent().getValue();
-        this.data().setDescription(description);
-      },
-      'submit .js-card-details-title' (evt) {
-        evt.preventDefault();
-        const title = this.currentComponent().getValue().trim();
-        if (title) {
-          this.data().setTitle(title);
-        }
-      },
-      'submit .js-card-details-assigner'(evt) {
-        evt.preventDefault();
-        const assigner = this.currentComponent().getValue().trim();
-        if (assigner) {
-          this.data().setAssignedBy(assigner);
-        }
-      },
-      'submit .js-card-details-requester'(evt) {
-        evt.preventDefault();
-        const requester = this.currentComponent().getValue().trim();
-        if (requester) {
-          this.data().setRequestedBy(requester);
-        }
-      },
-      'click .js-member': Popup.open('cardMember'),
-      'click .js-add-members': Popup.open('cardMembers'),
-      'click .js-add-labels': Popup.open('cardLabels'),
-      'click .js-received-date': Popup.open('editCardReceivedDate'),
-      'click .js-start-date': Popup.open('editCardStartDate'),
-      'click .js-due-date': Popup.open('editCardDueDate'),
-      'click .js-end-date': Popup.open('editCardEndDate'),
-      'mouseenter .js-card-details' () {
-        const parentComponent =  this.parentComponent().parentComponent();
-        //on mobile view parent is Board, not BoardBody.
-        if (parentComponent === null) return;
-        parentComponent.showOverlay.set(true);
-        parentComponent.mouseHasEnterCardDetails = true;
-      },
-      'click #toggleButton'() {
-        Meteor.call('toggleSystemMessages');
-      },
-    }];
+    ];
   },
 }).register('cardDetails');
 
+Template.cardDetails.helpers({
+  userData() {
+    // We need to handle a special case for the search results provided by the
+    // `matteodem:easy-search` package. Since these results gets published in a
+    // separate collection, and not in the standard Meteor.Users collection as
+    // expected, we use a component parameter ("property") to distinguish the
+    // two cases.
+    const userCollection = this.esSearch ? ESSearchResults : Users;
+    return userCollection.findOne(this.userId, {
+      fields: {
+        profile: 1,
+        username: 1,
+      },
+    });
+  },
+
+  assigneeSelected() {
+    if (this.getAssignees().length === 0) {
+      return false;
+    } else {
+      return true;
+    }
+  },
+
+  memberType() {
+    const user = Users.findOne(this.userId);
+    return user && user.isBoardAdmin() ? 'admin' : 'normal';
+  },
+
+  presenceStatusClassName() {
+    const user = Users.findOne(this.userId);
+    const userPresence = presences.findOne({ userId: this.userId });
+    if (user && user.isInvitedTo(Session.get('currentBoard'))) return 'pending';
+    else if (!userPresence) return 'disconnected';
+    else if (Session.equals('currentBoard', userPresence.state.currentBoardId))
+      return 'active';
+    else return 'idle';
+  },
+});
+
+Template.userAvatarAssigneeInitials.helpers({
+  initials() {
+    const user = Users.findOne(this.userId);
+    return user && user.getInitials();
+  },
+
+  viewPortWidth() {
+    const user = Users.findOne(this.userId);
+    return ((user && user.getInitials().length) || 1) * 12;
+  },
+});
+
 // We extends the normal InlinedForm component to support UnsavedEdits draft
 // feature.
 (class extends InlinedForm {
@@ -297,7 +423,9 @@ BlazeComponent.extendComponent({
   close(isReset = false) {
     if (this.isOpen.get() && !isReset) {
       const draft = this.getValue().trim();
-      if (draft !== Cards.findOne(Session.get('currentCard')).getDescription()) {
+      if (
+        draft !== Cards.findOne(Session.get('currentCard')).getDescription()
+      ) {
         UnsavedEdits.set(this._getUnsavedEditKey(), this.getValue());
       }
     }
@@ -311,12 +439,14 @@ BlazeComponent.extendComponent({
 
   events() {
     const parentEvents = InlinedForm.prototype.events()[0];
-    return [{
-      ...parentEvents,
-      'click .js-close-inlined-form': this.reset,
-    }];
+    return [
+      {
+        ...parentEvents,
+        'click .js-close-inlined-form': this.reset,
+      },
+    ];
   }
-}).register('inlinedCardDescription');
+}.register('inlinedCardDescription'));
 
 Template.cardDetailsActionsPopup.helpers({
   isWatching() {
@@ -324,12 +454,17 @@ Template.cardDetailsActionsPopup.helpers({
   },
 
   canModifyCard() {
-    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+    return (
+      Meteor.user() &&
+      Meteor.user().isBoardMember() &&
+      !Meteor.user().isCommentOnly()
+    );
   },
 });
 
 Template.cardDetailsActionsPopup.events({
   'click .js-members': Popup.open('cardMembers'),
+  'click .js-assignees': Popup.open('cardAssignees'),
   'click .js-labels': Popup.open('cardLabels'),
   'click .js-attachments': Popup.open('cardAttachments'),
   'click .js-custom-fields': Popup.open('cardCustomFields'),
@@ -342,23 +477,31 @@ Template.cardDetailsActionsPopup.events({
   'click .js-copy-card': Popup.open('copyCard'),
   'click .js-copy-checklist-cards': Popup.open('copyChecklistToManyCards'),
   'click .js-set-card-color': Popup.open('setCardColor'),
-  'click .js-move-card-to-top' (evt) {
-    evt.preventDefault();
-    const minOrder = _.min(this.list().cards(this.swimlaneId).map((c) => c.sort));
-    this.move(this.swimlaneId, this.listId, minOrder - 1);
+  'click .js-move-card-to-top'(event) {
+    event.preventDefault();
+    const minOrder = _.min(
+      this.list()
+        .cards(this.swimlaneId)
+        .map(c => c.sort),
+    );
+    this.move(this.boardId, this.swimlaneId, this.listId, minOrder - 1);
   },
-  'click .js-move-card-to-bottom' (evt) {
-    evt.preventDefault();
-    const maxOrder = _.max(this.list().cards(this.swimlaneId).map((c) => c.sort));
-    this.move(this.swimlaneId, this.listId, maxOrder + 1);
+  'click .js-move-card-to-bottom'(event) {
+    event.preventDefault();
+    const maxOrder = _.max(
+      this.list()
+        .cards(this.swimlaneId)
+        .map(c => c.sort),
+    );
+    this.move(this.boardId, this.swimlaneId, this.listId, maxOrder + 1);
   },
-  'click .js-archive' (evt) {
-    evt.preventDefault();
+  'click .js-archive'(event) {
+    event.preventDefault();
     this.archive();
     Popup.close();
   },
   'click .js-more': Popup.open('cardMore'),
-  'click .js-toggle-watch-card' () {
+  'click .js-toggle-watch-card'() {
     const currentCard = this;
     const level = currentCard.findWatcher(Meteor.userId()) ? null : 'watching';
     Meteor.call('watch', 'card', currentCard._id, level, (err, ret) => {
@@ -367,15 +510,15 @@ Template.cardDetailsActionsPopup.events({
   },
 });
 
-Template.editCardTitleForm.onRendered(function () {
+Template.editCardTitleForm.onRendered(function() {
   autosize(this.$('.js-edit-card-title'));
 });
 
 Template.editCardTitleForm.events({
-  'keydown .js-edit-card-title' (evt) {
+  'keydown .js-edit-card-title'(event) {
     // If enter key was pressed, submit the data
     // Unless the shift key is also being pressed
-    if (evt.keyCode === 13 && !evt.shiftKey) {
+    if (event.keyCode === 13 && !event.shiftKey) {
       $('.js-submit-edit-card-title-form').click();
     }
   },
@@ -386,9 +529,9 @@ Template.editCardRequesterForm.onRendered(function() {
 });
 
 Template.editCardRequesterForm.events({
-  'keydown .js-edit-card-requester'(evt) {
+  'keydown .js-edit-card-requester'(event) {
     // If enter key was pressed, submit the data
-    if (evt.keyCode === 13) {
+    if (event.keyCode === 13) {
       $('.js-submit-edit-card-requester-form').click();
     }
   },
@@ -399,16 +542,16 @@ Template.editCardAssignerForm.onRendered(function() {
 });
 
 Template.editCardAssignerForm.events({
-  'keydown .js-edit-card-assigner'(evt) {
+  'keydown .js-edit-card-assigner'(event) {
     // If enter key was pressed, submit the data
-    if (evt.keyCode === 13) {
+    if (event.keyCode === 13) {
       $('.js-submit-edit-card-assigner-form').click();
     }
   },
 });
 
 Template.moveCardPopup.events({
-  'click .js-done' () {
+  'click .js-done'() {
     // XXX We should *not* get the currentCard from the global state, but
     // instead from a “component” state.
     const card = Cards.findOne(Session.get('currentCard'));
@@ -424,18 +567,21 @@ Template.moveCardPopup.events({
 });
 BlazeComponent.extendComponent({
   onCreated() {
-    subManager.subscribe('board', Session.get('currentBoard'));
+    subManager.subscribe('board', Session.get('currentBoard'), false);
     this.selectedBoardId = new ReactiveVar(Session.get('currentBoard'));
   },
 
   boards() {
-    const boards = Boards.find({
-      archived: false,
-      'members.userId': Meteor.userId(),
-      _id: {$ne: Meteor.user().getTemplatesBoardId()},
-    }, {
-      sort: ['title'],
-    });
+    const boards = Boards.find(
+      {
+        archived: false,
+        'members.userId': Meteor.userId(),
+        _id: { $ne: Meteor.user().getTemplatesBoardId() },
+      },
+      {
+        sort: ['title'],
+      },
+    );
     return boards;
   },
 
@@ -450,12 +596,14 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'change .js-select-boards'(evt) {
-        this.selectedBoardId.set($(evt.currentTarget).val());
-        subManager.subscribe('board', this.selectedBoardId.get());
+    return [
+      {
+        'change .js-select-boards'(event) {
+          this.selectedBoardId.set($(event.currentTarget).val());
+          subManager.subscribe('board', this.selectedBoardId.get(), false);
+        },
       },
-    }];
+    ];
   },
 }).register('boardsAndLists');
 
@@ -471,7 +619,9 @@ Template.copyCardPopup.events({
     const textarea = $('#copy-card-title');
     const title = textarea.val().trim();
     // insert new card to the bottom of new list
-    card.sort = Lists.findOne(card.listId).cards().count();
+    card.sort = Lists.findOne(card.listId)
+      .cards()
+      .count();
 
     if (title) {
       card.title = title;
@@ -489,7 +639,7 @@ Template.copyCardPopup.events({
 });
 
 Template.copyChecklistToManyCardsPopup.events({
-  'click .js-done' () {
+  'click .js-done'() {
     const card = Cards.findOne(Session.get('currentCard'));
     const oldId = card._id;
     card._id = null;
@@ -502,11 +652,13 @@ Template.copyChecklistToManyCardsPopup.events({
     const textarea = $('#copy-card-title');
     const titleEntry = textarea.val().trim();
     // insert new card to the bottom of new list
-    card.sort = Lists.findOne(card.listId).cards().count();
+    card.sort = Lists.findOne(card.listId)
+      .cards()
+      .count();
 
     if (titleEntry) {
       const titleList = JSON.parse(titleEntry);
-      for (let i = 0; i < titleList.length; i++){
+      for (let i = 0; i < titleList.length; i++) {
         const obj = titleList[i];
         card.title = obj.title;
         card.description = obj.description;
@@ -519,12 +671,12 @@ Template.copyChecklistToManyCardsPopup.events({
         Filter.addException(_id);
 
         // copy checklists
-        Checklists.find({cardId: oldId}).forEach((ch) => {
+        Checklists.find({ cardId: oldId }).forEach(ch => {
           ch.copy(_id);
         });
 
         // copy subtasks
-        cursor = Cards.find({parentId: oldId});
+        cursor = Cards.find({ parentId: oldId });
         cursor.forEach(function() {
           'use strict';
           const subtask = arguments[0];
@@ -534,7 +686,7 @@ Template.copyChecklistToManyCardsPopup.events({
         });
 
         // copy card comments
-        CardComments.find({cardId: oldId}).forEach((cmt) => {
+        CardComments.find({ cardId: oldId }).forEach(cmt => {
           cmt.copy(_id);
         });
       }
@@ -550,7 +702,7 @@ BlazeComponent.extendComponent({
   },
 
   colors() {
-    return cardColors.map((color) => ({ color, name: '' }));
+    return cardColors.map(color => ({ color, name: '' }));
   },
 
   isSelected(color) {
@@ -561,19 +713,21 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'click .js-palette-color'() {
-        this.currentColor.set(this.currentData().color);
+    return [
+      {
+        'click .js-palette-color'() {
+          this.currentColor.set(this.currentData().color);
+        },
+        'click .js-submit'() {
+          this.currentCard.setColor(this.currentColor.get());
+          Popup.close();
+        },
+        'click .js-remove-color'() {
+          this.currentCard.setColor(null);
+          Popup.close();
+        },
       },
-      'click .js-submit' () {
-        this.currentCard.setColor(this.currentColor.get());
-        Popup.close();
-      },
-      'click .js-remove-color'() {
-        this.currentCard.setColor(null);
-        Popup.close();
-      },
-    }];
+    ];
   },
 }).register('setCardColorPopup');
 
@@ -592,15 +746,18 @@ BlazeComponent.extendComponent({
   },
 
   boards() {
-    const boards = Boards.find({
-      archived: false,
-      'members.userId': Meteor.userId(),
-      _id: {
-        $ne: Meteor.user().getTemplatesBoardId(),
+    const boards = Boards.find(
+      {
+        archived: false,
+        'members.userId': Meteor.userId(),
+        _id: {
+          $ne: Meteor.user().getTemplatesBoardId(),
+        },
       },
-    }, {
-      sort: ['title'],
-    });
+      {
+        sort: ['title'],
+      },
+    );
     return boards;
   },
 
@@ -609,7 +766,7 @@ BlazeComponent.extendComponent({
     if (this.parentBoard.get()) {
       return Cards.find({
         boardId: this.parentBoard.get(),
-        _id: {$ne: currentId},
+        _id: { $ne: currentId },
       });
     } else {
       return [];
@@ -642,63 +799,149 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'click .js-copy-card-link-to-clipboard' () {
-        // Clipboard code from:
-        // https://stackoverflow.com/questions/6300213/copy-selected-text-to-the-clipboard-without-using-flash-must-be-cross-browser
-        const StringToCopyElement = document.getElementById('cardURL');
-        StringToCopyElement.select();
-        if (document.execCommand('copy')) {
-          StringToCopyElement.blur();
-        } else {
-          document.getElementById('cardURL').selectionStart = 0;
-          document.getElementById('cardURL').selectionEnd = 999;
-          document.execCommand('copy');
-          if (window.getSelection) {
-            if (window.getSelection().empty) { // Chrome
-              window.getSelection().empty();
-            } else if (window.getSelection().removeAllRanges) { // Firefox
-              window.getSelection().removeAllRanges();
+    return [
+      {
+        'click .js-copy-card-link-to-clipboard'() {
+          // Clipboard code from:
+          // https://stackoverflow.com/questions/6300213/copy-selected-text-to-the-clipboard-without-using-flash-must-be-cross-browser
+          const StringToCopyElement = document.getElementById('cardURL');
+          StringToCopyElement.select();
+          if (document.execCommand('copy')) {
+            StringToCopyElement.blur();
+          } else {
+            document.getElementById('cardURL').selectionStart = 0;
+            document.getElementById('cardURL').selectionEnd = 999;
+            document.execCommand('copy');
+            if (window.getSelection) {
+              if (window.getSelection().empty) {
+                // Chrome
+                window.getSelection().empty();
+              } else if (window.getSelection().removeAllRanges) {
+                // Firefox
+                window.getSelection().removeAllRanges();
+              }
+            } else if (document.selection) {
+              // IE?
+              document.selection.empty();
             }
-          } else if (document.selection) { // IE?
-            document.selection.empty();
           }
-        }
+        },
+        'click .js-delete': Popup.afterConfirm('cardDelete', function() {
+          Popup.close();
+          Cards.remove(this._id);
+          Utils.goBoardId(this.boardId);
+        }),
+        'change .js-field-parent-board'(event) {
+          const selection = $(event.currentTarget).val();
+          const list = $('.js-field-parent-card');
+          if (selection === 'none') {
+            this.parentBoard.set(null);
+          } else {
+            subManager.subscribe('board', $(event.currentTarget).val(), false);
+            this.parentBoard.set(selection);
+            list.prop('disabled', false);
+          }
+          this.setParentCardId(null);
+        },
+        'change .js-field-parent-card'(event) {
+          const selection = $(event.currentTarget).val();
+          this.setParentCardId(selection);
+        },
       },
-      'click .js-delete': Popup.afterConfirm('cardDelete', function () {
-        Popup.close();
-        Cards.remove(this._id);
-        Utils.goBoardId(this.boardId);
-      }),
-      'change .js-field-parent-board'(evt) {
-        const selection = $(evt.currentTarget).val();
-        const list = $('.js-field-parent-card');
-        if (selection === 'none') {
-          this.parentBoard.set(null);
-        } else {
-          subManager.subscribe('board', $(evt.currentTarget).val());
-          this.parentBoard.set(selection);
-          list.prop('disabled', false);
-        }
-        this.setParentCardId(null);
-      },
-      'change .js-field-parent-card'(evt) {
-        const selection = $(evt.currentTarget).val();
-        this.setParentCardId(selection);
-      },
-    }];
+    ];
   },
 }).register('cardMorePopup');
 
-
 // Close the card details pane by pressing escape
-EscapeActions.register('detailsPane',
+EscapeActions.register(
+  'detailsPane',
   () => {
-    Utils.goBoardId(Session.get('currentBoard'));
+    if (Session.get('cardDetailsIsDragging')) {
+      // Reset dragging status as the mouse landed outside the cardDetails template area and this will prevent a mousedown event from firing
+      Session.set('cardDetailsIsDragging', false);
+      Session.set('cardDetailsIsMouseDown', false);
+    } else {
+      // Prevent close card when the user is selecting text and moves the mouse cursor outside the card detail area
+      Utils.goBoardId(Session.get('currentBoard'));
+    }
   },
   () => {
     return !Session.equals('currentCard', null);
-  }, {
+  },
+  {
     noClickEscapeOn: '.js-card-details,.board-sidebar,#header',
-  }
+  },
 );
+
+Template.cardAssigneesPopup.events({
+  'click .js-select-assignee'(event) {
+    const card = Cards.findOne(Session.get('currentCard'));
+    const assigneeId = this.userId;
+    card.toggleAssignee(assigneeId);
+    event.preventDefault();
+  },
+});
+
+Template.cardAssigneesPopup.helpers({
+  isCardAssignee() {
+    const card = Template.parentData();
+    const cardAssignees = card.getAssignees();
+
+    return _.contains(cardAssignees, this.userId);
+  },
+
+  user() {
+    return Users.findOne(this.userId);
+  },
+});
+
+Template.cardAssigneePopup.helpers({
+  userData() {
+    // We need to handle a special case for the search results provided by the
+    // `matteodem:easy-search` package. Since these results gets published in a
+    // separate collection, and not in the standard Meteor.Users collection as
+    // expected, we use a component parameter ("property") to distinguish the
+    // two cases.
+    const userCollection = this.esSearch ? ESSearchResults : Users;
+    return userCollection.findOne(this.userId, {
+      fields: {
+        profile: 1,
+        username: 1,
+      },
+    });
+  },
+
+  memberType() {
+    const user = Users.findOne(this.userId);
+    return user && user.isBoardAdmin() ? 'admin' : 'normal';
+  },
+
+  presenceStatusClassName() {
+    const user = Users.findOne(this.userId);
+    const userPresence = presences.findOne({ userId: this.userId });
+    if (user && user.isInvitedTo(Session.get('currentBoard'))) return 'pending';
+    else if (!userPresence) return 'disconnected';
+    else if (Session.equals('currentBoard', userPresence.state.currentBoardId))
+      return 'active';
+    else return 'idle';
+  },
+
+  isCardAssignee() {
+    const card = Template.parentData();
+    const cardAssignees = card.getAssignees();
+
+    return _.contains(cardAssignees, this.userId);
+  },
+
+  user() {
+    return Users.findOne(this.userId);
+  },
+});
+
+Template.cardAssigneePopup.events({
+  'click .js-remove-assignee'() {
+    Cards.findOne(this.cardId).unassignAssignee(this.userId);
+    Popup.close();
+  },
+  'click .js-edit-profile': Popup.open('editProfile'),
+});

client/components/cards/cardDetails.styl

@@ -1,5 +1,80 @@
 @import 'nib'
 
+// Assignee, code copied from wekan/client/users/userAvatar.styl
+
+avatar-radius = 50%
+
+.assignee
+  border-radius: 3px
+  display: block
+  position: relative
+  float: left
+  height: 30px
+  width: @height
+  margin: 0 4px 4px 0
+  cursor: pointer
+  user-select: none
+  z-index: 1
+  text-decoration: none
+  border-radius: avatar-radius
+
+  .avatar
+    overflow: hidden
+    border-radius: avatar-radius
+
+    &.avatar-assignee-initials
+      height: 70%
+      width: @height
+      padding: 15%
+      background-color: #dbdbdb
+      color: #444444
+      position: absolute
+
+    &.avatar-image
+      height: 100%
+      width: @height
+
+  .assignee-presence-status
+    background-color: #b3b3b3
+    border: 1px solid #fff
+    border-radius: 50%
+    height: 7px
+    width: @height
+    position: absolute
+    right: -1px
+    bottom: -1px
+    border: 1px solid white
+    z-index: 15
+
+    &.active
+      background: #64c464
+      border-color: #daf1da
+
+    &.idle
+      background: #e4e467
+      border-color: #f7f7d4
+
+    &.disconnected
+      background: #bdbdbd
+      border-color: #ededed
+
+    &.pending
+      background: #e44242
+      border-color: #f1dada
+
+
+
+  &.add-assignee
+    display: flex
+    align-items: center
+    justify-content: center
+    box-shadow: 0 0 0 2px darken(white, 25%) inset
+
+    &:hover, &.is-active
+      box-shadow: 0 0 0 2px darken(white, 60%) inset
+
+// Other card details
+
 .card-details
   padding: 0
   flex-shrink: 0
@@ -32,7 +107,9 @@
     border-bottom: 1px solid darken(white, 14%)
 
     .close-card-details,
-    .card-details-menu
+    .card-details-menu,
+    .close-card-details-mobile-web,
+    .card-details-menu-mobile-web
       float: right
 
     .close-card-details
@@ -40,10 +117,20 @@
       padding: 5px
       margin-right: -8px
 
+    .close-card-details-mobile-web
+      font-size: 24px
+      padding: 5px
+      margin-right: 40px
+
     .card-details-menu
       font-size: 17px
       padding: 10px
 
+    .card-details-menu-mobile-web
+      font-size: 17px
+      padding: 10px
+      margin-right: 30px
+
     .card-details-watch
       font-size: 17px
       padding-left: 7px
@@ -93,13 +180,16 @@
         margin-right: 0
       &.card-details-item-labels,
       &.card-details-item-members,
+      &.card-details-item-assignees,
       &.card-details-item-received,
       &.card-details-item-start,
       &.card-details-item-due,
       &.card-details-item-end,
       &.card-details-item-customfield,
       &.card-details-item-name
-        max-width: 50%
+        display: block
+        word-wrap: break-word
+        max-width: 48%
         flex-grow: 1
 
   .card-details-item-title
@@ -126,13 +216,14 @@ input[type="submit"].attachment-add-link-submit
 
 @media screen and (max-width: 800px)
   .card-details
-    width: calc(100% - 40px)
+    width: calc(100% - 1px)
     padding: 0px 20px 0px 20px
     margin: 0px
     transition: none
 
     .card-details-canvas
       width: 100%
+      padding-left: 0px;
 
     .card-details-header
       .close-card-details

client/components/cards/cardTime.js

@@ -20,29 +20,31 @@ BlazeComponent.extendComponent({
     this.card.setSpentTime(null);
   },
   events() {
-    return [{
-      //TODO : need checking this portion
-      'submit .edit-time'(evt) {
-        evt.preventDefault();
+    return [
+      {
+        //TODO : need checking this portion
+        'submit .edit-time'(evt) {
+          evt.preventDefault();
 
-        const spentTime = parseFloat(evt.target.time.value);
-        const isOvertime = this.card.getIsOvertime();
+          const spentTime = parseFloat(evt.target.time.value);
+          const isOvertime = this.card.getIsOvertime();
 
-        if (spentTime >= 0) {
-          this.storeTime(spentTime, isOvertime);
+          if (spentTime >= 0) {
+            this.storeTime(spentTime, isOvertime);
+            Popup.close();
+          } else {
+            this.error.set('invalid-time');
+            evt.target.time.focus();
+          }
+        },
+        'click .js-delete-time'(evt) {
+          evt.preventDefault();
+          this.deleteTime();
           Popup.close();
-        } else {
-          this.error.set('invalid-time');
-          evt.target.time.focus();
-        }
+        },
+        'click a.js-toggle-overtime': this.toggleOvertime,
       },
-      'click .js-delete-time'(evt) {
-        evt.preventDefault();
-        this.deleteTime();
-        Popup.close();
-      },
-      'click a.js-toggle-overtime': this.toggleOvertime,
-    }];
+    ];
   },
 }).register('editCardSpentTimePopup');
 
@@ -56,23 +58,33 @@ BlazeComponent.extendComponent({
   },
   showTitle() {
     if (this.data().getIsOvertime()) {
-      return `${TAPi18n.__('overtime')} ${this.data().getSpentTime()} ${TAPi18n.__('hours')}`;
+      return `${TAPi18n.__(
+        'overtime',
+      )} ${this.data().getSpentTime()} ${TAPi18n.__('hours')}`;
     } else {
-      return `${TAPi18n.__('card-spent')} ${this.data().getSpentTime()} ${TAPi18n.__('hours')}`;
+      return `${TAPi18n.__(
+        'card-spent',
+      )} ${this.data().getSpentTime()} ${TAPi18n.__('hours')}`;
     }
   },
   showTime() {
     return this.data().getSpentTime();
   },
   events() {
-    return [{
-      'click .js-edit-time': Popup.open('editCardSpentTime'),
-    }];
+    return [
+      {
+        'click .js-edit-time': Popup.open('editCardSpentTime'),
+      },
+    ];
   },
 }).register('cardSpentTime');
 
 Template.timeBadge.helpers({
   canModifyCard() {
-    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+    return (
+      Meteor.user() &&
+      Meteor.user().isBoardMember() &&
+      !Meteor.user().isCommentOnly()
+    );
   },
 });

client/components/cards/checklists.jade

@@ -1,5 +1,7 @@
 template(name="checklists")
-  h3 {{_ 'checklists'}}
+  h3
+    i.fa.fa-check
+    | {{_ 'checklists'}}
   if toggleDeleteDialog.get
     .board-overlay#card-details-overlay
     +checklistDeleteDialog(checklist = checklistToDelete)
@@ -56,7 +58,7 @@ template(name="addChecklistItemForm")
     a.fa.fa-times-thin.js-close-inlined-form
 
 template(name="editChecklistItemForm")
-  textarea.js-edit-checklist-item(rows='1' autofocus)
+  textarea.js-edit-checklist-item(rows='1' autofocus dir="auto")
     if $eq type 'item'
       = item.title
     else

client/components/cards/checklists.js

@@ -64,20 +64,23 @@ BlazeComponent.extendComponent({
   },
 
   canModifyCard() {
-    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+    return (
+      Meteor.user() &&
+      Meteor.user().isBoardMember() &&
+      !Meteor.user().isCommentOnly() &&
+      !Meteor.user().isWorker()
+    );
   },
 }).register('checklistDetail');
 
 BlazeComponent.extendComponent({
-
   addChecklist(event) {
     event.preventDefault();
     const textarea = this.find('textarea.js-add-checklist-item');
     const title = textarea.value.trim();
     let cardId = this.currentData().cardId;
     const card = Cards.findOne(cardId);
-    if (card.isLinked())
-      cardId = card.linkedId;
+    if (card.isLinked()) cardId = card.linkedId;
 
     if (title) {
       Checklists.insert({
@@ -86,7 +89,9 @@ BlazeComponent.extendComponent({
         sort: card.checklists().count(),
       });
       setTimeout(() => {
-        this.$('.add-checklist-item').last().click();
+        this.$('.add-checklist-item')
+          .last()
+          .click();
       }, 100);
     }
     textarea.value = '';
@@ -113,7 +118,12 @@ BlazeComponent.extendComponent({
   },
 
   canModifyCard() {
-    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+    return (
+      Meteor.user() &&
+      Meteor.user().isBoardMember() &&
+      !Meteor.user().isCommentOnly() &&
+      !Meteor.user().isWorker()
+    );
   },
 
   deleteChecklist() {
@@ -167,37 +177,43 @@ BlazeComponent.extendComponent({
   events() {
     const events = {
       'click .toggle-delete-checklist-dialog'(event) {
-        if($(event.target).hasClass('js-delete-checklist')){
+        if ($(event.target).hasClass('js-delete-checklist')) {
           this.checklistToDelete = this.currentData().checklist; //Store data context
         }
         this.toggleDeleteDialog.set(!this.toggleDeleteDialog.get());
       },
     };
 
-    return [{
-      ...events,
-      'submit .js-add-checklist': this.addChecklist,
-      'submit .js-edit-checklist-title': this.editChecklist,
-      'submit .js-add-checklist-item': this.addChecklistItem,
-      'submit .js-edit-checklist-item': this.editChecklistItem,
-      'click .js-delete-checklist-item': this.deleteItem,
-      'click .confirm-checklist-delete': this.deleteChecklist,
-      keydown: this.pressKey,
-    }];
+    return [
+      {
+        ...events,
+        'submit .js-add-checklist': this.addChecklist,
+        'submit .js-edit-checklist-title': this.editChecklist,
+        'submit .js-add-checklist-item': this.addChecklistItem,
+        'submit .js-edit-checklist-item': this.editChecklistItem,
+        'click .js-delete-checklist-item': this.deleteItem,
+        'click .confirm-checklist-delete': this.deleteChecklist,
+        keydown: this.pressKey,
+      },
+    ];
   },
 }).register('checklists');
 
 Template.checklistDeleteDialog.onCreated(() => {
   const $cardDetails = this.$('.card-details');
-  this.scrollState = { position: $cardDetails.scrollTop(), //save current scroll position
+  this.scrollState = {
+    position: $cardDetails.scrollTop(), //save current scroll position
     top: false, //required for smooth scroll animation
   };
   //Callback's purpose is to only prevent scrolling after animation is complete
-  $cardDetails.animate({ scrollTop: 0 }, 500, () => { this.scrollState.top = true; });
+  $cardDetails.animate({ scrollTop: 0 }, 500, () => {
+    this.scrollState.top = true;
+  });
 
   //Prevent scrolling while dialog is open
   $cardDetails.on('scroll', () => {
-    if(this.scrollState.top) { //If it's already in position, keep it there. Otherwise let animation scroll
+    if (this.scrollState.top) {
+      //If it's already in position, keep it there. Otherwise let animation scroll
       $cardDetails.scrollTop(0);
     }
   });
@@ -206,12 +222,17 @@ Template.checklistDeleteDialog.onCreated(() => {
 Template.checklistDeleteDialog.onDestroyed(() => {
   const $cardDetails = this.$('.card-details');
   $cardDetails.off('scroll'); //Reactivate scrolling
-  $cardDetails.animate( { scrollTop: this.scrollState.position });
+  $cardDetails.animate({ scrollTop: this.scrollState.position });
 });
 
 Template.checklistItemDetail.helpers({
   canModifyCard() {
-    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+    return (
+      Meteor.user() &&
+      Meteor.user().isBoardMember() &&
+      !Meteor.user().isCommentOnly() &&
+      !Meteor.user().isWorker()
+    );
   },
 });
 
@@ -224,8 +245,10 @@ BlazeComponent.extendComponent({
     }
   },
   events() {
-    return [{
-      'click .js-checklist-item .check-box': this.toggleItem,
-    }];
+    return [
+      {
+        'click .js-checklist-item .check-box': this.toggleItem,
+      },
+    ];
   },
 }).register('checklistItemDetail');

client/components/cards/checklists.styl

@@ -128,6 +128,9 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
     & .viewer
       p
         margin-bottom: 2px
+        display: block
+        word-wrap: break-word
+        max-width: 420px
 
 .js-delete-checklist-item
   margin: 0 0 0.5em 1.33em

client/components/cards/labels.jade

@@ -31,7 +31,8 @@ template(name="cardLabelsPopup")
         a.card-label-edit-button.fa.fa-pencil.js-edit-label
         span.card-label.card-label-selectable.js-select-label(class="card-label-{{color}}"
           class="{{# if isLabelSelected ../_id }}active{{/if}}")
-            = name
+            +viewer
+              = name
             if(isLabelSelected ../_id)
               i.card-label-selectable-icon.fa.fa-check
   if currentUser.isBoardAdmin

client/components/cards/labels.js

@@ -9,7 +9,7 @@ BlazeComponent.extendComponent({
   },
 
   labels() {
-    return labelColors.map((color) => ({ color, name: '' }));
+    return labelColors.map(color => ({ color, name: '' }));
   },
 
   isSelected(color) {
@@ -17,11 +17,13 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'click .js-palette-color'() {
-        this.currentColor.set(this.currentData().color);
+    return [
+      {
+        'click .js-palette-color'() {
+          this.currentColor.set(this.currentData().color);
+        },
       },
-    }];
+    ];
   },
 }).register('formLabel');
 
@@ -38,19 +40,19 @@ Template.createLabelPopup.helpers({
 });
 
 Template.cardLabelsPopup.events({
-  'click .js-select-label'(evt) {
+  'click .js-select-label'(event) {
     const card = Cards.findOne(Session.get('currentCard'));
     const labelId = this._id;
     card.toggleLabel(labelId);
-    evt.preventDefault();
+    event.preventDefault();
   },
   'click .js-edit-label': Popup.open('editLabel'),
   'click .js-add-label': Popup.open('createLabel'),
 });
 
 Template.formLabel.events({
-  'click .js-palette-color'(evt) {
-    const $this = $(evt.currentTarget);
+  'click .js-palette-color'(event) {
+    const $this = $(event.currentTarget);
 
     // hide selected ll colors
     $('.js-palette-select').addClass('hide');
@@ -62,11 +64,14 @@ Template.formLabel.events({
 
 Template.createLabelPopup.events({
   // Create the new label
-  'submit .create-label'(evt, tpl) {
-    evt.preventDefault();
+  'submit .create-label'(event, templateInstance) {
+    event.preventDefault();
     const board = Boards.findOne(Session.get('currentBoard'));
-    const name = tpl.$('#labelName').val().trim();
-    const color = Blaze.getData(tpl.find('.fa-check')).color;
+    const name = templateInstance
+      .$('#labelName')
+      .val()
+      .trim();
+    const color = Blaze.getData(templateInstance.find('.fa-check')).color;
     board.addLabel(name, color);
     Popup.back();
   },
@@ -78,11 +83,14 @@ Template.editLabelPopup.events({
     board.removeLabel(this._id);
     Popup.back(2);
   }),
-  'submit .edit-label'(evt, tpl) {
-    evt.preventDefault();
+  'submit .edit-label'(event, templateInstance) {
+    event.preventDefault();
     const board = Boards.findOne(Session.get('currentBoard'));
-    const name = tpl.$('#labelName').val().trim();
-    const color = Blaze.getData(tpl.find('.fa-check')).color;
+    const name = templateInstance
+      .$('#labelName')
+      .val()
+      .trim();
+    const color = Blaze.getData(templateInstance.find('.fa-check')).color;
     board.editLabel(this._id, name, color);
     Popup.back();
   },

client/components/cards/labels.styl

@@ -10,9 +10,10 @@
   margin-right: 4px
   margin-bottom: 5px
   padding: 3px 8px
-  max-width: 100%
+  max-width: 210px
   min-width: 8px
   overflow: ellipsis
+  word-wrap: break-word
   height: 18px
   vertical-align: bottom
 

client/components/cards/minicard.jade

@@ -3,15 +3,25 @@ template(name="minicard")
     class="{{#if isLinkedCard}}linked-card{{/if}}"
     class="{{#if isLinkedBoard}}linked-board{{/if}}"
     class="minicard-{{colorClass}}")
+    if isMiniScreen
+      .handle
+        .fa.fa-arrows
+    unless isMiniScreen
+      if showDesktopDragHandles
+        .handle
+          .fa.fa-arrows
     if cover
       .minicard-cover(style="background-image: url('{{cover.url}}');")
     if labels
       .minicard-labels
         each labels
-          .minicard-label(class="card-label-{{color}}" title="{{name}}")
+          unless hiddenMinicardLabelText
+            span.card-label(class="card-label-{{color}}" title=name)
+              +viewer
+                = name
+          if hiddenMinicardLabelText
+            .minicard-label(class="card-label-{{color}}" title="{{name}}")
     .minicard-title
-      .handle
-        .fa.fa-arrows
       if $eq 'prefix-with-full-path' currentBoard.presentParentTask
         .parent-prefix
           | {{ parentString ' > ' }}
@@ -48,6 +58,8 @@ template(name="minicard")
       if getDue
         .date
           +minicardDueDate
+      if getEnd
+         +minicardEndDate
       if getSpentTime
         .date
           +cardSpentTime
@@ -55,13 +67,21 @@ template(name="minicard")
     .minicard-custom-fields
       each customFieldsWD
         if definition.showOnCard
-          .minicard-custom-field
-            if definition.showLabelOnMiniCard
+          if trueValue
+            .minicard-custom-field
+              if definition.showLabelOnMiniCard
+                .minicard-custom-field-item
+                  +viewer
+                    = definition.name
               .minicard-custom-field-item
-                = definition.name
-            .minicard-custom-field-item
-              +viewer
-                = trueValue
+                +viewer
+                  = trueValue
+
+    if getAssignees
+      .minicard-assignees.js-minicard-assignees
+        each getAssignees
+          +userAvatar(userId=this)
+        hr
 
     if getMembers
       .minicard-members.js-minicard-members
@@ -73,7 +93,10 @@ template(name="minicard")
         if comments.count
           .badge(title="{{_ 'card-comments-title' comments.count }}")
             span.badge-icon.fa.fa-comment-o.badge-comment
-            span.badge-text= comments.count
+              = ' '
+              = comments.count
+            //span.badge-comment.badge-text
+            //|  {{_ 'comment'}}
       if getDescription
         .badge.badge-state-image-only(title=getDescription)
           span.badge-icon.fa.fa-align-left

client/components/cards/minicard.js

@@ -1,3 +1,5 @@
+import { Cookies } from 'meteor/ostrio:cookies';
+const cookies = new Cookies();
 // Template.cards.events({
 //   'click .member': Popup.open('cardMember')
 // });
@@ -8,13 +10,46 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'click .js-linked-link' () {
-        if (this.data().isLinkedCard())
-          Utils.goCardId(this.data().linkedId);
-        else if (this.data().isLinkedBoard())
-          Utils.goBoardId(this.data().linkedId);
+    return [
+      {
+        'click .js-linked-link'() {
+          if (this.data().isLinkedCard()) Utils.goCardId(this.data().linkedId);
+          else if (this.data().isLinkedBoard())
+            Utils.goBoardId(this.data().linkedId);
+        },
       },
-    }];
+      {
+        'click .js-toggle-minicard-label-text'() {
+          if (cookies.has('hiddenMinicardLabelText')) {
+            cookies.remove('hiddenMinicardLabelText'); //true
+          } else {
+            cookies.set('hiddenMinicardLabelText', 'true'); //true
+          }
+        },
+      },
+    ];
   },
 }).register('minicard');
+
+Template.minicard.helpers({
+  showDesktopDragHandles() {
+    currentUser = Meteor.user();
+    if (currentUser) {
+      return (currentUser.profile || {}).showDesktopDragHandles;
+    } else if (cookies.has('showDesktopDragHandles')) {
+      return true;
+    } else {
+      return false;
+    }
+  },
+  hiddenMinicardLabelText() {
+    currentUser = Meteor.user();
+    if (currentUser) {
+      return (currentUser.profile || {}).hiddenMinicardLabelText;
+    } else if (cookies.has('hiddenMinicardLabelText')) {
+      return true;
+    } else {
+      return false;
+    }
+  },
+});

client/components/cards/minicard.styl

@@ -81,6 +81,7 @@
   .minicard-labels
     float: right
     display: flex
+    flex-wrap: wrap
 
     .minicard-label
       width: 11px
@@ -92,8 +93,11 @@
   .minicard-custom-field
     display:flex;
   .minicard-custom-field-item
-    max-width:50%;
-    flex-grow:1;
+    flex-grow: 1
+    display: block
+    word-wrap: break-word
+    max-width: 100px
+    margin-right: 4px
   .handle
     width: 20px;
     height: 20px;
@@ -101,7 +105,7 @@
     right: 5px;
     top: 5px;
     display:none;
-    @media only screen and (max-width: 1199px) {
+    @media only screen {
       display:block;
     }
     .fa-arrows
@@ -111,7 +115,9 @@
     p:last-child
       margin-bottom: 0
     .viewer
-      display: inline-block
+      display: block
+      word-wrap: break-word
+      max-width: 230px
   .dates
     display: flex;
     flex-direction: row;
@@ -144,7 +150,7 @@
       .badge-text
         vertical-align: middle
         &.badge-comment
-           margin-bottom: 0.1rem
+          margin-bottom: 0.1rem
 
       .badge-text
         font-size: 0.9em
@@ -154,9 +160,10 @@
         padding-left: 0px
         line-height: 12px
 
-  .minicard-members
+  .minicard-members,
+  .minicard-assignees
     float: right
-    margin: 2px -8px -2px 0
+    margin: 2px -8px 12px 0
 
     .member
       float: right
@@ -164,10 +171,17 @@
       height: 28px
       width: @height
 
+    .assignee
+      float: right
+      border-radius: 50%
+      height: 28px
+      width: @height
+
     + .badges
       margin-top: 10px
 
-  .minicard-members:empty
+  .minicard-members:empty,
+  .minicard-assignees:empty
     display: none
 
   &.minicard-composer

client/components/cards/subtasks.jade

@@ -1,5 +1,7 @@
 template(name="subtasks")
-  h3 {{_ 'subtasks'}}
+  h3
+    i.fa.fa-sitemap
+    | {{_ 'subtasks'}}
   if toggleDeleteDialog.get
     .board-overlay#card-details-overlay
     +subtaskDeleteDialog(subtask = subtaskToDelete)
@@ -50,13 +52,13 @@ template(name="subtaskDeleteDialog")
       button.toggle-delete-subtask-dialog(type="button") {{_ 'cancel'}}
 
 template(name="addSubtaskItemForm")
-  textarea.js-add-subtask-item(rows='1' autofocus)
+  textarea.js-add-subtask-item(rows='1' autofocus dir="auto")
   .edit-controls.clearfix
     button.primary.confirm.js-submit-add-subtask-item-form(type="submit") {{_ 'save'}}
     a.fa.fa-times-thin.js-close-inlined-form
 
 template(name="editSubtaskItemForm")
-  textarea.js-edit-subtask-item(rows='1' autofocus)
+  textarea.js-edit-subtask-item(rows='1' autofocus dir="auto")
     if $eq type 'item'
       = item.title
     else
@@ -76,7 +78,7 @@ template(name="subtasksItems")
       else
         +subtaskItemDetail(item = item subtasks = subtasks)
     if canModifyCard
-      +inlinedForm(autoclose=false classNames="js-add-subtask-item" subtasks = subtasks)
+      +inlinedForm(autoclose=false classNames="js-add-subtask-item" subtasks = subtasks dir="auto")
         +addSubtaskItemForm
       else
         a.add-subtask-item.js-open-inlined-form

client/components/cards/subtasks.js

@@ -1,11 +1,15 @@
 BlazeComponent.extendComponent({
   canModifyCard() {
-    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+    return (
+      Meteor.user() &&
+      Meteor.user().isBoardMember() &&
+      !Meteor.user().isCommentOnly() &&
+      !Meteor.user().isWorker()
+    );
   },
 }).register('subtaskDetail');
 
 BlazeComponent.extendComponent({
-
   addSubtask(event) {
     event.preventDefault();
     const textarea = this.find('textarea.js-add-subtask-item');
@@ -38,9 +42,10 @@ BlazeComponent.extendComponent({
       // See https://github.com/wekan/wekan/issues/80
       Filter.addException(_id);
 
-
       setTimeout(() => {
-        this.$('.add-subtask-item').last().click();
+        this.$('.add-subtask-item')
+          .last()
+          .click();
       }, 100);
     }
     textarea.value = '';
@@ -48,7 +53,12 @@ BlazeComponent.extendComponent({
   },
 
   canModifyCard() {
-    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+    return (
+      Meteor.user() &&
+      Meteor.user().isBoardMember() &&
+      !Meteor.user().isCommentOnly() &&
+      !Meteor.user().isWorker()
+    );
   },
 
   deleteSubtask() {
@@ -85,13 +95,13 @@ BlazeComponent.extendComponent({
   events() {
     const events = {
       'click .toggle-delete-subtask-dialog'(event) {
-        if($(event.target).hasClass('js-delete-subtask')){
+        if ($(event.target).hasClass('js-delete-subtask')) {
           this.subtaskToDelete = this.currentData().subtask; //Store data context
         }
         this.toggleDeleteDialog.set(!this.toggleDeleteDialog.get());
       },
       'click .js-view-subtask'(event) {
-        if($(event.target).hasClass('js-view-subtask')){
+        if ($(event.target).hasClass('js-view-subtask')) {
           const subtask = this.currentData().subtask;
           const board = subtask.board();
           FlowRouter.go('card', {
@@ -103,27 +113,33 @@ BlazeComponent.extendComponent({
       },
     };
 
-    return [{
-      ...events,
-      'submit .js-add-subtask': this.addSubtask,
-      'submit .js-edit-subtask-title': this.editSubtask,
-      'click .confirm-subtask-delete': this.deleteSubtask,
-      keydown: this.pressKey,
-    }];
+    return [
+      {
+        ...events,
+        'submit .js-add-subtask': this.addSubtask,
+        'submit .js-edit-subtask-title': this.editSubtask,
+        'click .confirm-subtask-delete': this.deleteSubtask,
+        keydown: this.pressKey,
+      },
+    ];
   },
 }).register('subtasks');
 
 Template.subtaskDeleteDialog.onCreated(() => {
   const $cardDetails = this.$('.card-details');
-  this.scrollState = { position: $cardDetails.scrollTop(), //save current scroll position
+  this.scrollState = {
+    position: $cardDetails.scrollTop(), //save current scroll position
     top: false, //required for smooth scroll animation
   };
   //Callback's purpose is to only prevent scrolling after animation is complete
-  $cardDetails.animate({ scrollTop: 0 }, 500, () => { this.scrollState.top = true; });
+  $cardDetails.animate({ scrollTop: 0 }, 500, () => {
+    this.scrollState.top = true;
+  });
 
   //Prevent scrolling while dialog is open
   $cardDetails.on('scroll', () => {
-    if(this.scrollState.top) { //If it's already in position, keep it there. Otherwise let animation scroll
+    if (this.scrollState.top) {
+      //If it's already in position, keep it there. Otherwise let animation scroll
       $cardDetails.scrollTop(0);
     }
   });
@@ -132,12 +148,17 @@ Template.subtaskDeleteDialog.onCreated(() => {
 Template.subtaskDeleteDialog.onDestroyed(() => {
   const $cardDetails = this.$('.card-details');
   $cardDetails.off('scroll'); //Reactivate scrolling
-  $cardDetails.animate( { scrollTop: this.scrollState.position });
+  $cardDetails.animate({ scrollTop: this.scrollState.position });
 });
 
 Template.subtaskItemDetail.helpers({
   canModifyCard() {
-    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+    return (
+      Meteor.user() &&
+      Meteor.user().isBoardMember() &&
+      !Meteor.user().isCommentOnly() &&
+      !Meteor.user().isWorker()
+    );
   },
 });
 

client/components/import/import.js

@@ -56,7 +56,7 @@ BlazeComponent.extendComponent({
     const membersMapping = this.membersToMap.get();
     if (membersMapping) {
       const mappingById = {};
-      membersMapping.forEach((member) => {
+      membersMapping.forEach(member => {
         if (member.wekanId) {
           mappingById[member.id] = member.wekanId;
         }
@@ -64,7 +64,8 @@ BlazeComponent.extendComponent({
       additionalData.membersMapping = mappingById;
     }
     this.membersToMap.set([]);
-    Meteor.call('importBoard',
+    Meteor.call(
+      'importBoard',
       this.importedData.get(),
       additionalData,
       this.importSource,
@@ -76,7 +77,7 @@ BlazeComponent.extendComponent({
           Session.set('fromBoard', null);
           Utils.goBoardId(res);
         }
-      }
+      },
     );
   },
 
@@ -84,12 +85,12 @@ BlazeComponent.extendComponent({
     const importSource = Session.get('importSource');
     let membersToMap;
     switch (importSource) {
-    case 'trello':
-      membersToMap = trelloMembersMapper.getMembersToMap(dataObject);
-      break;
-    case 'wekan':
-      membersToMap = wekanMembersMapper.getMembersToMap(dataObject);
-      break;
+      case 'trello':
+        membersToMap = trelloMembersMapper.getMembersToMap(dataObject);
+        break;
+      case 'wekan':
+        membersToMap = wekanMembersMapper.getMembersToMap(dataObject);
+        break;
     }
     return membersToMap;
   },
@@ -109,22 +110,26 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      submit(evt) {
-        return this.parentComponent().importData(evt);
+    return [
+      {
+        submit(evt) {
+          return this.parentComponent().importData(evt);
+        },
       },
-    }];
+    ];
   },
 }).register('importTextarea');
 
 BlazeComponent.extendComponent({
   onCreated() {
     this.autorun(() => {
-      this.parentComponent().membersToMap.get().forEach(({ wekanId }) => {
-        if (wekanId) {
-          this.subscribe('user-miniprofile', wekanId);
-        }
-      });
+      this.parentComponent()
+        .membersToMap.get()
+        .forEach(({ wekanId }) => {
+          if (wekanId) {
+            this.subscribe('user-miniprofile', wekanId);
+          }
+        });
     });
   },
 
@@ -149,23 +154,23 @@ BlazeComponent.extendComponent({
   _setPropertyForMember(property, value, memberId, unset = false) {
     const listOfMembers = this.members();
     let finder = null;
-    if(memberId) {
-      finder = (member) => member.id === memberId;
+    if (memberId) {
+      finder = member => member.id === memberId;
     } else {
-      finder = (member) => member.selected;
+      finder = member => member.selected;
     }
-    listOfMembers.forEach((member) => {
-      if(finder(member)) {
-        if(value !== null) {
+    listOfMembers.forEach(member => {
+      if (finder(member)) {
+        if (value !== null) {
           member[property] = value;
         } else {
           delete member[property];
         }
-        if(!unset) {
+        if (!unset) {
           // we shortcut if we don't care about unsetting the others
           return false;
         }
-      } else if(unset) {
+      } else if (unset) {
         delete member[property];
       }
       return true;
@@ -186,9 +191,9 @@ BlazeComponent.extendComponent({
     const allMembers = this.members();
     let finder = null;
     if (memberId) {
-      finder = (user) => user.id === memberId;
+      finder = user => user.id === memberId;
     } else {
-      finder = (user) => user.selected;
+      finder = user => user.selected;
     }
     return allMembers.find(finder);
   },
@@ -197,7 +202,7 @@ BlazeComponent.extendComponent({
     return this._setPropertyForMember('wekanId', wekanId, null);
   },
 
-  unmapMember(memberId){
+  unmapMember(memberId) {
     return this._setPropertyForMember('wekanId', null, memberId);
   },
 
@@ -206,22 +211,22 @@ BlazeComponent.extendComponent({
     this.parentComponent().nextStep();
   },
 
-  onMapMember(evt) {
-    const memberToMap = this.currentData();
-    if(memberToMap.wekan) {
-      // todo xxx ask for confirmation?
-      this.unmapMember(memberToMap.id);
-    } else {
-      this.setSelectedMember(memberToMap.id);
-      Popup.open('importMapMembersAdd')(evt);
-    }
-  },
-
   events() {
-    return [{
-      'submit': this.onSubmit,
-      'click .js-select-member': this.onMapMember,
-    }];
+    return [
+      {
+        submit: this.onSubmit,
+        'click .js-select-member'(evt) {
+          const memberToMap = this.currentData();
+          if (memberToMap.wekan) {
+            // todo xxx ask for confirmation?
+            this.unmapMember(memberToMap.id);
+          } else {
+            this.setSelectedMember(memberToMap.id);
+            Popup.open('importMapMembersAdd')(evt);
+          }
+        },
+      },
+    ];
   },
 }).register('importMapMembers');
 
@@ -230,14 +235,16 @@ BlazeComponent.extendComponent({
     this.find('.js-map-member input').focus();
   },
 
-  onSelectUser(){
+  onSelectUser() {
     Popup.getOpenerComponent().mapSelectedMember(this.currentData()._id);
     Popup.back();
   },
 
   events() {
-    return [{
-      'click .js-select-import': this.onSelectUser,
-    }];
+    return [
+      {
+        'click .js-select-import': this.onSelectUser,
+      },
+    ];
   },
 }).register('importMapMembersAddPopup');

client/components/import/trelloMembersMapper.js

@@ -4,7 +4,7 @@ export function getMembersToMap(data) {
   // imported member
   const membersToMap = data.members;
   // auto-map based on username
-  membersToMap.forEach((importedMember) => {
+  membersToMap.forEach(importedMember => {
     const wekanUser = Users.findOne({ username: importedMember.username });
     if (wekanUser) {
       importedMember.wekanId = wekanUser._id;

client/components/import/wekanMembersMapper.js

@@ -5,10 +5,10 @@ export function getMembersToMap(data) {
   const membersToMap = data.members;
   const users = data.users;
   // auto-map based on username
-  membersToMap.forEach((importedMember) => {
+  membersToMap.forEach(importedMember => {
     importedMember.id = importedMember.userId;
     delete importedMember.userId;
-    const user = users.filter((user) => {
+    const user = users.filter(user => {
       return user._id === importedMember.id;
     })[0];
     if (user.profile && user.profile.fullname) {

client/components/lists/list.js

@@ -1,3 +1,5 @@
+import { Cookies } from 'meteor/ostrio:cookies';
+const cookies = new Cookies();
 const { calculateIndex, enableClickOnTouch } = Utils;
 
 BlazeComponent.extendComponent({
@@ -21,18 +23,16 @@ BlazeComponent.extendComponent({
     const boardComponent = this.parentComponent().parentComponent();
 
     function userIsMember() {
-      return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+      return (
+        Meteor.user() &&
+        Meteor.user().isBoardMember() &&
+        !Meteor.user().isCommentOnly()
+      );
     }
 
     const itemsSelector = '.js-minicard:not(.placeholder, .js-card-composer)';
     const $cards = this.$('.js-minicards');
 
-    if(window.matchMedia('(max-width: 1199px)').matches) {
-      $( '.js-minicards' ).sortable({
-        handle: '.handle',
-      });
-    }
-
     $cards.sortable({
       connectWith: '.js-minicards:not(.js-list-full)',
       tolerance: 'pointer',
@@ -42,10 +42,16 @@ BlazeComponent.extendComponent({
         if (MultiSelection.isActive()) {
           const andNOthers = $cards.find('.js-minicard.is-checked').length - 1;
           if (andNOthers > 0) {
-            helper.append($(Blaze.toHTML(HTML.DIV(
-              { 'class': 'and-n-other' },
-              TAPi18n.__('and-n-other-card', { count: andNOthers })
-            ))));
+            helper.append(
+              $(
+                Blaze.toHTML(
+                  HTML.DIV(
+                    { class: 'and-n-other' },
+                    TAPi18n.__('and-n-other-card', { count: andNOthers }),
+                  ),
+                ),
+              ),
+            );
           }
         }
         return helper;
@@ -69,10 +75,16 @@ BlazeComponent.extendComponent({
         const listId = Blaze.getData(ui.item.parents('.list').get(0))._id;
         const currentBoard = Boards.findOne(Session.get('currentBoard'));
         let swimlaneId = '';
-        const boardView = Meteor.user().profile.boardView;
-        if (boardView === 'board-view-swimlanes' || currentBoard.isTemplatesBoard())
+        if (
+          Utils.boardView() === 'board-view-swimlanes' ||
+          currentBoard.isTemplatesBoard()
+        )
           swimlaneId = Blaze.getData(ui.item.parents('.swimlane').get(0))._id;
-        else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal'))
+        else if (
+          Utils.boardView() === 'board-view-lists' ||
+          Utils.boardView() === 'board-view-cal' ||
+          !Utils.boardView
+        )
           swimlaneId = currentBoard.getDefaultSwimline()._id;
 
         // Normally the jquery-ui sortable library moves the dragged DOM element
@@ -86,7 +98,12 @@ BlazeComponent.extendComponent({
 
         if (MultiSelection.isActive()) {
           Cards.find(MultiSelection.getMongoSelector()).forEach((card, i) => {
-            card.move(currentBoard._id, swimlaneId, listId, sortIndex.base + i * sortIndex.increment);
+            card.move(
+              currentBoard._id,
+              swimlaneId,
+              listId,
+              sortIndex.base + i * sortIndex.increment,
+            );
           });
         } else {
           const cardDomElement = ui.item.get(0);
@@ -100,8 +117,29 @@ BlazeComponent.extendComponent({
     // ugly touch event hotfix
     enableClickOnTouch(itemsSelector);
 
-    // Disable drag-dropping if the current user is not a board member or is comment only
     this.autorun(() => {
+      let showDesktopDragHandles = false;
+      currentUser = Meteor.user();
+      if (currentUser) {
+        showDesktopDragHandles = (currentUser.profile || {})
+          .showDesktopDragHandles;
+      } else if (cookies.has('showDesktopDragHandles')) {
+        showDesktopDragHandles = true;
+      } else {
+        showDesktopDragHandles = false;
+      }
+
+      if (!Utils.isMiniScreen() && showDesktopDragHandles) {
+        $cards.sortable({
+          handle: '.handle',
+        });
+      } else {
+        $cards.sortable({
+          handle: '.minicard',
+        });
+      }
+
+      // Disable drag-dropping if the current user is not a board member or is comment only
       $cards.sortable('option', 'disabled', !userIsMember());
     });
 
@@ -133,6 +171,19 @@ BlazeComponent.extendComponent({
   },
 }).register('list');
 
+Template.list.helpers({
+  showDesktopDragHandles() {
+    currentUser = Meteor.user();
+    if (currentUser) {
+      return (currentUser.profile || {}).showDesktopDragHandles;
+    } else if (cookies.has('showDesktopDragHandles')) {
+      return true;
+    } else {
+      return false;
+    }
+  },
+});
+
 Template.miniList.events({
   'click .js-select-list'() {
     const listId = this._id;

client/components/lists/list.styl

@@ -84,21 +84,28 @@
     padding-left: 10px
     color: #a6a6a6
 
-
   .list-header-menu
     position: absolute
     padding: 27px 19px
     margin-top: 1px
     top: -7px
-    right: -7px
+    right: 3px
 
   .list-header-plus-icon
     color: #a6a6a6
-    margin-right: 10px
+    margin-right: 15px
 
   .highlight
     color: #ce1414
 
+  .cardCount
+    color: #8c8c8c
+    font-size: 0.8em
+
+.list-header .list-header-plus-icon, .js-open-list-menu, .list-header-menu a
+    color #4d4d4d
+    padding-left 4px
+
 .list-body
   flex: 1 1 auto
   flex-direction: column
@@ -157,11 +164,20 @@
 
 @media screen and (max-width: 800px)
   .list-header-menu
-    margin-right: 30px
+    position: absolute
+    padding: 27px 19px
+    margin-top: 1px
+    top: -7px
+    margin-right: 7px
+    right: -3px
+
+  .list-header
+    .list-header-name
+      margin-left: 1.4rem
 
   .mini-list
     flex: 0 0 60px
-    height: 60px
+    height: auto
     width: 100%
     border-left: 0px
     border-bottom: 1px solid darken(white, 20%)
@@ -170,6 +186,8 @@
     display: block
     width: 100%
     border-left: 0px
+    &:first-child
+      margin-left: 0px
 
     &.ui-sortable-helper
       flex: 0 0 60px
@@ -188,8 +206,16 @@
       border-left: 0px
       border-bottom: 1px solid darken(white, 20%)
 
-  .list-header
+  .list-body
+    padding: 15px 19px;
 
+  .list-header
+    padding: 0 12px 0px
+    border-bottom: 0px solid #e4e4e4
+    height: 60px
+    margin-top: 10px
+    display: flex
+    align-items: center
     .list-header-left-icon
       display: inline
       padding: 7px
@@ -201,8 +227,18 @@
     .list-header-menu-icon
       position: absolute
       padding: 7px
-      top: -@padding
-      right: 17px
+      top: 50%
+      transform: translateY(-50%)
+      right: 47px
+      font-size: 20px
+
+    .list-header-handle
+      position: absolute
+      padding: 7px
+      top: 50%
+      transform: translateY(-50%)
+      right: 10px
+      font-size: 24px
 
 .link-board-wrapper
   display: flex

client/components/lists/listBody.jade

@@ -13,14 +13,7 @@ template(name="listBody")
               class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}")
           +minicard(this)
       if (showSpinner (idOrNull ../../_id))
-        .sk-spinner.sk-spinner-wave.sk-spinner-list(
-          class=currentBoard.colorClass
-          id="showMoreResults")
-          .sk-rect1
-          .sk-rect2
-          .sk-rect3
-          .sk-rect4
-          .sk-rect5
+        +spinnerList
 
       if canSeeAddCard
         +inlinedForm(autoclose=false position="bottom")
@@ -30,13 +23,23 @@ template(name="listBody")
             i.fa.fa-plus
             | {{_ 'add-card'}}
 
+template(name="spinnerList")
+  .sk-spinner.sk-spinner-wave.sk-spinner-list(
+    class=currentBoard.colorClass
+    id="showMoreResults")
+    .sk-rect1
+    .sk-rect2
+    .sk-rect3
+    .sk-rect4
+    .sk-rect5
+
 template(name="addCardForm")
   .minicard.minicard-composer.js-composer
     if getLabels
       .minicard-labels
         each getLabels
           .minicard-label(class="card-label-{{color}}" title="{{name}}")
-    textarea.minicard-composer-textarea.js-card-title(autofocus)
+    textarea.minicard-composer-textarea.js-card-title(autofocus dir="auto")
     if members.get
       .minicard-members.js-minicard-composer-members
         each members.get
@@ -93,7 +96,7 @@ template(name="searchElementPopup")
   form
     label
       | {{_ 'title'}}
-      input.js-element-title(type="text" placeholder="{{_ 'title'}}" autofocus required)
+      input.js-element-title(type="text" placeholder="{{_ 'title'}}" autofocus required dir="auto")
   unless isTemplateSearch
     label {{_ 'boards'}}:
     .link-board-wrapper
@@ -102,7 +105,7 @@ template(name="searchElementPopup")
         each boards
           option(value="{{_id}}") {{title}}
   form.js-search-term-form
-    input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus)
+    input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus dir="auto")
   .list-body.js-perfect-scrollbar.search-card-results
     .minicards.clearfix.js-minicards
       if isBoardTemplateSearch

client/components/lists/listBody.js

@@ -7,28 +7,6 @@ BlazeComponent.extendComponent({
     this.cardlimit = new ReactiveVar(InfiniteScrollIter);
   },
 
-  onRendered() {
-    const domElement = this.find('.js-perfect-scrollbar');
-
-    this.$(domElement).on('scroll', () => this.updateList(domElement));
-    $(window).on(`resize.${this.data().listId}`, () => this.updateList(domElement));
-
-    // we add a Mutation Observer to allow propagations of cardlimit
-    // when the spinner stays in the current view (infinite scrolling)
-    this.mutationObserver = new MutationObserver(() => this.updateList(domElement));
-
-    this.mutationObserver.observe(domElement, {
-      childList: true,
-    });
-
-    this.updateList(domElement);
-  },
-
-  onDestroyed() {
-    $(window).off(`resize.${this.data().listId}`);
-    this.mutationObserver.disconnect();
-  },
-
   mixins() {
     return [Mixins.PerfectScrollbar];
   },
@@ -38,7 +16,7 @@ BlazeComponent.extendComponent({
     options.position = options.position || 'top';
 
     const forms = this.childComponents('inlinedForm');
-    let form = forms.find((component) => {
+    let form = forms.find(component => {
       return component.data().position === options.position;
     });
     if (!form && forms.length > 0) {
@@ -70,15 +48,15 @@ BlazeComponent.extendComponent({
     const board = this.data().board();
     let linkedId = '';
     let swimlaneId = '';
-    const boardView = Meteor.user().profile.boardView;
     let cardType = 'cardType-card';
     if (title) {
       if (board.isTemplatesBoard()) {
-        swimlaneId = this.parentComponent().parentComponent().data()._id; // Always swimlanes view
+        swimlaneId = this.parentComponent()
+          .parentComponent()
+          .data()._id; // Always swimlanes view
         const swimlane = Swimlanes.findOne(swimlaneId);
         // If this is the card templates swimlane, insert a card template
-        if (swimlane.isCardTemplatesSwimlane())
-          cardType = 'template-card';
+        if (swimlane.isCardTemplatesSwimlane()) cardType = 'template-card';
         // If this is the board templates swimlane, insert a board template and a linked card
         else if (swimlane.isBoardTemplatesSwimlane()) {
           linkedId = Boards.insert({
@@ -92,9 +70,15 @@ BlazeComponent.extendComponent({
           });
           cardType = 'cardType-linkedBoard';
         }
-      } else if (boardView === 'board-view-swimlanes')
-        swimlaneId = this.parentComponent().parentComponent().data()._id;
-      else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal'))
+      } else if (Utils.boardView() === 'board-view-swimlanes')
+        swimlaneId = this.parentComponent()
+          .parentComponent()
+          .data()._id;
+      else if (
+        Utils.boardView() === 'board-view-lists' ||
+        Utils.boardView() === 'board-view-cal' ||
+        !Utils.boardView
+      )
         swimlaneId = board.getDefaultSwimline()._id;
 
       const _id = Cards.insert({
@@ -113,7 +97,9 @@ BlazeComponent.extendComponent({
       // if the displayed card count is less than the total cards in the list,
       // we need to increment the displayed card count to prevent the spinner
       // to appear
-      const cardCount = this.data().cards(this.idOrNull(swimlaneId)).count();
+      const cardCount = this.data()
+        .cards(this.idOrNull(swimlaneId))
+        .count();
       if (this.cardlimit.get() < cardCount) {
         this.cardlimit.set(this.cardlimit.get() + InfiniteScrollIter);
       }
@@ -170,9 +156,12 @@ BlazeComponent.extendComponent({
   },
 
   idOrNull(swimlaneId) {
-    const currentUser = Meteor.user();
-    if (currentUser.profile.boardView === 'board-view-swimlanes' ||
-        this.data().board().isTemplatesBoard())
+    if (
+      Utils.boardView() === 'board-view-swimlanes' ||
+      this.data()
+        .board()
+        .isTemplatesBoard()
+    )
       return swimlaneId;
     return undefined;
   },
@@ -183,62 +172,46 @@ BlazeComponent.extendComponent({
       listId: this.currentData()._id,
       archived: false,
     };
-    if (swimlaneId)
-      selector.swimlaneId = swimlaneId;
+    if (swimlaneId) selector.swimlaneId = swimlaneId;
     return Cards.find(Filter.mongoSelector(selector), {
       sort: ['sort'],
       limit,
     });
   },
 
-  spinnerInView(container) {
-    const parentViewHeight = container.clientHeight;
-    const bottomViewPosition = container.scrollTop + parentViewHeight;
-
-    const spinner = this.find('.sk-spinner-list');
-
-    const threshold = spinner.offsetTop;
-
-    return bottomViewPosition > threshold;
-  },
-
   showSpinner(swimlaneId) {
     const list = Template.currentData();
     return list.cards(swimlaneId).count() > this.cardlimit.get();
   },
 
-  updateList(container) {
-    // first, if the spinner is not rendered, we have reached the end of
-    // the list of cards, so skip and disable firing the events
-    const target = this.find('.sk-spinner-list');
-    if (!target) {
-      this.$(container).off('scroll');
-      $(window).off(`resize.${this.data().listId}`);
-      return;
-    }
-
-    if (this.spinnerInView(container)) {
-      this.cardlimit.set(this.cardlimit.get() + InfiniteScrollIter);
-      Ps.update(container);
-    }
-  },
-
   canSeeAddCard() {
-    return !this.reachedWipLimit() && Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+    return (
+      !this.reachedWipLimit() &&
+      Meteor.user() &&
+      Meteor.user().isBoardMember() &&
+      !Meteor.user().isCommentOnly() &&
+      !Meteor.user().isWorker()
+    );
   },
 
   reachedWipLimit() {
     const list = Template.currentData();
-    return !list.getWipLimit('soft') && list.getWipLimit('enabled') && list.getWipLimit('value') <= list.cards().count();
+    return (
+      !list.getWipLimit('soft') &&
+      list.getWipLimit('enabled') &&
+      list.getWipLimit('value') <= list.cards().count()
+    );
   },
 
   events() {
-    return [{
-      'click .js-minicard': this.clickOnMiniCard,
-      'click .js-toggle-multi-selection': this.toggleMultiSelection,
-      'click .open-minicard-composer': this.scrollToBottom,
-      submit: this.addCard,
-    }];
+    return [
+      {
+        'click .js-minicard': this.clickOnMiniCard,
+        'click .js-toggle-multi-selection': this.toggleMultiSelection,
+        'click .open-minicard-composer': this.scrollToBottom,
+        submit: this.addCard,
+      },
+    ];
   },
 }).register('listBody');
 
@@ -261,10 +234,15 @@ BlazeComponent.extendComponent({
 
     const currentBoardId = Session.get('currentBoard');
     arr = [];
-    _.forEach(Boards.findOne(currentBoardId).customFields().fetch(), function(field){
-      if(field.automaticallyOnCard)
-        arr.push({_id: field._id, value: null});
-    });
+    _.forEach(
+      Boards.findOne(currentBoardId)
+        .customFields()
+        .fetch(),
+      function(field) {
+        if (field.automaticallyOnCard)
+          arr.push({ _id: field._id, value: null });
+      },
+    );
     this.customFields.set(arr);
   },
 
@@ -276,7 +254,7 @@ BlazeComponent.extendComponent({
 
   getLabels() {
     const currentBoardId = Session.get('currentBoard');
-    return Boards.findOne(currentBoardId).labels.filter((label) => {
+    return Boards.findOne(currentBoardId).labels.filter(label => {
       return this.labels.get().indexOf(label._id) > -1;
     });
   },
@@ -306,18 +284,20 @@ BlazeComponent.extendComponent({
       }
 
       BlazeComponent.getComponentForElement(nextList).openForm({
-        position:this.data().position,
+        position: this.data().position,
       });
     }
   },
 
   events() {
-    return [{
-      keydown: this.pressKey,
-      'click .js-link': Popup.open('linkCard'),
-      'click .js-search': Popup.open('searchElement'),
-      'click .js-card-template': Popup.open('searchElement'),
-    }];
+    return [
+      {
+        keydown: this.pressKey,
+        'click .js-link': Popup.open('linkCard'),
+        'click .js-search': Popup.open('searchElement'),
+        'click .js-card-template': Popup.open('searchElement'),
+      },
+    ];
   },
 
   onRendered() {
@@ -326,66 +306,75 @@ BlazeComponent.extendComponent({
 
     autosize($textarea);
 
-    $textarea.escapeableTextComplete([
-      // User mentions
-      {
-        match: /\B@([\w.]*)$/,
-        search(term, callback) {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
-          callback($.map(currentBoard.activeMembers(), (member) => {
-            const user = Users.findOne(member.userId);
-            return user.username.indexOf(term) === 0 ? user : null;
-          }));
+    $textarea.escapeableTextComplete(
+      [
+        // User mentions
+        {
+          match: /\B@([\w.]*)$/,
+          search(term, callback) {
+            const currentBoard = Boards.findOne(Session.get('currentBoard'));
+            callback(
+              $.map(currentBoard.activeMembers(), member => {
+                const user = Users.findOne(member.userId);
+                return user.username.indexOf(term) === 0 ? user : null;
+              }),
+            );
+          },
+          template(user) {
+            return user.username;
+          },
+          replace(user) {
+            toggleValueInReactiveArray(editor.members, user._id);
+            return '';
+          },
+          index: 1,
         },
-        template(user) {
-          return user.username;
-        },
-        replace(user) {
-          toggleValueInReactiveArray(editor.members, user._id);
-          return '';
-        },
-        index: 1,
-      },
 
-      // Labels
+        // Labels
+        {
+          match: /\B#(\w*)$/,
+          search(term, callback) {
+            const currentBoard = Boards.findOne(Session.get('currentBoard'));
+            callback(
+              $.map(currentBoard.labels, label => {
+                if (
+                  label.name.indexOf(term) > -1 ||
+                  label.color.indexOf(term) > -1
+                ) {
+                  return label;
+                }
+                return null;
+              }),
+            );
+          },
+          template(label) {
+            return Blaze.toHTMLWithData(Template.autocompleteLabelLine, {
+              hasNoName: !label.name,
+              colorName: label.color,
+              labelName: label.name || label.color,
+            });
+          },
+          replace(label) {
+            toggleValueInReactiveArray(editor.labels, label._id);
+            return '';
+          },
+          index: 1,
+        },
+      ],
       {
-        match: /\B#(\w*)$/,
-        search(term, callback) {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
-          callback($.map(currentBoard.labels, (label) => {
-            if (label.name.indexOf(term) > -1 ||
-              label.color.indexOf(term) > -1) {
-              return label;
-            }
-            return null;
-          }));
+        // When the autocomplete menu is shown we want both a press of both `Tab`
+        // or `Enter` to validation the auto-completion. We also need to stop the
+        // event propagation to prevent the card from submitting (on `Enter`) or
+        // going on the next column (on `Tab`).
+        onKeydown(evt, commands) {
+          if (evt.keyCode === 9 || evt.keyCode === 13) {
+            evt.stopPropagation();
+            return commands.KEY_ENTER;
+          }
+          return null;
         },
-        template(label) {
-          return Blaze.toHTMLWithData(Template.autocompleteLabelLine, {
-            hasNoName: !label.name,
-            colorName: label.color,
-            labelName: label.name || label.color,
-          });
-        },
-        replace(label) {
-          toggleValueInReactiveArray(editor.labels, label._id);
-          return '';
-        },
-        index: 1,
       },
-    ], {
-      // When the autocomplete menu is shown we want both a press of both `Tab`
-      // or `Enter` to validation the auto-completion. We also need to stop the
-      // event propagation to prevent the card from submitting (on `Enter`) or
-      // going on the next column (on `Tab`).
-      onKeydown(evt, commands) {
-        if (evt.keyCode === 9 || evt.keyCode === 13) {
-          evt.stopPropagation();
-          return commands.KEY_ENTER;
-        }
-        return null;
-      },
-    });
+    );
   },
 }).register('addCardForm');
 
@@ -397,30 +386,34 @@ BlazeComponent.extendComponent({
 
     this.boardId = Session.get('currentBoard');
     // In order to get current board info
-    subManager.subscribe('board', this.boardId);
+    subManager.subscribe('board', this.boardId, false);
     this.board = Boards.findOne(this.boardId);
     // List where to insert card
     const list = $(Popup._getTopStack().openerElement).closest('.js-list');
     this.listId = Blaze.getData(list[0])._id;
     // Swimlane where to insert card
-    const swimlane = $(Popup._getTopStack().openerElement).closest('.js-swimlane');
+    const swimlane = $(Popup._getTopStack().openerElement).closest(
+      '.js-swimlane',
+    );
     this.swimlaneId = '';
-    const boardView = Meteor.user().profile.boardView;
-    if (boardView === 'board-view-swimlanes')
+    if (Utils.boardView() === 'board-view-swimlanes')
       this.swimlaneId = Blaze.getData(swimlane[0])._id;
-    else if (boardView === 'board-view-lists')
-      this.swimlaneId = Swimlanes.findOne({boardId: this.boardId})._id;
+    else if (Utils.boardView() === 'board-view-lists' || !Utils.boardView)
+      this.swimlaneId = Swimlanes.findOne({ boardId: this.boardId })._id;
   },
 
   boards() {
-    const boards = Boards.find({
-      archived: false,
-      'members.userId': Meteor.userId(),
-      _id: {$ne: Session.get('currentBoard')},
-      type: 'board',
-    }, {
-      sort: ['title'],
-    });
+    const boards = Boards.find(
+      {
+        archived: false,
+        'members.userId': Meteor.userId(),
+        _id: { $ne: Session.get('currentBoard') },
+        type: 'board',
+      },
+      {
+        sort: ['title'],
+      },
+    );
     return boards;
   },
 
@@ -428,7 +421,7 @@ BlazeComponent.extendComponent({
     if (!this.selectedBoardId.get()) {
       return [];
     }
-    const swimlanes = Swimlanes.find({boardId: this.selectedBoardId.get()});
+    const swimlanes = Swimlanes.find({ boardId: this.selectedBoardId.get() });
     if (swimlanes.count())
       this.selectedSwimlaneId.set(swimlanes.fetch()[0]._id);
     return swimlanes;
@@ -438,9 +431,8 @@ BlazeComponent.extendComponent({
     if (!this.selectedBoardId.get()) {
       return [];
     }
-    const lists = Lists.find({boardId: this.selectedBoardId.get()});
-    if (lists.count())
-      this.selectedListId.set(lists.fetch()[0]._id);
+    const lists = Lists.find({ boardId: this.selectedBoardId.get() });
+    if (lists.count()) this.selectedListId.set(lists.fetch()[0]._id);
     return lists;
   },
 
@@ -448,73 +440,84 @@ BlazeComponent.extendComponent({
     if (!this.board) {
       return [];
     }
-    const ownCardsIds = this.board.cards().map((card) => { return card.linkedId || card._id; });
+    const ownCardsIds = this.board.cards().map(card => {
+      return card.linkedId || card._id;
+    });
     return Cards.find({
       boardId: this.selectedBoardId.get(),
       swimlaneId: this.selectedSwimlaneId.get(),
       listId: this.selectedListId.get(),
       archived: false,
-      linkedId: {$nin: ownCardsIds},
-      _id: {$nin: ownCardsIds},
-      type: {$nin: ['template-card']},
+      linkedId: { $nin: ownCardsIds },
+      _id: { $nin: ownCardsIds },
+      type: { $nin: ['template-card'] },
     });
   },
 
   events() {
-    return [{
-      'change .js-select-boards'(evt) {
-        subManager.subscribe('board', $(evt.currentTarget).val());
-        this.selectedBoardId.set($(evt.currentTarget).val());
-      },
-      'change .js-select-swimlanes'(evt) {
-        this.selectedSwimlaneId.set($(evt.currentTarget).val());
-      },
-      'change .js-select-lists'(evt) {
-        this.selectedListId.set($(evt.currentTarget).val());
-      },
-      'click .js-done' (evt) {
-        // LINK CARD
-        evt.stopPropagation();
-        evt.preventDefault();
-        const linkedId = $('.js-select-cards option:selected').val();
-        if (!linkedId) {
+    return [
+      {
+        'change .js-select-boards'(evt) {
+          subManager.subscribe('board', $(evt.currentTarget).val(), false);
+          this.selectedBoardId.set($(evt.currentTarget).val());
+        },
+        'change .js-select-swimlanes'(evt) {
+          this.selectedSwimlaneId.set($(evt.currentTarget).val());
+        },
+        'change .js-select-lists'(evt) {
+          this.selectedListId.set($(evt.currentTarget).val());
+        },
+        'click .js-done'(evt) {
+          // LINK CARD
+          evt.stopPropagation();
+          evt.preventDefault();
+          const linkedId = $('.js-select-cards option:selected').val();
+          if (!linkedId) {
+            Popup.close();
+            return;
+          }
+          const _id = Cards.insert({
+            title: $('.js-select-cards option:selected').text(), //dummy
+            listId: this.listId,
+            swimlaneId: this.swimlaneId,
+            boardId: this.boardId,
+            sort: Lists.findOne(this.listId)
+              .cards()
+              .count(),
+            type: 'cardType-linkedCard',
+            linkedId,
+          });
+          Filter.addException(_id);
           Popup.close();
-          return;
-        }
-        const _id = Cards.insert({
-          title: $('.js-select-cards option:selected').text(), //dummy
-          listId: this.listId,
-          swimlaneId: this.swimlaneId,
-          boardId: this.boardId,
-          sort: Lists.findOne(this.listId).cards().count(),
-          type: 'cardType-linkedCard',
-          linkedId,
-        });
-        Filter.addException(_id);
-        Popup.close();
-      },
-      'click .js-link-board' (evt) {
-        //LINK BOARD
-        evt.stopPropagation();
-        evt.preventDefault();
-        const impBoardId = $('.js-select-boards option:selected').val();
-        if (!impBoardId || Cards.findOne({linkedId: impBoardId, archived: false})) {
+        },
+        'click .js-link-board'(evt) {
+          //LINK BOARD
+          evt.stopPropagation();
+          evt.preventDefault();
+          const impBoardId = $('.js-select-boards option:selected').val();
+          if (
+            !impBoardId ||
+            Cards.findOne({ linkedId: impBoardId, archived: false })
+          ) {
+            Popup.close();
+            return;
+          }
+          const _id = Cards.insert({
+            title: $('.js-select-boards option:selected').text(), //dummy
+            listId: this.listId,
+            swimlaneId: this.swimlaneId,
+            boardId: this.boardId,
+            sort: Lists.findOne(this.listId)
+              .cards()
+              .count(),
+            type: 'cardType-linkedBoard',
+            linkedId: impBoardId,
+          });
+          Filter.addException(_id);
           Popup.close();
-          return;
-        }
-        const _id = Cards.insert({
-          title: $('.js-select-boards option:selected').text(), //dummy
-          listId: this.listId,
-          swimlaneId: this.swimlaneId,
-          boardId: this.boardId,
-          sort: Lists.findOne(this.listId).cards().count(),
-          type: 'cardType-linkedBoard',
-          linkedId: impBoardId,
-        });
-        Filter.addException(_id);
-        Popup.close();
+        },
       },
-    }];
+    ];
   },
 }).register('linkCardPopup');
 
@@ -524,23 +527,37 @@ BlazeComponent.extendComponent({
   },
 
   onCreated() {
-    this.isCardTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-card-template');
-    this.isListTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-list-template');
-    this.isSwimlaneTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-open-add-swimlane-menu');
-    this.isBoardTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-add-board');
-    this.isTemplateSearch = this.isCardTemplateSearch ||
+    this.isCardTemplateSearch = $(Popup._getTopStack().openerElement).hasClass(
+      'js-card-template',
+    );
+    this.isListTemplateSearch = $(Popup._getTopStack().openerElement).hasClass(
+      'js-list-template',
+    );
+    this.isSwimlaneTemplateSearch = $(
+      Popup._getTopStack().openerElement,
+    ).hasClass('js-open-add-swimlane-menu');
+    this.isBoardTemplateSearch = $(Popup._getTopStack().openerElement).hasClass(
+      'js-add-board',
+    );
+    this.isTemplateSearch =
+      this.isCardTemplateSearch ||
       this.isListTemplateSearch ||
       this.isSwimlaneTemplateSearch ||
       this.isBoardTemplateSearch;
     let board = {};
     if (this.isTemplateSearch) {
-      board = Boards.findOne(Meteor.user().profile.templatesBoardId);
+      board = Boards.findOne((Meteor.user().profile || {}).templatesBoardId);
     } else {
       // Prefetch first non-current board id
       board = Boards.findOne({
         archived: false,
         'members.userId': Meteor.userId(),
-        _id: {$nin: [Session.get('currentBoard'), Meteor.user().profile.templatesBoardId]},
+        _id: {
+          $nin: [
+            Session.get('currentBoard'),
+            (Meteor.user().profile || {}).templatesBoardId,
+          ],
+        },
       });
     }
     if (!board) {
@@ -549,20 +566,21 @@ BlazeComponent.extendComponent({
     }
     const boardId = board._id;
     // Subscribe to this board
-    subManager.subscribe('board', boardId);
+    subManager.subscribe('board', boardId, false);
     this.selectedBoardId = new ReactiveVar(boardId);
 
     if (!this.isBoardTemplateSearch) {
       this.boardId = Session.get('currentBoard');
       // In order to get current board info
-      subManager.subscribe('board', this.boardId);
+      subManager.subscribe('board', this.boardId, false);
       this.swimlaneId = '';
       // Swimlane where to insert card
-      const swimlane = $(Popup._getTopStack().openerElement).parents('.js-swimlane');
-      if (Meteor.user().profile.boardView === 'board-view-swimlanes')
+      const swimlane = $(Popup._getTopStack().openerElement).parents(
+        '.js-swimlane',
+      );
+      if (Utils.boardView() === 'board-view-swimlanes')
         this.swimlaneId = Blaze.getData(swimlane[0])._id;
-      else
-        this.swimlaneId = Swimlanes.findOne({boardId: this.boardId})._id;
+      else this.swimlaneId = Swimlanes.findOne({ boardId: this.boardId })._id;
       // List where to insert card
       const list = $(Popup._getTopStack().openerElement).closest('.js-list');
       this.listId = Blaze.getData(list[0])._id;
@@ -571,14 +589,17 @@ BlazeComponent.extendComponent({
   },
 
   boards() {
-    const boards = Boards.find({
-      archived: false,
-      'members.userId': Meteor.userId(),
-      _id: {$ne: Session.get('currentBoard')},
-      type: 'board',
-    }, {
-      sort: ['title'],
-    });
+    const boards = Boards.find(
+      {
+        archived: false,
+        'members.userId': Meteor.userId(),
+        _id: { $ne: Session.get('currentBoard') },
+        type: 'board',
+      },
+      {
+        sort: ['title'],
+      },
+    );
     return boards;
   },
 
@@ -595,8 +616,8 @@ BlazeComponent.extendComponent({
       return board.searchSwimlanes(this.term.get());
     } else if (this.isBoardTemplateSearch) {
       const boards = board.searchBoards(this.term.get());
-      boards.forEach((board) => {
-        subManager.subscribe('board', board.linkedId);
+      boards.forEach(board => {
+        subManager.subscribe('board', board.linkedId, false);
       });
       return boards;
     } else {
@@ -605,59 +626,140 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'change .js-select-boards'(evt) {
-        subManager.subscribe('board', $(evt.currentTarget).val());
-        this.selectedBoardId.set($(evt.currentTarget).val());
-      },
-      'submit .js-search-term-form'(evt) {
-        evt.preventDefault();
-        this.term.set(evt.target.searchTerm.value);
-      },
-      'click .js-minicard'(evt) {
-        // 0. Common
-        const title = $('.js-element-title').val().trim();
-        if (!title)
-          return;
-        const element = Blaze.getData(evt.currentTarget);
-        element.title = title;
-        let _id = '';
-        if (!this.isTemplateSearch || this.isCardTemplateSearch) {
-          // Card insertion
-          // 1. Common
-          element.sort = Lists.findOne(this.listId).cards().count();
-          // 1.A From template
-          if (this.isTemplateSearch) {
-            element.type = 'cardType-card';
-            element.linkedId = '';
-            _id = element.copy(this.boardId, this.swimlaneId, this.listId);
-            // 1.B Linked card
-          } else {
-            delete element._id;
-            element.type = 'cardType-linkedCard';
-            element.linkedId = element.linkedId || element._id;
-            _id = Cards.insert(element);
+    return [
+      {
+        'change .js-select-boards'(evt) {
+          subManager.subscribe('board', $(evt.currentTarget).val(), false);
+          this.selectedBoardId.set($(evt.currentTarget).val());
+        },
+        'submit .js-search-term-form'(evt) {
+          evt.preventDefault();
+          this.term.set(evt.target.searchTerm.value);
+        },
+        'click .js-minicard'(evt) {
+          // 0. Common
+          const title = $('.js-element-title')
+            .val()
+            .trim();
+          if (!title) return;
+          const element = Blaze.getData(evt.currentTarget);
+          element.title = title;
+          let _id = '';
+          if (!this.isTemplateSearch || this.isCardTemplateSearch) {
+            // Card insertion
+            // 1. Common
+            element.sort = Lists.findOne(this.listId)
+              .cards()
+              .count();
+            // 1.A From template
+            if (this.isTemplateSearch) {
+              element.type = 'cardType-card';
+              element.linkedId = '';
+              _id = element.copy(this.boardId, this.swimlaneId, this.listId);
+              // 1.B Linked card
+            } else {
+              delete element._id;
+              element.type = 'cardType-linkedCard';
+              element.linkedId = element.linkedId || element._id;
+              _id = Cards.insert(element);
+            }
+            Filter.addException(_id);
+            // List insertion
+          } else if (this.isListTemplateSearch) {
+            element.sort = Swimlanes.findOne(this.swimlaneId)
+              .lists()
+              .count();
+            element.type = 'list';
+            _id = element.copy(this.boardId, this.swimlaneId);
+          } else if (this.isSwimlaneTemplateSearch) {
+            element.sort = Boards.findOne(this.boardId)
+              .swimlanes()
+              .count();
+            element.type = 'swimlalne';
+            _id = element.copy(this.boardId);
+          } else if (this.isBoardTemplateSearch) {
+            board = Boards.findOne(element.linkedId);
+            board.sort = Boards.find({ archived: false }).count();
+            board.type = 'board';
+            board.title = element.title;
+            delete board.slug;
+            _id = board.copy();
           }
-          Filter.addException(_id);
-          // List insertion
-        } else if (this.isListTemplateSearch) {
-          element.sort = Swimlanes.findOne(this.swimlaneId).lists().count();
-          element.type = 'list';
-          _id = element.copy(this.boardId, this.swimlaneId);
-        } else if (this.isSwimlaneTemplateSearch) {
-          element.sort = Boards.findOne(this.boardId).swimlanes().count();
-          element.type = 'swimlalne';
-          _id = element.copy(this.boardId);
-        } else if (this.isBoardTemplateSearch) {
-          board = Boards.findOne(element.linkedId);
-          board.sort = Boards.find({archived: false}).count();
-          board.type = 'board';
-          board.title = element.title;
-          delete board.slug;
-          _id = board.copy();
-        }
-        Popup.close();
+          Popup.close();
+        },
       },
-    }];
+    ];
   },
 }).register('searchElementPopup');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.cardlimit = this.parentComponent().cardlimit;
+
+    this.listId = this.parentComponent().data()._id;
+    this.swimlaneId = '';
+
+    const isSandstorm =
+      Meteor.settings &&
+      Meteor.settings.public &&
+      Meteor.settings.public.sandstorm;
+
+    if (isSandstorm) {
+      const user = Meteor.user();
+      if (user) {
+        if (Utils.boardView() === 'board-view-swimlanes') {
+          this.swimlaneId = this.parentComponent()
+            .parentComponent()
+            .parentComponent()
+            .data()._id;
+        }
+      }
+    } else if (Utils.boardView() === 'board-view-swimlanes') {
+      this.swimlaneId = this.parentComponent()
+        .parentComponent()
+        .parentComponent()
+        .data()._id;
+    }
+  },
+
+  onRendered() {
+    this.spinner = this.find('.sk-spinner-list');
+    this.container = this.$(this.spinner).parents('.js-perfect-scrollbar')[0];
+
+    $(this.container).on(
+      `scroll.spinner_${this.swimlaneId}_${this.listId}`,
+      () => this.updateList(),
+    );
+    $(window).on(`resize.spinner_${this.swimlaneId}_${this.listId}`, () =>
+      this.updateList(),
+    );
+
+    this.updateList();
+  },
+
+  onDestroyed() {
+    $(this.container).off(`scroll.spinner_${this.swimlaneId}_${this.listId}`);
+    $(window).off(`resize.spinner_${this.swimlaneId}_${this.listId}`);
+  },
+
+  updateList() {
+    if (this.spinnerInView()) {
+      this.cardlimit.set(this.cardlimit.get() + InfiniteScrollIter);
+      window.requestIdleCallback(() => this.updateList());
+    }
+  },
+
+  spinnerInView() {
+    const parentViewHeight = this.container.clientHeight;
+    const bottomViewPosition = this.container.scrollTop + parentViewHeight;
+
+    const threshold = this.spinner.offsetTop;
+
+    // spinner deleted
+    if (!this.spinner.offsetTop) {
+      return false;
+    }
+
+    return bottomViewPosition > threshold;
+  },
+}).register('spinnerList');

client/components/lists/listHeader.jade

@@ -9,8 +9,10 @@ template(name="listHeader")
         if currentList
           a.list-header-left-icon.fa.fa-angle-left.js-unselect-list
       h2.list-header-name(
-        class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}")
-        = title
+        title="{{ moment modifiedAt 'LLL' }}"
+        class="{{#if currentUser.isBoardMember}}{{#unless currentUser.isCommentOnly}}{{#unless currentUser.isWorker}}js-open-inlined-form is-editable{{/unless}}{{/unless}}{{/if}}")
+        +viewer
+          = title
         if wipLimit.enabled
          | (
          span(class="{{#if reachedWipLimit}}highlight{{/if}}") {{cards.count}}
@@ -18,7 +20,7 @@ template(name="listHeader")
 
         if showCardsCountForList cards.count
           | 
-          p.quiet.small {{cardsCount}} {{_ 'cards-count'}}
+          span(class="cardCount") {{cardsCount}} {{_ 'cards-count'}}
       if isMiniScreen
         if currentList
           if isWatching
@@ -28,16 +30,22 @@ template(name="listHeader")
               if canSeeAddCard
                 a.js-add-card.fa.fa-plus.list-header-plus-icon
               a.fa.fa-navicon.js-open-list-menu
+          a.list-header-handle.handle.fa.fa-arrows.js-list-handle
         else
           a.list-header-menu-icon.fa.fa-angle-right.js-select-list
+          a.list-header-handle.handle.fa.fa-arrows.js-list-handle
       else if currentUser.isBoardMember
         if isWatching
           i.list-header-watch-icon.fa.fa-eye
         div.list-header-menu
           unless currentUser.isCommentOnly
+            //if isBoardAdmin
+            //  a.fa.js-list-star.list-header-plus-icon(class="fa-star{{#unless starred}}-o{{/unless}}")
             if canSeeAddCard
               a.js-add-card.fa.fa-plus.list-header-plus-icon
             a.fa.fa-navicon.js-open-list-menu
+          if showDesktopDragHandles
+            a.list-header-handle.handle.fa.fa-arrows.js-list-handle
 
 template(name="editListTitleForm")
   .list-composer
@@ -48,25 +56,47 @@ template(name="editListTitleForm")
 
 template(name="listActionPopup")
   ul.pop-over-list
-    li: a.js-toggle-watch-list {{#if isWatching}}{{_ 'unwatch'}}{{else}}{{_ 'watch'}}{{/if}}
+    li
+      a.js-toggle-watch-list
+        if isWatching
+          i.fa.fa-eye
+          |  {{_ 'unwatch'}}
+        else
+          i.fa.fa-eye-slash
+          |  {{_ 'watch'}}
   unless currentUser.isCommentOnly
-    hr
-    ul.pop-over-list
-      li: a.js-set-color-list {{_ 'set-color-list'}}
-    hr
+    unless currentUser.isWorker
+      ul.pop-over-list
+        li
+          a.js-set-color-list
+            i.fa.fa-paint-brush
+            | {{_ 'set-color-list'}}
     ul.pop-over-list
       if cards.count
-        li: a.js-select-cards {{_ 'list-select-cards'}}
-        hr
+        li
+          a.js-select-cards
+            i.fa.fa-check-square
+            | {{_ 'list-select-cards'}}
     if currentUser.isBoardAdmin
       ul.pop-over-list
-        li: a.js-set-wip-limit {{#if isWipLimitEnabled }}{{_ 'edit-wip-limit'}}{{else}}{{_ 'setWipLimitPopup-title'}}{{/if}}
+        li
+          a.js-set-wip-limit
+            i.fa.fa-ban
+            | {{#if isWipLimitEnabled }}{{_ 'edit-wip-limit'}}{{else}}{{_ 'setWipLimitPopup-title'}}{{/if}}
+    unless currentUser.isWorker
       hr
-    ul.pop-over-list
-      li: a.js-close-list {{_ 'archive-list'}}
+      ul.pop-over-list
+        li
+          a.js-close-list
+            i.fa.fa-arrow-right
+            i.fa.fa-archive
+            | {{_ 'archive-list'}}
     hr
     ul.pop-over-list
-      li: a.js-more {{_ 'listMorePopup-title'}}
+      li
+        a.js-more
+          i.fa.fa-link
+          | {{_ 'listMorePopup-title'}}
 
 template(name="boardLists")
   ul.pop-over-list
@@ -86,7 +116,8 @@ template(name="listMorePopup")
       input.inline-input(type="text" readonly value="{{ rootUrl }}")
     | {{_ 'added'}}
     span.date(title=list.createdAt) {{ moment createdAt 'LLL' }}
-    a.js-delete {{_ 'delete'}}
+    unless currentUser.isWorker
+      a.js-delete {{_ 'delete'}}
 
 template(name="listDeletePopup")
   p {{_ "list-delete-pop"}}

client/components/lists/listHeader.js

@@ -1,3 +1,5 @@
+import { Cookies } from 'meteor/ostrio:cookies';
+const cookies = new Cookies();
 let listsColors;
 Meteor.startup(() => {
   listsColors = Lists.simpleSchema()._schema.color.allowedValues;
@@ -6,12 +8,33 @@ Meteor.startup(() => {
 BlazeComponent.extendComponent({
   canSeeAddCard() {
     const list = Template.currentData();
-    return !list.getWipLimit('enabled') || list.getWipLimit('soft') || !this.reachedWipLimit();
+    return (
+      (!list.getWipLimit('enabled') ||
+        list.getWipLimit('soft') ||
+        !this.reachedWipLimit()) &&
+      !Meteor.user().isWorker()
+    );
   },
 
-  editTitle(evt) {
-    evt.preventDefault();
-    const newTitle = this.childComponents('inlinedForm')[0].getValue().trim();
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+  starred(check = undefined) {
+    const list = Template.currentData();
+    const status = list.isStarred();
+    if (check === undefined) {
+      // just check
+      return status;
+    } else {
+      list.star(!status);
+      return !status;
+    }
+  },
+  editTitle(event) {
+    event.preventDefault();
+    const newTitle = this.childComponents('inlinedForm')[0]
+      .getValue()
+      .trim();
     const list = this.currentData();
     if (newTitle) {
       list.rename(newTitle.trim());
@@ -24,22 +47,31 @@ BlazeComponent.extendComponent({
   },
 
   limitToShowCardsCount() {
-    return Meteor.user().getLimitToShowCardsCount();
+    const currentUser = Meteor.user();
+    if (currentUser) {
+      return Meteor.user().getLimitToShowCardsCount();
+    } else {
+      return false;
+    }
   },
 
   cardsCount() {
     const list = Template.currentData();
     let swimlaneId = '';
-    const boardView = Meteor.user().profile.boardView;
-    if (boardView === 'board-view-swimlanes')
-      swimlaneId = this.parentComponent().parentComponent().data()._id;
+    if (Utils.boardView() === 'board-view-swimlanes')
+      swimlaneId = this.parentComponent()
+        .parentComponent()
+        .data()._id;
 
     return list.cards(swimlaneId).count();
   },
 
   reachedWipLimit() {
     const list = Template.currentData();
-    return list.getWipLimit('enabled') && list.getWipLimit('value') <= list.cards().count();
+    return (
+      list.getWipLimit('enabled') &&
+      list.getWipLimit('value') <= list.cards().count()
+    );
   },
 
   showCardsCountForList(count) {
@@ -48,23 +80,44 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'click .js-open-list-menu': Popup.open('listAction'),
-      'click .js-add-card' (evt) {
-        const listDom = $(evt.target).parents(`#js-list-${this.currentData()._id}`)[0];
-        const listComponent = BlazeComponent.getComponentForElement(listDom);
-        listComponent.openForm({
-          position: 'top',
-        });
+    return [
+      {
+        'click .js-list-star'(event) {
+          event.preventDefault();
+          this.starred(!this.starred());
+        },
+        'click .js-open-list-menu': Popup.open('listAction'),
+        'click .js-add-card'(event) {
+          const listDom = $(event.target).parents(
+            `#js-list-${this.currentData()._id}`,
+          )[0];
+          const listComponent = BlazeComponent.getComponentForElement(listDom);
+          listComponent.openForm({
+            position: 'top',
+          });
+        },
+        'click .js-unselect-list'() {
+          Session.set('currentList', null);
+        },
+        submit: this.editTitle,
       },
-      'click .js-unselect-list'() {
-        Session.set('currentList', null);
-      },
-      submit: this.editTitle,
-    }];
+    ];
   },
 }).register('listHeader');
 
+Template.listHeader.helpers({
+  showDesktopDragHandles() {
+    currentUser = Meteor.user();
+    if (currentUser) {
+      return (currentUser.profile || {}).showDesktopDragHandles;
+    } else if (cookies.has('showDesktopDragHandles')) {
+      return true;
+    } else {
+      return false;
+    }
+  },
+});
+
 Template.listActionPopup.helpers({
   isWipLimitEnabled() {
     return Template.currentData().getWipLimit('enabled');
@@ -76,22 +129,22 @@ Template.listActionPopup.helpers({
 });
 
 Template.listActionPopup.events({
-  'click .js-list-subscribe' () {},
+  'click .js-list-subscribe'() {},
   'click .js-set-color-list': Popup.open('setListColor'),
-  'click .js-select-cards' () {
-    const cardIds = this.allCards().map((card) => card._id);
+  'click .js-select-cards'() {
+    const cardIds = this.allCards().map(card => card._id);
     MultiSelection.add(cardIds);
     Popup.close();
   },
-  'click .js-toggle-watch-list' () {
+  'click .js-toggle-watch-list'() {
     const currentList = this;
     const level = currentList.findWatcher(Meteor.userId()) ? null : 'watching';
     Meteor.call('watch', 'list', currentList._id, level, (err, ret) => {
       if (!err && ret) Popup.close();
     });
   },
-  'click .js-close-list' (evt) {
-    evt.preventDefault();
+  'click .js-close-list'(event) {
+    event.preventDefault();
     this.archive();
     Popup.close();
   },
@@ -102,10 +155,17 @@ Template.listActionPopup.events({
 BlazeComponent.extendComponent({
   applyWipLimit() {
     const list = Template.currentData();
-    const limit = parseInt(Template.instance().$('.wip-limit-value').val(), 10);
+    const limit = parseInt(
+      Template.instance()
+        .$('.wip-limit-value')
+        .val(),
+      10,
+    );
 
-    if(limit < list.cards().count() && !list.getWipLimit('soft')){
-      Template.instance().$('.wip-limit-error').click();
+    if (limit < list.cards().count() && !list.getWipLimit('soft')) {
+      Template.instance()
+        .$('.wip-limit-error')
+        .click();
     } else {
       Meteor.call('applyWipLimit', list._id, limit);
       Popup.back();
@@ -115,7 +175,10 @@ BlazeComponent.extendComponent({
   enableSoftLimit() {
     const list = Template.currentData();
 
-    if(list.getWipLimit('soft') && list.getWipLimit('value') < list.cards().count()){
+    if (
+      list.getWipLimit('soft') &&
+      list.getWipLimit('value') < list.cards().count()
+    ) {
       list.setWipLimit(list.cards().count());
     }
     Meteor.call('enableSoftLimit', Template.currentData()._id);
@@ -124,7 +187,10 @@ BlazeComponent.extendComponent({
   enableWipLimit() {
     const list = Template.currentData();
     // Prevent user from using previously stored wipLimit.value if it is less than the current number of cards in the list
-    if(!list.getWipLimit('enabled') && list.getWipLimit('value') < list.cards().count()){
+    if (
+      !list.getWipLimit('enabled') &&
+      list.getWipLimit('value') < list.cards().count()
+    ) {
       list.setWipLimit(list.cards().count());
     }
     Meteor.call('enableWipLimit', list._id);
@@ -138,24 +204,26 @@ BlazeComponent.extendComponent({
     return Template.currentData().getWipLimit('enabled');
   },
 
-  wipLimitValue(){
+  wipLimitValue() {
     return Template.currentData().getWipLimit('value');
   },
 
   events() {
-    return [{
-      'click .js-enable-wip-limit': this.enableWipLimit,
-      'click .wip-limit-apply': this.applyWipLimit,
-      'click .wip-limit-error': Popup.open('wipLimitError'),
-      'click .materialCheckBox': this.enableSoftLimit,
-    }];
+    return [
+      {
+        'click .js-enable-wip-limit': this.enableWipLimit,
+        'click .wip-limit-apply': this.applyWipLimit,
+        'click .wip-limit-error': Popup.open('wipLimitError'),
+        'click .materialCheckBox': this.enableSoftLimit,
+      },
+    ];
   },
 }).register('setWipLimitPopup');
 
 Template.listMorePopup.events({
-  'click .js-delete': Popup.afterConfirm('listDelete', function () {
+  'click .js-delete': Popup.afterConfirm('listDelete', function() {
     Popup.close();
-    this.allCards().map((card) => Cards.remove(card._id));
+    this.allCards().map(card => Cards.remove(card._id));
     Lists.remove(this._id);
     Utils.goBoardId(this.boardId);
   }),
@@ -168,7 +236,7 @@ BlazeComponent.extendComponent({
   },
 
   colors() {
-    return listsColors.map((color) => ({ color, name: '' }));
+    return listsColors.map(color => ({ color, name: '' }));
   },
 
   isSelected(color) {
@@ -176,18 +244,20 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'click .js-palette-color'() {
-        this.currentColor.set(this.currentData().color);
+    return [
+      {
+        'click .js-palette-color'() {
+          this.currentColor.set(this.currentData().color);
+        },
+        'click .js-submit'() {
+          this.currentList.setColor(this.currentColor.get());
+          Popup.close();
+        },
+        'click .js-remove-color'() {
+          this.currentList.setColor(null);
+          Popup.close();
+        },
       },
-      'click .js-submit' () {
-        this.currentList.setColor(this.currentColor.get());
-        Popup.close();
-      },
-      'click .js-remove-color'() {
-        this.currentList.setColor(null);
-        Popup.close();
-      },
-    }];
+    ];
   },
 }).register('setListColorPopup');

client/components/main/editor.jade

@@ -1,5 +1,6 @@
 template(name="editor")
   textarea.editor(
+    dir="auto"
     class="{{class}}"
     id=id
     autofocus=autofocus
@@ -7,7 +8,7 @@ template(name="editor")
     +Template.contentBlock
 
 template(name="viewer")
-  .viewer
+  .viewer(dir="auto")
     +mentions
       +markdown
         {{> UI.contentBlock }}

client/components/main/editor.js

@@ -1,18 +1,110 @@
+import _sanitizeXss from 'xss';
+const ASIS = 'asis';
+const sanitizeXss = (input, options) => {
+  const defaultAllowedIframeSrc = /^(https:){0,1}\/\/.*?(youtube|vimeo|dailymotion|youku)/i;
+  const allowedIframeSrcRegex = (function() {
+    let reg = defaultAllowedIframeSrc;
+    const SAFE_IFRAME_SRC_PATTERN =
+      Meteor.settings.public.SAFE_IFRAME_SRC_PATTERN;
+    try {
+      if (SAFE_IFRAME_SRC_PATTERN !== undefined) {
+        reg = new RegExp(SAFE_IFRAME_SRC_PATTERN, 'i');
+      }
+    } catch (e) {
+      /*eslint no-console: ["error", { allow: ["warn", "error"] }] */
+
+      console.error('Wrong pattern specified', SAFE_IFRAM_SRC_PATTERN, e);
+    }
+    return reg;
+  })();
+  const targetWindow = '_blank';
+  const getHtmlDOM = html => {
+    const i = document.createElement('i');
+    i.innerHTML = html;
+    return i.firstChild;
+  };
+  options = {
+    onTag(tag, html, options) {
+      const htmlDOM = getHtmlDOM(html);
+      const getAttr = attr => {
+        return htmlDOM && attr && htmlDOM.getAttribute(attr);
+      };
+      if (tag === 'iframe') {
+        const clipCls = 'note-vide-clip';
+        if (!options.isClosing) {
+          const iframeCls = getAttr('class');
+          let safe = iframeCls.indexOf(clipCls) > -1;
+          const src = getAttr('src');
+          if (allowedIframeSrcRegex.exec(src)) {
+            safe = true;
+          }
+          if (safe)
+            return `<iframe src='${src}' class="${clipCls}" width=100% height=auto allowfullscreen></iframe>`;
+        } else {
+          // remove </iframe> tag
+          return '';
+        }
+      } else if (tag === 'a') {
+        if (!options.isClosing) {
+          if (getAttr(ASIS) === 'true') {
+            // if has a ASIS attribute, don't do anything, it's a member id
+            return html;
+          } else {
+            const href = getAttr('href');
+            if (href.match(/^((http(s){0,1}:){0,1}\/\/|\/)/)) {
+              // a valid url
+              return `<a href=${href} target=${targetWindow}>`;
+            }
+          }
+        }
+      } else if (tag === 'img') {
+        if (!options.isClosing) {
+          const src = getAttr('src');
+          if (src) {
+            return `<a href='${src}' class='swipebox'><img src='${src}' class="attachment-image-preview mCS_img_loaded"></a>`;
+          }
+        }
+      }
+      return undefined;
+    },
+    onTagAttr(tag, name, value) {
+      if (tag === 'img' && name === 'src') {
+        if (value && value.substr(0, 5) === 'data:') {
+          // allow image with dataURI src
+          return `${name}='${value}'`;
+        }
+      } else if (tag === 'a' && name === 'target') {
+        return `${name}='${targetWindow}'`; // always change a href target to a new window
+      }
+      return undefined;
+    },
+    ...options,
+  };
+  return _sanitizeXss(input, options);
+};
 Template.editor.onRendered(() => {
-  const $textarea = this.$('textarea');
-
-  autosize($textarea);
-
-  $textarea.escapeableTextComplete([
+  const textareaSelector = 'textarea';
+  const mentions = [
     // User mentions
     {
       match: /\B@([\w.]*)$/,
       search(term, callback) {
         const currentBoard = Boards.findOne(Session.get('currentBoard'));
-        callback(currentBoard.activeMembers().map((member) => {
-          const username = Users.findOne(member.userId).username;
-          return username.includes(term) ? username : null;
-        }).filter(Boolean));
+        callback(
+          currentBoard
+            .activeMembers()
+            .map(member => {
+              const user = Users.findOne(member.userId);
+              if (user._id === Meteor.userId()) {
+                return null;
+              }
+              const value = user.username;
+              const username =
+                value && value.match(/\s+/) ? `"${value}"` : value;
+              return username.includes(term) ? username : null;
+            })
+            .filter(Boolean),
+        );
       },
       template(value) {
         return value;
@@ -22,83 +114,304 @@ Template.editor.onRendered(() => {
       },
       index: 1,
     },
-  ]);
+  ];
+  const enableTextarea = function() {
+    const $textarea = this.$(textareaSelector);
+    autosize($textarea);
+    $textarea.escapeableTextComplete(mentions);
+  };
+  if (Meteor.settings.public.RICHER_CARD_COMMENT_EDITOR !== false) {
+    const isSmall = Utils.isMiniScreen();
+    const toolbar = isSmall
+      ? [
+          ['view', ['fullscreen']],
+          ['table', ['table']],
+          ['font', ['bold']],
+          ['color', ['color']],
+          ['insert', ['video']], // iframe tag will be sanitized TODO if iframe[class=note-video-clip] can be added into safe list, insert video can be enabled
+          //['fontsize', ['fontsize']],
+        ]
+      : [
+          ['style', ['style']],
+          ['font', ['bold', 'underline', 'clear']],
+          ['fontsize', ['fontsize']],
+          ['fontname', ['fontname']],
+          ['color', ['color']],
+          ['para', ['ul', 'ol', 'paragraph']],
+          ['table', ['table']],
+          ['insert', ['link', 'picture', 'video']], // iframe tag will be sanitized TODO if iframe[class=note-video-clip] can be added into safe list, insert video can be enabled
+          //['insert', ['link', 'picture']], // modal popup has issue somehow :(
+          ['view', ['fullscreen', 'help']],
+        ];
+    const cleanPastedHTML = sanitizeXss;
+    const editor = '.editor';
+    const selectors = [
+      `.js-new-comment-form ${editor}`,
+      `.js-edit-comment ${editor}`,
+    ].join(','); // only new comment and edit comment
+    const inputs = $(selectors);
+    if (inputs.length === 0) {
+      // only enable richereditor to new comment or edit comment no others
+      enableTextarea();
+    } else {
+      const placeholder = inputs.attr('placeholder') || '';
+      const mSummernotes = [];
+      const getSummernote = function(input) {
+        const idx = inputs.index(input);
+        if (idx > -1) {
+          return mSummernotes[idx];
+        }
+        return undefined;
+      };
+      let popupShown = false;
+      inputs.each(function(idx, input) {
+        mSummernotes[idx] = $(input).summernote({
+          placeholder,
+          callbacks: {
+            onKeydown(e) {
+              if (popupShown) {
+                e.preventDefault();
+              }
+            },
+            onKeyup(e) {
+              if (popupShown) {
+                e.preventDefault();
+              }
+            },
+            onInit(object) {
+              const originalInput = this;
+              const setAutocomplete = function(jEditor) {
+                if (jEditor !== undefined) {
+                  jEditor.escapeableTextComplete(mentions).on({
+                    'textComplete:show'() {
+                      popupShown = true;
+                    },
+                    'textComplete:hide'() {
+                      popupShown = false;
+                    },
+                  });
+                }
+              };
+              $(originalInput).on('submitted', function() {
+                // resetCommentInput has been called
+                if (!this.value) {
+                  const sn = getSummernote(this);
+                  sn && sn.summernote('code', '');
+                }
+              });
+              const jEditor = object && object.editable;
+              const toolbar = object && object.toolbar;
+              setAutocomplete(jEditor);
+              if (toolbar !== undefined) {
+                const fBtn = toolbar.find('.btn-fullscreen');
+                fBtn.on('click', function() {
+                  const $this = $(this),
+                    isActive = $this.hasClass('active');
+                  $('.minicards,#header-quick-access').toggle(!isActive); // mini card is still showing when editor is in fullscreen mode, we hide here manually
+                });
+              }
+            },
+            onImageUpload(files) {
+              const $summernote = getSummernote(this);
+              if (files && files.length > 0) {
+                const image = files[0];
+                const currentCard = Cards.findOne(Session.get('currentCard'));
+                const MAX_IMAGE_PIXEL = Utils.MAX_IMAGE_PIXEL;
+                const COMPRESS_RATIO = Utils.IMAGE_COMPRESS_RATIO;
+                const insertImage = src => {
+                  const img = document.createElement('img');
+                  img.src = src;
+                  img.setAttribute('width', '100%');
+                  $summernote.summernote('insertNode', img);
+                };
+                const processData = function(fileObj) {
+                  Utils.processUploadedAttachment(
+                    currentCard,
+                    fileObj,
+                    attachment => {
+                      if (
+                        attachment &&
+                        attachment._id &&
+                        attachment.isImage()
+                      ) {
+                        attachment.one('uploaded', function() {
+                          const maxTry = 3;
+                          const checkItvl = 500;
+                          let retry = 0;
+                          const checkUrl = function() {
+                            // even though uploaded event fired, attachment.url() is still null somehow //TODO
+                            const url = attachment.url();
+                            if (url) {
+                              insertImage(
+                                `${location.protocol}//${location.host}${url}`,
+                              );
+                            } else {
+                              retry++;
+                              if (retry < maxTry) {
+                                setTimeout(checkUrl, checkItvl);
+                              }
+                            }
+                          };
+                          checkUrl();
+                        });
+                      }
+                    },
+                  );
+                };
+                if (MAX_IMAGE_PIXEL) {
+                  const reader = new FileReader();
+                  reader.onload = function(e) {
+                    const dataurl = e && e.target && e.target.result;
+                    if (dataurl !== undefined) {
+                      // need to shrink image
+                      Utils.shrinkImage({
+                        dataurl,
+                        maxSize: MAX_IMAGE_PIXEL,
+                        ratio: COMPRESS_RATIO,
+                        toBlob: true,
+                        callback(blob) {
+                          if (blob !== false) {
+                            blob.name = image.name;
+                            processData(blob);
+                          }
+                        },
+                      });
+                    }
+                  };
+                  reader.readAsDataURL(image);
+                } else {
+                  processData(image);
+                }
+              }
+            },
+            onPaste() {
+              // clear up unwanted tag info when user pasted in text
+              const thisNote = this;
+              const updatePastedText = function(object) {
+                const someNote = getSummernote(object);
+                const original = someNote.summernote('code');
+                const cleaned = cleanPastedHTML(original); //this is where to call whatever clean function you want. I have mine in a different file, called CleanPastedHTML.
+                someNote.summernote('code', ''); //clear original
+                someNote.summernote('pasteHTML', cleaned); //this sets the displayed content editor to the cleaned pasted code.
+              };
+              setTimeout(function() {
+                //this kinda sucks, but if you don't do a setTimeout,
+                //the function is called before the text is really pasted.
+                updatePastedText(thisNote);
+              }, 10);
+            },
+          },
+          dialogsInBody: true,
+          disableDragAndDrop: true,
+          toolbar,
+          popover: {
+            image: [
+              [
+                'image',
+                ['resizeFull', 'resizeHalf', 'resizeQuarter', 'resizeNone'],
+              ],
+              ['float', ['floatLeft', 'floatRight', 'floatNone']],
+              ['remove', ['removeMedia']],
+            ],
+            table: [
+              ['add', ['addRowDown', 'addRowUp', 'addColLeft', 'addColRight']],
+              ['delete', ['deleteRow', 'deleteCol', 'deleteTable']],
+            ],
+            air: [
+              ['color', ['color']],
+              ['font', ['bold', 'underline', 'clear']],
+            ],
+          },
+          height: 200,
+        });
+      });
+    }
+  } else {
+    enableTextarea();
+  }
 });
 
-import sanitizeXss from 'xss';
-
 // XXX I believe we should compute a HTML rendered field on the server that
 // would handle markdown and user mentions. We can simply have two
 // fields, one source, and one compiled version (in HTML) and send only the
 // compiled version to most users -- who don't need to edit.
 // In the meantime, all the transformation are done on the client using the
 // Blaze API.
-const at = HTML.CharRef({html: '&commat;', str: '@'});
-Blaze.Template.registerHelper('mentions', new Template('mentions', function() {
-  const view = this;
-  let content = Blaze.toHTML(view.templateContentBlock);
-  const currentBoard = Boards.findOne(Session.get('currentBoard'));
-  if (!currentBoard)
+const at = HTML.CharRef({ html: '&commat;', str: '@' });
+Blaze.Template.registerHelper(
+  'mentions',
+  new Template('mentions', function() {
+    const view = this;
+    let content = Blaze.toHTML(view.templateContentBlock);
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    if (!currentBoard) return HTML.Raw(sanitizeXss(content));
+    const knowedUsers = currentBoard.members.map(member => {
+      const u = Users.findOne(member.userId);
+      if (u) {
+        member.username = u.username;
+      }
+      return member;
+    });
+    const mentionRegex = /\B@(?:(?:"([\w.\s]*)")|([\w.]+))/gi; // including space in username
+
+    let currentMention;
+    while ((currentMention = mentionRegex.exec(content)) !== null) {
+      const [fullMention, quoteduser, simple] = currentMention;
+      const username = quoteduser || simple;
+      const knowedUser = _.findWhere(knowedUsers, { username });
+      if (!knowedUser) {
+        continue;
+      }
+
+      const linkValue = [' ', at, knowedUser.username];
+      let linkClass = 'atMention js-open-member';
+      if (knowedUser.userId === Meteor.userId()) {
+        linkClass += ' me';
+      }
+      const link = HTML.A(
+        {
+          class: linkClass,
+          // XXX Hack. Since we stringify this render function result below with
+          // `Blaze.toHTML` we can't rely on blaze data contexts to pass the
+          // `userId` to the popup as usual, and we need to store it in the DOM
+          // using a data attribute.
+          'data-userId': knowedUser.userId,
+          [ASIS]: 'true',
+        },
+        linkValue,
+      );
+
+      content = content.replace(fullMention, Blaze.toHTML(link));
+    }
     return HTML.Raw(sanitizeXss(content));
-  const knowedUsers = currentBoard.members.map((member) => {
-    const u = Users.findOne(member.userId);
-    if(u){
-      member.username = u.username;
-    }
-    return member;
-  });
-  const mentionRegex = /\B@([\w.]*)/gi;
-
-  let currentMention;
-  while ((currentMention = mentionRegex.exec(content)) !== null) {
-    const [fullMention, username] = currentMention;
-    const knowedUser = _.findWhere(knowedUsers, { username });
-    if (!knowedUser) {
-      continue;
-    }
-
-    const linkValue = [' ', at, knowedUser.username];
-    let linkClass = 'atMention js-open-member';
-    if (knowedUser.userId === Meteor.userId()) {
-      linkClass += ' me';
-    }
-    const link = HTML.A({
-      'class': linkClass,
-      // XXX Hack. Since we stringify this render function result below with
-      // `Blaze.toHTML` we can't rely on blaze data contexts to pass the
-      // `userId` to the popup as usual, and we need to store it in the DOM
-      // using a data attribute.
-      'data-userId': knowedUser.userId,
-    }, linkValue);
-
-    content = content.replace(fullMention, Blaze.toHTML(link));
-  }
-
-  return HTML.Raw(sanitizeXss(content));
-}));
-
+  }),
+);
 Template.viewer.events({
   // Viewer sometimes have click-able wrapper around them (for instance to edit
   // the corresponding text). Clicking a link shouldn't fire these actions, stop
   // we stop these event at the viewer component level.
-  'click a'(evt, tpl) {
-    evt.stopPropagation();
-
-    // XXX We hijack the build-in browser action because we currently don't have
-    // `_blank` attributes in viewer links, and the transformer function is
-    // handled by a third party package that we can't configure easily. Fix that
-    // by using directly `_blank` attribute in the rendered HTML.
-    evt.preventDefault();
-
-    const userId = evt.currentTarget.dataset.userid;
+  'click a'(event, templateInstance) {
+    let prevent = true;
+    const userId = event.currentTarget.dataset.userid;
     if (userId) {
-      Popup.open('member').call({ userId }, evt, tpl);
-    }
-    else {
-      const href = evt.currentTarget.href;
-      if (href) {
+      Popup.open('member').call({ userId }, event, templateInstance);
+    } else {
+      const href = event.currentTarget.href;
+      const child = event.currentTarget.firstElementChild;
+      if (child && child.tagName === 'IMG') {
+        prevent = false;
+      } else if (href) {
         window.open(href, '_blank');
       }
     }
+    if (prevent) {
+      event.stopPropagation();
+
+      // XXX We hijack the build-in browser action because we currently don't have
+      // `_blank` attributes in viewer links, and the transformer function is
+      // handled by a third party package that we can't configure easily. Fix that
+      // by using directly `_blank` attribute in the rendered HTML.
+      event.preventDefault();
+    }
   },
 });

client/components/main/header.js

@@ -20,13 +20,13 @@ Template.header.helpers({
   },
 
   hasAnnouncement() {
-    const announcements =  Announcements.findOne();
+    const announcements = Announcements.findOne();
     return announcements && announcements.enabled;
   },
 
   announcement() {
     $('.announcement').show();
-    const announcements =  Announcements.findOne();
+    const announcements = Announcements.findOne();
     return announcements && announcements.body;
   },
 });

client/components/main/layouts.jade

@@ -1,37 +1,32 @@
 head
   title
-  meta(name="viewport"
-   content="maximum-scale=1.0,width=device-width,initial-scale=1.0,user-scalable=0")
+  meta(name="viewport" content="maximum-scale=1.0,width=device-width,initial-scale=1.0,user-scalable=0")
   meta(http-equiv="X-UA-Compatible" content="IE=edge")
   //- XXX We should use pathFor in the following `href` to support the case
     where the application is deployed with a path prefix, but it seems to be
     difficult to do that cleanly with Blaze -- at least without adding extra
     packages.
-  link(rel="shortcut icon" href="/favicon.png")
-  link(rel="apple-touch-icon" href="/favicon.png")
-  link(rel="mask-icon" href="/logo-150.svg")
-  link(rel="manifest" href="/manifest.json")
+  link(rel="shortcut icon" href="/wekan-favicon.png")
+  link(rel="apple-touch-icon" href="/wekan-favicon.png")
+  link(rel="mask-icon" href="/wekan-logo-150.svg")
+  link(rel="manifest" href="/wekan-manifest.json")
 
 template(name="userFormsLayout")
   section.auth-layout
-    //if currentSetting.hideLogo
-    h1
-      br
-      br
-    //else
-    //  h1.at-form-landing-logo
-    //    img(src="{{pathFor '/logo.png'}}" alt="")
     section.auth-dialog
-      +Template.dynamic(template=content)
-      if currentSetting.displayAuthenticationMethod
-        +connectionMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod)
-      div.at-form-lang
-        select.select-lang.js-userform-set-language
-          each languages
-            if isCurrentLanguage
-              option(value="{{tag}}" selected="selected") {{name}}
-            else
-              option(value="{{tag}}") {{name}}
+      if isLoading
+        +loader
+      else
+        +Template.dynamic(template=content)
+        if currentSetting.displayAuthenticationMethod
+          +connectionMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod)
+        div.at-form-lang
+          select.select-lang.js-userform-set-language
+            each languages
+              if isCurrentLanguage
+                option(value="{{tag}}" selected="selected") {{name}}
+              else
+                option(value="{{tag}}") {{name}}
 
 template(name="defaultLayout")
   +header
@@ -64,3 +59,14 @@ template(name="message")
     unless currentUser
       with(pathFor route='atSignIn')
         p {{{_ 'page-maybe-private' this}}}
+
+template(name="loader")
+  h1.loadingText {{_ 'loading'}}
+  .lds-roller
+    div
+    div
+    div
+    div
+    div
+    div
+    div

client/components/main/layouts.js

@@ -1,6 +1,6 @@
 BlazeLayout.setRoot('body');
 
-const i18nTagToT9n = (i18nTag) => {
+const i18nTagToT9n = i18nTag => {
   // t9n/i18n tags are same now, see: https://github.com/softwarerero/meteor-accounts-t9n/pull/129
   // but we keep this conversion function here, to be aware that that they are different system.
   return i18nTag;
@@ -21,19 +21,23 @@ const validator = {
 };
 
 Template.userFormsLayout.onCreated(function() {
-  const instance = this;
-  instance.currentSetting = new ReactiveVar();
+  const templateInstance = this;
+  templateInstance.currentSetting = new ReactiveVar();
+  templateInstance.isLoading = new ReactiveVar(false);
 
   Meteor.subscribe('setting', {
     onReady() {
-      instance.currentSetting.set(Settings.findOne());
+      templateInstance.currentSetting.set(Settings.findOne());
       return this.stop();
     },
   });
 });
 
 Template.userFormsLayout.onRendered(() => {
-  AccountsTemplates.state.form.keys = new Proxy(AccountsTemplates.state.form.keys, validator);
+  AccountsTemplates.state.form.keys = new Proxy(
+    AccountsTemplates.state.form.keys,
+    validator,
+  );
 
   const i18nTag = navigator.language;
   if (i18nTag) {
@@ -47,6 +51,10 @@ Template.userFormsLayout.helpers({
     return Template.instance().currentSetting.get();
   },
 
+  isLoading() {
+    return Template.instance().isLoading.get();
+  },
+
   afterBodyStart() {
     return currentSetting.customHTMLafterBodyStart;
   },
@@ -63,6 +71,8 @@ Template.userFormsLayout.helpers({
         name = 'Brezhoneg';
       } else if (lang.name === 'ig') {
         name = 'Igbo';
+      } else if (lang.name === 'oc') {
+        name = 'Occitan';
       }
       return { tag, name };
     }).sort(function(a, b) {
@@ -82,14 +92,17 @@ Template.userFormsLayout.helpers({
 });
 
 Template.userFormsLayout.events({
-  'change .js-userform-set-language'(evt) {
-    const i18nTag = $(evt.currentTarget).val();
+  'change .js-userform-set-language'(event) {
+    const i18nTag = $(event.currentTarget).val();
     T9n.setLanguage(i18nTagToT9n(i18nTag));
-    evt.preventDefault();
+    event.preventDefault();
   },
-  'click #at-btn'(event, instance) {
+  'click #at-btn'(event, templateInstance) {
     if (FlowRouter.getRouteName() === 'atSignIn') {
-      authentication(event, instance);
+      templateInstance.isLoading.set(true);
+      authentication(event, templateInstance).then(() => {
+        templateInstance.isLoading.set(false);
+      });
     }
   },
 });
@@ -100,39 +113,47 @@ Template.defaultLayout.events({
   },
 });
 
-async function authentication(event, instance) {
+async function authentication(event, templateInstance) {
   const match = $('#at-field-username_and_email').val();
   const password = $('#at-field-password').val();
 
-  if (!match || !password) return;
+  if (!match || !password) return undefined;
 
-  const result = await getAuthenticationMethod(instance.currentSetting.get(), match);
+  const result = await getAuthenticationMethod(
+    templateInstance.currentSetting.get(),
+    match,
+  );
 
-  if (result === 'password') return;
+  if (result === 'password') return undefined;
 
   // Stop submit #at-pwd-form
   event.preventDefault();
   event.stopImmediatePropagation();
 
   switch (result) {
-  case 'ldap':
-    Meteor.loginWithLDAP(match, password, function() {
-      FlowRouter.go('/');
-    });
-    break;
+    case 'ldap':
+      return new Promise(resolve => {
+        Meteor.loginWithLDAP(match, password, function() {
+          resolve(FlowRouter.go('/'));
+        });
+      });
 
-  case 'cas':
-    Meteor.loginWithCas(function() {
-      FlowRouter.go('/');
-    });
-    break;
+    case 'cas':
+      return new Promise(resolve => {
+        Meteor.loginWithCas(match, password, function() {
+          resolve(FlowRouter.go('/'));
+        });
+      });
 
-  default:
-    break;
+    default:
+      return undefined;
   }
 }
 
-function getAuthenticationMethod({displayAuthenticationMethod, defaultAuthenticationMethod}, match) {
+function getAuthenticationMethod(
+  { displayAuthenticationMethod, defaultAuthenticationMethod },
+  match,
+) {
   if (displayAuthenticationMethod) {
     return $('.select-authentication').val();
   }
@@ -140,7 +161,7 @@ function getAuthenticationMethod({displayAuthenticationMethod, defaultAuthentica
 }
 
 function getUserAuthenticationMethod(defaultAuthenticationMethod, match) {
-  return new Promise((resolve) => {
+  return new Promise(resolve => {
     try {
       Meteor.subscribe('user-authenticationMethod', match, {
         onReady() {
@@ -153,7 +174,7 @@ function getUserAuthenticationMethod(defaultAuthenticationMethod, match) {
           resolve(authenticationMethod);
         },
       });
-    } catch(error) {
+    } catch (error) {
       resolve(defaultAuthenticationMethod);
     }
   });

client/components/main/layouts.styl

@@ -2,6 +2,35 @@
 
 global-reset()
 
+*
+  -webkit-box-sizing: unset
+  box-sizing: unset
+
+.note-popover .popover-content .note-color-palette div .note-color-btn, .panel-heading.note-toolbar .note-color-palette div .note-color-btn
+  background: none
+
+a:focus
+  outline: unset
+  outline-offset: unset
+
+a:hover,a:focus
+  color: unset
+  text-decoration: unset
+
+.badge
+  display: unset
+  min-width: unset
+  padding: unset
+  font-size: unset
+  font-weight: unset
+  line-height: unset
+  color: unset
+  text-align: unset
+  white-space: unset
+  vertical-align: unset
+  background-color: unset
+  border-radius: unset
+
 html, body, input, select, textarea, button
   font: 14px Roboto, "Helvetica Neue", Arial, Helvetica, sans-serif
   line-height: 18px
@@ -61,7 +90,7 @@ body
       display: block
       float: right
       font-size: 24px
-  
+
   .modal-content-wide
     width: 800px
     min-height: 0px
@@ -203,6 +232,7 @@ kbd
   background: darken(white, 2%)
   border-radius: 3px
   border: 1px solid darken(white, 10%)
+  color: unset
   box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.15)
 
 .clear
@@ -290,7 +320,7 @@ kbd
 // Implement a thiner close icon as suggested in
 // https://github.com/FortAwesome/Font-Awesome/issues/1540#issuecomment-68689950
 .fa.fa-times-thin:before
-  content: '\00d7';
+  content: '\00d7'
 
 .fa.fa-globe.colorful, .fa.fa-bell.colorful
   color: #4caf50
@@ -348,6 +378,12 @@ a
 
 .viewer
   min-height: 18px
+  display: block
+  word-wrap: break-word
+
+  table
+    word-wrap: normal
+    word-break: normal
 
   ol
     list-style-type: decimal
@@ -395,7 +431,110 @@ a
     height: 100%
     margin: 0px
 
+  .panel-default
+    width: 83vw
+
 .inline-input
   height: 37px
   margin: 8px 10px 0 0
   width: 50px
+
+.select-authentication
+  width: 100%
+
+.auth-layout
+  display: flex
+  flex-direction: column
+  align-items: center
+  justify-content: center
+  height: 100%
+
+  .auth-dialog
+    margin: 0 !important
+
+.loadingText
+  text-align: center
+
+.lds-roller
+  display: block
+  margin: auto
+  position: relative
+  width: 64px
+  height: 64px
+
+  div
+    animation: lds-roller 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite
+    transform-origin: 32px 32px
+
+  div:after
+    content: " "
+    display: block
+    position: absolute
+    width: 6px
+    height: 6px
+    border-radius: 50%
+    background: #dedede
+    margin: -3px 0 0 -3px
+
+  div:nth-child(1)
+    animation-delay: -0.036s
+
+  div:nth-child(1):after
+    top: 50px
+    left: 50px
+
+  div:nth-child(2)
+    animation-delay: -0.072s
+
+  div:nth-child(2):after
+    top: 54px
+    left: 45px
+
+  div:nth-child(3)
+    animation-delay: -0.108s
+
+  div:nth-child(3):after
+    top: 57px
+    left: 39px
+
+  div:nth-child(4)
+    animation-delay: -0.144s
+
+  div:nth-child(4):after
+    top: 58px
+    left: 32px
+
+  div:nth-child(5)
+    animation-delay: -0.18s
+
+  div:nth-child(5):after
+    top: 57px
+    left: 25px
+
+  div:nth-child(6)
+    animation-delay: -0.216s
+
+  div:nth-child(6):after
+    top: 54px
+    left: 19px
+
+  div:nth-child(7)
+    animation-delay: -0.252s
+
+  div:nth-child(7):after
+    top: 50px
+    left: 14px
+
+  div:nth-child(8)
+    animation-delay: -0.288s
+
+  div:nth-child(8):after
+    top: 45px
+    left: 10px
+
+@keyframes lds-roller
+  0%
+    transform: rotate(0deg)
+
+  100%
+    transform: rotate(360deg)

client/components/main/popup.styl

@@ -130,7 +130,8 @@ $popupWidth = 300px
     .popup-container-depth-{depth}
       transform: translateX(- depth * $popupWidth)
 
-.select-members-list
+.select-members-list,
+.select-avatars-list
   margin-bottom: 8px
 
 .pop-over-list
@@ -230,7 +231,8 @@ $popupWidth = 300px
     min-height: 56px
     position: relative
 
-    .member
+    .member,
+    .avatar
       position: absolute
       top: 2px
       left: 2px

client/components/mixins/infiniteScrolling.js

@@ -18,15 +18,17 @@ Mixins.InfiniteScrolling = BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      scroll(evt) {
-        const domElement = evt.currentTarget;
-        let altitude = domElement.scrollTop + domElement.offsetHeight;
-        altitude += peakAnticipation;
-        if (altitude >= this.callFirstWith(null, 'getNextPeak')) {
-          this.mixinParent().callFirstWith(null, 'reachNextPeak');
-        }
+    return [
+      {
+        scroll(evt) {
+          const domElement = evt.currentTarget;
+          let altitude = domElement.scrollTop + domElement.offsetHeight;
+          altitude += peakAnticipation;
+          if (altitude >= this.callFirstWith(null, 'getNextPeak')) {
+            this.mixinParent().callFirstWith(null, 'reachNextPeak');
+          }
+        },
       },
-    }];
+    ];
   },
 });

client/components/rules/actions/boardActions.js

@@ -1,168 +1,165 @@
 BlazeComponent.extendComponent({
-  onCreated() {
-
-  },
+  onCreated() {},
 
   events() {
-    return [{
-      'click .js-create-card-action' (event) {
-        const ruleName = this.data().ruleName.get();
-        const trigger = this.data().triggerVar.get();
-        const cardName = this.find('#card-name').value;
-        const listName = this.find('#list-name').value;
-        const swimlaneName = this.find('#swimlane-name2').value;
-        const boardId = Session.get('currentBoard');
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const triggerId = Triggers.insert(trigger);
-        const actionId = Actions.insert({
-          actionType: 'createCard',
-          swimlaneName,
-          cardName,
-          listName,
-          boardId,
-          desc,
-        });
-        Rules.insert({
-          title: ruleName,
-          triggerId,
-          actionId,
-          boardId,
-        });
-
+    return [
+      {
+        'click .js-create-card-action'(event) {
+          const ruleName = this.data().ruleName.get();
+          const trigger = this.data().triggerVar.get();
+          const cardName = this.find('#card-name').value;
+          const listName = this.find('#list-name').value;
+          const swimlaneName = this.find('#swimlane-name2').value;
+          const boardId = Session.get('currentBoard');
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'createCard',
+            swimlaneName,
+            cardName,
+            listName,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        },
+        'click .js-add-swimlane-action'(event) {
+          const ruleName = this.data().ruleName.get();
+          const trigger = this.data().triggerVar.get();
+          const swimlaneName = this.find('#swimlane-name').value;
+          const boardId = Session.get('currentBoard');
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'addSwimlane',
+            swimlaneName,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        },
+        'click .js-add-spec-move-action'(event) {
+          const ruleName = this.data().ruleName.get();
+          const trigger = this.data().triggerVar.get();
+          const actionSelected = this.find('#move-spec-action').value;
+          const listTitle = this.find('#listName').value;
+          const boardId = Session.get('currentBoard');
+          const desc = Utils.getTriggerActionDesc(event, this);
+          if (actionSelected === 'top') {
+            const triggerId = Triggers.insert(trigger);
+            const actionId = Actions.insert({
+              actionType: 'moveCardToTop',
+              listTitle,
+              boardId,
+              desc,
+            });
+            Rules.insert({
+              title: ruleName,
+              triggerId,
+              actionId,
+              boardId,
+            });
+          }
+          if (actionSelected === 'bottom') {
+            const triggerId = Triggers.insert(trigger);
+            const actionId = Actions.insert({
+              actionType: 'moveCardToBottom',
+              listTitle,
+              boardId,
+              desc,
+            });
+            Rules.insert({
+              title: ruleName,
+              triggerId,
+              actionId,
+              boardId,
+            });
+          }
+        },
+        'click .js-add-gen-move-action'(event) {
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const boardId = Session.get('currentBoard');
+          const ruleName = this.data().ruleName.get();
+          const trigger = this.data().triggerVar.get();
+          const actionSelected = this.find('#move-gen-action').value;
+          if (actionSelected === 'top') {
+            const triggerId = Triggers.insert(trigger);
+            const actionId = Actions.insert({
+              actionType: 'moveCardToTop',
+              listTitle: '*',
+              boardId,
+              desc,
+            });
+            Rules.insert({
+              title: ruleName,
+              triggerId,
+              actionId,
+              boardId,
+            });
+          }
+          if (actionSelected === 'bottom') {
+            const triggerId = Triggers.insert(trigger);
+            const actionId = Actions.insert({
+              actionType: 'moveCardToBottom',
+              listTitle: '*',
+              boardId,
+              desc,
+            });
+            Rules.insert({
+              title: ruleName,
+              triggerId,
+              actionId,
+              boardId,
+            });
+          }
+        },
+        'click .js-add-arch-action'(event) {
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const boardId = Session.get('currentBoard');
+          const ruleName = this.data().ruleName.get();
+          const trigger = this.data().triggerVar.get();
+          const actionSelected = this.find('#arch-action').value;
+          if (actionSelected === 'archive') {
+            const triggerId = Triggers.insert(trigger);
+            const actionId = Actions.insert({
+              actionType: 'archive',
+              boardId,
+              desc,
+            });
+            Rules.insert({
+              title: ruleName,
+              triggerId,
+              actionId,
+              boardId,
+            });
+          }
+          if (actionSelected === 'unarchive') {
+            const triggerId = Triggers.insert(trigger);
+            const actionId = Actions.insert({
+              actionType: 'unarchive',
+              boardId,
+              desc,
+            });
+            Rules.insert({
+              title: ruleName,
+              triggerId,
+              actionId,
+              boardId,
+            });
+          }
+        },
       },
-      'click .js-add-swimlane-action' (event) {
-        const ruleName = this.data().ruleName.get();
-        const trigger = this.data().triggerVar.get();
-        const swimlaneName = this.find('#swimlane-name').value;
-        const boardId = Session.get('currentBoard');
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const triggerId = Triggers.insert(trigger);
-        const actionId = Actions.insert({
-          actionType: 'addSwimlane',
-          swimlaneName,
-          boardId,
-          desc,
-        });
-        Rules.insert({
-          title: ruleName,
-          triggerId,
-          actionId,
-          boardId,
-        });
-
-      },
-      'click .js-add-spec-move-action' (event) {
-        const ruleName = this.data().ruleName.get();
-        const trigger = this.data().triggerVar.get();
-        const actionSelected = this.find('#move-spec-action').value;
-        const listTitle = this.find('#listName').value;
-        const boardId = Session.get('currentBoard');
-        const desc = Utils.getTriggerActionDesc(event, this);
-        if (actionSelected === 'top') {
-          const triggerId = Triggers.insert(trigger);
-          const actionId = Actions.insert({
-            actionType: 'moveCardToTop',
-            listTitle,
-            boardId,
-            desc,
-          });
-          Rules.insert({
-            title: ruleName,
-            triggerId,
-            actionId,
-            boardId,
-          });
-        }
-        if (actionSelected === 'bottom') {
-          const triggerId = Triggers.insert(trigger);
-          const actionId = Actions.insert({
-            actionType: 'moveCardToBottom',
-            listTitle,
-            boardId,
-            desc,
-          });
-          Rules.insert({
-            title: ruleName,
-            triggerId,
-            actionId,
-            boardId,
-          });
-        }
-      },
-      'click .js-add-gen-move-action' (event) {
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const boardId = Session.get('currentBoard');
-        const ruleName = this.data().ruleName.get();
-        const trigger = this.data().triggerVar.get();
-        const actionSelected = this.find('#move-gen-action').value;
-        if (actionSelected === 'top') {
-          const triggerId = Triggers.insert(trigger);
-          const actionId = Actions.insert({
-            actionType: 'moveCardToTop',
-            'listTitle': '*',
-            boardId,
-            desc,
-          });
-          Rules.insert({
-            title: ruleName,
-            triggerId,
-            actionId,
-            boardId,
-          });
-        }
-        if (actionSelected === 'bottom') {
-          const triggerId = Triggers.insert(trigger);
-          const actionId = Actions.insert({
-            actionType: 'moveCardToBottom',
-            'listTitle': '*',
-            boardId,
-            desc,
-          });
-          Rules.insert({
-            title: ruleName,
-            triggerId,
-            actionId,
-            boardId,
-          });
-        }
-      },
-      'click .js-add-arch-action' (event) {
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const boardId = Session.get('currentBoard');
-        const ruleName = this.data().ruleName.get();
-        const trigger = this.data().triggerVar.get();
-        const actionSelected = this.find('#arch-action').value;
-        if (actionSelected === 'archive') {
-          const triggerId = Triggers.insert(trigger);
-          const actionId = Actions.insert({
-            actionType: 'archive',
-            boardId,
-            desc,
-          });
-          Rules.insert({
-            title: ruleName,
-            triggerId,
-            actionId,
-            boardId,
-          });
-        }
-        if (actionSelected === 'unarchive') {
-          const triggerId = Triggers.insert(trigger);
-          const actionId = Actions.insert({
-            actionType: 'unarchive',
-            boardId,
-            desc,
-          });
-          Rules.insert({
-            title: ruleName,
-            triggerId,
-            actionId,
-            boardId,
-          });
-        }
-      },
-    }];
+    ];
   },
-
 }).register('boardActions');
 /* eslint-no-undef */

client/components/rules/actions/cardActions.jade

@@ -1,11 +1,44 @@
 template(name="cardActions")
+  div.trigger-item
+    div.trigger-content
+      div.trigger-dropdown
+        select(id="setdate-action")
+          option(value="setDate") {{{_'r-set'}}}
+          option(value="updateDate") {{{_'r-update'}}}
+      div.trigger-text
+        | {{{_'r-datefield'}}}
+      div.trigger-dropdown
+        select(id="setdate-datefield")
+          option(value="startAt") {{{_'r-df-start-at'}}}
+          option(value="dueAt") {{{_'r-df-due-at'}}}
+          option(value="endAt") {{{_'r-df-end-at'}}}
+          option(value="receivedAt") {{{_'r-df-received-at'}}}
+      div.trigger-text
+        | {{{_'r-to-current-datetime'}}}
+    div.trigger-button.js-set-date-action.js-goto-rules
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text
+        | {{{_'r-remove-value-from'}}}
+        | {{{_'r-datefield'}}}
+      div.trigger-dropdown
+        select(id="setdate-removedatefieldvalue")
+          option(value="startAt") {{{_'r-df-start-at'}}}
+          option(value="dueAt") {{{_'r-df-due-at'}}}
+          option(value="endAt") {{{_'r-df-end-at'}}}
+          option(value="receivedAt") {{{_'r-df-received-at'}}}
+    div.trigger-button.js-remove-datevalue-action.js-goto-rules
+      i.fa.fa-plus
+
   div.trigger-item
     div.trigger-content
       div.trigger-dropdown
         select(id="label-action")
           option(value="add") {{{_'r-add'}}}
           option(value="remove") {{{_'r-remove'}}}
-      div.trigger-text 
+      div.trigger-text
         | {{{_'r-label'}}}
       div.trigger-dropdown
         select(id="label-id")
@@ -21,16 +54,16 @@ template(name="cardActions")
         select(id="member-action")
           option(value="add") {{{_'r-add'}}}
           option(value="remove") {{{_'r-remove'}}}
-      div.trigger-text 
+      div.trigger-text
         | {{{_'r-member'}}}
       div.trigger-dropdown
-        input(id="member-name",type=text,placeholder="{{{_'r-name'}}}")  
+        input(id="member-name",type=text,placeholder="{{{_'r-name'}}}")
     div.trigger-button.js-add-member-action.js-goto-rules
       i.fa.fa-plus
 
   div.trigger-item
     div.trigger-content
-      div.trigger-text 
+      div.trigger-text
         | {{{_'r-remove-all'}}}
     div.trigger-button.js-add-removeall-action.js-goto-rules
       i.fa.fa-plus

client/components/rules/actions/cardActions.js

@@ -14,7 +14,7 @@ BlazeComponent.extendComponent({
   },
 
   cardColorButtonText() {
-    return `color-${ this.cardColorButtonValue.get() }`;
+    return `color-${this.cardColorButtonValue.get()}`;
   },
 
   labels() {
@@ -28,61 +28,24 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'click .js-add-label-action' (event) {
-        const ruleName = this.data().ruleName.get();
-        const trigger = this.data().triggerVar.get();
-        const actionSelected = this.find('#label-action').value;
-        const labelId = this.find('#label-id').value;
-        const boardId = Session.get('currentBoard');
-        const desc = Utils.getTriggerActionDesc(event, this);
-        if (actionSelected === 'add') {
+    return [
+      {
+        'click .js-set-date-action'(event) {
+          const ruleName = this.data().ruleName.get();
+          const trigger = this.data().triggerVar.get();
           const triggerId = Triggers.insert(trigger);
-          const actionId = Actions.insert({
-            actionType: 'addLabel',
-            labelId,
-            boardId,
-            desc,
-          });
-          Rules.insert({
-            title: ruleName,
-            triggerId,
-            actionId,
-            boardId,
-          });
-        }
-        if (actionSelected === 'remove') {
-          const triggerId = Triggers.insert(trigger);
-          const actionId = Actions.insert({
-            actionType: 'removeLabel',
-            labelId,
-            boardId,
-            desc,
-          });
-          Rules.insert({
-            title: ruleName,
-            triggerId,
-            actionId,
-            boardId,
-          });
-        }
+          const actionSelected = this.find('#setdate-action').value;
+          const dateFieldSelected = this.find('#setdate-datefield').value;
+          const boardId = Session.get('currentBoard');
+          const desc = Utils.getTriggerActionDesc(event, this);
 
-      },
-      'click .js-add-member-action' (event) {
-        const ruleName = this.data().ruleName.get();
-        const trigger = this.data().triggerVar.get();
-        const actionSelected = this.find('#member-action').value;
-        const username = this.find('#member-name').value;
-        const boardId = Session.get('currentBoard');
-        const desc = Utils.getTriggerActionDesc(event, this);
-        if (actionSelected === 'add') {
-          const triggerId = Triggers.insert(trigger);
           const actionId = Actions.insert({
-            actionType: 'addMember',
-            username,
+            actionType: actionSelected,
+            dateField: dateFieldSelected,
             boardId,
             desc,
           });
+
           Rules.insert({
             title: ruleName,
             triggerId,
@@ -90,12 +53,118 @@ BlazeComponent.extendComponent({
             boardId,
             desc,
           });
-        }
-        if (actionSelected === 'remove') {
+        },
+
+        'click .js-remove-datevalue-action'(event) {
+          const ruleName = this.data().ruleName.get();
+          const trigger = this.data().triggerVar.get();
           const triggerId = Triggers.insert(trigger);
+          const dateFieldSelected = this.find('#setdate-removedatefieldvalue')
+            .value;
+          const boardId = Session.get('currentBoard');
+          const desc = Utils.getTriggerActionDesc(event, this);
+
+          const actionId = Actions.insert({
+            actionType: 'removeDate',
+            dateField: dateFieldSelected,
+            boardId,
+            desc,
+          });
+
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+            desc,
+          });
+        },
+        'click .js-add-label-action'(event) {
+          const ruleName = this.data().ruleName.get();
+          const trigger = this.data().triggerVar.get();
+          const actionSelected = this.find('#label-action').value;
+          const labelId = this.find('#label-id').value;
+          const boardId = Session.get('currentBoard');
+          const desc = Utils.getTriggerActionDesc(event, this);
+          if (actionSelected === 'add') {
+            const triggerId = Triggers.insert(trigger);
+            const actionId = Actions.insert({
+              actionType: 'addLabel',
+              labelId,
+              boardId,
+              desc,
+            });
+            Rules.insert({
+              title: ruleName,
+              triggerId,
+              actionId,
+              boardId,
+            });
+          }
+          if (actionSelected === 'remove') {
+            const triggerId = Triggers.insert(trigger);
+            const actionId = Actions.insert({
+              actionType: 'removeLabel',
+              labelId,
+              boardId,
+              desc,
+            });
+            Rules.insert({
+              title: ruleName,
+              triggerId,
+              actionId,
+              boardId,
+            });
+          }
+        },
+        'click .js-add-member-action'(event) {
+          const ruleName = this.data().ruleName.get();
+          const trigger = this.data().triggerVar.get();
+          const actionSelected = this.find('#member-action').value;
+          const username = this.find('#member-name').value;
+          const boardId = Session.get('currentBoard');
+          const desc = Utils.getTriggerActionDesc(event, this);
+          if (actionSelected === 'add') {
+            const triggerId = Triggers.insert(trigger);
+            const actionId = Actions.insert({
+              actionType: 'addMember',
+              username,
+              boardId,
+              desc,
+            });
+            Rules.insert({
+              title: ruleName,
+              triggerId,
+              actionId,
+              boardId,
+              desc,
+            });
+          }
+          if (actionSelected === 'remove') {
+            const triggerId = Triggers.insert(trigger);
+            const actionId = Actions.insert({
+              actionType: 'removeMember',
+              username,
+              boardId,
+              desc,
+            });
+            Rules.insert({
+              title: ruleName,
+              triggerId,
+              actionId,
+              boardId,
+            });
+          }
+        },
+        'click .js-add-removeall-action'(event) {
+          const ruleName = this.data().ruleName.get();
+          const trigger = this.data().triggerVar.get();
+          const triggerId = Triggers.insert(trigger);
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const boardId = Session.get('currentBoard');
           const actionId = Actions.insert({
             actionType: 'removeMember',
-            username,
+            username: '*',
             boardId,
             desc,
           });
@@ -105,58 +174,38 @@ BlazeComponent.extendComponent({
             actionId,
             boardId,
           });
-        }
+        },
+        'click .js-show-color-palette'(event) {
+          const funct = Popup.open('setCardActionsColor');
+          const colorButton = this.find('#color-action');
+          if (colorButton.value === '') {
+            colorButton.value = 'green';
+          }
+          funct.call(this, event);
+        },
+        'click .js-set-color-action'(event) {
+          const ruleName = this.data().ruleName.get();
+          const trigger = this.data().triggerVar.get();
+          const selectedColor = this.cardColorButtonValue.get();
+          const boardId = Session.get('currentBoard');
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'setColor',
+            selectedColor,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        },
       },
-      'click .js-add-removeall-action' (event) {
-        const ruleName = this.data().ruleName.get();
-        const trigger = this.data().triggerVar.get();
-        const triggerId = Triggers.insert(trigger);
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const boardId = Session.get('currentBoard');
-        const actionId = Actions.insert({
-          actionType: 'removeMember',
-          'username': '*',
-          boardId,
-          desc,
-        });
-        Rules.insert({
-          title: ruleName,
-          triggerId,
-          actionId,
-          boardId,
-        });
-      },
-      'click .js-show-color-palette'(event){
-        const funct = Popup.open('setCardActionsColor');
-        const colorButton = this.find('#color-action');
-        if (colorButton.value === '') {
-          colorButton.value = 'green';
-        }
-        funct.call(this, event);
-      },
-      'click .js-set-color-action' (event) {
-        const ruleName = this.data().ruleName.get();
-        const trigger = this.data().triggerVar.get();
-        const selectedColor = this.cardColorButtonValue.get();
-        const boardId = Session.get('currentBoard');
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const triggerId = Triggers.insert(trigger);
-        const actionId = Actions.insert({
-          actionType: 'setColor',
-          selectedColor,
-          boardId,
-          desc,
-        });
-        Rules.insert({
-          title: ruleName,
-          triggerId,
-          actionId,
-          boardId,
-        });
-      },
-    }];
+    ];
   },
-
 }).register('cardActions');
 
 BlazeComponent.extendComponent({
@@ -167,7 +216,7 @@ BlazeComponent.extendComponent({
   },
 
   colors() {
-    return cardColors.map((color) => ({ color, name: '' }));
+    return cardColors.map(color => ({ color, name: '' }));
   },
 
   isSelected(color) {
@@ -175,14 +224,16 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'click .js-palette-color'() {
-        this.currentColor.set(this.currentData().color);
+    return [
+      {
+        'click .js-palette-color'() {
+          this.currentColor.set(this.currentData().color);
+        },
+        'click .js-submit'() {
+          this.colorButtonValue.set(this.currentColor.get());
+          Popup.close();
+        },
       },
-      'click .js-submit' () {
-        this.colorButtonValue.set(this.currentColor.get());
-        Popup.close();
-      },
-    }];
+    ];
   },
 }).register('setCardActionsColorPopup');

client/components/rules/actions/checklistActions.js

@@ -3,149 +3,148 @@ BlazeComponent.extendComponent({
     this.subscribe('allRules');
   },
   events() {
-    return [{
-      'click .js-add-checklist-items-action' (event) {
-        const ruleName = this.data().ruleName.get();
-        const trigger = this.data().triggerVar.get();
-        const checklistName = this.find('#checklist-name-3').value;
-        const checklistItems = this.find('#checklist-items').value;
-        const boardId = Session.get('currentBoard');
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const triggerId = Triggers.insert(trigger);
-        const actionId = Actions.insert({
-          actionType: 'addChecklistWithItems',
-          checklistName,
-          checklistItems,
-          boardId,
-          desc,
-        });
-        Rules.insert({
-          title: ruleName,
-          triggerId,
-          actionId,
-          boardId,
-        });
-
+    return [
+      {
+        'click .js-add-checklist-items-action'(event) {
+          const ruleName = this.data().ruleName.get();
+          const trigger = this.data().triggerVar.get();
+          const checklistName = this.find('#checklist-name-3').value;
+          const checklistItems = this.find('#checklist-items').value;
+          const boardId = Session.get('currentBoard');
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'addChecklistWithItems',
+            checklistName,
+            checklistItems,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        },
+        'click .js-add-checklist-action'(event) {
+          const ruleName = this.data().ruleName.get();
+          const trigger = this.data().triggerVar.get();
+          const actionSelected = this.find('#check-action').value;
+          const checklistName = this.find('#checklist-name').value;
+          const boardId = Session.get('currentBoard');
+          const desc = Utils.getTriggerActionDesc(event, this);
+          if (actionSelected === 'add') {
+            const triggerId = Triggers.insert(trigger);
+            const actionId = Actions.insert({
+              actionType: 'addChecklist',
+              checklistName,
+              boardId,
+              desc,
+            });
+            Rules.insert({
+              title: ruleName,
+              triggerId,
+              actionId,
+              boardId,
+            });
+          }
+          if (actionSelected === 'remove') {
+            const triggerId = Triggers.insert(trigger);
+            const actionId = Actions.insert({
+              actionType: 'removeChecklist',
+              checklistName,
+              boardId,
+              desc,
+            });
+            Rules.insert({
+              title: ruleName,
+              triggerId,
+              actionId,
+              boardId,
+            });
+          }
+        },
+        'click .js-add-checkall-action'(event) {
+          const ruleName = this.data().ruleName.get();
+          const trigger = this.data().triggerVar.get();
+          const actionSelected = this.find('#checkall-action').value;
+          const checklistName = this.find('#checklist-name2').value;
+          const boardId = Session.get('currentBoard');
+          const desc = Utils.getTriggerActionDesc(event, this);
+          if (actionSelected === 'check') {
+            const triggerId = Triggers.insert(trigger);
+            const actionId = Actions.insert({
+              actionType: 'checkAll',
+              checklistName,
+              boardId,
+              desc,
+            });
+            Rules.insert({
+              title: ruleName,
+              triggerId,
+              actionId,
+              boardId,
+            });
+          }
+          if (actionSelected === 'uncheck') {
+            const triggerId = Triggers.insert(trigger);
+            const actionId = Actions.insert({
+              actionType: 'uncheckAll',
+              checklistName,
+              boardId,
+              desc,
+            });
+            Rules.insert({
+              title: ruleName,
+              triggerId,
+              actionId,
+              boardId,
+            });
+          }
+        },
+        'click .js-add-check-item-action'(event) {
+          const ruleName = this.data().ruleName.get();
+          const trigger = this.data().triggerVar.get();
+          const checkItemName = this.find('#checkitem-name');
+          const checklistName = this.find('#checklist-name3');
+          const actionSelected = this.find('#check-item-action').value;
+          const boardId = Session.get('currentBoard');
+          const desc = Utils.getTriggerActionDesc(event, this);
+          if (actionSelected === 'check') {
+            const triggerId = Triggers.insert(trigger);
+            const actionId = Actions.insert({
+              actionType: 'checkItem',
+              checklistName,
+              checkItemName,
+              boardId,
+              desc,
+            });
+            Rules.insert({
+              title: ruleName,
+              triggerId,
+              actionId,
+              boardId,
+            });
+          }
+          if (actionSelected === 'uncheck') {
+            const triggerId = Triggers.insert(trigger);
+            const actionId = Actions.insert({
+              actionType: 'uncheckItem',
+              checklistName,
+              checkItemName,
+              boardId,
+              desc,
+            });
+            Rules.insert({
+              title: ruleName,
+              triggerId,
+              actionId,
+              boardId,
+            });
+          }
+        },
       },
-      'click .js-add-checklist-action' (event) {
-        const ruleName = this.data().ruleName.get();
-        const trigger = this.data().triggerVar.get();
-        const actionSelected = this.find('#check-action').value;
-        const checklistName = this.find('#checklist-name').value;
-        const boardId = Session.get('currentBoard');
-        const desc = Utils.getTriggerActionDesc(event, this);
-        if (actionSelected === 'add') {
-          const triggerId = Triggers.insert(trigger);
-          const actionId = Actions.insert({
-            actionType: 'addChecklist',
-            checklistName,
-            boardId,
-            desc,
-          });
-          Rules.insert({
-            title: ruleName,
-            triggerId,
-            actionId,
-            boardId,
-          });
-        }
-        if (actionSelected === 'remove') {
-          const triggerId = Triggers.insert(trigger);
-          const actionId = Actions.insert({
-            actionType: 'removeChecklist',
-            checklistName,
-            boardId,
-            desc,
-          });
-          Rules.insert({
-            title: ruleName,
-            triggerId,
-            actionId,
-            boardId,
-          });
-        }
-
-      },
-      'click .js-add-checkall-action' (event) {
-        const ruleName = this.data().ruleName.get();
-        const trigger = this.data().triggerVar.get();
-        const actionSelected = this.find('#checkall-action').value;
-        const checklistName = this.find('#checklist-name2').value;
-        const boardId = Session.get('currentBoard');
-        const desc = Utils.getTriggerActionDesc(event, this);
-        if (actionSelected === 'check') {
-          const triggerId = Triggers.insert(trigger);
-          const actionId = Actions.insert({
-            actionType: 'checkAll',
-            checklistName,
-            boardId,
-            desc,
-          });
-          Rules.insert({
-            title: ruleName,
-            triggerId,
-            actionId,
-            boardId,
-          });
-        }
-        if (actionSelected === 'uncheck') {
-          const triggerId = Triggers.insert(trigger);
-          const actionId = Actions.insert({
-            actionType: 'uncheckAll',
-            checklistName,
-            boardId,
-            desc,
-          });
-          Rules.insert({
-            title: ruleName,
-            triggerId,
-            actionId,
-            boardId,
-          });
-        }
-      },
-      'click .js-add-check-item-action' (event) {
-        const ruleName = this.data().ruleName.get();
-        const trigger = this.data().triggerVar.get();
-        const checkItemName = this.find('#checkitem-name');
-        const checklistName = this.find('#checklist-name3');
-        const actionSelected = this.find('#check-item-action').value;
-        const boardId = Session.get('currentBoard');
-        const desc = Utils.getTriggerActionDesc(event, this);
-        if (actionSelected === 'check') {
-          const triggerId = Triggers.insert(trigger);
-          const actionId = Actions.insert({
-            actionType: 'checkItem',
-            checklistName,
-            checkItemName,
-            boardId,
-            desc,
-          });
-          Rules.insert({
-            title: ruleName,
-            triggerId,
-            actionId,
-            boardId,
-          });
-        }
-        if (actionSelected === 'uncheck') {
-          const triggerId = Triggers.insert(trigger);
-          const actionId = Actions.insert({
-            actionType: 'uncheckItem',
-            checklistName,
-            checkItemName,
-            boardId,
-            desc,
-          });
-          Rules.insert({
-            title: ruleName,
-            triggerId,
-            actionId,
-            boardId,
-          });
-        }
-      },
-    }];
+    ];
   },
-
 }).register('checklistActions');

client/components/rules/actions/mailActions.js

@@ -1,35 +1,34 @@
 BlazeComponent.extendComponent({
-  onCreated() {
-
-  },
+  onCreated() {},
 
   events() {
-    return [{
-      'click .js-mail-action' (event) {
-        const emailTo = this.find('#email-to').value;
-        const emailSubject = this.find('#email-subject').value;
-        const emailMsg = this.find('#email-msg').value;
-        const trigger = this.data().triggerVar.get();
-        const ruleName = this.data().ruleName.get();
-        const triggerId = Triggers.insert(trigger);
-        const boardId = Session.get('currentBoard');
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const actionId = Actions.insert({
-          actionType: 'sendEmail',
-          emailTo,
-          emailSubject,
-          emailMsg,
-          boardId,
-          desc,
-        });
-        Rules.insert({
-          title: ruleName,
-          triggerId,
-          actionId,
-          boardId,
-        });
+    return [
+      {
+        'click .js-mail-action'(event) {
+          const emailTo = this.find('#email-to').value;
+          const emailSubject = this.find('#email-subject').value;
+          const emailMsg = this.find('#email-msg').value;
+          const trigger = this.data().triggerVar.get();
+          const ruleName = this.data().ruleName.get();
+          const triggerId = Triggers.insert(trigger);
+          const boardId = Session.get('currentBoard');
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const actionId = Actions.insert({
+            actionType: 'sendEmail',
+            emailTo,
+            emailSubject,
+            emailMsg,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        },
       },
-    }];
+    ];
   },
-
 }).register('mailActions');

client/components/rules/ruleDetails.js

@@ -3,7 +3,6 @@ BlazeComponent.extendComponent({
     this.subscribe('allRules');
     this.subscribe('allTriggers');
     this.subscribe('allActions');
-
   },
 
   trigger() {
@@ -34,5 +33,4 @@ BlazeComponent.extendComponent({
   events() {
     return [{}];
   },
-
 }).register('ruleDetails');

client/components/rules/rulesActions.js

@@ -40,19 +40,21 @@ BlazeComponent.extendComponent({
     // console.log(this.data());
   },
   events() {
-    return [{
-      'click .js-set-board-actions'(){
-        this.setBoardActions();
+    return [
+      {
+        'click .js-set-board-actions'() {
+          this.setBoardActions();
+        },
+        'click .js-set-card-actions'() {
+          this.setCardActions();
+        },
+        'click .js-set-mail-actions'() {
+          this.setMailActions();
+        },
+        'click .js-set-checklist-actions'() {
+          this.setChecklistActions();
+        },
       },
-      'click .js-set-card-actions'() {
-        this.setCardActions();
-      },
-      'click .js-set-mail-actions'() {
-        this.setMailActions();
-      },
-      'click .js-set-checklist-actions'() {
-        this.setChecklistActions();
-      },
-    }];
+    ];
   },
 }).register('rulesActions');

client/components/rules/rulesList.jade

@@ -17,6 +17,10 @@ template(name="rulesList")
               button.js-delete-rule
                 i.fa.fa-trash-o
                 | {{{_ 'r-delete-rule'}}}
+            else if currentUser.isBoardAdmin
+              button.js-delete-rule
+                i.fa.fa-trash-o
+                | {{{_ 'r-delete-rule'}}}
       else
         li.no-items-message {{{_ 'r-no-rules' }}}
     if currentUser.isAdmin
@@ -24,4 +28,10 @@ template(name="rulesList")
         button.js-goto-trigger
           i.fa.fa-plus
           | {{{_ 'r-add-rule'}}}
-        input(type=text,placeholder="{{{_ 'r-new-rule-name' }}}",id="ruleTitle")
+        input(type=text,placeholder="{{{_ 'r-new-rule-name' }}}",id="ruleTitle")
+    else if currentUser.isBoardAdmin
+      div.rules-add
+        button.js-goto-trigger
+          i.fa.fa-plus
+          | {{{_ 'r-add-rule'}}}
+        input(type=text,placeholder="{{{_ 'r-new-rule-name' }}}",id="ruleTitle")

client/components/rules/rulesMain.js

@@ -9,12 +9,12 @@ BlazeComponent.extendComponent({
   setTrigger() {
     this.rulesCurrentTab.set('trigger');
   },
-  sanitizeObject(obj){
-    Object.keys(obj).forEach((key) => {
-      if(obj[key] === '' || obj[key] === undefined){
+  sanitizeObject(obj) {
+    Object.keys(obj).forEach(key => {
+      if (obj[key] === '' || obj[key] === undefined) {
         obj[key] = '*';
-      }}
-    );
+      }
+    });
   },
   setRulesList() {
     this.rulesCurrentTab.set('rulesList');
@@ -29,69 +29,73 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'click .js-delete-rule' () {
-        const rule = this.currentData();
-        Rules.remove(rule._id);
-        Actions.remove(rule.actionId);
-        Triggers.remove(rule.triggerId);
-
-      },
-      'click .js-goto-trigger' (event) {
-        event.preventDefault();
-        const ruleTitle = this.find('#ruleTitle').value;
-        if(ruleTitle !== undefined && ruleTitle !== ''){
-          this.find('#ruleTitle').value = '';
-          this.ruleName.set(ruleTitle);
-          this.setTrigger();
-        }
-      },
-      'click .js-goto-action' (event) {
-        event.preventDefault();
-        // Add user to the trigger
-        const username = $(event.currentTarget.offsetParent).find('.user-name').val();
-        let trigger = this.triggerVar.get();
-        trigger.userId = '*';
-        if(username !== undefined ){
-          const userFound = Users.findOne({username});
-          if(userFound !== undefined){
-            trigger.userId = userFound._id;
-            this.triggerVar.set(trigger);
+    return [
+      {
+        'click .js-delete-rule'() {
+          const rule = this.currentData();
+          Rules.remove(rule._id);
+          Actions.remove(rule.actionId);
+          Triggers.remove(rule.triggerId);
+        },
+        'click .js-goto-trigger'(event) {
+          event.preventDefault();
+          const ruleTitle = this.find('#ruleTitle').value;
+          if (ruleTitle !== undefined && ruleTitle !== '') {
+            this.find('#ruleTitle').value = '';
+            this.ruleName.set(ruleTitle);
+            this.setTrigger();
           }
-        }
-        // Sanitize trigger
-        trigger = this.triggerVar.get();
-        this.sanitizeObject(trigger);
-        this.triggerVar.set(trigger);
-        this.setAction();
-      },
-      'click .js-show-user-field' (event) {
-        event.preventDefault();
-        $(event.currentTarget.offsetParent).find('.user-details').removeClass('hide-element');
-      },
-      'click .js-goto-rules' (event) {
-        event.preventDefault();
-        this.setRulesList();
-      },
-      'click .js-goback' (event) {
-        event.preventDefault();
-        if(this.rulesCurrentTab.get() === 'trigger' || this.rulesCurrentTab.get() === 'ruleDetails' ){
+        },
+        'click .js-goto-action'(event) {
+          event.preventDefault();
+          // Add user to the trigger
+          const username = $(event.currentTarget.offsetParent)
+            .find('.user-name')
+            .val();
+          let trigger = this.triggerVar.get();
+          trigger.userId = '*';
+          if (username !== undefined) {
+            const userFound = Users.findOne({ username });
+            if (userFound !== undefined) {
+              trigger.userId = userFound._id;
+              this.triggerVar.set(trigger);
+            }
+          }
+          // Sanitize trigger
+          trigger = this.triggerVar.get();
+          this.sanitizeObject(trigger);
+          this.triggerVar.set(trigger);
+          this.setAction();
+        },
+        'click .js-show-user-field'(event) {
+          event.preventDefault();
+          $(event.currentTarget.offsetParent)
+            .find('.user-details')
+            .removeClass('hide-element');
+        },
+        'click .js-goto-rules'(event) {
+          event.preventDefault();
           this.setRulesList();
-        }
-        if(this.rulesCurrentTab.get() === 'action'){
-          this.setTrigger();
-        }
+        },
+        'click .js-goback'(event) {
+          event.preventDefault();
+          if (
+            this.rulesCurrentTab.get() === 'trigger' ||
+            this.rulesCurrentTab.get() === 'ruleDetails'
+          ) {
+            this.setRulesList();
+          }
+          if (this.rulesCurrentTab.get() === 'action') {
+            this.setTrigger();
+          }
+        },
+        'click .js-goto-details'(event) {
+          event.preventDefault();
+          const rule = this.currentData();
+          this.ruleId.set(rule._id);
+          this.setRuleDetails();
+        },
       },
-      'click .js-goto-details' (event) {
-        event.preventDefault();
-        const rule = this.currentData();
-        this.ruleId.set(rule._id);
-        this.setRuleDetails();
-      },
-
-    }];
+    ];
   },
-
 }).register('rulesMain');
-
-

client/components/rules/rulesTriggers.js

@@ -38,16 +38,18 @@ BlazeComponent.extendComponent({
     // console.log(this.data());
   },
   events() {
-    return [{
-      'click .js-set-board-triggers' () {
-        this.setBoardTriggers();
+    return [
+      {
+        'click .js-set-board-triggers'() {
+          this.setBoardTriggers();
+        },
+        'click .js-set-card-triggers'() {
+          this.setCardTriggers();
+        },
+        'click .js-set-checklist-triggers'() {
+          this.setChecklistTriggers();
+        },
       },
-      'click .js-set-card-triggers' () {
-        this.setCardTriggers();
-      },
-      'click .js-set-checklist-triggers' () {
-        this.setChecklistTriggers();
-      },
-    }];
+    ];
   },
 }).register('rulesTriggers');

client/components/rules/triggers/boardTriggers.jade

@@ -64,8 +64,7 @@ template(name="boardTriggers")
       div.trigger-text 
         | {{_'r-in-swimlane'}}
       div.trigger-dropdown
-        input(id="create-swimlane-name",type=text,placeholder="{{_'r-swimlane-name'}}") 
-      div.trigger-button.trigger-button-person.js-show-user-field  
+        input(id="create-swimlane-name-2",type=text,placeholder="{{_'r-swimlane-name'}}") 
       div.trigger-button.trigger-button-person.js-show-user-field
         i.fa.fa-user
       div.user-details.hide-element

client/components/rules/triggers/boardTriggers.js

@@ -4,112 +4,118 @@ BlazeComponent.extendComponent({
     this.currentPopupTriggerId = 'def';
     this.cardTitleFilters = {};
   },
-  setNameFilter(name){
-    this.cardTitleFilters[this.currentPopupTriggerId] =  name;
+  setNameFilter(name) {
+    this.cardTitleFilters[this.currentPopupTriggerId] = name;
   },
 
   events() {
-    return [{
-      'click .js-open-card-title-popup'(event){
-        const funct = Popup.open('boardCardTitle');
-        const divId = $(event.currentTarget.parentNode.parentNode).attr('id');
-        //console.log('current popup');
-        //console.log(this.currentPopupTriggerId);
-        this.currentPopupTriggerId = divId;
-        funct.call(this, event);
-      },
-      'click .js-add-create-trigger' (event) {
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const datas = this.data();
-        const listName = this.find('#create-list-name').value;
-        const swimlaneName = this.find('#create-swimlane-name').value;
-        const boardId = Session.get('currentBoard');
-        const divId = $(event.currentTarget.parentNode).attr('id');
-        const cardTitle = this.cardTitleFilters[divId];
-        // move to generic funciont
-        datas.triggerVar.set({
-          activityType: 'createCard',
-          boardId,
-          cardTitle,
-          swimlaneName,
-          listName,
-          desc,
-        });
-      },
-      'click .js-add-moved-trigger' (event) {
-        const datas = this.data();
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const swimlaneName = this.find('#create-swimlane-name').value;
-        const actionSelected = this.find('#move-action').value;
-        const listName = this.find('#move-list-name').value;
-        const boardId = Session.get('currentBoard');
-        if (actionSelected === 'moved-to') {
+    return [
+      {
+        'click .js-open-card-title-popup'(event) {
+          const funct = Popup.open('boardCardTitle');
+          const divId = $(event.currentTarget.parentNode.parentNode).attr('id');
+          //console.log('current popup');
+          //console.log(this.currentPopupTriggerId);
+          this.currentPopupTriggerId = divId;
+          funct.call(this, event);
+        },
+        'click .js-add-create-trigger'(event) {
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const datas = this.data();
+          const listName = this.find('#create-list-name').value;
+          const swimlaneName = this.find('#create-swimlane-name').value;
+          const boardId = Session.get('currentBoard');
+          const divId = $(event.currentTarget.parentNode).attr('id');
+          const cardTitle = this.cardTitleFilters[divId];
+          // move to generic funciont
           datas.triggerVar.set({
-            activityType: 'moveCard',
+            activityType: 'createCard',
             boardId,
+            cardTitle,
+            swimlaneName,
             listName,
-            swimlaneName,
-            'oldListName': '*',
             desc,
           });
-        }
-        if (actionSelected === 'moved-from') {
+        },
+        'click .js-add-moved-trigger'(event) {
+          const datas = this.data();
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const swimlaneName = this.find('#create-swimlane-name-2').value;
+          const actionSelected = this.find('#move-action').value;
+          const listName = this.find('#move-list-name').value;
+          const boardId = Session.get('currentBoard');
+          const divId = $(event.currentTarget.parentNode).attr('id');
+          const cardTitle = this.cardTitleFilters[divId];
+          if (actionSelected === 'moved-to') {
+            datas.triggerVar.set({
+              activityType: 'moveCard',
+              boardId,
+              listName,
+              cardTitle,
+              swimlaneName,
+              oldListName: '*',
+              desc,
+            });
+          }
+          if (actionSelected === 'moved-from') {
+            datas.triggerVar.set({
+              activityType: 'moveCard',
+              boardId,
+              cardTitle,
+              swimlaneName,
+              listName: '*',
+              oldListName: listName,
+              desc,
+            });
+          }
+        },
+        'click .js-add-gen-moved-trigger'(event) {
+          const datas = this.data();
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const boardId = Session.get('currentBoard');
+
           datas.triggerVar.set({
             activityType: 'moveCard',
             boardId,
-            swimlaneName,
-            'listName': '*',
-            'oldListName': listName,
+            swimlaneName: '*',
+            listName: '*',
+            oldListName: '*',
             desc,
           });
-        }
+        },
+        'click .js-add-arc-trigger'(event) {
+          const datas = this.data();
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const actionSelected = this.find('#arch-action').value;
+          const boardId = Session.get('currentBoard');
+          if (actionSelected === 'archived') {
+            datas.triggerVar.set({
+              activityType: 'archivedCard',
+              boardId,
+              desc,
+            });
+          }
+          if (actionSelected === 'unarchived') {
+            datas.triggerVar.set({
+              activityType: 'restoredCard',
+              boardId,
+              desc,
+            });
+          }
+        },
       },
-      'click .js-add-gen-moved-trigger' (event){
-        const datas = this.data();
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const boardId = Session.get('currentBoard');
-
-        datas.triggerVar.set({
-          'activityType': 'moveCard',
-          boardId,
-          'swimlaneName': '*',
-          'listName':'*',
-          'oldListName': '*',
-          desc,
-        });
-      },
-      'click .js-add-arc-trigger' (event) {
-        const datas = this.data();
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const actionSelected = this.find('#arch-action').value;
-        const boardId = Session.get('currentBoard');
-        if (actionSelected === 'archived') {
-          datas.triggerVar.set({
-            activityType: 'archivedCard',
-            boardId,
-            desc,
-          });
-        }
-        if (actionSelected === 'unarchived') {
-          datas.triggerVar.set({
-            activityType: 'restoredCard',
-            boardId,
-            desc,
-          });
-        }
-      },
-
-    }];
+    ];
   },
-
 }).register('boardTriggers');
 
-
 Template.boardCardTitlePopup.events({
-  submit(evt, tpl) {
-    const title = tpl.$('.js-card-filter-name').val().trim();
+  submit(event, templateInstance) {
+    const title = templateInstance
+      .$('.js-card-filter-name')
+      .val()
+      .trim();
     Popup.getOpenerComponent().setNameFilter(title);
-    evt.preventDefault();
+    event.preventDefault();
     Popup.close();
   },
 });

client/components/rules/triggers/cardTriggers.jade

@@ -22,7 +22,7 @@ template(name="cardTriggers")
   div.trigger-item
     div.trigger-content
       div.trigger-text
-        | {{_'r-when-the-label-is'}}
+        | {{_'r-when-the-label'}}
       div.trigger-dropdown
         select(id="spec-label")
           each labels

client/components/rules/triggers/cardTriggers.js

@@ -7,7 +7,7 @@ BlazeComponent.extendComponent({
     for (let i = 0; i < labels.length; i++) {
       if (labels[i].name === '' || labels[i].name === undefined) {
         labels[i].name = labels[i].color;
-        labels[i].translatedname = `${TAPi18n.__(`color-${  labels[i].color}`)}`;
+        labels[i].translatedname = `${TAPi18n.__(`color-${labels[i].color}`)}`;
       } else {
         labels[i].translatedname = labels[i].name;
       }
@@ -15,117 +15,119 @@ BlazeComponent.extendComponent({
     return labels;
   },
   events() {
-    return [{
-      'click .js-add-gen-label-trigger' (event) {
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const datas = this.data();
-        const actionSelected = this.find('#label-action').value;
-        const boardId = Session.get('currentBoard');
-        if (actionSelected === 'added') {
-          datas.triggerVar.set({
-            activityType: 'addedLabel',
-            boardId,
-            'labelId': '*',
-            desc,
-          });
-        }
-        if (actionSelected === 'removed') {
-          datas.triggerVar.set({
-            activityType: 'removedLabel',
-            boardId,
-            'labelId': '*',
-            desc,
-          });
-        }
+    return [
+      {
+        'click .js-add-gen-label-trigger'(event) {
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const datas = this.data();
+          const actionSelected = this.find('#label-action').value;
+          const boardId = Session.get('currentBoard');
+          if (actionSelected === 'added') {
+            datas.triggerVar.set({
+              activityType: 'addedLabel',
+              boardId,
+              labelId: '*',
+              desc,
+            });
+          }
+          if (actionSelected === 'removed') {
+            datas.triggerVar.set({
+              activityType: 'removedLabel',
+              boardId,
+              labelId: '*',
+              desc,
+            });
+          }
+        },
+        'click .js-add-spec-label-trigger'(event) {
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const datas = this.data();
+          const actionSelected = this.find('#spec-label-action').value;
+          const labelId = this.find('#spec-label').value;
+          const boardId = Session.get('currentBoard');
+          if (actionSelected === 'added') {
+            datas.triggerVar.set({
+              activityType: 'addedLabel',
+              boardId,
+              labelId,
+              desc,
+            });
+          }
+          if (actionSelected === 'removed') {
+            datas.triggerVar.set({
+              activityType: 'removedLabel',
+              boardId,
+              labelId,
+              desc,
+            });
+          }
+        },
+        'click .js-add-gen-member-trigger'(event) {
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const datas = this.data();
+          const actionSelected = this.find('#gen-member-action').value;
+          const boardId = Session.get('currentBoard');
+          if (actionSelected === 'added') {
+            datas.triggerVar.set({
+              activityType: 'joinMember',
+              boardId,
+              username: '*',
+              desc,
+            });
+          }
+          if (actionSelected === 'removed') {
+            datas.triggerVar.set({
+              activityType: 'unjoinMember',
+              boardId,
+              username: '*',
+              desc,
+            });
+          }
+        },
+        'click .js-add-spec-member-trigger'(event) {
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const datas = this.data();
+          const actionSelected = this.find('#spec-member-action').value;
+          const username = this.find('#spec-member').value;
+          const boardId = Session.get('currentBoard');
+          if (actionSelected === 'added') {
+            datas.triggerVar.set({
+              activityType: 'joinMember',
+              boardId,
+              username,
+              desc,
+            });
+          }
+          if (actionSelected === 'removed') {
+            datas.triggerVar.set({
+              activityType: 'unjoinMember',
+              boardId,
+              username,
+              desc,
+            });
+          }
+        },
+        'click .js-add-attachment-trigger'(event) {
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const datas = this.data();
+          const actionSelected = this.find('#attach-action').value;
+          const boardId = Session.get('currentBoard');
+          if (actionSelected === 'added') {
+            datas.triggerVar.set({
+              activityType: 'addAttachment',
+              boardId,
+              desc,
+            });
+          }
+          if (actionSelected === 'removed') {
+            datas.triggerVar.set({
+              activityType: 'deleteAttachment',
+              boardId,
+              desc,
+            });
+          }
+        },
       },
-      'click .js-add-spec-label-trigger' (event) {
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const datas = this.data();
-        const actionSelected = this.find('#spec-label-action').value;
-        const labelId = this.find('#spec-label').value;
-        const boardId = Session.get('currentBoard');
-        if (actionSelected === 'added') {
-          datas.triggerVar.set({
-            activityType: 'addedLabel',
-            boardId,
-            labelId,
-            desc,
-          });
-        }
-        if (actionSelected === 'removed') {
-          datas.triggerVar.set({
-            activityType: 'removedLabel',
-            boardId,
-            labelId,
-            desc,
-          });
-        }
-      },
-      'click .js-add-gen-member-trigger' (event) {
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const datas = this.data();
-        const actionSelected = this.find('#gen-member-action').value;
-        const boardId = Session.get('currentBoard');
-        if (actionSelected === 'added') {
-          datas.triggerVar.set({
-            activityType: 'joinMember',
-            boardId,
-            'username': '*',
-            desc,
-          });
-        }
-        if (actionSelected === 'removed') {
-          datas.triggerVar.set({
-            activityType: 'unjoinMember',
-            boardId,
-            'username': '*',
-            desc,
-          });
-        }
-      },
-      'click .js-add-spec-member-trigger' (event) {
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const datas = this.data();
-        const actionSelected = this.find('#spec-member-action').value;
-        const username = this.find('#spec-member').value;
-        const boardId = Session.get('currentBoard');
-        if (actionSelected === 'added') {
-          datas.triggerVar.set({
-            activityType: 'joinMember',
-            boardId,
-            username,
-            desc,
-          });
-        }
-        if (actionSelected === 'removed') {
-          datas.triggerVar.set({
-            activityType: 'unjoinMember',
-            boardId,
-            username,
-            desc,
-          });
-        }
-      },
-      'click .js-add-attachment-trigger' (event) {
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const datas = this.data();
-        const actionSelected = this.find('#attach-action').value;
-        const boardId = Session.get('currentBoard');
-        if (actionSelected === 'added') {
-          datas.triggerVar.set({
-            activityType: 'addAttachment',
-            boardId,
-            desc,
-          });
-        }
-        if (actionSelected === 'removed') {
-          datas.triggerVar.set({
-            activityType: 'deleteAttachment',
-            boardId,
-            desc,
-          });
-        }
-      },
-    }];
+    ];
   },
 }).register('cardTriggers');

client/components/rules/triggers/checklistTriggers.js

@@ -3,144 +3,145 @@ BlazeComponent.extendComponent({
     this.subscribe('allRules');
   },
   events() {
-    return [{
-      'click .js-add-gen-check-trigger' (event) {
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const datas = this.data();
-        const actionSelected = this.find('#gen-check-action').value;
-        const boardId = Session.get('currentBoard');
-        if (actionSelected === 'created') {
-          datas.triggerVar.set({
-            activityType: 'addChecklist',
-            boardId,
-            'checklistName': '*',
-            desc,
-          });
-        }
-        if (actionSelected === 'removed') {
-          datas.triggerVar.set({
-            activityType: 'removeChecklist',
-            boardId,
-            'checklistName': '*',
-            desc,
-          });
-        }
-      },
-      'click .js-add-spec-check-trigger' (event) {
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const datas = this.data();
-        const actionSelected = this.find('#spec-check-action').value;
-        const checklistId = this.find('#check-name').value;
-        const boardId = Session.get('currentBoard');
-        if (actionSelected === 'created') {
-          datas.triggerVar.set({
-            activityType: 'addChecklist',
-            boardId,
-            'checklistName': checklistId,
-            desc,
-          });
-        }
-        if (actionSelected === 'removed') {
-          datas.triggerVar.set({
-            activityType: 'removeChecklist',
-            boardId,
-            'checklistName': checklistId,
-            desc,
-          });
-        }
-      },
-      'click .js-add-gen-comp-trigger' (event) {
-        const desc = Utils.getTriggerActionDesc(event, this);
+    return [
+      {
+        'click .js-add-gen-check-trigger'(event) {
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const datas = this.data();
+          const actionSelected = this.find('#gen-check-action').value;
+          const boardId = Session.get('currentBoard');
+          if (actionSelected === 'created') {
+            datas.triggerVar.set({
+              activityType: 'addChecklist',
+              boardId,
+              checklistName: '*',
+              desc,
+            });
+          }
+          if (actionSelected === 'removed') {
+            datas.triggerVar.set({
+              activityType: 'removeChecklist',
+              boardId,
+              checklistName: '*',
+              desc,
+            });
+          }
+        },
+        'click .js-add-spec-check-trigger'(event) {
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const datas = this.data();
+          const actionSelected = this.find('#spec-check-action').value;
+          const checklistId = this.find('#check-name').value;
+          const boardId = Session.get('currentBoard');
+          if (actionSelected === 'created') {
+            datas.triggerVar.set({
+              activityType: 'addChecklist',
+              boardId,
+              checklistName: checklistId,
+              desc,
+            });
+          }
+          if (actionSelected === 'removed') {
+            datas.triggerVar.set({
+              activityType: 'removeChecklist',
+              boardId,
+              checklistName: checklistId,
+              desc,
+            });
+          }
+        },
+        'click .js-add-gen-comp-trigger'(event) {
+          const desc = Utils.getTriggerActionDesc(event, this);
 
-        const datas = this.data();
-        const actionSelected = this.find('#gen-comp-check-action').value;
-        const boardId = Session.get('currentBoard');
-        if (actionSelected === 'completed') {
-          datas.triggerVar.set({
-            activityType: 'completeChecklist',
-            boardId,
-            'checklistName': '*',
-            desc,
-          });
-        }
-        if (actionSelected === 'uncompleted') {
-          datas.triggerVar.set({
-            activityType: 'uncompleteChecklist',
-            boardId,
-            'checklistName': '*',
-            desc,
-          });
-        }
+          const datas = this.data();
+          const actionSelected = this.find('#gen-comp-check-action').value;
+          const boardId = Session.get('currentBoard');
+          if (actionSelected === 'completed') {
+            datas.triggerVar.set({
+              activityType: 'completeChecklist',
+              boardId,
+              checklistName: '*',
+              desc,
+            });
+          }
+          if (actionSelected === 'uncompleted') {
+            datas.triggerVar.set({
+              activityType: 'uncompleteChecklist',
+              boardId,
+              checklistName: '*',
+              desc,
+            });
+          }
+        },
+        'click .js-add-spec-comp-trigger'(event) {
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const datas = this.data();
+          const actionSelected = this.find('#spec-comp-check-action').value;
+          const checklistId = this.find('#spec-comp-check-name').value;
+          const boardId = Session.get('currentBoard');
+          if (actionSelected === 'completed') {
+            datas.triggerVar.set({
+              activityType: 'completeChecklist',
+              boardId,
+              checklistName: checklistId,
+              desc,
+            });
+          }
+          if (actionSelected === 'uncompleted') {
+            datas.triggerVar.set({
+              activityType: 'uncompleteChecklist',
+              boardId,
+              checklistName: checklistId,
+              desc,
+            });
+          }
+        },
+        'click .js-add-gen-check-item-trigger'(event) {
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const datas = this.data();
+          const actionSelected = this.find('#check-item-gen-action').value;
+          const boardId = Session.get('currentBoard');
+          if (actionSelected === 'checked') {
+            datas.triggerVar.set({
+              activityType: 'checkedItem',
+              boardId,
+              checklistItemName: '*',
+              desc,
+            });
+          }
+          if (actionSelected === 'unchecked') {
+            datas.triggerVar.set({
+              activityType: 'uncheckedItem',
+              boardId,
+              checklistItemName: '*',
+              desc,
+            });
+          }
+        },
+        'click .js-add-spec-check-item-trigger'(event) {
+          const desc = Utils.getTriggerActionDesc(event, this);
+          const datas = this.data();
+          const actionSelected = this.find('#check-item-spec-action').value;
+          const checklistItemId = this.find('#check-item-name').value;
+          const boardId = Session.get('currentBoard');
+          if (actionSelected === 'checked') {
+            datas.triggerVar.set({
+              activityType: 'checkedItem',
+              boardId,
+              checklistItemName: checklistItemId,
+              desc,
+            });
+          }
+          if (actionSelected === 'unchecked') {
+            datas.triggerVar.set({
+              activityType: 'uncheckedItem',
+              boardId,
+              checklistItemName: checklistItemId,
+              desc,
+            });
+          }
+        },
       },
-      'click .js-add-spec-comp-trigger' (event) {
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const datas = this.data();
-        const actionSelected = this.find('#spec-comp-check-action').value;
-        const checklistId = this.find('#spec-comp-check-name').value;
-        const boardId = Session.get('currentBoard');
-        if (actionSelected === 'completed') {
-          datas.triggerVar.set({
-            activityType: 'completeChecklist',
-            boardId,
-            'checklistName': checklistId,
-            desc,
-          });
-        }
-        if (actionSelected === 'uncompleted') {
-          datas.triggerVar.set({
-            activityType: 'uncompleteChecklist',
-            boardId,
-            'checklistName': checklistId,
-            desc,
-          });
-        }
-      },
-      'click .js-add-gen-check-item-trigger' (event) {
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const datas = this.data();
-        const actionSelected = this.find('#check-item-gen-action').value;
-        const boardId = Session.get('currentBoard');
-        if (actionSelected === 'checked') {
-          datas.triggerVar.set({
-            activityType: 'checkedItem',
-            boardId,
-            'checklistItemName': '*',
-            desc,
-          });
-        }
-        if (actionSelected === 'unchecked') {
-          datas.triggerVar.set({
-            activityType: 'uncheckedItem',
-            boardId,
-            'checklistItemName': '*',
-            desc,
-          });
-        }
-      },
-      'click .js-add-spec-check-item-trigger' (event) {
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const datas = this.data();
-        const actionSelected = this.find('#check-item-spec-action').value;
-        const checklistItemId = this.find('#check-item-name').value;
-        const boardId = Session.get('currentBoard');
-        if (actionSelected === 'checked') {
-          datas.triggerVar.set({
-            activityType: 'checkedItem',
-            boardId,
-            'checklistItemName': checklistItemId,
-            desc,
-          });
-        }
-        if (actionSelected === 'unchecked') {
-          datas.triggerVar.set({
-            activityType: 'uncheckedItem',
-            boardId,
-            'checklistItemName': checklistItemId,
-            desc,
-          });
-        }
-      },
-    }];
+    ];
   },
-
 }).register('checklistTriggers');

client/components/settings/connectionMethod.js

@@ -6,9 +6,11 @@ Template.connectionMethod.onCreated(function() {
       // TODO : add a management of different languages
       // (ex {value: ldap, text: TAPi18n.__('ldap', {}, T9n.getLanguage() || 'en')})
       this.authenticationMethods.set([
-        {value: 'password'},
+        { value: 'password' },
         // Gets only the authentication methods availables
-        ...Object.entries(result).filter((e) => e[1]).map((e) => ({value: e[0]})),
+        ...Object.entries(result)
+          .filter(e => e[1])
+          .map(e => ({ value: e[0] })),
       ]);
     }
 
@@ -24,7 +26,9 @@ Template.connectionMethod.onCreated(function() {
 
 Template.connectionMethod.onRendered(() => {
   // Moves the select boxe in the first place of the at-pwd-form div
-  $('.at-form-authentication').detach().prependTo('.at-pwd-form');
+  $('.at-form-authentication')
+    .detach()
+    .prependTo('.at-pwd-form');
 });
 
 Template.connectionMethod.helpers({

client/components/settings/informationBody.jade

@@ -4,12 +4,16 @@ template(name='information')
       | {{_ 'error-notAuthorized'}}
     else
       .content-title
-        span {{_ 'info'}}
+        span
+          i.fa.fa-info-circle
+          | {{_ 'info'}}
       .content-body
         .side-menu
           ul
             li.active
-              a.js-setting-menu(data-id="information-display") {{_ 'info'}}
+              a.js-setting-menu(data-id="information-display")
+                i.fa.fa-info-circle
+                | {{_ 'info'}}
         .main-body
           +statistics
 
@@ -19,9 +23,21 @@ template(name='statistics')
         tr
           th Wekan {{_ 'info'}}
           td {{statistics.version}}
+        tr
+          th {{_ 'Meteor_version'}}
+          td {{statistics.meteor.meteorVersion}}
         tr
           th {{_ 'Node_version'}}
           td {{statistics.process.nodeVersion}}
+        tr
+          th {{_ 'MongoDB_version'}}
+          td {{statistics.mongo.mongoVersion}}
+        tr
+          th {{_ 'MongoDB_storage_engine'}}
+          td {{statistics.mongo.mongoStorageEngine}}
+        tr
+          th {{_ 'MongoDB_Oplog_enabled'}}
+          td {{statistics.mongo.mongoOplogEnabled}}
         tr
           th {{_ 'OS_Type'}}
           td {{statistics.os.type}}

client/components/settings/peopleBody.jade

@@ -3,13 +3,24 @@ template(name="people")
     unless currentUser.isAdmin
       | {{_ 'error-notAuthorized'}}
     else
-      .content-title
-        span {{_ 'people'}}
+      .content-title.ext-box
+        .ext-box-left
+          span
+            i.fa.fa-users
+            | {{_ 'people'}}
+          input#searchInput(placeholder="{{_ 'search'}}")
+          button#searchButton
+            i.fa.fa-search
+            | {{_ 'search'}}
+        .ext-box-right
+          span {{_ 'people-number'}} #{peopleNumber}
       .content-body
         .side-menu
           ul
             li.active
-              a.js-setting-menu(data-id="people-setting") {{_ 'people'}}
+              a.js-setting-menu(data-id="people-setting")
+                i.fa.fa-users
+                | {{_ 'people'}}
         .main-body
           if loading.get
             +spinner
@@ -34,28 +45,58 @@ template(name="peopleGeneral")
 
 template(name="peopleRow")
   tr
-    td.username {{ userData.username }}
-    td {{ userData.profile.fullname }}
-    td
-      if userData.isAdmin
-        | {{_ 'yes'}}
-      else
-        | {{_ 'no'}}
-    td {{ userData.emails.[0].address }}
-    td
-      if userData.emails.[0].verified
-        | {{_ 'yes'}}
-      else
-        | {{_ 'no'}}
-    td {{ moment userData.createdAt 'LLL' }}
+    if userData.loginDisabled
+      td.username <s>{{ userData.username }}</s>
+    else
+      td.username {{ userData.username }}
+    if userData.loginDisabled
+      td <s>{{ userData.profile.fullname }}</s>
+    else
+      td {{ userData.profile.fullname }}
+    if userData.loginDisabled
+      td
+        if userData.isAdmin
+          | <s>{{_ 'yes'}}</s>
+        else
+          | <s>{{_ 'no'}}</s>
+    else
+      td
+        if userData.isAdmin
+          | {{_ 'yes'}}
+        else
+          | {{_ 'no'}}
+    if userData.loginDisabled
+      td <s>{{ userData.emails.[0].address }}</s>
+    else
+      td {{ userData.emails.[0].address }}
+    if userData.loginDisabled
+      td
+        if userData.emails.[0].verified
+          | <s>{{_ 'yes'}}</s>
+        else
+          | <s>{{_ 'no'}}</s>
+    else
+      td
+        if userData.emails.[0].verified
+          | {{_ 'yes'}}
+        else
+          | {{_ 'no'}}
+    if userData.loginDisabled
+      td <s>{{ moment userData.createdAt 'LLL' }}</s>
+    else
+      td {{ moment userData.createdAt 'LLL' }}
     td
       if userData.loginDisabled
         | {{_ 'no'}}
       else
         | {{_ 'yes'}}
-    td {{_ userData.authenticationMethod }}
+    if userData.loginDisabled
+      td <s>{{_ userData.authenticationMethod }}</s>
+    else
+      td {{_ userData.authenticationMethod }}
     td
       a.edit-user
+        i.fa.fa-edit
         | {{_ 'edit'}}
 
 template(name="editUserPopup")
@@ -102,5 +143,8 @@ template(name="editUserPopup")
     label
       | {{_ 'password'}}
       input.js-profile-password(type="password")
+    div.buttonsContainer
+      input.primary.wide(type="submit" value="{{_ 'save'}}")
+    //  div
+    //  input#deleteButton.primary.wide(type="button" value="{{_ 'delete'}}")
 
-    input.primary.wide(type="submit" value="{{_ 'save'}}")

client/components/settings/peopleBody.js

@@ -8,6 +8,8 @@ BlazeComponent.extendComponent({
     this.error = new ReactiveVar('');
     this.loading = new ReactiveVar(false);
     this.people = new ReactiveVar(true);
+    this.findUsersOptions = new ReactiveVar({});
+    this.number = new ReactiveVar(0);
 
     this.page = new ReactiveVar(1);
     this.loadNextPageLocked = false;
@@ -15,7 +17,7 @@ BlazeComponent.extendComponent({
     this.autorun(() => {
       const limit = this.page.get() * usersPerPage;
 
-      this.subscribe('people', limit, () => {
+      this.subscribe('people', this.findUsersOptions.get(), limit, () => {
         this.loadNextPageLocked = false;
         const nextPeakBefore = this.callFirstWith(null, 'getNextPeak');
         this.calculateNextPeak();
@@ -26,6 +28,37 @@ BlazeComponent.extendComponent({
       });
     });
   },
+  events() {
+    return [
+      {
+        'click #searchButton'() {
+          this.filterPeople();
+        },
+        'keydown #searchInput'(event) {
+          if (event.keyCode === 13 && !event.shiftKey) {
+            this.filterPeople();
+          }
+        },
+      },
+    ];
+  },
+  filterPeople() {
+    const value = $('#searchInput')
+      .first()
+      .val();
+    if (value === '') {
+      this.findUsersOptions.set({});
+    } else {
+      const regex = new RegExp(value, 'i');
+      this.findUsersOptions.set({
+        $or: [
+          { username: regex },
+          { 'profile.fullname': regex },
+          { 'emails.address': regex },
+        ],
+      });
+    }
+  },
   loadNextPage() {
     if (this.loadNextPageLocked === false) {
       this.page.set(this.page.get() + 1);
@@ -49,9 +82,14 @@ BlazeComponent.extendComponent({
     this.loading.set(w);
   },
   peopleList() {
-    return Users.find({}, {
-      fields: {_id: true},
+    const users = Users.find(this.findUsersOptions.get(), {
+      fields: { _id: true },
     });
+    this.number.set(users.count(false));
+    return users;
+  },
+  peopleNumber() {
+    return this.number.get();
   },
 }).register('people');
 
@@ -64,15 +102,18 @@ Template.peopleRow.helpers({
 
 Template.editUserPopup.onCreated(function() {
   this.authenticationMethods = new ReactiveVar([]);
+  this.errorMessage = new ReactiveVar('');
 
   Meteor.call('getAuthenticationsEnabled', (_, result) => {
     if (result) {
       // TODO : add a management of different languages
       // (ex {value: ldap, text: TAPi18n.__('ldap', {}, T9n.getLanguage() || 'en')})
       this.authenticationMethods.set([
-        {value: 'password'},
+        { value: 'password' },
         // Gets only the authentication methods availables
-        ...Object.entries(result).filter((e) => e[1]).map((e) => ({value: e[0]})),
+        ...Object.entries(result)
+          .filter(e => e[1])
+          .map(e => ({ value: e[0] })),
       ]);
     }
   });
@@ -95,72 +136,85 @@ Template.editUserPopup.helpers({
     const selected = Users.findOne(userId).authenticationMethod;
     return selected === 'ldap';
   },
+  errorMessage() {
+    return Template.instance().errorMessage.get();
+  },
 });
 
 BlazeComponent.extendComponent({
-  onCreated() {
-  },
+  onCreated() {},
   user() {
     return Users.findOne(this.userId);
   },
   events() {
-    return [{
-      'click a.edit-user': Popup.open('editUser'),
-    }];
+    return [
+      {
+        'click a.edit-user': Popup.open('editUser'),
+      },
+    ];
   },
 }).register('peopleRow');
 
 Template.editUserPopup.events({
-  submit(evt, tpl) {
-    evt.preventDefault();
+  submit(event, templateInstance) {
+    event.preventDefault();
     const user = Users.findOne(this.userId);
-    const fullname = tpl.find('.js-profile-fullname').value.trim();
-    const username = tpl.find('.js-profile-username').value.trim();
-    const password = tpl.find('.js-profile-password').value;
-    const isAdmin = tpl.find('.js-profile-isadmin').value.trim();
-    const isActive = tpl.find('.js-profile-isactive').value.trim();
-    const email = tpl.find('.js-profile-email').value.trim();
-    const authentication = tpl.find('.js-authenticationMethod').value.trim();
+    const fullname = templateInstance.find('.js-profile-fullname').value.trim();
+    const username = templateInstance.find('.js-profile-username').value.trim();
+    const password = templateInstance.find('.js-profile-password').value;
+    const isAdmin = templateInstance.find('.js-profile-isadmin').value.trim();
+    const isActive = templateInstance.find('.js-profile-isactive').value.trim();
+    const email = templateInstance.find('.js-profile-email').value.trim();
+    const authentication = templateInstance
+      .find('.js-authenticationMethod')
+      .value.trim();
 
     const isChangePassword = password.length > 0;
     const isChangeUserName = username !== user.username;
-    const isChangeEmail = email.toLowerCase() !== user.emails[0].address.toLowerCase();
+    const isChangeEmail =
+      email.toLowerCase() !== user.emails[0].address.toLowerCase();
 
     Users.update(this.userId, {
       $set: {
         'profile.fullname': fullname,
-        'isAdmin': isAdmin === 'true',
-        'loginDisabled': isActive === 'true',
-        'authenticationMethod': authentication,
+        isAdmin: isAdmin === 'true',
+        loginDisabled: isActive === 'true',
+        authenticationMethod: authentication,
       },
     });
 
-    if(isChangePassword){
+    if (isChangePassword) {
       Meteor.call('setPassword', password, this.userId);
     }
 
     if (isChangeUserName && isChangeEmail) {
-      Meteor.call('setUsernameAndEmail', username, email.toLowerCase(), this.userId, function (error) {
-        const usernameMessageElement = tpl.$('.username-taken');
-        const emailMessageElement = tpl.$('.email-taken');
-        if (error) {
-          const errorElement = error.error;
-          if (errorElement === 'username-already-taken') {
-            usernameMessageElement.show();
-            emailMessageElement.hide();
-          } else if (errorElement === 'email-already-taken') {
+      Meteor.call(
+        'setUsernameAndEmail',
+        username,
+        email.toLowerCase(),
+        this.userId,
+        function(error) {
+          const usernameMessageElement = templateInstance.$('.username-taken');
+          const emailMessageElement = templateInstance.$('.email-taken');
+          if (error) {
+            const errorElement = error.error;
+            if (errorElement === 'username-already-taken') {
+              usernameMessageElement.show();
+              emailMessageElement.hide();
+            } else if (errorElement === 'email-already-taken') {
+              usernameMessageElement.hide();
+              emailMessageElement.show();
+            }
+          } else {
             usernameMessageElement.hide();
-            emailMessageElement.show();
+            emailMessageElement.hide();
+            Popup.close();
           }
-        } else {
-          usernameMessageElement.hide();
-          emailMessageElement.hide();
-          Popup.close();
-        }
-      });
+        },
+      );
     } else if (isChangeUserName) {
-      Meteor.call('setUsername', username, this.userId, function (error) {
-        const usernameMessageElement = tpl.$('.username-taken');
+      Meteor.call('setUsername', username, this.userId, function(error) {
+        const usernameMessageElement = templateInstance.$('.username-taken');
         if (error) {
           const errorElement = error.error;
           if (errorElement === 'username-already-taken') {
@@ -172,8 +226,10 @@ Template.editUserPopup.events({
         }
       });
     } else if (isChangeEmail) {
-      Meteor.call('setEmail', email.toLowerCase(), this.userId, function (error) {
-        const emailMessageElement = tpl.$('.email-taken');
+      Meteor.call('setEmail', email.toLowerCase(), this.userId, function(
+        error,
+      ) {
+        const emailMessageElement = templateInstance.$('.email-taken');
         if (error) {
           const errorElement = error.error;
           if (errorElement === 'email-already-taken') {
@@ -186,4 +242,9 @@ Template.editUserPopup.events({
       });
     } else Popup.close();
   },
+
+  'click #deleteButton': Popup.afterConfirm('userDelete', function() {
+    Users.remove(this.userId);
+    Popup.close();
+  }),
 });

client/components/settings/peopleBody.styl

@@ -13,3 +13,36 @@ table
 
   tr:nth-child(even)
     background-color: #dddddd;
+
+.ext-box
+  display: flex;
+  flex-direction: row;
+  height: 34px;
+
+  .ext-box-left
+    display: flex;
+    width: 40%
+
+  span
+    vertical-align: center;
+    line-height: 34px;
+    margin-right: 10px;
+
+  input, button
+    margin: 0 10px 0 0;
+    padding: 0;
+
+  button
+    min-width: 90px;
+
+.content-wrapper
+  margin-top: 10px
+
+.buttonsContainer
+  display: flex
+
+  input
+    margin: 0
+
+  div
+    margin: auto

client/components/settings/settingBody.jade

@@ -4,20 +4,35 @@ template(name="setting")
       | {{_ 'error-notAuthorized'}}
     else
       .content-title
+        i.fa.fa-cog
         span {{_ 'settings'}}
       .content-body
         .side-menu
           ul
             li.active
-              a.js-setting-menu(data-id="registration-setting") {{_ 'registration'}}
+              a.js-setting-menu(data-id="registration-setting")
+                i.fa.fa-sign-in
+                | {{_ 'registration'}}
             li
-              a.js-setting-menu(data-id="email-setting") {{_ 'email'}}
+              a.js-setting-menu(data-id="email-setting")
+                i.fa.fa-envelope
+                | {{_ 'email'}}
             li
-              a.js-setting-menu(data-id="account-setting") {{_ 'accounts'}}
+              a.js-setting-menu(data-id="account-setting")
+                i.fa.fa-users
+                | {{_ 'accounts'}}
             li
-              a.js-setting-menu(data-id="announcement-setting") {{_ 'admin-announcement'}}
+              a.js-setting-menu(data-id="announcement-setting")
+                i.fa.fa-bullhorn
+                | {{_ 'admin-announcement'}}
             li
-              a.js-setting-menu(data-id="layout-setting") {{_ 'layout'}}
+              a.js-setting-menu(data-id="layout-setting")
+                i.fa.fa-object-group
+                | {{_ 'layout'}}
+            li
+              a.js-setting-menu(data-id="webhook-setting")
+                i.fa.fa-globe
+                | {{_ 'global-webhook'}}
         .main-body
           if loading.get
             +spinner
@@ -31,6 +46,12 @@ template(name="setting")
             +announcementSettings
           else if layoutSetting.get
             +layoutSettings
+          else if webhookSetting.get
+            +webhookSettings
+
+template(name="webhookSettings")
+  span
+     +outgoingWebhooksPopup
 
 template(name="general")
   ul#registration-setting.setting-detail
@@ -44,7 +65,7 @@ template(name="general")
         ul
           li
             .title {{_ 'invite-people'}}
-            textarea#email-to-invite.form-control(rows='5', placeholder="{{_ 'email-addresses'}}")
+            textarea#email-to-invite.wekan-form-control(rows='5', placeholder="{{_ 'email-addresses'}}")
           li
             .title {{_ 'to-boards'}}
             .bg-white
@@ -63,20 +84,20 @@ template(name='email')
       .title {{_ 'smtp-host'}}
       .description {{_ 'smtp-host-description'}}
       .form-group
-        input.form-control#mail-server-host(type="text", placeholder="smtp.domain.com" value="{{currentSetting.mailServer.host}}")
+        input.wekan-form-control#mail-server-host(type="text", placeholder="smtp.domain.com" value="{{currentSetting.mailServer.host}}")
     li.smtp-form
       .title {{_ 'smtp-port'}}
       .description {{_ 'smtp-port-description'}}
       .form-group
-        input.form-control#mail-server-port(type="text", placeholder="25" value="{{currentSetting.mailServer.port}}")
+        input.wekan-form-control#mail-server-port(type="text", placeholder="25" value="{{currentSetting.mailServer.port}}")
     li.smtp-form
       .title {{_ 'smtp-username'}}
       .form-group
-        input.form-control#mail-server-username(type="text", placeholder="{{_ 'username'}}" value="{{currentSetting.mailServer.username}}")
+        input.wekan-form-control#mail-server-username(type="text", placeholder="{{_ 'username'}}" value="{{currentSetting.mailServer.username}}")
     li.smtp-form
       .title {{_ 'smtp-password'}}
       .form-group
-        input.form-control#mail-server-password(type="password", placeholder="{{_ 'password'}}" value="{{currentSetting.mailServer.password}}")
+        input.wekan-form-control#mail-server-password(type="password", placeholder="{{_ 'password'}}" value="{{currentSetting.mailServer.password}}")
     li.smtp-form
       .title {{_ 'smtp-tls'}}
       .form-group
@@ -88,7 +109,7 @@ template(name='email')
     li.smtp-form
       .title {{_ 'send-from'}}
       .form-group
-        input.form-control#mail-server-from(type="email", placeholder="no-reply@domain.com" value="{{currentSetting.mailServer.from}}")
+        input.wekan-form-control#mail-server-from(type="email", placeholder="no-reply@domain.com" value="{{currentSetting.mailServer.from}}")
 
     li
       button.js-save.primary {{_ 'save'}}
@@ -101,17 +122,25 @@ template(name='accountSettings')
     li.accounts-form
       .title {{_ 'accounts-allowEmailChange'}}
       .form-group.flex
-        input.form-control#accounts-allowEmailChange(type="radio" name="allowEmailChange" value="true" checked="{{#if allowEmailChange}}checked{{/if}}")
+        input.wekan-form-control#accounts-allowEmailChange(type="radio" name="allowEmailChange" value="true" checked="{{#if allowEmailChange}}checked{{/if}}")
         span {{_ 'yes'}}
-        input.form-control#accounts-allowEmailChange(type="radio" name="allowEmailChange" value="false" checked="{{#unless allowEmailChange}}checked{{/unless}}")
+        input.wekan-form-control#accounts-allowEmailChange(type="radio" name="allowEmailChange" value="false" checked="{{#unless allowEmailChange}}checked{{/unless}}")
         span {{_ 'no'}}
     li
     li.accounts-form
       .title {{_ 'accounts-allowUserNameChange'}}
       .form-group.flex
-        input.form-control#accounts-allowUserNameChange(type="radio" name="allowUserNameChange" value="true" checked="{{#if allowUserNameChange}}checked{{/if}}")
+        input.wekan-form-control#accounts-allowUserNameChange(type="radio" name="allowUserNameChange" value="true" checked="{{#if allowUserNameChange}}checked{{/if}}")
         span {{_ 'yes'}}
-        input.form-control#accounts-allowUserNameChange(type="radio" name="allowUserNameChange" value="false" checked="{{#unless allowUserNameChange}}checked{{/unless}}")
+        input.wekan-form-control#accounts-allowUserNameChange(type="radio" name="allowUserNameChange" value="false" checked="{{#unless allowUserNameChange}}checked{{/unless}}")
+        span {{_ 'no'}}
+    li
+    li.accounts-form
+      .title {{_ 'accounts-allowUserDelete'}}
+      .form-group.flex
+        input.wekan-form-control#accounts-allowUserDelete(type="radio" name="allowUserDelete" value="true" checked="{{#if allowUserDelete}}checked{{/if}}")
+        span {{_ 'yes'}}
+        input.wekan-form-control#accounts-allowUserDelete(type="radio" name="allowUserDelete" value="false" checked="{{#unless allowUserDelete}}checked{{/unless}}")
         span {{_ 'no'}}
     li
       button.js-accounts-save.primary {{_ 'save'}}
@@ -128,7 +157,7 @@ template(name='announcementSettings')
         ul
           li
             .title {{_ 'admin-announcement-title'}}
-            textarea#admin-announcement.form-control= currentSetting.body
+            textarea#admin-announcement.wekan-form-control= currentSetting.body
           li
             button.js-announcement-save.primary {{_ 'save'}}
 
@@ -137,16 +166,16 @@ template(name='layoutSettings')
     //li.layout-form
       .title {{_ 'hide-logo'}}
       .form-group.flex
-        input.form-control#hide-logo(type="radio" name="hideLogo" value="true" checked="{{#if currentSetting.hideLogo}}checked{{/if}}")
+        input.wekan-form-control#hide-logo(type="radio" name="hideLogo" value="true" checked="{{#if currentSetting.hideLogo}}checked{{/if}}")
         span {{_ 'yes'}}
-        input.form-control#hide-logo(type="radio" name="hideLogo" value="false" checked="{{#unless currentSetting.hideLogo}}checked{{/unless}}")
+        input.wekan-form-control#hide-logo(type="radio" name="hideLogo" value="false" checked="{{#unless currentSetting.hideLogo}}checked{{/unless}}")
         span {{_ 'no'}}
     li.layout-form
       .title {{_ 'display-authentication-method'}}
       .form-group.flex
-        input.form-control#display-authentication-method(type="radio" name="displayAuthenticationMethod" value="true" checked="{{#if currentSetting.displayAuthenticationMethod}}checked{{/if}}")
+        input.wekan-form-control#display-authentication-method(type="radio" name="displayAuthenticationMethod" value="true" checked="{{#if currentSetting.displayAuthenticationMethod}}checked{{/if}}")
         span {{_ 'yes'}}
-        input.form-control#display-authentication-method(type="radio" name="displayAuthenticationMethod" value="false" checked="{{#unless currentSetting.displayAuthenticationMethod}}checked{{/unless}}")
+        input.wekan-form-control#display-authentication-method(type="radio" name="displayAuthenticationMethod" value="false" checked="{{#unless currentSetting.displayAuthenticationMethod}}checked{{/unless}}")
         span {{_ 'no'}}
     li.layout-form
       .title {{_ 'default-authentication-method'}}
@@ -154,13 +183,7 @@ template(name='layoutSettings')
     li.layout-form
       .title {{_ 'custom-product-name'}}
       .form-group
-        input.form-control#product-name(type="text", placeholder="" value="{{currentSetting.productName}}")
-    li.layout-form
-      .title {{_ 'add-custom-html-after-body-start'}}
-      textarea#customHTMLafterBodyStart.form-control= currentSetting.customHTMLafterBodyStart
-    li.layout-form
-      .title {{_ 'add-custom-html-before-body-end'}}
-      textarea#customHTMLbeforeBodyEnd.form-control= currentSetting.customHTMLbeforeBodyEnd
+        input.wekan-form-control#product-name(type="text", placeholder="" value="{{currentSetting.productName}}")
     li
       button.js-save-layout.primary {{_ 'save'}}
 

client/components/settings/settingBody.js

@@ -7,11 +7,13 @@ BlazeComponent.extendComponent({
     this.accountSetting = new ReactiveVar(false);
     this.announcementSetting = new ReactiveVar(false);
     this.layoutSetting = new ReactiveVar(false);
+    this.webhookSetting = new ReactiveVar(false);
 
     Meteor.subscribe('setting');
     Meteor.subscribe('mailServer');
     Meteor.subscribe('accountSettings');
     Meteor.subscribe('announcements');
+    Meteor.subscribe('globalwebhooks');
   },
 
   setError(error) {
@@ -25,7 +27,9 @@ BlazeComponent.extendComponent({
   checkField(selector) {
     const value = $(selector).val();
     if (!value || value.trim() === '') {
-      $(selector).parents('li.smtp-form').addClass('has-error');
+      $(selector)
+        .parents('li.smtp-form')
+        .addClass('has-error');
       throw Error('blank field');
     } else {
       return value;
@@ -37,18 +41,23 @@ BlazeComponent.extendComponent({
   },
 
   boards() {
-    return Boards.find({
-      archived: false,
-      'members.userId': Meteor.userId(),
-      'members.isAdmin': true,
-    }, {
-      sort: ['title'],
-    });
+    return Boards.find(
+      {
+        archived: false,
+        'members.userId': Meteor.userId(),
+        'members.isAdmin': true,
+      },
+      {
+        sort: ['title'],
+      },
+    );
   },
   toggleRegistration() {
     this.setLoading(true);
     const registrationClosed = this.currentSetting().disableRegistration;
-    Settings.update(Settings.findOne()._id, {$set: {disableRegistration: !registrationClosed}});
+    Settings.update(Settings.findOne()._id, {
+      $set: { disableRegistration: !registrationClosed },
+    });
     this.setLoading(false);
     if (registrationClosed) {
       $('.invite-people').slideUp();
@@ -76,6 +85,7 @@ BlazeComponent.extendComponent({
       this.accountSetting.set('account-setting' === targetID);
       this.announcementSetting.set('announcement-setting' === targetID);
       this.layoutSetting.set('layout-setting' === targetID);
+      this.webhookSetting.set('webhook-setting' === targetID);
     }
   },
 
@@ -90,13 +100,19 @@ BlazeComponent.extendComponent({
   },
 
   inviteThroughEmail() {
-    const emails = $('#email-to-invite').val().toLowerCase().trim().split('\n').join(',').split(',');
+    const emails = $('#email-to-invite')
+      .val()
+      .toLowerCase()
+      .trim()
+      .split('\n')
+      .join(',')
+      .split(',');
     const boardsToInvite = [];
-    $('.js-toggle-board-choose .materialCheckBox.is-checked').each(function () {
+    $('.js-toggle-board-choose .materialCheckBox.is-checked').each(function() {
       boardsToInvite.push($(this).data('id'));
     });
     const validEmails = [];
-    emails.forEach((email) => {
+    emails.forEach(email => {
       if (email && SimpleSchema.RegEx.Email.test(email.trim())) {
         validEmails.push(email.trim());
       }
@@ -119,14 +135,22 @@ BlazeComponent.extendComponent({
     try {
       const host = this.checkField('#mail-server-host');
       const port = this.checkField('#mail-server-port');
-      const username = $('#mail-server-username').val().trim();
-      const password = $('#mail-server-password').val().trim();
+      const username = $('#mail-server-username')
+        .val()
+        .trim();
+      const password = $('#mail-server-password')
+        .val()
+        .trim();
       const from = this.checkField('#mail-server-from');
       const tls = $('#mail-server-tls.is-checked').length > 0;
       Settings.update(Settings.findOne()._id, {
         $set: {
-          'mailServer.host': host, 'mailServer.port': port, 'mailServer.username': username,
-          'mailServer.password': password, 'mailServer.enableTLS': tls, 'mailServer.from': from,
+          'mailServer.host': host,
+          'mailServer.port': port,
+          'mailServer.username': username,
+          'mailServer.password': password,
+          'mailServer.enableTLS': tls,
+          'mailServer.from': from,
         },
       });
     } catch (e) {
@@ -134,27 +158,25 @@ BlazeComponent.extendComponent({
     } finally {
       this.setLoading(false);
     }
-
   },
 
   saveLayout() {
     this.setLoading(true);
     $('li').removeClass('has-error');
 
-    const productName = $('#product-name').val().trim();
-    const hideLogoChange = ($('input[name=hideLogo]:checked').val() === 'true');
-    const displayAuthenticationMethod = ($('input[name=displayAuthenticationMethod]:checked').val() === 'true');
+    const productName = $('#product-name')
+      .val()
+      .trim();
+    const hideLogoChange = $('input[name=hideLogo]:checked').val() === 'true';
+    const displayAuthenticationMethod =
+      $('input[name=displayAuthenticationMethod]:checked').val() === 'true';
     const defaultAuthenticationMethod = $('#defaultAuthenticationMethod').val();
-    const customHTMLafterBodyStart = $('#customHTMLafterBodyStart').val().trim();
-    const customHTMLbeforeBodyEnd = $('#customHTMLbeforeBodyEnd').val().trim();
 
     try {
       Settings.update(Settings.findOne()._id, {
         $set: {
           productName,
           hideLogo: hideLogoChange,
-          customHTMLafterBodyStart,
-          customHTMLbeforeBodyEnd,
           displayAuthenticationMethod,
           defaultAuthenticationMethod,
         },
@@ -166,7 +188,6 @@ BlazeComponent.extendComponent({
     }
 
     DocHead.setTitle(productName);
-
   },
 
   sendSMTPTestEmail() {
@@ -183,31 +204,40 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'click a.js-toggle-registration': this.toggleRegistration,
-      'click a.js-toggle-tls': this.toggleTLS,
-      'click a.js-setting-menu': this.switchMenu,
-      'click a.js-toggle-board-choose': this.checkBoard,
-      'click button.js-email-invite': this.inviteThroughEmail,
-      'click button.js-save': this.saveMailServerInfo,
-      'click button.js-send-smtp-test-email': this.sendSMTPTestEmail,
-      'click a.js-toggle-hide-logo': this.toggleHideLogo,
-      'click button.js-save-layout': this.saveLayout,
-      'click a.js-toggle-display-authentication-method': this.toggleDisplayAuthenticationMethod,
-    }];
+    return [
+      {
+        'click a.js-toggle-registration': this.toggleRegistration,
+        'click a.js-toggle-tls': this.toggleTLS,
+        'click a.js-setting-menu': this.switchMenu,
+        'click a.js-toggle-board-choose': this.checkBoard,
+        'click button.js-email-invite': this.inviteThroughEmail,
+        'click button.js-save': this.saveMailServerInfo,
+        'click button.js-send-smtp-test-email': this.sendSMTPTestEmail,
+        'click a.js-toggle-hide-logo': this.toggleHideLogo,
+        'click button.js-save-layout': this.saveLayout,
+        'click a.js-toggle-display-authentication-method': this
+          .toggleDisplayAuthenticationMethod,
+      },
+    ];
   },
 }).register('setting');
 
 BlazeComponent.extendComponent({
-
   saveAccountsChange() {
-    const allowEmailChange = ($('input[name=allowEmailChange]:checked').val() === 'true');
-    const allowUserNameChange = ($('input[name=allowUserNameChange]:checked').val() === 'true');
+    const allowEmailChange =
+      $('input[name=allowEmailChange]:checked').val() === 'true';
+    const allowUserNameChange =
+      $('input[name=allowUserNameChange]:checked').val() === 'true';
+    const allowUserDelete =
+      $('input[name=allowUserDelete]:checked').val() === 'true';
     AccountSettings.update('accounts-allowEmailChange', {
-      $set: {'booleanValue': allowEmailChange},
+      $set: { booleanValue: allowEmailChange },
     });
     AccountSettings.update('accounts-allowUserNameChange', {
-      $set: {'booleanValue': allowUserNameChange},
+      $set: { booleanValue: allowUserNameChange },
+    });
+    AccountSettings.update('accounts-allowUserDelete', {
+      $set: { booleanValue: allowUserDelete },
     });
   },
 
@@ -217,11 +247,16 @@ BlazeComponent.extendComponent({
   allowUserNameChange() {
     return AccountSettings.findOne('accounts-allowUserNameChange').booleanValue;
   },
+  allowUserDelete() {
+    return AccountSettings.findOne('accounts-allowUserDelete').booleanValue;
+  },
 
   events() {
-    return [{
-      'click button.js-accounts-save': this.saveAccountsChange,
-    }];
+    return [
+      {
+        'click button.js-accounts-save': this.saveAccountsChange,
+      },
+    ];
   },
 }).register('accountSettings');
 
@@ -239,9 +274,11 @@ BlazeComponent.extendComponent({
   },
 
   saveMessage() {
-    const message = $('#admin-announcement').val().trim();
+    const message = $('#admin-announcement')
+      .val()
+      .trim();
     Announcements.update(Announcements.findOne()._id, {
-      $set: {'body': message},
+      $set: { body: message },
     });
   },
 
@@ -249,7 +286,7 @@ BlazeComponent.extendComponent({
     this.setLoading(true);
     const isActive = this.currentSetting().enabled;
     Announcements.update(Announcements.findOne()._id, {
-      $set: {'enabled': !isActive},
+      $set: { enabled: !isActive },
     });
     this.setLoading(false);
     if (isActive) {
@@ -260,14 +297,15 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      'click a.js-toggle-activemessage': this.toggleActive,
-      'click button.js-announcement-save': this.saveMessage,
-    }];
+    return [
+      {
+        'click a.js-toggle-activemessage': this.toggleActive,
+        'click button.js-announcement-save': this.saveMessage,
+      },
+    ];
   },
 }).register('announcementSettings');
 
-
 Template.selectAuthenticationMethod.onCreated(function() {
   this.authenticationMethods = new ReactiveVar([]);
 
@@ -276,9 +314,11 @@ Template.selectAuthenticationMethod.onCreated(function() {
       // TODO : add a management of different languages
       // (ex {value: ldap, text: TAPi18n.__('ldap', {}, T9n.getLanguage() || 'en')})
       this.authenticationMethods.set([
-        {value: 'password'},
+        { value: 'password' },
         // Gets only the authentication methods availables
-        ...Object.entries(result).filter((e) => e[1]).map((e) => ({value: e[0]})),
+        ...Object.entries(result)
+          .filter(e => e[1])
+          .map(e => ({ value: e[0] })),
       ]);
     }
   });

client/components/settings/settingBody.styl

@@ -41,21 +41,24 @@
           &:hover
             background #fff
             box-shadow 0 1px 2px rgba(0,0,0,0.15);
+
           a
             @extends .flex
             padding: 1rem 0 1rem 1rem
             width: 100% - 5rem
 
-
             span
               font-size: 13px
 
+            i
+              margin-right: 20px
+
     .main-body
       padding: 0.1em 1em
-      -webkit-user-select: auto // Safari 3.1+
-      -moz-user-select: auto // Firefox 2+
-      -ms-user-select: auto // IE 10+
-      user-select: auto // Standard syntax
+      -webkit-user-select: text // Safari 3.1+
+      -moz-user-select: text // Firefox 2+
+      -ms-user-select: text // IE 10+
+      user-select: text // Standard syntax
 
       ul
         li
@@ -105,14 +108,14 @@
 .bg-white
   background #f9fbfc;
 
-.form-control.has-error
+.wekan-form-control.has-error
   border-color: #a94442;
   box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
 
 li.has-error
   color #a94442
   .form-group
-    .form-control
+    .wekan-form-control
       border-color: #a94442;
       box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
 

client/components/sidebar/sidebar.jade

@@ -10,8 +10,8 @@ template(name="sidebar")
           i.fa.fa-keyboard-o
           span {{_ 'keyboard-shortcuts' }}
       .sidebar-content.js-board-sidebar-content.js-perfect-scrollbar
-        a.hide-btn.js-hide-sidebar
-          i.fa.fa-navicon
+        //a.hide-btn.js-hide-sidebar
+        //  i.fa.fa-navicon
         unless isDefaultView
           h2
             a.fa.fa-chevron-left.js-back-home
@@ -22,6 +22,11 @@ template(name='homeSidebar')
   +membersWidget
   hr
   +labelsWidget
+  ul#cards.label-text-hidden
+    a.flex.js-toggle-minicard-label-text
+      span {{_ 'hide-minicard-label-text'}}
+      b  
+      .materialCheckBox(class="{{#if hiddenMinicardLabelText}}is-checked{{/if}}")
   hr
   unless currentUser.isNoComments
     h3
@@ -32,10 +37,12 @@ template(name='homeSidebar')
 template(name="membersWidget")
   .board-widget.board-widget-members
     h3
-      i.fa.fa-user
+      i.fa.fa-users
       | {{_ 'members'}}
-      a.board-header-btn.js-open-board-menu(title="{{_ 'boardMenuPopup-title'}}").right
-        i.board-header-btn-icon.fa.fa-cog
+      unless currentUser.isCommentOnly
+        unless currentUser.isWorker
+          a.board-header-btn.js-open-board-menu(title="{{_ 'boardMenuPopup-title'}}").right
+            i.board-header-btn-icon.fa.fa-cog
 
     .board-widget-content
       each currentBoard.activeMembers
@@ -61,6 +68,7 @@ template(name="boardChangeColorPopup")
     each backgroundColors
       .board-background-select.js-select-background
         span.background-box(class="board-color-{{this}}")
+          span {{this}}
           if isSelected
             i.fa.fa-check
 
@@ -123,62 +131,113 @@ template(name="chooseBoardSource")
 
 template(name="archiveBoardPopup")
   p {{_ 'close-board-pop'}}
-  button.js-confirm.negate.full(type="submit") {{_ 'archive'}}
+  button.js-confirm.negate.full(type="submit")
+    i.fa.fa-archive
+    | {{_ 'archive'}}
 
 template(name="outgoingWebhooksPopup")
   each integrations
     form.integration-form
-      if title
-        h4 {{title}}
-      else
-        h4 {{_ 'no-name'}}
-      label
-        | URL
-        input.js-outgoing-webhooks-url(type="text" name="url" value=url)
-        input(type="hidden" value=_id name="id")
+      a.flex
+        span {{_ 'disable-webhook'}}
+        b  
+        .materialCheckBox(class="{{#unless enabled}}is-checked{{/unless}}")
+      input.js-outgoing-webhooks-title(placeholder="{{_ 'webhook-title'}}" type="text" name="title" value=title)
+      input.js-outgoing-webhooks-url(type="text" name="url" value=url autofocus)
+      input.js-outgoing-webhooks-token(placeholder="{{_ 'webhook-token' }}" type="text" value=token name="token")
+      select.js-outgoing-webhooks-type(name="type")
+          each _type in types
+              if($eq _type this.type)
+                  option(value=_type selected="selected") {{_ _type}}
+              else
+                  option(value=_type) {{_ _type}}
+      input(type="hidden" value=this.type name="_type")
+      input(type="hidden" value=_id name="id")
       input.primary.wide(type="submit" value="{{_ 'save'}}")
   form.integration-form
-    h4
-      | {{_ 'new-outgoing-webhook'}}
-    label
-      | URL
-      input.js-outgoing-webhooks-url(type="text" name="url" autofocus)
-    input.primary.wide(type="submit" value="{{_ 'save'}}")
+    input.js-outgoing-webhooks-title(placeholder="{{_ 'webhook-title'}}" type="text" name="title" autofocus)
+    input.js-outgoing-webhooks-url(placeholder="{{_ 'URL' }}" type="text" name="url")
+    input.js-outgoing-webhooks-token(placeholder="{{_ 'webhook-token' }}" type="text" name="token")
+    select.js-outgoing-webhooks-type(name="type")
+        each _type in types
+            option(value=_type) {{_ _type}}
+    input.primary.wide(type="submit" value="{{_ 'create'}}")
 
 template(name="boardMenuPopup")
   ul.pop-over-list
     li: a.js-custom-fields {{_ 'custom-fields'}}
-    li: a.js-open-archives {{_ 'archived-items'}}
+    li
+      a.js-open-archives
+        i.fa.fa-archive
+        | {{_ 'archived-items'}}
     if currentUser.isBoardAdmin
-      li: a.js-change-board-color {{_ 'board-change-color'}}
+      li
+        a.js-change-board-color
+          i.fa.fa-paint-brush
+          | {{_ 'board-change-color'}}
+
     //-
       XXX Language should be handled by sandstorm, but for now display a
       language selection link in the board menu. This link is normally present
       in the header bar that is not displayed on sandstorm.
     if isSandstorm
-      li: a.js-change-language {{_ 'language'}}
+      li
+        a.js-change-language
+          i.fa.fa-flag
+          | {{_ 'language'}}
   unless isSandstorm
     if currentUser.isBoardAdmin
       hr
       ul.pop-over-list
-        li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}}
-        unless currentBoard.isTemplatesBoard
-          li: a.js-archive-board {{_ 'archive-board'}}
-        li: a.js-outgoing-webhooks {{_ 'outgoing-webhooks'}}
-      hr
-      ul.pop-over-list
-        li: a.js-subtask-settings {{_ 'subtask-settings'}}
+        li
+          a(href="{{exportUrl}}", download="{{exportFilename}}")
+            i.fa.fa-share-alt
+            | {{_ 'export-board'}}
+        li
+          a.js-outgoing-webhooks
+            i.fa.fa-globe
+            | {{_ 'outgoing-webhooks'}}
+        li
+          a.js-subtask-settings
+            i.fa.fa-sitemap
+            | {{_ 'subtask-settings'}}
+      unless currentBoard.isTemplatesBoard
+        hr
+        ul.pop-over-list
+          li
+            a.js-archive-board
+              i.fa.fa-arrow-right
+              i.fa.fa-archive
+              | {{_ 'archive-board'}}
 
   if isSandstorm
     hr
     ul.pop-over-list
-      li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}}
-      li: a.js-import-board {{_ 'import-board-c'}}
-      li: a.js-archive-board {{_ 'archive-board'}}
-      li: a.js-outgoing-webhooks {{_ 'outgoing-webhooks'}}
+      li
+        a(href="{{exportUrl}}", download="{{exportFilename}}")
+          i.fa.fa-share-alt
+          i.fa.fa-sign-out
+          | {{_ 'export-board'}}
+      li
+        a.js-import-board
+          i.fa.fa-share-alt
+          i.fa.fa-sign-in
+          | {{_ 'import-board-c'}}
+      li
+        a.js-archive-board
+          i.fa.fa-arrow-right
+          i.fa.fa-archive
+          | {{_ 'archive-board'}}
+      li
+        a.js-outgoing-webhooks
+          i.fa.fa-globe
+          | {{_ 'outgoing-webhooks'}}
     hr
     ul.pop-over-list
-      li: a.js-subtask-settings {{_ 'subtask-settings'}}
+      li
+        a.js-subtask-settings
+          i.fa.fa-sitemap
+          | {{_ 'subtask-settings'}}
 
 template(name="labelsWidget")
   .board-widget.board-widget-labels
@@ -188,8 +247,10 @@ template(name="labelsWidget")
     .board-widget-content
       each currentBoard.labels
           a.card-label(class="card-label-{{color}}"
-            class="{{#if currentUser.isNotCommentOnly}}js-label{{/if}}")
-            span.card-label-name= name
+            class="{{#if currentUser.isNotCommentOnly}}{{#if currentUser.isNotWorker}}js-label{{/if}}{{/if}}")
+            span.card-label-name
+              +viewer
+                = name
       if currentUser.isBoardAdmin
         a.card-label.add-label.js-add-label
           i.fa.fa-plus
@@ -215,12 +276,12 @@ template(name="memberPopup")
           a.js-change-role
             | {{_ 'change-permissions'}}
             span.quiet (#{memberType})
-      li
-        if $eq currentUser._id userId
-          a.js-leave-member {{_ 'leave-board'}}
-        else if currentUser.isBoardAdmin
-          a.js-remove-member {{_ 'remove-from-board'}}
-
+      unless currentUser.isWorker
+        li
+          if $eq currentUser._id userId
+            a.js-leave-member {{_ 'leave-board'}}
+          else if currentUser.isBoardAdmin
+            a.js-remove-member {{_ 'remove-from-board'}}
 
 template(name="removeMemberPopup")
   p {{_ 'remove-member-pop' name=user.profile.fullname username=user.username boardTitle=board.title}}
@@ -284,6 +345,12 @@ template(name="changePermissionsPopup")
         if isCommentOnly
           i.fa.fa-check
         span.sub-name {{_ 'comment-only-desc'}}
+    li
+      a(class="{{#if isLastAdmin}}disabled{{else}}js-set-worker{{/if}}")
+        | {{_ 'worker'}}
+        if isWorker
+          i.fa.fa-check
+        span.sub-name {{_ 'worker-desc'}}
   if isLastAdmin
     hr
     p.quiet.bottom {{_ 'last-admin-desc'}}