v2.97

- Add new background colors: moderatepink, strongcyan, limegreen.
- Add new background colors with themes: dark, relax.
- Note: due date etc on cards is visible on all themes. Hiding is not implemented yet.

Thanks to xet7 !

.babelrc

@@ -1,5 +0,0 @@
-{ 
-  "presets": [ 
-    "@babel/preset-stage-3" 
-  ]
-}

.devcontainer/Dockerfile

@@ -1,162 +0,0 @@
-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

@@ -1,12 +0,0 @@
-#!/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

@@ -1,17 +0,0 @@
-// 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

@@ -1,50 +0,0 @@
-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,20 +8,3 @@ 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

@@ -1,2 +0,0 @@
-packages/*
-.snap-meteor-1.8/*

.eslintrc.json

@@ -1,20 +1,16 @@
 {
-  "extends": [
-    "eslint:recommended",
-    "plugin:meteor/recommended",
-    "prettier",
-    "prettier/standard"
-  ],
+  "extends": "eslint:recommended",
   "env": {
     "es6": true,
     "node": true,
-    "browser": true,
-    "meteor": true
+    "browser": true
   },
-  "parser": "babel-eslint",
   "parserOptions": {
-    "ecmaVersion": 2018,
-    "sourceType": "module"
+    "ecmaVersion": 2017,
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true
+    }
   },
   "rules": {
     "strict": 0,
@@ -24,7 +20,7 @@
     "consistent-return": 2,
     "dot-notation": 2,
     "eqeqeq": 2,
-    "indent": 0,
+    "indent": [2, 2],
     "no-cond-assign": 2,
     "no-constant-condition": 2,
     "no-eval": 2,
@@ -32,12 +28,11 @@
     "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,
@@ -48,6 +43,7 @@
     "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,
@@ -56,27 +52,8 @@
     "prefer-const": 2,
     "prefer-spread": 2,
     "prefer-template": 2,
-    "no-unused-vars": "warn",
-    "prettier/prettier": [
-      "error",
-      {
-        "printWidth": 80,
-        "tabWidth": 2,
-        "useTabs": false,
-        "singleQuote": true,
-        "trailingComma": "all"
-      }
-    ],
-    "meteor/no-session": 0
+    "no-unused-vars" : "warn"
   },
-  "settings": {
-    "import/resolver": {
-      "meteor": {
-        "extensions": [".js", ".jsx"]
-      }
-    }
-  },
-  "plugins": ["prettier", "meteor"],
   "globals": {
     "Meteor": false,
     "Session": false,
@@ -123,7 +100,7 @@
     "Attachments": true,
     "Boards": true,
     "CardComments": true,
-    "DatePicker": true,
+    "DatePicker" : true,
     "Cards": true,
     "CustomFields": true,
     "Lists": true,
@@ -146,7 +123,6 @@
     "allowIsBoardMemberByCard": true,
     "allowIsBoardMemberCommentOnly": true,
     "allowIsBoardMemberNoComments": true,
-    "allowIsBoardMemberWorker": true,
     "Emoji": true,
     "Checklists": true,
     "Settings": true,

.future-snap/broken-snapcraft.yaml

@@ -1,257 +0,0 @@
-name: wekan
-version: 0
-version-script: git describe --tags |  cut -c 2-
-summary: The open-source kanban
-description: |
-   Wekan is an open-source and collaborative kanban board application.
-
-   Whether you’re maintaining a personal todo list, planning your holidays with some friends, or working in a team on your next revolutionary idea, Kanban boards are an unbeatable tool to keep your things organized. They give you a visual overview of the current state of your project, and make you productive by allowing you to focus on the few items that matter the most.
-   Depending on target environment, some configuration settings might need to be adjusted.
-   For full list of configuration options call:
-   $ wekan.help
-
-confinement: strict
-grade: stable
-
-architectures:
-  - amd64
-
-plugs:
-  mongodb-plug:
-    interface: content
-    target: $SNAP_DATA/shared
-
-hooks:
-  configure:
-    plugs:
-      - network
-      - network-bind
-
-slots:
-  mongodb-slot:
-    interface: content
-    write:
-      - $SNAP_DATA/share
-
-apps:
-    wekan:
-        command: wekan-control
-        daemon: simple
-        plugs: [network, network-bind]
-
-    mongodb:
-        command: mongodb-control
-        daemon: simple
-        plugs: [network, network-bind]
-
-    caddy:
-        command: caddy-control
-        daemon: simple
-        plugs: [network, network-bind]
-
-    help:
-        command: wekan-help
-
-    database-backup:
-        command: mongodb-backup
-        plugs: [network, network-bind]
-
-    database-list-backups:
-        command: ls -al $SNAP_COMMON/db-backups/
-
-    database-restore:
-        command: mongodb-restore
-        plugs: [network, network-bind]
-
-parts:
-    mongodb:
-        source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-4.2.6.tgz
-        plugin: dump
-        stage-packages: [libssl1.0.0, libcurl3]
-        filesets:
-            mongo:
-                - usr
-                - bin
-                - lib
-        stage:
-            - $mongo
-        prime:
-            - $mongo
-
-    wekan:
-        source: .
-        plugin: nodejs
-        node-engine: 12.16.2
-        node-packages:
-            - node-gyp
-            - node-pre-gyp
-            - fibers
-        build-packages:
-            - ca-certificates
-            - apt-utils
-            - python
-            - python3
-            - g++
-            - capnproto
-            - curl
-            - libcurl3
-            - execstack
-            - nodejs
-            - npm
-        stage-packages:
-            - libfontconfig1
-        override-build: |
-            echo "Cleaning environment first"
-            rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules
-            # Create the OpenAPI specification
-            rm -rf .build
-            ## Use Meteor 1.8.x on Snap
-            #rm -rf .meteor
-            #mv .snap-meteor-1.8/.meteor .
-            #mv .snap-meteor-1.8/package.json .
-            #mv .snap-meteor-1.8/package-lock.json .
-            ## Meteor 1.9.x has changes to Buffer() => Buffer.alloc(), so reverting those
-            #mv .snap-meteor-1.8/cfs_access-point.txt fix-download-unicode/
-            #mv .snap-meteor-1.8/export.js models/
-            #mv .snap-meteor-1.8/wekanCreator.js models/
-            #mv .snap-meteor-1.8/ldap.js packages/wekan-ldap/server/ldap.js
-            #mv .snap-meteor-1.8/oidc_server.js packages/wekan-oidc/oidc_server.js
-            rm -rf .snap-meteor-1.8
-            #mkdir -p .build/python
-            #cd .build/python
-            #git clone --depth 1 -b master https://github.com/Kronuz/esprima-python
-            #cd esprima-python
-            #python3 setup.py install
-            #cd ../../..
-            #mkdir -p ./public/api
-            #python3 ./openapi/generate_openapi.py --release $(git describe --tags --abbrev=0) > ./public/api/wekan.yml
-            # we temporary need api2html and mkdirp
-            #npm install -g api2html@0.3.0
-            #npm install -g mkdirp
-            #api2html -c ./public/logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml
-            #npm uninstall -g mkdirp
-            #npm uninstall -g api2html
-            # Node Fibers 100% CPU usage issue:
-            # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161
-            # https://github.com/meteor/meteor/issues/9796#issuecomment-381676326
-            # https://github.com/sandstorm-io/sandstorm/blob/0f1fec013fe7208ed0fd97eb88b31b77e3c61f42/shell/server/00-startup.js#L99-L129
-            # Also see beginning of wekan/server/authentication.js
-            #   import Fiber from "fibers";
-            #   Fiber.poolSize = 1e9;
-            # OLD: Download node version 8.12.0 prerelease build => Official node 8.12.0 has been released
-            # Description at https://releases.wekan.team/node.txt
-            ##echo "375bd8db50b9c692c0bbba6e96d4114cd29bee3770f901c1ff2249d1038f1348  node" >> node-SHASUMS256.txt.asc
-            ##curl https://releases.wekan.team/node -o node
-            # Verify Fibers patched node authenticity
-            ##echo "Fibers 100% CPU issue patched node authenticity:"
-            ##grep node node-SHASUMS256.txt.asc | shasum -a 256 -c -
-            ##rm -f node-SHASUMS256.txt.asc
-            ##chmod +x node
-            ##mv node `which node`
-            # DOES NOT WORK: paxctl fix.
-            # Removed from build-packages: - paxctl
-            #echo "Applying paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303"
-            #paxctl -mC `which node`
-            #echo "Installing npm"
-            #curl -L https://www.npmjs.com/install.sh | sh
-            echo "Installing meteor"
-            curl https://install.meteor.com/ -o install_meteor.sh
-            #sed -i "s|RELEASE=.*|RELEASE=\"1.8.1-beta.0\"|g" install_meteor.sh
-            chmod +x install_meteor.sh
-            sh install_meteor.sh
-            rm install_meteor.sh
-            # REPOS BELOW ARE INCLUDED TO WEKAN REPO
-            #if [ ! -d "packages" ]; then
-            #  mkdir packages
-            #fi
-            #if [ ! -d "packages/kadira-flow-router" ]; then
-            #  cd packages
-            #  git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
-            #  cd ..
-            #fi
-            #if [ ! -d "packages/meteor-useraccounts-core" ]; then
-            #  cd packages
-            #  git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
-            #  sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' meteor-useraccounts-core/package.js
-            #  cd ..
-            #fi
-            #if [ ! -d "packages/meteor-accounts-cas" ]; then
-            #  cd packages
-            #  git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git meteor-accounts-cas
-            #  cd ..
-            #fi
-            #if [ ! -d "packages/wekan-ldap" ]; then
-            #  cd packages
-            #  git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
-            #  cd ..
-            #fi
-            #if [ ! -d "packages/wekan-scrollbar" ]; then
-            #  cd packages
-            #  git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
-            #  cd ..
-            #fi
-            #if [ ! -d "packages/wekan_accounts-oidc" ]; then
-            #  cd packages
-            #  git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git
-            #  mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan-accounts-oidc
-            #  mv meteor-accounts-oidc/packages/switch_oidc wekan-oidc
-            #  rm -rf meteor-accounts-oidc
-            #  cd ..
-            #fi
-            #if [ ! -d "packages/markdown" ]; then
-            #  cd packages
-            #  git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git
-            #  cd ..
-            #fi
-            rm -rf .build
-            meteor add standard-minifier-js --allow-superuser
-            meteor npm install --allow-superuser
-            meteor npm install --allow-superuser --save babel-runtime
-            meteor build .build --directory --allow-superuser
-            cp -f fix-download-unicode/cfs_access-point.txt .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 .build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt
-            #rm -rf node_modules/bcrypt
-            #meteor npm install --save bcrypt
-            # Change from npm-bcrypt directory back to .build/bundle/programs/server directory.
-            #cd ../../../../
-            # Change to directory .build/bundle/programs/server
-            cd .build/bundle/programs/server
-            npm install
-            npm install --allow-superuser --save babel-runtime
-            #meteor npm install --save bcrypt
-            # Change back to Wekan source directory
-            cd ../../../..
-            cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/
-            cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/
-            rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan
-            rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
-            rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/tar/lib/.mkdir.js.swp
-            rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp
-            rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-gyp/node_modules/tar/lib/.mkdir.js.swp
-            # Meteor 1.8.x additional .swp remove
-            rm -f $SNAPCRAFT_PART_INSTALL/programs/server/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp
-
-        organize:
-            README: README.wekan
-        prime:
-            - -lib/node_modules/node-pre-gyp/node_modules/tar/lib/.unpack.js.swp
-
-    helpers:
-        source: snap-src
-        plugin: dump
-
-    caddy:
-        plugin: dump
-        source: https://caddyserver.com/download/linux/amd64?license=personal&telemetry=off
-        source-type: tar
-        organize:
-          caddy: bin/caddy
-          CHANGES.txt: CADDY_CHANGES.txt
-          EULA.txt: CADDY_EULA.txt
-          LICENSES.txt: CADDY_LICENSES.txt
-          README.txt: CADDY_README.txt
-        stage:
-          - -init

.future-snap/snapcraft.yaml

@@ -1,155 +0,0 @@
-name: wekan
-version: git
-summary: The open-source kanban
-description: |
-   Wekan is an open-source and collaborative kanban board application.
-
-   Whether you’re maintaining a personal todo list, planning your holidays with some friends, or working in a team on your next revolutionary idea, Kanban boards are an unbeatable tool to keep your things organized. They give you a visual overview of the current state of your project, and make you productive by allowing you to focus on the few items that matter the most.
-   Depending on target environment, some configuration settings might need to be adjusted.
-   For full list of configuration options call:
-   $ wekan.help
-
-confinement: strict
-grade: stable
-base: core18
-
-architectures:
-  - amd64
-
-plugs:
-  mongodb-plug:
-    interface: content
-    target: $SNAP_DATA/shared
-
-hooks:
-  configure:
-    plugs:
-      - network
-      - network-bind
-
-slots:
-  mongodb-slot:
-    interface: content
-    write:
-      - $SNAP_DATA/share
-
-apps:
-    wekan:
-        command: wekan-control
-        daemon: simple
-        plugs: [network, network-bind]
-
-    mongodb:
-        command: mongodb-control
-        daemon: simple
-        plugs: [network, network-bind]
-
-    caddy:
-        command: caddy-control
-        daemon: simple
-        plugs: [network, network-bind]
-
-    help:
-        command: wekan-help
-
-    database-backup:
-        command: mongodb-backup
-        plugs: [network, network-bind]
-
-    database-list-backups:
-        command: ls -al $SNAP_COMMON/db-backups/
-
-    database-restore:
-        command: mongodb-restore
-        plugs: [network, network-bind]
-
-parts:
-    mongodb:
-        source: https://repo.mongodb.org/apt/ubuntu/dists/xenial/mongodb-org/4.2/multiverse/binary-amd64/mongodb-org-server_4.2.2_amd64.deb
-        #https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-4.0.14.tgz
-        #https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.22.tgz
-        plugin: dump
-        stage-packages: [libssl1.0.0, libcurl3]
-        filesets:
-            mongo:
-                - usr
-                - bin
-                - lib
-        stage:
-            - $mongo
-        prime:
-            - $mongo
-
-    wekan:
-        source: .
-        plugin: nodejs
-        node-engine: 12.14.1
-        node-packages:
-            - node-gyp
-            - node-pre-gyp
-            - fibers
-        build-packages:
-            - ca-certificates
-            - apt-utils
-            - build-essential
-            - python
-            - python3
-            - g++
-            - capnproto
-            - curl
-            - libcurl3
-            - execstack
-            - nodejs
-            - npm
-        stage-packages:
-            - libfontconfig1
-        override-build: |
-            echo "Cleaning environment first"
-            rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules
-            rm -rf .build
-            echo "Installing meteor"
-            curl https://install.meteor.com/ -o install_meteor.sh
-            chmod +x install_meteor.sh
-            sh install_meteor.sh
-            rm install_meteor.sh
-            rm -rf .build
-            meteor add standard-minifier-js --allow-superuser
-            meteor npm install --allow-superuser
-            meteor npm install --allow-superuser --save babel-runtime
-            meteor build .build --directory --allow-superuser
-            cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
-            cd .build/bundle/programs/server
-            npm install
-            npm install --allow-superuser --save babel-runtime
-            # Change back to Wekan source directory
-            cd ../../../..
-            cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/
-            cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/
-            rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan
-            rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
-            rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/tar/lib/.mkdir.js.swp
-            rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp
-            rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-gyp/node_modules/tar/lib/.mkdir.js.swp
-            rm -f $SNAPCRAFT_PART_INSTALL/programs/server/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp
-
-        organize:
-            README: README.wekan
-        prime:
-            - -lib/node_modules/node-pre-gyp/node_modules/tar/lib/.unpack.js.swp
-
-    helpers:
-        source: snap-src
-        plugin: dump
-
-    caddy:
-        plugin: dump
-        source: https://caddyserver.com/download/linux/amd64?license=personal&telemetry=off
-        source-type: tar
-        organize:
-          caddy: bin/caddy
-          CHANGES.txt: CADDY_CHANGES.txt
-          EULA.txt: CADDY_EULA.txt
-          LICENSES.txt: CADDY_LICENSES.txt
-          README.txt: CADDY_README.txt
-        stage:
-          - -init

.gitattributes

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

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE.md

@@ -2,16 +2,13 @@
 
 Add these issues to elsewhere:
 - Snap: https://github.com/wekan/wekan-snap/issues
-- LDAP: https://github.com/wekan/wekan-ldap/issues
-- UCS: https://github.com/wekan/univention/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 so Wekan cards open correctly https://github.com/wekan/wekan/wiki/Settings ?
+* For new Wekan install, did you configure root-url 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:
@@ -19,12 +16,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:
-* Wekan only works on newest desktop Firefox/Chromium/Chrome/Edge/Chromium Edge and mobile Chrome. What webbrowser version are you using?
+* ROOT_URL environment variable http(s)://(subdomain).example.com(/suburl):
 
 **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` ? Please anonymize logs.* 
-- *If using Docker, what does show command `sudo docker logs wekan-app` ? Please anonymize logs.*
+- *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 logs are very long, attach them in .zip file*

.github/workflows/dockerimage.yml

@@ -1,17 +0,0 @@
-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,6 +8,7 @@ npm-debug.log
 .vscode/
 .idea/
 .build/*
+package-lock.json
 **/parts/
 **/stage
 **/prime
@@ -28,7 +29,3 @@ versions.json
 .Trashes
 Thumbs.db
 ehthumbs.db
-.eslintcache
-.meteor/local
-.meteor-1.6-snap/.meteor/local
-.devcontainer/docker-compose.extend.yml

.gitpod.Dockerfile

@@ -1,10 +0,0 @@
-FROM gitpod/workspace-mongodb
-                    
-USER gitpod
-
-# Install custom tools, runtime, etc. using apt-get
-# For example, the command below would install "bastet" - a command line tetris clone:
-#
-# RUN sudo apt-get -q update && #     sudo apt-get install -yq bastet && #     sudo rm -rf /var/lib/apt/lists/*
-#
-# More information: https://www.gitpod.io/docs/config-docker/

.gitpod.yml

@@ -1,4 +0,0 @@
-tasks:
-  - init: npm install
-image:
-  file: .gitpod.Dockerfile

.meteor/.finished-upgraders

@@ -16,5 +16,3 @@ 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,17 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor-base@1.4.0
+meteor-base@1.2.0
 
 # Build system
-ecmascript@0.14.3
-standard-minifier-css@1.6.0
-standard-minifier-js@2.6.0
+ecmascript
+stylus@2.513.13
+standard-minifier-css@1.3.5
+standard-minifier-js@2.2.0
 mquandalle:jade
-coffeescript@2.4.1!
 
 # Polyfills
-es5-shim@4.8.0
+es5-shim@4.6.15
 
 # Collections
 aldeed:collection2
@@ -23,7 +23,7 @@ dburles:collection-helpers
 idmontie:migrations
 matb33:collection-hooks
 matteodem:easy-search
-mongo@1.10.0
+mongo@1.3.1
 mquandalle:collection-mutations
 
 # Account system
@@ -36,23 +36,26 @@ wekan-accounts-cas
 wekan-accounts-oidc
 
 # Utilities
-check@1.3.1
+check@1.2.5
 jquery@1.11.10
-random@1.2.0
-reactive-dict@1.3.0
-session@1.2.0
-tracker@1.2.0
+random@1.0.10
+reactive-dict@1.2.0
+session@1.1.7
+tracker@1.1.3
 underscore@1.0.10
 3stack:presence
+alethes:pages
 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.4.2
+http@1.3.0
 
 # UI components
 blaze
