v2.93

Fix lint errors.
Update translations.
2019-06-28 09:14:34 +03:00 · 2019-06-28 09:07:30 +03:00 · 2019-06-28 08:55:58 +03:00 · 2019-06-28 08:54:19 +03:00 · 2019-06-28 08:50:29 +03:00 · 2019-06-28 06:59:51 +02:00
241 changed files with 43632 additions and 68719 deletions
@@ -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
@@ -1 +0,0 @@
-packages/*
@@ -1,19 +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
  },
  "parserOptions": {
-    "ecmaVersion": 2018,
-    "sourceType": "module"
+    "ecmaVersion": 2017,
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true
+    }
  },
  "rules": {
    "strict": 0,
@@ -23,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,
@@ -31,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,
@@ -47,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,
@@ -55,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,
@@ -122,7 +100,7 @@
    "Attachments": true,
    "Boards": true,
    "CardComments": true,
-    "DatePicker": true,
+    "DatePicker" : true,
    "Cards": true,
    "CustomFields": true,
    "Lists": true,
@@ -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
-package-lock.json
-.meteor/local
-.meteor-1.6-snap/.meteor/local
@@ -16,4 +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
@@ -3,16 +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.12.4
-standard-minifier-css@1.5.3
-standard-minifier-js@2.4.1
+ecmascript
+stylus@2.513.13
+standard-minifier-css@1.3.5
+standard-minifier-js@2.2.0
 mquandalle:jade

 # Polyfills
-es5-shim@4.8.0
+es5-shim@4.6.15

 # Collections
 aldeed:collection2
@@ -22,7 +23,7 @@ dburles:collection-helpers
 idmontie:migrations
 matb33:collection-hooks
 matteodem:easy-search
-mongo@1.6.2
+mongo@1.3.1
 mquandalle:collection-mutations

 # Account system
@@ -35,12 +36,12 @@ wekan-accounts-cas
 wekan-accounts-oidc

 # Utilities
-check@1.3.1
+check@1.2.5
 jquery@1.11.10
-random@1.1.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
@@ -48,11 +49,13 @@ 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,32 +70,25 @@ templates:tabs
 verron:autosize
 simple:json-routes
 rajit:bootstrap3-datepicker
-shell-server@0.4.0
+shell-server@0.3.0
 simple:rest-accounts-password
 useraccounts:core
 email@1.2.3
 horka:swipebox
-dynamic-import@0.5.1
+dynamic-import@0.2.0
 staringatlights:fast-render

-accounts-password@1.5.1
+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!
-coagmano:stylus
+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
@@ -1 +1 @@
-METEOR@1.8.1
+METEOR@1.6.0.1
@@ -1,119 +1,113 @@
 3stack:presence@1.1.2
-accounts-base@1.4.4
-accounts-oauth@1.1.16
-accounts-password@1.5.1
+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.3.4
-babel-runtime@1.3.0
-base64@1.0.12
-binary-heap@1.0.11
-blaze@2.3.3
+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.6.0
+boilerplate-generator@1.3.1
 browser-policy-common@1.0.11
 browser-policy-framing@1.1.0
-caching-compiler@1.2.1
-caching-html-compiler@1.1.3
-callback-hook@1.1.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@2.0.0
-coffeescript@1.0.17
+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.0
+ddp-server@2.1.1
 deps@1.0.12
-diff-sequence@1.1.1
-dynamic-import@0.5.1
-easylogic:summernote@0.8.8
-ecmascript@0.12.7
-ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.8.0
-ecmascript-runtime-server@0.7.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.0
-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.0.1
-lamhieu:unblock@1.0.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.8.4
 matteodem:easy-search@1.6.4
-mdg:meteor-apm-agent@3.2.3
+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.4.2
-minifier-js@2.4.1
+minifier-css@1.2.16
+minifier-js@2.2.2
 minifiers@1.1.8-faster-rebuild.0
-minimongo@1.4.5
+minimongo@1.4.3
+mixmax:smart-disconnect@0.0.4
 mobile-status-bar@1.0.14
-modern-browsers@0.1.4
-modules@0.13.0
-modules-runtime@0.10.3
-momentjs:moment@2.24.0
-mongo@1.6.3
-mongo-decimal@0.1.1
+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,73 +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.1.2
-oauth@1.2.8
-oauth2@1.2.1
+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
+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.9.0
-peerlibrary:reactive-field@0.5.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.1.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.4.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.2.2
 softwarerero:accounts-t9n@1.3.11
 spacebars@1.0.15
 spacebars-compiler@1.1.3
-srp@1.0.12
-standard-minifier-css@1.5.3
-standard-minifier-js@2.4.1
-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.2.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.7.4
+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
@@ -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:
@@ -1,7 +0,0 @@
-packages/
-node_modules/
-.build/
-.meteor/
-.vscode/
-.tx/
-.github/
@@ -1,8 +0,0 @@
-{
-  "printWidth": 80,
-  "tabWidth": 2,
-  "useTabs": false,
-  "semi": true,
-  "singleQuote": true,
-  "trailingComma": "all"
-}
@@ -1,517 +1,3 @@
-# v3.24 2019-08-22 Wekan release
-
-This release fixes the following bugs:
-
- [Snap: Delete old MongoDB log, and log to syslog instead, because syslog usually already has
-  log rotation](https://github.com/wekan/wekan/commit/cc792ddd57691bb54972c73b9c861c768fce8c34).
-  Thanks to xet7.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.23 2019-08-20 Wekan release
-
-This release fixes the following bugs:
-
- [Fix login did not work](https://github.com/wekan/wekan/commit/b2deab544bfeea49017bec27f92f1269b0b7ec43).
-  Thanks to xet7.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.22 2019-08-20 Wekan release
-
-This release adds the following new features:
-
- [Wrap minicard text labels to multiple rows](https://github.com/wekan/wekan/commit/af830812dbbf7d766a754d937308b11373c66e5a).
-  Thanks to xet7.
-
-and fixes the following bugs:
-
- [Fix: Some users cannot switch views or languages](https://github.com/wekan/wekan/issues/2630).
-  Thanks to xet7 and justinr1234.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.21 2019-08-16 Wekan release
-
-This release adds the following new features:
-
- [In the filter menu, 1) Turning on "show archive" will request archived lists and show them on the ListView.
-  2) Turning on "hide empty lists" will hide empty lists on the ListView](https://github.com/wekan/wekan/pull/2632).
-  Thanks to urakagi.
-
-and fixes the following bugs:
-
- [Fix mismatched queries](https://github.com/wekan/wekan/pull/2628).
-  Thanks to justinr1234.
- [Fix Summernote too wide when in mobile screen](https://github.com/wekan/wekan/issues/2621).
-  Thanks to whowillcare.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.20 2019-08-15 Wekan release
-
-This release fixes the following security issues:
-
- [Revert permission change](https://github.com/wekan/wekan/commit/d302d6f857657ada229f78d9fcd32f63753d9779),
-  related [#2590](https://github.com/wekan/wekan/issues/2590) and
-  [these comments](https://github.com/wekan/wekan/commit/9f6d615ee5bbdb7552e6bdcae75a76a7f74fef7a#commitcomment-34636513).
-  Thanks to road42, justinr1234 and xet7.
-
-and adds the following new features:
-
- On board, BoardAdmin and normal user can now [invite new user directly
-  with email address](https://github.com/wekan/wekan/issues/2060),
-  [without using Admin Panel or registering
-  at /sign-up](https://github.com/wekan/wekan/commit/5c696e5a3c70d31a7af6e47cbcf691f6c18eb384).
-  Thanks to xet7.
-
-and fixes the following bugs:
-
- [Fix bug: When on board, clicking Admin Panel redirects to All Boards page, so it did require
-  to click Admin Panel again](https://github.com/wekan/wekan/commit/d302d6f857657ada229f78d9fcd32f63753d9779).
-  Thanks to xet7.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.18 2019-08-15 Wekan release
-
-This release adds the following new features:
-
- [Send webhook message](https://github.com/wekan/wekan/issues/2518) when
-  [cardDetails is rendered](https://github.com/wekan/wekan/pull/2620).
-  Thanks to jymcheong.
- Related to [above new feature](https://github.com/wekan/wekan/issues/2518),
-  Add [setting CARD_OPENED_WEBHOOK_ENABLED=false as
-  default](https://github.com/wekan/wekan/commit/b8c527d52bec7272c890385f11e26acec65822ae).
-  Thanks to xet7.
-
-and adds the following updates:
-
- [Update base64 dependency](https://github.com/wekan/wekan/commit/c87001fa9f8d1fa13640ae604b1ba46556c7813c).
-  Thanks to xet7.
-
-and fixes the following bugs:
-
- [Time line is missing delete/edit comments, add English i18n for these two activities,
-  For html email msg needs](https://github.com/wekan/wekan/pull/2615).
-  Thanks to whowillcare.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.17 2019-08-13 Wekan release
-
-This release fixes the following bugs:
-
- [Fix ReferenceError: cardAssignees is not defined](https://github.com/wekan/wekan/issues/2612).
-  Reverted In-Progress Assignee field, moving it to feature branch.
-  Thanks to saschafoerster and to xet7.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.16 2019-08-13 Wekan release
-
-This release adds the following new features:
-
- [Make Admin Panel text like version etc selectable](https://github.com/wekan/wekan/commit/5aa090e91184764afeac8b7c7bf4b4cb947c8f17).
-  Thanks to xet7.
- [Add to Admin Panel / Version: Meteor version, MongoDB version, MongoDB storage engine, MongoDB Oplog
-  enabled](https://github.com/wekan/wekan/commit/20294d833a2bf0bd1720444f4ffe018b025dacca).
-  Thanks to RocketChat developers for MongoDB detection code and xet7 for other code.
- [Use Meteor 1.8.1 and MongoDB 3.2.22 in Snap](https://github.com/wekan/wekan/commit/39ffe1d80dad5759b338d4ed2d6c576717af2a07).
-  Removed Meteor 1.6.x files.
-  Thanks to xet7.
- [Enable HTML email content for richer comment](https://github.com/wekan/wekan/pull/2611).
-  Thanks to whowillcare.
-
-and fixes the following bugs:
-
- [Fix scrollHeight error when the sidebar is not visible](https://github.com/wekan/wekan/pull/2609).
-  Thanks to Trekky12.
- [Fix insert action for CustomFields API](https://github.com/wekan/wekan/pull/2610).
-  Thanks to JimCircadian.
- [Fixed a few issues related summernote enabled: 1) @ user couldn't send out email sometime, due to html format.
-  2) @ user link wasn't able to show user info by clicking](https://github.com/wekan/wekan/pull/2611).
-  Thanks to whowillcare.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.15 2019-08-11 Wekan release
-
-This release fixes the following bugs:
-
- [Try to fix Snap](https://github.com/wekan/wekan/commit/a1d883b22f73f4bef6d547f94dcb900f475fcb41).
-  Thanks to xet7.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.14 2019-08-11 Wekan release
-
-This release adds the following new features:
-
- [On wekan master specifying ATTACHMENTS_STORE_PATH, it will try its best keeping original attachments, only newer
-  attachments will be stored into specified path](https://github.com/wekan/wekan/pull/2607).
-  Thanks to whowillcare.
- [Made image upload in summernote as attachment to wekan board instead of base64 string,
-  which would make the comments use less bytes and be able to take advantage of using local file system feature
-  as attachment](https://github.com/wekan/wekan/pull/2608).
-  Thanks to whowillcare.
-
-and fixes the following bugs:
-
- [Fix bug: Unable to disable richer comment editor](https://github.com/wekan/wekan/pull/2607).
-  Thanks to whowillcare.
- [Changed rm to rm -f in wekan snap build, and add packages that somehow didn't get install during snapcraft
-  build](https://github.com/wekan/wekan/pull/2608).
-  Thanks to whowillcare.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.13 2019-08-09 Wekan release
-
-Update translations. Thanks to translators.
-
-# v3.12 2019-08-09 Wekan release
-
-This release adds the following new features:
-
- [Allowing wekan server admin to specify the attachments to be uploaded to server
-  file system instead of mongodb by specifying a system
-  env var: ATTACHMENTS_STORE_PATH](https://github.com/wekan/wekan/pull/2603).
-  The only caveat for this is if it's not a brand new wekan, if the wekan
-  server admin switchs to this setting, their old attachments won't be available
-  anymore, unless someone make a script to export them out to the filesystem.
-  Thanks to whowillcare.
- [Allowing user to insert video, link and image, or paste in html with sanitization.
-  In user comments display area, images can be clicked and shown as
-  swipebox](https://github.com/wekan/wekan/pull/2593).
-  Thanks to whowillcare.
-
-and fixes the following bugs:
-
- [Fix comment-editor marking issue](https://github.com/wekan/wekan/issues/2575).
-  Thanks to whowillcare.
- [Bugfix: style kbd font color became white after introduced summernote editor
-  to card comments](https://github.com/wekan/wekan/pull/2600).
-  Thanks to whowillcare.
- [Show All Boards / Clone Board and Archive Board only to BoardAdmin/Admin/Sandstorm users
-  on desktop webbrowser view, so that it's not possible for normal users to make accidental
-  clicks to those](https://github.com/wekan/wekan/issues/2599).
-  Thanks to derbolle and xet7.
- [Fix bug on editing users informations, switching to other view, staring
-  a board](https://github.com/wekan/wekan/issues/2590).
-  Thanks to road42.
- [Fix null access with board body](https://github.com/wekan/wekan/pull/2602).
-  Thanks to justinr1234.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.11 2019-08-07 Wekan release
-
-This release fixes the following bugs:
-
- [Remove non-existing file from snapcraft.yaml to get Snap to build](https://github.com/wekan/wekan/commit/ad82a900e8ec636a72c6e74bb8489559ce2a8bf0).
-  Thanks to xet7.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.10 2019-08-07 Wekan release
-
-This release fixes the following bugs:
-
- [Add missing dependencies back and revert deleting phantomjs](https://github.com/wekan/wekan/commit/32e9aa0ddaf1b015825b8c62ad17ed74b449e4b1).
-  Thanks to whowillcare and xet7.
-    
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.09 2019-08-07 Wekan release
-
-This release adds the following features:
-
- [Hide minicard label text: per user checkbox setting at sidebar](https://github.com/wekan/wekan/commit/f7e0b837d394d55d66d451c34f43fa8afd357e5b).
-  Thanks to xet7.
-
-and fixes the following bugs:
-
- [Make Save button visible again at Admin Panel People Edit](https://github.com/wekan/wekan/commit/716fc32968e7dd51b64a11c6c33e59aee849c982).
-  Thanks to sclerc-chss and xet7.
- [Fix checking if API is enabled](https://github.com/wekan/wekan/pull/2588).
-  Thanks to justinr1234.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.08 2019-08-07 Wekan release
-
-This release fixes the following bugs:
-
- [Removed removing phantomjs from snap, because snap build did stop to error
-  no phantomjs could be removed](https://github.com/wekan/wekan/commit/7d8f1dee62f285a4587fb40e7331d0f500b2e5fb).
-  Thanks to xet7.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.07 2019-08-07 Wekan release
-
-This release fixes the following bugs:
-
- [Try to make release sizes smaller by deleting phantomjs](https://github.com/wekan/wekan/commit/1fc3a1db2e663f149287b6e14053d536fb1a8a81).
-  Thanks to xet7.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.06 2019-08-07 Wekan release
-
-This release fixes the following bugs:
-
- [Fix board query](https://github.com/wekan/wekan/pull/2587).
-  Thanks to justinr1234.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.05 2019-08-07 Wekan release
-
-This release fixes the following bugs:
-
- [Fixed LDAP group filtering bug on Snap settings](https://github.com/wekan/wekan/pull/2584).
-  Thanks to KuenzelIT.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.04 2019-08-06 Wekan release
-
-This release fixes the following bugs:
-
- [Fixed Snap: Use Meteor 1.6.0.1 dependencies on Snap on master branch](https://github.com/wekan/wekan/commit/74a4b28313e9cfedcb927e4496c0dd3800b1e6f9).
-  Thanks to xet7.
- [Hide Admin Panel user delete button until someone has time to fix it](https://github.com/wekan/wekan/commit/b9a25ecfaca067d0392c83d97a0deb65e6e296dd).
-  Thanks to xet7.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.03 2019-08-04 Wekan release
-
-This release adds the following new features:
-
- [Add RICHER_CARD_COMMENT_EDITOR=true to docker-compose.yml](https://github.com/wekan/wekan/commit/268f9de23c8167dca9499587ee31fb74edb6b83e).
-  Thanks to xet7.
- [Add popup to confirm deleting one account](https://github.com/wekan/wekan/pull/2573).
-  Thanks to Akuket.
- [Add admin setting to prevent users to self deleting their account](https://github.com/wekan/wekan/pull/2573).
-  Thanks to Akuket.
- [Add Packager.io DEB/RPM Wekan packages for Debian/Ubuntu/CentOS/SLES](https://packager.io/gh/wekan/wekan).
-  Does not work yet, [debugging in progress here](https://github.com/wekan/wekan/issues/2582).
-  Thanks to xet7 and sfahrenholz.
- [Add setting field LDAP_USER_AUTHENTICATION_FIELD=uid](https://github.com/wekan/wekan/pull/2581).
-  Thanks to Trekky12.
-
-and adds the following upgrades:
-
- [Upgrade MongoDB to 4.0.11](https://github.com/wekan/wekan/commit/ec35c544b780e563a973fd887c5190f429431bfb).
-  Thanks to xet7.
-
-and fixes the following bugs:
-
- [Remove mixmax:smart-disconnect, previously it did disconnect Wekan when
-  browser tab was not active, but because now users are working on multiple
-  boards at different browser tabs and switching all time time, there was
-  constant loading, so now after removing all tabs keeps active. This can
-  increase server CPU usage](https://github.com/wekan/wekan/commit/669cd76018cbbfbd3ee58610a35959fa8a84ea36).
-  Thanks to xet7.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.02 2019-07-26 Wekan release
-
-This release adds the following updates:
-
- [Updated Wekan on OpenShift](https://github.com/wekan/wekan/commit/85ca2b1363ed0bad8639ba7ed65c55e445816947).
-  Thanks to xet7.
-
-and fixes the following bugs:
-
- [Set LDAP_BACKGROUND_SYNC_INTERVAL='' (empty string) so it works](https://github.com/wekan/wekan/commit/fff144a8279ac36ce83e6b975f17f6dbc35f39d6)
-  and [does not crash](https://github.com/wekan/wekan/issues/2354#issuecomment-515305722).
-  Also updated wekan-postgresql docker-compose.yml to use devel branch docker image, because ToroDB requires MongoDB 3.2,
-  it's not tested yet could newest master branch docker image work with MongoDB 3.2.
-  Thanks to benh57 and xet7.
-
-and tries to fix following bugs:
-
- [Try to fix Snap](https://github.com/wekan/wekan/commit/7cf6850cdf77ef51808784e3d275c5be86ff6c92).
-  This [will be tested soon, does this work](https://github.com/wekan/wekan/issues/2533#issuecomment-515329490).
-  Thanks to xet7.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.01 2019-07-26 Wekan release
-
-This release adds the following new features:
-
- [Rich text editor at card comments, based on
-  Summernote](https://github.com/wekan/wekan/pull/2560).
-  Thanks to whowillcare.
- [Add setting RICHER_CARD_COMMENT_EDITOR=true to
-  Source/Snap/Docker/Sandstorm](https://github.com/wekan/wekan/commit/4aba290358455433c0fc676e8c9cf1bd627eddde).
-  Thanks to xet7.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v3.00 2019-07-25 Wekan release
-
-This release:
-
- works with source, and docker-compose.yml at master branch.
- Docker release uses Meteor 1.8.1 and MongoDB 4.0.10, so you need to backup your old MongoDB database and
-  restore with --noIndexRestore as described at https://github.com/wekan/wekan/wiki/Backup
- Snap and Sandstorm builds are not fixed yet, see progress at https://github.com/wekan/wekan/issues/2533
-
-This release adds the following new features:
-
- [Added label text to labels on minicard](https://github.com/wekan/wekan/commit/c48d5a73cab04db1a1e113e4367dc88573110438).
-  Thanks to xet7.
- [Allow to shrink attached/pasted image](https://github.com/wekan/wekan/pull/2544).
-  Thanks to whowillcare.
-
-and fixes the following bugs:
-
- [Fix invites](https://github.com/wekan/wekan/pull/2549).
-  Thanks to justinr1234.
- [Makes LDAP background sync work. If the sync interval is unspecified, falls back to a hourly default](https://github.com/wekan/wekan/pull/2555).
-  Thanks to pshunter.
- [Prevent isCommentOnly user adding attachments, editing list names, moving lists,
-  and seeing board settings menu. Show non-editable Custom Fields to isCommentOnly user](https://github.com/wekan/wekan/commit/a68c928896a94c377134f29a7183aa0b5a423720).
-  Thanks to xet7.
- [Many](https://github.com/wekan/wekan/pull/2546) [Snap](https://github.com/wekan/wekan/pull/2552) [fixes](https://github.com/wekan/wekan/pull/2553).
-  In Progress. Thanks to justrinr1234.
- [Fixed Dockerfile](https://github.com/wekan/wekan/commit/7df6f305c5cf41ac213623aeffaa7e48c981e0b6) and
-  [docker-compose.yml](https://github.com/wekan/wekan/commit/95698911f92ca728dbaab69406fd09bcbf81339d).
-  Thanks to xet7.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v2.99 2019-07-17 Wekan release
-
-This release adds the following new features:
-
- [Add Corteza theme. In progress](https://github.com/wekan/wekan/commit/289e78dbd29cca9d97d3b5787c3368583d43b40f).
-  Thanks to xet7.
- [Notify Due Days: System timelines will be showing any user modification for duat startat endat receivedat,
-  also notification to the watchers and if any card is due, about due or past due](https://github.com/wekan/wekan/pull/2536).
-  ENV variables: NOTIFY_DUE_DAYS_BEFORE_AND_AFTER (default is 2, if 0, will turn off notification for and dued cards),
-  NOTIFY_DUE_AT_HOUR_OF_DAY (any number between 0 - 23, standing for at what hour of a day that the notification will
-  be sent to the watchers). Also [bug fix for this, timeOldValue needs to set to "" in params when it's
-  not set](https://github.com/wekan/wekan/pull/2541).
-  Thanks to whowillcare.
- [Notify Due Days: Add settings to Snap/Docker/Source. Rename env variables to NOTIFY_DUE_DAYS_BEFORE_AND_AFTER and
-  NOTIFY_DUE_AT_HOUR_OF_DAY](https://github.com/wekan/wekan/commit/5084cddf37ba16ce0855f8575c39f5e62d1b7f67).
-  Thanks to xet7.
- [BIGEVENTS_PATTERN: When user being @ in comment, as long as it's not himself, a notification will be
-  sent out no matter this user is watching the board or not](https://github.com/wekan/wekan/pull/2541).
-  Introduced a system env var BIGEVENTS_PATTERN default as "due", so any activityType matches the pattern,
-  system will send out notifications to all board members no matter they are watching or tracking
-  the board or not. Owner of the Wekan server can disable the feature by setting this variable to "NONE"
-  or change the pattern to any valid regex. i.e. '|' delimited activityType names.
-  Thanks to whowillcare.
- [Add BIGEVENTS_PATTERN to Source/Snap/Docker](https://github.com/wekan/wekan/commit/d7c09df7d2649bf2d2b61772c251f81793a6ed77).
-  Thanks to xet7.
-
-and adds the following updates:
-
- [Update Meteor mongo package version](https://github.com/wekan/wekan/commit/96065d11a543852c1069cbab528bd08508b4a27c).
-  Thanks to xet7.
- [Update dependencies](https://github.com/wekan/wekan/commit/d82c72f1c1df908e92045e5034fa12b33fc7f70c).
-  Thanks to xet7.
-
-and fixes the following bugs:
-
- RELAX THEME: Use [only in this theme](https://github.com/wekan/wekan/commit/3ad6e554dceea822dee7390872260e872a792dcd)
-  the aggressive [red color and big bold serif font style
-  number](https://github.com/wekan/wekan/commit/bbc68309af0029f2bc4194db4c7e79689f888ea4#commitcomment-34216371) and
-  [card details text emphasis](https://github.com/wekan/wekan/commit/48ebc5f11745b125ce01d08d60e2d8e3a9419a5f#commitcomment-34268095)
-  Thanks to hever and xet7.
- [Try to fix docker-compose.yml to use correct master branch that has
-  meteor 1.8.1](https://github.com/wekan/wekan/commit/202cc5a797b6269ec422c6f2e532a49f09d4e30a).
-  Thanks to xet7.
- [Outgoing Webhooks setCustomField: Add board name, card name, custom field name to be
-  visible](https://github.com/wekan/wekan/commit/2003d90467debeadf51b69630c80ee6040524f52).
-  Still missing: custom field value, list name, swimlane name.
-  Thanks to xet7.
- [Don't remove boardoverlay when mouse leaves carddetails](https://github.com/wekan/wekan/pull/2540).
-  This reduces Wekan board flashiness.
-  Thanks to newhinton.
- [Limit the board list to 2 or 1 for mobile clients](https://github.com/wekan/wekan/pull/2542).
-  As a mobile user, the board size of in the home page too small, so the user is easily to
-  click on archive or copy button by accident. Increase the board size to 50% for pixel
-  greater than 360 and lesser than 800 and height to 8rem, 100% for any screen is even smaller.
-  This will reduce the accident much more.
-  Thanks to whowillcare.
- [Add check for board member isActive](https://github.com/wekan/wekan/commit fe42eb1d014c06dfed8114a00b29eac9b08baec6).
-  Thanks to xet7.
-
-and has the following features in progress, not anything visible yet:
-
- [Teams/Organizations: Add beginnings of database structure](https://github.com/wekan/wekan/issues/802#issuecomment-505986270).
-  Thanks to xet7.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v2.98 2019-07-02 Wekan release
-
-This release adds the following new features, thanks to xet7:
-
- [Add Wekan v2.95-v2.97 master branch features and fixes to meteor-1.8 branch](https://github.com/wekan/wekan/commit/34b2168d0dda253dedabbee47031873efa4ae446).
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v2.97 2019-07-01 Wekan release
-
-This release [adds the following new features](https://github.com/wekan/wekan/commit/3e8cb8c6e1617ef03ebce045d3b93aeb2cf91228), thanks to xet7:
-
- Add background color names to background colors.
- 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 background colors and themes. Hiding is not implemented yet.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v2.96 2019-07-01 Wekan release
-
-This release removes the following features, that were added at Wekan v2.95:
-
- [Remove RELAX MODE and DARK MODE](https://github.com/wekan/wekan/commit/8477e94f3b8f531a4209f49758200009d274c1cf),
-  because [they changed look of all existing boards](https://github.com/wekan/wekan/issues/1149#issuecomment-507255114).
-  At some later Wekan release they will be added back as separate themes
-  that can be selected, without changing existing boards.
-  Thanks to chirrut2 and xet7.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v2.95 2019-07-01 Wekan release
-
-This release adds the following new features, thanks to xet7:
-
- [Make list header add card + button more black, to make it more visible](https://github.com/wekan/wekan/commit/b260d05a8b2f87c29dd998d42103d1220b20cc08).
- [On minicard, make comment icon and number of comments have red color
-  on white rounded background, so it is more visible when there is comments on card](https://github.com/wekan/wekan/commit/bbc68309af0029f2bc4194db4c7e79689f888ea4).
- [Make card description text more visible with black borders and more white text area](https://github.com/wekan/wekan/commit/48ebc5f11745b125ce01d08d60e2d8e3a9419a5f).
-
-and adds the following [themes to board background colors](https://github.com/wekan/wekan/commit/c04292e98832e3aa7952e8a7858d47a853f40aad), thanks to xet7:
-
- RELAX MODE, so when green background selected, list background is light green.
- [DARK MODE](https://github.com/wekan/wekan/issues/1149), when dark backgroud color selected. Please test and send color visibility fixes as pull requests.
- In RELAX MODE and DARK MODE, [hide card fields: received, start, due, end, members, requested, assigned](https://github.com/wekan/wekan/commit/b42ecb7948ad194433dc4460305174965106a751).
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
-# v2.94 2019-06-29 Wekan release
-
-This release adds the following updates:
-
- [Prettier & eslint project style update](https://github.com/wekan/wekan/pull/2520).
-  Thanks to justinr1234.
-
-Thanks to above GitHub users for their contributions and translators for their translations.
-
 # v2.93 2019-06-28 Wekan release

 This release fixes the following bugs:
@@ -633,7 +119,7 @@ This release fixes the following bugs:

 - [Fix OIDC Docker login. Empty string results to empty array at wekan/server/authentication.js](https://github.com/wekan/wekan/commit/bddbaa7bc2f3cfe8553a2265e168231ab51876f3).
  Thanks to xet7.
-
+    
 Thanks to above GitHub users for their contributions and translators for their translations.

 # v2.81 2019-06-13 Wekan release
@@ -896,7 +382,7 @@ and adds the following updates:
  because [it was found old version was in use](https://github.com/wekan/wekan/issues/2334).
  Thanks to shaygover and xet7.
 - [Upgrade to Node 8.16.0](https://github.com/wekan/wekan/commit/6117097a93bfb11c8bd4c87a23c44a50e22ceb87).
-  Thanks to Node developers and xet7.
+  Thanks to Node developers and xet7.    
 - [Upgrade Docker base image to ubuntu:disco](https://github.com/wekan/wekan/commit/bd14ee3b1f450ddc6dec26ccc8da702b839942e5).
  Thanks to Ubuntu developers and xet7.

@@ -4,14 +4,14 @@ 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 bsdtar gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates" \
+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=v8.16.0 \
-    METEOR_RELEASE=1.8.1 \
+    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,14 +21,6 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 g++ build-essential
    ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE=3 \
    ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD=60 \
    ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW=15 \
-    RICHER_CARD_COMMENT_EDITOR=true \
-    CARD_OPENED_WEBHOOK_ENABLED=false \
-    ATTACHMENTS_STORE_PATH="" \
-    MAX_IMAGE_PIXEL="" \
-    IMAGE_COMPRESS_RATIO="" \
-    BIGEVENTS_PATTERN="" \
-    NOTIFY_DUE_DAYS_BEFORE_AND_AFTER="" \
-    NOTIFY_DUE_AT_HOUR_OF_DAY="" \
    EMAIL_NOTIFICATION_TIMEOUT=30000 \
    MATOMO_ADDRESS="" \
    MATOMO_SITE_ID="" \
@@ -65,14 +57,13 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 g++ build-essential
    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="" \
@@ -122,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
@@ -178,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.0 /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 && \
@@ -231,39 +216,31 @@ 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 && \
@@ -279,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
@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v3.24.0"
+appVersion: "v2.93.0"
 files:
  userUploads:
    - README.md
@@ -201,25 +201,7 @@ template(name="cardActivities")
          .activity-checklist(href="{{ card.absoluteUrl }}")
            +viewer
              = checklistItem.title
-        
-        if(currentData.timeKey)
-          | {{{_ activityType }}}
-          = ' '
-          i(title=currentData.timeValue).activity-meta {{ moment currentData.timeValue 'LLL' }}
-          if (currentData.timeOldValue)
-              = ' '                                                                                    
-              | {{{_ "previous_as" }}}
-              = ' '
-              i(title=currentData.timeOldValue).activity-meta {{ moment currentData.timeOldValue 'LLL' }}
-          = ' @'
-        else if(currentData.timeValue)
-          | {{{_ activityType currentData.timeValue}}}
-        

-        if($eq activityType 'deleteComment')
-          | {{{_ 'activity-deleteComment' currentData.commentId}}}.
-        if($eq activityType 'editComment')
-          | {{{_ 'activity-editComment' currentData.commentId}}}.
        if($eq activityType 'addComment')
          +inlinedForm(classNames='js-edit-comment')
            +editor(autofocus=true)
@@ -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;
@@ -49,9 +50,9 @@ BlazeComponent.extendComponent({
    }
  },

-  checkItem() {
+  checkItem(){
    const checkItemId = this.currentData().checklistItemId;
-    const checkItem = ChecklistItems.findOne({ _id: checkItemId });
+    const checkItem = ChecklistItems.findOne({_id:checkItemId});
    return checkItem.title;
  },

@@ -65,58 +66,42 @@ BlazeComponent.extendComponent({

  cardLink() {
    const card = this.currentData().card();
-    return (
-      card &&
-      Blaze.toHTML(
-        HTML.A(
-          {
-            href: card.absoluteUrl(),
-            class: 'action-card',
-          },
-          card.title,
-        ),
-      )
-    );
+    return card && Blaze.toHTML(HTML.A({
+      href: card.absoluteUrl(),
+      'class': 'action-card',
+    }, card.title));
  },

-  lastLabel() {
+  lastLabel(){
    const lastLabelId = this.currentData().labelId;
-    if (!lastLabelId) return null;
-    const lastLabel = Boards.findOne(Session.get('currentBoard')).getLabelById(
-      lastLabelId,
-    );
-    if (lastLabel.name === undefined || lastLabel.name === '') {
+    if (!lastLabelId)
+      return null;
+    const lastLabel = Boards.findOne(Session.get('currentBoard')).getLabelById(lastLabelId);
+    if(lastLabel.name === undefined || lastLabel.name === ''){
      return lastLabel.color;
-    } else {
+    }else{
      return lastLabel.name;
    }
  },

-  lastCustomField() {
-    const lastCustomField = CustomFields.findOne(
-      this.currentData().customFieldId,
-    );
-    if (!lastCustomField) return null;
+  lastCustomField(){
+    const lastCustomField = CustomFields.findOne(this.currentData().customFieldId);
+    if (!lastCustomField)
+      return null;
    return lastCustomField.name;
  },

-  lastCustomFieldValue() {
-    const lastCustomField = CustomFields.findOne(
-      this.currentData().customFieldId,
-    );
-    if (!lastCustomField) return null;
+  lastCustomFieldValue(){
+    const lastCustomField = CustomFields.findOne(this.currentData().customFieldId);
+    if (!lastCustomField)
+      return null;
    const value = this.currentData().value;
-    if (
-      lastCustomField.settings.dropdownItems &&
-      lastCustomField.settings.dropdownItems.length > 0
-    ) {
-      const dropDownValue = _.find(
-        lastCustomField.settings.dropdownItems,
-        item => {
-          return item._id === value;
-        },
-      );
-      if (dropDownValue) return dropDownValue.name;
+    if (lastCustomField.settings.dropdownItems && lastCustomField.settings.dropdownItems.length > 0) {
+      const dropDownValue = _.find(lastCustomField.settings.dropdownItems, (item) => {
+        return item._id === value;
+      });
+      if (dropDownValue)
+        return dropDownValue.name;
    }
    return value;
  },
@@ -127,16 +112,11 @@ BlazeComponent.extendComponent({

  sourceLink() {
    const source = this.currentData().source;
-    if (source) {
-      if (source.url) {
-        return Blaze.toHTML(
-          HTML.A(
-            {
-              href: source.url,
-            },
-            source.system,
-          ),
-        );
+    if(source) {
+      if(source.url) {
+        return Blaze.toHTML(HTML.A({
+          href: source.url,
+        }, source.system));
      } else {
        return source.system;
      }
@@ -153,50 +133,38 @@ BlazeComponent.extendComponent({
  attachmentLink() {
    const attachment = this.currentData().attachment();
    // trying to display url before file is stored generates js errors
-    return (
-      attachment &&
-      attachment.url({ download: true }) &&
-      Blaze.toHTML(
-        HTML.A(
-          {
-            href: attachment.url({ download: true }),
-            target: '_blank',
-          },
-          attachment.name(),
-        ),
-      )
-    );
+    return attachment && attachment.url({ download: true }) && Blaze.toHTML(HTML.A({
+      href: attachment.url({ download: true }),
+      target: '_blank',
+    }, attachment.name()));
  },

  customField() {
    const customField = this.currentData().customField();
-    if (!customField) return null;
+    if (!customField)
+      return null;
    return customField.name;
  },

  events() {
-    return [
-      {
-        // XXX We should use Popup.afterConfirmation here
-        'click .js-delete-comment'() {
-          const commentId = this.currentData().commentId;
-          CardComments.remove(commentId);
-        },
-        '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,
-              },
-            });
-          }
-        },
+    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('activities');
@@ -14,48 +14,45 @@ BlazeComponent.extendComponent({
  },

  events() {
-    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);
-            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);
 }
@@ -72,8 +69,7 @@ Tracker.autorun(() => {
  });
 });

-EscapeActions.register(
-  'inlinedForm',
+EscapeActions.register('inlinedForm',
  () => {
    const draftKey = {
      fieldName: 'cardComment',
@@ -88,10 +84,7 @@ EscapeActions.register(
    }
    resetCommentInput(commentInput);
  },
-  () => {
-    return commentFormIsOpen.get();
-  },
-  {
+  () => { return commentFormIsOpen.get(); }, {
    noClickEscapeOn: '.js-new-comment',
-  },
+  }
 );
@@ -4,45 +4,36 @@ BlazeComponent.extendComponent({
  },

  archivedBoards() {
-    return Boards.find(
-      { archived: true },
-      {
-        sort: ['title'],
-      },
-    );
+    return Boards.find({ archived: true }, {
+      sort: ['title'],
+    });
  },

  events() {
-    return [
-      {
-        'click .js-restore-board'() {
-          // TODO : Make isSandstorm variable global
-          const isSandstorm =
-            Meteor.settings &&
-            Meteor.settings.public &&
-            Meteor.settings.public.sandstorm;
-          if (isSandstorm && Session.get('currentBoard')) {
-            const currentBoard = Boards.findOne(Session.get('currentBoard'));
-            currentBoard.archive();
-          }
-          const board = this.currentData();
-          board.restore();
-          Utils.goBoardId(board._id);
-        },
-        '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');
@@ -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

@@ -12,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(() => {
@@ -29,6 +30,7 @@ BlazeComponent.extendComponent({
  goHome() {
    FlowRouter.go('home');
  },
+
 }).register('board');

 BlazeComponent.extendComponent({
@@ -45,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,
@@ -60,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,
@@ -108,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();
@@ -125,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');
@@ -156,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
@@ -174,17 +169,9 @@ 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));
          }
        }
      },
@@ -194,11 +181,7 @@ BlazeComponent.extendComponent({
    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
@@ -212,44 +195,45 @@ BlazeComponent.extendComponent({
  isViewSwimlanes() {
    const currentUser = Meteor.user();
    if (!currentUser) return false;
-    return (currentUser.profile || {}).boardView === 'board-view-swimlanes';
+    return ((currentUser.profile || {}).boardView === 'board-view-swimlanes');
  },

  isViewLists() {
    const currentUser = Meteor.user();
    if (!currentUser) return true;
-    return (currentUser.profile || {}).boardView === 'board-view-lists';
+    return ((currentUser.profile || {}).boardView === 'board-view-lists');
  },

  isViewCalendar() {
    const currentUser = Meteor.user();
    if (!currentUser) return false;
-    return (currentUser.profile || {}).boardView === 'board-view-cal';
+    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
@@ -261,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');
    });
  },
@@ -290,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
@@ -301,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',
      },
@@ -309,25 +291,20 @@ BlazeComponent.extendComponent({
      events(start, end, timezone, callback) {
        const currentBoard = Boards.findOne(Session.get('currentBoard'));
        const events = [];
-        currentBoard
-          .cardsInInterval(start.toDate(), end.toDate())
-          .forEach(function(card) {
-            events.push({
-              id: card._id,
-              title: card.title,
-              start: card.startAt,
-              end: card.endAt,
-              allDay:
-                Math.abs(card.endAt.getTime() - card.startAt.getTime()) /
-                  1000 ===
-                24 * 3600,
-              url: FlowRouter.url('card', {
-                boardId: currentBoard._id,
-                slug: currentBoard.slug,
-                cardId: card._id,
-              }),
-            });
+        currentBoard.cardsInInterval(start.toDate(), end.toDate()).forEach(function(card){
+          events.push({
+            id: card._id,
+            title: card.title,
+            start: card.startAt,
+            end: card.endAt,
+            allDay: Math.abs(card.endAt.getTime() - card.startAt.getTime()) / 1000 === 24*3600,
+            url: FlowRouter.url('card', {
+              boardId: currentBoard._id,
+              slug: currentBoard.slug,
+              cardId: card._id,
+            }),
          });
+        });
        callback(events);
      },
      eventResize(event, delta, revertFunc) {
@@ -362,6 +339,6 @@ BlazeComponent.extendComponent({
  isViewCalendar() {
    const currentUser = Meteor.user();
    if (!currentUser) return false;
-    return (currentUser.profile || {}).boardView === 'board-view-cal';
+    return ((currentUser.profile || {}).boardView === 'board-view-cal');
  },
 }).register('calendarView');
@@ -87,208 +87,3 @@ setBoardColor(color)

 .board-color-pumpkin
  setBoardColor(#E67E22)
-
-.board-color-moderatepink
-  setBoardColor(#CD5A91)
-
-.board-color-strongcyan
-  setBoardColor(#00AECC)
-
-.board-color-limegreen
-  setBoardColor(#4BBF6B)
-
-.board-color-dark
-  setBoardColor(#2C3E51)
-
-  /* Not hidden in dark mode.
-    card fields: received, start, due, end, members, requested, assigned
-  .card-details-item.card-details-item-received,
-  .card-details-item.card-details-item-start,
-  .card-details-item.card-details-item-due,
-  .card-details-item.card-details-item-end,
-  .card-details-item.card-details-item-members,
-  .card-details-item.card-details-item-name { display:none; }
-  .card-details-items:empty { display:none; }
-  */
-
-  // DARK MODE, when dark background mode selected.
-  // Modified version from https://github.com/wekan/wekan/wiki/Custom-CSS-themes#dark-theme
-  // In progress, please send pull requests to fix remaining visibility issues.
-  .ui-sortable,
-  .swimlane,
-  .swimlane >.swimlane-header-wrap,
-  .swimlane >.list.js-list,
-  .swimlane >.list-composer.js-list-composer,
-  .list-body,
-  .list,
-  .list-composer,
-  .sidebar-content,
-  .card-details
-    background-color:#2C3E50
-
-  .card-details h3,
-  .card-details-items,
-  .card-checklist-items .ui-sortable,
-  .card-subtasks-items,
-  .activities,
-  .material-toggle-switch
-    color:#bbbbbb
-
-  .list-header
-    background-color: #888888
-
-  .board-widget,
-  .board-widget-labels,
-  .board-widget-members
-    color: #aaaaaa
-
-  /* popup menu titles (boards, swimlanes, lists, cards, labels) */
-  .pop-over >.header
-    display:none;
-
-  /* HIDE UNTIL HOVER -------------------------------------------------- */
-
-  /* header "+" button */
-  #header-quick-access .fa-plus
-    display:none
-  #header-quick-access:hover .fa-plus
-    display:inherit
-
-  /* "add card" links (use visibility rather than display so items don't jump) */
-  .open-minicard-composer
-    visibility:hidden
-
-  .list.js-list:hover .open-minicard-composer
-    visibility:visible
-
-  .list-header-menu
-    visibility:hidden
-
-  .list.js-list:hover .list-header-menu
-    visibility:visible
-
-  /* "add list/swimlane" links (use visibility rather than display so items don't jump) */
-  .list.js-list-composer       >.list-header
-    visibility:hidden
-
-  .list.js-list-composer:hover >.list-header
-    visibility:visible
-
-  /* headers */
-  #header-quick-access, #header
-    background-color:rgba(0,0,0,.75) !important
-
-  #header .board-header-btn:hover
-    background-color:rgba(255,255,255,0.3) !important
-
-  /* foregrounds: swimlanes, lists */
-  .list >.list-header, .swimlane-header
-    color:rgba(255,255,255,.7)
-
-  /* minicards */
-  .minicard
-    background-color:rgba(255,255,255,.4)
-
-  .minicard-wrapper.is-selected .minicard,
-  .minicard:hover,
-  .minicard-composer.js-composer,
-  .open-minicard-composer:hover
-    background-color:rgba(255,255,255,.8) !important
-    color:#000
-
-  .minicard, .minicard .badge
-    color:#fff
-
-  .minicard:hover .badge, .minicard-wrapper.is-selected .badge
-    color:#000
-
-  /* cards */
-  .card-details .card-details-header
-    background-color:#ccc
-
-  /* sidebar */
-  .sidebar-tongue, .sidebar-shadow
-    background-color:#666 !important
-
-  .sidebar-content h3, .sidebar-content h2, .sidebar-content
-    color:rgba(255,255,255,.7) !important
-
-.board-color-relax
-  setBoardColor(#27AE61)
-
-  // RELAX MODE: light green background, with green background color,
-  // to help this theme users to relax.
-  // Colors and emphasis are specific to this Wekan theme contributor's company.
-  .ui-sortable
-    background-color:#a7e366
-
-  .list-header
-    background-color:#a7e366
-    border-bottom: 6px solid #a7e366
-
-  .list-body
-    background-color:#a7e366
-
-  .list
-    border-left: 1px dotted #000000
-
-  // Card details text emphasis: black border and white background
-  // to make it details text field easier to find for RELAX MODE users,
-  // and focus attention.
-  .card-details .card-details-items
-    & ~ .js-open-inlined-form
-        .viewer
-            background-color #ffffff !important
-            padding 15px !important
-            border 1px solid #000000 !important
-
-  // 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
@@ -45,21 +45,15 @@ Template.boardMenuPopup.helpers({
 });

 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();
  },
 });