@@ -67,34 +70,25 @@ templates:tabs
 verron:autosize
 simple:json-routes
 rajit:bootstrap3-datepicker
-shell-server@0.5.0
+shell-server@0.3.0
 simple:rest-accounts-password
 useraccounts:core
 email@1.2.3
 horka:swipebox
-dynamic-import@0.5.2
+dynamic-import@0.2.0
 staringatlights:fast-render
 
-accounts-password@1.6.0
+mixmax:smart-disconnect
+accounts-password@1.5.0
 cfs:gridfs
 rzymek:fullcalendar
 momentjs:moment@2.22.2
-browser-policy-framing@1.1.0
+browser-policy-framing
 mquandalle:moment
 msavin:usercache
 wekan-scrollbar
 mquandalle:perfect-scrollbar
-mdg:meteor-apm-agent@3.2.0-rc.0!
-# Keep stylus in 1.1.0, because building v2 takes extra 52 minutes.
-coagmano:stylus@1.1.0!
+mdg:meteor-apm-agent
+meteorhacks:unblock
 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.10.2
+METEOR@1.6.0.1

.meteor/versions

@@ -1,119 +1,113 @@
 3stack:presence@1.1.2
-accounts-base@1.6.0
-accounts-oauth@1.2.0
-accounts-password@1.6.0
+accounts-base@1.4.0
+accounts-oauth@1.1.15
+accounts-password@1.5.0
 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.4
+aldeed:simple-schema@1.5.3
+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.6.0
-babel-compiler@7.5.3
-babel-runtime@1.5.0
-base64@1.0.12
-binary-heap@1.0.11
-blaze@2.3.4
+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
 blaze-tools@1.0.10
-boilerplate-generator@1.7.0
+boilerplate-generator@1.3.1
 browser-policy-common@1.0.11
 browser-policy-framing@1.1.0
-caching-compiler@1.2.2
-caching-html-compiler@1.1.3
-callback-hook@1.3.0
+caching-compiler@1.1.9
+caching-html-compiler@1.1.2
+callback-hook@1.0.10
 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.10
-cfs:storage-adapter@0.2.4
-cfs:tempstore@0.1.6
+cfs:standard-packages@0.5.9
+cfs:storage-adapter@0.2.3
+cfs:tempstore@0.1.5
 cfs:upload-http@0.0.20
-cfs:worker@0.1.5
-check@1.3.1
+cfs:worker@0.1.4
+check@1.2.5
 chuangbo:cookie@1.1.0
-coagmano:stylus@1.1.0
-coffeescript@2.4.1
-coffeescript-compiler@2.4.1
+coffeescript@1.12.7_3
+coffeescript-compiler@1.12.7_3
 cottz:publish-relations@2.0.8
 dburles:collection-helpers@1.1.0
 ddp@1.4.0
-ddp-client@2.3.3
-ddp-common@1.4.0
+ddp-client@2.2.0
+ddp-common@1.3.0
 ddp-rate-limiter@1.0.7
-ddp-server@2.3.1
+ddp-server@2.1.1
 deps@1.0.12
-diff-sequence@1.1.1
-dynamic-import@0.5.2
-easylogic:summernote@0.8.8
-ecmascript@0.14.3
-ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.10.0
-ecmascript-runtime-server@0.9.0
-ejson@1.1.1
+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
 email@1.2.3
-es5-shim@4.8.0
+es5-shim@4.6.15
 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.4.2
-id-map@1.1.0
+http@1.3.0
+id-map@1.0.9
 idmontie:migrations@1.0.3
-inter-process-messaging@0.1.1
-jquery@1.11.11
+jquery@1.11.10
 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.2.0
+launch-screen@1.1.1
 livedata@1.0.18
 localstorage@1.2.0
-logging@1.1.20
+logging@1.1.19
 lucasantoniassi:accounts-lockout@1.0.0
-matb33:collection-hooks@0.9.1
+matb33:collection-hooks@0.8.4
 matteodem:easy-search@1.6.4
-mdg:meteor-apm-agent@3.2.5
+mdg:meteor-apm-agent@3.1.2
 mdg:validation-error@0.5.1
-meteor@1.9.3
-meteor-base@1.4.0
+meteor@1.8.2
+meteor-base@1.2.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.5.0
-minifier-js@2.6.0
+minifier-css@1.2.16
+minifier-js@2.2.2
 minifiers@1.1.8-faster-rebuild.0
-minimongo@1.6.0
-mobile-status-bar@1.1.0
-modern-browsers@0.1.5
-modules@0.15.0
-modules-runtime@0.12.0
-momentjs:moment@2.24.0
-mongo@1.10.0
-mongo-decimal@0.1.1
+minimongo@1.4.3
+mixmax:smart-disconnect@0.0.4
+mobile-status-bar@1.0.14
+modules@0.11.0
+modules-runtime@0.9.1
+momentjs:moment@2.22.2
+mongo@1.3.1
 mongo-dev-server@1.1.0
-mongo-id@1.0.7
+mongo-id@1.0.6
 mongo-livedata@1.0.12
 mousetrap:mousetrap@1.4.6_1
 mquandalle:autofocus@1.0.0
@@ -125,74 +119,70 @@ 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.8.0
+msavin:usercache@1.0.0
 npm-bcrypt@0.9.3
-npm-mongo@3.7.0
-oauth@1.3.0
-oauth2@1.3.0
+npm-mongo@2.2.33
+oauth@1.2.1
+oauth2@1.2.0
 observe-sequence@1.0.16
 ongoworks:speakingurl@1.1.0
-ordered-dict@1.1.0
-ostrio:cookies@2.6.0
-peerlibrary:assert@0.3.0
+ordered-dict@1.0.9
+peerlibrary:assert@0.2.5
 peerlibrary:base-component@0.16.0
 peerlibrary:blaze-components@0.15.1
-peerlibrary:computed-field@0.10.0
-peerlibrary:reactive-field@0.6.0
-percolate:synced-cron@1.3.2
-promise@0.11.2
+peerlibrary:computed-field@0.7.0
+peerlibrary:reactive-field@0.3.0
+promise@0.10.0
 raix:eventemitter@0.1.3
 raix:handlebar-helpers@0.2.5
-rajit:bootstrap3-datepicker@1.7.1_1
-random@1.2.0
-rate-limit@1.0.9
-reactive-dict@1.3.0
+rajit:bootstrap3-datepicker@1.7.1
+random@1.0.10
+rate-limit@1.0.8
+reactive-dict@1.2.0
 reactive-var@1.0.11
-reload@1.3.0
-retry@1.1.0
-routepolicy@1.1.0
+reload@1.1.11
+retry@1.0.9
+routepolicy@1.0.12
 rzymek:fullcalendar@3.8.0
-server-render@0.3.1
 service-configuration@1.0.11
-session@1.2.0
+session@1.1.7
 sha@1.0.9
-shell-server@0.5.0
+shell-server@0.3.1
 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.3.0
 softwarerero:accounts-t9n@1.3.11
 spacebars@1.0.15
 spacebars-compiler@1.1.3
-srp@1.1.0
-standard-minifier-css@1.6.0
-standard-minifier-js@2.6.0
-staringatlights:fast-render@3.2.0
-staringatlights:inject-data@2.3.0
+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
 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.2.0
-twbs:bootstrap@3.3.6
+tracker@1.1.3
 ui@1.0.13
 underscore@1.0.10
-url@1.3.0
+url@1.1.0
 useraccounts:core@1.14.2
 useraccounts:flow-routing@1.14.2
 useraccounts:unstyled@1.14.2
 verron:autosize@3.0.8
-webapp@1.9.1
+webapp@1.4.0
 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-ldap@0.0.2
 yasaricli:slugify@0.0.7
 zimme:active-route@2.3.2

.pkgr.yml

@@ -1,13 +0,0 @@
-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

@@ -1,8 +0,0 @@
-packages/
-node_modules/
-.build/
-.meteor/
-.vscode/
-.tx/
-.github/
-.snap-meteor-1.8/

.prettierrc

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

.travis.yml

@@ -1,10 +1,10 @@
-dist: eoan
+dist: trusty
 sudo: required
 
 env:
-  TRAVIS_DOCKER_COMPOSE_VERSION: 1.24.0
-  TRAVIS_NODE_VERSION: 12.16.2
-  TRAVIS_NPM_VERSION: latest
+  TRAVIS_DOCKER_COMPOSE_VERSION: 1.17.0
+  TRAVIS_NODE_VERSION: 8.9.3
+  TRAVIS_NPM_VERSION: 5.5.1
 
 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, sl_SI:sl, zh_CN:zh-CN, zh_TW:zh-TW, zh_HK:zh-HK
+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, zh_HK:zh-HK
 
 [wekan.application]
 file_filter = i18n/<lang>.i18n.json

.vscode/launch.json

@@ -1,28 +0,0 @@
-{
-  "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,17 +1,17 @@
-FROM ubuntu:rolling
+FROM ubuntu:disco
 LABEL maintainer="wekan"
 
 # 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 libarchive-tools gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates python3" \
+ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential python3 python3-pip git ca-certificates gcc-8" \
     DEBUG=false \
-    NODE_VERSION=v12.16.2 \
-    METEOR_RELEASE=1.10.2 \
+    NODE_VERSION=v8.16.0 \
+    METEOR_RELEASE=1.6.0.1 \
     USE_EDGE=false \
     METEOR_EDGE=1.5-beta.17 \
     NPM_VERSION=latest \
-    FIBERS_VERSION=4.0.1 \
+    FIBERS_VERSION=2.0.0 \
     ARCHITECTURE=linux-x64 \
     SRC_PATH=./ \
     WITH_API=true \
@@ -21,15 +21,6 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
     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=false \
-    CARD_OPENED_WEBHOOK_ENABLED=false \
-    ATTACHMENTS_STORE_PATH="" \
-    MAX_IMAGE_PIXEL="" \
-    IMAGE_COMPRESS_RATIO="" \
-    NOTIFICATION_TRAY_AFTER_READ_DAYS_BEFORE_REMOVE="" \
-    BIGEVENTS_PATTERN=NONE \
-    NOTIFY_DUE_DAYS_BEFORE_AND_AFTER="" \
-    NOTIFY_DUE_AT_HOUR_OF_DAY="" \
     EMAIL_NOTIFICATION_TIMEOUT=30000 \
     MATOMO_ADDRESS="" \
     MATOMO_SITE_ID="" \
@@ -66,14 +57,13 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
     LDAP_AUTHENTIFICATION_PASSWORD="" \
     LDAP_LOG_ENABLED=false \
     LDAP_BACKGROUND_SYNC=false \
-    LDAP_BACKGROUND_SYNC_INTERVAL="" \
+    LDAP_BACKGROUND_SYNC_INTERVAL=100 \
     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="" \
@@ -111,10 +101,7 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
     CORS="" \
     CORS_ALLOW_HEADERS="" \
     CORS_EXPOSE_HEADERS="" \
-    DEFAULT_AUTHENTICATION_METHOD="" \
-    SCROLLINERTIA="0" \
-    SCROLLAMOUNT="auto" \
-    PASSWORD_LOGIN_ENABLED=true
+    DEFAULT_AUTHENTICATION_METHOD=""
 
 # Copy the app to the image
 COPY ${SRC_PATH} /home/wekan/app
@@ -126,7 +113,7 @@ RUN \
     \
     # OS dependencies
     apt-get update -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} && \
-    #pip3 install -U pip setuptools wheel && \
+    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
@@ -182,39 +169,33 @@ 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. Python path for node-gyp.
+    # Install Node dependencies
     npm install -g npm@${NPM_VERSION} && \
-    #npm config set python python2.7 && \
-    #npm install -g node-gyp && \
-    #npm install -g fibers@${FIBERS_VERSION} && \
+    npm install -g node-gyp && \
+    npm install -g fibers@${FIBERS_VERSION} && \
     \
     # Change user to wekan and install meteor
     cd /home/wekan/ && \
-    chown wekan --recursive /home/wekan && \
-    #curl "https://install.meteor.com" -o /home/wekan/install_meteor.sh && \
+    chown wekan: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" && \
-    gosu wekan:wekan curl https://install.meteor.com/ | /bin/sh && \
-    mv /root/.meteor /home/wekan/ && \
-    chown wekan --recursive /home/wekan/.meteor && \
+    chown wekan:wekan /home/wekan/install_meteor.sh && \
     \
     # 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; \
-    #  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; \
-    #\
+    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; \
+    \
     # Get additional packages
     #mkdir -p /home/wekan/app/packages && \
     #chown wekan:wekan --recursive /home/wekan && \
@@ -235,44 +216,34 @@ RUN \
     gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \
     \
     # extract the OpenAPI specification
-    #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; \
+    npm install -g api2html@0.3.3 && \
+    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 https://github.com/Kronuz/esprima-python && \
+    cd /home/wekan/python/esprima-python && \
+    python3 setup.py install --record files.txt && \
+    cd /home/wekan/app &&\
+    gosu wekan:wekan mkdir -p ./public/api && \
+    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 && \
-    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 add standard-minifier-js && \
+    gosu wekan:wekan /home/wekan/.meteor/meteor 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 /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 && \
     #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 && \
-    # Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
-		rm -rf /home/wekan/app_build/bundle/programs/web.browser.legacy && \
     mv /home/wekan/app_build/bundle /build && \
     \
     # Put back the original tar
@@ -285,10 +256,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

Dockerfile.arm64v8

@@ -1,77 +0,0 @@
-FROM amd64/alpine:3.7 AS builder
-
-# Set the environment variables for builder
-ENV QEMU_VERSION=v4.2.0-6 \
-    QEMU_ARCHITECTURE=aarch64 \
-    NODE_ARCHITECTURE=linux-arm64 \
-    NODE_VERSION=v12.16.1 \
-    WEKAN_VERSION=3.96  \
-    WEKAN_ARCHITECTURE=arm64
-     
-     # Install dependencies 
-RUN  apk update && apk add ca-certificates outils-sha1 && \
-     \
-     # Download qemu static for our architecture
-     wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-${QEMU_ARCHITECTURE}-static.tar.gz -O - | tar -xz && \
-     \
-    # Download wekan and shasum
-    wget https://releases.wekan.team/raspi3/wekan-${WEKAN_VERSION}-${WEKAN_ARCHITECTURE}.zip && \
-    wget https://releases.wekan.team/raspi3/SHA256SUMS.txt && \
-    # Verify wekan
-    grep wekan-${WEKAN_VERSION}-${WEKAN_ARCHITECTURE}.zip SHA256SUMS.txt | sha256sum -c - && \ 
-    \
-    # Unzip wekan
-    unzip wekan-${WEKAN_VERSION}-${WEKAN_ARCHITECTURE}.zip && \
-    \
-    # Download node and shasums
-    wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz && \
-    wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
-    \
-    # Verify nodejs authenticity
-    grep node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | sha256sum -c - && \
-    \
-    # Extract node and remove tar.gz
-    tar xvzf node-${NODE_VERSION}-${NODE_ARCHITECTURE}.tar.gz
-
-# Build wekan dockerfile 
-FROM arm64v8/ubuntu:19.10
-LABEL maintainer="wekan"
-
-# Set the environment variables (defaults where required)
-ENV QEMU_ARCHITECTURE=aarch64 \
-    NODE_ARCHITECTURE=linux-arm64 \
-    NODE_VERSION=v12.16.1 \
-    NODE_ENV=production \
-    NPM_VERSION=latest \
-    WITH_API=true \
-    PORT=8080 \
-    ROOT_URL=http://localhost \
-    MONGO_URL=mongodb://127.0.0.1:27017/wekan 
-
-# Copy qemu-static to image
-COPY --from=builder qemu-${QEMU_ARCHITECTURE}-static /usr/bin
-
-# Copy the app to the image
-COPY --from=builder bundle /home/wekan/bundle
-
-# Copy
-COPY --from=builder node-${NODE_VERSION}-${NODE_ARCHITECTURE} /opt/nodejs 
-
-RUN \
-    set -o xtrace && \
-    # Add non-root user wekan
-    useradd --user-group --system --home-dir /home/wekan wekan && \
-    \
-    # Install Node
-    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 && \
-    \
-    # Install Node dependencies
-    npm install -g npm@${NPM_VERSION}
-
-EXPOSE $PORT
-USER wekan
-
-CMD ["node", "/home/wekan/bundle/main.js"]

README.md