@@ -82,79 +76,67 @@ BlazeComponent.extendComponent({
  },

  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'() {
-          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'(event) {
-          event.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'(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()
-    );
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
  },
 });

@@ -182,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',
@@ -203,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() {
@@ -240,11 +218,9 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        'click .js-select-visibility': this.selectBoardVisibility,
-      },
-    ];
+    return [{
+      'click .js-select-visibility': this.selectBoardVisibility,
+    }];
  },
 }).register('boardChangeVisibilityPopup');

@@ -259,21 +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');
@@ -31,28 +31,12 @@ 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 currentUser.isBoardAdmin
-                    i.fa.js-clone-board(
-                        class="fa-clone"
-                        title="{{_ 'duplicate-board'}}")
-                    i.fa.js-archive-board(
-                        class="fa-archive"
-                        title="{{_ 'archive-board'}}")
-                  else if currentUser.isAdmin
-                    i.fa.js-clone-board(
-                        class="fa-clone"
-                        title="{{_ 'duplicate-board'}}")
-                    i.fa.js-archive-board(
-                        class="fa-archive"
-                        title="{{_ 'archive-board'}}")
+                i.fa.js-clone-board(
+                    class="fa-clone"
+                    title="{{_ 'duplicate-board'}}")
+                i.fa.js-archive-board(
+                    class="fa-archive"
+                    title="{{_ 'archive-board'}}")

 template(name="boardListHeaderBar")
  h1 {{_ 'my-boards'}}
@@ -8,10 +8,10 @@ Template.boardListHeaderBar.events({

 Template.boardListHeaderBar.helpers({
  templatesBoardId() {
-    return Meteor.user() && Meteor.user().getTemplatesBoardId();
+    return Meteor.user().getTemplatesBoardId();
  },
  templatesBoardSlug() {
-    return Meteor.user() && Meteor.user().getTemplatesBoardSlug();
+    return Meteor.user().getTemplatesBoardSlug();
  },
 });

@@ -21,14 +21,11 @@ BlazeComponent.extendComponent({
  },

  boards() {
-    return Boards.find(
-      {
-        archived: false,
-        'members.userId': Meteor.userId(),
-        type: 'board',
-      },
-      { sort: ['title'] },
-    );
+    return Boards.find({
+      archived: false,
+      'members.userId': Meteor.userId(),
+      type: 'board',
+    }, { sort: ['title'] });
  },
  isStarred() {
    const user = Meteor.user();
@@ -51,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');
@@ -161,7 +161,6 @@ $spaceBetweenTiles = 16px
      padding-right: 6px

    .background-box
-      color: white
      border-radius: 3px
      background-size: cover
      display: block
@@ -183,11 +182,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
@@ -196,4 +194,4 @@ $spaceBetweenTiles = 16px

@media screen and (max-width: 360px)
    li
-      width: 100%
+      width: 50%
@@ -37,19 +37,17 @@ template(name="attachmentsGalery")
              i.fa.fa-download
              | {{_ 'download'}}
            if currentUser.isBoardMember
-              unless currentUser.isCommentOnly
-                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
-        li.attachment-item.add-attachment
-          a.js-add-attachment {{_ 'add-attachment' }}
+      li.attachment-item.add-attachment
+        a.js-add-attachment {{_ 'add-attachment' }}
@@ -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,120 +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);
-          },
-        });
-      }
+      $('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) {
@@ -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
@@ -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');
@@ -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,58 +44,51 @@ 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()
-    );
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
  },
 });