@@ -1,5 +1,3 @@
-[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/wekan/wekan) 
-
 # Wekan - Open Source kanban
 
 [![Contributors](https://img.shields.io/github/contributors/wekan/wekan.svg "Contributors")](https://github.com/wekan/wekan/graphs/contributors)
@@ -34,7 +32,7 @@ and PWA app that can be added as icon on Android and bookmark on iOS, used like
 
 **NOTE**: 
 - Please read the [FAQ](https://github.com/wekan/wekan/wiki/FAQ) first
-- Please don't feed the [trolls](https://github.com/wekan/wekan/wiki/FAQ#why-am-i-called-a-troll) and [spammers](https://github.com/wekan/wekan/wiki/FAQ#why-am-i-called-a-spammer) that are mentioned in the FAQ :)
+- Please don't feed the trolls and spammers that are mentioned in the FAQ :)
 
 ## About Wekan
 
@@ -56,14 +54,15 @@ 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), bundle for RasPi3 ARM and other CPUs where Node.js and MongoDB exists.
+  [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 minimum total 4 GB RAM.
-  For thousands of users, for example with [Docker](https://github.com/wekan/wekan/blob/master/docker-compose.yml): 3 frontend servers,
+  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.
 - SECURITY: Updating to newest Wekan version very often. Please check you do not have automatic updates of Sandstorm or Snap turned off.
@@ -75,25 +74,41 @@ 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 and Demo
+## Roadmap
 
-[Roadmap][roadmap_wekan] - Public read-only board at Wekan demo.
+[Roadmap Milestones](https://github.com/wekan/wekan/milestones)
 
 [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/commercial-support/).
+- [Commercial Support](https://wekan.team).
+- [Bounties](https://wekan.team/bounties/index.html).
 
 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_wekan]][roadmap_wekan]
+[![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).
 
 ## License
 
@@ -102,11 +117,14 @@ 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]: https://wekan.github.io/wekan-markdown.png
+[screenshot_wekan]: http://i.imgur.com/cI4jW2h.png
+[screenshot_wefork]: https://wekan.github.io/wekan-markdown.png
 [features]: https://github.com/wekan/wekan/wiki/Features
-[roadmap_wekan]: https://boards.wekan.team/b/D2SzJKZDS4Z48yeQH/wekan-open-source-kanban-board-with-mit-license
-[wekan_issues]: https://github.com/wekan/wekan/issues
+[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
 [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

Stackerfile.yml

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

client/components/activities/activities.jade

@@ -8,201 +8,216 @@ template(name="activities")
       +cardActivities
 
 template(name="boardActivities")
-  each activityData in currentBoard.activities
-    +activity(activity=activityData card=card mode=mode)
+  each currentBoard.activities
+    .activity
+      +userAvatar(userId=user._id)
+      p.activity-desc
+        +memberName(user=user)
 
-template(name="cardActivities")
-  each activityData in currentCard.activities
-    +activity(activity=activityData card=card mode=mode)
+        if($eq activityType 'deleteAttachment')
+          | {{{_ 'activity-delete-attach' cardLink}}}.
 
-template(name="activity")
-  .activity
-    +userAvatar(userId=activity.user._id)
-    p.activity-desc
-      +memberName(user=activity.user)
+        if($eq activityType 'addAttachment')
+          | {{{_ 'activity-attached' attachmentLink cardLink}}}.
 
-      //- attachment activity -------------------------------------------------
-      if($eq activity.activityType 'deleteAttachment')
-        | {{{_ 'activity-delete-attach' cardLink}}}.
-
-      if($eq activity.activityType 'addAttachment')
-        | {{{_ 'activity-attached' attachmentLink cardLink}}}.
-        if($neq mode 'board')
-          if activity.attachment.isImage
-            img.attachment-image-preview(src=activity.attachment.url)
-
-      //- board activity ------------------------------------------------------
-      if($eq mode 'board')
-        if($eq activity.activityType 'createBoard')
-          | {{_ 'activity-created' boardLabel}}.
-
-        if($eq activity.activityType 'importBoard')
-          | {{{_ 'activity-imported-board' boardLabel sourceLink}}}.
-
-        if($eq activity.activityType 'addBoardMember')
+        if($eq activityType 'addBoardMember')
           | {{{_ 'activity-added' memberLink boardLabel}}}.
 
-        if($eq activity.activityType 'removeBoardMember')
+        if($eq activityType 'addComment')
+          | {{{_ 'activity-on' cardLink}}}
+          a.activity-comment(href="{{ card.absoluteUrl }}")
+            +viewer
+              = comment.text
+
+        if($eq activityType 'addChecklist')
+          | {{{_ 'activity-checklist-added' cardLink}}}.
+          .activity-checklist(href="{{ card.absoluteUrl }}")
+            +viewer
+              = checklist.title
+        if($eq activityType 'removeChecklist')
+          | {{{_ 'activity-checklist-removed' cardLink}}}.
+
+        if($eq activityType 'checkedItem')
+          | {{{_ 'activity-checked-item' checkItem checklist.title cardLink}}}.
+
+        if($eq activityType 'uncheckedItem')
+          | {{{_ 'activity-unchecked-item' checkItem checklist.title cardLink}}}.
+
+        if($eq activityType 'checklistCompleted')
+          | {{{_ 'activity-checklist-completed' checklist.title cardLink}}}.
+
+        if($eq activityType 'checklistUncompleted')
+          | {{{_ 'activity-checklist-uncompleted' checklist.title cardLink}}}.
+
+        if($eq activityType 'addChecklistItem')
+          | {{{_ 'activity-checklist-item-added' checklist.title cardLink}}}.
+          .activity-checklist(href="{{ card.absoluteUrl }}")
+            +viewer
+              = checklistItem.title
+        if($eq activityType 'removedChecklistItem')
+          | {{{_ 'activity-checklist-item-removed' checklist.title cardLink}}}.
+
+        if($eq activityType 'archivedCard')
+          | {{{_ 'activity-archived' cardLink}}}.
+
+        if($eq activityType 'archivedList')
+          | {{_ 'activity-archived' list.title}}.
+
+        if($eq activityType 'archivedSwimlane')
+          | {{_ 'activity-archived' swimlane.title}}.
+
+        if($eq activityType 'createBoard')
+          | {{_ 'activity-created' boardLabel}}.
+
+        if($eq activityType 'createCard')
+          | {{{_ 'activity-added' cardLink boardLabel}}}.
+
+        if($eq activityType 'createCustomField')
+          | {{_ 'activity-customfield-created' customField}}.
+
+        if($eq activityType 'createList')
+          | {{_ 'activity-added' list.title boardLabel}}.
+
+        if($eq activityType 'createSwimlane')
+          | {{_ 'activity-added' swimlane.title boardLabel}}.
+
+        if($eq activityType 'removeList')
+          | {{_ 'activity-removed' title boardLabel}}.
+
+        if($eq activityType 'importBoard')
+          | {{{_ 'activity-imported-board' boardLabel sourceLink}}}.
+
+        if($eq activityType 'importCard')
+          | {{{_ 'activity-imported' cardLink boardLabel sourceLink}}}.
+
+        if($eq activityType 'importList')
+          | {{{_ 'activity-imported' listLabel boardLabel sourceLink}}}.
+
+        if($eq activityType 'joinMember')
+          if($eq user._id member._id)
+            | {{{_ 'activity-joined' cardLink}}}.
+          else
+            | {{{_ 'activity-added' memberLink cardLink}}}.
+
+        if($eq activityType 'moveCardBoard')
+          | {{{_ 'activity-moved' cardLink oldBoardName boardName}}}.
+
+        if($eq activityType 'moveCard')
+          | {{{_ 'activity-moved' cardLink oldList.title list.title}}}.
+
+        if($eq activityType 'removeBoardMember')
           | {{{_ 'activity-excluded' memberLink boardLabel}}}.
 
-      //- card activity -------------------------------------------------------
-      if($eq activity.activityType 'createCard')
-        if($eq mode 'card')
-          | {{{_ 'activity-added' cardLabel activity.listName}}}.
-        else
-          | {{{_ 'activity-added' cardLabel boardLabel}}}.
+        if($eq activityType 'restoredCard')
+          | {{{_ 'activity-sent' cardLink boardLabel}}}.
 
-      if($eq activity.activityType 'importCard')
-        | {{{_ 'activity-imported' cardLink boardLabel sourceLink}}}.
+        if($eq activityType 'addedLabel')
+          | {{{_ 'activity-added-label' lastLabel cardLink}}}.
 
-      if($eq activity.activityType 'moveCard')
-        | {{{_ 'activity-moved' cardLabel activity.oldList.title activity.list.title}}}.
+        if($eq activityType 'removedLabel')
+          | {{{_ 'activity-removed-label' lastLabel cardLink}}}.
 
-      if($eq activity.activityType 'moveCardBoard')
-        | {{{_ 'activity-moved' cardLink activity.oldBoardName activity.boardName}}}.
+        if($eq activityType 'setCustomField')
+          | {{{_ 'activity-set-customfield' lastCustomField lastCustomFieldValue cardLink}}}.
 
-      if($eq activity.activityType 'archivedCard')
-        | {{{_ 'activity-archived' cardLink}}}.
+        if($eq activityType 'unsetCustomField')
+          | {{{_ 'activity-unset-customfield' lastCustomField cardLink}}}.
 
-      if($eq activity.activityType 'restoredCard')
-        | {{{_ 'activity-sent' cardLink boardLabel}}}.
+        if($eq activityType 'unjoinMember')
+          if($eq user._id member._id)
+            | {{{_ 'activity-unjoined' cardLink}}}.
+          else
+            | {{{_ 'activity-removed' memberLink cardLink}}}.
 
-      //- checklist activity --------------------------------------------------
-      if($eq activity.activityType 'addChecklist')
-        | {{{_ 'activity-checklist-added' cardLink}}}.
-        if($eq mode 'card')
+        span(title=createdAt).activity-meta {{ moment createdAt }}
+
+template(name="cardActivities")
+  each currentCard.activities
+    .activity
+      +userAvatar(userId=user._id)
+      p.activity-desc
+        +memberName(user=user)
+        if($eq activityType 'createCard')
+          | {{_ 'activity-added' cardLabel listName}}.
+        if($eq activityType 'importCard')
+          | {{{_ 'activity-imported' cardLabel list.title sourceLink}}}.
+        if($eq activityType 'joinMember')
+          if($eq user._id member._id)
+            | {{_ 'activity-joined' cardLabel}}.
+          else
+            | {{{_ 'activity-added' memberLink cardLabel}}}.
+        if($eq activityType 'unjoinMember')
+          if($eq user._id member._id)
+            | {{_ 'activity-unjoined' cardLabel}}.
+          else
+            | {{{_ 'activity-removed' cardLabel memberLink}}}.
+        if($eq activityType 'archivedCard')
+          | {{_ 'activity-archived' cardLabel}}.
+
+        if($eq activityType 'addedLabel')
+          | {{{_ 'activity-added-label-card' lastLabel }}}.
+
+        if($eq activityType 'removedLabel')
+          | {{{_ 'activity-removed-label-card' lastLabel }}}.
+
+        if($eq activityType 'removeChecklist')
+          | {{{_ 'activity-checklist-removed' cardLabel}}}.
+
+        if($eq activityType 'checkedItem')
+          | {{{_ 'activity-checked-item-card' checkItem checklist.title }}}.
+
+        if($eq activityType 'uncheckedItem')
+          | {{{_ 'activity-unchecked-item-card' checkItem checklist.title }}}.
+
+        if($eq activityType 'checklistCompleted')
+          | {{{_ 'activity-checklist-completed-card' checklist.title }}}.
+
+        if($eq activityType 'checklistUncompleted')
+          | {{{_ 'activity-checklist-uncompleted-card' checklist.title }}}.
+
+        if($eq activityType 'restoredCard')
+          | {{_ 'activity-sent' cardLabel boardLabel}}.
+        if($eq activityType 'moveCard')
+          | {{_ 'activity-moved' cardLabel oldList.title list.title}}.
+
+        if($eq activityType 'moveCardBoard')
+          | {{{_ 'activity-moved' cardLink oldBoardName boardName}}}.
+
+        if($eq activityType 'addAttachment')
+          | {{{_ 'activity-attached' attachmentLink cardLabel}}}.
+          if attachment.isImage
+            img.attachment-image-preview(src=attachment.url)
+        if($eq activityType 'deleteAttachment')
+          | {{{_ 'activity-delete-attach'  cardLabel}}}.
+        if($eq activityType 'removedChecklist')
+          | {{{_ 'activity-checklist-removed' cardLabel}}}.
+        if($eq activityType 'addChecklist')
+          | {{{_ 'activity-checklist-added' cardLabel}}}.
           .activity-checklist
             +viewer
-              = activity.checklist.title
-        else
-          a.activity-checklist(href="{{ activity.card.absoluteUrl }}")
+              = checklist.title
+        if($eq activityType 'addChecklistItem')
+          | {{{_ 'activity-checklist-item-added' checklist.title cardLink}}}.
+          .activity-checklist(href="{{ card.absoluteUrl }}")
             +viewer
-              = activity.checklist.title
+              = checklistItem.title
 
-      if($eq activity.activityType 'removedChecklist')
-        | {{{_ 'activity-checklist-removed' cardLink}}}.
-
-      if($eq activity.activityType 'completeChecklist')
-        | {{{_ 'activity-checklist-completed' activity.checklist.title cardLink}}}.
-
-      if($eq activity.activityType 'uncompleteChecklist')
-        | {{{_ 'activity-checklist-uncompleted' activity.checklist.title cardLink}}}.
-
-      if($eq activity.activityType 'checkedItem')
-        | {{{_ 'activity-checked-item' checkItem activity.checklist.title cardLink}}}.
-
-      if($eq activity.activityType 'uncheckedItem')
-        | {{{_ 'activity-unchecked-item' checkItem activity.checklist.title cardLink}}}.
-
-      if($eq activity.activityType 'addChecklistItem')
-        | {{{_ 'activity-checklist-item-added' activity.checklist.title cardLink}}}.
-        .activity-checklist(href="{{ activity.card.absoluteUrl }}")
-          +viewer
-            = activity.checklistItem.title
-
-      if($eq activity.activityType 'removedChecklistItem')
-        | {{{_ 'activity-checklist-item-removed' activity.checklist.title cardLink}}}.
-
-      //- comment activity ----------------------------------------------------
-      if($eq mode 'card')
-        //- if we are in card mode we display the comment in a way that it
-        //- can be edited by the owner
-        if($eq activity.activityType 'addComment')
+        if($eq activityType 'addComment')
           +inlinedForm(classNames='js-edit-comment')
             +editor(autofocus=true)
-              = activity.comment.text
+              = comment.text
             .edit-controls
               button.primary(type="submit") {{_ 'edit'}}
           else
             .activity-comment
               +viewer
-                = activity.comment.text
-            span(title=activity.createdAt).activity-meta {{ moment activity.createdAt }}
-              if ($eq currentUser._id activity.comment.userId)
+                = comment.text
+            span(title=createdAt).activity-meta {{ moment createdAt }}
+              if ($eq currentUser._id comment.userId)
                 = ' - '
                 a.js-open-inlined-form {{_ "edit"}}
                 = ' - '
                 a.js-delete-comment {{_ "delete"}}
 
-        if($eq activity.activityType 'deleteComment')
-          | {{{_ 'activity-deleteComment' currentData.commentId}}}.
-
-        if($eq activity.activityType 'editComment')
-          | {{{_ 'activity-editComment' currentData.commentId}}}.
-      else
-        //- if we are not in card mode we only display a summary of the comment
-        if($eq activity.activityType 'addComment')
-          | {{{_ 'activity-on' cardLink}}}
-          a.activity-comment(href="{{ activity.card.absoluteUrl }}")
-            +viewer
-              = activity.comment.text
-
-      //- customField activity ------------------------------------------------
-      if($eq mode 'board')
-        if($eq activity.activityType 'createCustomField')
-          | {{_ 'activity-customfield-created' customField}}.
-
-        if($eq activity.activityType 'setCustomField')
-          | {{{_ 'activity-set-customfield' lastCustomField lastCustomFieldValue cardLink}}}.
-
-        if($eq activity.activityType 'unsetCustomField')
-          | {{{_ 'activity-unset-customfield' lastCustomField cardLink}}}.
-
-      //- label activity ------------------------------------------------------
-      if($eq activity.activityType 'addedLabel')
-        | {{{_ 'activity-added-label' lastLabel cardLink}}}.
-
-      if($eq activity.activityType 'removedLabel')
-        | {{{_ 'activity-removed-label' lastLabel cardLink}}}.
-
-      //- list activity -------------------------------------------------------
-      if($neq mode 'card')
-        if($eq activity.activityType 'createList')
-          | {{{_ 'activity-added' listLabel boardLabel}}}.
-
-        if($eq activity.activityType 'importList')
-          | {{{_ 'activity-imported' listLabel boardLabel sourceLink}}}.
-
-        if($eq activity.activityType 'removeList')
-          | {{{_ 'activity-removed' activity.title boardLabel}}}.
-
-        if($eq activity.activityType 'archivedList')
-          | {{_ 'activity-archived' listLabel}}.
-
-      //- member activity ----------------------------------------------------
-      if($eq activity.activityType 'joinMember')
-        if($eq user._id activity.member._id)
-          | {{{_ 'activity-joined' cardLink}}}.
         else
-          | {{{_ 'activity-added' memberLink cardLink}}}.
-
-      if($eq activity.activityType 'unjoinMember')
-        if($eq user._id activity.member._id)
-          | {{{_ 'activity-unjoined' cardLink}}}.
-        else
-          | {{{_ 'activity-removed' memberLink cardLink}}}.
-
-      //- swimlane activity --------------------------------------------------
-      if($neq mode 'card')
-        if($eq activity.activityType 'createSwimlane')
-          | {{{_ 'activity-added' activity.swimlane.title boardLabel}}}.
-
-        if($eq activity.activityType 'archivedSwimlane')
-          | {{_ 'activity-archived' activity.swimlane.title}}.
-
-
-      //- I don't understand this part ----------------------------------------
-      if(currentData.timeKey)
-        | {{{_ activity.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)
-        | {{{_ activity.activityType currentData.timeValue}}}
-
-      span(title=activity.createdAt).activity-meta {{ moment activity.createdAt }}
+          span(title=createdAt).activity-meta {{ moment createdAt }}

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,7 +22,8 @@ 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;
@@ -41,9 +42,7 @@ BlazeComponent.extendComponent({
       });
     });
   },
-}).register('activities');
 
-BlazeComponent.extendComponent({
   loadNextPage() {
     if (this.loadNextPageLocked === false) {
       this.page.set(this.page.get() + 1);
@@ -51,92 +50,73 @@ BlazeComponent.extendComponent({
     }
   },
 
-  checkItem() {
-    const checkItemId = this.currentData().activity.checklistItemId;
-    const checkItem = ChecklistItems.findOne({ _id: checkItemId });
-    return checkItem && checkItem.title;
+  checkItem(){
+    const checkItemId = this.currentData().checklistItemId;
+    const checkItem = ChecklistItems.findOne({_id:checkItemId});
+    return checkItem.title;
   },
 
   boardLabel() {
-    const data = this.currentData();
-    if (data.mode !== 'board') {
-      return createBoardLink(data.activity.board(), data.activity.listName);
-    }
     return TAPi18n.__('this-board');
   },
 
   cardLabel() {
-    const data = this.currentData();
-    if (data.mode !== 'card') {
-      return createCardLink(this.currentData().activity.card());
-    }
     return TAPi18n.__('this-card');
   },
 
   cardLink() {
-    return createCardLink(this.currentData().activity.card());
+    const card = this.currentData().card();
+    return card && Blaze.toHTML(HTML.A({
+      href: card.absoluteUrl(),
+      'class': 'action-card',
+    }, card.title));
   },
 
-  lastLabel() {
-    const lastLabelId = this.currentData().activity.labelId;
-    if (!lastLabelId) return null;
-    const lastLabel = Boards.findOne(
-      this.currentData().activity.boardId,
-    ).getLabelById(lastLabelId);
-    if (lastLabel && (lastLabel.name === undefined || lastLabel.name === '')) {
+  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 === ''){
       return lastLabel.color;
-    } else {
+    }else{
       return lastLabel.name;
     }
   },
 
-  lastCustomField() {
-    const lastCustomField = CustomFields.findOne(
-      this.currentData().activity.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().activity.customFieldId,
-    );
-    if (!lastCustomField) return null;
-    const value = this.currentData().activity.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;
+  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;
     }
     return value;
   },
 
   listLabel() {
-    const activity = this.currentData().activity;
-    const list = activity.list();
-    return (list && list.title) || activity.title;
+    return this.currentData().list().title;
   },
 
   sourceLink() {
-    const source = this.currentData().activity.source;
-    if (source) {
-      if (source.url) {
-        return Blaze.toHTML(
-          HTML.A(
-            {
-              href: source.url,
-            },
-            source.system,
-          ),
-        );
+    const source = this.currentData().source;
+    if(source) {
+      if(source.url) {
+        return Blaze.toHTML(HTML.A({
+          href: source.url,
+        }, source.system));
       } else {
         return source.system;
       }
@@ -146,90 +126,45 @@ BlazeComponent.extendComponent({
 
   memberLink() {
     return Blaze.toHTMLWithData(Template.memberName, {
-      user: this.currentData().activity.member(),
+      user: this.currentData().member(),
     });
   },
 
   attachmentLink() {
-    const attachment = this.currentData().activity.attachment();
+    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(),
-          ),
-        )) ||
-      this.currentData().activity.attachmentName
-    );
+    return attachment && attachment.url({ download: true }) && Blaze.toHTML(HTML.A({
+      href: attachment.url({ download: true }),
+      target: '_blank',
+    }, attachment.name()));
   },
 
   customField() {
-    const customField = this.currentData().activity.customField();
-    if (!customField) return null;
+    const customField = this.currentData().customField();
+    if (!customField)
+      return null;
     return customField.name;
   },
 
   events() {
-    return [
-      {
-        // XXX We should use Popup.afterConfirmation here
-        'click .js-delete-comment'() {
-          const commentId = this.currentData().activity.commentId;
-          CardComments.remove(commentId);
-        },
-        'submit .js-edit-comment'(evt) {
-          evt.preventDefault();
-          const commentText = this.currentComponent()
-            .getValue()
-            .trim();
-          const commentId = Template.parentData().activity.commentId;
-          if (commentText) {
-            CardComments.update(commentId, {
-              $set: {
-                text: commentText,
-              },
-            });
-          }
-        },
+    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,
+            },
+          });
+        }
+      },
+    }];
   },
-}).register('activity');
-
-function createCardLink(card) {
-  return (
-    card &&
-    Blaze.toHTML(
-      HTML.A(
-        {
-          href: card.absoluteUrl(),
-          class: 'action-card',
-        },
-        card.title,
-      ),
-    )
-  );
-}
-
-function createBoardLink(board, list) {
-  let text = board.title;
-  if (list) text += `: ${list}`;
-  return (
-    board &&
-    Blaze.toHTML(
-      HTML.A(
-        {
-          href: board.absoluteUrl(),
-          class: 'action-board',
-        },
-        text,
-      ),
-    )
-  );
-}
+}).register('activities');

client/components/activities/activities.styl

@@ -9,7 +9,7 @@
   clear: both
 
   .activity
-    margin: 0.5px 0
+    margin: 10px 0
     display: flex
 
     .member

client/components/activities/comments.js

@@ -14,45 +14,45 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    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();
-          }
-        },
+    return [{
+      'click .js-new-comment:not(.focus)'() {
+        commentFormIsOpen.set(true);
       },
-    ];
+      '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(''); // without manually trigger, input event won't be fired
+  input.val('');
   input.blur();
   commentFormIsOpen.set(false);
 }
@@ -69,8 +69,7 @@ Tracker.autorun(() => {
   });
 });
 
-EscapeActions.register(
-  'inlinedForm',
+EscapeActions.register('inlinedForm',
   () => {
     const draftKey = {
       fieldName: 'cardComment',
@@ -85,10 +84,7 @@ EscapeActions.register(
     }
     resetCommentInput(commentInput);
   },
-  () => {
-    return commentFormIsOpen.get();
-  },
-  {
+  () => { return commentFormIsOpen.get(); }, {
     noClickEscapeOn: '.js-new-comment',
-  },
+  }
 );

client/components/activities/comments.styl

@@ -46,23 +46,3 @@
 
     &:is-open
       cursor: auto
-
-.comment-item
-  background-color: #fff
-  border: 0
-  box-shadow: 0 1px 2px rgba(0, 0, 0, .23)
-  color: #8c8c8c
-  height: 36px
-  margin: 4px 4px 6px 0
-  width: 92%
-
-  &:hover
-    background: darken(white, 12%)
-
-  &.add-comment
-    display: flex
-    margin: 5px
-
-    a
-      display: block
-      margin: auto

client/components/boards/boardArchive.js

@@ -4,45 +4,36 @@ BlazeComponent.extendComponent({
   },
 
   archivedBoards() {
-    return Boards.find(
-      { archived: true },
-      {
-        sort: { sort: 1 /* boards default sorting */ },
-      },
-    );
+    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);
-        },
-        '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');
-        }),
+    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');
+      }),
+    }];
   },
 }).register('archivedBoards');

client/components/boards/boardBody.jade

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

client/components/boards/boardBody.js

@@ -1,7 +1,5 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
 const subManager = new SubsManager();
-const { calculateIndex } = Utils;
+const { calculateIndex, enableClickOnTouch } = Utils;
 const swimlaneWhileSortingHeight = 150;
 
 BlazeComponent.extendComponent({
@@ -14,7 +12,8 @@ BlazeComponent.extendComponent({
     // unfortunatly, Blaze doesn't have this notion.
     this.autorun(() => {
       const currentBoardId = Session.get('currentBoard');
-      if (!currentBoardId) return;
+      if (!currentBoardId)
+        return;
       const handle = subManager.subscribe('board', currentBoardId, false);
       Tracker.nonreactive(() => {
         Tracker.autorun(() => {
@@ -31,6 +30,7 @@ BlazeComponent.extendComponent({
   goHome() {
     FlowRouter.go('home');
   },
+
 }).register('board');
 
 BlazeComponent.extendComponent({
@@ -47,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,
@@ -62,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,
@@ -91,6 +91,7 @@ BlazeComponent.extendComponent({
         helper.append(list.clone());
         return helper;
       },
+      handle: '.js-swimlane-header',
       items: '.swimlane:not(.placeholder)',
       placeholder: 'swimlane placeholder',
       distance: 7,
@@ -109,15 +110,12 @@ 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();
@@ -126,8 +124,7 @@ 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');
@@ -157,14 +154,11 @@ 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
@@ -175,53 +169,19 @@ 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));
           }
         }
       },
     });
 
-    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) {
-        $swimlanesDom.sortable({
-          handle: '.js-swimlane-header-handle',
-        });
-      } else if (!Utils.isMiniScreen() && !showDesktopDragHandles) {
-        $swimlanesDom.sortable({
-          handle: '.swimlane-header',
-        });
-      }
-
-      // Disable drag-dropping if the current user is not a board member
-      $swimlanesDom.sortable('option', 'disabled', !userIsMember());
-    });
+    // ugly touch event hotfix
+    enableClickOnTouch('.js-swimlane:not(.placeholder)');
 
     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
@@ -233,55 +193,47 @@ BlazeComponent.extendComponent({
   },
 
   isViewSwimlanes() {
-    currentUser = Meteor.user();
-    if (currentUser) {
-      return (currentUser.profile || {}).boardView === 'board-view-swimlanes';
-    } else {
-      return cookies.get('boardView') === 'board-view-swimlanes';
-    }
+    const currentUser = Meteor.user();
+    if (!currentUser) return false;
+    return ((currentUser.profile || {}).boardView === 'board-view-swimlanes');
   },
 
   isViewLists() {
-    currentUser = Meteor.user();
-    if (currentUser) {
-      return (currentUser.profile || {}).boardView === 'board-view-lists';
-    } else {
-      return cookies.get('boardView') === 'board-view-lists';
-    }
+    const currentUser = Meteor.user();
+    if (!currentUser) return true;
+    return ((currentUser.profile || {}).boardView === 'board-view-lists');
   },
 
   isViewCalendar() {
-    currentUser = Meteor.user();
-    if (currentUser) {
-      return (currentUser.profile || {}).boardView === 'board-view-cal';
-    } else {
-      return cookies.get('boardView') === 'board-view-cal';
-    }
+    const currentUser = Meteor.user();
+    if (!currentUser) return false;
+    return ((currentUser.profile || {}).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.
-        mouseup() {
-          if (this._isDragging) {
-            this._isDragging = false;
-          }
-        },
+    return [{
+      // XXX The board-overlay div should probably be moved to the parent
+      // component.
+      'mouseenter .board-overlay'() {
+        if (this.mouseHasEnterCardDetails) {
+          this.showOverlay.set(false);
+        }
       },
-    ];
+      'mouseup'() {
+        if (this._isDragging) {
+          this._isDragging = false;
+        }
+      },
+    }];
   },
 
   // XXX Flow components allow us to avoid creating these two setter methods by
@@ -293,24 +245,23 @@ 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');
     });
   },
@@ -322,8 +273,7 @@ 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
@@ -333,7 +283,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',
       },