@@ -106,8 +96,7 @@ Template.dateBadge.helpers({
 (class extends DatePicker {
  onCreated() {
    super.onCreated();
-    this.data().getReceived() &&
-      this.date.set(moment(this.data().getReceived()));
+    this.data().getReceived() && this.date.set(moment(this.data().getReceived()));
  }

  _storeDate(date) {
@@ -117,7 +106,8 @@ Template.dateBadge.helpers({
  _deleteDate() {
    this.card.setReceived(null);
  }
-}.register('editCardReceivedDatePopup'));
+}).register('editCardReceivedDatePopup');
+

 // editCardStartDatePopup
 (class extends DatePicker {
@@ -129,10 +119,7 @@ Template.dateBadge.helpers({
  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());
    }
  }

@@ -143,7 +130,7 @@ Template.dateBadge.helpers({
  _deleteDate() {
    this.card.setStart(null);
  }
-}.register('editCardStartDatePopup'));
+}).register('editCardStartDatePopup');

 // editCardDueDatePopup
 (class extends DatePicker {
@@ -166,7 +153,7 @@ Template.dateBadge.helpers({
  _deleteDate() {
    this.card.setDue(null);
  }
-}.register('editCardDueDatePopup'));
+}).register('editCardDueDatePopup');

 // editCardEndDatePopup
 (class extends DatePicker {
@@ -189,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({
@@ -236,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(dueAt)) ||
-      (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() {
@@ -276,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;
  }

@@ -310,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;
  }

@@ -344,9 +337,12 @@ class CardEndDate extends CardDate {
    let classes = 'end-date' + ' ';
    const dueAt = this.data().getDue();
    const theDate = this.date.get();
-    if (theDate.diff(dueAt, 'days') >= 2) classes += 'long-overdue';
-    else if (theDate.diff(dueAt, 'days') >= 0) classes += 'due';
-    else if (theDate.diff(dueAt, 'days') >= -2) classes += 'almost-due';
+    if (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;
  }

@@ -366,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');
@@ -27,7 +27,7 @@ BlazeComponent.extendComponent({
  onCreated() {
    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
    this.isLoaded = new ReactiveVar(false);
-    const boardBody = this.parentComponent().parentComponent();
+    const boardBody =  this.parentComponent().parentComponent();
    //in Miniview parent is Board, not BoardBody.
    if (boardBody !== null) {
      boardBody.showOverlay.set(true);
@@ -48,11 +48,7 @@ BlazeComponent.extendComponent({
  },

  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly()
-    );
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
  },

  scrollParentContainer() {
@@ -84,17 +80,18 @@ BlazeComponent.extendComponent({
    const cardContainerScrollTop = $cardContainer.scrollTop();

    let topOffset = false;
-    if (cardViewStartTop !== 100) {
+    if(cardViewStartTop !== 100){
      topOffset = cardViewStartTop - 100;
    }
-    if (topOffset !== false) {
+    if(topOffset !== false) {
      bodyBoardComponent.scrollTop(cardContainerScrollTop + topOffset);
    }
+
  },

  presentParentTask() {
    let result = this.currentBoard.presentParentTask;
-    if (result === null || result === undefined) {
+    if ((result === null) || (result === undefined)) {
      result = 'no-parent';
    }
    return result;
@@ -117,46 +114,9 @@ BlazeComponent.extendComponent({
  },

  onRendered() {
-    if (Meteor.settings.public.CARD_OPENED_WEBHOOK_ENABLED) {
-      // Send Webhook but not create Activities records ---
-      const card = this.currentData();
-      const userId = Meteor.userId();
-      //console.log(`userId: ${userId}`);
-      //console.log(`cardId: ${card._id}`);
-      //console.log(`boardId: ${card.boardId}`);
-      //console.log(`listId: ${card.listId}`);
-      //console.log(`swimlaneId: ${card.swimlaneId}`);
-      const params = {
-        userId,
-        cardId: card._id,
-        boardId: card.boardId,
-        listId: card.listId,
-        user: Meteor.user().username,
-        url: '',
-      };
-      //console.log('looking for integrations...');
-      const integrations = Integrations.find({
-        boardId: card.boardId,
-        type: 'outgoing-webhooks',
-        enabled: true,
-        activities: { $in: ['CardDetailsRendered', 'all'] },
-      }).fetch();
-      //console.log(`Investigation length: ${integrations.length}`);
-      if (integrations.length > 0) {
-        Meteor.call('outgoingWebhooks', integrations, 'CardSelected', params);
-      }
-      //-------------
-    }
-
    if (!Utils.isMiniScreen()) {
      Meteor.setTimeout(() => {
-        $('.card-details').mCustomScrollbar({
-          theme: 'minimal-dark',
-          setWidth: false,
-          setLeft: 0,
-          scrollbarPosition: 'outside',
-          mouseWheel: true,
-        });
+        $('.card-details').mCustomScrollbar({theme:'minimal-dark', setWidth: false, setLeft: 0, scrollbarPosition: 'outside', mouseWheel: true });
        this.scrollParentContainer();
      }, 500);
    }
@@ -252,7 +212,7 @@ BlazeComponent.extendComponent({
  },

  onDestroyed() {
-    const parentComponent = this.parentComponent().parentComponent();
+    const parentComponent =  this.parentComponent().parentComponent();
    //on mobile view parent is Board, not board body.
    if (parentComponent === null) return;
    parentComponent.showOverlay.set(false);
@@ -268,64 +228,56 @@ BlazeComponent.extendComponent({
      },
    };

-    return [
-      {
-        ...events,
-        'click .js-close-card-details'() {
-          Utils.goBoardId(this.data().boardId);
-        },
-        'click .js-open-card-details-menu': Popup.open('cardDetailsActions'),
-        'submit .js-card-description'(event) {
-          event.preventDefault();
-          const description = this.currentComponent().getValue();
-          this.data().setDescription(description);
-        },
-        'submit .js-card-details-title'(event) {
-          event.preventDefault();
-          const title = this.currentComponent()
-            .getValue()
-            .trim();
-          if (title) {
-            this.data().setTitle(title);
-          }
-        },
-        'submit .js-card-details-assigner'(event) {
-          event.preventDefault();
-          const assigner = this.currentComponent()
-            .getValue()
-            .trim();
-          if (assigner) {
-            this.data().setAssignedBy(assigner);
-          }
-        },
-        'submit .js-card-details-requester'(event) {
-          event.preventDefault();
-          const requester = this.currentComponent()
-            .getValue()
-            .trim();
-          if (requester) {
-            this.data().setRequestedBy(requester);
-          }
-        },
-        'click .js-member': Popup.open('cardMember'),
-        'click .js-add-members': Popup.open('cardMembers'),
-        'click .js-add-labels': Popup.open('cardLabels'),
-        'click .js-received-date': Popup.open('editCardReceivedDate'),
-        'click .js-start-date': Popup.open('editCardStartDate'),
-        'click .js-due-date': Popup.open('editCardDueDate'),
-        'click .js-end-date': Popup.open('editCardEndDate'),
-        'mouseenter .js-card-details'() {
-          const parentComponent = this.parentComponent().parentComponent();
-          //on mobile view parent is Board, not BoardBody.
-          if (parentComponent === null) return;
-          parentComponent.showOverlay.set(true);
-          parentComponent.mouseHasEnterCardDetails = true;
-        },
-        'click #toggleButton'() {
-          Meteor.call('toggleSystemMessages');
-        },
+    return [{
+      ...events,
+      'click .js-close-card-details' () {
+        Utils.goBoardId(this.data().boardId);
      },
-    ];
+      'click .js-open-card-details-menu': Popup.open('cardDetailsActions'),
+      'submit .js-card-description' (evt) {
+        evt.preventDefault();
+        const description = this.currentComponent().getValue();
+        this.data().setDescription(description);
+      },
+      'submit .js-card-details-title' (evt) {
+        evt.preventDefault();
+        const title = this.currentComponent().getValue().trim();
+        if (title) {
+          this.data().setTitle(title);
+        }
+      },
+      'submit .js-card-details-assigner'(evt) {
+        evt.preventDefault();
+        const assigner = this.currentComponent().getValue().trim();
+        if (assigner) {
+          this.data().setAssignedBy(assigner);
+        }
+      },
+      'submit .js-card-details-requester'(evt) {
+        evt.preventDefault();
+        const requester = this.currentComponent().getValue().trim();
+        if (requester) {
+          this.data().setRequestedBy(requester);
+        }
+      },
+      'click .js-member': Popup.open('cardMember'),
+      'click .js-add-members': Popup.open('cardMembers'),
+      'click .js-add-labels': Popup.open('cardLabels'),
+      'click .js-received-date': Popup.open('editCardReceivedDate'),
+      'click .js-start-date': Popup.open('editCardStartDate'),
+      'click .js-due-date': Popup.open('editCardDueDate'),
+      'click .js-end-date': Popup.open('editCardEndDate'),
+      'mouseenter .js-card-details' () {
+        const parentComponent =  this.parentComponent().parentComponent();
+        //on mobile view parent is Board, not BoardBody.
+        if (parentComponent === null) return;
+        parentComponent.showOverlay.set(true);
+        parentComponent.mouseHasEnterCardDetails = true;
+      },
+      'click #toggleButton'() {
+        Meteor.call('toggleSystemMessages');
+      },
+    }];
  },
 }).register('cardDetails');

@@ -345,9 +297,7 @@ BlazeComponent.extendComponent({
  close(isReset = false) {
    if (this.isOpen.get() && !isReset) {
      const draft = this.getValue().trim();
-      if (
-        draft !== Cards.findOne(Session.get('currentCard')).getDescription()
-      ) {
+      if (draft !== Cards.findOne(Session.get('currentCard')).getDescription()) {
        UnsavedEdits.set(this._getUnsavedEditKey(), this.getValue());
      }
    }
@@ -361,14 +311,12 @@ BlazeComponent.extendComponent({

  events() {
    const parentEvents = InlinedForm.prototype.events()[0];
-    return [
-      {
-        ...parentEvents,
-        'click .js-close-inlined-form': this.reset,
-      },
-    ];
+    return [{
+      ...parentEvents,
+      'click .js-close-inlined-form': this.reset,
+    }];
  }
-}.register('inlinedCardDescription'));
+}).register('inlinedCardDescription');

 Template.cardDetailsActionsPopup.helpers({
  isWatching() {
@@ -376,11 +324,7 @@ Template.cardDetailsActionsPopup.helpers({
  },

  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly()
-    );
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
  },
 });

@@ -398,31 +342,23 @@ Template.cardDetailsActionsPopup.events({
  'click .js-copy-card': Popup.open('copyCard'),
  'click .js-copy-checklist-cards': Popup.open('copyChecklistToManyCards'),
  'click .js-set-card-color': Popup.open('setCardColor'),
-  'click .js-move-card-to-top'(event) {
-    event.preventDefault();
-    const minOrder = _.min(
-      this.list()
-        .cards(this.swimlaneId)
-        .map(c => c.sort),
-    );
+  'click .js-move-card-to-top' (evt) {
+    evt.preventDefault();
+    const minOrder = _.min(this.list().cards(this.swimlaneId).map((c) => c.sort));
    this.move(this.boardId, this.swimlaneId, this.listId, minOrder - 1);
  },
-  'click .js-move-card-to-bottom'(event) {
-    event.preventDefault();
-    const maxOrder = _.max(
-      this.list()
-        .cards(this.swimlaneId)
-        .map(c => c.sort),
-    );
+  'click .js-move-card-to-bottom' (evt) {
+    evt.preventDefault();
+    const maxOrder = _.max(this.list().cards(this.swimlaneId).map((c) => c.sort));
    this.move(this.boardId, this.swimlaneId, this.listId, maxOrder + 1);
  },
-  'click .js-archive'(event) {
-    event.preventDefault();
+  'click .js-archive' (evt) {
+    evt.preventDefault();
    this.archive();
    Popup.close();
  },
  'click .js-more': Popup.open('cardMore'),
-  'click .js-toggle-watch-card'() {
+  'click .js-toggle-watch-card' () {
    const currentCard = this;
    const level = currentCard.findWatcher(Meteor.userId()) ? null : 'watching';
    Meteor.call('watch', 'card', currentCard._id, level, (err, ret) => {
@@ -431,15 +367,15 @@ Template.cardDetailsActionsPopup.events({
  },
 });

-Template.editCardTitleForm.onRendered(function() {
+Template.editCardTitleForm.onRendered(function () {
  autosize(this.$('.js-edit-card-title'));
 });

 Template.editCardTitleForm.events({
-  'keydown .js-edit-card-title'(event) {
+  'keydown .js-edit-card-title' (evt) {
    // If enter key was pressed, submit the data
    // Unless the shift key is also being pressed
-    if (event.keyCode === 13 && !event.shiftKey) {
+    if (evt.keyCode === 13 && !evt.shiftKey) {
      $('.js-submit-edit-card-title-form').click();
    }
  },
@@ -450,9 +386,9 @@ Template.editCardRequesterForm.onRendered(function() {
 });

 Template.editCardRequesterForm.events({
-  'keydown .js-edit-card-requester'(event) {
+  'keydown .js-edit-card-requester'(evt) {
    // If enter key was pressed, submit the data
-    if (event.keyCode === 13) {
+    if (evt.keyCode === 13) {
      $('.js-submit-edit-card-requester-form').click();
    }
  },
@@ -463,16 +399,16 @@ Template.editCardAssignerForm.onRendered(function() {
 });

 Template.editCardAssignerForm.events({
-  'keydown .js-edit-card-assigner'(event) {
+  'keydown .js-edit-card-assigner'(evt) {
    // If enter key was pressed, submit the data
-    if (event.keyCode === 13) {
+    if (evt.keyCode === 13) {
      $('.js-submit-edit-card-assigner-form').click();
    }
  },
 });

 Template.moveCardPopup.events({
-  'click .js-done'() {
+  'click .js-done' () {
    // XXX We should *not* get the currentCard from the global state, but
    // instead from a “component” state.
    const card = Cards.findOne(Session.get('currentCard'));
@@ -493,16 +429,13 @@ BlazeComponent.extendComponent({
  },

  boards() {
-    const boards = Boards.find(
-      {
-        archived: false,
-        'members.userId': Meteor.userId(),
-        _id: { $ne: Meteor.user().getTemplatesBoardId() },
-      },
-      {
-        sort: ['title'],
-      },
-    );
+    const boards = Boards.find({
+      archived: false,
+      'members.userId': Meteor.userId(),
+      _id: {$ne: Meteor.user().getTemplatesBoardId()},
+    }, {
+      sort: ['title'],
+    });
    return boards;
  },

@@ -517,14 +450,12 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        'change .js-select-boards'(event) {
-          this.selectedBoardId.set($(event.currentTarget).val());
-          subManager.subscribe('board', this.selectedBoardId.get(), false);
-        },
+    return [{
+      'change .js-select-boards'(evt) {
+        this.selectedBoardId.set($(evt.currentTarget).val());
+        subManager.subscribe('board', this.selectedBoardId.get(), false);
      },
-    ];
+    }];
  },
 }).register('boardsAndLists');

@@ -540,9 +471,7 @@ Template.copyCardPopup.events({
    const textarea = $('#copy-card-title');
    const title = textarea.val().trim();
    // insert new card to the bottom of new list
-    card.sort = Lists.findOne(card.listId)
-      .cards()
-      .count();
+    card.sort = Lists.findOne(card.listId).cards().count();

    if (title) {
      card.title = title;
@@ -560,7 +489,7 @@ Template.copyCardPopup.events({
 });

 Template.copyChecklistToManyCardsPopup.events({
-  'click .js-done'() {
+  'click .js-done' () {
    const card = Cards.findOne(Session.get('currentCard'));
    const oldId = card._id;
    card._id = null;
@@ -573,13 +502,11 @@ Template.copyChecklistToManyCardsPopup.events({
    const textarea = $('#copy-card-title');
    const titleEntry = textarea.val().trim();
    // insert new card to the bottom of new list
-    card.sort = Lists.findOne(card.listId)
-      .cards()
-      .count();
+    card.sort = Lists.findOne(card.listId).cards().count();

    if (titleEntry) {
      const titleList = JSON.parse(titleEntry);
-      for (let i = 0; i < titleList.length; i++) {
+      for (let i = 0; i < titleList.length; i++){
        const obj = titleList[i];
        card.title = obj.title;
        card.description = obj.description;
@@ -592,12 +519,12 @@ Template.copyChecklistToManyCardsPopup.events({
        Filter.addException(_id);

        // copy checklists
-        Checklists.find({ cardId: oldId }).forEach(ch => {
+        Checklists.find({cardId: oldId}).forEach((ch) => {
          ch.copy(_id);
        });

        // copy subtasks
-        cursor = Cards.find({ parentId: oldId });
+        cursor = Cards.find({parentId: oldId});
        cursor.forEach(function() {
          'use strict';
          const subtask = arguments[0];
@@ -607,7 +534,7 @@ Template.copyChecklistToManyCardsPopup.events({
        });

        // copy card comments
-        CardComments.find({ cardId: oldId }).forEach(cmt => {
+        CardComments.find({cardId: oldId}).forEach((cmt) => {
          cmt.copy(_id);
        });
      }
@@ -623,7 +550,7 @@ BlazeComponent.extendComponent({
  },

  colors() {
-    return cardColors.map(color => ({ color, name: '' }));
+    return cardColors.map((color) => ({ color, name: '' }));
  },

  isSelected(color) {
@@ -634,21 +561,19 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        'click .js-palette-color'() {
-          this.currentColor.set(this.currentData().color);
-        },
-        'click .js-submit'() {
-          this.currentCard.setColor(this.currentColor.get());
-          Popup.close();
-        },
-        'click .js-remove-color'() {
-          this.currentCard.setColor(null);
-          Popup.close();
-        },
+    return [{
+      'click .js-palette-color'() {
+        this.currentColor.set(this.currentData().color);
      },
-    ];
+      'click .js-submit' () {
+        this.currentCard.setColor(this.currentColor.get());
+        Popup.close();
+      },
+      'click .js-remove-color'() {
+        this.currentCard.setColor(null);
+        Popup.close();
+      },
+    }];
  },
 }).register('setCardColorPopup');

@@ -667,18 +592,15 @@ BlazeComponent.extendComponent({
  },

  boards() {
-    const boards = Boards.find(
-      {
-        archived: false,
-        'members.userId': Meteor.userId(),
-        _id: {
-          $ne: Meteor.user().getTemplatesBoardId(),
-        },
+    const boards = Boards.find({
+      archived: false,
+      'members.userId': Meteor.userId(),
+      _id: {
+        $ne: Meteor.user().getTemplatesBoardId(),
      },
-      {
-        sort: ['title'],
-      },
-    );
+    }, {
+      sort: ['title'],
+    });
    return boards;
  },

@@ -687,7 +609,7 @@ BlazeComponent.extendComponent({
    if (this.parentBoard.get()) {
      return Cards.find({
        boardId: this.parentBoard.get(),
-        _id: { $ne: currentId },
+        _id: {$ne: currentId},
      });
    } else {
      return [];
@@ -720,69 +642,63 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        'click .js-copy-card-link-to-clipboard'() {
-          // Clipboard code from:
-          // https://stackoverflow.com/questions/6300213/copy-selected-text-to-the-clipboard-without-using-flash-must-be-cross-browser
-          const StringToCopyElement = document.getElementById('cardURL');
-          StringToCopyElement.select();
-          if (document.execCommand('copy')) {
-            StringToCopyElement.blur();
-          } else {
-            document.getElementById('cardURL').selectionStart = 0;
-            document.getElementById('cardURL').selectionEnd = 999;
-            document.execCommand('copy');
-            if (window.getSelection) {
-              if (window.getSelection().empty) {
-                // Chrome
-                window.getSelection().empty();
-              } else if (window.getSelection().removeAllRanges) {
-                // Firefox
-                window.getSelection().removeAllRanges();
-              }
-            } else if (document.selection) {
-              // IE?
-              document.selection.empty();
+    return [{
+      'click .js-copy-card-link-to-clipboard' () {
+        // Clipboard code from:
+        // https://stackoverflow.com/questions/6300213/copy-selected-text-to-the-clipboard-without-using-flash-must-be-cross-browser
+        const StringToCopyElement = document.getElementById('cardURL');
+        StringToCopyElement.select();
+        if (document.execCommand('copy')) {
+          StringToCopyElement.blur();
+        } else {
+          document.getElementById('cardURL').selectionStart = 0;
+          document.getElementById('cardURL').selectionEnd = 999;
+          document.execCommand('copy');
+          if (window.getSelection) {
+            if (window.getSelection().empty) { // Chrome
+              window.getSelection().empty();
+            } else if (window.getSelection().removeAllRanges) { // Firefox
+              window.getSelection().removeAllRanges();
            }
+          } else if (document.selection) { // IE?
+            document.selection.empty();
          }
-        },
-        'click .js-delete': Popup.afterConfirm('cardDelete', function() {
-          Popup.close();
-          Cards.remove(this._id);
-          Utils.goBoardId(this.boardId);
-        }),
-        'change .js-field-parent-board'(event) {
-          const selection = $(event.currentTarget).val();
-          const list = $('.js-field-parent-card');
-          if (selection === 'none') {
-            this.parentBoard.set(null);
-          } else {
-            subManager.subscribe('board', $(event.currentTarget).val(), false);
-            this.parentBoard.set(selection);
-            list.prop('disabled', false);
-          }
-          this.setParentCardId(null);
-        },
-        'change .js-field-parent-card'(event) {
-          const selection = $(event.currentTarget).val();
-          this.setParentCardId(selection);
-        },
+        }
      },
-    ];
+      'click .js-delete': Popup.afterConfirm('cardDelete', function () {
+        Popup.close();
+        Cards.remove(this._id);
+        Utils.goBoardId(this.boardId);
+      }),
+      'change .js-field-parent-board'(evt) {
+        const selection = $(evt.currentTarget).val();
+        const list = $('.js-field-parent-card');
+        if (selection === 'none') {
+          this.parentBoard.set(null);
+        } else {
+          subManager.subscribe('board', $(evt.currentTarget).val(), false);
+          this.parentBoard.set(selection);
+          list.prop('disabled', false);
+        }
+        this.setParentCardId(null);
+      },
+      'change .js-field-parent-card'(evt) {
+        const selection = $(evt.currentTarget).val();
+        this.setParentCardId(selection);
+      },
+    }];
  },
 }).register('cardMorePopup');

+
 // Close the card details pane by pressing escape
-EscapeActions.register(
-  'detailsPane',
+EscapeActions.register('detailsPane',
  () => {
    Utils.goBoardId(Session.get('currentBoard'));
  },
  () => {
    return !Session.equals('currentCard', null);
-  },
-  {
+  }, {
    noClickEscapeOn: '.js-card-details,.board-sidebar,#header',
-  },
+  }
 );
@@ -126,7 +126,7 @@ 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
@@ -134,7 +134,7 @@ input[type="submit"].attachment-add-link-submit
    .card-details-canvas
      width: 100%
      padding-left: 0px;
-
+ 
    .card-details-header
      .close-card-details
        margin-right: 0px
@@ -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();
  },
 });
@@ -64,22 +64,20 @@ BlazeComponent.extendComponent({
  },

  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly()
-    );
+    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({
@@ -88,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 = '';
@@ -117,11 +113,7 @@ BlazeComponent.extendComponent({
  },

  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly()
-    );
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
  },

  deleteChecklist() {
@@ -175,43 +167,37 @@ BlazeComponent.extendComponent({
  events() {
    const events = {
      'click .toggle-delete-checklist-dialog'(event) {
-        if ($(event.target).hasClass('js-delete-checklist')) {
+        if($(event.target).hasClass('js-delete-checklist')){
          this.checklistToDelete = this.currentData().checklist; //Store data context
        }
        this.toggleDeleteDialog.set(!this.toggleDeleteDialog.get());
      },
    };

-    return [
-      {
-        ...events,
-        'submit .js-add-checklist': this.addChecklist,
-        'submit .js-edit-checklist-title': this.editChecklist,
-        'submit .js-add-checklist-item': this.addChecklistItem,
-        'submit .js-edit-checklist-item': this.editChecklistItem,
-        'click .js-delete-checklist-item': this.deleteItem,
-        'click .confirm-checklist-delete': this.deleteChecklist,
-        keydown: this.pressKey,
-      },
-    ];
+    return [{
+      ...events,
+      'submit .js-add-checklist': this.addChecklist,
+      'submit .js-edit-checklist-title': this.editChecklist,
+      'submit .js-add-checklist-item': this.addChecklistItem,
+      'submit .js-edit-checklist-item': this.editChecklistItem,
+      'click .js-delete-checklist-item': this.deleteItem,
+      'click .confirm-checklist-delete': this.deleteChecklist,
+      keydown: this.pressKey,
+    }];
  },
 }).register('checklists');

 Template.checklistDeleteDialog.onCreated(() => {
  const $cardDetails = this.$('.card-details');
-  this.scrollState = {
-    position: $cardDetails.scrollTop(), //save current scroll position
+  this.scrollState = { position: $cardDetails.scrollTop(), //save current scroll position
    top: false, //required for smooth scroll animation
  };
  //Callback's purpose is to only prevent scrolling after animation is complete
-  $cardDetails.animate({ scrollTop: 0 }, 500, () => {
-    this.scrollState.top = true;
-  });
+  $cardDetails.animate({ scrollTop: 0 }, 500, () => { this.scrollState.top = true; });

  //Prevent scrolling while dialog is open
  $cardDetails.on('scroll', () => {
-    if (this.scrollState.top) {
-      //If it's already in position, keep it there. Otherwise let animation scroll
+    if(this.scrollState.top) { //If it's already in position, keep it there. Otherwise let animation scroll
      $cardDetails.scrollTop(0);
    }
  });
@@ -220,16 +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()
-    );
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
  },
 });

@@ -242,10 +224,8 @@ BlazeComponent.extendComponent({
    }
  },
  events() {
-    return [
-      {
-        'click .js-checklist-item .check-box': this.toggleItem,
-      },
-    ];
+    return [{
+      'click .js-checklist-item .check-box': this.toggleItem,
+    }];
  },
 }).register('checklistItemDetail');
@@ -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();
  },
@@ -8,12 +8,7 @@ template(name="minicard")
    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
@@ -79,10 +74,7 @@ template(name="minicard")
        if comments.count
          .badge(title="{{_ 'card-comments-title' comments.count }}")
            span.badge-icon.fa.fa-comment-o.badge-comment
-              = ' '
-              = comments.count
-            //span.badge-comment.badge-text
-            //|  {{_ 'comment'}}
+            span.badge-text= comments.count
      if getDescription
        .badge.badge-state-image-only(title=getDescription)
          span.badge-icon.fa.fa-align-left
@@ -8,25 +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'() {
-          Meteor.call('toggleMinicardLabelText');
-        },
-      },
-    ];
+    }];
  },
 }).register('minicard');
-
-Template.minicard.helpers({
-  hiddenMinicardLabelText() {
-    return Meteor.user().hasHiddenMinicardLabelText();
-  },
-});
@@ -81,7 +81,6 @@
  .minicard-labels
    float: right
    display: flex
-    flex-wrap: wrap

    .minicard-label
      width: 11px
@@ -145,7 +144,7 @@
      .badge-text
        vertical-align: middle
        &.badge-comment
-          margin-bottom: 0.1rem
+           margin-bottom: 0.1rem

      .badge-text
        font-size: 0.9em
@@ -1,14 +1,11 @@
 BlazeComponent.extendComponent({
  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly()
-    );
+    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');
@@ -41,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 = '';
@@ -52,11 +48,7 @@ BlazeComponent.extendComponent({
  },

  canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly()
-    );
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
  },

  deleteSubtask() {
@@ -93,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', {
@@ -111,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);
    }
  });
@@ -146,16 +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()
-    );
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
  },
 });

@@ -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);
  },

@@ -213,7 +208,7 @@ BlazeComponent.extendComponent({

  onMapMember(evt) {
    const memberToMap = this.currentData();
-    if (memberToMap.wekan) {
+    if(memberToMap.wekan) {
      // todo xxx ask for confirmation?
      this.unmapMember(memberToMap.id);
    } else {
@@ -223,12 +218,10 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        submit: this.onSubmit,
-        'click .js-select-member': this.onMapMember,
-      },
-    ];
+    return [{
+      'submit': this.onSubmit,
+      'click .js-select-member': this.onMapMember,
+    }];
  },
 }).register('importMapMembers');

@@ -237,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');
@@ -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;
@@ -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) {
@@ -21,18 +21,14 @@ 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({
+    if(window.matchMedia('(max-width: 1199px)').matches) {
+      $( '.js-minicards' ).sortable({
        handle: '.handle',
      });
    }
@@ -46,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;
@@ -80,16 +70,9 @@ BlazeComponent.extendComponent({
        const currentBoard = Boards.findOne(Session.get('currentBoard'));
        let swimlaneId = '';
        const boardView = (Meteor.user().profile || {}).boardView;
-        if (
-          boardView === 'board-view-swimlanes' ||
-          currentBoard.isTemplatesBoard()
-        )
+        if (boardView === 'board-view-swimlanes' || currentBoard.isTemplatesBoard())
          swimlaneId = Blaze.getData(ui.item.parents('.swimlane').get(0))._id;
-        else if (
-          boardView === 'board-view-lists' ||
-          boardView === 'board-view-cal' ||
-          !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
@@ -103,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);
@@ -103,10 +103,6 @@
    color: #8c8c8c
    font-size: 0.8em

-.list-header .list-header-plus-icon, .js-open-list-menu, .list-header-menu a
-    color #4d4d4d
-    padding-left 4px
-
 .list-body
  flex: 1 1 auto
  flex-direction: column
@@ -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) {
@@ -52,12 +52,11 @@ BlazeComponent.extendComponent({
    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({
@@ -72,14 +71,8 @@ BlazeComponent.extendComponent({
          cardType = 'cardType-linkedBoard';
        }
      } else if (boardView === 'board-view-swimlanes')
-        swimlaneId = this.parentComponent()
-          .parentComponent()
-          .data()._id;
-      else if (
-        boardView === 'board-view-lists' ||
-        boardView === 'board-view-cal' ||
-        !boardView
-      )
+        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({
@@ -98,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);
      }
@@ -158,12 +149,8 @@ BlazeComponent.extendComponent({

  idOrNull(swimlaneId) {
    const currentUser = Meteor.user();
-    if (
-      (currentUser.profile || {}).boardView === 'board-view-swimlanes' ||
-      this.data()
-        .board()
-        .isTemplatesBoard()
-    )
+    if ((currentUser.profile || {}).boardView === 'board-view-swimlanes' ||
+        this.data().board().isTemplatesBoard())
      return swimlaneId;
    return undefined;
  },
@@ -174,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,
@@ -187,32 +175,21 @@ BlazeComponent.extendComponent({
  },

  canSeeAddCard() {
-    return (
-      !this.reachedWipLimit() &&
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly()
-    );
+    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');

@@ -235,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);
  },

@@ -255,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;
    });
  },
@@ -285,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() {
@@ -307,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');

@@ -393,29 +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 = '';
    const boardView = (Meteor.user().profile || {}).boardView;
    if (boardView === 'board-view-swimlanes')
      this.swimlaneId = Blaze.getData(swimlane[0])._id;
    else if (boardView === 'board-view-lists' || !boardView)
-      this.swimlaneId = Swimlanes.findOne({ boardId: this.boardId })._id;
+      this.swimlaneId = Swimlanes.findOne({boardId: this.boardId})._id;
  },

  boards() {
-    const boards = Boards.find(
-      {
-        archived: false,
-        'members.userId': Meteor.userId(),
-        _id: { $ne: Session.get('currentBoard') },
-        type: 'board',
-      },
-      {
-        sort: ['title'],
-      },
-    );
+    const boards = Boards.find({
+      archived: false,
+      'members.userId': Meteor.userId(),
+      _id: {$ne: Session.get('currentBoard')},
+      type: 'board',
+    }, {
+      sort: ['title'],
+    });
    return boards;
  },

@@ -423,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;
@@ -433,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;
  },

@@ -442,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');

@@ -529,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;
@@ -554,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) {
@@ -577,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',
-      );
+      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;
@@ -591,17 +522,14 @@ BlazeComponent.extendComponent({
  },

  boards() {
-    const boards = Boards.find(
-      {
-        archived: false,
-        'members.userId': Meteor.userId(),
-        _id: { $ne: Session.get('currentBoard') },
-        type: 'board',
-      },
-      {
-        sort: ['title'],
-      },
-    );
+    const boards = Boards.find({
+      archived: false,
+      'members.userId': Meteor.userId(),
+      _id: {$ne: Session.get('currentBoard')},
+      type: 'board',
+    }, {
+      sort: ['title'],
+    });
    return boards;
  },

@@ -618,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;
@@ -628,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');

@@ -703,23 +622,15 @@ BlazeComponent.extendComponent({

    const boardView = (Meteor.user().profile || {}).boardView;
    if (boardView === 'board-view-swimlanes')
-      this.swimlaneId = this.parentComponent()
-        .parentComponent()
-        .parentComponent()
-        .data()._id;
+      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();
  },
@@ -749,4 +660,5 @@ BlazeComponent.extendComponent({

    return bottomViewPosition > threshold;
  },
+
 }).register('spinnerList');
@@ -9,7 +9,7 @@ template(name="listHeader")
        if currentList
          a.list-header-left-icon.fa.fa-angle-left.js-unselect-list
      h2.list-header-name(
-        class="{{#if currentUser.isBoardMember}}{{#unless currentUser.isCommentOnly}}js-open-inlined-form is-editable{{/unless}}{{/if}}")
+        class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}")
        +viewer
          = title
        if wipLimit.enabled
@@ -6,18 +6,12 @@ Meteor.startup(() => {
 BlazeComponent.extendComponent({
  canSeeAddCard() {
    const list = Template.currentData();
-    return (
-      !list.getWipLimit('enabled') ||
-      list.getWipLimit('soft') ||
-      !this.reachedWipLimit()
-    );
+    return !list.getWipLimit('enabled') || list.getWipLimit('soft') || !this.reachedWipLimit();
  },

-  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());
@@ -38,19 +32,14 @@ BlazeComponent.extendComponent({
    let swimlaneId = '';
    const boardView = (Meteor.user().profile || {}).boardView;
    if (boardView === 'board-view-swimlanes')
-      swimlaneId = this.parentComponent()
-        .parentComponent()
-        .data()._id;
+      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) {
@@ -59,24 +48,20 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        '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');

@@ -91,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();
  },
@@ -117,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();
@@ -137,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);
@@ -149,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);
@@ -166,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);
  }),
@@ -198,7 +168,7 @@ BlazeComponent.extendComponent({
  },

  colors() {
-    return listsColors.map(color => ({ color, name: '' }));
+    return listsColors.map((color) => ({ color, name: '' }));
  },

  isSelected(color) {
@@ -206,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');
@@ -1,104 +1,18 @@
-import _sanitizeXss from 'xss';
-const ASIS = 'asis';
-const sanitizeXss = (input, options) => {
-  const defaultAllowedIframeSrc = /^(https:){0,1}\/\/.*?(youtube|vimeo|dailymotion|youku)/i;
-  const allowedIframeSrcRegex = (function() {
-    let reg = defaultAllowedIframeSrc;
-    const SAFE_IFRAME_SRC_PATTERN =
-      Meteor.settings.public.SAFE_IFRAME_SRC_PATTERN;
-    try {
-      if (SAFE_IFRAME_SRC_PATTERN !== undefined) {
-        reg = new RegExp(SAFE_IFRAME_SRC_PATTERN, 'i');
-      }
-    } catch (e) {
-      /*eslint no-console: ["error", { allow: ["warn", "error"] }] */
-
-      console.error('Wrong pattern specified', SAFE_IFRAM_SRC_PATTERN, e);
-    }
-    return reg;
-  })();
-  const targetWindow = '_blank';
-  const getHtmlDOM = html => {
-    const i = document.createElement('i');
-    i.innerHTML = html;
-    return i.firstChild;
-  };
-  options = {
-    onTag(tag, html, options) {
-      const htmlDOM = getHtmlDOM(html);
-      const getAttr = attr => {
-        return htmlDOM && attr && htmlDOM.getAttribute(attr);
-      };
-      if (tag === 'iframe') {
-        const clipCls = 'note-vide-clip';
-        if (!options.isClosing) {
-          const iframeCls = getAttr('class');
-          let safe = iframeCls.indexOf(clipCls) > -1;
-          const src = getAttr('src');
-          if (allowedIframeSrcRegex.exec(src)) {
-            safe = true;
-          }
-          if (safe)
-            return `<iframe src='${src}' class="${clipCls}" width=100% height=auto allowfullscreen></iframe>`;
-        } else {
-          // remove </iframe> tag
-          return '';
-        }
-      } else if (tag === 'a') {
-        if (!options.isClosing) {
-          if (getAttr(ASIS) === 'true') {
-            // if has a ASIS attribute, don't do anything, it's a member id
-            return html;
-          } else {
-            const href = getAttr('href');
-            if (href.match(/^((http(s){0,1}:){0,1}\/\/|\/)/)) {
-              // a valid url
-              return `<a href=${href} target=${targetWindow}>`;
-            }
-          }
-        }
-      } else if (tag === 'img') {
-        if (!options.isClosing) {
-          const src = getAttr('src');
-          if (src) {
-            return `<a href='${src}' class='swipebox'><img src='${src}' class="attachment-image-preview mCS_img_loaded"></a>`;
-          }
-        }
-      }
-      return undefined;
-    },
-    onTagAttr(tag, name, value) {
-      if (tag === 'img' && name === 'src') {
-        if (value && value.substr(0, 5) === 'data:') {
-          // allow image with dataURI src
-          return `${name}='${value}'`;
-        }
-      } else if (tag === 'a' && name === 'target') {
-        return `${name}='${targetWindow}'`; // always change a href target to a new window
-      }
-      return undefined;
-    },
-    ...options,
-  };
-  return _sanitizeXss(input, options);
-};
 Template.editor.onRendered(() => {
-  const 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;
@@ -108,282 +22,83 @@ 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 = sanitizeXss;
-    const editor = '.editor';
-    const selectors = [
-      `.js-new-comment-form ${editor}`,
-      `.js-edit-comment ${editor}`,
-    ].join(','); // only new comment and edit comment
-    const inputs = $(selectors);
-    if (inputs.length === 0) {
-      // only enable richereditor to new comment or edit comment no others
-      enableTextarea();
-    } else {
-      const placeholder = inputs.attr('placeholder') || '';
-      const mSummernotes = [];
-      const getSummernote = function(input) {
-        const idx = inputs.index(input);
-        if (idx > -1) {
-          return mSummernotes[idx];
-        }
-        return undefined;
-      };
-      inputs.each(function(idx, input) {
-        mSummernotes[idx] = $(input).summernote({
-          placeholder,
-          callbacks: {
-            onInit(object) {
-              const originalInput = this;
-              $(originalInput).on('submitted', function() {
-                // resetCommentInput has been called
-                if (!this.value) {
-                  const sn = getSummernote(this);
-                  sn && sn.summernote('reset');
-                  object && object.editingArea.find('.note-placeholder').show();
-                }
-              });
-              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);
-                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('reset'); //clear original
-                someNote.summernote('pasteHTML', cleaned); //this sets the displayed content editor to the cleaned pasted code.
-              };
-              setTimeout(function() {
-                //this kinda sucks, but if you don't do a setTimeout,
-                //the function is called before the text is really pasted.
-                updatePastedText(thisNote);
-              }, 10);
-            },
-          },
-          dialogsInBody: true,
-          disableDragAndDrop: true,
-          toolbar,
-          popover: {
-            image: [
-              [
-                'image',
-                ['resizeFull', 'resizeHalf', 'resizeQuarter', 'resizeNone'],
-              ],
-              ['float', ['floatLeft', 'floatRight', 'floatNone']],
-              ['remove', ['removeMedia']],
-            ],
-            table: [
-              ['add', ['addRowDown', 'addRowUp', 'addColLeft', 'addColRight']],
-              ['delete', ['deleteRow', 'deleteCol', 'deleteTable']],
-            ],
-            air: [
-              ['color', ['color']],
-              ['font', ['bold', 'underline', 'clear']],
-            ],
-          },
-          height: 200,
-        });
-      });
-    }
-  } else {
-    enableTextarea();
-  }
+  ]);
 });

+import sanitizeXss from 'xss';
+
 // XXX I believe we should compute a HTML rendered field on the server that
 // would handle markdown and user mentions. We can simply have two
 // fields, one source, and one compiled version (in HTML) and send only the
 // compiled version to most users -- who don't need to edit.
 // In the meantime, all the transformation are done on the client using the
 // Blaze API.
-const at = HTML.CharRef({ html: '&commat;', str: '@' });
-Blaze.Template.registerHelper(
-  'mentions',
-  new Template('mentions', function() {
-    const view = this;
-    let content = Blaze.toHTML(view.templateContentBlock);
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    if (!currentBoard) return HTML.Raw(sanitizeXss(content));
-    const knowedUsers = currentBoard.members.map(member => {
-      const u = Users.findOne(member.userId);
-      if (u) {
-        member.username = u.username;
-      }
-      return member;
-    });
-    const mentionRegex = /\B@([\w.]*)/gi;
-
-    let currentMention;
-    while ((currentMention = mentionRegex.exec(content)) !== null) {
-      const [fullMention, username] = currentMention;
-      const knowedUser = _.findWhere(knowedUsers, { username });
-      if (!knowedUser) {
-        continue;
-      }
-
-      const linkValue = [' ', at, knowedUser.username];
-      let linkClass = 'atMention js-open-member';
-      if (knowedUser.userId === Meteor.userId()) {
-        linkClass += ' me';
-      }
-      const link = HTML.A(
-        {
-          class: linkClass,
-          // XXX Hack. Since we stringify this render function result below with
-          // `Blaze.toHTML` we can't rely on blaze data contexts to pass the
-          // `userId` to the popup as usual, and we need to store it in the DOM
-          // using a data attribute.
-          'data-userId': knowedUser.userId,
-          [ASIS]: 'true',
-        },
-        linkValue,
-      );
-
-      content = content.replace(fullMention, Blaze.toHTML(link));
-    }
+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, username] = currentMention;
+    const knowedUser = _.findWhere(knowedUsers, { username });
+    if (!knowedUser) {
+      continue;
+    }
+
+    const linkValue = [' ', at, knowedUser.username];
+    let linkClass = 'atMention js-open-member';
+    if (knowedUser.userId === Meteor.userId()) {
+      linkClass += ' me';
+    }
+    const link = HTML.A({
+      'class': linkClass,
+      // XXX Hack. Since we stringify this render function result below with
+      // `Blaze.toHTML` we can't rely on blaze data contexts to pass the
+      // `userId` to the popup as usual, and we need to store it in the DOM
+      // using a data attribute.
+      'data-userId': knowedUser.userId,
+    }, linkValue);
+
+    content = content.replace(fullMention, Blaze.toHTML(link));
+  }
+
+  return HTML.Raw(sanitizeXss(content));
+}));
+
 Template.viewer.events({
  // Viewer sometimes have click-able wrapper around them (for instance to edit
  // the corresponding text). Clicking a link shouldn't fire these actions, stop
  // we stop these event at the viewer component level.
-  'click a'(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;
-      const child = event.currentTarget.firstElementChild;
-      if (child && child.tagName === 'IMG') {
-        prevent = false;
-      } else if (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();
-    }
  },
 });
@@ -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;
  },
 });
@@ -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,23 +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();
    },
  });
 });

 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) {
@@ -92,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);
+        });
    }
  },
 });
@@ -113,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;

@@ -131,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();
  }
@@ -161,7 +153,7 @@ function getAuthenticationMethod(
 }

 function getUserAuthenticationMethod(defaultAuthenticationMethod, match) {
-  return new Promise(resolve => {
+  return new Promise((resolve) => {
    try {
      Meteor.subscribe('user-authenticationMethod', match, {
        onReady() {
@@ -174,7 +166,7 @@ function getUserAuthenticationMethod(defaultAuthenticationMethod, match) {
          resolve(authenticationMethod);
        },
      });
-    } catch (error) {
+    } catch(error) {
      resolve(defaultAuthenticationMethod);
    }
  });
@@ -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
@@ -425,9 +395,6 @@ a
    height: 100%
    margin: 0px

-  .panel-default
-    width: 83vw
-
 .inline-input
  height: 37px
  margin: 8px 10px 0 0
@@ -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');
+        }
      },
-    ];
+    }];
  },
 });
@@ -1,165 +1,168 @@
 BlazeComponent.extendComponent({
-  onCreated() {},
+  onCreated() {
+
+  },

  events() {
-    return [
-      {
-        'click .js-create-card-action'(event) {
-          const ruleName = this.data().ruleName.get();
-          const trigger = this.data().triggerVar.get();
-          const cardName = this.find('#card-name').value;
-          const listName = this.find('#list-name').value;
-          const swimlaneName = this.find('#swimlane-name2').value;
-          const boardId = Session.get('currentBoard');
-          const desc = Utils.getTriggerActionDesc(event, this);
-          const triggerId = Triggers.insert(trigger);
-          const actionId = Actions.insert({
-            actionType: 'createCard',
-            swimlaneName,
-            cardName,
-            listName,
-            boardId,
-            desc,
-          });
-          Rules.insert({
-            title: ruleName,
-            triggerId,
-            actionId,
-            boardId,
-          });
-        },
-        '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,
-            });
-          }
-        },
+    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 */
@@ -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');
@@ -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');
@@ -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');
@@ -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');
@@ -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');
@@ -9,12 +9,12 @@ BlazeComponent.extendComponent({
  setTrigger() {
    this.rulesCurrentTab.set('trigger');
  },
-  sanitizeObject(obj) {
-    Object.keys(obj).forEach(key => {
-      if (obj[key] === '' || obj[key] === undefined) {
+  sanitizeObject(obj){
+    Object.keys(obj).forEach((key) => {
+      if(obj[key] === '' || obj[key] === undefined){
        obj[key] = '*';
-      }
-    });
+      }}
+    );
  },
  setRulesList() {
    this.rulesCurrentTab.set('rulesList');
@@ -29,73 +29,69 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        'click .js-delete-rule'() {
-          const rule = this.currentData();
-          Rules.remove(rule._id);
-          Actions.remove(rule.actionId);
-          Triggers.remove(rule.triggerId);
-        },
-        'click .js-goto-trigger'(event) {
-          event.preventDefault();
-          const ruleTitle = this.find('#ruleTitle').value;
-          if (ruleTitle !== undefined && ruleTitle !== '') {
-            this.find('#ruleTitle').value = '';
-            this.ruleName.set(ruleTitle);
-            this.setTrigger();
-          }
-        },
-        'click .js-goto-action'(event) {
-          event.preventDefault();
-          // Add user to the trigger
-          const username = $(event.currentTarget.offsetParent)
-            .find('.user-name')
-            .val();
-          let trigger = this.triggerVar.get();
-          trigger.userId = '*';
-          if (username !== undefined) {
-            const userFound = Users.findOne({ username });
-            if (userFound !== undefined) {
-              trigger.userId = userFound._id;
-              this.triggerVar.set(trigger);
-            }
-          }
-          // Sanitize trigger
-          trigger = this.triggerVar.get();
-          this.sanitizeObject(trigger);
-          this.triggerVar.set(trigger);
-          this.setAction();
-        },
-        'click .js-show-user-field'(event) {
-          event.preventDefault();
-          $(event.currentTarget.offsetParent)
-            .find('.user-details')
-            .removeClass('hide-element');
-        },
-        'click .js-goto-rules'(event) {
-          event.preventDefault();
-          this.setRulesList();
-        },
-        'click .js-goback'(event) {
-          event.preventDefault();
-          if (
-            this.rulesCurrentTab.get() === 'trigger' ||
-            this.rulesCurrentTab.get() === 'ruleDetails'
-          ) {
-            this.setRulesList();
-          }
-          if (this.rulesCurrentTab.get() === 'action') {
-            this.setTrigger();
-          }
-        },
-        'click .js-goto-details'(event) {
-          event.preventDefault();
-          const rule = this.currentData();
-          this.ruleId.set(rule._id);
-          this.setRuleDetails();
-        },
+    return [{
+      'click .js-delete-rule' () {
+        const rule = this.currentData();
+        Rules.remove(rule._id);
+        Actions.remove(rule.actionId);
+        Triggers.remove(rule.triggerId);
+
      },
-    ];
+      'click .js-goto-trigger' (event) {
+        event.preventDefault();
+        const ruleTitle = this.find('#ruleTitle').value;
+        if(ruleTitle !== undefined && ruleTitle !== ''){
+          this.find('#ruleTitle').value = '';
+          this.ruleName.set(ruleTitle);
+          this.setTrigger();
+        }
+      },
+      'click .js-goto-action' (event) {
+        event.preventDefault();
+        // Add user to the trigger
+        const username = $(event.currentTarget.offsetParent).find('.user-name').val();
+        let trigger = this.triggerVar.get();
+        trigger.userId = '*';
+        if(username !== undefined ){
+          const userFound = Users.findOne({username});
+          if(userFound !== undefined){
+            trigger.userId = userFound._id;
+            this.triggerVar.set(trigger);
+          }
+        }
+        // Sanitize trigger
+        trigger = this.triggerVar.get();
+        this.sanitizeObject(trigger);
+        this.triggerVar.set(trigger);
+        this.setAction();
+      },
+      'click .js-show-user-field' (event) {
+        event.preventDefault();
+        $(event.currentTarget.offsetParent).find('.user-details').removeClass('hide-element');
+      },
+      'click .js-goto-rules' (event) {
+        event.preventDefault();
+        this.setRulesList();
+      },
+      'click .js-goback' (event) {
+        event.preventDefault();
+        if(this.rulesCurrentTab.get() === 'trigger' || this.rulesCurrentTab.get() === 'ruleDetails' ){
+          this.setRulesList();
+        }
+        if(this.rulesCurrentTab.get() === 'action'){
+          this.setTrigger();
+        }
+      },
+      'click .js-goto-details' (event) {
+        event.preventDefault();
+        const rule = this.currentData();
+        this.ruleId.set(rule._id);
+        this.setRuleDetails();
+      },
+
+    }];
  },
+
 }).register('rulesMain');
+
+
@@ -38,18 +38,16 @@ BlazeComponent.extendComponent({
    // console.log(this.data());
  },
  events() {
-    return [
-      {
-        'click .js-set-board-triggers'() {
-          this.setBoardTriggers();
-        },
-        'click .js-set-card-triggers'() {
-          this.setCardTriggers();
-        },
-        'click .js-set-checklist-triggers'() {
-          this.setChecklistTriggers();
-        },
+    return [{
+      'click .js-set-board-triggers' () {
+        this.setBoardTriggers();
      },
-    ];
+      'click .js-set-card-triggers' () {
+        this.setCardTriggers();
+      },
+      'click .js-set-checklist-triggers' () {
+        this.setChecklistTriggers();
+      },
+    }];
  },
 }).register('rulesTriggers');
@@ -4,118 +4,116 @@ BlazeComponent.extendComponent({
    this.currentPopupTriggerId = 'def';
    this.cardTitleFilters = {};
  },
-  setNameFilter(name) {
-    this.cardTitleFilters[this.currentPopupTriggerId] = name;
+  setNameFilter(name){
+    this.cardTitleFilters[this.currentPopupTriggerId] =  name;
  },

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

+
 Template.boardCardTitlePopup.events({
-  submit(event, templateInstance) {
-    const title = templateInstance
-      .$('.js-card-filter-name')
-      .val()
-      .trim();
+  submit(evt, tpl) {
+    const title = tpl.$('.js-card-filter-name').val().trim();
    Popup.getOpenerComponent().setNameFilter(title);
-    event.preventDefault();
+    evt.preventDefault();
    Popup.close();
  },
 });
@@ -7,7 +7,7 @@ BlazeComponent.extendComponent({
    for (let i = 0; i < labels.length; i++) {
      if (labels[i].name === '' || labels[i].name === undefined) {
        labels[i].name = labels[i].color;
-        labels[i].translatedname = `${TAPi18n.__(`color-${labels[i].color}`)}`;
+        labels[i].translatedname = `${TAPi18n.__(`color-${  labels[i].color}`)}`;
      } else {
        labels[i].translatedname = labels[i].name;
      }
@@ -15,119 +15,117 @@ BlazeComponent.extendComponent({
    return labels;
  },
  events() {
-    return [
-      {
-        'click .js-add-gen-label-trigger'(event) {
-          const desc = Utils.getTriggerActionDesc(event, this);
-          const datas = this.data();
-          const actionSelected = this.find('#label-action').value;
-          const boardId = Session.get('currentBoard');
-          if (actionSelected === 'added') {
-            datas.triggerVar.set({
-              activityType: 'addedLabel',
-              boardId,
-              labelId: '*',
-              desc,
-            });
-          }
-          if (actionSelected === 'removed') {
-            datas.triggerVar.set({
-              activityType: 'removedLabel',
-              boardId,
-              labelId: '*',
-              desc,
-            });
-          }
-        },
-        'click .js-add-spec-label-trigger'(event) {
-          const desc = Utils.getTriggerActionDesc(event, this);
-          const datas = this.data();
-          const actionSelected = this.find('#spec-label-action').value;
-          const labelId = this.find('#spec-label').value;
-          const boardId = Session.get('currentBoard');
-          if (actionSelected === 'added') {
-            datas.triggerVar.set({
-              activityType: 'addedLabel',
-              boardId,
-              labelId,
-              desc,
-            });
-          }
-          if (actionSelected === 'removed') {
-            datas.triggerVar.set({
-              activityType: 'removedLabel',
-              boardId,
-              labelId,
-              desc,
-            });
-          }
-        },
-        'click .js-add-gen-member-trigger'(event) {
-          const desc = Utils.getTriggerActionDesc(event, this);
-          const datas = this.data();
-          const actionSelected = this.find('#gen-member-action').value;
-          const boardId = Session.get('currentBoard');
-          if (actionSelected === 'added') {
-            datas.triggerVar.set({
-              activityType: 'joinMember',
-              boardId,
-              username: '*',
-              desc,
-            });
-          }
-          if (actionSelected === 'removed') {
-            datas.triggerVar.set({
-              activityType: 'unjoinMember',
-              boardId,
-              username: '*',
-              desc,
-            });
-          }
-        },
-        'click .js-add-spec-member-trigger'(event) {
-          const desc = Utils.getTriggerActionDesc(event, this);
-          const datas = this.data();
-          const actionSelected = this.find('#spec-member-action').value;
-          const username = this.find('#spec-member').value;
-          const boardId = Session.get('currentBoard');
-          if (actionSelected === 'added') {
-            datas.triggerVar.set({
-              activityType: 'joinMember',
-              boardId,
-              username,
-              desc,
-            });
-          }
-          if (actionSelected === 'removed') {
-            datas.triggerVar.set({
-              activityType: 'unjoinMember',
-              boardId,
-              username,
-              desc,
-            });
-          }
-        },
-        'click .js-add-attachment-trigger'(event) {
-          const desc = Utils.getTriggerActionDesc(event, this);
-          const datas = this.data();
-          const actionSelected = this.find('#attach-action').value;
-          const boardId = Session.get('currentBoard');
-          if (actionSelected === 'added') {
-            datas.triggerVar.set({
-              activityType: 'addAttachment',
-              boardId,
-              desc,
-            });
-          }
-          if (actionSelected === 'removed') {
-            datas.triggerVar.set({
-              activityType: 'deleteAttachment',
-              boardId,
-              desc,
-            });
-          }
-        },
+    return [{
+      'click .js-add-gen-label-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#label-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'added') {
+          datas.triggerVar.set({
+            activityType: 'addedLabel',
+            boardId,
+            'labelId': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'removedLabel',
+            boardId,
+            'labelId': '*',
+            desc,
+          });
+        }
      },
-    ];
+      'click .js-add-spec-label-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#spec-label-action').value;
+        const labelId = this.find('#spec-label').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'added') {
+          datas.triggerVar.set({
+            activityType: 'addedLabel',
+            boardId,
+            labelId,
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'removedLabel',
+            boardId,
+            labelId,
+            desc,
+          });
+        }
+      },
+      'click .js-add-gen-member-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#gen-member-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'added') {
+          datas.triggerVar.set({
+            activityType: 'joinMember',
+            boardId,
+            'username': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'unjoinMember',
+            boardId,
+            'username': '*',
+            desc,
+          });
+        }
+      },
+      'click .js-add-spec-member-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#spec-member-action').value;
+        const username = this.find('#spec-member').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'added') {
+          datas.triggerVar.set({
+            activityType: 'joinMember',
+            boardId,
+            username,
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'unjoinMember',
+            boardId,
+            username,
+            desc,
+          });
+        }
+      },
+      'click .js-add-attachment-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#attach-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'added') {
+          datas.triggerVar.set({
+            activityType: 'addAttachment',
+            boardId,
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'deleteAttachment',
+            boardId,
+            desc,
+          });
+        }
+      },
+    }];
  },
 }).register('cardTriggers');
@@ -3,145 +3,144 @@ BlazeComponent.extendComponent({
    this.subscribe('allRules');
  },
  events() {
-    return [
-      {
-        'click .js-add-gen-check-trigger'(event) {
-          const desc = Utils.getTriggerActionDesc(event, this);
-          const datas = this.data();
-          const actionSelected = this.find('#gen-check-action').value;
-          const boardId = Session.get('currentBoard');
-          if (actionSelected === 'created') {
-            datas.triggerVar.set({
-              activityType: 'addChecklist',
-              boardId,
-              checklistName: '*',
-              desc,
-            });
-          }
-          if (actionSelected === 'removed') {
-            datas.triggerVar.set({
-              activityType: 'removeChecklist',
-              boardId,
-              checklistName: '*',
-              desc,
-            });
-          }
-        },
-        'click .js-add-spec-check-trigger'(event) {
-          const desc = Utils.getTriggerActionDesc(event, this);
-          const datas = this.data();
-          const actionSelected = this.find('#spec-check-action').value;
-          const checklistId = this.find('#check-name').value;
-          const boardId = Session.get('currentBoard');
-          if (actionSelected === 'created') {
-            datas.triggerVar.set({
-              activityType: 'addChecklist',
-              boardId,
-              checklistName: checklistId,
-              desc,
-            });
-          }
-          if (actionSelected === 'removed') {
-            datas.triggerVar.set({
-              activityType: 'removeChecklist',
-              boardId,
-              checklistName: checklistId,
-              desc,
-            });
-          }
-        },
-        'click .js-add-gen-comp-trigger'(event) {
-          const desc = Utils.getTriggerActionDesc(event, this);
-
-          const datas = this.data();
-          const actionSelected = this.find('#gen-comp-check-action').value;
-          const boardId = Session.get('currentBoard');
-          if (actionSelected === 'completed') {
-            datas.triggerVar.set({
-              activityType: 'completeChecklist',
-              boardId,
-              checklistName: '*',
-              desc,
-            });
-          }
-          if (actionSelected === 'uncompleted') {
-            datas.triggerVar.set({
-              activityType: 'uncompleteChecklist',
-              boardId,
-              checklistName: '*',
-              desc,
-            });
-          }
-        },
-        'click .js-add-spec-comp-trigger'(event) {
-          const desc = Utils.getTriggerActionDesc(event, this);
-          const datas = this.data();
-          const actionSelected = this.find('#spec-comp-check-action').value;
-          const checklistId = this.find('#spec-comp-check-name').value;
-          const boardId = Session.get('currentBoard');
-          if (actionSelected === 'completed') {
-            datas.triggerVar.set({
-              activityType: 'completeChecklist',
-              boardId,
-              checklistName: checklistId,
-              desc,
-            });
-          }
-          if (actionSelected === 'uncompleted') {
-            datas.triggerVar.set({
-              activityType: 'uncompleteChecklist',
-              boardId,
-              checklistName: checklistId,
-              desc,
-            });
-          }
-        },
-        'click .js-add-gen-check-item-trigger'(event) {
-          const desc = Utils.getTriggerActionDesc(event, this);
-          const datas = this.data();
-          const actionSelected = this.find('#check-item-gen-action').value;
-          const boardId = Session.get('currentBoard');
-          if (actionSelected === 'checked') {
-            datas.triggerVar.set({
-              activityType: 'checkedItem',
-              boardId,
-              checklistItemName: '*',
-              desc,
-            });
-          }
-          if (actionSelected === 'unchecked') {
-            datas.triggerVar.set({
-              activityType: 'uncheckedItem',
-              boardId,
-              checklistItemName: '*',
-              desc,
-            });
-          }
-        },
-        'click .js-add-spec-check-item-trigger'(event) {
-          const desc = Utils.getTriggerActionDesc(event, this);
-          const datas = this.data();
-          const actionSelected = this.find('#check-item-spec-action').value;
-          const checklistItemId = this.find('#check-item-name').value;
-          const boardId = Session.get('currentBoard');
-          if (actionSelected === 'checked') {
-            datas.triggerVar.set({
-              activityType: 'checkedItem',
-              boardId,
-              checklistItemName: checklistItemId,
-              desc,
-            });
-          }
-          if (actionSelected === 'unchecked') {
-            datas.triggerVar.set({
-              activityType: 'uncheckedItem',
-              boardId,
-              checklistItemName: checklistItemId,
-              desc,
-            });
-          }
-        },
+    return [{
+      'click .js-add-gen-check-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#gen-check-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'created') {
+          datas.triggerVar.set({
+            activityType: 'addChecklist',
+            boardId,
+            'checklistName': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'removeChecklist',
+            boardId,
+            'checklistName': '*',
+            desc,
+          });
+        }
      },
-    ];
+      'click .js-add-spec-check-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#spec-check-action').value;
+        const checklistId = this.find('#check-name').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'created') {
+          datas.triggerVar.set({
+            activityType: 'addChecklist',
+            boardId,
+            'checklistName': checklistId,
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'removeChecklist',
+            boardId,
+            'checklistName': checklistId,
+            desc,
+          });
+        }
+      },
+      'click .js-add-gen-comp-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+
+        const datas = this.data();
+        const actionSelected = this.find('#gen-comp-check-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'completed') {
+          datas.triggerVar.set({
+            activityType: 'completeChecklist',
+            boardId,
+            'checklistName': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'uncompleted') {
+          datas.triggerVar.set({
+            activityType: 'uncompleteChecklist',
+            boardId,
+            'checklistName': '*',
+            desc,
+          });
+        }
+      },
+      'click .js-add-spec-comp-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#spec-comp-check-action').value;
+        const checklistId = this.find('#spec-comp-check-name').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'completed') {
+          datas.triggerVar.set({
+            activityType: 'completeChecklist',
+            boardId,
+            'checklistName': checklistId,
+            desc,
+          });
+        }
+        if (actionSelected === 'uncompleted') {
+          datas.triggerVar.set({
+            activityType: 'uncompleteChecklist',
+            boardId,
+            'checklistName': checklistId,
+            desc,
+          });
+        }
+      },
+      'click .js-add-gen-check-item-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#check-item-gen-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'checked') {
+          datas.triggerVar.set({
+            activityType: 'checkedItem',
+            boardId,
+            'checklistItemName': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'unchecked') {
+          datas.triggerVar.set({
+            activityType: 'uncheckedItem',
+            boardId,
+            'checklistItemName': '*',
+            desc,
+          });
+        }
+      },
+      'click .js-add-spec-check-item-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#check-item-spec-action').value;
+        const checklistItemId = this.find('#check-item-name').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'checked') {
+          datas.triggerVar.set({
+            activityType: 'checkedItem',
+            boardId,
+            'checklistItemName': checklistItemId,
+            desc,
+          });
+        }
+        if (actionSelected === 'unchecked') {
+          datas.triggerVar.set({
+            activityType: 'uncheckedItem',
+            boardId,
+            'checklistItemName': checklistItemId,
+            desc,
+          });
+        }
+      },
+    }];
  },
+
 }).register('checklistTriggers');
@@ -6,11 +6,9 @@ Template.connectionMethod.onCreated(function() {
      // TODO : add a management of different languages
      // (ex {value: ldap, text: TAPi18n.__('ldap', {}, T9n.getLanguage() || 'en')})
      this.authenticationMethods.set([
-        { value: 'password' },
+        {value: 'password'},
        // Gets only the authentication methods availables
-        ...Object.entries(result)
-          .filter(e => e[1])
-          .map(e => ({ value: e[0] })),
+        ...Object.entries(result).filter((e) => e[1]).map((e) => ({value: e[0]})),
      ]);
    }

@@ -26,9 +24,7 @@ Template.connectionMethod.onCreated(function() {

 Template.connectionMethod.onRendered(() => {
  // Moves the select boxe in the first place of the at-pwd-form div
-  $('.at-form-authentication')
-    .detach()
-    .prependTo('.at-pwd-form');
+  $('.at-form-authentication').detach().prependTo('.at-pwd-form');
 });

 Template.connectionMethod.helpers({
@@ -19,21 +19,9 @@ template(name='statistics')
        tr
          th Wekan {{_ 'info'}}
          td {{statistics.version}}
-        tr
-          th {{_ 'Meteor_version'}}
-          td {{statistics.meteor.meteorVersion}}
        tr
          th {{_ 'Node_version'}}
          td {{statistics.process.nodeVersion}}
-        tr
-          th {{_ 'MongoDB_version'}}
-          td {{statistics.mongo.mongoVersion}}
-        tr
-          th {{_ 'MongoDB_storage_engine'}}
-          td {{statistics.mongo.mongoStorageEngine}}
-        tr
-          th {{_ 'MongoDB_Oplog_enabled'}}
-          td {{statistics.mongo.mongoOplogEnabled}}
        tr
          th {{_ 'OS_Type'}}
          td {{statistics.os.type}}
@@ -109,6 +109,6 @@ template(name="editUserPopup")
      input.js-profile-password(type="password")
    div.buttonsContainer
      input.primary.wide(type="submit" value="{{_ 'save'}}")
-    //  div
-    //  input#deleteButton.primary.wide(type="button" value="{{_ 'delete'}}")
+      div
+      input#deleteButton.primary.wide(type="button" value="{{_ 'delete'}}")

@@ -29,23 +29,19 @@ BlazeComponent.extendComponent({
    });
  },
  events() {
-    return [
-      {
-        'click #searchButton'() {
-          this.filterPeople();
-        },
-        'keydown #searchInput'(event) {
-          if (event.keyCode === 13 && !event.shiftKey) {
-            this.filterPeople();
-          }
-        },
+    return [{
+      'click #searchButton'() {
+        this.filterPeople();
      },
-    ];
+      'keydown #searchInput'(event) {
+        if (event.keyCode === 13 && !event.shiftKey) {
+          this.filterPeople();
+        }
+      },
+    }];
  },
  filterPeople() {
-    const value = $('#searchInput')
-      .first()
-      .val();
+    const value = $('#searchInput').first().val();
    if (value === '') {
      this.findUsersOptions.set({});
    } else {
@@ -83,7 +79,7 @@ BlazeComponent.extendComponent({
  },
  peopleList() {
    const users = Users.find(this.findUsersOptions.get(), {
-      fields: { _id: true },
+      fields: {_id: true},
    });
    this.number.set(users.count());
    return users;
@@ -109,11 +105,9 @@ Template.editUserPopup.onCreated(function() {
      // TODO : add a management of different languages
      // (ex {value: ldap, text: TAPi18n.__('ldap', {}, T9n.getLanguage() || 'en')})
      this.authenticationMethods.set([
-        { value: 'password' },
+        {value: 'password'},
        // Gets only the authentication methods availables
-        ...Object.entries(result)
-          .filter(e => e[1])
-          .map(e => ({ value: e[0] })),
+        ...Object.entries(result).filter((e) => e[1]).map((e) => ({value: e[0]})),
      ]);
    }
  });
@@ -142,79 +136,69 @@ Template.editUserPopup.helpers({
 });

 BlazeComponent.extendComponent({
-  onCreated() {},
+  onCreated() {
+  },
  user() {
    return Users.findOne(this.userId);
  },
  events() {
-    return [
-      {
-        'click a.edit-user': Popup.open('editUser'),
-      },
-    ];
+    return [{
+      'click a.edit-user': Popup.open('editUser'),
+    }];
  },
 }).register('peopleRow');

 Template.editUserPopup.events({
-  submit(event, templateInstance) {
-    event.preventDefault();
+  submit(evt, tpl) {
+    evt.preventDefault();
    const user = Users.findOne(this.userId);
-    const fullname = templateInstance.find('.js-profile-fullname').value.trim();
-    const username = templateInstance.find('.js-profile-username').value.trim();
-    const password = templateInstance.find('.js-profile-password').value;
-    const isAdmin = templateInstance.find('.js-profile-isadmin').value.trim();
-    const isActive = templateInstance.find('.js-profile-isactive').value.trim();
-    const email = templateInstance.find('.js-profile-email').value.trim();
-    const authentication = templateInstance
-      .find('.js-authenticationMethod')
-      .value.trim();
+    const fullname = tpl.find('.js-profile-fullname').value.trim();
+    const username = tpl.find('.js-profile-username').value.trim();
+    const password = tpl.find('.js-profile-password').value;
+    const isAdmin = tpl.find('.js-profile-isadmin').value.trim();
+    const isActive = tpl.find('.js-profile-isactive').value.trim();
+    const email = tpl.find('.js-profile-email').value.trim();
+    const authentication = tpl.find('.js-authenticationMethod').value.trim();

    const isChangePassword = password.length > 0;
    const isChangeUserName = username !== user.username;
-    const isChangeEmail =
-      email.toLowerCase() !== user.emails[0].address.toLowerCase();
+    const isChangeEmail = email.toLowerCase() !== user.emails[0].address.toLowerCase();

    Users.update(this.userId, {
      $set: {
        'profile.fullname': fullname,
-        isAdmin: isAdmin === 'true',
-        loginDisabled: isActive === 'true',
-        authenticationMethod: authentication,
+        'isAdmin': isAdmin === 'true',
+        'loginDisabled': isActive === 'true',
+        'authenticationMethod': authentication,
      },
    });

-    if (isChangePassword) {
+    if(isChangePassword){
      Meteor.call('setPassword', password, this.userId);
    }

    if (isChangeUserName && isChangeEmail) {
-      Meteor.call(
-        'setUsernameAndEmail',
-        username,
-        email.toLowerCase(),
-        this.userId,
-        function(error) {
-          const usernameMessageElement = templateInstance.$('.username-taken');
-          const emailMessageElement = templateInstance.$('.email-taken');
-          if (error) {
-            const errorElement = error.error;
-            if (errorElement === 'username-already-taken') {
-              usernameMessageElement.show();
-              emailMessageElement.hide();
-            } else if (errorElement === 'email-already-taken') {
-              usernameMessageElement.hide();
-              emailMessageElement.show();
-            }
-          } else {
-            usernameMessageElement.hide();
+      Meteor.call('setUsernameAndEmail', username, email.toLowerCase(), this.userId, function (error) {
+        const usernameMessageElement = tpl.$('.username-taken');
+        const emailMessageElement = tpl.$('.email-taken');
+        if (error) {
+          const errorElement = error.error;
+          if (errorElement === 'username-already-taken') {
+            usernameMessageElement.show();
            emailMessageElement.hide();
-            Popup.close();
+          } else if (errorElement === 'email-already-taken') {
+            usernameMessageElement.hide();
+            emailMessageElement.show();
          }
-        },
-      );
+        } else {
+          usernameMessageElement.hide();
+          emailMessageElement.hide();
+          Popup.close();
+        }
+      });
    } else if (isChangeUserName) {
-      Meteor.call('setUsername', username, this.userId, function(error) {
-        const usernameMessageElement = templateInstance.$('.username-taken');
+      Meteor.call('setUsername', username, this.userId, function (error) {
+        const usernameMessageElement = tpl.$('.username-taken');
        if (error) {
          const errorElement = error.error;
          if (errorElement === 'username-already-taken') {
@@ -226,10 +210,8 @@ Template.editUserPopup.events({
        }
      });
    } else if (isChangeEmail) {
-      Meteor.call('setEmail', email.toLowerCase(), this.userId, function(
-        error,
-      ) {
-        const emailMessageElement = templateInstance.$('.email-taken');
+      Meteor.call('setEmail', email.toLowerCase(), this.userId, function (error) {
+        const emailMessageElement = tpl.$('.email-taken');
        if (error) {
          const errorElement = error.error;
          if (errorElement === 'email-already-taken') {
@@ -243,8 +225,8 @@ Template.editUserPopup.events({
    } else Popup.close();
  },

-  'click #deleteButton': Popup.afterConfirm('userDelete', function() {
+  'click #deleteButton'() {
    Users.remove(this.userId);
    Popup.close();
-  }),
+  },
 });
@@ -44,7 +44,7 @@ template(name="general")
        ul
          li
            .title {{_ 'invite-people'}}
-            textarea#email-to-invite.wekan-form-control(rows='5', placeholder="{{_ 'email-addresses'}}")
+            textarea#email-to-invite.form-control(rows='5', placeholder="{{_ 'email-addresses'}}")
          li
            .title {{_ 'to-boards'}}
            .bg-white
@@ -63,20 +63,20 @@ template(name='email')
      .title {{_ 'smtp-host'}}
      .description {{_ 'smtp-host-description'}}
      .form-group
-        input.wekan-form-control#mail-server-host(type="text", placeholder="smtp.domain.com" value="{{currentSetting.mailServer.host}}")
+        input.form-control#mail-server-host(type="text", placeholder="smtp.domain.com" value="{{currentSetting.mailServer.host}}")
    li.smtp-form
      .title {{_ 'smtp-port'}}
      .description {{_ 'smtp-port-description'}}
      .form-group
-        input.wekan-form-control#mail-server-port(type="text", placeholder="25" value="{{currentSetting.mailServer.port}}")
+        input.form-control#mail-server-port(type="text", placeholder="25" value="{{currentSetting.mailServer.port}}")
    li.smtp-form
      .title {{_ 'smtp-username'}}
      .form-group
-        input.wekan-form-control#mail-server-username(type="text", placeholder="{{_ 'username'}}" value="{{currentSetting.mailServer.username}}")
+        input.form-control#mail-server-username(type="text", placeholder="{{_ 'username'}}" value="{{currentSetting.mailServer.username}}")
    li.smtp-form
      .title {{_ 'smtp-password'}}
      .form-group
-        input.wekan-form-control#mail-server-password(type="password", placeholder="{{_ 'password'}}" value="{{currentSetting.mailServer.password}}")
+        input.form-control#mail-server-password(type="password", placeholder="{{_ 'password'}}" value="{{currentSetting.mailServer.password}}")
    li.smtp-form
      .title {{_ 'smtp-tls'}}
      .form-group
@@ -88,7 +88,7 @@ template(name='email')
    li.smtp-form
      .title {{_ 'send-from'}}
      .form-group
-        input.wekan-form-control#mail-server-from(type="email", placeholder="no-reply@domain.com" value="{{currentSetting.mailServer.from}}")
+        input.form-control#mail-server-from(type="email", placeholder="no-reply@domain.com" value="{{currentSetting.mailServer.from}}")

    li
      button.js-save.primary {{_ 'save'}}
@@ -101,25 +101,17 @@ template(name='accountSettings')
    li.accounts-form
      .title {{_ 'accounts-allowEmailChange'}}
      .form-group.flex
-        input.wekan-form-control#accounts-allowEmailChange(type="radio" name="allowEmailChange" value="true" checked="{{#if allowEmailChange}}checked{{/if}}")
+        input.form-control#accounts-allowEmailChange(type="radio" name="allowEmailChange" value="true" checked="{{#if allowEmailChange}}checked{{/if}}")
        span {{_ 'yes'}}
-        input.wekan-form-control#accounts-allowEmailChange(type="radio" name="allowEmailChange" value="false" checked="{{#unless allowEmailChange}}checked{{/unless}}")
+        input.form-control#accounts-allowEmailChange(type="radio" name="allowEmailChange" value="false" checked="{{#unless allowEmailChange}}checked{{/unless}}")
        span {{_ 'no'}}
    li
    li.accounts-form
      .title {{_ 'accounts-allowUserNameChange'}}
      .form-group.flex
-        input.wekan-form-control#accounts-allowUserNameChange(type="radio" name="allowUserNameChange" value="true" checked="{{#if allowUserNameChange}}checked{{/if}}")
+        input.form-control#accounts-allowUserNameChange(type="radio" name="allowUserNameChange" value="true" checked="{{#if allowUserNameChange}}checked{{/if}}")
        span {{_ 'yes'}}
-        input.wekan-form-control#accounts-allowUserNameChange(type="radio" name="allowUserNameChange" value="false" checked="{{#unless allowUserNameChange}}checked{{/unless}}")
-        span {{_ 'no'}}
-    li
-    li.accounts-form
-      .title {{_ 'accounts-allowUserDelete'}}
-      .form-group.flex
-        input.wekan-form-control#accounts-allowUserDelete(type="radio" name="allowUserDelete" value="true" checked="{{#if allowUserDelete}}checked{{/if}}")
-        span {{_ 'yes'}}
-        input.wekan-form-control#accounts-allowUserDelete(type="radio" name="allowUserDelete" value="false" checked="{{#unless allowUserDelete}}checked{{/unless}}")
+        input.form-control#accounts-allowUserNameChange(type="radio" name="allowUserNameChange" value="false" checked="{{#unless allowUserNameChange}}checked{{/unless}}")
        span {{_ 'no'}}
    li
      button.js-accounts-save.primary {{_ 'save'}}
@@ -136,7 +128,7 @@ template(name='announcementSettings')
        ul
          li
            .title {{_ 'admin-announcement-title'}}
-            textarea#admin-announcement.wekan-form-control= currentSetting.body
+            textarea#admin-announcement.form-control= currentSetting.body
          li
            button.js-announcement-save.primary {{_ 'save'}}

@@ -145,16 +137,16 @@ template(name='layoutSettings')
    //li.layout-form
      .title {{_ 'hide-logo'}}
      .form-group.flex
-        input.wekan-form-control#hide-logo(type="radio" name="hideLogo" value="true" checked="{{#if currentSetting.hideLogo}}checked{{/if}}")
+        input.form-control#hide-logo(type="radio" name="hideLogo" value="true" checked="{{#if currentSetting.hideLogo}}checked{{/if}}")
        span {{_ 'yes'}}
-        input.wekan-form-control#hide-logo(type="radio" name="hideLogo" value="false" checked="{{#unless currentSetting.hideLogo}}checked{{/unless}}")
+        input.form-control#hide-logo(type="radio" name="hideLogo" value="false" checked="{{#unless currentSetting.hideLogo}}checked{{/unless}}")
        span {{_ 'no'}}
    li.layout-form
      .title {{_ 'display-authentication-method'}}
      .form-group.flex
-        input.wekan-form-control#display-authentication-method(type="radio" name="displayAuthenticationMethod" value="true" checked="{{#if currentSetting.displayAuthenticationMethod}}checked{{/if}}")
+        input.form-control#display-authentication-method(type="radio" name="displayAuthenticationMethod" value="true" checked="{{#if currentSetting.displayAuthenticationMethod}}checked{{/if}}")
        span {{_ 'yes'}}
-        input.wekan-form-control#display-authentication-method(type="radio" name="displayAuthenticationMethod" value="false" checked="{{#unless currentSetting.displayAuthenticationMethod}}checked{{/unless}}")
+        input.form-control#display-authentication-method(type="radio" name="displayAuthenticationMethod" value="false" checked="{{#unless currentSetting.displayAuthenticationMethod}}checked{{/unless}}")
        span {{_ 'no'}}
    li.layout-form
      .title {{_ 'default-authentication-method'}}
@@ -162,13 +154,13 @@ template(name='layoutSettings')
    li.layout-form
      .title {{_ 'custom-product-name'}}
      .form-group
-        input.wekan-form-control#product-name(type="text", placeholder="" value="{{currentSetting.productName}}")
+        input.form-control#product-name(type="text", placeholder="" value="{{currentSetting.productName}}")
    li.layout-form
      .title {{_ 'add-custom-html-after-body-start'}}
-      textarea#customHTMLafterBodyStart.wekan-form-control= currentSetting.customHTMLafterBodyStart
+      textarea#customHTMLafterBodyStart.form-control= currentSetting.customHTMLafterBodyStart
    li.layout-form
      .title {{_ 'add-custom-html-before-body-end'}}
-      textarea#customHTMLbeforeBodyEnd.wekan-form-control= currentSetting.customHTMLbeforeBodyEnd
+      textarea#customHTMLbeforeBodyEnd.form-control= currentSetting.customHTMLbeforeBodyEnd
    li
      button.js-save-layout.primary {{_ 'save'}}

@@ -25,9 +25,7 @@ BlazeComponent.extendComponent({
  checkField(selector) {
    const value = $(selector).val();
    if (!value || value.trim() === '') {
-      $(selector)
-        .parents('li.smtp-form')
-        .addClass('has-error');
+      $(selector).parents('li.smtp-form').addClass('has-error');
      throw Error('blank field');
    } else {
      return value;
@@ -39,23 +37,18 @@ BlazeComponent.extendComponent({
  },

  boards() {
-    return Boards.find(
-      {
-        archived: false,
-        'members.userId': Meteor.userId(),
-        'members.isAdmin': true,
-      },
-      {
-        sort: ['title'],
-      },
-    );
+    return Boards.find({
+      archived: false,
+      'members.userId': Meteor.userId(),
+      'members.isAdmin': true,
+    }, {
+      sort: ['title'],
+    });
  },
  toggleRegistration() {
    this.setLoading(true);
    const registrationClosed = this.currentSetting().disableRegistration;
-    Settings.update(Settings.findOne()._id, {
-      $set: { disableRegistration: !registrationClosed },
-    });
+    Settings.update(Settings.findOne()._id, {$set: {disableRegistration: !registrationClosed}});
    this.setLoading(false);
    if (registrationClosed) {
      $('.invite-people').slideUp();
@@ -97,19 +90,13 @@ BlazeComponent.extendComponent({
  },

  inviteThroughEmail() {
-    const emails = $('#email-to-invite')
-      .val()
-      .toLowerCase()
-      .trim()
-      .split('\n')
-      .join(',')
-      .split(',');
+    const emails = $('#email-to-invite').val().toLowerCase().trim().split('\n').join(',').split(',');
    const boardsToInvite = [];
-    $('.js-toggle-board-choose .materialCheckBox.is-checked').each(function() {
+    $('.js-toggle-board-choose .materialCheckBox.is-checked').each(function () {
      boardsToInvite.push($(this).data('id'));
    });
    const validEmails = [];
-    emails.forEach(email => {
+    emails.forEach((email) => {
      if (email && SimpleSchema.RegEx.Email.test(email.trim())) {
        validEmails.push(email.trim());
      }
@@ -132,22 +119,14 @@ BlazeComponent.extendComponent({
    try {
      const host = this.checkField('#mail-server-host');
      const port = this.checkField('#mail-server-port');
-      const username = $('#mail-server-username')
-        .val()
-        .trim();
-      const password = $('#mail-server-password')
-        .val()
-        .trim();
+      const username = $('#mail-server-username').val().trim();
+      const password = $('#mail-server-password').val().trim();
      const from = this.checkField('#mail-server-from');
      const tls = $('#mail-server-tls.is-checked').length > 0;
      Settings.update(Settings.findOne()._id, {
        $set: {
-          'mailServer.host': host,
-          'mailServer.port': port,
-          'mailServer.username': username,
-          'mailServer.password': password,
-          'mailServer.enableTLS': tls,
-          'mailServer.from': from,
+          'mailServer.host': host, 'mailServer.port': port, 'mailServer.username': username,
+          'mailServer.password': password, 'mailServer.enableTLS': tls, 'mailServer.from': from,
        },
      });
    } catch (e) {
@@ -155,25 +134,19 @@ BlazeComponent.extendComponent({
    } finally {
      this.setLoading(false);
    }
+
  },

  saveLayout() {
    this.setLoading(true);
    $('li').removeClass('has-error');

-    const productName = $('#product-name')
-      .val()
-      .trim();
-    const hideLogoChange = $('input[name=hideLogo]:checked').val() === 'true';
-    const displayAuthenticationMethod =
-      $('input[name=displayAuthenticationMethod]:checked').val() === 'true';
+    const productName = $('#product-name').val().trim();
+    const hideLogoChange = ($('input[name=hideLogo]:checked').val() === 'true');
+    const displayAuthenticationMethod = ($('input[name=displayAuthenticationMethod]:checked').val() === 'true');
    const defaultAuthenticationMethod = $('#defaultAuthenticationMethod').val();
-    const customHTMLafterBodyStart = $('#customHTMLafterBodyStart')
-      .val()
-      .trim();
-    const customHTMLbeforeBodyEnd = $('#customHTMLbeforeBodyEnd')
-      .val()
-      .trim();
+    const customHTMLafterBodyStart = $('#customHTMLafterBodyStart').val().trim();
+    const customHTMLbeforeBodyEnd = $('#customHTMLbeforeBodyEnd').val().trim();

    try {
      Settings.update(Settings.findOne()._id, {
@@ -193,6 +166,7 @@ BlazeComponent.extendComponent({
    }

    DocHead.setTitle(productName);
+
  },

  sendSMTPTestEmail() {
@@ -209,40 +183,31 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        'click a.js-toggle-registration': this.toggleRegistration,
-        'click a.js-toggle-tls': this.toggleTLS,
-        'click a.js-setting-menu': this.switchMenu,
-        'click a.js-toggle-board-choose': this.checkBoard,
-        'click button.js-email-invite': this.inviteThroughEmail,
-        'click button.js-save': this.saveMailServerInfo,
-        'click button.js-send-smtp-test-email': this.sendSMTPTestEmail,
-        'click a.js-toggle-hide-logo': this.toggleHideLogo,
-        'click button.js-save-layout': this.saveLayout,
-        'click a.js-toggle-display-authentication-method': this
-          .toggleDisplayAuthenticationMethod,
-      },
-    ];
+    return [{
+      'click a.js-toggle-registration': this.toggleRegistration,
+      'click a.js-toggle-tls': this.toggleTLS,
+      'click a.js-setting-menu': this.switchMenu,
+      'click a.js-toggle-board-choose': this.checkBoard,
+      'click button.js-email-invite': this.inviteThroughEmail,
+      'click button.js-save': this.saveMailServerInfo,
+      'click button.js-send-smtp-test-email': this.sendSMTPTestEmail,
+      'click a.js-toggle-hide-logo': this.toggleHideLogo,
+      'click button.js-save-layout': this.saveLayout,
+      'click a.js-toggle-display-authentication-method': this.toggleDisplayAuthenticationMethod,
+    }];
  },
 }).register('setting');

 BlazeComponent.extendComponent({
+
  saveAccountsChange() {
-    const allowEmailChange =
-      $('input[name=allowEmailChange]:checked').val() === 'true';
-    const allowUserNameChange =
-      $('input[name=allowUserNameChange]:checked').val() === 'true';
-    const allowUserDelete =
-      $('input[name=allowUserDelete]:checked').val() === 'true';
+    const allowEmailChange = ($('input[name=allowEmailChange]:checked').val() === 'true');
+    const allowUserNameChange = ($('input[name=allowUserNameChange]:checked').val() === 'true');
    AccountSettings.update('accounts-allowEmailChange', {
-      $set: { booleanValue: allowEmailChange },
+      $set: {'booleanValue': allowEmailChange},
    });
    AccountSettings.update('accounts-allowUserNameChange', {
-      $set: { booleanValue: allowUserNameChange },
-    });
-    AccountSettings.update('accounts-allowUserDelete', {
-      $set: { booleanValue: allowUserDelete },
+      $set: {'booleanValue': allowUserNameChange},
    });
  },

@@ -252,16 +217,11 @@ BlazeComponent.extendComponent({
  allowUserNameChange() {
    return AccountSettings.findOne('accounts-allowUserNameChange').booleanValue;
  },
-  allowUserDelete() {
-    return AccountSettings.findOne('accounts-allowUserDelete').booleanValue;
-  },

  events() {
-    return [
-      {
-        'click button.js-accounts-save': this.saveAccountsChange,
-      },
-    ];
+    return [{
+      'click button.js-accounts-save': this.saveAccountsChange,
+    }];
  },
 }).register('accountSettings');

@@ -279,11 +239,9 @@ BlazeComponent.extendComponent({
  },

  saveMessage() {
-    const message = $('#admin-announcement')
-      .val()
-      .trim();
+    const message = $('#admin-announcement').val().trim();
    Announcements.update(Announcements.findOne()._id, {
-      $set: { body: message },
+      $set: {'body': message},
    });
  },

@@ -291,7 +249,7 @@ BlazeComponent.extendComponent({
    this.setLoading(true);
    const isActive = this.currentSetting().enabled;
    Announcements.update(Announcements.findOne()._id, {
-      $set: { enabled: !isActive },
+      $set: {'enabled': !isActive},
    });
    this.setLoading(false);
    if (isActive) {
@@ -302,15 +260,14 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        'click a.js-toggle-activemessage': this.toggleActive,
-        'click button.js-announcement-save': this.saveMessage,
-      },
-    ];
+    return [{
+      'click a.js-toggle-activemessage': this.toggleActive,
+      'click button.js-announcement-save': this.saveMessage,
+    }];
  },
 }).register('announcementSettings');

+
 Template.selectAuthenticationMethod.onCreated(function() {
  this.authenticationMethods = new ReactiveVar([]);

@@ -319,11 +276,9 @@ Template.selectAuthenticationMethod.onCreated(function() {
      // TODO : add a management of different languages
      // (ex {value: ldap, text: TAPi18n.__('ldap', {}, T9n.getLanguage() || 'en')})
      this.authenticationMethods.set([
-        { value: 'password' },
+        {value: 'password'},
        // Gets only the authentication methods availables
-        ...Object.entries(result)
-          .filter(e => e[1])
-          .map(e => ({ value: e[0] })),
+        ...Object.entries(result).filter((e) => e[1]).map((e) => ({value: e[0]})),
      ]);
    }
  });
@@ -52,10 +52,10 @@

    .main-body
      padding: 0.1em 1em
-      -webkit-user-select: text // Safari 3.1+
-      -moz-user-select: text // Firefox 2+
-      -ms-user-select: text // IE 10+
-      user-select: text // Standard syntax
+      -webkit-user-select: auto // Safari 3.1+
+      -moz-user-select: auto // Firefox 2+
+      -ms-user-select: auto // IE 10+
+      user-select: auto // Standard syntax

      ul
        li
@@ -105,14 +105,14 @@
 .bg-white
  background #f9fbfc;

-.wekan-form-control.has-error
+.form-control.has-error
  border-color: #a94442;
  box-shadow: inset 0 1px 1px rgba(0,0,0,.075);

 li.has-error
  color #a94442
  .form-group
-    .wekan-form-control
+    .form-control
      border-color: #a94442;
      box-shadow: inset 0 1px 1px rgba(0,0,0,.075);

@@ -22,11 +22,6 @@ template(name='homeSidebar')
  +membersWidget
  hr
  +labelsWidget
-  ul#cards.label-text-hidden
-    a.flex.js-toggle-minicard-label-text
-      span {{_ 'hide-minicard-label-text'}}
-      b &nbsp;
-      .materialCheckBox(class="{{#if hiddenMinicardLabelText}}is-checked{{/if}}")
  hr
  unless currentUser.isNoComments
    h3
@@ -39,9 +34,8 @@ template(name="membersWidget")
    h3
      i.fa.fa-user
      | {{_ 'members'}}
-      unless currentUser.isCommentOnly
-        a.board-header-btn.js-open-board-menu(title="{{_ 'boardMenuPopup-title'}}").right
-          i.board-header-btn-icon.fa.fa-cog
+      a.board-header-btn.js-open-board-menu(title="{{_ 'boardMenuPopup-title'}}").right
+        i.board-header-btn-icon.fa.fa-cog

    .board-widget-content
      each currentBoard.activeMembers
@@ -67,7 +61,6 @@ template(name="boardChangeColorPopup")
    each backgroundColors
      .board-background-select.js-select-background
        span.background-box(class="board-color-{{this}}")
-          span {{this}}
          if isSelected
            i.fa.fa-check

@@ -47,11 +47,8 @@ BlazeComponent.extendComponent({
  },

  calculateNextPeak() {
-    const sidebarElement = this.find('.js-board-sidebar-content');
-    if (sidebarElement) {
-      const altitude = sidebarElement.scrollHeight;
-      this.callFirstWith(this, 'setNextPeak', altitude);
-    }
+    const altitude = this.find('.js-board-sidebar-content').scrollHeight;
+    this.callFirstWith(this, 'setNextPeak', altitude);
  },

  reachNextPeak() {
@@ -94,43 +91,29 @@ BlazeComponent.extendComponent({
  },

  showTongueTitle() {
-    if (this.isOpen()) return `${TAPi18n.__('sidebar-close')}`;
-    else return `${TAPi18n.__('sidebar-open')}`;
+    if (this.isOpen())
+      return `${TAPi18n.__('sidebar-close')}`;
+    else
+      return `${TAPi18n.__('sidebar-open')}`;
  },

  events() {
-    return [
-      {
-        'click .js-hide-sidebar': this.hide,
-        'click .js-toggle-sidebar': this.toggle,
-        'click .js-back-home': this.setView,
-        'click .js-toggle-minicard-label-text'() {
-          Meteor.call('toggleMinicardLabelText');
-        },
-        'click .js-shortcuts'() {
-          FlowRouter.go('shortcuts');
-        },
+    return [{
+      'click .js-hide-sidebar': this.hide,
+      'click .js-toggle-sidebar': this.toggle,
+      'click .js-back-home': this.setView,
+      'click .js-shortcuts'() {
+        FlowRouter.go('shortcuts');
      },
-    ];
+    }];
  },
 }).register('sidebar');

 Blaze.registerHelper('Sidebar', () => Sidebar);

-Template.homeSidebar.helpers({
-  hiddenMinicardLabelText() {
-    return Meteor.user().hasHiddenMinicardLabelText();
-  },
-});
-
-EscapeActions.register(
-  'sidebarView',
-  () => {
-    Sidebar.setView(defaultView);
-  },
-  () => {
-    return Sidebar && Sidebar.getView() !== defaultView;
-  },
+EscapeActions.register('sidebarView',
+  () => { Sidebar.setView(defaultView); },
+  () => { return Sidebar && Sidebar.getView() !== defaultView; }
 );

 Template.memberPopup.helpers({
@@ -139,13 +122,13 @@ Template.memberPopup.helpers({
  },
  memberType() {
    const type = Users.findOne(this.userId).isBoardAdmin() ? 'admin' : 'normal';
-    if (type === 'normal') {
+    if(type === 'normal'){
      const currentBoard = Boards.findOne(Session.get('currentBoard'));
      const commentOnly = currentBoard.hasCommentOnly(this.userId);
      const noComments = currentBoard.hasNoComments(this.userId);
-      if (commentOnly) {
+      if(commentOnly){
        return TAPi18n.__('comment-only').toLowerCase();
-      } else if (noComments) {
+      } else if(noComments) {
        return TAPi18n.__('no-comments').toLowerCase();
      } else {
        return TAPi18n.__(type).toLowerCase();
@@ -214,7 +197,7 @@ Template.memberPopup.events({
  'click .js-remove-member': Popup.afterConfirm('removeMember', function() {
    const boardId = Session.get('currentBoard');
    const memberId = this.userId;
-    Cards.find({ boardId, members: memberId }).forEach(card => {
+    Cards.find({ boardId, members: memberId }).forEach((card) => {
      card.unassignMember(memberId);
    });
    Boards.findOne(boardId).removeMember(memberId);
@@ -291,40 +274,38 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        submit(evt) {
-          evt.preventDefault();
-          const url = evt.target.url.value;
-          const boardId = Session.get('currentBoard');
-          let id = null;
-          let integration = null;
-          if (evt.target.id) {
-            id = evt.target.id.value;
-            integration = this.integration(id);
-            if (url) {
-              Integrations.update(integration._id, {
-                $set: {
-                  url: `${url}`,
-                },
-              });
-            } else {
-              Integrations.remove(integration._id);
-            }
-          } else if (url) {
-            Integrations.insert({
-              userId: Meteor.userId(),
-              enabled: true,
-              type: 'outgoing-webhooks',
-              url: `${url}`,
-              boardId: `${boardId}`,
-              activities: ['all'],
+    return [{
+      'submit'(evt) {
+        evt.preventDefault();
+        const url = evt.target.url.value;
+        const boardId = Session.get('currentBoard');
+        let id = null;
+        let integration = null;
+        if (evt.target.id) {
+          id = evt.target.id.value;
+          integration = this.integration(id);
+          if (url) {
+            Integrations.update(integration._id, {
+              $set: {
+                url: `${url}`,
+              },
            });
+          } else {
+            Integrations.remove(integration._id);
          }
-          Popup.close();
-        },
+        } else if (url) {
+          Integrations.insert({
+            userId: Meteor.userId(),
+            enabled: true,
+            type: 'outgoing-webhooks',
+            url: `${url}`,
+            boardId: `${boardId}`,
+            activities: ['all'],
+          });
+        }
+        Popup.close();
      },
-    ];
+    }];
  },
 }).register('outgoingWebhooksPopup');

@@ -394,16 +375,14 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        'click .js-select-background'(evt) {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
-          const newColor = this.currentData().toString();
-          currentBoard.setColor(newColor);
-          evt.preventDefault();
-        },
+    return [{
+      'click .js-select-background'(evt) {
+        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        const newColor = this.currentData().toString();
+        currentBoard.setColor(newColor);
+        evt.preventDefault();
      },
-    ];
+    }];
  },
 }).register('boardChangeColorPopup');

@@ -421,34 +400,25 @@ BlazeComponent.extendComponent({
  },

  isNullBoardSelected() {
-    return (
-      this.currentBoard.subtasksDefaultBoardId === null ||
-      this.currentBoard.subtasksDefaultBoardId === undefined
-    );
+    return (this.currentBoard.subtasksDefaultBoardId === null) || (this.currentBoard.subtasksDefaultBoardId === undefined);
  },

  boards() {
-    return Boards.find(
-      {
-        archived: false,
-        'members.userId': Meteor.userId(),
-      },
-      {
-        sort: ['title'],
-      },
-    );
+    return Boards.find({
+      archived: false,
+      'members.userId': Meteor.userId(),
+    }, {
+      sort: ['title'],
+    });
  },

  lists() {
-    return Lists.find(
-      {
-        boardId: this.currentBoard._id,
-        archived: false,
-      },
-      {
-        sort: ['title'],
-      },
-    );
+    return Lists.find({
+      boardId: this.currentBoard._id,
+      archived: false,
+    }, {
+      sort: ['title'],
+    });
  },

  hasLists() {
@@ -461,74 +431,54 @@ BlazeComponent.extendComponent({

  presentParentTask() {
    let result = this.currentBoard.presentParentTask;
-    if (result === null || result === undefined) {
+    if ((result === null) || (result === undefined)) {
      result = 'no-parent';
    }
    return result;
  },

  events() {
-    return [
-      {
-        'click .js-field-has-subtasks'(evt) {
-          evt.preventDefault();
-          this.currentBoard.allowsSubtasks = !this.currentBoard.allowsSubtasks;
-          this.currentBoard.setAllowsSubtasks(this.currentBoard.allowsSubtasks);
-          $('.js-field-has-subtasks .materialCheckBox').toggleClass(
-            'is-checked',
-            this.currentBoard.allowsSubtasks,
-          );
-          $('.js-field-has-subtasks').toggleClass(
-            'is-checked',
-            this.currentBoard.allowsSubtasks,
-          );
-          $('.js-field-deposit-board').prop(
-            'disabled',
-            !this.currentBoard.allowsSubtasks,
-          );
-        },
-        'change .js-field-deposit-board'(evt) {
-          let value = evt.target.value;
-          if (value === 'null') {
-            value = null;
-          }
-          this.currentBoard.setSubtasksDefaultBoardId(value);
-          evt.preventDefault();
-        },
-        'change .js-field-deposit-list'(evt) {
-          this.currentBoard.setSubtasksDefaultListId(evt.target.value);
-          evt.preventDefault();
-        },
-        'click .js-field-show-parent-in-minicard'(evt) {
-          const value =
-            evt.target.id ||
-            $(evt.target).parent()[0].id ||
-            $(evt.target)
-              .parent()[0]
-              .parent()[0].id;
-          const options = [
-            'prefix-with-full-path',
-            'prefix-with-parent',
-            'subtext-with-full-path',
-            'subtext-with-parent',
-            'no-parent',
-          ];
-          options.forEach(function(element) {
-            if (element !== value) {
-              $(`#${element} .materialCheckBox`).toggleClass(
-                'is-checked',
-                false,
-              );
-              $(`#${element}`).toggleClass('is-checked', false);
-            }
-          });
-          $(`#${value} .materialCheckBox`).toggleClass('is-checked', true);
-          $(`#${value}`).toggleClass('is-checked', true);
-          this.currentBoard.setPresentParentTask(value);
-          evt.preventDefault();
-        },
+    return [{
+      'click .js-field-has-subtasks'(evt) {
+        evt.preventDefault();
+        this.currentBoard.allowsSubtasks = !this.currentBoard.allowsSubtasks;
+        this.currentBoard.setAllowsSubtasks(this.currentBoard.allowsSubtasks);
+        $('.js-field-has-subtasks .materialCheckBox').toggleClass('is-checked', this.currentBoard.allowsSubtasks);
+        $('.js-field-has-subtasks').toggleClass('is-checked', this.currentBoard.allowsSubtasks);
+        $('.js-field-deposit-board').prop('disabled', !this.currentBoard.allowsSubtasks);
      },
-    ];
+      'change .js-field-deposit-board'(evt) {
+        let value = evt.target.value;
+        if (value === 'null') {
+          value = null;
+        }
+        this.currentBoard.setSubtasksDefaultBoardId(value);
+        evt.preventDefault();
+      },
+      'change .js-field-deposit-list'(evt) {
+        this.currentBoard.setSubtasksDefaultListId(evt.target.value);
+        evt.preventDefault();
+      },
+      'click .js-field-show-parent-in-minicard'(evt) {
+        const value = evt.target.id || $(evt.target).parent()[0].id ||  $(evt.target).parent()[0].parent()[0].id;
+        const options = [
+          'prefix-with-full-path',
+          'prefix-with-parent',
+          'subtext-with-full-path',
+          'subtext-with-parent',
+          'no-parent'];
+        options.forEach(function(element) {
+          if (element !== value) {
+            $(`#${element} .materialCheckBox`).toggleClass('is-checked', false);
+            $(`#${element}`).toggleClass('is-checked', false);
+          }
+        });
+        $(`#${value} .materialCheckBox`).toggleClass('is-checked', true);
+        $(`#${value}`).toggleClass('is-checked', true);
+        this.currentBoard.setPresentParentTask(value);
+        evt.preventDefault();
+      },
+    }];
  },
 }).register('boardSubtaskSettingsPopup');

@@ -578,46 +528,35 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        'keyup input'() {
-          this.setError('');
-        },
-        'click .js-select-member'() {
-          const userId = this.currentData()._id;
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
-          if (!currentBoard.hasMember(userId)) {
-            this.inviteUser(userId);
-          }
-        },
-        'click .js-email-invite'() {
-          const idNameEmail = $('.js-search-member input').val();
-          if (idNameEmail.indexOf('@') < 0 || this.isValidEmail(idNameEmail)) {
-            this.inviteUser(idNameEmail);
-          } else this.setError('email-invalid');
-        },
+    return [{
+      'keyup input'() {
+        this.setError('');
      },
-    ];
+      'click .js-select-member'() {
+        const userId = this.currentData()._id;
+        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        if (!currentBoard.hasMember(userId)) {
+          this.inviteUser(userId);
+        }
+      },
+      'click .js-email-invite'() {
+        const idNameEmail = $('.js-search-member input').val();
+        if (idNameEmail.indexOf('@')<0 || this.isValidEmail(idNameEmail)) {
+          this.inviteUser(idNameEmail);
+        } else this.setError('email-invalid');
+      },
+    }];
  },
 }).register('addMemberPopup');

 Template.changePermissionsPopup.events({
-  'click .js-set-admin, click .js-set-normal, click .js-set-no-comments, click .js-set-comment-only'(
-    event,
-  ) {
+  'click .js-set-admin, click .js-set-normal, click .js-set-no-comments, click .js-set-comment-only'(event) {
    const currentBoard = Boards.findOne(Session.get('currentBoard'));
    const memberId = this.userId;
    const isAdmin = $(event.currentTarget).hasClass('js-set-admin');
-    const isCommentOnly = $(event.currentTarget).hasClass(
-      'js-set-comment-only',
-    );
+    const isCommentOnly = $(event.currentTarget).hasClass('js-set-comment-only');
    const isNoComments = $(event.currentTarget).hasClass('js-set-no-comments');
-    currentBoard.setMemberPermission(
-      memberId,
-      isAdmin,
-      isNoComments,
-      isCommentOnly,
-    );
+    currentBoard.setMemberPermission(memberId, isAdmin, isNoComments, isCommentOnly);
    Popup.back(1);
  },
 });
@@ -630,33 +569,21 @@ Template.changePermissionsPopup.helpers({

  isNormal() {
    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    return (
-      !currentBoard.hasAdmin(this.userId) &&
-      !currentBoard.hasNoComments(this.userId) &&
-      !currentBoard.hasCommentOnly(this.userId)
-    );
+    return !currentBoard.hasAdmin(this.userId) && !currentBoard.hasNoComments(this.userId) && !currentBoard.hasCommentOnly(this.userId);
  },

  isNoComments() {
    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    return (
-      !currentBoard.hasAdmin(this.userId) &&
-      currentBoard.hasNoComments(this.userId)
-    );
+    return !currentBoard.hasAdmin(this.userId) && currentBoard.hasNoComments(this.userId);
  },

  isCommentOnly() {
    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    return (
-      !currentBoard.hasAdmin(this.userId) &&
-      currentBoard.hasCommentOnly(this.userId)
-    );
+    return !currentBoard.hasAdmin(this.userId) && currentBoard.hasCommentOnly(this.userId);
  },

  isLastAdmin() {
    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    return (
-      currentBoard.hasAdmin(this.userId) && currentBoard.activeAdmins() === 1
-    );
+    return currentBoard.hasAdmin(this.userId) && (currentBoard.activeAdmins() === 1);
  },
 });
@@ -1,4 +1,3 @@
-archivedRequested = false;
 const subManager = new SubsManager();

 BlazeComponent.extendComponent({
@@ -11,12 +10,12 @@ 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, true);
-      archivedRequested = true;
      Tracker.nonreactive(() => {
        Tracker.autorun(() => {
-          this.isArchiveReady.set(handle.ready());
+          this.isArchiveReady.set( handle.ready() );
        });
      });
    });
@@ -60,82 +59,74 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        'click .js-restore-card'() {
-          const card = this.currentData();
-          if (card.canBeRestored()) {
+    return [{
+      'click .js-restore-card'() {
+        const card = this.currentData();
+        if(card.canBeRestored()){
+          card.restore();
+        }
+      },
+      'click .js-restore-all-cards'() {
+        this.archivedCards().forEach((card) => {
+          if(card.canBeRestored()){
            card.restore();
          }
-        },
-        'click .js-restore-all-cards'() {
-          this.archivedCards().forEach(card => {
-            if (card.canBeRestored()) {
-              card.restore();
-            }
-          });
-        },
-
-        'click .js-delete-card': Popup.afterConfirm('cardDelete', function() {
-          const cardId = this._id;
-          Cards.remove(cardId);
-          Popup.close();
-        }),
-        'click .js-delete-all-cards': Popup.afterConfirm('cardDelete', () => {
-          this.archivedCards().forEach(card => {
-            Cards.remove(card._id);
-          });
-          Popup.close();
-        }),
-
-        'click .js-restore-list'() {
-          const list = this.currentData();
-          list.restore();
-        },
-        'click .js-restore-all-lists'() {
-          this.archivedLists().forEach(list => {
-            list.restore();
-          });
-        },
-
-        'click .js-delete-list': Popup.afterConfirm('listDelete', function() {
-          this.remove();
-          Popup.close();
-        }),
-        'click .js-delete-all-lists': Popup.afterConfirm('listDelete', () => {
-          this.archivedLists().forEach(list => {
-            list.remove();
-          });
-          Popup.close();
-        }),
-
-        'click .js-restore-swimlane'() {
-          const swimlane = this.currentData();
-          swimlane.restore();
-        },
-        'click .js-restore-all-swimlanes'() {
-          this.archivedSwimlanes().forEach(swimlane => {
-            swimlane.restore();
-          });
-        },
-
-        'click .js-delete-swimlane': Popup.afterConfirm(
-          'swimlaneDelete',
-          function() {
-            this.remove();
-            Popup.close();
-          },
-        ),
-        'click .js-delete-all-swimlanes': Popup.afterConfirm(
-          'swimlaneDelete',
-          () => {
-            this.archivedSwimlanes().forEach(swimlane => {
-              swimlane.remove();
-            });
-            Popup.close();
-          },
-        ),
+        });
      },
-    ];
+
+      'click .js-delete-card': Popup.afterConfirm('cardDelete', function() {
+        const cardId = this._id;
+        Cards.remove(cardId);
+        Popup.close();
+      }),
+      'click .js-delete-all-cards': Popup.afterConfirm('cardDelete', () => {
+        this.archivedCards().forEach((card) => {
+          Cards.remove(card._id);
+        });
+        Popup.close();
+      }),
+
+      'click .js-restore-list'() {
+        const list = this.currentData();
+        list.restore();
+      },
+      'click .js-restore-all-lists'() {
+        this.archivedLists().forEach((list) => {
+          list.restore();
+        });
+      },
+
+      'click .js-delete-list': Popup.afterConfirm('listDelete', function() {
+        this.remove();
+        Popup.close();
+      }),
+      'click .js-delete-all-lists': Popup.afterConfirm('listDelete', () => {
+        this.archivedLists().forEach((list) => {
+          list.remove();
+        });
+        Popup.close();
+      }),
+
+      'click .js-restore-swimlane'() {
+        const swimlane = this.currentData();
+        swimlane.restore();
+      },
+      'click .js-restore-all-swimlanes'() {
+        this.archivedSwimlanes().forEach((swimlane) => {
+          swimlane.restore();
+        });
+      },
+
+      'click .js-delete-swimlane': Popup.afterConfirm('swimlaneDelete', function() {
+        this.remove();
+        Popup.close();
+      }),
+      'click .js-delete-all-swimlanes': Popup.afterConfirm('swimlaneDelete', () => {
+        this.archivedSwimlanes().forEach((swimlane) => {
+          swimlane.remove();
+        });
+        Popup.close();
+      }),
+    }];
  },
 }).register('archivesSidebar');
@@ -1,43 +1,37 @@
 BlazeComponent.extendComponent({
+
  customFields() {
    return CustomFields.find({
-      boardIds: { $in: [Session.get('currentBoard')] },
+      boardIds: {$in: [Session.get('currentBoard')]},
    });
  },

  events() {
-    return [
-      {
-        'click .js-open-create-custom-field': Popup.open('createCustomField'),
-        'click .js-edit-custom-field': Popup.open('editCustomField'),
-      },
-    ];
+    return [{
+      'click .js-open-create-custom-field': Popup.open('createCustomField'),
+      'click .js-edit-custom-field': Popup.open('editCustomField'),
+    }];
  },
+
 }).register('customFieldsSidebar');

 const CreateCustomFieldPopup = BlazeComponent.extendComponent({
+
  _types: ['text', 'number', 'date', 'dropdown'],

  onCreated() {
-    this.type = new ReactiveVar(
-      this.data().type ? this.data().type : this._types[0],
-    );
-    this.dropdownItems = new ReactiveVar(
-      this.data().settings && this.data().settings.dropdownItems
-        ? this.data().settings.dropdownItems
-        : [],
-    );
+    this.type = new ReactiveVar((this.data().type) ? this.data().type : this._types[0]);
+    this.dropdownItems = new ReactiveVar((this.data().settings && this.data().settings.dropdownItems) ? this.data().settings.dropdownItems : []);
  },

  types() {
    const currentType = this.data().type;
-    return this._types.map(type => {
-      return {
+    return this._types.
+      map((type) => {return {
        value: type,
        name: TAPi18n.__(`custom-field-${type}`),
        selected: type === currentType,
-      };
-    });
+      };});
  },

  isTypeNotSelected(type) {
@@ -46,122 +40,113 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({

  getDropdownItems() {
    const items = this.dropdownItems.get();
-    Array.from(this.findAll('.js-field-settings-dropdown input')).forEach(
-      (el, index) => {
-        //console.log('each item!', index, el.value);
-        if (!items[index])
-          items[index] = {
-            _id: Random.id(6),
-          };
-        items[index].name = el.value.trim();
-      },
-    );
+    Array.from(this.findAll('.js-field-settings-dropdown input')).forEach((el, index) => {
+      //console.log('each item!', index, el.value);
+      if (!items[index]) items[index] = {
+        _id: Random.id(6),
+      };
+      items[index].name = el.value.trim();
+    });
    return items;
  },

  getSettings() {
    const settings = {};
    switch (this.type.get()) {
-      case 'dropdown': {
-        const dropdownItems = this.getDropdownItems().filter(
-          item => !!item.name.trim(),
-        );
-        settings.dropdownItems = dropdownItems;
-        break;
-      }
+    case 'dropdown': {
+      const dropdownItems = this.getDropdownItems().filter((item) => !!item.name.trim());
+      settings.dropdownItems = dropdownItems;
+      break;
+    }
    }
    return settings;
  },

  events() {
-    return [
-      {
-        'change .js-field-type'(evt) {
-          const value = evt.target.value;
-          this.type.set(value);
-        },
-        'keydown .js-dropdown-item.last'(evt) {
-          if (evt.target.value.trim() && evt.keyCode === 13) {
-            const items = this.getDropdownItems();
-            this.dropdownItems.set(items);
-            evt.target.value = '';
-          }
-        },
-        'click .js-field-show-on-card'(evt) {
-          let $target = $(evt.target);
-          if (!$target.hasClass('js-field-show-on-card')) {
-            $target = $target.parent();
-          }
-          $target.find('.materialCheckBox').toggleClass('is-checked');
-          $target.toggleClass('is-checked');
-        },
-        'click .js-field-automatically-on-card'(evt) {
-          let $target = $(evt.target);
-          if (!$target.hasClass('js-field-automatically-on-card')) {
-            $target = $target.parent();
-          }
-          $target.find('.materialCheckBox').toggleClass('is-checked');
-          $target.toggleClass('is-checked');
-        },
-        'click .js-field-showLabel-on-card'(evt) {
-          let $target = $(evt.target);
-          if (!$target.hasClass('js-field-showLabel-on-card')) {
-            $target = $target.parent();
-          }
-          $target.find('.materialCheckBox').toggleClass('is-checked');
-          $target.toggleClass('is-checked');
-        },
-        'click .primary'(evt) {
-          evt.preventDefault();
-
-          const data = {
-            name: this.find('.js-field-name').value.trim(),
-            type: this.type.get(),
-            settings: this.getSettings(),
-            showOnCard: this.find('.js-field-show-on-card.is-checked') !== null,
-            showLabelOnMiniCard:
-              this.find('.js-field-showLabel-on-card.is-checked') !== null,
-            automaticallyOnCard:
-              this.find('.js-field-automatically-on-card.is-checked') !== null,
-          };
-
-          // insert or update
-          if (!this.data()._id) {
-            data.boardIds = [Session.get('currentBoard')];
-            CustomFields.insert(data);
-          } else {
-            CustomFields.update(this.data()._id, { $set: data });
-          }
-
-          Popup.back();
-        },
-        'click .js-delete-custom-field': Popup.afterConfirm(
-          'deleteCustomField',
-          function() {
-            const customField = CustomFields.findOne(this._id);
-            if (customField.boardIds.length > 1) {
-              CustomFields.update(customField._id, {
-                $pull: {
-                  boardIds: Session.get('currentBoard'),
-                },
-              });
-            } else {
-              CustomFields.remove(customField._id);
-            }
-            Popup.close();
-          },
-        ),
+    return [{
+      'change .js-field-type'(evt) {
+        const value = evt.target.value;
+        this.type.set(value);
      },
-    ];
+      'keydown .js-dropdown-item.last'(evt) {
+        if (evt.target.value.trim() && evt.keyCode === 13) {
+          const items = this.getDropdownItems();
+          this.dropdownItems.set(items);
+          evt.target.value = '';
+        }
+      },
+      'click .js-field-show-on-card'(evt) {
+        let $target = $(evt.target);
+        if(!$target.hasClass('js-field-show-on-card')){
+          $target = $target.parent();
+        }
+        $target.find('.materialCheckBox').toggleClass('is-checked');
+        $target.toggleClass('is-checked');
+      },
+      'click .js-field-automatically-on-card'(evt) {
+        let $target = $(evt.target);
+        if(!$target.hasClass('js-field-automatically-on-card')){
+          $target = $target.parent();
+        }
+        $target.find('.materialCheckBox').toggleClass('is-checked');
+        $target.toggleClass('is-checked');
+      },
+      'click .js-field-showLabel-on-card'(evt) {
+        let $target = $(evt.target);
+        if(!$target.hasClass('js-field-showLabel-on-card')){
+          $target = $target.parent();
+        }
+        $target.find('.materialCheckBox').toggleClass('is-checked');
+        $target.toggleClass('is-checked');
+      },
+      'click .primary'(evt) {
+        evt.preventDefault();
+
+        const data = {
+          name: this.find('.js-field-name').value.trim(),
+          type: this.type.get(),
+          settings: this.getSettings(),
+          showOnCard: this.find('.js-field-show-on-card.is-checked') !== null,
+          showLabelOnMiniCard: this.find('.js-field-showLabel-on-card.is-checked') !== null,
+          automaticallyOnCard: this.find('.js-field-automatically-on-card.is-checked') !== null,
+        };
+
+        // insert or update
+        if (!this.data()._id) {
+          data.boardIds = [Session.get('currentBoard')];
+          CustomFields.insert(data);
+        } else {
+          CustomFields.update(this.data()._id, {$set: data});
+        }
+
+        Popup.back();
+      },
+      'click .js-delete-custom-field': Popup.afterConfirm('deleteCustomField', function() {
+        const customField = CustomFields.findOne(this._id);
+        if (customField.boardIds.length > 1) {
+          CustomFields.update(customField._id, {
+            $pull: {
+              boardIds: Session.get('currentBoard'),
+            },
+          });
+        } else {
+          CustomFields.remove(customField._id);
+        }
+        Popup.close();
+      }),
+    }];
  },
+
 });
 CreateCustomFieldPopup.register('createCustomFieldPopup');

 (class extends CreateCustomFieldPopup {
+
  template() {
    return 'createCustomFieldPopup';
  }
-}.register('editCustomFieldPopup'));
+
+}).register('editCustomFieldPopup');

 /*Template.deleteCustomFieldPopup.events({
  'submit'(evt) {
@@ -56,22 +56,6 @@ template(name="filterSidebar")
          if Filter.customFields.isSelected _id
            i.fa.fa-check
  hr
-  ul.sidebar-list
-    li(class="{{#if Filter.archive.isSelected _id}}active{{/if}}")
-      a.name.js-toggle-archive-filter
-        span.sidebar-list-item-description
-          | {{_ 'filter-show-archive'}}
-        if Filter.archive.isSelected _id
-          i.fa.fa-check
-  hr
-  ul.sidebar-list
-    li(class="{{#if Filter.hideEmpty.isSelected _id}}active{{/if}}")
-      a.name.js-toggle-hideEmpty-filter
-        span.sidebar-list-item-description
-          | {{_ 'filter-hide-empty'}}
-        if Filter.hideEmpty.isSelected _id
-          i.fa.fa-check
-  hr
  span {{_ 'advanced-filter-label'}}
  input.js-field-advanced-filter(type="text")
  span {{_ 'advanced-filter-description'}}
@@ -1,127 +1,106 @@
-const subManager = new SubsManager();
-
 BlazeComponent.extendComponent({
  events() {
-    return [
-      {
-        'click .js-toggle-label-filter'(evt) {
-          evt.preventDefault();
-          Filter.labelIds.toggle(this.currentData()._id);
-          Filter.resetExceptions();
-        },
-        'click .js-toggle-member-filter'(evt) {
-          evt.preventDefault();
-          Filter.members.toggle(this.currentData()._id);
-          Filter.resetExceptions();
-        },
-        'click .js-toggle-archive-filter'(evt) {
-          evt.preventDefault();
-          Filter.archive.toggle(this.currentData()._id);
-          Filter.resetExceptions();
-          const currentBoardId = Session.get('currentBoard');
-          if (!currentBoardId) return;
-          subManager.subscribe(
-            'board',
-            currentBoardId,
-            Filter.archive.isSelected(),
-          );
-        },
-        'click .js-toggle-hideEmpty-filter'(evt) {
-          evt.preventDefault();
-          Filter.hideEmpty.toggle(this.currentData()._id);
-          Filter.resetExceptions();
-        },
-        'click .js-toggle-custom-fields-filter'(evt) {
-          evt.preventDefault();
-          Filter.customFields.toggle(this.currentData()._id);
-          Filter.resetExceptions();
-        },
-        'change .js-field-advanced-filter'(evt) {
-          evt.preventDefault();
-          Filter.advanced.set(
-            this.find('.js-field-advanced-filter').value.trim(),
-          );
-          Filter.resetExceptions();
-        },
-        'click .js-clear-all'(evt) {
-          evt.preventDefault();
-          Filter.reset();
-        },
-        'click .js-filter-to-selection'(evt) {
-          evt.preventDefault();
-          const selectedCards = Cards.find(Filter.mongoSelector()).map(c => {
-            return c._id;
-          });
-          MultiSelection.add(selectedCards);
-        },
+    return [{
+      'click .js-toggle-label-filter'(evt) {
+        evt.preventDefault();
+        Filter.labelIds.toggle(this.currentData()._id);
+        Filter.resetExceptions();
      },
-    ];
+      'click .js-toggle-member-filter'(evt) {
+        evt.preventDefault();
+        Filter.members.toggle(this.currentData()._id);
+        Filter.resetExceptions();
+      },
+      'click .js-toggle-custom-fields-filter'(evt) {
+        evt.preventDefault();
+        Filter.customFields.toggle(this.currentData()._id);
+        Filter.resetExceptions();
+      },
+      'change .js-field-advanced-filter'(evt) {
+        evt.preventDefault();
+        Filter.advanced.set(this.find('.js-field-advanced-filter').value.trim());
+        Filter.resetExceptions();
+      },
+      'click .js-clear-all'(evt) {
+        evt.preventDefault();
+        Filter.reset();
+      },
+      'click .js-filter-to-selection'(evt) {
+        evt.preventDefault();
+        const selectedCards = Cards.find(Filter.mongoSelector()).map((c) => {
+          return c._id;
+        });
+        MultiSelection.add(selectedCards);
+      },
+    }];
  },
 }).register('filterSidebar');

 function mutateSelectedCards(mutationName, ...args) {
-  Cards.find(MultiSelection.getMongoSelector()).forEach(card => {
+  Cards.find(MultiSelection.getMongoSelector()).forEach((card) => {
    card[mutationName](...args);
  });
 }

 BlazeComponent.extendComponent({
  mapSelection(kind, _id) {
-    return Cards.find(MultiSelection.getMongoSelector()).map(card => {
+    return Cards.find(MultiSelection.getMongoSelector()).map((card) => {
      const methodName = kind === 'label' ? 'hasLabel' : 'isAssigned';
      return card[methodName](_id);
    });
  },

  allSelectedElementHave(kind, _id) {
-    if (MultiSelection.isEmpty()) return false;
-    else return _.every(this.mapSelection(kind, _id));
+    if (MultiSelection.isEmpty())
+      return false;
+    else
+      return _.every(this.mapSelection(kind, _id));
  },

  someSelectedElementHave(kind, _id) {
-    if (MultiSelection.isEmpty()) return false;
-    else return _.some(this.mapSelection(kind, _id));
+    if (MultiSelection.isEmpty())
+      return false;
+    else
+      return _.some(this.mapSelection(kind, _id));
  },

  events() {
-    return [
-      {
-        'click .js-toggle-label-multiselection'(evt) {
-          const labelId = this.currentData()._id;
-          const mappedSelection = this.mapSelection('label', labelId);
+    return [{
+      'click .js-toggle-label-multiselection'(evt) {
+        const labelId = this.currentData()._id;
+        const mappedSelection = this.mapSelection('label', labelId);

-          if (_.every(mappedSelection)) {
-            mutateSelectedCards('removeLabel', labelId);
-          } else if (_.every(mappedSelection, bool => !bool)) {
-            mutateSelectedCards('addLabel', labelId);
-          } else {
-            const popup = Popup.open('disambiguateMultiLabel');
-            // XXX We need to have a better integration between the popup and the
-            // UI components systems.
-            popup.call(this.currentData(), evt);
-          }
-        },
-        'click .js-toggle-member-multiselection'(evt) {
-          const memberId = this.currentData()._id;
-          const mappedSelection = this.mapSelection('member', memberId);
-          if (_.every(mappedSelection)) {
-            mutateSelectedCards('unassignMember', memberId);
-          } else if (_.every(mappedSelection, bool => !bool)) {
-            mutateSelectedCards('assignMember', memberId);
-          } else {
-            const popup = Popup.open('disambiguateMultiMember');
-            // XXX We need to have a better integration between the popup and the
-            // UI components systems.
-            popup.call(this.currentData(), evt);
-          }
-        },
-        'click .js-move-selection': Popup.open('moveSelection'),
-        'click .js-archive-selection'() {
-          mutateSelectedCards('archive');
-          EscapeActions.executeUpTo('multiselection');
-        },
+        if (_.every(mappedSelection)) {
+          mutateSelectedCards('removeLabel', labelId);
+        } else if (_.every(mappedSelection, (bool) => !bool)) {
+          mutateSelectedCards('addLabel', labelId);
+        } else {
+          const popup = Popup.open('disambiguateMultiLabel');
+          // XXX We need to have a better integration between the popup and the
+          // UI components systems.
+          popup.call(this.currentData(), evt);
+        }
      },
-    ];
+      'click .js-toggle-member-multiselection'(evt) {
+        const memberId = this.currentData()._id;
+        const mappedSelection = this.mapSelection('member', memberId);
+        if (_.every(mappedSelection)) {
+          mutateSelectedCards('unassignMember', memberId);
+        } else if (_.every(mappedSelection, (bool) => !bool)) {
+          mutateSelectedCards('assignMember', memberId);
+        } else {
+          const popup = Popup.open('disambiguateMultiMember');
+          // XXX We need to have a better integration between the popup and the
+          // UI components systems.
+          popup.call(this.currentData(), evt);
+        }
+      },
+      'click .js-move-selection': Popup.open('moveSelection'),
+      'click .js-archive-selection'() {
+        mutateSelectedCards('archive');
+        EscapeActions.executeUpTo('multiselection');
+      },
+    }];
  },
 }).register('multiselectionSidebar');

@@ -9,13 +9,11 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        'submit .js-search-term-form'(evt) {
-          evt.preventDefault();
-          this.term.set(evt.target.searchTerm.value);
-        },
+    return [{
+      'submit .js-search-term-form'(evt) {
+        evt.preventDefault();
+        this.term.set(evt.target.searchTerm.value);
      },
-    ];
+    }];
  },
 }).register('searchSidebar');
@@ -6,11 +6,9 @@ Meteor.startup(() => {
 });

 BlazeComponent.extendComponent({
-  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 swimlane = this.currentData();
    if (newTitle) {
      swimlane.rename(newTitle.trim());
@@ -18,20 +16,18 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        'click .js-open-swimlane-menu': Popup.open('swimlaneAction'),
-        'click .js-open-add-swimlane-menu': Popup.open('swimlaneAdd'),
-        submit: this.editTitle,
-      },
-    ];
+    return [{
+      'click .js-open-swimlane-menu': Popup.open('swimlaneAction'),
+      'click .js-open-add-swimlane-menu': Popup.open('swimlaneAdd'),
+      submit: this.editTitle,
+    }];
  },
 }).register('swimlaneHeader');

 Template.swimlaneActionPopup.events({
  'click .js-set-swimlane-color': Popup.open('setSwimlaneColor'),
-  'click .js-close-swimlane'(event) {
-    event.preventDefault();
+  'click .js-close-swimlane' (evt) {
+    evt.preventDefault();
    this.archive();
    Popup.close();
  },
@@ -43,42 +39,34 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        submit(event) {
-          event.preventDefault();
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
-          const nextSwimlane = currentBoard.nextSwimlane(this.currentSwimlane);
-          const titleInput = this.find('.swimlane-name-input');
-          const title = titleInput.value.trim();
-          const sortValue = calculateIndexData(
-            this.currentSwimlane,
-            nextSwimlane,
-            1,
-          );
-          const swimlaneType = currentBoard.isTemplatesBoard()
-            ? 'template-swimlane'
-            : 'swimlane';
+    return [{
+      submit(evt) {
+        evt.preventDefault();
+        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        const nextSwimlane = currentBoard.nextSwimlane(this.currentSwimlane);
+        const titleInput = this.find('.swimlane-name-input');
+        const title = titleInput.value.trim();
+        const sortValue = calculateIndexData(this.currentSwimlane, nextSwimlane, 1);
+        const swimlaneType = (currentBoard.isTemplatesBoard())?'template-swimlane':'swimlane';

-          if (title) {
-            Swimlanes.insert({
-              title,
-              boardId: Session.get('currentBoard'),
-              sort: sortValue.base,
-              type: swimlaneType,
-            });
+        if (title) {
+          Swimlanes.insert({
+            title,
+            boardId: Session.get('currentBoard'),
+            sort: sortValue.base,
+            type: swimlaneType,
+          });

-            titleInput.value = '';
-            titleInput.focus();
-          }
-          // XXX ideally, we should move the popup to the newly
-          // created swimlane so a user can add more than one swimlane
-          // with a minimum of interactions
-          Popup.close();
-        },
-        'click .js-swimlane-template': Popup.open('searchElement'),
+          titleInput.value = '';
+          titleInput.focus();
+        }
+        // XXX ideally, we should move the popup to the newly
+        // created swimlane so a user can add more than one swimlane
+        // with a minimum of interactions
+        Popup.close();
      },
-    ];
+      'click .js-swimlane-template': Popup.open('searchElement'),
+    }];
  },
 }).register('swimlaneAddPopup');

@@ -89,7 +77,7 @@ BlazeComponent.extendComponent({
  },

  colors() {
-    return swimlaneColors.map(color => ({ color, name: '' }));
+    return swimlaneColors.map((color) => ({ color, name: '' }));
  },

  isSelected(color) {
@@ -97,20 +85,18 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        'click .js-palette-color'() {
-          this.currentColor.set(this.currentData().color);
-        },
-        'click .js-submit'() {
-          this.currentSwimlane.setColor(this.currentColor.get());
-          Popup.close();
-        },
-        'click .js-remove-color'() {
-          this.currentSwimlane.setColor(null);
-          Popup.close();
-        },
+    return [{
+      'click .js-palette-color'() {
+        this.currentColor.set(this.currentData().color);
      },
-    ];
+      'click .js-submit' () {
+        this.currentSwimlane.setColor(this.currentColor.get());
+        Popup.close();
+      },
+      'click .js-remove-color'() {
+        this.currentSwimlane.setColor(null);
+        Popup.close();
+      },
+    }];
  },
 }).register('setSwimlaneColorPopup');
@@ -9,16 +9,14 @@ template(name="swimlane")
        each lists
          +miniList(this)
        if currentUser.isBoardMember
-          unless currentUser.isCommentOnly
-            +addListForm
+          +addListForm
    else
      each lists
        +list(this)
        if currentCardIsInThisList _id ../_id
          +cardDetails(currentCard)
      if currentUser.isBoardMember
-        unless currentUser.isCommentOnly
-          +addListForm
+        +addListForm

 template(name="listsGroup")
  .swimlane.list-group.js-lists
@@ -29,17 +27,14 @@ template(name="listsGroup")
        each lists
          +miniList(this)
        if currentUser.isBoardMember
-          unless currentUser.isCommentOnly
-            +addListForm
+          +addListForm
    else
      each lists
-        if visible this
-          +list(this)
+        +list(this)
        if currentCardIsInThisList _id null
          +cardDetails(currentCard)
      if currentUser.isBoardMember
-        unless currentUser.isCommentOnly
-          +addListForm
+        +addListForm

 template(name="addListForm")
  .list.list-composer.js-list-composer
@@ -2,27 +2,16 @@ const { calculateIndex, enableClickOnTouch } = Utils;

 function currentListIsInThisSwimlane(swimlaneId) {
  const currentList = Lists.findOne(Session.get('currentList'));
-  return (
-    currentList &&
-    (currentList.swimlaneId === swimlaneId || currentList.swimlaneId === '')
-  );
+  return currentList && (currentList.swimlaneId === swimlaneId || currentList.swimlaneId === '');
 }

 function currentCardIsInThisList(listId, swimlaneId) {
  const currentCard = Cards.findOne(Session.get('currentCard'));
  const currentUser = Meteor.user();
-  if (
-    currentUser &&
-    currentUser.profile &&
-    currentUser.profile.boardView === 'board-view-swimlanes'
-  )
-    return (
-      currentCard &&
-      currentCard.listId === listId &&
-      currentCard.swimlaneId === swimlaneId
-    );
-  // Default view: board-view-lists
-  else return currentCard && currentCard.listId === listId;
+  if (currentUser && currentUser.profile && currentUser.profile.boardView === 'board-view-swimlanes')
+    return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId;
+  else // Default view: board-view-lists
+    return currentCard && currentCard.listId === listId;
  // https://github.com/wekan/wekan/issues/1623
  // https://github.com/ChronikEwok/wekan/commit/cad9b20451bb6149bfb527a99b5001873b06c3de
  // TODO: In public board, if you would like to switch between List/Swimlane view, you could
@@ -90,11 +79,7 @@ function initSortable(boardComponent, $listsDom) {
  enableClickOnTouch('.js-list:not(.js-list-composer)');

  function userIsMember() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly()
-    );
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
  }

  // Disable drag-dropping while in multi-selection mode, or if the current user
@@ -102,11 +87,8 @@ function initSortable(boardComponent, $listsDom) {
  boardComponent.autorun(() => {
    const $listDom = $listsDom;
    if ($listDom.data('sortable')) {
-      $listsDom.sortable(
-        'option',
-        'disabled',
-        MultiSelection.isActive() || !userIsMember(),
-      );
+      $listsDom.sortable('option', 'disabled',
+        MultiSelection.isActive() || !userIsMember());
    }
  });
 }
@@ -142,60 +124,47 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        // Click-and-drag action
-        'mousedown .board-canvas'(evt) {
-          // Translating the board canvas using the click-and-drag action can
-          // conflict with the build-in browser mechanism to select text. We
-          // define a list of elements in which we disable the dragging because
-          // the user will legitimately expect to be able to select some text with
-          // his mouse.
-          const noDragInside = [
-            'a',
-            'input',
-            'textarea',
-            'p',
-            '.js-list-header',
-          ];
-          if (
-            $(evt.target).closest(noDragInside.join(',')).length === 0 &&
-            this.$('.swimlane').prop('clientHeight') > evt.offsetY
-          ) {
-            this._isDragging = true;
-            this._lastDragPositionX = evt.clientX;
-          }
-        },
-        mouseup() {
-          if (this._isDragging) {
-            this._isDragging = false;
-          }
-        },
-        mousemove(evt) {
-          if (this._isDragging) {
-            // Update the canvas position
-            this.listsDom.scrollLeft -= evt.clientX - this._lastDragPositionX;
-            this._lastDragPositionX = evt.clientX;
-            // Disable browser text selection while dragging
-            evt.stopPropagation();
-            evt.preventDefault();
-            // Don't close opened card or inlined form at the end of the
-            // click-and-drag.
-            EscapeActions.executeUpTo('popup-close');
-            EscapeActions.preventNextClick();
-          }
-        },
+    return [{
+      // Click-and-drag action
+      'mousedown .board-canvas'(evt) {
+        // Translating the board canvas using the click-and-drag action can
+        // conflict with the build-in browser mechanism to select text. We
+        // define a list of elements in which we disable the dragging because
+        // the user will legitimately expect to be able to select some text with
+        // his mouse.
+        const noDragInside = ['a', 'input', 'textarea', 'p', '.js-list-header'];
+        if ($(evt.target).closest(noDragInside.join(',')).length === 0 && this.$('.swimlane').prop('clientHeight') > evt.offsetY) {
+          this._isDragging = true;
+          this._lastDragPositionX = evt.clientX;
+        }
      },
-    ];
+      'mouseup'() {
+        if (this._isDragging) {
+          this._isDragging = false;
+        }
+      },
+      'mousemove'(evt) {
+        if (this._isDragging) {
+          // Update the canvas position
+          this.listsDom.scrollLeft -= evt.clientX - this._lastDragPositionX;
+          this._lastDragPositionX = evt.clientX;
+          // Disable browser text selection while dragging
+          evt.stopPropagation();
+          evt.preventDefault();
+          // Don't close opened card or inlined form at the end of the
+          // click-and-drag.
+          EscapeActions.executeUpTo('popup-close');
+          EscapeActions.preventNextClick();
+        }
+      },
+    }];
  },
 }).register('swimlane');

 BlazeComponent.extendComponent({
  onCreated() {
    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
-    this.isListTemplatesSwimlane =
-      this.currentBoard.isTemplatesBoard() &&
-      this.currentData().isListTemplatesSwimlane();
+    this.isListTemplatesSwimlane = this.currentBoard.isTemplatesBoard() && this.currentData().isListTemplatesSwimlane();
    this.currentSwimlane = this.currentData();
  },

@@ -205,40 +174,32 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        submit(evt) {
-          evt.preventDefault();
-          const titleInput = this.find('.list-name-input');
-          const title = titleInput.value.trim();
-          if (title) {
-            Lists.insert({
-              title,
-              boardId: Session.get('currentBoard'),
-              sort: $('.list').length,
-              type: this.isListTemplatesSwimlane ? 'template-list' : 'list',
-              swimlaneId: this.currentBoard.isTemplatesBoard()
-                ? this.currentSwimlane._id
-                : '',
-            });
+    return [{
+      submit(evt) {
+        evt.preventDefault();
+        const titleInput = this.find('.list-name-input');
+        const title = titleInput.value.trim();
+        if (title) {
+          Lists.insert({
+            title,
+            boardId: Session.get('currentBoard'),
+            sort: $('.list').length,
+            type: (this.isListTemplatesSwimlane)?'template-list':'list',
+            swimlaneId: (this.currentBoard.isTemplatesBoard())?this.currentSwimlane._id:'',
+          });

-            titleInput.value = '';
-            titleInput.focus();
-          }
-        },
-        'click .js-list-template': Popup.open('searchElement'),
+          titleInput.value = '';
+          titleInput.focus();
+        }
      },
-    ];
+      'click .js-list-template': Popup.open('searchElement'),
+    }];
  },
 }).register('addListForm');

 Template.swimlane.helpers({
  canSeeAddList() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly()
-    );
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
  },
 });

@@ -246,24 +207,6 @@ BlazeComponent.extendComponent({
  currentCardIsInThisList(listId, swimlaneId) {
    return currentCardIsInThisList(listId, swimlaneId);
  },
-  visible(list) {
-    if (list.archived) {
-      // Show archived list only when filter archive is on or archive is selected
-      if (!(Filter.archive.isSelected() || archivedRequested)) {
-        return false;
-      }
-    }
-    if (Filter.hideEmpty.isSelected()) {
-      const swimlaneId = this.parentComponent()
-        .parentComponent()
-        .data()._id;
-      const cards = list.cards(swimlaneId);
-      if (cards.count() === 0) {
-        return false;
-      }
-    }
-    return true;
-  },
  onRendered() {
    const boardComponent = this.parentComponent();
    const $listsDom = this.$('.js-lists');
@@ -22,11 +22,14 @@ Template.userAvatar.helpers({
  presenceStatusClassName() {
    const user = Users.findOne(this.userId);
    const userPresence = presences.findOne({ userId: this.userId });
-    if (user && user.isInvitedTo(Session.get('currentBoard'))) return 'pending';
-    else if (!userPresence) return 'disconnected';
+    if (user && user.isInvitedTo(Session.get('currentBoard')))
+      return 'pending';
+    else if (!userPresence)
+      return 'disconnected';
    else if (Session.equals('currentBoard', userPresence.state.currentBoardId))
      return 'active';
-    else return 'idle';
+    else
+      return 'idle';
  },
 });

@@ -42,7 +45,7 @@ Template.userAvatarInitials.helpers({

  viewPortWidth() {
    const user = Users.findOne(this.userId);
-    return ((user && user.getInitials().length) || 1) * 12;
+    return (user && user.getInitials().length || 1) * 12;
  },
 });

@@ -61,7 +64,7 @@ BlazeComponent.extendComponent({
  },

  uploadedAvatars() {
-    return Avatars.find({ userId: Meteor.userId() });
+    return Avatars.find({userId: Meteor.userId()});
  },

  isSelected() {
@@ -86,48 +89,46 @@ BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        'click .js-upload-avatar'() {
-          this.$('.js-upload-avatar-input').click();
-        },
-        'change .js-upload-avatar-input'(event) {
-          let file, fileUrl;
-
-          FS.Utility.eachFile(event, f => {
-            try {
-              file = Avatars.insert(new FS.File(f));
-              fileUrl = file.url(this.avatarUrlOptions());
-            } catch (e) {
-              this.setError('avatar-too-big');
-            }
-          });
-
-          if (fileUrl) {
-            this.setError('');
-            const fetchAvatarInterval = window.setInterval(() => {
-              $.ajax({
-                url: fileUrl,
-                success: () => {
-                  this.setAvatar(file.url(this.avatarUrlOptions()));
-                  window.clearInterval(fetchAvatarInterval);
-                },
-              });
-            }, 100);
-          }
-        },
-        'click .js-select-avatar'() {
-          const avatarUrl = this.currentData().url(this.avatarUrlOptions());
-          this.setAvatar(avatarUrl);
-        },
-        'click .js-select-initials'() {
-          this.setAvatar('');
-        },
-        'click .js-delete-avatar'() {
-          Avatars.remove(this.currentData()._id);
-        },
+    return [{
+      'click .js-upload-avatar'() {
+        this.$('.js-upload-avatar-input').click();
      },
-    ];
+      'change .js-upload-avatar-input'(evt) {
+        let file, fileUrl;
+
+        FS.Utility.eachFile(evt, (f) => {
+          try {
+            file = Avatars.insert(new FS.File(f));
+            fileUrl = file.url(this.avatarUrlOptions());
+          } catch (e) {
+            this.setError('avatar-too-big');
+          }
+        });
+
+        if (fileUrl) {
+          this.setError('');
+          const fetchAvatarInterval = window.setInterval(() => {
+            $.ajax({
+              url: fileUrl,
+              success: () => {
+                this.setAvatar(file.url(this.avatarUrlOptions()));
+                window.clearInterval(fetchAvatarInterval);
+              },
+            });
+          }, 100);
+        }
+      },
+      'click .js-select-avatar'() {
+        const avatarUrl = this.currentData().url(this.avatarUrlOptions());
+        this.setAvatar(avatarUrl);
+      },
+      'click .js-select-initials'() {
+        this.setAvatar('');
+      },
+      'click .js-delete-avatar'() {
+        Avatars.remove(this.currentData()._id);
+      },
+    }];
  },
 }).register('changeAvatarPopup');

@@ -145,11 +146,11 @@ Template.cardMembersPopup.helpers({
 });

 Template.cardMembersPopup.events({
-  'click .js-select-member'(event) {
+  'click .js-select-member'(evt) {
    const card = Cards.findOne(Session.get('currentCard'));
    const memberId = this.userId;
    card.toggleMember(memberId);
-    event.preventDefault();
+    evt.preventDefault();
  },
 });

@@ -55,9 +55,8 @@ template(name="editProfilePopup")
        input.js-profile-email(type="email" value="{{emails.[0].address}}" readonly)
    div.buttonsContainer
      input.primary.wide(type="submit" value="{{_ 'save'}}")
-      if allowUserDelete
-        div
-        input#deleteButton.primary.wide(type="button" value="{{_ 'delete'}}")
+      div
+      input#deleteButton.primary.wide(type="button" value="{{_ 'delete'}}")

 template(name="changePasswordPopup")
  +atForm(state='changePwd')
@@ -83,8 +82,3 @@ template(name="changeSettingsPopup")
        | {{_ 'show-cards-minimum-count'}}
      input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="0" max="99" onkeydown="return false")
      input.js-apply-show-cards-at.left(type="submit" value="{{_ 'apply'}}")
-
-
-template(name="userDeletePopup")
-  p {{_ 'delete-user-confirm-popup'}}
-  button.js-confirm.negate.full(type="submit") {{_ 'delete'}}
@@ -18,8 +18,8 @@ Template.memberMenuPopup.events({
  'click .js-change-avatar': Popup.open('changeAvatar'),
  'click .js-change-password': Popup.open('changePassword'),
  'click .js-change-language': Popup.open('changeLanguage'),
-  'click .js-logout'(event) {
-    event.preventDefault();
+  'click .js-logout'(evt) {
+    evt.preventDefault();

    AccountsTemplates.logout();
  },
@@ -35,18 +35,15 @@ Template.editProfilePopup.helpers({
  allowUserNameChange() {
    return AccountSettings.findOne('accounts-allowUserNameChange').booleanValue;
  },
-  allowUserDelete() {
-    return AccountSettings.findOne('accounts-allowUserDelete').booleanValue;
-  },
 });

 Template.editProfilePopup.events({
-  submit(event, templateInstance) {
-    event.preventDefault();
-    const fullname = templateInstance.find('.js-profile-fullname').value.trim();
-    const username = templateInstance.find('.js-profile-username').value.trim();
-    const initials = templateInstance.find('.js-profile-initials').value.trim();
-    const email = templateInstance.find('.js-profile-email').value.trim();
+  submit(evt, tpl) {
+    evt.preventDefault();
+    const fullname = tpl.find('.js-profile-fullname').value.trim();
+    const username = tpl.find('.js-profile-username').value.trim();
+    const initials = tpl.find('.js-profile-initials').value.trim();
+    const email = tpl.find('.js-profile-email').value.trim();
    let isChangeUserName = false;
    let isChangeEmail = false;
    Users.update(Meteor.userId(), {
@@ -56,36 +53,29 @@ Template.editProfilePopup.events({
      },
    });
    isChangeUserName = username !== Meteor.user().username;
-    isChangeEmail =
-      email.toLowerCase() !== Meteor.user().emails[0].address.toLowerCase();
+    isChangeEmail = email.toLowerCase() !== Meteor.user().emails[0].address.toLowerCase();
    if (isChangeUserName && isChangeEmail) {
-      Meteor.call(
-        'setUsernameAndEmail',
-        username,
-        email.toLowerCase(),
-        Meteor.userId(),
-        function(error) {
-          const usernameMessageElement = templateInstance.$('.username-taken');
-          const emailMessageElement = templateInstance.$('.email-taken');
-          if (error) {
-            const errorElement = error.error;
-            if (errorElement === 'username-already-taken') {
-              usernameMessageElement.show();
-              emailMessageElement.hide();
-            } else if (errorElement === 'email-already-taken') {
-              usernameMessageElement.hide();
-              emailMessageElement.show();
-            }
-          } else {
-            usernameMessageElement.hide();
+      Meteor.call('setUsernameAndEmail', username, email.toLowerCase(), Meteor.userId(), function (error) {
+        const usernameMessageElement = tpl.$('.username-taken');
+        const emailMessageElement = tpl.$('.email-taken');
+        if (error) {
+          const errorElement = error.error;
+          if (errorElement === 'username-already-taken') {
+            usernameMessageElement.show();
            emailMessageElement.hide();
-            Popup.back();
+          } else if (errorElement === 'email-already-taken') {
+            usernameMessageElement.hide();
+            emailMessageElement.show();
          }
-        },
-      );
+        } else {
+          usernameMessageElement.hide();
+          emailMessageElement.hide();
+          Popup.back();
+        }
+      });
    } else if (isChangeUserName) {
-      Meteor.call('setUsername', username, Meteor.userId(), function(error) {
-        const messageElement = templateInstance.$('.username-taken');
+      Meteor.call('setUsername', username, Meteor.userId(), function (error) {
+        const messageElement = tpl.$('.username-taken');
        if (error) {
          messageElement.show();
        } else {
@@ -94,10 +84,8 @@ Template.editProfilePopup.events({
        }
      });
    } else if (isChangeEmail) {
-      Meteor.call('setEmail', email.toLowerCase(), Meteor.userId(), function(
-        error,
-      ) {
-        const messageElement = templateInstance.$('.email-taken');
+      Meteor.call('setEmail', email.toLowerCase(), Meteor.userId(), function (error) {
+        const messageElement = tpl.$('.email-taken');
        if (error) {
          messageElement.show();
        } else {
@@ -107,16 +95,16 @@ Template.editProfilePopup.events({
      });
    } else Popup.back();
  },
-  'click #deleteButton': Popup.afterConfirm('userDelete', function() {
-    Popup.close();
+  'click #deleteButton'() {
    Users.remove(Meteor.userId());
+    Popup.close();
    AccountsTemplates.logout();
-  }),
+  },
 });

 // XXX For some reason the useraccounts autofocus isnt working in this case.
 // See https://github.com/meteor-useraccounts/core/issues/384
-Template.changePasswordPopup.onRendered(function() {
+Template.changePasswordPopup.onRendered(function () {
  this.find('#at-field-current_password').focus();
 });

@@ -135,7 +123,7 @@ Template.changeLanguagePopup.helpers({
        name = 'Occitan';
      }
      return { tag, name };
-    }).sort(function(a, b) {
+    }).sort(function (a, b) {
      if (a.name === b.name) {
        return 0;
      } else {
@@ -150,13 +138,13 @@ Template.changeLanguagePopup.helpers({
 });

 Template.changeLanguagePopup.events({
-  'click .js-set-language'(event) {
+  'click .js-set-language'(evt) {
    Users.update(Meteor.userId(), {
      $set: {
        'profile.language': this.tag,
      },
    });
-    event.preventDefault();
+    evt.preventDefault();
  },
 });

@@ -173,12 +161,9 @@ Template.changeSettingsPopup.events({
  'click .js-toggle-system-messages'() {
    Meteor.call('toggleSystemMessages');
  },
-  'click .js-apply-show-cards-at'(event, templateInstance) {
-    event.preventDefault();
-    const minLimit = parseInt(
-      templateInstance.$('#show-cards-count-at').val(),
-      10,
-    );
+  'click .js-apply-show-cards-at'(evt, tpl) {
+    evt.preventDefault();
+    const minLimit = parseInt(tpl.$('#show-cards-count-at').val(), 10);
    if (!isNaN(minLimit)) {
      Meteor.call('changeLimitToShowCardsCount', minLimit);
      Popup.back();
@@ -25,7 +25,7 @@ Blaze.registerHelper('currentList', () => {
  }
 });

-Blaze.registerHelper('getUser', userId => Users.findOne(userId));
+Blaze.registerHelper('getUser', (userId) => Users.findOne(userId));

 Blaze.registerHelper('concat', (...args) => args.slice(0, -1).join(''));

@@ -27,7 +27,10 @@ function copyTitleInAriaLabel(attributes) {
 // which is a little bit hacky -- but still reasonable with our ES6 usage. If we
 // end up switching to React we will probably create lower level small
 // components to handle that without overwriting any build-in function.
-const { A: superA, I: superI } = HTML;
+const {
+  A: superA,
+  I: superI,
+} = HTML;

 HTML.A = (attributes, ...others) => {
  return superA(copyTitleInAriaLabel(enforceHref(attributes)), ...others);
@@ -3,11 +3,11 @@
 function whichTransitionEvent() {
  const el = document.createElement('fakeelement');
  const transitions = {
-    transition: 'transitionend',
-    OTransition: 'oTransitionEnd',
-    MSTransition: 'msTransitionEnd',
-    MozTransition: 'transitionend',
-    WebkitTransition: 'webkitTransitionEnd',
+    transition:'transitionend',
+    OTransition:'oTransitionEnd',
+    MSTransition:'msTransitionEnd',
+    MozTransition:'transitionend',
+    WebkitTransition:'webkitTransitionEnd',
  };

  for (const t in transitions) {
@@ -21,11 +21,11 @@ function whichTransitionEvent() {
 function whichAnimationEvent() {
  const el = document.createElement('fakeelement');
  const transitions = {
-    animation: 'animationend',
-    OAnimation: 'oAnimationEnd',
-    MSTransition: 'msAnimationEnd',
-    MozAnimation: 'animationend',
-    WebkitAnimation: 'webkitAnimationEnd',
+    animation:'animationend',
+    OAnimation:'oAnimationEnd',
+    MSTransition:'msAnimationEnd',
+    MozAnimation:'animationend',
+    WebkitAnimation:'webkitAnimationEnd',
  };

  for (const t in transitions) {
@@ -10,20 +10,15 @@ DatePicker = 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());
@@ -31,11 +26,13 @@ DatePicker = 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() {
@@ -46,47 +43,44 @@ DatePicker = 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();
+      },
+    }];
  },
 });
@@ -11,10 +11,7 @@
  $.event.fix = (function(originalFix) {
    return function(event) {
      event = originalFix.apply(this, arguments);
-      if (
-        event.type.indexOf('drag') === 0 ||
-        event.type.indexOf('drop') === 0
-      ) {
+      if (event.type.indexOf('drag') === 0 || event.type.indexOf('drop') === 0) {
        event.dataTransfer = event.originalEvent.dataTransfer;
      }
      return event;
@@ -26,7 +23,7 @@
    matchType: /image.*/,
  };

-  return ($.fn.dropImageReader = function(options) {
+  return $.fn.dropImageReader = function(options) {
    if (typeof options === 'function') {
      options = {
        callback: options,
@@ -43,9 +40,9 @@
      return $(element).bind('drop', function(event) {
        stopFn(event);
        const files = event.dataTransfer.files;
-        for (let i = 0; i < files.length; i++) {
+        for(let i=0; i<files.length; i++) {
          const f = files[i];
-          if (f.type.match(options.matchType)) {
+          if(f.type.match(options.matchType)) {
            const reader = new FileReader();
            reader.onload = function(evt) {
              return options.callback.call(element, {
@@ -61,5 +58,5 @@
        }
      });
    });
-  });
+  };
 })(jQuery);
@@ -33,19 +33,13 @@ EscapeActions = {

    const noClickEscapeOn = options.noClickEscapeOn;

-    this._actions = _.sortBy(
-      [
-        ...this._actions,
-        {
-          priority,
-          condition,
-          action,
-          noClickEscapeOn,
-          enabledOnClick,
-        },
-      ],
-      action => action.priority,
-    );
+    this._actions = _.sortBy([...this._actions, {
+      priority,
+      condition,
+      action,
+      noClickEscapeOn,
+      enabledOnClick,
+    }], (action) => action.priority);
  },

  executeLowest() {
@@ -86,8 +80,10 @@ EscapeActions = {
  },

  _stopClick(action, clickTarget) {
-    if (!_.isString(action.noClickEscapeOn)) return false;
-    else return $(clickTarget).closest(action.noClickEscapeOn).length > 0;
+    if (!_.isString(action.noClickEscapeOn))
+      return false;
+    else
+      return $(clickTarget).closest(action.noClickEscapeOn).length > 0;
  },

  _execute(options) {
@@ -99,11 +95,14 @@ EscapeActions = {
    let executedAtLeastOne = false;
    let maxPriority;

-    if (!maxLabel) maxPriority = Infinity;
-    else maxPriority = this.hierarchy.indexOf(maxLabel);
+    if (!maxLabel)
+      maxPriority = Infinity;
+    else
+      maxPriority = this.hierarchy.indexOf(maxLabel);

    for (const currentAction of this._actions) {
-      if (currentAction.priority > maxPriority) return executedAtLeastOne;
+      if (currentAction.priority > maxPriority)
+        return executedAtLeastOne;

      if (isClick && this._stopClick(currentAction, clickTarget))
        return executedAtLeastOne;
@@ -112,7 +111,8 @@ EscapeActions = {
      if (isEnabled && currentAction.condition()) {
        currentAction.action();
        executedAtLeastOne = true;
-        if (!multipleActions) return executedAtLeastOne;
+        if (!multipleActions)
+          return executedAtLeastOne;
      }
    }
    return executedAtLeastOne;
@@ -128,15 +128,13 @@ Mousetrap.bindGlobal('esc', () => {
 // On a left click on the document, we try to exectute one escape action (eg,
 // close the popup). We don't execute any action if the user has clicked on a
 // link or a button.
-$(document).on('click', evt => {
-  if (
-    evt.button === 0 &&
-    $(evt.target).closest('a,button,.is-editable').length === 0
-  ) {
+$(document).on('click', (evt) => {
+  if (evt.button === 0 &&
+    $(evt.target).closest('a,button,.is-editable').length === 0) {
    EscapeActions.clickExecute(evt.target, 'multiselection');
  }
 });

-$(document).on('click', 'a[href=\\#]', evt => {
+$(document).on('click', 'a[href=\\#]',  (evt) => {
  evt.preventDefault();
 });
@@ -71,19 +71,18 @@ class SetFilter {
  _getEmptySelector() {
    this._dep.depend();
    let includeEmpty = false;
-    this._selectedElements.forEach(el => {
+    this._selectedElements.forEach((el) => {
      if (el === undefined) {
        includeEmpty = true;
      }
    });
-    return includeEmpty
-      ? {
-          $eq: [],
-        }
-      : null;
+    return includeEmpty ? {
+      $eq: [],
+    } : null;
  }
 }

+
 // Advanced filter forms a MongoSelector from a users String.
 // Build by: Ignatz 19.05.2018 (github feuerball11)
 class AdvancedFilter {
@@ -129,8 +128,7 @@ class AdvancedFilter {
        current += char;
        continue;
      }
-      // eslint-disable-next-line quotes
-      if (char === "'") {
+      if (char === '\'') {
        string = !string;
        if (string) wasString = true;
        continue;
@@ -141,8 +139,8 @@ class AdvancedFilter {
      }
      if (char === ' ' && !string) {
        commands.push({
-          cmd: current,
-          string: wasString,
+          'cmd': current,
+          'string': wasString,
          regex,
        });
        wasString = false;
@@ -153,8 +151,8 @@ class AdvancedFilter {
    }
    if (current !== '') {
      commands.push({
-        cmd: current,
-        string: wasString,
+        'cmd': current,
+        'string': wasString,
        regex,
      });
    }
@@ -163,19 +161,16 @@ class AdvancedFilter {

  _fieldNameToId(field) {
    const found = CustomFields.findOne({
-      name: field,
+      'name': field,
    });
    return found._id;
  }

  _fieldValueToId(field, value) {
    const found = CustomFields.findOne({
-      name: field,
+      'name': field,
    });
-    if (
-      found.settings.dropdownItems &&
-      found.settings.dropdownItems.length > 0
-    ) {
+    if (found.settings.dropdownItems && found.settings.dropdownItems.length > 0) {
      for (let i = 0; i < found.settings.dropdownItems.length; i++) {
        if (found.settings.dropdownItems[i].name === value) {
          return found.settings.dropdownItems[i]._id;
@@ -207,32 +202,37 @@ class AdvancedFilter {
    for (let i = 0; i < commands.length; i++) {
      if (commands[i].cmd) {
        switch (commands[i].cmd) {
-          case '(': {
-            level++;
-            if (start === -1) start = i;
-            continue;
-          }
-          case ')': {
-            level--;
+        case '(':
+        {
+          level++;
+          if (start === -1) start = i;
+          continue;
+        }
+        case ')':
+        {
+          level--;
+          commands.splice(i, 1);
+          i--;
+          continue;
+        }
+        default:
+        {
+          if (level > 0) {
+            subcommands.push(commands[i]);
            commands.splice(i, 1);
            i--;
            continue;
          }
-          default: {
-            if (level > 0) {
-              subcommands.push(commands[i]);
-              commands.splice(i, 1);
-              i--;
-              continue;
-            }
-          }
+        }
        }
      }
    }
    if (start !== -1) {
      this._processSubCommands(subcommands);
-      if (subcommands.length === 1) commands.splice(start, 0, subcommands[0]);
-      else commands.splice(start, 0, subcommands);
+      if (subcommands.length === 1)
+        commands.splice(start, 0, subcommands[0]);
+      else
+        commands.splice(start, 0, subcommands);
    }
    this._processConditions(commands);
    this._processLogicalOperators(commands);
@@ -242,139 +242,149 @@ class AdvancedFilter {
    for (let i = 0; i < commands.length; i++) {
      if (!commands[i].string && commands[i].cmd) {
        switch (commands[i].cmd) {
-          case '=':
-          case '==':
-          case '===': {
-            const field = commands[i - 1].cmd;
-            const str = commands[i + 1].cmd;
-            if (commands[i + 1].regex) {
-              const match = str.match(new RegExp('^/(.*?)/([gimy]*)$'));
-              let regex = null;
-              if (match.length > 2) regex = new RegExp(match[1], match[2]);
-              else regex = new RegExp(match[1]);
-              commands[i] = {
-                'customFields._id': this._fieldNameToId(field),
-                'customFields.value': regex,
-              };
-            } else {
-              commands[i] = {
-                'customFields._id': this._fieldNameToId(field),
-                'customFields.value': {
+        case '=':
+        case '==':
+        case '===':
+        {
+          const field = commands[i - 1].cmd;
+          const str = commands[i + 1].cmd;
+          if (commands[i + 1].regex) {
+            const match = str.match(new RegExp('^/(.*?)/([gimy]*)$'));
+            let regex = null;
+            if (match.length > 2)
+              regex = new RegExp(match[1], match[2]);
+            else
+              regex = new RegExp(match[1]);
+            commands[i] = {
+              'customFields._id': this._fieldNameToId(field),
+              'customFields.value': regex,
+            };
+          } else {
+            commands[i] = {
+              'customFields._id': this._fieldNameToId(field),
+              'customFields.value': {
+                $in: [this._fieldValueToId(field, str), parseInt(str, 10)],
+              },
+            };
+          }
+          commands.splice(i - 1, 1);
+          commands.splice(i, 1);
+          //changed = true;
+          i--;
+          break;
+        }
+        case '!=':
+        case '!==':
+        {
+          const field = commands[i - 1].cmd;
+          const str = commands[i + 1].cmd;
+          if (commands[i + 1].regex) {
+            const match = str.match(new RegExp('^/(.*?)/([gimy]*)$'));
+            let regex = null;
+            if (match.length > 2)
+              regex = new RegExp(match[1], match[2]);
+            else
+              regex = new RegExp(match[1]);
+            commands[i] = {
+              'customFields._id': this._fieldNameToId(field),
+              'customFields.value': {
+                $not: regex,
+              },
+            };
+          } else {
+            commands[i] = {
+              'customFields._id': this._fieldNameToId(field),
+              'customFields.value': {
+                $not: {
                  $in: [this._fieldValueToId(field, str), parseInt(str, 10)],
                },
-              };
-            }
-            commands.splice(i - 1, 1);
-            commands.splice(i, 1);
-            //changed = true;
-            i--;
-            break;
-          }
-          case '!=':
-          case '!==': {
-            const field = commands[i - 1].cmd;
-            const str = commands[i + 1].cmd;
-            if (commands[i + 1].regex) {
-              const match = str.match(new RegExp('^/(.*?)/([gimy]*)$'));
-              let regex = null;
-              if (match.length > 2) regex = new RegExp(match[1], match[2]);
-              else regex = new RegExp(match[1]);
-              commands[i] = {
-                'customFields._id': this._fieldNameToId(field),
-                'customFields.value': {
-                  $not: regex,
-                },
-              };
-            } else {
-              commands[i] = {
-                'customFields._id': this._fieldNameToId(field),
-                'customFields.value': {
-                  $not: {
-                    $in: [this._fieldValueToId(field, str), parseInt(str, 10)],
-                  },
-                },
-              };
-            }
-            commands.splice(i - 1, 1);
-            commands.splice(i, 1);
-            //changed = true;
-            i--;
-            break;
-          }
-          case '>':
-          case 'gt':
-          case 'Gt':
-          case 'GT': {
-            const field = commands[i - 1].cmd;
-            const str = commands[i + 1].cmd;
-            commands[i] = {
-              'customFields._id': this._fieldNameToId(field),
-              'customFields.value': {
-                $gt: parseInt(str, 10),
              },
            };
-            commands.splice(i - 1, 1);
-            commands.splice(i, 1);
-            //changed = true;
-            i--;
-            break;
-          }
-          case '>=':
-          case '>==':
-          case 'gte':
-          case 'Gte':
-          case 'GTE': {
-            const field = commands[i - 1].cmd;
-            const str = commands[i + 1].cmd;
-            commands[i] = {
-              'customFields._id': this._fieldNameToId(field),
-              'customFields.value': {
-                $gte: parseInt(str, 10),
-              },
-            };
-            commands.splice(i - 1, 1);
-            commands.splice(i, 1);
-            //changed = true;
-            i--;
-            break;
-          }
-          case '<':
-          case 'lt':
-          case 'Lt':
-          case 'LT': {
-            const field = commands[i - 1].cmd;
-            const str = commands[i + 1].cmd;
-            commands[i] = {
-              'customFields._id': this._fieldNameToId(field),
-              'customFields.value': {
-                $lt: parseInt(str, 10),
-              },
-            };
-            commands.splice(i - 1, 1);
-            commands.splice(i, 1);
-            //changed = true;
-            i--;
-            break;
-          }
-          case '<=':
-          case '<==':
-          case 'lte':
-          case 'Lte':
-          case 'LTE': {
-            const field = commands[i - 1].cmd;
-            const str = commands[i + 1].cmd;
-            commands[i] = {
-              'customFields._id': this._fieldNameToId(field),
-              'customFields.value': {
-                $lte: parseInt(str, 10),
-              },
-            };
-            commands.splice(i - 1, 1);
-            commands.splice(i, 1);
-            //changed = true;
-            i--;
-            break;
          }
+          commands.splice(i - 1, 1);
+          commands.splice(i, 1);
+          //changed = true;
+          i--;
+          break;
+        }
+        case '>':
+        case 'gt':
+        case 'Gt':
+        case 'GT':
+        {
+          const field = commands[i - 1].cmd;
+          const str = commands[i + 1].cmd;
+          commands[i] = {
+            'customFields._id': this._fieldNameToId(field),
+            'customFields.value': {
+              $gt: parseInt(str, 10),
+            },
+          };
+          commands.splice(i - 1, 1);
+          commands.splice(i, 1);
+          //changed = true;
+          i--;
+          break;
+        }
+        case '>=':
+        case '>==':
+        case 'gte':
+        case 'Gte':
+        case 'GTE':
+        {
+          const field = commands[i - 1].cmd;
+          const str = commands[i + 1].cmd;
+          commands[i] = {
+            'customFields._id': this._fieldNameToId(field),
+            'customFields.value': {
+              $gte: parseInt(str, 10),
+            },
+          };
+          commands.splice(i - 1, 1);
+          commands.splice(i, 1);
+          //changed = true;
+          i--;
+          break;
+        }
+        case '<':
+        case 'lt':
+        case 'Lt':
+        case 'LT':
+        {
+          const field = commands[i - 1].cmd;
+          const str = commands[i + 1].cmd;
+          commands[i] = {
+            'customFields._id': this._fieldNameToId(field),
+            'customFields.value': {
+              $lt: parseInt(str, 10),
+            },
+          };
+          commands.splice(i - 1, 1);
+          commands.splice(i, 1);
+          //changed = true;
+          i--;
+          break;
+        }
+        case '<=':
+        case '<==':
+        case 'lte':
+        case 'Lte':
+        case 'LTE':
+        {
+          const field = commands[i - 1].cmd;
+          const str = commands[i + 1].cmd;
+          commands[i] = {
+            'customFields._id': this._fieldNameToId(field),
+            'customFields.value': {
+              $lte: parseInt(str, 10),
+            },
+          };
+          commands.splice(i - 1, 1);
+          commands.splice(i, 1);
+          //changed = true;
+          i--;
+          break;
+        }
        }
      }
    }
@@ -384,51 +394,54 @@ class AdvancedFilter {
    for (let i = 0; i < commands.length; i++) {
      if (!commands[i].string && commands[i].cmd) {
        switch (commands[i].cmd) {
-          case 'or':
-          case 'Or':
-          case 'OR':
-          case '|':
-          case '||': {
-            const op1 = commands[i - 1];
-            const op2 = commands[i + 1];
-            commands[i] = {
-              $or: [op1, op2],
-            };
-            commands.splice(i - 1, 1);
-            commands.splice(i, 1);
-            //changed = true;
-            i--;
-            break;
-          }
-          case 'and':
-          case 'And':
-          case 'AND':
-          case '&':
-          case '&&': {
-            const op1 = commands[i - 1];
-            const op2 = commands[i + 1];
-            commands[i] = {
-              $and: [op1, op2],
-            };
-            commands.splice(i - 1, 1);
-            commands.splice(i, 1);
-            //changed = true;
-            i--;
-            break;
-          }
-          case 'not':
-          case 'Not':
-          case 'NOT':
-          case '!': {
-            const op1 = commands[i + 1];
-            commands[i] = {
-              $not: op1,
-            };
-            commands.splice(i + 1, 1);
-            //changed = true;
-            i--;
-            break;
-          }
+        case 'or':
+        case 'Or':
+        case 'OR':
+        case '|':
+        case '||':
+        {
+          const op1 = commands[i - 1];
+          const op2 = commands[i + 1];
+          commands[i] = {
+            $or: [op1, op2],
+          };
+          commands.splice(i - 1, 1);
+          commands.splice(i, 1);
+          //changed = true;
+          i--;
+          break;
+        }
+        case 'and':
+        case 'And':
+        case 'AND':
+        case '&':
+        case '&&':
+        {
+          const op1 = commands[i - 1];
+          const op2 = commands[i + 1];
+          commands[i] = {
+            $and: [op1, op2],
+          };
+          commands.splice(i - 1, 1);
+          commands.splice(i, 1);
+          //changed = true;
+          i--;
+          break;
+        }
+        case 'not':
+        case 'Not':
+        case 'NOT':
+        case '!':
+        {
+          const op1 = commands[i + 1];
+          commands[i] = {
+            $not: op1,
+          };
+          commands.splice(i + 1, 1);
+          //changed = true;
+          i--;
+          break;
+        }
        }
      }
    }
@@ -439,6 +452,7 @@ class AdvancedFilter {
    const commands = this._filterToCommands();
    return this._arrayToSelector(commands);
  }
+
 }

 // The global Filter object.
@@ -451,12 +465,10 @@ Filter = {
  // before changing the schema.
  labelIds: new SetFilter(),
  members: new SetFilter(),
-  archive: new SetFilter(),
-  hideEmpty: new SetFilter(),
  customFields: new SetFilter('_id'),
  advanced: new AdvancedFilter(),

-  _fields: ['labelIds', 'members', 'archive', 'hideEmpty', 'customFields'],
+  _fields: ['labelIds', 'members', 'customFields'],

  // We don't filter cards that have been added after the last filter change. To
  // implement this we keep the id of these cards in this `_exceptions` fields
@@ -465,26 +477,23 @@ Filter = {
  _exceptionsDep: new Tracker.Dependency(),

  isActive() {
-    return (
-      _.any(this._fields, fieldName => {
-        return this[fieldName]._isActive();
-      }) || this.advanced._isActive()
-    );
+    return _.any(this._fields, (fieldName) => {
+      return this[fieldName]._isActive();
+    }) || this.advanced._isActive();
  },

  _getMongoSelector() {
-    if (!this.isActive()) return {};
+    if (!this.isActive())
+      return {};

    const filterSelector = {};
    const emptySelector = {};
    let includeEmptySelectors = false;
-    this._fields.forEach(fieldName => {
+    this._fields.forEach((fieldName) => {
      const filter = this[fieldName];
      if (filter._isActive()) {
        if (filter.subField !== '') {
-          filterSelector[
-            `${fieldName}.${filter.subField}`
-          ] = filter._getMongoSelector();
+          filterSelector[`${fieldName}.${filter.subField}`] = filter._getMongoSelector();
        } else {
          filterSelector[fieldName] = filter._getMongoSelector();
        }
@@ -504,15 +513,11 @@ Filter = {

    const selectors = [exceptionsSelector];

-    if (
-      _.any(this._fields, fieldName => {
-        return this[fieldName]._isActive();
-      })
-    )
-      selectors.push(filterSelector);
+    if (_.any(this._fields, (fieldName) => {
+      return this[fieldName]._isActive();
+    })) selectors.push(filterSelector);
    if (includeEmptySelectors) selectors.push(emptySelector);
-    if (this.advanced._isActive())
-      selectors.push(this.advanced._getMongoSelector());
+    if (this.advanced._isActive()) selectors.push(this.advanced._getMongoSelector());

    return {
      $or: selectors,
@@ -521,7 +526,8 @@ Filter = {

  mongoSelector(additionalSelector) {
    const filterSelector = this._getMongoSelector();
-    if (_.isUndefined(additionalSelector)) return filterSelector;
+    if (_.isUndefined(additionalSelector))
+      return filterSelector;
    else
      return {
        $and: [filterSelector, additionalSelector],
@@ -529,7 +535,7 @@ Filter = {
  },

  reset() {
-    this._fields.forEach(fieldName => {
+    this._fields.forEach((fieldName) => {
      const filter = this[fieldName];
      filter.reset();
    });
@@ -12,7 +12,7 @@ Meteor.startup(() => {
    }

    if (!language) {
-      if (navigator.languages) {
+      if(navigator.languages) {
        language = navigator.languages[0];
      } else {
        language = navigator.language || navigator.userLanguage;
@@ -48,43 +48,35 @@ InlinedForm = BlazeComponent.extendComponent({
  },

  events() {
-    return [
-      {
-        'click .js-close-inlined-form': this.close,
-        'click .js-open-inlined-form': this.open,
+    return [{
+      'click .js-close-inlined-form': this.close,
+      'click .js-open-inlined-form': this.open,

-        // 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();
-          }
-        },
-
-        // Close the inlined form when after its submission
-        submit() {
-          if (this.currentData().autoclose !== false) {
-            Tracker.afterFlush(() => {
-              this.close();
-            });
-          }
-        },
+      // 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();
+        }
      },
-    ];
+
+      // Close the inlined form when after its submission
+      submit() {
+        if (this.currentData().autoclose !== false) {
+          Tracker.afterFlush(() => {
+            this.close();
+          });
+        }
+      },
+    }];
  },
 }).register('inlinedForm');

 // Press escape to close the currently opened inlinedForm
-EscapeActions.register(
-  'inlinedForm',
-  () => {
-    currentlyOpenedForm.get().close();
-  },
-  () => {
-    return currentlyOpenedForm.get() !== null;
-  },
-  {
+EscapeActions.register('inlinedForm',
+  () => { currentlyOpenedForm.get().close(); },
+  () => { return currentlyOpenedForm.get() !== null; }, {
    enabledOnClick: false,
-  },
+  }
 );

 // submit on click outside
@@ -40,10 +40,8 @@ Mousetrap.bind(['down', 'up'], (evt, key) => {
    return;
  }

-  const nextFunc = key === 'down' ? 'next' : 'prev';
-  const nextCard = $('.js-minicard.is-selected')
-    [nextFunc]('.js-minicard')
-    .get(0);
+  const nextFunc = (key === 'down' ? 'next' : 'prev');
+  const nextCard = $('.js-minicard.is-selected')[nextFunc]('.js-minicard').get(0);
  if (nextCard) {
    const nextCardId = Blaze.getData(nextCard)._id;
    Utils.goCardId(nextCardId);
@@ -51,7 +49,7 @@ Mousetrap.bind(['down', 'up'], (evt, key) => {
 });

 // XXX This shortcut should also work when hovering over a card in board view
-Mousetrap.bind('space', evt => {
+Mousetrap.bind('space', (evt) => {
  if (!Session.get('currentCard')) {
    return;
  }
@@ -71,38 +69,29 @@ Mousetrap.bind('space', evt => {
 });

 Template.keyboardShortcuts.helpers({
-  mapping: [
-    {
-      keys: ['W'],
-      action: 'shortcut-toggle-sidebar',
-    },
-    {
-      keys: ['Q'],
-      action: 'shortcut-filter-my-cards',
-    },
-    {
-      keys: ['F'],
-      action: 'shortcut-toggle-filterbar',
-    },
-    {
-      keys: ['X'],
-      action: 'shortcut-clear-filters',
-    },
-    {
-      keys: ['?'],
-      action: 'shortcut-show-shortcuts',
-    },
-    {
-      keys: ['ESC'],
-      action: 'shortcut-close-dialog',
-    },
-    {
-      keys: ['@'],
-      action: 'shortcut-autocomplete-members',
-    },
-    {
-      keys: ['SPACE'],
-      action: 'shortcut-assign-self',
-    },
-  ],
+  mapping: [{
+    keys: ['W'],
+    action: 'shortcut-toggle-sidebar',
+  }, {
+    keys: ['Q'],
+    action: 'shortcut-filter-my-cards',
+  }, {
+    keys: ['F'],
+    action: 'shortcut-toggle-filterbar',
+  }, {
+    keys: ['X'],
+    action: 'shortcut-clear-filters',
+  }, {
+    keys: ['?'],
+    action: 'shortcut-show-shortcuts',
+  }, {
+    keys: ['ESC'],
+    action: 'shortcut-close-dialog',
+  }, {
+    keys: ['@'],
+    action: 'shortcut-autocomplete-members',
+  }, {
+    keys: ['SPACE'],
+    action: 'shortcut-assign-self',
+  }],
 });
@@ -1,6 +1,6 @@
 const closedValue = null;

-window.Modal = new (class {
+window.Modal = new class {
  constructor() {
    this._currentModal = new ReactiveVar(closedValue);
    this._onCloseGoTo = '';
@@ -21,7 +21,7 @@ window.Modal = new (class {
    return this.getTemplateName() !== closedValue;
  }

-  isWide() {
+  isWide(){
    return this._isWideModal;
  }

@@ -32,23 +32,23 @@ window.Modal = new (class {
    }
  }

-  openWide(modalName, { header = '', onCloseGoTo = '' } = {}) {
+  openWide(modalName, { header = '', onCloseGoTo = ''} = {}) {
    this._currentModal.set({ header, modalName });
    this._onCloseGoTo = onCloseGoTo;
    this._isWideModal = true;
  }

-  open(modalName, { header = '', onCloseGoTo = '' } = {}) {
+  open(modalName, { header = '', onCloseGoTo = ''} = {}) {
    this._currentModal.set({ header, modalName });
    this._onCloseGoTo = onCloseGoTo;
+
  }
-})();
+}();

 Blaze.registerHelper('Modal', Modal);

-EscapeActions.register(
-  'modalWindow',
+EscapeActions.register('modalWindow',
  () => Modal.close(),
  () => Modal.isOpen(),
-  { noClickEscapeOn: '.modal-container' },
+  { noClickEscapeOn: '.modal-container' }
 );
@@ -1,4 +1,6 @@
+
 function getCardsBetween(idA, idB) {
+
  function pluckId(doc) {
    return doc._id;
  }
@@ -13,7 +15,7 @@ function getCardsBetween(idA, idB) {
    }).map(pluckId);
  }

-  const cards = _.sortBy([Cards.findOne(idA), Cards.findOne(idB)], c => {
+  const cards = _.sortBy([Cards.findOne(idA), Cards.findOne(idB)], (c) => {
    return c.sort;
  });

@@ -29,21 +31,17 @@ function getCardsBetween(idA, idB) {
    };
  } else {
    selector = {
-      $or: [
-        {
-          listId: cards[0].listId,
-          sort: { $lte: cards[0].sort },
+      $or: [{
+        listId: cards[0].listId,
+        sort: { $lte: cards[0].sort },
+      }, {
+        listId: {
+          $in: getListsStrictlyBetween(cards[0].listId, cards[1].listId),
        },
-        {
-          listId: {
-            $in: getListsStrictlyBetween(cards[0].listId, cards[1].listId),
-          },
-        },
-        {
-          listId: cards[1].listId,
-          sort: { $gte: cards[1].sort },
-        },
-      ],
+      }, {
+        listId: cards[1].listId,
+        sort: { $gte: cards[1].sort },
+      }],
      archived: false,
    };
  }
@@ -135,12 +133,14 @@ MultiSelection = {

    const selectedCards = this._selectedCards.get();

-    cardIds.forEach(cardId => {
+    cardIds.forEach((cardId) => {
      const indexOfCard = selectedCards.indexOf(cardId);

      if (options.remove && indexOfCard > -1)
        selectedCards.splice(indexOfCard, 1);
-      else if (options.add) selectedCards.push(cardId);
+
+      else if (options.add)
+        selectedCards.push(cardId);
    });

    this._selectedCards.set(selectedCards);
@@ -153,15 +153,9 @@ MultiSelection = {

 Blaze.registerHelper('MultiSelection', MultiSelection);

-EscapeActions.register(
-  'multiselection',
-  () => {
-    MultiSelection.disable();
-  },
-  () => {
-    return MultiSelection.isActive();
-  },
-  {
+EscapeActions.register('multiselection',
+  () => { MultiSelection.disable(); },
+  () => { return MultiSelection.isActive(); }, {
    noClickEscapeOn: '.js-minicard,.js-board-sidebar-content',
-  },
+  }
 );
@@ -11,10 +11,7 @@
  $.event.fix = (function(originalFix) {
    return function(event) {
      event = originalFix.apply(this, arguments);
-      if (
-        event.type.indexOf('copy') === 0 ||
-        event.type.indexOf('paste') === 0
-      ) {
+      if (event.type.indexOf('copy') === 0 || event.type.indexOf('paste') === 0) {
        event.clipboardData = event.originalEvent.clipboardData;
      }
      return event;
@@ -26,7 +23,7 @@
    matchType: /image.*/,
  };

-  return ($.fn.pasteImageReader = function(options) {
+  return $.fn.pasteImageReader = function(options) {
    if (typeof options === 'function') {
      options = {
        callback: options,
@@ -38,11 +35,8 @@
      return $(element).bind('paste', function(event) {
        const types = event.clipboardData.types;
        const items = event.clipboardData.items;
-        for (let i = 0; i < types.length; i++) {
-          if (
-            types[i].match(options.matchType) ||
-            items[i].type.match(options.matchType)
-          ) {
+        for(let i=0; i<types.length; i++) {
+          if(types[i].match(options.matchType) || items[i].type.match(options.matchType)) {
            const f = items[i].getAsFile();
            const reader = new FileReader();
            reader.onload = function(evt) {
@@ -59,5 +53,5 @@
        }
      });
    });
-  });
+  };
 })(jQuery);
@@ -1,4 +1,4 @@
-window.Popup = new (class {
+window.Popup = new class {
  constructor() {
    // The template we use to render popups
    this.template = Template.popup;
@@ -67,7 +67,7 @@ window.Popup = new (class {
        title: self._getTitle(popupName),
        depth: self._stack.length,
        offset: self._getOffset(openerElement),
-        dataContext: (this.currentData && this.currentData()) || this,
+        dataContext: this.currentData && this.currentData() || this,
      });

      // If there are no popup currently opened we use the Blaze API to render
@@ -80,14 +80,11 @@ window.Popup = new (class {
      // our internal dependency, and since we just changed the top element of
      // our internal stack, the popup will be updated with the new data.
      if (!self.isOpen()) {
-        self.current = Blaze.renderWithData(
-          self.template,
-          () => {
-            self._dep.depend();
-            return { ...self._getTopStack(), stack: self._stack };
-          },
-          document.body,
-        );
+        self.current = Blaze.renderWithData(self.template, () => {
+          self._dep.depend();
+          return { ...self._getTopStack(), stack: self._stack };
+        }, document.body);
+
      } else {
        self._dep.changed();
      }
@@ -104,7 +101,7 @@ window.Popup = new (class {
    const self = this;

    return function(evt, tpl) {
-      const context = (this.currentData && this.currentData()) || this;
+      const context = this.currentData && this.currentData() || this;
      context.__afterConfirmAction = action;
      self.open(name).call(context, evt, tpl);
    };
@@ -139,6 +136,7 @@ window.Popup = new (class {
      const openerElement = this._getTopStack().openerElement;
      $(openerElement).removeClass('is-active');

+
      this._stack = [];
    }
  }
@@ -161,7 +159,7 @@ window.Popup = new (class {
    return () => {
      Utils.windowResizeDep.depend();

-      if (Utils.isMiniScreen()) return { left: 0, top: 0 };
+      if(Utils.isMiniScreen()) return { left:0, top:0 };

      const offset = $element.offset();
      const popupWidth = 300 + 15;
@@ -190,19 +188,18 @@ window.Popup = new (class {
      return title !== translationKey ? title : defaultTitle;
    };
  }
-})();
+}();

 // We close a potential opened popup on any left click on the document, or go
 // one step back by pressing escape.
 const escapeActions = ['back', 'close'];
-escapeActions.forEach(actionName => {
-  EscapeActions.register(
-    `popup-${actionName}`,
+escapeActions.forEach((actionName) => {
+  EscapeActions.register(`popup-${actionName}`,
    () => Popup[actionName](),
    () => Popup.isOpen(),
    {
      noClickEscapeOn: '.js-pop-over,.js-open-card-title-popup',
      enabledOnClick: actionName === 'close',
-    },
+    }
  );
 });
@@ -47,6 +47,9 @@ $.fn.escapeableTextComplete = function(strategies, options, ...otherArgs) {
  });
 };

-EscapeActions.register('textcomplete', () => {}, () => dropdownMenuIsOpened, {
-  noClickEscapeOn: '.textcomplete-dropdown',
-});
+EscapeActions.register('textcomplete',
+  () => {},
+  () => dropdownMenuIsOpened, {
+    noClickEscapeOn: '.textcomplete-dropdown',
+  }
+);
@@ -34,13 +34,13 @@ UnsavedEdits = {
  },

  has({ fieldName, docId }) {
-    return Boolean(this.get({ fieldName, docId }));
+    return Boolean(this.get({fieldName, docId}));
  },

  set({ fieldName, docId }, value) {
    const currentDoc = this._getCollectionDocument(fieldName, docId);
    if (currentDoc) {
-      UnsavedEditCollection.update(currentDoc._id, { $set: { value } });
+      UnsavedEditCollection.update(currentDoc._id, { $set: { value }});
    } else {
      UnsavedEditCollection.insert({
        fieldName,
@@ -58,7 +58,7 @@ UnsavedEdits = {
  },

  _getCollectionDocument(fieldName, docId) {
-    return UnsavedEditCollection.findOne({ fieldName, docId });
+    return UnsavedEditCollection.findOne({fieldName, docId});
  },
 };

@@ -2,105 +2,22 @@ Utils = {
  // XXX We should remove these two methods
  goBoardId(_id) {
    const board = Boards.findOne(_id);
-    return (
-      board &&
-      FlowRouter.go('board', {
-        id: board._id,
-        slug: board.slug,
-      })
-    );
+    return board && FlowRouter.go('board', {
+      id: board._id,
+      slug: board.slug,
+    });
  },

  goCardId(_id) {
    const card = Cards.findOne(_id);
    const board = Boards.findOne(card.boardId);
-    return (
-      board &&
-      FlowRouter.go('card', {
-        cardId: card._id,
-        boardId: board._id,
-        slug: board.slug,
-      })
-    );
+    return board && FlowRouter.go('card', {
+      cardId: card._id,
+      boardId: board._id,
+      slug: board.slug,
+    });
  },

-  MAX_IMAGE_PIXEL: Meteor.settings.public.MAX_IMAGE_PIXEL,
-  COMPRESS_RATIO: Meteor.settings.public.IMAGE_COMPRESS_RATIO,
-  processUploadedAttachment(card, fileObj, callback) {
-    const next = attachment => {
-      if (typeof callback === 'function') {
-        callback(attachment);
-      }
-    };
-    if (!card) {
-      return next();
-    }
-    const file = new FS.File(fileObj);
-    if (card.isLinkedCard()) {
-      file.boardId = Cards.findOne(card.linkedId).boardId;
-      file.cardId = card.linkedId;
-    } else {
-      file.boardId = card.boardId;
-      file.swimlaneId = card.swimlaneId;
-      file.listId = card.listId;
-      file.cardId = card._id;
-    }
-    file.userId = Meteor.userId();
-    if (file.original) {
-      file.original.name = fileObj.name;
-    }
-    return next(Attachments.insert(file));
-  },
-  shrinkImage(options) {
-    // shrink image to certain size
-    const dataurl = options.dataurl,
-      callback = options.callback,
-      toBlob = options.toBlob;
-    let canvas = document.createElement('canvas'),
-      image = document.createElement('img');
-    const maxSize = options.maxSize || 1024;
-    const ratio = options.ratio || 1.0;
-    const next = function(result) {
-      image = null;
-      canvas = null;
-      if (typeof callback === 'function') {
-        callback(result);
-      }
-    };
-    image.onload = function() {
-      let width = this.width,
-        height = this.height;
-      let changed = false;
-      if (width > height) {
-        if (width > maxSize) {
-          height *= maxSize / width;
-          width = maxSize;
-          changed = true;
-        }
-      } else if (height > maxSize) {
-        width *= maxSize / height;
-        height = maxSize;
-        changed = true;
-      }
-      canvas.width = width;
-      canvas.height = height;
-      canvas.getContext('2d').drawImage(this, 0, 0, width, height);
-      if (changed === true) {
-        const type = 'image/jpeg';
-        if (toBlob) {
-          canvas.toBlob(next, type, ratio);
-        } else {
-          next(canvas.toDataURL(type, ratio));
-        }
-      } else {
-        next(changed);
-      }
-    };
-    image.onerror = function() {
-      next(false);
-    };
-    image.src = dataurl;
-  },
  capitalize(string) {
    return string.charAt(0).toUpperCase() + string.slice(1);
  },
@@ -187,21 +104,13 @@ Utils = {
        return window.matchMedia(query).matches;
      };

-      if (
-        'ontouchstart' in window ||
-        (window.DocumentTouch && document instanceof window.DocumentTouch)
-      ) {
+      if (('ontouchstart' in window) || window.DocumentTouch && document instanceof window.DocumentTouch) {
        return true;
      }

      // include the 'heartz' as a way to have a non matching MQ to help terminate the join
      // https://git.io/vznFH
-      const query = [
-        '(',
-        prefixes.join('touch-enabled),('),
-        'heartz',
-        ')',
-      ].join('');
+      const query = ['(', prefixes.join('touch-enabled),('), 'heartz', ')'].join('');
      return mq(query);
    })();
    Utils.isTouchDevice = () => isTouchable;
@@ -211,7 +120,7 @@ Utils = {
  calculateTouchDistance(touchA, touchB) {
    return Math.sqrt(
      Math.pow(touchA.screenX - touchB.screenX, 2) +
-        Math.pow(touchA.screenY - touchB.screenY, 2),
+      Math.pow(touchA.screenY - touchB.screenY, 2)
    );
  },

@@ -227,11 +136,7 @@ Utils = {
      lastTouch = touches[touches.length - 1];
    });
    $(document).on('touchend', selector, function(e) {
-      if (
-        touchStart &&
-        lastTouch &&
-        Utils.calculateTouchDistance(touchStart, lastTouch) <= 20
-      ) {
+      if (touchStart && lastTouch && Utils.calculateTouchDistance(touchStart, lastTouch) <= 20) {
        e.preventDefault();
        const clickEvent = document.createEvent('MouseEvents');
        clickEvent.initEvent('click', true, true);
@@ -240,30 +145,30 @@ Utils = {
    });
  },

-  manageCustomUI() {
+  manageCustomUI(){
    Meteor.call('getCustomUI', (err, data) => {
-      if (err && err.error[0] === 'var-not-exist') {
+      if (err && err.error[0] === 'var-not-exist'){
        Session.set('customUI', false); // siteId || address server not defined
      }
-      if (!err) {
+      if (!err){
        Utils.setCustomUI(data);
      }
    });
  },

-  setCustomUI(data) {
+  setCustomUI(data){
    const currentBoard = Boards.findOne(Session.get('currentBoard'));
    if (currentBoard) {
-      DocHead.setTitle(`${currentBoard.title} - ${data.productName}`);
+      DocHead.setTitle(`${currentBoard.title  } - ${  data.productName}`);
    } else {
      DocHead.setTitle(`${data.productName}`);
    }
  },

-  setMatomo(data) {
+  setMatomo(data){
    window._paq = window._paq || [];
    window._paq.push(['setDoNotTrack', data.doNotTrack]);
-    if (data.withUserName) {
+    if (data.withUserName){
      window._paq.push(['setUserId', Meteor.user().username]);
    }
    window._paq.push(['trackPageView']);
@@ -291,12 +196,12 @@ Utils = {

  manageMatomo() {
    const matomo = Session.get('matomo');
-    if (matomo === undefined) {
+    if (matomo === undefined){
      Meteor.call('getMatomoConf', (err, data) => {
-        if (err && err.error[0] === 'var-not-exist') {
+        if (err && err.error[0] === 'var-not-exist'){
          Session.set('matomo', false); // siteId || address server not defined
        }
-        if (!err) {
+        if (!err){
          Utils.setMatomo(data);
        }
      });
@@ -315,21 +220,15 @@ Utils = {
        finalString += element.text().toLowerCase();
      } else if (element.hasClass('user-details')) {
        let username = element.find('input').val();
-        if (username === undefined || username === '') {
+        if(username === undefined || username === ''){
          username = '*';
        }
-        finalString += `${element
-          .find('.trigger-text')
-          .text()
-          .toLowerCase()} ${username}`;
+        finalString += `${element.find('.trigger-text').text().toLowerCase() } ${  username}`;
      } else if (element.find('select').length > 0) {
-        finalString += element
-          .find('select option:selected')
-          .text()
-          .toLowerCase();
+        finalString += element.find('select option:selected').text().toLowerCase();
      } else if (element.find('input').length > 0) {
        let inputvalue = element.find('input').val();
-        if (inputvalue === undefined || inputvalue === '') {
+        if(inputvalue === undefined || inputvalue === ''){
          inputvalue = '*';
        }
        finalString += inputvalue;
Author	SHA1	Message	Date
Lauri Ojansivu	dae8033d61	v2.93	2019-06-28 09:14:34 +03:00
Lauri Ojansivu	b5c566615b	Fix lint errors.	2019-06-28 09:07:30 +03:00
Lauri Ojansivu	d792033ffa	Update translations.	2019-06-28 08:55:58 +03:00
Lauri Ojansivu	63fa75819c	Update changelog.	2019-06-28 08:54:19 +03:00
Lauri Ojansivu	f25e54a9f1	Merge pull request #2519 from Worteks/devel Add test if email attribute is an Array	2019-06-28 08:50:29 +03:00
Thibaut Démaret	621efd59db	Add test if email attribute is an Array	2019-06-28 06:59:51 +02:00