@@ -341,45 +291,19 @@ BlazeComponent.extendComponent({
       events(start, end, timezone, callback) {
         const currentBoard = Boards.findOne(Session.get('currentBoard'));
         const events = [];
-        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}` : '');
+        currentBoard.cardsInInterval(start.toDate(), end.toDate()).forEach(function(card){
           events.push({
             id: card._id,
-            title,
-            start,
-            end: end || card.endAt,
-            allDay:
-              Math.abs(end.getTime() - start.getTime()) / 1000 === 24 * 3600,
+            title: card.title,
+            start: card.startAt,
+            end: card.endAt,
+            allDay: Math.abs(card.endAt.getTime() - card.startAt.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);
       },
@@ -413,11 +337,8 @@ BlazeComponent.extendComponent({
     };
   },
   isViewCalendar() {
-    currentUser = Meteor.user();
-    if (currentUser) {
-      return (currentUser.profile || {}).boardView === 'board-view-cal';
-    } else {
-      return cookies.get('boardView') === 'board-view-cal';
-    }
+    const currentUser = Meteor.user();
+    if (!currentUser) return false;
+    return ((currentUser.profile || {}).boardView === 'board-view-cal');
   },
 }).register('calendarView');

client/components/boards/boardBody.styl

@@ -53,81 +53,3 @@ position()
         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

@@ -216,9 +216,7 @@ setBoardColor(color)
 .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.
+  // RELAX MODE: light green backgroud, when green background color selected.
   .ui-sortable
     background-color:#a7e366
 
@@ -231,65 +229,3 @@ setBoardColor(color)
 
   .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,11 +77,6 @@ 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}}")
@@ -90,6 +85,15 @@ 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'}}
+      else if currentUser.isBoardAdmin
+        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
@@ -98,14 +102,8 @@ template(name="boardHeaderBar")
       unless currentBoard.isTemplatesBoard
         a.board-header-btn.js-toggle-board-view(
           title="{{_ 'board-view'}}")
-          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}}
+          i.fa.fa-th-large
+          span {{#if currentUser.profile.boardView}}{{_ currentUser.profile.boardView}}{{else}}{{_ 'board-view-lists'}}{{/if}}
 
       if canModifyBoard
         a.board-header-btn.js-multiselection-activate(
@@ -170,30 +168,6 @@ 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
-
 template(name="createBoard")
   form
     label
@@ -220,20 +194,6 @@ 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

client/components/boards/boardHeader.js

@@ -1,7 +1,3 @@
-/*
-const DOWNCLS = 'fa-sort-down';
-const UPCLS = 'fa-sort-up';
-*/
 Template.boardMenuPopup.events({
   'click .js-rename-board': Popup.open('boardChangeTitle'),
   'click .js-custom-fields'() {
@@ -30,25 +26,34 @@ Template.boardMenuPopup.events({
   'click .js-outgoing-webhooks': Popup.open('outgoingWebhooks'),
   'click .js-import-board': Popup.open('chooseBoardSource'),
   'click .js-subtask-settings': Popup.open('boardSubtaskSettings'),
-  'click .js-card-settings': Popup.open('boardCardSettings'),
+});
+
+Template.boardMenuPopup.helpers({
+  exportUrl() {
+    const params = {
+      boardId: Session.get('currentBoard'),
+    };
+    const queryParams = {
+      authToken: Accounts._storedLoginToken(),
+    };
+    return FlowRouter.path('/api/boards/:boardId/export', params, queryParams);
+  },
+  exportFilename() {
+    const boardId = Session.get('currentBoard');
+    return `wekan-export-board-${boardId}.json`;
+  },
 });
 
 Template.boardChangeTitlePopup.events({
-  submit(event, templateInstance) {
-    const newTitle = templateInstance
-      .$('.js-board-name')
-      .val()
-      .trim();
-    const newDesc = templateInstance
-      .$('.js-board-desc')
-      .val()
-      .trim();
+  submit(evt, tpl) {
+    const newTitle = tpl.$('.js-board-name').val().trim();
+    const newDesc = tpl.$('.js-board-desc').val().trim();
     if (newTitle) {
       this.rename(newTitle);
       this.setDescription(newDesc);
       Popup.close();
     }
-    event.preventDefault();
+    evt.preventDefault();
   },
 });
 
@@ -69,111 +74,69 @@ 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'));
-        },
-        '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');
-        },
+    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'() {
+        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');
+        } else {
+          currentUser.setBoardView('board-view-swimlanes');
+        }
+      },
+      '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()
-    );
-  },
-  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();
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
   },
 });
 
@@ -201,17 +164,15 @@ const CreateBoard = BlazeComponent.extendComponent({
     this.visibilityMenuIsOpen.set(!this.visibilityMenuIsOpen.get());
   },
 
-  onSubmit(event) {
-    event.preventDefault();
+  onSubmit(evt) {
+    evt.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',
@@ -222,28 +183,26 @@ const CreateBoard = BlazeComponent.extendComponent({
   },
 
   events() {
-    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'),
+    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'),
+    }];
   },
 }).register('createBoardPopup');
 
 (class HeaderBarCreateBoard extends CreateBoard {
-  onSubmit(event) {
-    super.onSubmit(event);
+  onSubmit(evt) {
+    super.onSubmit(evt);
     // Immediately star boards crated with the headerbar popup.
     Meteor.user().toggleBoardStar(this.boardId.get());
   }
-}.register('headerBarCreateBoardPopup'));
+}).register('headerBarCreateBoardPopup');
 
 BlazeComponent.extendComponent({
   visibilityCheck() {
@@ -259,11 +218,9 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [
-      {
-        'click .js-select-visibility': this.selectBoardVisibility,
-      },
-    ];
+    return [{
+      'click .js-select-visibility': this.selectBoardVisibility,
+    }];
   },
 }).register('boardChangeVisibilityPopup');
 
@@ -278,93 +235,13 @@ 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

@@ -1,10 +1,10 @@
 template(name="boardList")
   .wrapper
-    ul.board-list.clearfix.js-boards
+    ul.board-list.clearfix
       li.js-add-board
         a.board-list-item.label {{_ 'add-board'}}
       each boards
-        li(class="{{#if isStarred}}starred{{/if}}" class=colorClass).js-board
+        li(class="{{#if isStarred}}starred{{/if}}" class=colorClass)
           if isInvited
             .board-list-item
               span.details
@@ -31,31 +31,15 @@ template(name="boardList")
                   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}}")
-                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 isAdministrable
-                    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'}}")
+                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 {{_ title }}
+  h1 {{_ 'my-boards'}}
   .board-header-btns.right
     a.board-header-btn.js-open-archived-board
       i.fa.fa-archive

client/components/boards/boardsList.js

@@ -1,5 +1,4 @@
 const subManager = new SubsManager();
-const { calculateIndex } = Utils;
 
 Template.boardListHeaderBar.events({
   'click .js-open-archived-board'() {
@@ -8,14 +7,11 @@ Template.boardListHeaderBar.events({
 });
 
 Template.boardListHeaderBar.helpers({
-  title() {
-    return FlowRouter.getRouteName() === 'home' ? 'my-boards' : 'public';
-  },
   templatesBoardId() {
-    return Meteor.user() && Meteor.user().getTemplatesBoardId();
+    return Meteor.user().getTemplatesBoardId();
   },
   templatesBoardSlug() {
-    return Meteor.user() && Meteor.user().getTemplatesBoardSlug();
+    return Meteor.user().getTemplatesBoardSlug();
   },
 });
 
@@ -24,77 +20,17 @@ BlazeComponent.extendComponent({
     Meteor.subscribe('setting');
   },
 
-  onRendered() {
-    const self = this;
-    function userIsAllowedToMove() {
-      return Meteor.user();
-    }
-
-    const itemsSelector = '.js-board:not(.placeholder)';
-
-    const $boards = this.$('.js-boards');
-    $boards.sortable({
-      connectWith: '.js-boards',
-      tolerance: 'pointer',
-      appendTo: '.board-list',
-      helper: 'clone',
-      distance: 7,
-      items: itemsSelector,
-      placeholder: 'board-wrapper placeholder',
-      start(evt, ui) {
-        ui.helper.css('z-index', 1000);
-        ui.placeholder.height(ui.helper.height());
-        EscapeActions.executeUpTo('popup-close');
-      },
-      stop(evt, ui) {
-        // To attribute the new index number, we need to get the DOM element
-        // of the previous and the following card -- if any.
-        const prevBoardDom = ui.item.prev('.js-board').get(0);
-        const nextBoardBom = ui.item.next('.js-board').get(0);
-        const sortIndex = calculateIndex(prevBoardDom, nextBoardBom, 1);
-
-        const boardDomElement = ui.item.get(0);
-        const board = Blaze.getData(boardDomElement);
-        // Normally the jquery-ui sortable library moves the dragged DOM element
-        // to its new position, which disrupts Blaze reactive updates mechanism
-        // (especially when we move the last card of a list, or when multiple
-        // users move some cards at the same time). To prevent these UX glitches
-        // we ask sortable to gracefully cancel the move, and to put back the
-        // DOM in its initial state. The card move is then handled reactively by
-        // Blaze with the below query.
-        $boards.sortable('cancel');
-
-        board.move(sortIndex.base);
-      },
-    });
-
-    // Disable drag-dropping if the current user is not a board member or is comment only
-    this.autorun(() => {
-      $boards.sortable('option', 'disabled', !userIsAllowedToMove());
-    });
-  },
-
   boards() {
-    let query = {
+    return Boards.find({
       archived: false,
+      'members.userId': Meteor.userId(),
       type: 'board',
-    };
-    if (FlowRouter.getRouteName() === 'home')
-      query['members.userId'] = Meteor.userId();
-    else query.permission = 'public';
-
-    return Boards.find(query, {
-      sort: { sort: 1 /* boards default sorting */ },
-    });
+    }, { sort: ['title'] });
   },
   isStarred() {
     const user = Meteor.user();
     return user && user.hasStarred(this.currentData()._id);
   },
-  isAdministrable() {
-    const user = Meteor.user();
-    return user && user.isBoardAdmin(this.currentData()._id);
-  },
 
   hasOvertimeCards() {
     subManager.subscribe('board', this.currentData()._id, false);
@@ -112,49 +48,46 @@ 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();
-        },
-        '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');
-            }
-          });
-        },
+    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.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

@@ -11,19 +11,6 @@ $spaceBetweenTiles = 16px
     box-sizing: border-box
     position: relative
 
-    &.placeholder:after
-      content: '';
-      display: block;
-      background: darken(white, 20%)
-      border-radius: 3px;
-      height: 106px;
-      margin: 8px;
-
-    &.ui-sortable-helper
-      cursor: grabbing
-      transform: rotate(4deg)
-      display: block !important
-
     &.starred
       .fa-star,
       .fa-star-o
@@ -33,7 +20,7 @@ $spaceBetweenTiles = 16px
     overflow: hidden;
     background-color: #999
     color: #f6f6f6
-    height: auto
+    height: 90px
     font-size: 16px
     line-height: 22px
     border-radius: 3px
@@ -44,7 +31,6 @@ $spaceBetweenTiles = 16px
     margin: ($spaceBetweenTiles/2)
     position: relative
     text-decoration: none
-    word-wrap: break-word
 
     &.tile
       background-size: auto
@@ -197,11 +183,10 @@ $spaceBetweenTiles = 16px
     overflow: scroll
 
     li
-      width: 50%
+      width: 33.3%
 
     .board-list-item
       overflow: hidden
-      height: 8rem
 
     .board-list-item-sub-name
       position: relative
@@ -210,4 +195,4 @@ $spaceBetweenTiles = 16px
 
 @media screen and (max-width: 360px)
     li
-      width: 100%
+      width: 50%

client/components/cards/attachments.jade

@@ -37,23 +37,17 @@ template(name="attachmentsGalery")
               i.fa.fa-download
               | {{_ 'download'}}
             if currentUser.isBoardMember
-              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 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
-      unless currentUser.isCommentOnly
-        unless currentUser.isWorker
-          //li.attachment-item.add-attachment
-          a.js-add-attachment
-            i.fa.fa-plus
-            | {{_ 'add-attachment' }}
+      li.attachment-item.add-attachment
+        a.js-add-attachment {{_ 'add-attachment' }}

client/components/cards/attachments.js

@@ -1,11 +1,10 @@
 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.
@@ -18,8 +17,8 @@ Template.attachmentsGalery.events({
   'click .js-remove-cover'() {
     Cards.findOne(this.cardId).unsetCover();
   },
-  'click .js-preview-image'(event) {
-    Popup.open('previewAttachedImage').call(this, event);
+  'click .js-preview-image'(evt) {
+    Popup.open('previewAttachedImage').call(this, evt);
     // 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.
@@ -32,122 +31,83 @@ 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 = $(event.currentTarget).attr('src');
-    if (img.src === url && img.complete) rePosPopup();
-    else img.onload = rePosPopup;
+    const url = $(evt.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'(event) {
+  'change .js-attach-file'(evt) {
     const card = this;
-    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);
+    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;
       } else {
-        processFile(f);
+        file.boardId = card.boardId;
+        file.swimlaneId = card.swimlaneId;
+        file.listId = card.listId;
+        file.cardId = card._id;
       }
+      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'(event, templateInstance) {
-    templateInstance.find('.js-attach-file').click();
-    event.preventDefault();
+  'click .js-computer-upload'(evt, tpl) {
+    tpl.find('.js-attach-file').click();
+    evt.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
-  const handle = results => {
+  $(document.body).pasteImageReader((results) => {
     if (results.dataURL.startsWith('data:image/')) {
-      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);
-      }
+      $('img.preview-clipboard-image').attr('src', results.dataURL);
+      pastedResults = results;
     }
-  };
-
-  $(document.body).pasteImageReader(handle);
+  });
 
   // we can also drag & drop image file to it
-  $(document.body).dropImageReader(handle);
+  $(document.body).dropImageReader((results) => {
+    if (results.dataURL.startsWith('data:image/')) {
+      $('img.preview-clipboard-image').attr('src', results.dataURL);
+      pastedResults = results;
+    }
+  });
 });
 
 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

@@ -31,10 +31,6 @@ template(name="cardCustomField-text")
                         = value
                 else
                     | {{_ 'edit'}}
-    else
-      +viewer
-        = value
-
 
 template(name="cardCustomField-number")
     if canModifyCard
@@ -49,9 +45,6 @@ template(name="cardCustomField-number")
                     = value
                 else
                     | {{_ 'edit'}}
-    else
-        if value
-            = value
 
 template(name="cardCustomField-date")
     if canModifyCard
@@ -62,11 +55,6 @@ template(name="cardCustomField-date")
                         | {{showDate}}
             else
                 | {{_ 'edit'}}
-    else
-        if value
-            div.card-date
-                time(datetime="{{showISODate}}")
-                    | {{showDate}}
 
 template(name="cardCustomField-dropdown")
     if canModifyCard
@@ -91,7 +79,3 @@ template(name="cardCustomField-dropdown")
                         = selectedItem
                 else
                     | {{_ 'edit'}}
-    else
-        if value
-            +viewer
-                = selectedItem

client/components/cards/cardCustomFields.js

@@ -7,21 +7,22 @@ Template.cardCustomFieldsPopup.helpers({
 });
 
 Template.cardCustomFieldsPopup.events({
-  'click .js-select-field'(event) {
+  'click .js-select-field'(evt) {
     const card = Cards.findOne(Session.get('currentCard'));
     const customFieldId = this._id;
     card.toggleCustomField(customFieldId);
-    event.preventDefault();
+    evt.preventDefault();
   },
-  'click .js-settings'(event) {
+  'click .js-settings'(evt) {
     EscapeActions.executeUpTo('detailsPane');
     Sidebar.setView('customFields');
-    event.preventDefault();
+    evt.preventDefault();
   },
 });
 
 // cardCustomField
 const CardCustomField = BlazeComponent.extendComponent({
+
   getTemplate() {
     return `cardCustomField-${this.data().definition.type}`;
   },
@@ -33,55 +34,52 @@ 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'(event) {
-          event.preventDefault();
-          const value = this.currentComponent().getValue();
-          this.card.setCustomField(this.customFieldId, value);
-        },
+    return [{
+      'submit .js-card-customfield-text'(evt) {
+        evt.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'(event) {
-          event.preventDefault();
-          const value = parseInt(this.find('input').value, 10);
-          this.card.setCustomField(this.customFieldId, value);
-        },
+    return [{
+      'submit .js-card-customfield-number'(evt) {
+        evt.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;
@@ -110,10 +108,8 @@ 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 '';
@@ -124,13 +120,12 @@ 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 {
@@ -149,10 +144,11 @@ 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;
@@ -164,23 +160,20 @@ 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'(event) {
-          event.preventDefault();
-          const value = this.find('select').value;
-          this.card.setCustomField(this.customFieldId, value);
-        },
+    return [{
+      'submit .js-card-customfield-dropdown'(evt) {
+        evt.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,20 +11,15 @@ 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());
@@ -32,11 +27,13 @@ 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() {
@@ -47,68 +44,59 @@ 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();
-
-          // 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());
-            Popup.close();
-          } else {
-            this.error.set('invalid-date');
-            evt.target.date.focus();
-          }
-        },
-        'click .js-delete-date'(evt) {
-          evt.preventDefault();
-          this._deleteDate();
-          Popup.close();
-        },
+    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');
+
+        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();
+      },
+    }];
   },
 });
 
 Template.dateBadge.helpers({
   canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
-    );
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
   },
 });
 
 // editCardReceivedDatePopup
 (class extends DatePicker {
   onCreated() {
-    super.onCreated(moment().format('YYYY-MM-DD HH:mm'));
-    this.data().getReceived() &&
-      this.date.set(moment(this.data().getReceived()));
+    super.onCreated();
+    this.data().getReceived() && this.date.set(moment(this.data().getReceived()));
   }
 
   _storeDate(date) {
@@ -118,22 +106,20 @@ Template.dateBadge.helpers({
   _deleteDate() {
     this.card.setReceived(null);
   }
-}.register('editCardReceivedDatePopup'));
+}).register('editCardReceivedDatePopup');
+
 
 // editCardStartDatePopup
 (class extends DatePicker {
   onCreated() {
-    super.onCreated(moment().format('YYYY-MM-DD HH:mm'));
+    super.onCreated();
     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());
     }
   }
 
@@ -144,12 +130,12 @@ Template.dateBadge.helpers({
   _deleteDate() {
     this.card.setStart(null);
   }
-}.register('editCardStartDatePopup'));
+}).register('editCardStartDatePopup');
 
 // editCardDueDatePopup
 (class extends DatePicker {
   onCreated() {
-    super.onCreated('1970-01-01 17:00:00');
+    super.onCreated();
     this.data().getDue() && this.date.set(moment(this.data().getDue()));
   }
 
@@ -167,12 +153,12 @@ Template.dateBadge.helpers({
   _deleteDate() {
     this.card.setDue(null);
   }
-}.register('editCardDueDatePopup'));
+}).register('editCardDueDatePopup');
 
 // editCardEndDatePopup
 (class extends DatePicker {
   onCreated() {
-    super.onCreated(moment().format('YYYY-MM-DD HH:mm'));
+    super.onCreated();
     this.data().getEnd() && this.date.set(moment(this.data().getEnd()));
   }
 
@@ -190,7 +176,8 @@ Template.dateBadge.helpers({
   _deleteDate() {
     this.card.setEnd(null);
   }
-}.register('editCardEndDatePopup'));
+}).register('editCardEndDatePopup');
+
 
 // Display received, start, due & end dates
 const CardDate = BlazeComponent.extendComponent({
@@ -237,20 +224,17 @@ 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(startAt)) ||
-      (endAt && theDate.isAfter(endAt)) ||
-      (dueAt && theDate.isAfter(dueAt))
-    )
+    if (((startAt) && (theDate.isAfter(dueAt))) ||
+       ((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() {
@@ -277,10 +261,13 @@ 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;
   }
 
@@ -311,12 +298,17 @@ 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;
   }
 
@@ -345,9 +337,12 @@ class CardEndDate extends CardDate {
     let classes = 'end-date' + ' ';
     const dueAt = this.data().getDue();
     const theDate = this.date.get();
-    if (!dueAt) classes += '';
-    else if (theDate.isBefore(dueAt)) classes += 'current';
-    else if (theDate.isAfter(dueAt)) classes += 'due';
+    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';
     return classes;
   }
 
@@ -367,22 +362,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,27 +4,15 @@ template(name="cardDetails")
       +inlinedForm(classNames="js-card-details-title")
         +editCardTitleForm
       else
-        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
-            input.inline-input(type="text" id="cardURL_copy" value="{{ absoluteUrl }}")
-            a.fa.fa-link.card-copy-button.js-copy-link(
-              class="fa-link"
-              title="{{_ 'copy-card-link-to-clipboard'}}"
-              value="{{ absoluteUrl }}"
-            )
-        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
-            a.fa.fa-link.card-copy-mobile-button
+        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
         h2.card-details-title.js-card-title(
           class="{{#if canModifyCard}}js-open-inlined-form is-editable{{/if}}")
             +viewer
               = getTitle
-            if isWatching
-              i.card-details-watch.fa.fa-eye
+              if isWatching
+                i.fa.fa-eye.card-details-watch
         .card-details-path
           each parentList
             |   >  
@@ -32,7 +20,7 @@ template(name="cardDetails")
           // else
             {{_ 'top-level-card'}}
         if isLinkedCard
-          a.linked-card-location.js-go-to-linked-card
+          h3.linked-card-location
             +viewer
               | {{getBoardTitle}} > {{getTitle}}
 
@@ -43,105 +31,60 @@ template(name="cardDetails")
         p.warning {{_ 'card-archived'}}
 
     .card-details-items
-      if currentBoard.allowsReceivedDate
-        .card-details-item.card-details-item-received
-          h3
-            i.fa.fa-sign-out
-            card-details-item-title {{_ 'card-received'}}
-          if getReceived
-            +cardReceivedDate
-          else
-            if canModifyCard
-              unless currentUser.isWorker
-                a.card-label.add-label.js-received-date
-                  i.fa.fa-plus
-
-      if currentBoard.allowsStartDate
-        .card-details-item.card-details-item-start
-          h3
-            i.fa.fa-hourglass-start
-            card-details-item-title {{_ 'card-start'}}
-          if getStart
-            +cardStartDate
-          else
-            if canModifyCard
-              unless currentUser.isWorker
-                a.card-label.add-label.js-start-date
-                  i.fa.fa-plus
-
-      if currentBoard.allowsDueDate
-        .card-details-item.card-details-item-due
-          h3
-            i.fa.fa-sign-in
-            card-details-item-title {{_ 'card-due'}}
-          if getDue
-            +cardDueDate
-          else
-            if canModifyCard
-              unless currentUser.isWorker
-                a.card-label.add-label.js-due-date
-                  i.fa.fa-plus
-
-      if currentBoard.allowsEndDate
-        .card-details-item.card-details-item-end
-          h3
-            i.fa.fa-hourglass-end
-            card-details-item-title {{_ 'card-end'}}
-          if getEnd
-            +cardEndDate
-          else
-            if canModifyCard
-              unless currentUser.isWorker
-                a.card-label.add-label.js-end-date
-                  i.fa.fa-plus
-
-      //.card-details-items
-      if currentBoard.allowsMembers
-        .card-details-item.card-details-item-members
-          h3
-            i.fa.fa-users
-            card-details-item-title {{_ 'members'}}
-          each getMembers
-            +userAvatar(userId=this cardId=../_id)
-            | {{! XXX Hack to hide syntaxic coloration /// }}
+      .card-details-item.card-details-item-received
+        h3.card-details-item-title {{_ 'card-received'}}
+        if getReceived
+          +cardReceivedDate
+        else
           if canModifyCard
-            unless currentUser.isWorker
-              a.member.add-member.card-details-item-add-button.js-add-members(title="{{_ 'card-members-title'}}")
-                i.fa.fa-plus
+            a.js-received-date {{_ 'add'}}
 
-      //if assigneeSelected
-      if currentBoard.allowsAssignee
-        .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 /// }}
+      .card-details-item.card-details-item-start
+        h3.card-details-item-title {{_ 'card-start'}}
+        if getStart
+          +cardStartDate
+        else
           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
+            a.js-start-date {{_ 'add'}}
 
-      if currentBoard.allowsLabels
-        .card-details-item.card-details-item-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)
-                +viewer
-                  = name
+      .card-details-item.card-details-item-due
+        h3.card-details-item-title {{_ 'card-due'}}
+        if getDue
+          +cardDueDate
+        else
           if canModifyCard
-            unless currentUser.isWorker
-              a.card-label.add-label.js-add-labels(title="{{_ 'card-labels-title'}}")
-                i.fa.fa-plus
+            a.js-due-date {{_ 'add'}}
 
-      //.card-details-items
+      .card-details-item.card-details-item-end
+        h3.card-details-item-title {{_ 'card-end'}}
+        if getEnd
+          +cardEndDate
+        else
+          if canModifyCard
+            a.js-end-date {{_ 'add'}}
+
+    .card-details-items
+      .card-details-item.card-details-item-members
+        h3.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'}}")
+            i.fa.fa-plus
+
+      .card-details-item.card-details-item-labels
+        h3.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)
+              +viewer
+                = name
+        if canModifyCard
+          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
@@ -149,7 +92,7 @@ template(name="cardDetails")
               = definition.name
           +cardCustomField
 
-      //.card-details-items
+    .card-details-items
       if getSpentTime
         .card-details-item.card-details-item-spent
           if getIsOvertime
@@ -158,124 +101,84 @@ template(name="cardDetails")
             h3.card-details-item-title {{_ 'spent-time-hours'}}
           +cardSpentTime
 
-      //.card-details-items
-      if currentBoard.allowsRequestedBy
-        .card-details-item.card-details-item-name
-          h3
-            i.fa.fa-shopping-cart
-            card-details-item-title {{_ 'requested-by'}}
-          if canModifyCard
-            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
-
-      if currentBoard.allowsAssignedBy
-        .card-details-item.card-details-item-name
-          h3
-            i.fa.fa-user-plus
-            card-details-item-title {{_ 'assigned-by'}}
-          if canModifyCard
-            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
-
-    if getVoteQuestion
-      hr
-      .vote-title
-        h3
-          i.fa.fa-thumbs-up
-          card-details-item-title {{_ 'vote-question'}}
-        .vote-result
-          if votePublic
-            a.card-label.card-label-green.js-show-positive-votes {{ voteCountPositive }}
-            a.card-label.card-label-red.js-show-negative-votes {{ voteCountNegative }}
-          else
-            .card-label.card-label-green {{ voteCountPositive }}
-            .card-label.card-label-red {{ voteCountNegative }}
-      +viewer
-        = getVoteQuestion
-      button.card-details-green.js-vote.js-vote-positive(class="{{#if voteState}}voted{{/if}}") {{_ 'vote-for-it'}}
-      button.card-details-red.js-vote.js-vote-negative(class="{{#if $eq voteState false}}voted{{/if}}") {{_ 'vote-against'}}
-
     //- XXX We should use "editable" to avoid repetiting ourselves
     if canModifyCard
-      unless currentUser.isWorker
-        if currentBoard.allowsDescriptionTitle
-          hr
-          h3
-            i.fa.fa-align-left
-            card-details-item-title {{_ 'description'}}
-        if currentBoard.allowsDescriptionText
-          +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
+      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
-            if currentBoard.allowsDescriptionText
-              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'}}
+            | {{_ '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
-      if currentBoard.allowsDescriptionTitle
-        hr
-        h3.card-details-item-title {{_ 'description'}}
-      if currentBoard.allowsDescriptionText
-        +viewer
-          = getDescription
+      h3.card-details-item-title {{_ 'description'}}
+      +viewer
+        = getDescription
 
-    .card-checklist-attachmentGalerys
-      .card-checklist-attachmentGalery.card-checklists
-        if currentBoard.allowsChecklists
-          hr
-          +checklists(cardId = _id)
-        if currentBoard.allowsSubtasks
-          hr
-          +subtasks(cardId = _id)
-      if currentBoard.allowsAttachments
-        hr
-        h3
-          i.fa.fa-paperclip
-          | {{_ 'attachments'}}
-        .card-checklist-attachmentGalery.card-attachmentGalery
-          +attachmentsGalery
+    .card-details-items
+      .card-details-item.card-details-item-name
+        h3.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'}}
+        else if getRequestedBy
+          +viewer
+            = getRequestedBy
+
+      .card-details-item.card-details-item-name
+        h3.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'}}
+        else if getRequestedBy
+          +viewer
+            = getAssignedBy
+
+    hr
+    +checklists(cardId = _id)
+
+    if currentBoard.allowsSubtasks
+      hr
+      +subtasks(cardId = _id)
+
+    hr
+    h3
+      i.fa.fa-paperclip
+      | {{_ 'attachments'}}
+
+    +attachmentsGalery
 
     hr
     unless currentUser.isNoComments
       .activity-title
-        h3
-          i.fa.fa-history
-          | {{ _ 'activity'}}
+        h3 {{ _ 'activity'}}
         if currentUser.isBoardMember
           .material-toggle-switch
             span.toggle-switch-title {{_ 'hide-system-messages'}}
@@ -284,10 +187,9 @@ template(name="cardDetails")
             else
               input.toggle-switch(type="checkbox" id="toggleButton")
             label.toggle-label(for="toggleButton")
-    if currentBoard.allowsComments
-      if currentUser.isBoardMember
-        unless currentUser.isNoComments
-          +commentForm
+    if currentUser.isBoardMember
+      unless currentUser.isNoComments
+        +commentForm
     unless currentUser.isNoComments
       if isLoaded.get
         if isLinkedCard
@@ -318,89 +220,32 @@ template(name="editCardAssignerForm")
 
 template(name="cardDetailsActionsPopup")
   ul.pop-over-list
-    li
-      a.js-toggle-watch-card
-        if isWatching
-          i.fa.fa-eye
-          |  {{_ 'unwatch'}}
-        else
-          i.fa.fa-eye-slash
-          |  {{_ 'watch'}}
+    li: a.js-toggle-watch-card {{#if isWatching}}{{_ 'unwatch'}}{{else}}{{_ 'watch'}}{{/if}}
   if canModifyCard
-    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'}}
-        if getVoteQuestion
-          li
-            a.js-cancel-voting
-              i.fa.fa-thumbs-up
-              | {{_ 'card-cancel-voting'}}
-        else
-          li
-            a.js-start-voting
-              i.fa.fa-thumbs-up
-              | {{_ 'card-start-voting'}}
-        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
+    hr
     ul.pop-over-list
-      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'}}
+      //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'}}
       unless archived
-        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'}}
+        li: a.js-archive {{_ 'archive-card'}}
+      li: a.js-more {{_ 'cardMorePopup-title'}}
 
 template(name="moveCardPopup")
   +boardsAndLists
@@ -451,67 +296,6 @@ 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
@@ -566,35 +350,3 @@ template(name="cardDeletePopup")
   unless archived
    p {{_ "card-delete-suggest-archive"}}
   button.js-confirm.negate.full(type="submit") {{_ 'delete'}}
-
-template(name="cardStartVotingPopup")
-  form.edit-vote-question
-    .fields
-      label(for="vote") {{_ 'vote-question'}}
-      input.js-vote-field#vote(type="text" name="vote" value="{{card.getVoteQuestion}}" autofocus)
-      label(for="vote-public") {{_ 'vote-public'}}
-        a.js-toggle-vote-public
-          .materialCheckBox#vote-public(name="vote-public")
-
-    button.primary.confirm.js-submit {{_ 'save'}}
-    //- button.js-remove-color.negate.wide.right {{_ 'delete'}}
-
-template(name="positiveVoteMembersPopup")
-  ul.pop-over-list.js-card-member-list
-    each m in voteMemberPositive
-      li.item
-        a.name
-          +userAvatar(userId=m._id)
-          span.full-name
-            = m.profile.fullname
-            | (<span class="username">{{ m.username }}</span>)
-
-template(name="negativeVoteMembersPopup")
-  ul.pop-over-list.js-card-member-list
-    each m in voteMemberNegative
-      li.item
-        a.name
-          +userAvatar(userId=m._id)
-          span.full-name
-            = m.profile.fullname
-            | (<span class="username">{{ m.username }}</span>)

client/components/cards/cardDetails.styl

@@ -1,86 +1,5 @@
 @import 'nib'
 
-// Assignee, code copied from wekan/client/users/userAvatar.styl
-
-avatar-radius = 50%
-
-#cardURL_copy
-  // Have clipboard text not visible by moving it to far left
-  position: absolute
-  left: -2000px
-  top: 0px
-
-.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
@@ -94,18 +13,17 @@ avatar-radius = 50%
   animation: flexGrowIn 0.1s
   box-shadow: 0 0 7px 0 darken(white, 30%)
   transition: flex-basis 0.1s
-  box-sizing: border-box
 
   .mCustomScrollBox
     padding-left: 0
 
   .ps-scrollbar-y-rail
     pointer-event: all
-    position: absolute
+    position: absolute;
 
   .card-details-canvas
     width: 470px
-    padding-left: 20px
+    padding-left: 20px;
 
   .card-details-header
     margin: 0 -20px 5px
@@ -114,11 +32,7 @@ avatar-radius = 50%
     border-bottom: 1px solid darken(white, 14%)
 
     .close-card-details,
-    .card-details-menu,
-    .card-copy-button,
-    .card-copy-mobile-button,
-    .close-card-details-mobile-web,
-    .card-details-menu-mobile-web
+    .card-details-menu
       float: right
 
     .close-card-details
@@ -126,30 +40,10 @@ avatar-radius = 50%
       padding: 5px
       margin-right: -8px
 
-    .close-card-details-mobile-web
-      font-size: 24px
-      padding: 5px
-      margin-right: 40px
-
-    .card-copy-button
-      font-size: 17px
-      padding: 10px
-      margin-right: 10px
-
-    .card-copy-mobile-button
-      font-size: 17px
-      padding: 10px
-      margin-right: 10px
-
     .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
@@ -192,6 +86,11 @@ avatar-radius = 50%
     display: flex
     flex-wrap: wrap
     margin: 15px 0
+    & ~ .js-open-inlined-form
+        .viewer
+            background-color #ffffff !important
+            padding 15px !important
+            border 1px solid #000000 !important
 
     .card-details-item
       margin-right: 0.5em
@@ -199,16 +98,13 @@ avatar-radius = 50%
         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
-        display: block
-        word-wrap: break-word
-        max-width: 48%
+        max-width: 50%
         flex-grow: 1
 
   .card-details-item-title
@@ -235,14 +131,14 @@ input[type="submit"].attachment-add-link-submit
 
 @media screen and (max-width: 800px)
   .card-details
-    width: calc(100% - 1px)
+    width: calc(100% - 40px)
     padding: 0px 20px 0px 20px
     margin: 0px
     transition: none
 
     .card-details-canvas
       width: 100%
-      padding-left: 0px
+      padding-left: 0px;
 
     .card-details-header
       .close-card-details
@@ -331,13 +227,3 @@ card-details-color(background, color...)
 
 .card-details-indigo
   card-details-color(#4b0082, #ffffff) //White text for better visibility
-
-.voted
-  opacity: .7
-.vote-title
-  display: flex
-  justify-content: space-between
-.vote-result
-  display: flex
-.js-show-positive-votes
-  cursor: pointer

client/components/cards/cardTime.js

@@ -20,31 +20,29 @@ 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);
-            Popup.close();
-          } else {
-            this.error.set('invalid-time');
-            evt.target.time.focus();
-          }
-        },
-        'click .js-delete-time'(evt) {
-          evt.preventDefault();
-          this.deleteTime();
+        if (spentTime >= 0) {
+          this.storeTime(spentTime, isOvertime);
           Popup.close();
-        },
-        'click a.js-toggle-overtime': this.toggleOvertime,
+        } else {
+          this.error.set('invalid-time');
+          evt.target.time.focus();
+        }
       },
-    ];
+      'click .js-delete-time'(evt) {
+        evt.preventDefault();
+        this.deleteTime();
+        Popup.close();
+      },
+      'click a.js-toggle-overtime': this.toggleOvertime,
+    }];
   },
 }).register('editCardSpentTimePopup');
 
@@ -58,33 +56,23 @@ 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,7 +1,5 @@
 template(name="checklists")
-  h3
-    i.fa.fa-check
-    | {{_ 'checklists'}}
+  h3 {{_ 'checklists'}}
   if toggleDeleteDialog.get
     .board-overlay#card-details-overlay
     +checklistDeleteDialog(checklist = checklistToDelete)
@@ -88,8 +86,7 @@ template(name="checklistItems")
 template(name='checklistItemDetail')
   .js-checklist-item.checklist-item
     if canModifyCard
-      .check-box-container
-        .check-box.materialCheckBox(class="{{#if item.isFinished }}is-checked{{/if}}")
+      .check-box.materialCheckBox(class="{{#if item.isFinished }}is-checked{{/if}}")
       .item-title.js-open-inlined-form.is-editable(class="{{#if item.isFinished }}is-checked{{/if}}")
         +viewer
           = item.title

client/components/cards/checklists.js

@@ -1,4 +1,4 @@
-const { calculateIndexData, capitalize } = Utils;
+const { calculateIndexData, enableClickOnTouch } = Utils;
 
 function initSorting(items) {
   items.sortable({
@@ -36,6 +36,9 @@ function initSorting(items) {
       checklistItem.move(checklistId, sortIndex.base);
     },
   });
+
+  // ugly touch event hotfix
+  enableClickOnTouch('.js-checklist-item:not(.placeholder)');
 }
 
 BlazeComponent.extendComponent({
@@ -51,37 +54,30 @@ BlazeComponent.extendComponent({
       return Meteor.user() && Meteor.user().isBoardMember();
     }
 
-    // Disable sorting if the current user is not a board member or is a miniscreen
+    // Disable sorting if the current user is not a board member
     self.autorun(() => {
       const $itemsDom = $(self.itemsDom);
-      if ($itemsDom.data('uiSortable') || $itemsDom.data('sortable')) {
-        $(self.itemsDom).sortable(
-          'option',
-          'disabled',
-          !userIsMember() || Utils.isMiniScreen(),
-        );
+      if ($itemsDom.data('sortable')) {
+        $(self.itemsDom).sortable('option', 'disabled', !userIsMember());
       }
     });
   },
 
   canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
-    );
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
   },
 }).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({
@@ -90,9 +86,7 @@ BlazeComponent.extendComponent({
         sort: card.checklists().count(),
       });
       setTimeout(() => {
-        this.$('.add-checklist-item')
-          .last()
-          .click();
+        this.$('.add-checklist-item').last().click();
       }, 100);
     }
     textarea.value = '';
@@ -119,12 +113,7 @@ BlazeComponent.extendComponent({
   },
 
   canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
-    );
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
   },
 
   deleteChecklist() {
@@ -175,57 +164,40 @@ BlazeComponent.extendComponent({
     }
   },
 
-  focusChecklistItem(event) {
-    // If a new checklist is created, pre-fill the title and select it.
-    const checklist = this.currentData().checklist;
-    if (!checklist) {
-      const textarea = event.target;
-      textarea.value = capitalize(TAPi18n.__('r-checklist'));
-      textarea.select();
-    }
-  },
-
   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,
-        'focus .js-add-checklist-item': this.focusChecklistItem,
-        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);
     }
   });
@@ -234,17 +206,12 @@ 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() &&
-      !Meteor.user().isWorker()
-    );
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
   },
 });
 
@@ -257,10 +224,8 @@ BlazeComponent.extendComponent({
     }
   },
   events() {
-    return [
-      {
-        'click .js-checklist-item .check-box-container': this.toggleItem,
-      },
-    ];
+    return [{
+      'click .js-checklist-item .check-box': this.toggleItem,
+    }];
   },
 }).register('checklistItemDetail');

client/components/cards/checklists.styl

@@ -113,9 +113,6 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
   &:hover
     background-color: darken(white, 8%)
 
-  .check-box-container
-    padding-right: 1px;
-
   .check-box
     margin: 0.1em 0 0 0;
     &.is-checked
@@ -124,16 +121,13 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
 
   .item-title
     flex: 1
-    margin-left: 10px;
+    padding-left: 10px;
     &.is-checked
       color: #8c8c8c
       font-style: italic
     & .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.js

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

client/components/cards/labels.styl

@@ -10,10 +10,9 @@
   margin-right: 4px
   margin-bottom: 5px
   padding: 3px 8px
-  max-width: 210px
+  max-width: 100%
   min-width: 8px
   overflow: ellipsis
-  word-wrap: break-word
   height: 18px
   vertical-align: bottom
 
@@ -158,8 +157,6 @@
 
 .edit-labels-pop-over
   margin-bottom: 8px
-  .card-label .viewer p
-    margin: 0
 
 .edit-labels-pop-over .shortcut
   display: inline-block

client/components/cards/minicard.jade

@@ -3,25 +3,15 @@ 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
-          unless hiddenMinicardLabelText
-            span.card-label(class="card-label-{{color}}" title=name)
-              +viewer
-                = name
-          if hiddenMinicardLabelText
-            .minicard-label(class="card-label-{{color}}" title="{{name}}")
+          .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 ' > ' }}
@@ -58,8 +48,6 @@ template(name="minicard")
       if getDue
         .date
           +minicardDueDate
-      if getEnd
-         +minicardEndDate
       if getSpentTime
         .date
           +cardSpentTime
@@ -67,21 +55,14 @@ template(name="minicard")
     .minicard-custom-fields
       each customFieldsWD
         if definition.showOnCard
-          if trueValue
-            .minicard-custom-field
-              if definition.showLabelOnMiniCard
-                .minicard-custom-field-item
-                  +viewer
-                    = definition.name
+          .minicard-custom-field
+            if definition.showLabelOnMiniCard
               .minicard-custom-field-item
                 +viewer
-                  = trueValue
-
-    if getAssignees
-      .minicard-assignees.js-minicard-assignees
-        each getAssignees
-          +userAvatar(userId=this)
-        hr
+                  = definition.name
+            .minicard-custom-field-item
+              +viewer
+                = trueValue
 
     if getMembers
       .minicard-members.js-minicard-members
@@ -100,10 +81,6 @@ template(name="minicard")
       if getDescription
         .badge.badge-state-image-only(title=getDescription)
           span.badge-icon.fa.fa-align-left
-      if getVoteQuestion
-        .badge.badge-state-image-only(title=getVoteQuestion)
-          span.badge-icon.fa.fa-thumbs-up
-          span.badge-icon.fa.fa-thumbs-down
       if attachments.count
         .badge
           span.badge-icon.fa.fa-paperclip

client/components/cards/minicard.js

@@ -1,5 +1,3 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
 // Template.cards.events({
 //   'click .member': Popup.open('cardMember')
 // });
@@ -10,46 +8,13 @@ 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

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

client/components/cards/subtasks.jade

@@ -1,7 +1,5 @@
 template(name="subtasks")
-  h3
-    i.fa.fa-sitemap
-    | {{_ 'subtasks'}}
+  h3 {{_ 'subtasks'}}
   if toggleDeleteDialog.get
     .board-overlay#card-details-overlay
     +subtaskDeleteDialog(subtask = subtaskToDelete)

client/components/cards/subtasks.js

@@ -1,15 +1,11 @@
 BlazeComponent.extendComponent({
   canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
-    );
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
   },
 }).register('subtaskDetail');
 
 BlazeComponent.extendComponent({
+
   addSubtask(event) {
     event.preventDefault();
     const textarea = this.find('textarea.js-add-subtask-item');
@@ -20,22 +16,7 @@ BlazeComponent.extendComponent({
     const crtBoard = Boards.findOne(card.boardId);
     const targetBoard = crtBoard.getDefaultSubtasksBoard();
     const listId = targetBoard.getDefaultSubtasksListId();
-
-    //Get the full swimlane data for the parent task.
-    const parentSwimlane = Swimlanes.findOne({
-      boardId: crtBoard._id,
-      _id: card.swimlaneId,
-    });
-    //find the swimlane of the same name in the target board.
-    const targetSwimlane = Swimlanes.findOne({
-      boardId: targetBoard._id,
-      title: parentSwimlane.title,
-    });
-    //If no swimlane with a matching title exists in the target board, fall back to the default swimlane.
-    const swimlaneId =
-      targetSwimlane === undefined
-        ? targetBoard.getDefaultSwimline()._id
-        : targetSwimlane._id;
+    const swimlaneId = targetBoard.getDefaultSwimline()._id;
 
     if (title) {
       const _id = Cards.insert({
@@ -57,10 +38,9 @@ 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 = '';
@@ -68,12 +48,7 @@ BlazeComponent.extendComponent({
   },
 
   canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
-    );
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
   },
 
   deleteSubtask() {
@@ -110,13 +85,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', {
@@ -128,33 +103,27 @@ 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);
     }
   });
@@ -163,17 +132,12 @@ 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() &&
-      !Meteor.user().isWorker()
-    );
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
   },
 });
 

client/components/import/import.jade

@@ -15,6 +15,9 @@ template(name="importTextarea")
     p: label(for='import-textarea') {{_ instruction}} {{_ 'import-board-instruction-about-errors'}}
     textarea.js-import-json(placeholder="{{_ 'import-json-placeholder'}}" autofocus)
       | {{jsonText}}
+    if isSandstorm
+      h1.warning {{_ 'import-sandstorm-backup-warning'}}
+      p.warning {{_ 'import-sandstorm-warning'}}
     input.primary.wide(type="submit" value="{{_ 'import'}}")
 
 template(name="importMapMembers")

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,8 +64,7 @@ BlazeComponent.extendComponent({
       additionalData.membersMapping = mappingById;
     }
     this.membersToMap.set([]);
-    Meteor.call(
-      'importBoard',
+    Meteor.call('importBoard',
       this.importedData.get(),
       additionalData,
       this.importSource,
@@ -77,7 +76,7 @@ BlazeComponent.extendComponent({
           Session.set('fromBoard', null);
           Utils.goBoardId(res);
         }
-      },
+      }
     );
   },
 
@@ -85,12 +84,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;
   },
@@ -110,26 +109,22 @@ 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);
+        }
+      });
     });
   },
 
@@ -154,23 +149,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;
@@ -191,9 +186,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);
   },
@@ -202,7 +197,7 @@ BlazeComponent.extendComponent({
     return this._setPropertyForMember('wekanId', wekanId, null);
   },
 
-  unmapMember(memberId) {
+  unmapMember(memberId){
     return this._setPropertyForMember('wekanId', null, memberId);
   },
 
@@ -211,22 +206,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'(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);
-          }
-        },
-      },
-    ];
+    return [{
+      'submit': this.onSubmit,
+      'click .js-select-member': this.onMapMember,
+    }];
   },
 }).register('importMapMembers');
 
@@ -235,16 +230,14 @@ 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,6 +1,4 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
-const { calculateIndex } = Utils;
+const { calculateIndex, enableClickOnTouch } = Utils;
 
 BlazeComponent.extendComponent({
   // Proxy
@@ -23,16 +21,18 @@ 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,16 +42,10 @@ 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;
@@ -75,16 +69,10 @@ BlazeComponent.extendComponent({
         const listId = Blaze.getData(ui.item.parents('.list').get(0))._id;
         const currentBoard = Boards.findOne(Session.get('currentBoard'));
         let swimlaneId = '';
-        if (
-          Utils.boardView() === 'board-view-swimlanes' ||
-          currentBoard.isTemplatesBoard()
-        )
+        const boardView = (Meteor.user().profile || {}).boardView;
+        if (boardView === 'board-view-swimlanes' || currentBoard.isTemplatesBoard())
           swimlaneId = Blaze.getData(ui.item.parents('.swimlane').get(0))._id;
-        else if (
-          Utils.boardView() === 'board-view-lists' ||
-          Utils.boardView() === 'board-view-cal' ||
-          !Utils.boardView
-        )
+        else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal') || !boardView)
           swimlaneId = currentBoard.getDefaultSwimline()._id;
 
         // Normally the jquery-ui sortable library moves the dragged DOM element
@@ -98,12 +86,7 @@ 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);
@@ -114,38 +97,12 @@ 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 if (!Utils.isMiniScreen() && !showDesktopDragHandles) {
-        $cards.sortable({
-          handle: '.minicard',
-        });
-      }
-
-      if ($cards.data('uiSortable') || $cards.data('sortable')) {
-        $cards.sortable(
-          'option',
-          'disabled',
-          // Disable drag-dropping when user is not member
-          !userIsMember(),
-          // Not disable drag-dropping while in multi-selection mode
-          // MultiSelection.isActive() || !userIsMember(),
-        );
-      }
+      $cards.sortable('option', 'disabled', !userIsMember());
     });
 
     // We want to re-run this function any time a card is added.
@@ -176,19 +133,6 @@ 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

@@ -60,7 +60,6 @@
   background-color: #e4e4e4;
   border-bottom: 6px solid #e4e4e4;
 
-
   &.ui-sortable-handle
     cursor: grab
 
@@ -84,16 +83,17 @@
     padding-left: 10px
     color: #a6a6a6
 
+
   .list-header-menu
     position: absolute
     padding: 27px 19px
     margin-top: 1px
     top: -7px
-    right: 3px
+    right: -7px
 
   .list-header-plus-icon
     color: #a6a6a6
-    margin-right: 15px
+    margin-right: 10px
 
   .highlight
     color: #ce1414
@@ -164,16 +164,7 @@
 
 @media screen and (max-width: 800px)
   .list-header-menu
-    position: absolute
-    padding: 27px 19px
-    margin-top: 1px
-    top: -7px
-    margin-right: 7px
-    right: -3px
-
-  .list-header
-    .list-header-name
-      margin-left: 1.4rem
+    margin-right: 30px
 
   .mini-list
     flex: 0 0 60px
@@ -229,17 +220,9 @@
       padding: 7px
       top: 50%
       transform: translateY(-50%)
-      right: 47px
+      right: 17px
       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
   align-items: baseline

client/components/lists/listBody.js

@@ -16,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) {
@@ -48,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({
@@ -70,15 +70,9 @@ BlazeComponent.extendComponent({
           });
           cardType = 'cardType-linkedBoard';
         }
-      } 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
-      )
+      } else if (boardView === 'board-view-swimlanes')
+        swimlaneId = this.parentComponent().parentComponent().data()._id;
+      else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal') || !boardView)
         swimlaneId = board.getDefaultSwimline()._id;
 
       const _id = Cards.insert({
@@ -97,9 +91,7 @@ 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);
       }
@@ -156,12 +148,9 @@ BlazeComponent.extendComponent({
   },
 
   idOrNull(swimlaneId) {
-    if (
-      Utils.boardView() === 'board-view-swimlanes' ||
-      this.data()
-        .board()
-        .isTemplatesBoard()
-    )
+    const currentUser = Meteor.user();
+    if ((currentUser.profile || {}).boardView === 'board-view-swimlanes' ||
+        this.data().board().isTemplatesBoard())
       return swimlaneId;
     return undefined;
   },
@@ -172,7 +161,8 @@ 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,
@@ -185,33 +175,21 @@ BlazeComponent.extendComponent({
   },
 
   canSeeAddCard() {
-    return (
-      !this.reachedWipLimit() &&
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
-    );
+    return !this.reachedWipLimit() && Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
   },
 
   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');
 
@@ -234,15 +212,10 @@ 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);
   },
 
@@ -254,7 +227,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;
     });
   },
@@ -284,20 +257,18 @@ 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() {
@@ -306,75 +277,66 @@ 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;
-              }),
-            );
-          },
-          template(user) {
-            return user.username;
-          },
-          replace(user) {
-            toggleValueInReactiveArray(editor.members, user._id);
-            return '';
-          },
-          index: 1,
-        },
-
-        // 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,
-        },
-      ],
+    $textarea.escapeableTextComplete([
+      // User mentions
       {
-        // 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;
+        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,
       },
-    );
+
+      // 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,
+      },
+    ], {
+      // 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');
 
@@ -392,28 +354,24 @@ BlazeComponent.extendComponent({
     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 = '';
-    if (Utils.boardView() === 'board-view-swimlanes')
+    const boardView = (Meteor.user().profile || {}).boardView;
+    if (boardView === 'board-view-swimlanes')
       this.swimlaneId = Blaze.getData(swimlane[0])._id;
-    else if (Utils.boardView() === 'board-view-lists' || !Utils.boardView)
-      this.swimlaneId = Swimlanes.findOne({ boardId: this.boardId })._id;
+    else if (boardView === 'board-view-lists' || !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: { sort: 1 /* boards default sorting */ },
-      },
-    );
+    const boards = Boards.find({
+      archived: false,
+      'members.userId': Meteor.userId(),
+      _id: {$ne: Session.get('currentBoard')},
+      type: 'board',
+    }, {
+      sort: ['title'],
+    });
     return boards;
   },
 
@@ -421,7 +379,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;
@@ -431,8 +389,9 @@ 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;
   },
 
@@ -440,84 +399,73 @@ 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(), 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();
-        },
-        '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 [{
+      '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();
+      },
+      '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();
+      },
+    }];
   },
 }).register('linkCardPopup');
 
@@ -527,20 +475,11 @@ 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;
@@ -552,12 +491,7 @@ BlazeComponent.extendComponent({
       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) {
@@ -575,12 +509,11 @@ BlazeComponent.extendComponent({
       subManager.subscribe('board', this.boardId, false);
       this.swimlaneId = '';
       // Swimlane where to insert card
-      const swimlane = $(Popup._getTopStack().openerElement).parents(
-        '.js-swimlane',
-      );
-      if (Utils.boardView() === 'board-view-swimlanes')
+      const swimlane = $(Popup._getTopStack().openerElement).parents('.js-swimlane');
+      if ((Meteor.user().profile || {}).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;
@@ -589,17 +522,14 @@ BlazeComponent.extendComponent({
   },
 
   boards() {
-    const boards = Boards.find(
-      {
-        archived: false,
-        'members.userId': Meteor.userId(),
-        _id: { $ne: Session.get('currentBoard') },
-        type: 'board',
-      },
-      {
-        sort: { sort: 1 /* boards default sorting */ },
-      },
-    );
+    const boards = Boards.find({
+      archived: false,
+      'members.userId': Meteor.userId(),
+      _id: {$ne: Session.get('currentBoard')},
+      type: 'board',
+    }, {
+      sort: ['title'],
+    });
     return boards;
   },
 
@@ -616,7 +546,7 @@ BlazeComponent.extendComponent({
       return board.searchSwimlanes(this.term.get());
     } else if (this.isBoardTemplateSearch) {
       const boards = board.searchBoards(this.term.get());
-      boards.forEach(board => {
+      boards.forEach((board) => {
         subManager.subscribe('board', board.linkedId, false);
       });
       return boards;
@@ -626,69 +556,60 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    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();
-          }
-          Popup.close();
-        },
+    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();
+        }
+        Popup.close();
+      },
+    }];
   },
 }).register('searchElementPopup');
 
@@ -699,40 +620,17 @@ BlazeComponent.extendComponent({
     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;
-    }
+    const boardView = (Meteor.user().profile || {}).boardView;
+    if (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.container).on(`scroll.spinner_${this.swimlaneId}_${this.listId}`, () => this.updateList());
+    $(window).on(`resize.spinner_${this.swimlaneId}_${this.listId}`, () => this.updateList());
 
     this.updateList();
   },
@@ -743,25 +641,9 @@ BlazeComponent.extendComponent({
   },
 
   updateList() {
-    // Use fallback when requestIdleCallback is not available on iOS and Safari
-    // https://www.afasterweb.com/2017/11/20/utilizing-idle-moments/
-    checkIdleTime =
-      window.requestIdleCallback ||
-      function(handler) {
-        const startTime = Date.now();
-        return setTimeout(function() {
-          handler({
-            didTimeout: false,
-            timeRemaining() {
-              return Math.max(0, 50.0 - (Date.now() - startTime));
-            },
-          });
-        }, 1);
-      };
-
     if (this.spinnerInView()) {
       this.cardlimit.set(this.cardlimit.get() + InfiniteScrollIter);
-      checkIdleTime(() => this.updateList());
+      window.requestIdleCallback(() => this.updateList());
     }
   },
 
@@ -778,4 +660,5 @@ BlazeComponent.extendComponent({
 
     return bottomViewPosition > threshold;
   },
+
 }).register('spinnerList');

client/components/lists/listHeader.jade

@@ -9,8 +9,7 @@ template(name="listHeader")
         if currentList
           a.list-header-left-icon.fa.fa-angle-left.js-unselect-list
       h2.list-header-name(
-        title="{{ moment modifiedAt 'LLL' }}"
-        class="{{#if currentUser.isBoardMember}}{{#unless currentUser.isCommentOnly}}{{#unless currentUser.isWorker}}js-open-inlined-form is-editable{{/unless}}{{/unless}}{{/if}}")
+        class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}")
         +viewer
           = title
         if wipLimit.enabled
@@ -32,19 +31,14 @@ template(name="listHeader")
               a.fa.fa-navicon.js-open-list-menu
         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
@@ -55,47 +49,25 @@ template(name="editListTitleForm")
 
 template(name="listActionPopup")
   ul.pop-over-list
-    li
-      a.js-toggle-watch-list
-        if isWatching
-          i.fa.fa-eye
-          |  {{_ 'unwatch'}}
-        else
-          i.fa.fa-eye-slash
-          |  {{_ 'watch'}}
+    li: a.js-toggle-watch-list {{#if isWatching}}{{_ 'unwatch'}}{{else}}{{_ 'watch'}}{{/if}}
   unless currentUser.isCommentOnly
-    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
-            i.fa.fa-check-square
-            | {{_ 'list-select-cards'}}
-    if currentUser.isBoardAdmin
-      ul.pop-over-list
-        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
-            i.fa.fa-arrow-right
-            i.fa.fa-archive
-            | {{_ 'archive-list'}}
     hr
     ul.pop-over-list
-      li
-        a.js-more
-          i.fa.fa-link
-          | {{_ 'listMorePopup-title'}}
+      li: a.js-set-color-list {{_ 'set-color-list'}}
+    hr
+    ul.pop-over-list
+      if cards.count
+        li: a.js-select-cards {{_ 'list-select-cards'}}
+        hr
+    if currentUser.isBoardAdmin
+      ul.pop-over-list
+        li: a.js-set-wip-limit {{#if isWipLimitEnabled }}{{_ 'edit-wip-limit'}}{{else}}{{_ 'setWipLimitPopup-title'}}{{/if}}
+      hr
+    ul.pop-over-list
+      li: a.js-close-list {{_ 'archive-list'}}
+    hr
+    ul.pop-over-list
+      li: a.js-more {{_ 'listMorePopup-title'}}
 
 template(name="boardLists")
   ul.pop-over-list
@@ -115,8 +87,7 @@ template(name="listMorePopup")
       input.inline-input(type="text" readonly value="{{ rootUrl }}")
     | {{_ 'added'}}
     span.date(title=list.createdAt) {{ moment createdAt 'LLL' }}
-    unless currentUser.isWorker
-      a.js-delete {{_ 'delete'}}
+    a.js-delete {{_ 'delete'}}
 
 template(name="listDeletePopup")
   p {{_ "list-delete-pop"}}

client/components/lists/listHeader.js

@@ -1,5 +1,3 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
 let listsColors;
 Meteor.startup(() => {
   listsColors = Lists.simpleSchema()._schema.color.allowedValues;
@@ -8,33 +6,12 @@ Meteor.startup(() => {
 BlazeComponent.extendComponent({
   canSeeAddCard() {
     const list = Template.currentData();
-    return (
-      (!list.getWipLimit('enabled') ||
-        list.getWipLimit('soft') ||
-        !this.reachedWipLimit()) &&
-      !Meteor.user().isWorker()
-    );
+    return !list.getWipLimit('enabled') || list.getWipLimit('soft') || !this.reachedWipLimit();
   },
 
-  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();
+  editTitle(evt) {
+    evt.preventDefault();
+    const newTitle = this.childComponents('inlinedForm')[0].getValue().trim();
     const list = this.currentData();
     if (newTitle) {
       list.rename(newTitle.trim());
@@ -47,31 +24,22 @@ BlazeComponent.extendComponent({
   },
 
   limitToShowCardsCount() {
-    const currentUser = Meteor.user();
-    if (currentUser) {
-      return Meteor.user().getLimitToShowCardsCount();
-    } else {
-      return false;
-    }
+    return Meteor.user().getLimitToShowCardsCount();
   },
 
   cardsCount() {
     const list = Template.currentData();
     let swimlaneId = '';
-    if (Utils.boardView() === 'board-view-swimlanes')
-      swimlaneId = this.parentComponent()
-        .parentComponent()
-        .data()._id;
+    const boardView = (Meteor.user().profile || {}).boardView;
+    if (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) {
@@ -80,44 +48,23 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    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,
+    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',
+        });
       },
-    ];
+      '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');
@@ -129,22 +76,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'(event) {
-    event.preventDefault();
+  'click .js-close-list' (evt) {
+    evt.preventDefault();
     this.archive();
     Popup.close();
   },
@@ -155,17 +102,10 @@ 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();
@@ -175,10 +115,7 @@ 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);
@@ -187,10 +124,7 @@ 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);
@@ -204,26 +138,24 @@ 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);
   }),
@@ -236,7 +168,7 @@ BlazeComponent.extendComponent({
   },
 
   colors() {
-    return listsColors.map(color => ({ color, name: '' }));
+    return listsColors.map((color) => ({ color, name: '' }));
   },
 
   isSelected(color) {
@@ -244,20 +176,18 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    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();
-        },
+    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();
+      },
+    }];
   },
 }).register('setListColorPopup');

client/components/main/editor.js

@@ -1,20 +1,18 @@
 Template.editor.onRendered(() => {
-  const textareaSelector = 'textarea';
-  const mentions = [
+  const $textarea = this.$('textarea');
+
+  autosize($textarea);
+
+  $textarea.escapeableTextComplete([
     // 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 username = Users.findOne(member.userId).username;
+          return username.includes(term) ? username : null;
+        }).filter(Boolean));
       },
       template(value) {
         return value;
@@ -24,242 +22,7 @@ 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', 'underline']],
-          //['fontsize', ['fontsize']],
-          ['color', ['color']],
-        ]
-      : [
-          ['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 = function(input) {
-      const badTags = [
-        'style',
-        'script',
-        'applet',
-        'embed',
-        'noframes',
-        'noscript',
-        'meta',
-        'link',
-        'button',
-        'form',
-      ].join('|');
-      const badPatterns = new RegExp(
-        `(?:${[
-          `<(${badTags})s*[^>][\\s\\S]*?<\\/\\1>`,
-          `<(${badTags})[^>]*?\\/>`,
-        ].join('|')})`,
-        'gi',
-      );
-      let output = input;
-      // remove bad Tags
-      output = output.replace(badPatterns, '');
-      // remove attributes ' style="..."'
-      const badAttributes = new RegExp(
-        `(?:${[
-          'on\\S+=([\'"]?).*?\\1',
-          'href=([\'"]?)javascript:.*?\\2',
-          'style=([\'"]?).*?\\3',
-          'target=\\S+',
-        ].join('|')})`,
-        'gi',
-      );
-      output = output.replace(badAttributes, '');
-      output = output.replace(/(<a )/gi, '$1target=_ '); // always to new target
-      return output;
-    };
-    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;
-      };
-      inputs.each(function(idx, input) {
-        mSummernotes[idx] = $(input).summernote({
-          placeholder,
-          callbacks: {
-            onInit(object) {
-              const originalInput = this;
-              $(originalInput).on('submitted', function() {
-                // when comment is submitted, the original textarea will be set to '', so shall we
-                if (!this.value) {
-                  const sn = getSummernote(this);
-                  sn && sn.summernote('code', '');
-                }
-              });
-              const jEditor = object && object.editable;
-              const toolbar = object && object.toolbar;
-              if (jEditor !== undefined) {
-                jEditor.escapeableTextComplete(mentions);
-              }
-              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);
-                // Fix Pasting text into a card is adding a line before and after
-                // (and multiplies by pasting more) by changing paste "p" to "br".
-                // Fixes https://github.com/wekan/wekan/2890 .
-                // == Fix Start ==
-                someNote.execCommand('defaultParagraphSeparator', false, 'br');
-                // == Fix End ==
-                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';
@@ -270,84 +33,72 @@ import sanitizeXss from 'xss';
 // 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) 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;
+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.]*)/gi;
 
-    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';
-      }
-      // This @user mention link generation did open same Wekan
-      // window in new tab, so now A is changed to U so it's
-      // underlined and there is no link popup. This way also
-      // text can be selected more easily.
-      //const link = HTML.A(
-      const link = HTML.U(
-        {
-          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));
+  let currentMention;
+  while ((currentMention = mentionRegex.exec(content)) !== null) {
+    const [fullMention, username] = currentMention;
+    const knowedUser = _.findWhere(knowedUsers, { username });
+    if (!knowedUser) {
+      continue;
     }
 
-    return HTML.Raw(sanitizeXss(content));
-  }),
-);
+    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'(event, templateInstance) {
-    let prevent = true;
-    const userId = event.currentTarget.dataset.userid;
+  '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;
     if (userId) {
-      Popup.open('member').call({ userId }, event, templateInstance);
-    } else {
-      const href = event.currentTarget.href;
+      Popup.open('member').call({ userId }, evt, tpl);
+    }
+    else {
+      const href = evt.currentTarget.href;
       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.jade

@@ -24,11 +24,6 @@ template(name="header")
             a(href="{{pathFor 'home'}}")
               span.fa.fa-home
               | {{_ 'all-boards'}}
-          li.separator -
-          li
-            a(href="{{pathFor 'public'}}")
-              span.fa.fa-globe
-              | {{_ 'public'}}
           each currentUser.starredBoards
             li.separator -
             li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
@@ -40,8 +35,6 @@ template(name="header")
       a#header-new-board-icon.js-create-board
         i.fa.fa-plus(title="Create a new board")
 
-      +notifications
-
       +headerUserBar
 
   #header(class=currentBoard.colorClass)

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/header.styl

@@ -99,7 +99,7 @@
   height: 28px
   font-size: 12px
   display: flex
-  z-index: 21
+  z-index: 17
 
   #header-user-bar,
   #header-new-board-icon,
@@ -127,7 +127,7 @@
       &.current
         color: darken(white, 5%)
 
-      &:first-child .fa-home,&:nth-child(3) .fa-globe
+      &:first-child .fa-home
         margin-right: 5px
 
       a.js-create-board
@@ -218,9 +218,6 @@
       padding: 10px
       margin: -10px 0 -10px -10px
 
-.announcement .viewer
-  display: inline-block
-
 .announcement,
 .offline-warning
   width: 100%

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,28 +21,20 @@ const validator = {
 };
 
 Template.userFormsLayout.onCreated(function() {
-  const templateInstance = this;
-  templateInstance.currentSetting = new ReactiveVar();
-  templateInstance.isLoading = new ReactiveVar(false);
+  const instance = this;
+  instance.currentSetting = new ReactiveVar();
+  instance.isLoading = new ReactiveVar(false);
 
   Meteor.subscribe('setting', {
     onReady() {
-      templateInstance.currentSetting.set(Settings.findOne());
+      instance.currentSetting.set(Settings.findOne());
       return this.stop();
     },
   });
-  Meteor.call('isPasswordLoginDisabled', (_, result) => {
-    if (result) {
-      $('.at-pwd-form').hide();
-    }
-  });
 });
 
 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) {
@@ -78,8 +70,6 @@ Template.userFormsLayout.helpers({
         name = 'Igbo';
       } else if (lang.name === 'oc') {
         name = 'Occitan';
-      } else if (lang.name === '繁体中文（台湾）') {
-        name = '繁體中文（台灣）';
       }
       return { tag, name };
     }).sort(function(a, b) {
@@ -99,17 +89,18 @@ Template.userFormsLayout.helpers({
 });
 
 Template.userFormsLayout.events({
-  'change .js-userform-set-language'(event) {
-    const i18nTag = $(event.currentTarget).val();
+  'change .js-userform-set-language'(evt) {
+    const i18nTag = $(evt.currentTarget).val();
     T9n.setLanguage(i18nTagToT9n(i18nTag));
-    event.preventDefault();
+    evt.preventDefault();
   },
-  'click #at-btn'(event, templateInstance) {
+  'click #at-btn'(event, instance) {
     if (FlowRouter.getRouteName() === 'atSignIn') {
-      templateInstance.isLoading.set(true);
-      authentication(event, templateInstance).then(() => {
-        templateInstance.isLoading.set(false);
-      });
+      instance.isLoading.set(true);
+      authentication(event, instance)
+        .then(() => {
+          instance.isLoading.set(false);
+        });
     }
   },
 });
@@ -120,16 +111,13 @@ Template.defaultLayout.events({
   },
 });
 
-async function authentication(event, templateInstance) {
+async function authentication(event, instance) {
   const match = $('#at-field-username_and_email').val();
   const password = $('#at-field-password').val();
 
   if (!match || !password) return undefined;
 
-  const result = await getAuthenticationMethod(
-    templateInstance.currentSetting.get(),
-    match,
-  );
+  const result = await getAuthenticationMethod(instance.currentSetting.get(), match);
 
   if (result === 'password') return undefined;
 
@@ -138,29 +126,26 @@ async function authentication(event, templateInstance) {
   event.stopImmediatePropagation();
 
   switch (result) {
-    case 'ldap':
-      return new Promise(resolve => {
-        Meteor.loginWithLDAP(match, password, function() {
-          resolve(FlowRouter.go('/'));
-        });
+  case 'ldap':
+    return new Promise((resolve) => {
+      Meteor.loginWithLDAP(match, password, function() {
+        resolve(FlowRouter.go('/'));
       });
+    });
 
-    case 'cas':
-      return new Promise(resolve => {
-        Meteor.loginWithCas(match, password, function() {
-          resolve(FlowRouter.go('/'));
-        });
+  case 'cas':
+    return new Promise((resolve) => {
+      Meteor.loginWithCas(match, password, function() {
+        resolve(FlowRouter.go('/'));
       });
+    });
 
-    default:
-      return undefined;
+  default:
+    return undefined;
   }
 }
 
-function getAuthenticationMethod(
-  { displayAuthenticationMethod, defaultAuthenticationMethod },
-  match,
-) {
+function getAuthenticationMethod({displayAuthenticationMethod, defaultAuthenticationMethod}, match) {
   if (displayAuthenticationMethod) {
     return $('.select-authentication').val();
   }
@@ -168,7 +153,7 @@ function getAuthenticationMethod(
 }
 
 function getUserAuthenticationMethod(defaultAuthenticationMethod, match) {
-  return new Promise(resolve => {
+  return new Promise((resolve) => {
     try {
       Meteor.subscribe('user-authenticationMethod', match, {
         onReady() {
@@ -181,7 +166,7 @@ function getUserAuthenticationMethod(defaultAuthenticationMethod, match) {
           resolve(authenticationMethod);
         },
       });
-    } catch (error) {
+    } catch(error) {
       resolve(defaultAuthenticationMethod);
     }
   });

client/components/main/layouts.styl

@@ -2,35 +2,6 @@
 
 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
@@ -232,7 +203,6 @@ 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
@@ -378,12 +348,6 @@ a
 
 .viewer
   min-height: 18px
-  display: block
-  word-wrap: break-word
-
-  table
-    word-wrap: normal
-    word-break: normal
 
   ol
     list-style-type: decimal
@@ -431,9 +395,6 @@ a
     height: 100%
     margin: 0px
 
-  .panel-default
-    width: 83vw
-
 .inline-input
   height: 37px
   margin: 8px 10px 0 0

client/components/main/popup.styl

@@ -130,15 +130,10 @@ $popupWidth = 300px
     .popup-container-depth-{depth}
       transform: translateX(- depth * $popupWidth)
 
-.select-members-list,
-.select-avatars-list
+.select-members-list
   margin-bottom: 8px
 
 .pop-over-list
-  li
-    display: block
-    clear: both
-
   li > a
     clear: both
     cursor: pointer
@@ -235,8 +230,7 @@ $popupWidth = 300px
     min-height: 56px
     position: relative
 
-    .member,
-    .avatar
+    .member
       position: absolute
       top: 2px
       left: 2px
@@ -320,7 +314,6 @@ $popupWidth = 300px
         input[type="file"]
           margin: 4px 0 12px
           width: 100%
-          box-sizing: border-box
 
     .pop-over-list
       li > a

client/components/mixins/infiniteScrolling.js

@@ -18,17 +18,15 @@ 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/notifications/notification.jade

@@ -1,10 +0,0 @@
-template(name='notification')
-  li.notification(class="{{#if read}}read{{/if}}")
-    .read-status
-      .materialCheckBox(class="{{#if read}}is-checked{{/if}}")
-      +notificationIcon(activityData)
-    .details
-      +activity(activity=activityData mode='none')
-    if read
-      .remove
-        a.fa.fa-trash

client/components/notifications/notification.js

@@ -1,28 +0,0 @@
-Template.notification.events({
-  'click .read-status .materialCheckBox'() {
-    const update = {};
-    update[`profile.notifications.${this.index}.read`] = this.read
-      ? null
-      : Date.now();
-    Users.update(Meteor.userId(), { $set: update });
-  },
-  'click .remove a'() {
-    Meteor.user().removeNotification(this.activityData._id);
-  },
-});
-
-Template.notification.helpers({
-  mode: 'board',
-  isOfActivityType(activityId, type) {
-    const activity = Activities.findOne(activityId);
-    return activity && activity.activityType === type;
-  },
-  activityType(activityId) {
-    const activity = Activities.findOne(activityId);
-    return activity ? activity.activityType : '';
-  },
-  activityUser(activityId) {
-    const activity = Activities.findOne(activityId);
-    return activity && activity.userId;
-  },
-});

client/components/notifications/notification.styl

@@ -1,57 +0,0 @@
-#notifications-drawer
-  &.show-read .notification.read
-    display: flex
-
-  .notification
-    display: flex
-    float: none
-    padding: 12px 8px 8px
-    color: black
-    border-bottom: 1px solid #dbdbdb
-
-    &.read
-      display: none
-
-    .read-status
-      width: 30px
-
-      input
-        width: 24px
-        height: 24px
-
-      .activity-type
-        margin: 16px 0 0
-        width: 17px
-        height: 17px
-        font-size: 17px
-        display: block
-        color: #bbb
-
-    .details
-      width: calc(100% - 30px)
-
-      .activity
-        display: flex
-
-        .activity-desc
-          width: 100%;
-
-        .activity-comment
-          display: block
-          width: 100%
-          border-radius: 3px
-          background: #fff
-          text-decoration: none
-          box-shadow: 0 1px 2px rgba(0,0,0,0.2)
-          margin-top: 5px
-          padding: 5px
-
-        .activity-meta
-          display: block
-          font-size: 0.8em
-          color: #999
-          font-style: italic
-
-    .remove
-      a:hover
-        color #eb4646 !important

client/components/notifications/notificationIcon.jade

@@ -1,53 +0,0 @@
-template(name='notificationIcon')
-  if($in activityType 'deleteAttachment' 'addAttachment')
-    i.fa.fa-paperclip.activity-type(title="attachment")
-  else if($in activityType 'createBoard' 'importBoard')
-    i.fa.fa-chalkboard.activity-type(title="board")
-
-  else if($in activityType 'createCard' 'importCard' 'moveCard')
-    +cardNotificationIcon
-  else if($in activityType 'moveCardBoard' 'archivedCard' 'restoredCard')
-    +cardNotificationIcon
-    //- $in can only handle up to 3 cases so we have to break this case over 2 cases... use a simple template to keep it
-    //- DRY and consistant
-
-  else if($in activityType 'addChecklist' 'removedChecklist' 'completeChecklist')
-    +checklistNotificationIcon
-  else if($in activityType 'uncompleteChecklist')
-    +checklistNotificationIcon
-    //- $in can only handle up to 3 cases so we have to break this case over 2 cases... use a simple template to keep it
-    //- DRY and consistant
-
-  else if($in activityType 'checkedItem' 'uncheckedItem' 'addChecklistItem' 'removedChecklistItem')
-    i.fa.fa-check-square.activity-type(title="checklist item")
-  else if($in activityType 'addComment')
-    i.fa.fa-comment-o.activity-type(title="comment")
-  else if($in activityType 'createCustomField' 'setCustomField' 'unsetCustomField')
-    i.fa.fa-code.activity-type(title="custom field")
-  else if($in activityType 'addedLabel' 'removedLabel')
-    i.fa.fa-tag.activity-type(title="label")
-
-  else if($in activityType 'createList' 'removeList' 'archivedList')
-    +listNotificationIcon
-  else if($in activityType  'importList')
-    +listNotificationIcon
-    //- $in can only handle up to 3 cases so we have to break this case over 2 cases... use a simple template to keep it
-    //- DRY and consistant
-
-    //- elswhere in the app we use fa-trello to indicate lists...
-    //- i personally like fa-columns a bit better
-  else if($in activityType 'unjoinMember' 'addBoardMember' 'joinMember' 'removeBoardMember')
-    i.fa.fa-user.activity-type(title="member")
-  else if($in activityType 'createSwimlane' 'archivedSwimlane')
-    i.fa.fa-th-large.activity-type(title="swimlane")
-  else
-    i.fa.fa-bug.activity-type(title="can't find icon for #{activityType}")
-
-template(name='cardNotificationIcon')
-  i.fa.fa-clone.activity-type(title="card")
-
-template(name='checklistNotificationIcon')
-  i.fa.fa-list.activity-type(title="checklist")
-
-template(name='listNotificationIcon')
-  i.fa.fa-columns.activity-type(title="list")

client/components/notifications/notifications.jade

@@ -1,5 +0,0 @@
-template(name='notifications')
-  #notifications.board-header-btns.right
-    a.notifications-drawer-toggle.fa.fa-bell(class="{{#if $gt unreadNotifications 0}}alert{{/if}}")
-    if $.Session.get 'showNotificationsDrawer'
-      +notificationsDrawer(unreadNotifications=unreadNotifications)

client/components/notifications/notifications.js

@@ -1,32 +0,0 @@
-// this hides the notifications drawer if anyone clicks off of the panel
-Template.body.events({
-  click(event) {
-    if (
-      !$(event.target).is('#notifications *') &&
-      Session.get('showNotificationsDrawer')
-    ) {
-      toggleNotificationsDrawer();
-    }
-  },
-});
-
-Template.notifications.helpers({
-  unreadNotifications() {
-    const notifications = Users.findOne(Meteor.userId()).notifications();
-    const unreadNotifications = _.filter(notifications, v => !v.read);
-    return unreadNotifications.length;
-  },
-});
-
-Template.notifications.events({
-  'click .notifications-drawer-toggle'() {
-    toggleNotificationsDrawer();
-  },
-});
-
-export function toggleNotificationsDrawer() {
-  Session.set(
-    'showNotificationsDrawer',
-    !Session.get('showNotificationsDrawer'),
-  );
-}

client/components/notifications/notifications.styl

@@ -1,17 +0,0 @@
-#notifications
-  position: relative
-
-  .notifications-drawer-toggle
-    display: block
-    line-height: 28px
-    color: #f2f2f2
-    margin: 0 10px
-    width: 28px
-    height: 28px
-    text-align: center
-    border: 0
-    padding: 0
-
-    &.alert
-      background-color: #eb4646;
-

client/components/notifications/notificationsDrawer.jade

@@ -1,20 +0,0 @@
-template(name='notificationsDrawer')
-  section#notifications-drawer(class="{{#if $.Session.get 'showReadNotifications'}}show-read{{/if}}")
-    .header
-      if $.Session.get 'showReadNotifications'
-        a.toggle-read {{_ 'filter-by-unread'}}
-      else
-        a.toggle-read {{_ 'view-all'}}
-      h5 {{_ 'notifications'}}
-        if($gt unreadNotifications 0)
-          |(#{unreadNotifications})
-      a.fa.fa-times-thin.close
-    ul.notifications
-      each transformedProfile.notifications
-        +notification(activityData=activity index=dbIndex read=read)
-    if($gt unreadNotifications 0)
-      a.all-read {{_ 'mark-all-as-read'}}
-    if ($and ($.Session.get 'showReadNotifications') ($gt readNotifications 0))
-      a.remove-read
-        i.fa.fa-trash
-        | {{_ 'remove-all-read'}}

client/components/notifications/notificationsDrawer.js

@@ -1,53 +0,0 @@
-import { toggleNotificationsDrawer } from './notifications.js';
-
-Template.notificationsDrawer.onCreated(function() {
-  Meteor.subscribe('notificationActivities');
-  Meteor.subscribe('notificationCards');
-  Meteor.subscribe('notificationUsers');
-  Meteor.subscribe('notificationsAttachments');
-  Meteor.subscribe('notificationChecklistItems');
-  Meteor.subscribe('notificationChecklists');
-  Meteor.subscribe('notificationComments');
-  Meteor.subscribe('notificationLists');
-  Meteor.subscribe('notificationSwimlanes');
-});
-
-Template.notificationsDrawer.helpers({
-  transformedProfile() {
-    return Users.findOne(Meteor.userId());
-  },
-  readNotifications() {
-    const readNotifications = _.filter(
-      Meteor.user().profile.notifications,
-      v => !!v.read,
-    );
-    return readNotifications.length;
-  },
-});
-
-Template.notificationsDrawer.events({
-  'click .all-read'() {
-    const notifications = Meteor.user().profile.notifications;
-    for (const index in notifications) {
-      if (notifications.hasOwnProperty(index) && !notifications[index].read) {
-        const update = {};
-        update[`profile.notifications.${index}.read`] = Date.now();
-        Users.update(Meteor.userId(), { $set: update });
-      }
-    }
-  },
-  'click .close'() {
-    toggleNotificationsDrawer();
-  },
-  'click .toggle-read'() {
-    Session.set('showReadNotifications', !Session.get('showReadNotifications'));
-  },
-  'click .remove-read'() {
-    const user = Meteor.user();
-    for (const notification of user.profile.notifications) {
-      if (notification.read) {
-        user.removeNotification(notification.activity);
-      }
-    }
-  },
-});

client/components/notifications/notificationsDrawer.styl

@@ -1,69 +0,0 @@
-belize = #2980b9
-
-section#notifications-drawer
-  position: fixed
-  top: 28px
-  right: 0
-  width: 400px
-  background-color: #fafafa
-  box-shadow: 0 1px 2px rgba(0,0,0,0.15)
-  border-radius: 2px
-  max-height: calc(100vh - 28px - 36px)
-  color: black
-  padding-top 36px
-
-  a:hover
-    color: belize !important
-
-  .header
-    position: fixed
-    top 28px
-    right 0
-    width calc(400px - 32px)
-    padding: 8px 16px
-    background: #ededed
-    border-bottom: 1px solid #dbdbdb
-    z-index 2
-
-    .toggle-read
-      position absolute
-      left 16px
-      top calc(50% - 8px)
-      color belize
-
-    h5
-      text-align: center
-      margin: 0
-
-    .close
-      position: absolute
-      top: calc(50% - 12px)
-      right: 12px
-      font-size: 24px
-      height: 24px
-      line-height: 24px
-      opacity 1
-
-  .all-read,
-  .remove-read
-    color belize
-    background-color: #fafafa
-    margin 8px 16px 12px
-    display inline-block
-
-  .remove-read
-    float right
-
-    &:hover
-      color #eb4646 !important
-
-      i.fa
-        color inherit
-
-
-  ul.notifications
-    display: block
-    padding: 0px 16px
-    margin: 0
-    height: calc(100vh - 102px)
-    overflow-y: scroll

client/components/rules/actions/boardActions.jade

@@ -1,42 +1,29 @@
 template(name="boardActions")
   div.trigger-item
     div.trigger-content
-      div.trigger-text
+      div.trigger-text 
         | {{_'r-move-card-to'}}
       div.trigger-dropdown
         select(id="move-gen-action")
           option(value="top") {{_'r-top-of'}}
           option(value="bottom") {{_'r-bottom-of'}}
-      div.trigger-text
+      div.trigger-text 
         | {{_'r-its-list'}}
     div.trigger-button.js-add-gen-move-action.js-goto-rules
       i.fa.fa-plus
 
   div.trigger-item
     div.trigger-content
-      div.trigger-text
+      div.trigger-text 
         | {{_'r-move-card-to'}}
       div.trigger-dropdown
         select(id="move-spec-action")
           option(value="top") {{_'r-top-of'}}
           option(value="bottom") {{_'r-bottom-of'}}
-      div.trigger-text
-        | {{_'r-the-board'}}
-      div.trigger-dropdown
-        select(id="board-id")
-          each boards
-            if $eq _id currentBoard._id
-              option(value="{{_id}}" selected) {{_ 'current'}}
-            else
-              option(value="{{_id}}") {{title}}
-      div.trigger-text
-        | {{_'r-in-list'}}
+      div.trigger-text 
+        | {{_'r-list'}}
       div.trigger-dropdown
         input(id="listName",type=text,placeholder="{{_'r-name'}}")
-      div.trigger-text
-        | {{_'r-in-swimlane'}}
-      div.trigger-dropdown
-        input(id="swimlaneName",type=text,placeholder="{{_'r-name'}}")
     div.trigger-button.js-add-spec-move-action.js-goto-rules
       i.fa.fa-plus
 
@@ -46,14 +33,14 @@ template(name="boardActions")
         select(id="arch-action")
           option(value="archive") {{_'r-archive'}}
           option(value="unarchive") {{_'r-unarchive'}}
-      div.trigger-text
+      div.trigger-text 
         | {{_'r-card'}}
     div.trigger-button.js-add-arch-action.js-goto-rules
       i.fa.fa-plus
 
   div.trigger-item
     div.trigger-content
-      div.trigger-text
+      div.trigger-text 
         | {{_'r-add-swimlane'}}
       div.trigger-dropdown
         input(id="swimlane-name",type=text,placeholder="{{_'r-name'}}")
@@ -62,15 +49,15 @@ template(name="boardActions")
 
   div.trigger-item
     div.trigger-content
-      div.trigger-text
+      div.trigger-text 
         | {{_'r-create-card'}}
       div.trigger-dropdown
         input(id="card-name",type=text,placeholder="{{_'r-name'}}")
-      div.trigger-text
+      div.trigger-text 
         | {{_'r-in-list'}}
       div.trigger-dropdown
         input(id="list-name",type=text,placeholder="{{_'r-name'}}")
-      div.trigger-text
+      div.trigger-text 
         | {{_'r-in-swimlane'}}
       div.trigger-dropdown
         input(id="swimlane-name2",type=text,placeholder="{{_'r-name'}}")
@@ -78,8 +65,8 @@ template(name="boardActions")
       i.fa.fa-plus
 
 
-
-
+   
+  
 
 
 

client/components/rules/actions/boardActions.js

@@ -1,185 +1,168 @@
 BlazeComponent.extendComponent({
-  onCreated() {},
+  onCreated() {
 
-  boards() {
-    const boards = Boards.find(
-      {
-        archived: false,
-        'members.userId': Meteor.userId(),
-        _id: {
-          $ne: Meteor.user().getTemplatesBoardId(),
-        },
-      },
-      {
-        sort: { sort: 1 /* boards default sorting */ },
-      },
-    );
-    return boards;
   },
 
   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,
-          });
-        },
-        '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 swimlaneName = this.find('#swimlaneName').value;
-          const listName = this.find('#listName').value;
-          const boardId = Session.get('currentBoard');
-          const destBoardId = this.find('#board-id').value;
-          const desc = Utils.getTriggerActionDesc(event, this);
-          if (actionSelected === 'top') {
-            const triggerId = Triggers.insert(trigger);
-            const actionId = Actions.insert({
-              actionType: 'moveCardToTop',
-              listName,
-              swimlaneName,
-              boardId: destBoardId,
-              desc,
-            });
-            Rules.insert({
-              title: ruleName,
-              triggerId,
-              actionId,
-              boardId,
-            });
-          }
-          if (actionSelected === 'bottom') {
-            const triggerId = Triggers.insert(trigger);
-            const actionId = Actions.insert({
-              actionType: 'moveCardToBottom',
-              listName,
-              swimlaneName,
-              boardId: destBoardId,
-              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,
-            });
-          }
-        },
+    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,
+          });
+        }
+      },
+    }];
   },
+
 }).register('boardActions');
 /* eslint-no-undef */

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,24 +28,109 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    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 actionSelected = this.find('#setdate-action').value;
-          const dateFieldSelected = this.find('#setdate-datefield').value;
-          const boardId = Session.get('currentBoard');
-          const desc = Utils.getTriggerActionDesc(event, this);
+    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 actionSelected = this.find('#setdate-action').value;
+        const dateFieldSelected = this.find('#setdate-datefield').value;
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
 
+        const actionId = Actions.insert({
+          actionType: actionSelected,
+          dateField: dateFieldSelected,
+          boardId,
+          desc,
+        });
+
+        Rules.insert({
+          title: ruleName,
+          triggerId,
+          actionId,
+          boardId,
+          desc,
+        });
+      },
+
+      '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: actionSelected,
-            dateField: dateFieldSelected,
+            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,
@@ -53,118 +138,12 @@ BlazeComponent.extendComponent({
             boardId,
             desc,
           });
-        },
-
-        'click .js-remove-datevalue-action'(event) {
-          const ruleName = this.data().ruleName.get();
-          const trigger = this.data().triggerVar.get();
+        }
+        if (actionSelected === 'remove') {
           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,
           });
@@ -174,38 +153,58 @@ 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({
@@ -216,7 +215,7 @@ BlazeComponent.extendComponent({
   },
 
   colors() {
-    return cardColors.map(color => ({ color, name: '' }));
+    return cardColors.map((color) => ({ color, name: '' }));
   },
 
   isSelected(color) {
@@ -224,16 +223,14 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [
-      {
-        'click .js-palette-color'() {
-          this.currentColor.set(this.currentData().color);
-        },
-        'click .js-submit'() {
-          this.colorButtonValue.set(this.currentColor.get());
-          Popup.close();
-        },
+    return [{
+      'click .js-palette-color'() {
+        this.currentColor.set(this.currentData().color);
       },
-    ];
+      'click .js-submit' () {
+        this.colorButtonValue.set(this.currentColor.get());
+        Popup.close();
+      },
+    }];
   },
 }).register('setCardActionsColorPopup');

client/components/rules/actions/checklistActions.js

@@ -3,20 +3,42 @@ 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);
+    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: 'addChecklistWithItems',
+            actionType: 'addChecklist',
             checklistName,
-            checklistItems,
             boardId,
             desc,
           });
@@ -26,125 +48,104 @@ BlazeComponent.extendComponent({
             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,
-            });
-          }
-        },
+        }
+        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,34 +1,35 @@
 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,6 +3,7 @@ BlazeComponent.extendComponent({
     this.subscribe('allRules');
     this.subscribe('allTriggers');
     this.subscribe('allActions');
+
   },
 
   trigger() {
@@ -33,4 +34,5 @@ BlazeComponent.extendComponent({
   events() {
     return [{}];
   },
+
 }).register('ruleDetails');

client/components/rules/rulesActions.js

@@ -40,21 +40,19 @@ BlazeComponent.extendComponent({
     // console.log(this.data());
   },
   events() {
-    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();
-        },
+    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();
+      },
+    }];
   },
 }).register('rulesActions');