v5.17

Added stable tag release script.
Updated translations.
2021-04-01 01:51:20 +03:00 · 2021-04-01 01:49:41 +03:00 · 2021-04-01 01:45:24 +03:00 · 2021-04-01 01:38:05 +03:00 · 2021-04-01 01:34:23 +03:00 · 2021-04-01 00:40:02 +03:00
266 changed files with 73625 additions and 42723 deletions
@@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND=noninteractive

 ENV \
    DEBUG=false \
-    NODE_VERSION=v12.20.0 \
+    NODE_VERSION=v12.22.0 \
    METEOR_RELEASE=1.10.2 \
    USE_EDGE=false \
    METEOR_EDGE=1.5-beta.17 \
@@ -19,6 +19,7 @@ ENV \
    ARCHITECTURE=linux-x64 \
    SRC_PATH=./ \
    WITH_API=true \
+    RESULTS_PER_PAGE="" \
    ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE=3 \
    ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD=60 \
    ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW=15 \
@@ -81,7 +81,7 @@ parts:
    wekan:
        source: .
        plugin: nodejs
-        node-engine: 12.20.0
+        node-engine: 12.22.0
        node-packages:
            - node-gyp
            - node-pre-gyp
@@ -5,7 +5,7 @@ echo "      with 'sudo dpkg-reconfigure locales' , so that MongoDB works correct
 echo "      You can still use any other locale as your main locale."

 #Below script installs newest node 8.x for Debian/Ubuntu/Mint.
-#NODE_VERSION=12.18.2
+#NODE_VERSION=12.21.0
 #X64NODE="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz"

 function pause(){
@@ -80,7 +80,7 @@ do
 			curl -0 -L https://npmjs.org/install.sh | sudo sh
 			sudo chown -R $(id -u):$(id -g) $HOME/.npm
 			sudo npm -g install n
-			sudo n 12.18.2
+			sudo n 12.21.0
 			#curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
 			#sudo apt-get install -y nodejs
 		elif [[ "$OSTYPE" == "darwin"* ]]; then
@@ -83,7 +83,7 @@ parts:
    wekan:
        source: .
        plugin: nodejs
-        node-engine: 12.20.0
+        node-engine: 12.22.0
        node-packages:
            - node-gyp
            - node-pre-gyp
@@ -1,8 +1,10 @@
 ## Issue

+Email settings:
+- https://github.com/wekan/wekan/wiki/Troubleshooting-Mail
+
 Add these issues to elsewhere:
- Snap: https://github.com/wekan/wekan-snap/issues
- LDAP: https://github.com/wekan/wekan-ldap/issues
+- SECURITY ISSUES: https://github.com/wekan/wekan/blob/master/SECURITY.md
 - UCS: https://github.com/wekan/univention/issues

 Other Wekan issues can be added here.
@@ -0,0 +1,12 @@
+on: [push]
+
+jobs:
+  zap_scan:
+    runs-on: ubuntu-latest
+    name: Scan the webapplication
+    steps:
+      - name: OWASP ZAP Scan
+        runs-on: ubuntu-latest
+        uses: zaproxy/action-baseline@v0.4.0
+        with:
+          target: 'https://boards.wekan.team/sign-in'
@@ -31,5 +31,4 @@ Thumbs.db
 ehthumbs.db
 .eslintcache
 .meteor/local
-.meteor-1.6-snap/.meteor/local
 .devcontainer/docker-compose.extend.yml
@@ -6,8 +6,8 @@
 meteor-base@1.4.0

 # Build system
-ecmascript@0.14.4
-standard-minifier-css@1.7.1
+ecmascript@0.15.0
+standard-minifier-css@1.7.2
 standard-minifier-js@2.6.0
 mquandalle:jade
 coffeescript@2.4.1!
@@ -72,9 +72,9 @@ simple:rest-accounts-password
 useraccounts:core
 email@2.0.0
 horka:swipebox
-dynamic-import@0.5.4
+dynamic-import@0.6.0

-accounts-password@1.6.3
+accounts-password@1.7.0
 cfs:gridfs
 rzymek:fullcalendar
 momentjs:moment@2.22.2
@@ -91,7 +91,6 @@ meteorhacks:aggregate@1.3.0
 wekan-markdown
 konecty:mongo-counter
 percolate:synced-cron
-easylogic:summernote
 cfs:filesystem
 tmeasday:check-npm-versions
 steffo:meteor-accounts-saml
@@ -145,3 +144,4 @@ rajit:bootstrap3-datepicker-zh-cn
 rajit:bootstrap3-datepicker-zh-tw
 staringatlights:fast-render
 spacebars
+easylogic:summernote
@@ -1 +1 @@
-METEOR@1.12
+METEOR@2.1
@@ -1,7 +1,7 @@
 3stack:presence@1.1.2
-accounts-base@1.7.1
+accounts-base@1.8.0
 accounts-oauth@1.2.0
-accounts-password@1.6.3
+accounts-password@1.7.0
 aldeed:collection2@2.10.0
 aldeed:collection2-core@1.2.0
 aldeed:schema-deny@1.1.0
@@ -10,8 +10,8 @@ aldeed:simple-schema@1.5.4
 allow-deny@1.1.0
 arillo:flow-router-helpers@0.5.2
 audit-argument-checks@1.0.7
-autoupdate@1.6.0
-babel-compiler@7.5.4
+autoupdate@1.7.0
+babel-compiler@7.6.0
 babel-runtime@1.5.0
 base64@1.0.12
 binary-heap@1.0.11
@@ -49,15 +49,15 @@ coffeescript-compiler@2.4.1
 cottz:publish-relations@2.0.8
 dburles:collection-helpers@1.1.0
 ddp@1.4.0
-ddp-client@2.3.3
+ddp-client@2.4.0
 ddp-common@1.4.0
 ddp-rate-limiter@1.0.9
 ddp-server@2.3.2
 deps@1.0.12
 diff-sequence@1.1.1
-dynamic-import@0.5.4
+dynamic-import@0.6.0
 easylogic:summernote@0.8.8
-ecmascript@0.14.4
+ecmascript@0.15.0
 ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.11.0
 ecmascript-runtime-server@0.10.0
@@ -72,7 +72,7 @@ horka:swipebox@1.0.2
 hot-code-push@1.0.4
 html-tools@1.0.11
 htmljs@1.0.11
-http@1.4.2
+http@1.4.3
 id-map@1.1.0
 idmontie:migrations@1.0.3
 inter-process-messaging@0.1.1
@@ -87,7 +87,7 @@ lamhieu:unblock@1.0.0
 launch-screen@1.2.0
 livedata@1.0.18
 localstorage@1.2.0
-logging@1.1.20
+logging@1.2.0
 lucasantoniassi:accounts-lockout@1.0.0
 matb33:collection-hooks@0.9.1
 matteodem:easy-search@1.6.4
@@ -106,7 +106,7 @@ minifiers@1.1.8-faster-rebuild.0
 minimongo@1.6.1
 mobile-status-bar@1.1.0
 modern-browsers@0.1.5
-modules@0.15.0
+modules@0.16.0
 modules-runtime@0.12.0
 momentjs:moment@2.29.1
 mongo@1.10.1
@@ -191,6 +191,7 @@ rajit:bootstrap3-datepicker-zh-cn@1.7.1
 rajit:bootstrap3-datepicker-zh-tw@1.7.1
 random@1.2.0
 rate-limit@1.0.9
+react-fast-refresh@0.1.0
 reactive-dict@1.3.0
 reactive-var@1.0.11
 reload@1.3.1
@@ -212,7 +213,7 @@ softwarerero:accounts-t9n@1.3.11
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.1.0
-standard-minifier-css@1.7.1
+standard-minifier-css@1.7.2
 standard-minifier-js@2.6.0
 staringatlights:fast-render@3.3.0
 staringatlights:inject-data@2.3.0
@@ -233,8 +234,8 @@ useraccounts:core@1.14.2
 useraccounts:flow-routing@1.14.2
 useraccounts:unstyled@1.14.2
 verron:autosize@3.0.8
-webapp@1.9.1
-webapp-hashing@1.0.9
+webapp@1.10.0
+webapp-hashing@1.1.0
 wekan-accounts-cas@0.1.0
 wekan-accounts-oidc@1.0.10
 wekan-ldap@0.0.2
@@ -3,7 +3,7 @@ sudo: required

 env:
  TRAVIS_DOCKER_COMPOSE_VERSION: 1.24.0
-  TRAVIS_NODE_VERSION: 12.20.0
+  TRAVIS_NODE_VERSION: 12.22.0
  TRAVIS_NPM_VERSION: latest

 before_install:
@@ -39,7 +39,7 @@ host = https://www.transifex.com
 # tap:i18n requires us to use `-` separator in the language identifiers whereas
 # Transifex uses a `_` separator, without an option to customize it on one side
 # or the other, so we need to do a Manual mapping.
-lang_map = bg_BG:bg, en_GB:en-GB, es_AR:es-AR, es_CL:es-CL, es_PE:es-PE, el_GR:el, fi_FI:fi, hu_HU:hu, id_ID:id, mn_MN:mn, no:nb, lv_LV:lv, pt_BR:pt-BR, ro_RO:ro, sl_SI:sl, zh_CN:zh-CN, zh_TW:zh-TW, zh_HK:zh-HK
+lang_map = ar_EG:ar-EG, bg_BG:bg, en_GB:en-GB, es_AR:es-AR, es_CL:es-CL, es_419:es-LA, es_PE:es-PE, es_MX:es-MX, es_TX:es-TX, es_PY:es-PY, el_GR:el, fa_IR:fa-IR, fi_FI:fi, hu_HU:hu, id_ID:id, mn_MN:mn, no:nb, lv_LV:lv, pt_BR:pt-BR, ro_RO:ro, sl_SI:sl, zh_CN:zh-CN, zh_TW:zh-TW, zh_HK:zh-HK

 [wekan.application]
 file_filter = i18n/<lang>.i18n.json
@@ -1,4 +1,4 @@
-FROM quay.io/wekan/ubuntu:groovy-20201125.2
+FROM quay.io/wekan/ubuntu:groovy-20210115
 LABEL maintainer="wekan"

 # 2020-12-03:
@@ -12,7 +12,7 @@ ARG DEBIAN_FRONTEND=noninteractive

 ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates python3" \
    DEBUG=false \
-    NODE_VERSION=v12.20.0 \
+    NODE_VERSION=v12.22.0 \
    METEOR_RELEASE=1.10.2 \
    USE_EDGE=false \
    METEOR_EDGE=1.5-beta.17 \
@@ -21,6 +21,7 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
    ARCHITECTURE=linux-x64 \
    SRC_PATH=./ \
    WITH_API=true \
+    RESULTS_PER_PAGE="" \
    ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE=3 \
    ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD=60 \
    ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW=15 \
@@ -274,11 +275,12 @@ RUN \
    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 && \
+    chmod u+w *.json && \
    gosu wekan:wekan npm install && \
    gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \
-    cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \
+    #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 && \
+    #chown wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \
    #Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
    #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
    #https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c
@@ -291,10 +293,11 @@ RUN \
    #find . -name "*phantomjs*" | xargs rm -rf && \
    #
    cd /home/wekan/app_build/bundle/programs/server/ && \
+    chmod u+w *.json && \
    gosu wekan:wekan npm install && \
    #gosu wekan:wekan npm install bcrypt && \
    # Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
-		rm -rf /home/wekan/app_build/bundle/programs/web.browser.legacy && \
+    rm -rf /home/wekan/app_build/bundle/programs/web.browser.legacy && \
    mv /home/wekan/app_build/bundle /build && \
    \
    # Put back the original tar
@@ -4,7 +4,7 @@ FROM amd64/alpine:3.7 AS builder
 ENV QEMU_VERSION=v4.2.0-6 \
    QEMU_ARCHITECTURE=aarch64 \
    NODE_ARCHITECTURE=linux-arm64 \
-    NODE_VERSION=v12.20.0 \
+    NODE_VERSION=v12.22.0 \
    WEKAN_VERSION=3.96  \
    WEKAN_ARCHITECTURE=arm64

@@ -40,7 +40,7 @@ LABEL maintainer="wekan"
 # Set the environment variables (defaults where required)
 ENV QEMU_ARCHITECTURE=aarch64 \
    NODE_ARCHITECTURE=linux-arm64 \
-    NODE_VERSION=v12.20.0 \
+    NODE_VERSION=v12.22.0 \
    NODE_ENV=production \
    NPM_VERSION=latest \
    WITH_API=true \
@@ -1,21 +1,18 @@
-[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/wekan/wekan) 
+[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/wekan/wekan)

 # Wekan - Open Source kanban

 [![Contributors](https://img.shields.io/github/contributors/wekan/wekan.svg "Contributors")](https://github.com/wekan/wekan/graphs/contributors)
 [![Docker Repository on Quay](https://quay.io/repository/wekan/wekan/status "Docker Repository on Quay")](https://quay.io/repository/wekan/wekan)
+[![Docker Hub container status](https://img.shields.io/docker/build/wekanteam/wekan.svg "Docker Hub container status")](https://hub.docker.com/r/wekanteam/wekan)
+[![Docker Hub pulls](https://img.shields.io/docker/pulls/wekanteam/wekan.svg "Docker Hub Pulls")](https://hub.docker.com/r/wekanteam/wekan)
 [![Wekan Build Status][travis_badge]][travis_status]
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/02137ecec4e34c5aa303f57637196a93 "Codacy Badge")](https://www.codacy.com/app/xet7/wekan?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=wekan/wekan&amp;utm_campaign=Badge_Grade)
 [![Code Climate](https://codeclimate.com/github/wekan/wekan/badges/gpa.svg "Code Climate")](https://codeclimate.com/github/wekan/wekan)
 [![Project Dependencies](https://david-dm.org/wekan/wekan.svg "Project Dependencies")](https://david-dm.org/wekan/wekan)
 [![Code analysis at Open Hub](https://img.shields.io/badge/code%20analysis-at%20Open%20Hub-brightgreen.svg "Code analysis at Open Hub")](https://www.openhub.net/p/wekan)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwekan%2Fwekan.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwekan%2Fwekan?ref=badge_shield)
-
-NOTE: Docker Hub builds are broken with error ENOMEM. Only Quay works, see docker-compose.yml .
-<!--
-[![Docker Hub container status](https://img.shields.io/docker/build/wekanteam/wekan.svg "Docker Hub container sta>
-[![Docker Hub pulls](https://img.shields.io/docker/pulls/wekanteam/wekan.svg "Docker Hub Pulls")](https://hub.doc>
-->
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4619/badge)](https://bestpractices.coreinfrastructure.org/projects/4619)

 ## [Translate Wekan at Transifex](https://transifex.com/wekan/wekan)

@@ -24,19 +21,18 @@ New English strings of new features can be added as PRs to edge branch file weka

 ## [Wekan feature requests and bugs](https://github.com/wekan/wekan/issues)

-Please add most of your questions as GitHub issue: [Wekan feature requests and bugs](https://github.com/wekan/wekan/issues).
+Please add most of your questions as GitHub issue: [Wekan Feature Requests and Bugs](https://github.com/wekan/wekan/issues).
 It's better than at chat where details get lost when chat scrolls up.

 ## Chat

-[![Wekan Chat][vanila_badge]][wekan_chat] - Most Wekan community and developers are here. Works on webbrowser
-and PWA app that can be added as icon on Android and bookmark on iOS, used like native app.
+[Discussions][discussions] - Wekan Community GitHub Discussions, that are not [Feature Requests and Bugs](https://github.com/wekan/wekan/issues).

 [Wekan IRC FAQ](https://github.com/wekan/wekan/wiki/IRC-FAQ)

 ## FAQ

-**NOTE**: 
+**NOTE**:
 - Please read the [FAQ](https://github.com/wekan/wekan/wiki/FAQ) first
 - Please don't feed the [trolls](https://github.com/wekan/wekan/wiki/FAQ#why-am-i-called-a-troll) and [spammers](https://github.com/wekan/wekan/wiki/FAQ#why-am-i-called-a-spammer) that are mentioned in the FAQ :)

@@ -56,7 +52,7 @@ that by providing one-click installation on various platforms.

 - Wekan is used in [most countries of the world](https://snapcraft.io/wekan).
 - Wekan largest user has 13k users using Wekan in their company.
- Wekan has been [translated](https://transifex.com/wekan/wekan) to about 50 languages.
+- Wekan has been [translated](https://transifex.com/wekan/wekan) to about 62 languages.
 - [Features][features]: Wekan has real-time user interface.
 - [Platforms][platforms]: Wekan supports many platforms.
  Wekan is critical part of new platforms Wekan is currently being integrated to.
@@ -68,7 +64,7 @@ that by providing one-click installation on various platforms.
  [More Platforms](https://github.com/wekan/wekan/wiki/Platforms), bundle for RasPi3 ARM and other CPUs where Node.js and MongoDB exists.
 - 1 GB RAM minimum free for Wekan. Production server should have minimum total 4 GB RAM.
  For thousands of users, for example with [Docker](https://github.com/wekan/wekan/blob/master/docker-compose.yml): 3 frontend servers,
-  each having 2 CPU and 2 wekan-app containers. One backend wekan-db server with many CPUs.  
+  each having 2 CPU and 2 wekan-app containers. One backend wekan-db server with many CPUs.
 - Enough disk space and alerts about low disk space. If you run out disk space, MongoDB database gets corrupted.
 - SECURITY: Updating to newest Wekan version very often. Please check you do not have automatic updates of Sandstorm or Snap turned off.
  Old versions have security issues because of old versions Node.js etc. Only newest Wekan is supported.
@@ -118,8 +114,6 @@ with [Meteor](https://www.meteor.com).
 [translate_wekan]: https://www.transifex.com/wekan/wekan/
 [open_source]: https://en.wikipedia.org/wiki/Open-source_software
 [free_software]: https://en.wikipedia.org/wiki/Free_software
-[vanila_badge]: https://vanila.io/img/join-chat-button2.png
-[wekan_chat]: https://community.vanila.io/wekan
-
+[discussions]: https://github.com/wekan/wekan/discussions

 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwekan%2Fwekan.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwekan%2Fwekan?ref=badge_large)
@@ -1,10 +1,10 @@
 Security is very important to us. If you discover any issue regarding security, please disclose
-the information responsibly by sending an email to security (at) wekan.team and not by
+the information responsibly by sending an email to support (at) wekan.team using
+[this PGP public key](support-at-wekan.team_pgp-publickey.asc) and not by
 creating a GitHub issue. We will respond swiftly to fix verifiable security issues.

 We thank you with a place at our hall of fame page, that is
-at https://wekan.github.io/hall-of-fame . Others have just posted public GitHub issue,
-so they are not at that hall-of-fame page.
+at https://wekan.github.io/hall-of-fame

 ## How should reports be formatted?

@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v4.59.0"
+appVersion: "v5.17.0"
 files:
  userUploads:
    - README.md
@@ -82,7 +82,7 @@ template(name="activity")
            +viewer
              = activity.checklist.title
        else
-          a.activity-checklist(href="{{ activity.card.absoluteUrl }}")
+          a.activity-checklist(href="{{ activity.card.originRelativeUrl }}")
            +viewer
              = activity.checklist.title

@@ -103,7 +103,7 @@ template(name="activity")

      if($eq activity.activityType 'addChecklistItem')
        | {{{_ 'activity-checklist-item-added' (sanitize activity.checklist.title) cardLink}}}.
-        .activity-checklist(href="{{ activity.card.absoluteUrl }}")
+        .activity-checklist(href="{{ activity.card.originRelativeUrl }}")
          +viewer
            = activity.checklistItem.title

@@ -139,7 +139,7 @@ template(name="activity")
        //- if we are not in card mode we only display a summary of the comment
        if($eq activity.activityType 'addComment')
          | {{{_ 'activity-on' cardLink}}}
-          a.activity-comment(href="{{ activity.card.absoluteUrl }}")
+          a.activity-comment(href="{{ activity.card.originRelativeUrl }}")
            +viewer
              = activity.comment.text

@@ -1,6 +1,6 @@
 import sanitizeXss from 'xss';

-const activitiesPerPage = 20;
+const activitiesPerPage = 500;

 BlazeComponent.extendComponent({
  onCreated() {
@@ -243,7 +243,7 @@ function createCardLink(card) {
    Blaze.toHTML(
      HTML.A(
        {
-          href: card.absoluteUrl(),
+          href: card.originRelativeUrl(),
          class: 'action-card',
        },
        sanitizeXss(card.title),
@@ -260,7 +260,7 @@ function createBoardLink(board, list) {
    Blaze.toHTML(
      HTML.A(
        {
-          href: board.absoluteUrl(),
+          href: board.originRelativeUrl(),
          class: 'action-board',
        },
        sanitizeXss(text),
@@ -3,11 +3,15 @@ BlazeComponent.extendComponent({
    this.subscribe('archivedBoards');
  },

+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+
  archivedBoards() {
    return Boards.find(
      { archived: true },
      {
-        sort: { sort: 1 /* boards default sorting */ },
+        sort: { archivedAt: -1, modifiedAt: -1 },
      },
    );
  },
@@ -211,7 +211,12 @@ BlazeComponent.extendComponent({
      }

      // Disable drag-dropping if the current user is not a board member
-      $swimlanesDom.sortable('option', 'disabled', !userIsMember());
+      //$swimlanesDom.sortable('option', 'disabled', !userIsMember());
+      $swimlanesDom.sortable(
+        'option',
+        'disabled',
+        !Meteor.user().isBoardAdmin(),
+      );
    });

    function userIsMember() {
@@ -355,7 +360,7 @@ BlazeComponent.extendComponent({
            end: end || card.endAt,
            allDay:
              Math.abs(end.getTime() - start.getTime()) / 1000 === 24 * 3600,
-            url: FlowRouter.url('card', {
+            url: FlowRouter.path('card', {
              boardId: currentBoard._id,
              slug: currentBoard.slug,
              cardId: card._id,
@@ -15,7 +15,8 @@ setBoardColor(color)
  .is-selected .minicard
    border-left: 3px solid color

-  button[type=submit].primary, input[type=submit].primary
+  button[type=submit].primary, input[type=submit].primary,
+  .sidebar .sidebar-content .sidebar-btn
    background-color: darken(color, 20%)

  &.pop-over .pop-over-list li a:not(.disabled):hover,
@@ -653,7 +654,6 @@ setBoardClear(color1,color2)

  /* Card changes */
  .minicard
-    background: #FFF
    padding: 15px 15px 10px
    box-shadow: 0 3px 8px rgba(0,0,0,.05)

@@ -1,14 +1,17 @@
 template(name="boardHeaderBar")
  h1.header-board-menu
    with currentBoard
-      a(class="{{#if currentUser.isBoardAdmin}}js-edit-board-title{{else}}is-disabled{{/if}}")
-        +viewer
-          = title
+      +viewer
+        = title

  .board-header-btns.left
    unless isMiniScreen
      if currentBoard
        if currentUser
+          with currentBoard
+            a.board-header-btn(class="{{#if currentUser.isBoardAdmin}}js-edit-board-title{{else}}is-disabled{{/if}}" title="{{_ 'edit'}}" value=title)
+              i.fa.fa-pencil-square-o
+
          a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
            title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
            i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
@@ -31,6 +34,12 @@ template(name="boardHeaderBar")
            if $eq watchLevel "muted"
              i.fa.fa-bell-slash
            span {{_ watchLevel}}
+          a.board-header-btn(title="{{_ 'sort-cards'}}" class="{{#if isSortActive }}emphasis{{else}} js-sort-cards {{/if}}")
+            i.fa.fa-sort
+            span {{#if isSortActive }}{{_ 'Sort is on'}}{{else}}{{_ 'sort-cards'}}{{/if}}
+            if isSortActive
+              a.board-header-btn-close.js-sort-reset(title="Remove Sort")
+                i.fa.fa-times-thin

        else
          a.board-header-btn.js-log-in(
@@ -42,6 +51,10 @@ template(name="boardHeaderBar")
    if currentBoard
      if isMiniScreen
        if currentUser
+          with currentBoard
+            a.board-header-btn(class="{{#if currentUser.isBoardAdmin}}js-edit-board-title{{else}}is-disabled{{/if}}" title="{{_ 'edit'}}" value=title)
+              i.fa.fa-pencil-square-o
+
          a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
            title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
            i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
@@ -247,3 +260,19 @@ template(name="boardChangeTitlePopup")
 template(name="boardCreateRulePopup")
  p {{_ 'close-board-pop'}}
  button.js-confirm.negate.full(type="submit") {{_ 'archive'}}
+
+
+template(name="cardsSortPopup")
+  ul.pop-over-list
+    li
+      a.js-sort-due {{_ 'due-date'}}
+      hr
+    li
+      a.js-sort-title {{_ 'title-alphabetically'}}
+      hr
+    li
+      a.js-sort-created-desc {{_ 'created-at-newest-first'}}
+      hr
+    li
+      a.js-sort-created-asc {{_ 'created-at-oldest-first'}}
+
@@ -2,6 +2,7 @@
 const DOWNCLS = 'fa-sort-down';
 const UPCLS = 'fa-sort-up';
 */
+const sortCardsBy = new ReactiveVar('');
 Template.boardMenuPopup.events({
  'click .js-rename-board': Popup.open('boardChangeTitle'),
  'click .js-custom-fields'() {
@@ -110,6 +111,7 @@ BlazeComponent.extendComponent({
        'click .js-open-filter-view'() {
          Sidebar.setView('filter');
        },
+        'click .js-sort-cards': Popup.open('cardsSort'),
        /*
        'click .js-open-sort-view'(evt) {
          const target = evt.target;
@@ -127,6 +129,9 @@ BlazeComponent.extendComponent({
          Sidebar.setView();
          Filter.reset();
        },
+        'click .js-sort-reset'() {
+          Session.set('sortBy', '');
+        },
        'click .js-open-search-view'() {
          Sidebar.setView('search');
        },
@@ -160,6 +165,9 @@ Template.boardHeaderBar.helpers({
  boardView() {
    return Utils.boardView();
  },
+  isSortActive() {
+    return Session.get('sortBy') ? true : false;
+  },
 });

 Template.boardChangeViewPopup.events({
@@ -368,3 +376,44 @@ BlazeComponent.extendComponent({
  },
 }).register('listsortPopup');
 */
+
+BlazeComponent.extendComponent({
+  events() {
+    return [
+      {
+        'click .js-sort-due'() {
+          const sortBy = {
+            dueAt: 1,
+          };
+          Session.set('sortBy', sortBy);
+          sortCardsBy.set(TAPi18n.__('due-date'));
+          Popup.close();
+        },
+        'click .js-sort-title'() {
+          const sortBy = {
+            title: 1,
+          };
+          Session.set('sortBy', sortBy);
+          sortCardsBy.set(TAPi18n.__('title'));
+          Popup.close();
+        },
+        'click .js-sort-created-asc'() {
+          const sortBy = {
+            createdAt: 1,
+          };
+          Session.set('sortBy', sortBy);
+          sortCardsBy.set(TAPi18n.__('date-created-newest-first'));
+          Popup.close();
+        },
+        'click .js-sort-created-desc'() {
+          const sortBy = {
+            createdAt: -1,
+          };
+          Session.set('sortBy', sortBy);
+          sortCardsBy.set(TAPi18n.__('date-created-oldest-first'));
+          Popup.close();
+        },
+      },
+    ];
+  },
+}).register('cardsSortPopup');
@@ -60,10 +60,10 @@ template(name="boardList")

 template(name="boardListHeaderBar")
  h1 {{_ title }}
-  .board-header-btns.right
-    a.board-header-btn.js-open-archived-board
-      i.fa.fa-archive
-      span {{_ 'archives'}}
-    a.board-header-btn(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}")
-      i.fa.fa-clone
-      span {{_ 'templates'}}
+  //.board-header-btns.right
+  //  a.board-header-btn.js-open-archived-board
+  //    i.fa.fa-archive
+  //    span {{_ 'archives'}}
+  //  a.board-header-btn(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}")
+  //    i.fa.fa-clone
+  //    span {{_ 'templates'}}
@@ -124,9 +124,13 @@ BlazeComponent.extendComponent({
        },
        'click .js-clone-board'(evt) {
          Meteor.call(
-            'cloneBoard',
+            'copyBoard',
            this.currentData()._id,
-            Session.get('fromBoard'),
+            {
+              sort: Boards.find({ archived: false }).count(),
+              type: 'board',
+              title: Boards.findOne(this.currentData()._id).title,
+            },
            (err, res) => {
              if (err) {
                this.setError(err.error);
@@ -46,9 +46,10 @@ template(name="attachmentsGalery")
                        | {{_ 'remove-cover'}}
                      else
                        | {{_ 'add-cover'}}
-                  a.js-confirm-delete
-                    i.fa.fa-close
-                    | {{_ 'delete'}}
+                  if currentUser.isBoardAdmin
+                    a.js-confirm-delete
+                      i.fa.fa-close
+                      | {{_ 'delete'}}

    if currentUser.isBoardMember
      unless currentUser.isCommentOnly
@@ -45,6 +45,12 @@ Template.attachmentsGalery.events({
  },
 });

+Template.attachmentsGalery.helpers({
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+});
+
 Template.previewAttachedImagePopup.events({
  'click .js-large-image-clicked'() {
    Popup.close();
@@ -52,6 +52,14 @@ template(name="cardCustomField-number")
        if value
            = value

+template(name="cardCustomField-checkbox")
+  .js-checklist-item.checklist-item(class="{{#if data.value }}is-checked{{/if}}")
+    if canModifyCard
+      .check-box-container
+        .check-box.materialCheckBox(class="{{#if data.value }}is-checked{{/if}}")
+    else
+      .materialCheckBox(class="{{#if data.value }}is-checked{{/if}}")
+
 template(name="cardCustomField-currency")
    if canModifyCard
        +inlinedForm(classNames="js-card-customfield-currency")
@@ -80,6 +80,25 @@ CardCustomField.register('cardCustomField');
  }
 }.register('cardCustomField-number'));

+// cardCustomField-checkbox
+(class extends CardCustomField {
+  onCreated() {
+    super.onCreated();
+  }
+
+  toggleItem() {
+    this.card.setCustomField(this.customFieldId, !this.data().value);
+  }
+
+  events() {
+    return [
+      {
+        'click .js-checklist-item .check-box-container': this.toggleItem,
+      },
+    ];
+  }
+}.register('cardCustomField-checkbox'));
+
 // cardCustomField-currency
 (class extends CardCustomField {
  onCreated() {
@@ -102,7 +121,8 @@ CardCustomField.register('cardCustomField');
      {
        'submit .js-card-customfield-currency'(event) {
          event.preventDefault();
-          const value = Number(this.find('input').value, 10);
+          // To allow input separated by comma, the comma is replaced by a period.
+          const value = Number(this.find('input').value.replace(/,/i, '.'), 10);
          this.card.setCustomField(this.customFieldId, value);
        },
      },
@@ -8,3 +8,7 @@ template(name="dateBadge")
      time(datetime="{{showISODate}}")
        | {{showDate}}

+template(name="dateCustomField")
+  a(title="{{showTitle}}" class="{{classes}}")
+    time(datetime="{{showISODate}}")
+      | {{showDate}}
@@ -1,3 +1,11 @@
+// Helper function to replace HH with H for 24 hours format, because H allows also single-digit hours
+function adjustedTimeFormat() {
+  return moment
+    .localeData()
+    .longDateFormat('LT')
+    .replace(/HH/i, 'H');
+}
+
 // Edit received, start, due & end dates
 BlazeComponent.extendComponent({
  template() {
@@ -59,7 +67,11 @@ BlazeComponent.extendComponent({
        },
        'keyup .js-time-field'() {
          // parse for localized time format in strict mode
-          const dateMoment = moment(this.find('#time').value, 'LT', true);
+          const dateMoment = moment(
+            this.find('#time').value,
+            adjustedTimeFormat(),
+            true,
+          );
          if (dateMoment.isValid()) {
            this.error.set('');
          }
@@ -71,16 +83,30 @@ BlazeComponent.extendComponent({
          const time =
            evt.target.time.value ||
            moment(new Date().setHours(12, 0, 0)).format('LT');
-
+          const newTime = moment(time, adjustedTimeFormat(), true);
+          const newDate = moment(evt.target.date.value, 'L', true);
          const dateString = `${evt.target.date.value} ${time}`;
-          const newDate = moment(dateString, 'L LT', true);
-          if (newDate.isValid()) {
-            this._storeDate(newDate.toDate());
-            Popup.close();
-          } else {
+          const newCompleteDate = moment(
+            dateString,
+            'L ' + adjustedTimeFormat(),
+            true,
+          );
+          if (!newTime.isValid()) {
+            this.error.set('invalid-time');
+            evt.target.time.focus();
+          }
+          if (!newDate.isValid()) {
            this.error.set('invalid-date');
            evt.target.date.focus();
          }
+          if (newCompleteDate.isValid()) {
+            this._storeDate(newCompleteDate.toDate());
+            Popup.close();
+          } else {
+            if (!this.error) {
+              this.error.set('invalid');
+            }
+          }
        },
        'click .js-delete-date'(evt) {
          evt.preventDefault();
@@ -363,6 +389,33 @@ class CardEndDate extends CardDate {
 }
 CardEndDate.register('cardEndDate');

+class CardCustomFieldDate extends CardDate {
+  template() {
+    return 'dateCustomField';
+  }
+
+  onCreated() {
+    super.onCreated();
+    const self = this;
+    self.autorun(() => {
+      self.date.set(moment(self.data().value));
+    });
+  }
+
+  classes() {
+    return 'customfield-date';
+  }
+
+  showTitle() {
+    return '';
+  }
+
+  events() {
+    return [];
+  }
+}
+CardCustomFieldDate.register('cardCustomFieldDate');
+
 (class extends CardReceivedDate {
  showDate() {
    return this.date.get().format('l');
@@ -387,6 +440,12 @@ CardEndDate.register('cardEndDate');
  }
 }.register('minicardEndDate'));

+(class extends CardCustomFieldDate {
+  showDate() {
+    return this.date.get().format('l');
+  }
+}.register('minicardCustomFieldDate'));
+
 class VoteEndDate extends CardDate {
  onCreated() {
    super.onCreated();
@@ -2,11 +2,11 @@
  display: block
  border-radius: 4px
  padding: 1px 3px
-  
+
  background-color: #dbdbdb
  &:hover, &.is-active
    background-color: #b3b3b3
-  
+
  &.current, &.almost-due, &.due, &.long-overdue
    color: #fff

@@ -14,17 +14,17 @@
    background-color: #5ba639
    &:hover, &.is-active
      background-color: darken(#5ba639, 10)
-  
+
  &.almost-due
    background-color: #edc909
    &:hover, &.is-active
      background-color: darken(#edc909, 10)
-  
+
  &.due
    background-color: #fa3f00
    &:hover, &.is-active
      background-color: darken(#fa3f00, 10)
-  
+
  &.long-overdue
    background-color: #fd5d47
    &:hover, &.is-active
@@ -57,3 +57,7 @@
      -webkit-font-smoothing: antialiased
      margin-right: 0.3em

+.customfield-date
+  display: block
+  border-radius: 4px
+  padding: 1px 3px
@@ -3,5 +3,5 @@ template(name="descriptionForm")
  .new-description.js-new-description(
    class="{{#if descriptionFormIsOpen}}is-open{{/if}}")
    form.js-new-description-form
-      +editor(class="js-new-description-input" data-meteor-emoji-large="true" autofocus="autofocus")
+      +editor(class="js-new-description-input" autofocus="autofocus")
        | {{getUnsavedValue 'cardDescription' _id getDescription}}
@@ -8,11 +8,10 @@ template(name="cardDetails")
          a.fa.fa-times-thin.close-card-details.js-close-card-details
          if currentUser.isBoardMember
            a.fa.fa-navicon.card-details-menu.js-open-card-details-menu
-            input.inline-input(type="text" id="cardURL_copy" value="{{ absoluteUrl }}")
+            input.inline-input(type="text" id="cardURL_copy" value="{{ originRelativeUrl }}")
            a.fa.fa-link.card-copy-button.js-copy-link(
              class="fa-link"
              title="{{_ 'copy-card-link-to-clipboard'}}"
-              value="{{ absoluteUrl }}"
            )
        if isMiniScreen
          a.fa.fa-times-thin.close-card-details-mobile-web.js-close-card-details
@@ -354,10 +353,11 @@ template(name="cardDetailsActionsPopup")
          a.js-start-voting
            i.fa.fa-thumbs-up
            | {{_ 'card-edit-voting'}}
-        li
-          a.js-custom-fields
-            i.fa.fa-list-alt
-            | {{_ 'card-edit-custom-fields'}}
+        if currentUser.isBoardAdmin
+          li
+            a.js-custom-fields
+              i.fa.fa-list-alt
+              | {{_ 'card-edit-custom-fields'}}
        //li: a.js-received-date {{_ 'editCardReceivedDatePopup-title'}}
        //li: a.js-start-date {{_ 'editCardStartDatePopup-title'}}
        //li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
@@ -382,10 +382,11 @@ template(name="cardDetailsActionsPopup")
          | {{_ 'moveCardToBottom-title'}}
      hr
    ul.pop-over-list
-      li
-        a.js-move-card
-          i.fa.fa-arrow-right
-          | {{_ 'moveCardPopup-title'}}
+      if currentUser.isBoardAdmin
+        li
+          a.js-move-card
+            i.fa.fa-arrow-right
+            | {{_ 'moveCardPopup-title'}}
      unless currentUser.isWorker
        li
          a.js-copy-card
@@ -531,7 +532,7 @@ template(name="cardMorePopup")
      span {{_ 'link-card'}}
      = ' '
      i.fa.colorful(class="{{#if board.isPublic}}fa-globe{{else}}fa-lock{{/if}}")
-      input.inline-input(type="text" id="cardURL" readonly value="{{ absoluteUrl }}" autofocus="autofocus")
+      input.inline-input(type="text" id="cardURL" readonly value="{{ originRelativeUrl }}" autofocus="autofocus")
      button.js-copy-card-link-to-clipboard(class="btn" id="clipboard") {{_ 'copy-card-link-to-clipboard'}}
    span.clearfix
    br
@@ -562,7 +563,8 @@ template(name="cardMorePopup")
    br
    | {{_ 'added'}}
    span.date(title=card.createdAt) {{ moment createdAt 'LLL' }}
-    a.js-delete(title="{{_ 'card-delete-notice'}}") {{_ 'delete'}}
+    if currentUser.isBoardAdmin
+      a.js-delete(title="{{_ 'card-delete-notice'}}") {{_ 'delete'}}

 template(name="setCardColorPopup")
  form.edit-label
@@ -609,7 +611,8 @@ template(name="cardStartVotingPopup")

    button.primary.js-submit {{_ 'save'}}
    if getVoteQuestion
-      button.js-remove-vote.negate.wide.right {{_ 'delete'}}
+      if currentUser.isBoardAdmin
+        button.js-remove-vote.negate.wide.right {{_ 'delete'}}

 template(name="positiveVoteMembersPopup")
  ul.pop-over-list.js-card-member-list
@@ -114,7 +114,7 @@ BlazeComponent.extendComponent({
    if (card) {
      const board = Boards.findOne(card.boardId);
      if (board) {
-        result = FlowRouter.url('card', {
+        result = FlowRouter.path('card', {
          boardId: card.boardId,
          slug: board.slug,
          cardId: card._id,
@@ -291,6 +291,8 @@ BlazeComponent.extendComponent({
        },
        'click .js-copy-link'() {
          StringToCopyElement = document.getElementById('cardURL_copy');
+          StringToCopyElement.value =
+            window.location.origin + window.location.pathname;
          StringToCopyElement.select();
          if (document.execCommand('copy')) {
            StringToCopyElement.blur();
@@ -567,6 +569,10 @@ Template.cardDetailsActionsPopup.helpers({
    return this.findWatcher(Meteor.userId());
  },

+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+
  canModifyCard() {
    return (
      Meteor.user() &&
@@ -102,9 +102,9 @@ template(name='checklistItemDetail')
    if canModifyCard
      .check-box-container
        .check-box.materialCheckBox(class="{{#if item.isFinished }}is-checked{{/if}}")
+      if isMiniScreenOrShowDesktopDragHandles
+        span.fa.checklistitem-handle(class="fa-arrows" title="{{_ 'dragChecklistItem'}}")
      .item-title.js-open-inlined-form.is-editable(class="{{#if item.isFinished }}is-checked{{/if}}")
-        if isMiniScreenOrShowDesktopDragHandles
-          span.fa.checklistitem-handle(class="fa-arrows" title="{{_ 'dragChecklistItem'}}")
        +viewer
          = item.title
    else
@@ -6,7 +6,7 @@ function initSorting(items) {
    helper: 'clone',
    items: '.js-checklist-item:not(.placeholder)',
    connectWith: '.js-checklist-items',
-    appendTo: '.board-canvas',
+    appendTo: 'parent',
    distance: 7,
    placeholder: 'checklist-item placeholder',
    scroll: false,
@@ -55,15 +55,10 @@ BlazeComponent.extendComponent({
    self.autorun(() => {
      const $itemsDom = $(self.itemsDom);
      if ($itemsDom.data('uiSortable') || $itemsDom.data('sortable')) {
-        $(self.itemsDom).sortable(
-          'option',
-          'disabled',
-          !userIsMember(),
-        );
+        $(self.itemsDom).sortable('option', 'disabled', !userIsMember());
        if (Utils.isMiniScreenOrShowDesktopDragHandles()) {
          $(self.itemsDom).sortable({
            handle: 'span.fa.checklistitem-handle',
-            appendTo: 'parent',
          });
        }
      }
@@ -116,7 +111,7 @@ BlazeComponent.extendComponent({
        title,
        checklistId: checklist._id,
        cardId: checklist.cardId,
-        sort: checklist.itemCount(),
+        sort: Utils.calculateIndexData(checklist.lastItem()).base,
      });
    }
    // We keep the form opened, empty it.
@@ -228,6 +223,14 @@ Template.checklists.helpers({
  },
 });

+Template.addChecklistItemForm.onRendered(() => {
+  autosize($('textarea.js-add-checklist-item'));
+});
+
+Template.editChecklistItemForm.onRendered(() => {
+  autosize($('textarea.js-edit-checklist-item'));
+});
+
 Template.checklistDeleteDialog.onCreated(() => {
  const $cardDetails = this.$('.card-details');
  this.scrollState = {
@@ -44,8 +44,8 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item

  span.fa.checklist-handle
    padding-right: 20px
-    padding-top: 6px
-    float: right
+    padding-top: 3px
+    float: left


 .js-confirm-checklist-delete
@@ -134,7 +134,7 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
    background-color: darken(white, 8%)

  .check-box-container
-    padding-right: 1px;
+    padding-right: 10px;

  .check-box
    margin: 0.1em 0 0 0;
@@ -144,7 +144,6 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item

  .item-title
    flex: 1
-    margin-left: 10px;
    &.is-checked
      color: #8c8c8c
      font-style: italic
@@ -157,7 +156,8 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
        max-width: 420px

  span.fa.checklistitem-handle
-    float: right
+    padding-top: 2px
+    padding-right: 10px;

 .js-delete-checklist-item
  margin: 0 0 0.5em 1.33em
@@ -77,6 +77,11 @@ template(name="minicard")
                if $eq definition.type "currency"
                  +viewer
                    = formattedCurrencyCustomFieldValue(definition)
+                else if $eq definition.type "date"
+                  .date
+                    +minicardCustomFieldDate
+                else if $eq definition.type "checkbox"
+                  .materialCheckBox(class="{{#if value }}is-checked{{/if}}")
                else
                  +viewer
                    = trueValue
@@ -165,13 +165,15 @@
  .minicard-members,
  .minicard-assignees
    float: right
-    margin: 2px -8px 2px 0
+    margin-left: 5px
+    margin-bottom: 4px

    .member
      float: right
      border-radius: 50%
      height: 28px
      width: @height
+      margin-bottom: 4px

    .assignee
      float: right
@@ -180,7 +182,10 @@
      width: @height

    + .badges
-      margin-top: 10px
+      margin-top: 5px
+
+  .minicard-assignees
+    border-bottom: 1px solid red

  .minicard-members:empty,
  .minicard-assignees:empty
@@ -0,0 +1,44 @@
+template(name="resultCard")
+  .result-card-wrapper
+    a.minicard-wrapper.card-title(href=originRelativeUrl)
+      +minicard(this)
+      //= card.title
+    ul.result-card-context-list
+      li.result-card-context(title="{{_ 'board'}}")
+        .result-card-block-wrapper
+          if boardId
+            +viewer
+              = getBoard.title
+          else
+            .broken-cards-null
+              | NULL
+        if getBoard.archived
+          i.fa.fa-archive
+      li.result-card-context.result-card-context-separator
+        = ' '
+        | {{_ 'context-separator'}}
+        = ' '
+      li.result-card-context(title="{{_ 'swimlane'}}")
+        .result-card-block-wrapper
+          if swimlaneId
+            +viewer
+              = getSwimlane.title
+          else
+            .broken-cards-null
+              | NULL
+        if getSwimlane.archived
+          i.fa.fa-archive
+      li.result-card-context.result-card-context-separator
+        = ' '
+        | {{_ 'context-separator'}}
+        = ' '
+      li.result-card-context(title="{{_ 'list'}}")
+        .result-card-block-wrapper
+          if listId
+            +viewer
+              = getList.title
+          else
+            .broken-cards-null
+              | NULL
+        if getList.archived
+          i.fa.fa-archive
@@ -0,0 +1,11 @@
+Template.resultCard.helpers({
+  userId() {
+    return Meteor.userId();
+  },
+});
+
+BlazeComponent.extendComponent({
+  events() {
+    return [{}];
+  },
+}).register('resultCard');
@@ -0,0 +1,24 @@
+.result-card-list-wrapper
+  margin: 1rem
+  border-radius: 5px
+  padding: 1.5rem
+  padding-top: 0.75rem
+  display: inline-block
+  min-width: 250px
+  max-width: 350px
+
+.result-card-wrapper
+  margin-top: 0
+  margin-bottom: 10px
+
+.result-card-context
+  display: inline-block
+
+.result-card-context-separator
+  font-weight: bold
+
+.result-card-context-list
+  margin-bottom: 0.7rem
+
+.result-card-block-wrapper
+  display: inline-block
@@ -2,10 +2,10 @@ template(name="subtasks")
  h3.card-details-item-title
    i.fa.fa-sitemap
    | {{_ 'subtasks'}}
-  if toggleDeleteDialog.get
-    .board-overlay#card-details-overlay
-    +subtaskDeleteDialog(subtask = subtaskToDelete)
-
+  if currentUser.isBoardAdmin
+    if toggleDeleteDialog.get
+      .board-overlay#card-details-overlay
+      +subtaskDeleteDialog(subtask = subtaskToDelete)

  .card-subtasks-items
    each subtask in currentCard.subtasks
@@ -28,7 +28,8 @@ template(name="subtaskDetail")
        span
        a.js-view-subtask(title="{{ subtask.title }}") {{_ "view-it"}}
        if canModifyCard
-          a.js-delete-subtask.toggle-delete-subtask-dialog {{_ "delete"}}...
+          if currentUser.isBoardAdmin
+            a.js-delete-subtask.toggle-delete-subtask-dialog {{_ "delete"}}...

        if canModifyCard
          h2.title.js-open-inlined-form.is-editable
@@ -68,7 +69,8 @@ template(name="editSubtaskItemForm")
    a.fa.fa-times-thin.js-close-inlined-form
    span(title=createdAt) {{ moment createdAt }}
    if canModifyCard
-      a.js-delete-subtask-item {{_ "delete"}}...
+      if currentUser.isBoardAdmin
+        a.js-delete-subtask-item {{_ "delete"}}...

 template(name="subtasksItems")
  .subtasks-items.js-subtasks-items
@@ -242,11 +242,11 @@ textarea
    margin: 3px 4px

 // Material Design checkboxes
-[type="checkbox"]:not(:checked),
-[type="checkbox"]:checked
-  position: absolute
-  left: -9999px
-  visibility: hidden
+  [type="checkbox"]:not(:checked),
+  [type="checkbox"]:checked
+    position: absolute
+    left: -9999px
+    visibility: hidden

 .materialCheckBox
  position: relative
@@ -13,38 +13,43 @@ template(name="import")
 template(name="importTextarea")
  form
    p: label(for='import-textarea') {{_ instruction}} {{_ 'import-board-instruction-about-errors'}}
-    textarea.js-import-json(placeholder="{{_ importPlaceHolder}}" autofocus)
+    textarea.js-import-json(id='import-textarea' placeholder="{{_ importPlaceHolder}}" autofocus)
      | {{jsonText}}
    input.primary.wide(type="submit" value="{{_ 'import'}}")

 template(name="importMapMembers")
  h2 {{_ 'import-map-members'}}
-  .map-members
-    p {{_ 'import-members-map'}}
-    .mapping-list
-      each members
-        a.mapping-item.js-select-member(class="{{#if wekanId}}filled{{/if}}")
-          .profile-source
-            .full-name= fullName
-            .username
-              | ({{username}})
-          .wekan
-            if wekanId
-              +userAvatar(userId=wekanId)
-            else
-              a.member.add-member
-                i.fa.fa-plus
-      //-
-        Due to the way the flewbox layout is working, we need to set some
-        invisible items so that the last row items have a consistent width.
-        See http://jsfiddle.net/Ln4h3c4n/ for an minimal example of the issue.
-      .mapping-item.ghost-item
-      .mapping-item.ghost-item
-      .mapping-item.ghost-item
-      .mapping-item.ghost-item
-      .mapping-item.ghost-item
-    form
-      input.primary.wide(type="submit" value="{{_ 'done'}}")
+  if usersLoaded.get
+    .map-members
+      p {{_ 'import-members-map'}}
+      p.import-members-map-note
+        | {{_ 'import-members-map-note' }}
+      .mapping-list
+        each members
+          a.mapping-item.js-select-member(class="{{#if wekanId}}filled{{/if}}")
+            .profile-source
+              .full-name= fullName
+              .username
+                | ({{username}})
+            .wekan
+              if wekanId
+                +userAvatar(userId=wekanId)
+              else
+                a.member.add-member
+                  i.fa.fa-plus
+        //-
+          Due to the way the flewbox layout is working, we need to set some
+          invisible items so that the last row items have a consistent width.
+          See http://jsfiddle.net/Ln4h3c4n/ for an minimal example of the issue.
+        .mapping-item.ghost-item
+        .mapping-item.ghost-item
+        .mapping-item.ghost-item
+        .mapping-item.ghost-item
+        .mapping-item.ghost-item
+      form
+        input.primary.wide(type="submit" value="{{_ 'done'}}")
+  else
+    +spinner

 template(name="importMapMembersAddPopup")
  .select-member
@@ -150,14 +150,42 @@ BlazeComponent.extendComponent({

 BlazeComponent.extendComponent({
  onCreated() {
+    this.usersLoaded = new ReactiveVar(false);
+
    this.autorun(() => {
-      this.parentComponent()
-        .membersToMap.get()
-        .forEach(({ wekanId }) => {
-          if (wekanId) {
-            this.subscribe('user-miniprofile', wekanId);
+      const handle = this.subscribe(
+        'user-miniprofile',
+        this.members().map(member => {
+          return member.username;
+        }),
+      );
+      Tracker.nonreactive(() => {
+        Tracker.autorun(() => {
+          if (
+            handle.ready() &&
+            !this.usersLoaded.get() &&
+            this.members().length
+          ) {
+            this._refreshMembers(
+              this.members().map(member => {
+                if (!member.wekanId) {
+                  let user = Users.findOne({ username: member.username });
+                  if (!user) {
+                    user = Users.findOne({ importUsernames: member.username });
+                  }
+                  if (user) {
+                    // eslint-disable-next-line no-console
+                    // console.log('found username:', user.username);
+                    member.wekanId = user._id;
+                  }
+                }
+                return member;
+              }),
+            );
          }
+          this.usersLoaded.set(handle.ready());
        });
+      });
    });
  },

@@ -47,3 +47,7 @@

 a.show-mapping
  text-decoration underline
+
+.import-members-map-note
+  font-size: 90%
+  font-weight: bold
@@ -180,7 +180,8 @@
    border-bottom: 1px solid darken(white, 20%)

  .list
-    display: block
+    display: contents
+    flex-basis: auto
    width: 100%
    border-left: 0px
    &:first-child
@@ -5,7 +5,7 @@ template(name="listBody")
        +inlinedForm(autoclose=false position="top")
          +addCardForm(listId=_id position="top")
      each (cardsWithLimit (idOrNull ../../_id))
-        a.minicard-wrapper.js-minicard(href=absoluteUrl
+        a.minicard-wrapper.js-minicard(href=originRelativeUrl
          class="{{#if cardIsSelected}}is-selected{{/if}}"
          class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}")
          if MultiSelection.isActive
@@ -168,13 +168,16 @@ BlazeComponent.extendComponent({

  cardsWithLimit(swimlaneId) {
    const limit = this.cardlimit.get();
+    const defaultSort = { sort: 1 };
+    const sortBy = Session.get('sortBy') ? Session.get('sortBy') : defaultSort;
    const selector = {
      listId: this.currentData()._id,
      archived: false,
    };
    if (swimlaneId) selector.swimlaneId = swimlaneId;
    return Cards.find(Filter.mongoSelector(selector), {
-      sort: ['sort'],
+      // sort: ['sort'],
+      sort: sortBy,
      limit,
    });
  },
@@ -239,7 +242,7 @@ BlazeComponent.extendComponent({
        .customFields()
        .fetch(),
      function(field) {
-        if (field.automaticallyOnCard)
+        if (field.automaticallyOnCard || field.alwaysOnCard)
          arr.push({ _id: field._id, value: null });
      },
    );
@@ -675,12 +678,18 @@ BlazeComponent.extendComponent({
            element.type = 'swimlane';
            _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();
+            Meteor.call(
+              'copyBoard',
+              element.linkedId,
+              {
+                sort: Boards.find({ archived: false }).count(),
+                type: 'board',
+                title: element.title,
+              },
+              (err, data) => {
+                _id = data;
+              },
+            );
          }
          Popup.close();
        },
@@ -1,7 +1,7 @@
 template(name="listHeader")
  .list-header.js-list-header(
    class="{{#if limitToShowCardsCount}}list-header-card-count{{/if}}"
-    class="{{#if colorClass}}list-header-{{colorClass}}{{/if}}")
+    class=colorClass)
    +inlinedForm
      +editListTitleForm
    else
@@ -15,7 +15,7 @@ template(name="listHeader")
          = title
        if wipLimit.enabled
         |&nbsp;(
-         span(class="{{#if reachedWipLimit}}highlight{{/if}}") {{cards.count}}
+         span(class="{{#if exceededWipLimit}}highlight{{/if}}") {{cards.count}}
         |/#{wipLimit.value})

        if showCardsCountForList cards.count
@@ -43,8 +43,9 @@ template(name="listHeader")
            if canSeeAddCard
              a.js-add-card.fa.fa-plus.list-header-plus-icon
            a.fa.fa-navicon.js-open-list-menu
-          if showDesktopDragHandles
-            a.list-header-handle.handle.fa.fa-arrows.js-list-handle
+          if currentUser.isBoardAdmin
+            if showDesktopDragHandles
+              a.list-header-handle.handle.fa.fa-arrows.js-list-handle

 template(name="editListTitleForm")
  .list-composer
@@ -115,8 +116,9 @@ template(name="listMorePopup")
      input.inline-input(type="text" readonly value="{{ rootUrl }}")
    | {{_ 'added'}}
    span.date(title=list.createdAt) {{ moment createdAt 'LLL' }}
-    unless currentUser.isWorker
-      a.js-delete {{_ 'delete'}}
+    //unless currentUser.isWorker
+    //  if currentUser.isBoardAdmin
+    //    a.js-delete {{_ 'delete'}}

 template(name="listDeletePopup")
  p {{_ "list-delete-pop"}}
@@ -151,7 +153,7 @@ template(name="setListColorPopup")
  form.edit-label
    .palette-colors: each colors
      // note: we use the swimlane palette to have more than just the border
-      span.card-label.palette-color.js-palette-color(class="swimlane-{{color}}")
+      span.card-label.palette-color.js-palette-color(class="card-details-{{color}}")
        if(isSelected color)
          i.fa.fa-check
    button.primary.confirm.js-submit {{_ 'save'}}
@@ -72,9 +72,17 @@ BlazeComponent.extendComponent({
    );
  },

+  exceededWipLimit() {
+    const list = Template.currentData();
+    return (
+      list.getWipLimit('enabled') &&
+      list.getWipLimit('value') < list.cards().count()
+    );
+  },
+
  showCardsCountForList(count) {
    const limit = this.limitToShowCardsCount();
-    return limit > 0 && count > limit;
+    return limit >= 0 && count >= limit;
  },

  events() {
@@ -104,6 +112,10 @@ BlazeComponent.extendComponent({
 }).register('listHeader');

 Template.listHeader.helpers({
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+
  showDesktopDragHandles() {
    currentUser = Meteor.user();
    if (currentUser) {
@@ -117,6 +129,10 @@ Template.listHeader.helpers({
 });

 Template.listActionPopup.helpers({
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+
  isWipLimitEnabled() {
    return Template.currentData().getWipLimit('enabled');
  },
@@ -254,6 +270,12 @@ Template.listMorePopup.events({
  }),
 });

+Template.listHeader.helpers({
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+});
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.currentList = this.currentData();
@@ -265,7 +287,11 @@ BlazeComponent.extendComponent({
  },

  isSelected(color) {
-    return this.currentColor.get() === color;
+    if (this.currentColor.get() === null) {
+      return color === 'white';
+    } else {
+      return this.currentColor.get() === color;
+    }
  },

  events() {
@@ -0,0 +1,17 @@
+template(name="brokenCardsHeaderBar")
+  h1
+    | {{_ 'broken-cards'}}
+
+template(name="brokenCards")
+  if currentUser
+    if searching.get
+      +spinner
+    else if hasResults.get
+      .global-search-results-list-wrapper
+        if hasQueryErrors.get
+          div
+            each msg in errorMessages
+              span.global-search-error-messages
+                = msg
+        else
+          +resultsPaged(this)
@@ -0,0 +1,18 @@
+import { CardSearchPagedComponent } from '../../lib/cardSearch';
+
+BlazeComponent.extendComponent({}).register('brokenCardsHeaderBar');
+
+Template.brokenCards.helpers({
+  userId() {
+    return Meteor.userId();
+  },
+});
+
+class BrokenCardsComponent extends CardSearchPagedComponent {
+  onCreated() {
+    super.onCreated();
+
+    Meteor.subscribe('brokenCards', this.sessionId);
+  }
+}
+BrokenCardsComponent.register('brokenCards');
@@ -0,0 +1,31 @@
+.broken-cards-card-wrapper
+  margin-top: 0
+  margin-bottom: 10px
+  border-width: 3px !important
+  border-color: grey !important
+  border-style: solid
+  border-radius: 5px
+  padding: 1.5rem
+  background-color: white
+
+.broken-cards-wrapper
+  max-width: 500px
+  margin-right: auto
+  margin-left: auto
+
+.broken-cards-card-title
+  font-weight: bold
+  //padding: 10px
+
+.broken-cards-context
+  display: inline-block
+
+.broken-cards-context-separator
+  font-weight: bold
+
+.broken-cards-context-list
+  //margin-bottom: 0.7rem
+
+.broken-cards-null
+  color: darkred
+  font-style: italic
@@ -0,0 +1,57 @@
+template(name="dueCardsHeaderBar")
+  if currentUser
+    h1
+      i.fa.fa-calendar
+      | {{_ 'dueCards-title'}}
+
+    .board-header-btns.left
+      a.board-header-btn.js-due-cards-view-change(title="{{_ 'dueCardsViewChange-title'}}")
+        i.fa.fa-caret-down
+        if $eq dueCardsView 'me'
+          i.fa.fa-user
+          | {{_ 'dueCardsViewChange-choice-me'}}
+        if $eq dueCardsView 'all'
+          i.fa.fa-users
+          | {{_ 'dueCardsViewChange-choice-all'}}
+
+template(name="dueCardsModalTitle")
+  if currentUser
+    h2
+      i.fa.fa-keyboard-o
+      | {{_ 'dueCards-title'}}
+
+template(name="dueCards")
+  if currentUser
+    if searching.get
+      +spinner
+    else if hasResults.get
+      .global-search-results-list-wrapper
+        if hasQueryErrors.get
+          div
+            each msg in errorMessages
+              span.global-search-error-messages
+                = msg
+        else
+          +resultsPaged(this)
+
+template(name="dueCardsViewChangePopup")
+  if currentUser
+    ul.pop-over-list
+      li
+        with "dueCardsViewChange-choice-me"
+          a.js-due-cards-view-me
+            i.fa.fa-user.colorful
+            | {{_ 'dueCardsViewChange-choice-me'}}
+            if $eq Utils.dueCardsView "me"
+              i.fa.fa-check
+      hr
+      li
+        with "dueCardsViewChange-choice-all"
+          a.js-due-cards-view-all
+            i.fa.fa-users.colorful
+            | {{_ 'dueCardsViewChange-choice-all'}}
+            span.sub-name
+              +viewer
+                | {{_ 'dueCardsViewChange-choice-all-description' }}
+            if $eq Utils.dueCardsView "all"
+              i.fa.fa-check
@@ -0,0 +1,111 @@
+import { CardSearchPagedComponent } from '../../lib/cardSearch';
+import {
+  OPERATOR_HAS,
+  OPERATOR_SORT,
+  OPERATOR_USER,
+  ORDER_DESCENDING,
+  PREDICATE_DUE_AT,
+} from '../../../config/search-const';
+import { QueryParams } from '../../../config/query-classes';
+
+// const subManager = new SubsManager();
+
+BlazeComponent.extendComponent({
+  dueCardsView() {
+    // eslint-disable-next-line no-console
+    // console.log('sort:', Utils.dueCardsView());
+    return Utils.dueCardsView();
+  },
+
+  events() {
+    return [
+      {
+        'click .js-due-cards-view-change': Popup.open('dueCardsViewChange'),
+      },
+    ];
+  },
+}).register('dueCardsHeaderBar');
+
+Template.dueCards.helpers({
+  userId() {
+    return Meteor.userId();
+  },
+});
+
+BlazeComponent.extendComponent({
+  events() {
+    return [
+      {
+        'click .js-due-cards-view-me'() {
+          Utils.setDueCardsView('me');
+          Popup.close();
+        },
+
+        'click .js-due-cards-view-all'() {
+          Utils.setDueCardsView('all');
+          Popup.close();
+        },
+      },
+    ];
+  },
+}).register('dueCardsViewChangePopup');
+
+class DueCardsComponent extends CardSearchPagedComponent {
+  onCreated() {
+    super.onCreated();
+
+    const queryParams = new QueryParams();
+    queryParams.addPredicate(OPERATOR_HAS, {
+      field: PREDICATE_DUE_AT,
+      exists: true,
+    });
+    // queryParams[OPERATOR_LIMIT] = 5;
+    queryParams.addPredicate(OPERATOR_SORT, {
+      name: PREDICATE_DUE_AT,
+      order: ORDER_DESCENDING,
+    });
+
+    if (Utils.dueCardsView() !== 'all') {
+      queryParams.addPredicate(OPERATOR_USER, Meteor.user().username);
+    }
+
+    this.runGlobalSearch(queryParams.getQueryParams());
+  }
+
+  dueCardsView() {
+    // eslint-disable-next-line no-console
+    //console.log('sort:', Utils.dueCardsView());
+    return Utils.dueCardsView();
+  }
+
+  sortByBoard() {
+    return this.dueCardsView() === 'board';
+  }
+
+  dueCardsList() {
+    const results = this.getResults();
+    console.log('results:', results);
+    const cards = [];
+    if (results) {
+      results.forEach(card => {
+        cards.push(card);
+      });
+    }
+
+    cards.sort((a, b) => {
+      const x = a.dueAt === null ? new Date('2100-12-31') : a.dueAt;
+      const y = b.dueAt === null ? new Date('2100-12-31') : b.dueAt;
+
+      if (x > y) return 1;
+      else if (x < y) return -1;
+
+      return 0;
+    });
+
+    // eslint-disable-next-line no-console
+    console.log('cards:', cards);
+    return cards;
+  }
+}
+
+DueCardsComponent.register('dueCards');
@@ -0,0 +1,4 @@
+.due-cards-dueat-list-wrapper
+  max-width: 500px
+  margin-right: auto
+  margin-left: auto
@@ -275,7 +275,12 @@ function mySafeAttrValue(tag, name, value, cssFilter) {
    if (
      /^thunderlink:/gi.test(value) ||
      /^cbthunderlink:/gi.test(value) ||
-      /^aodroplink:/gi.test(value)
+      /^aodroplink:/gi.test(value) ||
+      /^onenote:/gi.test(value) ||
+      /^file:/gi.test(value) ||
+      /^abasurl:/gi.test(value) ||
+      /^conisio:/gi.test(value) ||
+      /^mailspring:/gi.test(value)
    ) {
      return value;
    } else {
@@ -0,0 +1,86 @@
+template(name="globalSearchHeaderBar")
+  if currentUser
+    h1
+      i.fa.fa-search
+      | {{_ 'globalSearch-title'}}
+
+template(name="globalSearchModalTitle")
+  if currentUser
+    h2
+      i.fa.fa-keyboard-o
+      | {{_ 'globalSearch-title'}}
+
+template(name="resultsPaged")
+  h1
+    = resultsHeading.get
+    a.fa.fa-link(title="{{_ 'link-to-search' }}" href="{{ getSearchHref }}")
+  each card in results.get
+    +resultCard(card)
+  table.global-search-footer
+    tr
+      td.global-search-previous-page
+        if hasPreviousPage.get
+          button.js-previous-page
+            | {{_ 'previous-page' }}
+      td.global-search-next-page(align="right")
+        if hasNextPage.get
+          button.js-next-page
+            | {{_ 'next-page' }}
+
+template(name="globalSearch")
+  if currentUser
+    .wrapper
+      form.global-search-page.js-search-query-form
+        input.global-search-query-input(
+          style="{# if hasResults.get #}display: inline-block;{#/if#}"
+          id="global-search-input"
+          type="text"
+          name="searchQuery"
+          placeholder="{{_ 'search-example'}}"
+          value="{{ query.get }}"
+          autofocus dir="auto"
+        )
+        a.js-new-search.fa.fa-eraser
+      if searching.get
+        +spinner
+      else if hasResults.get
+        .global-search-results-list-wrapper
+          if hasQueryErrors.get
+            ul
+              each msg in errorMessages
+                li.global-search-error-messages
+                  = msg
+          else
+            +resultsPaged(this)
+      else if serverError.get
+        .global-search-page
+          .global-search-help
+            h1 {{_ 'server-error' }}
+            +viewer
+              | {{_ 'server-error-troubleshooting' }}
+      else
+        .global-search-page
+          .global-search-help
+            h2 {{_ 'boards' }}
+            .lists-wrapper
+              each title in myBoardNames.get
+                span.card-label.list-title.js-board-title
+                  = title
+            h2 {{_ 'lists' }}
+            .lists-wrapper
+              each title in myLists.get
+                span.card-label.list-title.js-list-title
+                  = title
+            h2 {{_ 'label-colors' }}
+            .palette-colors: each label in labelColors
+              span.card-label.palette-color.js-label-color(class="card-label-{{label.color}}")
+                = label.name
+            if myLabelNames.get.length
+              h2 {{_ 'label-names' }}
+              .lists-wrapper
+                each name in myLabelNames.get
+                  span.card-label.list-title.js-label-name
+                    = name
+          .global-search-instructions
+            +viewer
+              = searchInstructions
@@ -0,0 +1,264 @@
+import { CardSearchPagedComponent } from '../../lib/cardSearch';
+import Boards from '../../../models/boards';
+import { Query, QueryErrors } from '../../../config/query-classes';
+
+// const subManager = new SubsManager();
+
+BlazeComponent.extendComponent({
+  events() {
+    return [
+      {
+        'click .js-due-cards-view-change': Popup.open('globalSearchViewChange'),
+      },
+    ];
+  },
+}).register('globalSearchHeaderBar');
+
+Template.globalSearch.helpers({
+  userId() {
+    return Meteor.userId();
+  },
+});
+
+class GlobalSearchComponent extends CardSearchPagedComponent {
+  onCreated() {
+    super.onCreated();
+    this.myLists = new ReactiveVar([]);
+    this.myLabelNames = new ReactiveVar([]);
+    this.myBoardNames = new ReactiveVar([]);
+    this.parsingErrors = new QueryErrors();
+    this.queryParams = null;
+
+    Meteor.call('myLists', (err, data) => {
+      if (!err) {
+        this.myLists.set(data);
+      }
+    });
+
+    Meteor.call('myLabelNames', (err, data) => {
+      if (!err) {
+        this.myLabelNames.set(data);
+      }
+    });
+
+    Meteor.call('myBoardNames', (err, data) => {
+      if (!err) {
+        this.myBoardNames.set(data);
+      }
+    });
+  }
+
+  onRendered() {
+    Meteor.subscribe('setting');
+
+    // eslint-disable-next-line no-console
+    //console.log('lang:', TAPi18n.getLanguage());
+
+    if (Session.get('globalQuery')) {
+      this.searchAllBoards(Session.get('globalQuery'));
+    }
+  }
+
+  resetSearch() {
+    super.resetSearch();
+    this.parsingErrors = new QueryErrors();
+  }
+
+  errorMessages() {
+    if (this.parsingErrors.hasErrors()) {
+      return this.parsingErrors.errorMessages();
+    }
+    return this.queryErrorMessages();
+  }
+
+  parsingErrorMessages() {
+    this.parsingErrors.errorMessages();
+  }
+
+  searchAllBoards(queryText) {
+    queryText = queryText.trim();
+    // eslint-disable-next-line no-console
+    //console.log('queryText:', queryText);
+
+    this.query.set(queryText);
+
+    this.resetSearch();
+
+    if (!queryText) {
+      return;
+    }
+
+    this.searching.set(true);
+
+    const query = new Query();
+    query.buildParams(queryText);
+
+    // eslint-disable-next-line no-console
+    // console.log('params:', query.getParams());
+
+    this.queryParams = query.getQueryParams().getParams();
+
+    if (query.hasErrors()) {
+      this.searching.set(false);
+      this.queryErrors = query.errors();
+      this.hasResults.set(true);
+      this.hasQueryErrors.set(true);
+      return;
+    }
+
+    this.runGlobalSearch(query.getQueryParams());
+  }
+
+  searchInstructions() {
+    const tags = {
+      operator_board: TAPi18n.__('operator-board'),
+      operator_list: TAPi18n.__('operator-list'),
+      operator_swimlane: TAPi18n.__('operator-swimlane'),
+      operator_comment: TAPi18n.__('operator-comment'),
+      operator_label: TAPi18n.__('operator-label'),
+      operator_label_abbrev: TAPi18n.__('operator-label-abbrev'),
+      operator_user: TAPi18n.__('operator-user'),
+      operator_user_abbrev: TAPi18n.__('operator-user-abbrev'),
+      operator_member: TAPi18n.__('operator-member'),
+      operator_member_abbrev: TAPi18n.__('operator-member-abbrev'),
+      operator_assignee: TAPi18n.__('operator-assignee'),
+      operator_assignee_abbrev: TAPi18n.__('operator-assignee-abbrev'),
+      operator_due: TAPi18n.__('operator-due'),
+      operator_created: TAPi18n.__('operator-created'),
+      operator_modified: TAPi18n.__('operator-modified'),
+      operator_status: TAPi18n.__('operator-status'),
+      operator_has: TAPi18n.__('operator-has'),
+      operator_sort: TAPi18n.__('operator-sort'),
+      operator_limit: TAPi18n.__('operator-limit'),
+      predicate_overdue: TAPi18n.__('predicate-overdue'),
+      predicate_archived: TAPi18n.__('predicate-archived'),
+      predicate_all: TAPi18n.__('predicate-all'),
+      predicate_ended: TAPi18n.__('predicate-ended'),
+      predicate_week: TAPi18n.__('predicate-week'),
+      predicate_month: TAPi18n.__('predicate-month'),
+      predicate_quarter: TAPi18n.__('predicate-quarter'),
+      predicate_year: TAPi18n.__('predicate-year'),
+      predicate_attachment: TAPi18n.__('predicate-attachment'),
+      predicate_description: TAPi18n.__('predicate-description'),
+      predicate_checklist: TAPi18n.__('predicate-checklist'),
+      predicate_public: TAPi18n.__('predicate-public'),
+      predicate_private: TAPi18n.__('predicate-private'),
+      predicate_due: TAPi18n.__('predicate-due'),
+      predicate_created: TAPi18n.__('predicate-created'),
+      predicate_modified: TAPi18n.__('predicate-modified'),
+      predicate_start: TAPi18n.__('predicate-start'),
+      predicate_end: TAPi18n.__('predicate-end'),
+      predicate_assignee: TAPi18n.__('predicate-assignee'),
+      predicate_member: TAPi18n.__('predicate-member'),
+    };
+
+    let text = '';
+    [
+      ['# ', 'globalSearch-instructions-heading'],
+      ['\n', 'globalSearch-instructions-description'],
+      ['\n\n', 'globalSearch-instructions-operators'],
+      ['\n* ', 'globalSearch-instructions-operator-board'],
+      ['\n* ', 'globalSearch-instructions-operator-list'],
+      ['\n* ', 'globalSearch-instructions-operator-swimlane'],
+      ['\n* ', 'globalSearch-instructions-operator-comment'],
+      ['\n* ', 'globalSearch-instructions-operator-label'],
+      ['\n* ', 'globalSearch-instructions-operator-hash'],
+      ['\n* ', 'globalSearch-instructions-operator-user'],
+      ['\n* ', 'globalSearch-instructions-operator-at'],
+      ['\n* ', 'globalSearch-instructions-operator-member'],
+      ['\n* ', 'globalSearch-instructions-operator-assignee'],
+      ['\n* ', 'globalSearch-instructions-operator-due'],
+      ['\n* ', 'globalSearch-instructions-operator-created'],
+      ['\n* ', 'globalSearch-instructions-operator-modified'],
+      ['\n* ', 'globalSearch-instructions-operator-status'],
+      ['\n    * ', 'globalSearch-instructions-status-archived'],
+      ['\n    * ', 'globalSearch-instructions-status-public'],
+      ['\n    * ', 'globalSearch-instructions-status-private'],
+      ['\n    * ', 'globalSearch-instructions-status-all'],
+      ['\n    * ', 'globalSearch-instructions-status-ended'],
+      ['\n* ', 'globalSearch-instructions-operator-has'],
+      ['\n* ', 'globalSearch-instructions-operator-sort'],
+      ['\n* ', 'globalSearch-instructions-operator-limit'],
+      ['\n## ', 'heading-notes'],
+      ['\n* ', 'globalSearch-instructions-notes-1'],
+      ['\n* ', 'globalSearch-instructions-notes-2'],
+      ['\n* ', 'globalSearch-instructions-notes-3'],
+      ['\n* ', 'globalSearch-instructions-notes-3-2'],
+      ['\n* ', 'globalSearch-instructions-notes-4'],
+      ['\n* ', 'globalSearch-instructions-notes-5'],
+    ].forEach(([prefix, instruction]) => {
+      text += `${prefix}${TAPi18n.__(instruction, tags)}`;
+    });
+
+    return text;
+  }
+
+  labelColors() {
+    return Boards.simpleSchema()._schema['labels.$.color'].allowedValues.map(
+      color => {
+        return { color, name: TAPi18n.__(`color-${color}`) };
+      },
+    );
+  }
+
+  events() {
+    return [
+      {
+        ...super.events()[0],
+        'submit .js-search-query-form'(evt) {
+          evt.preventDefault();
+          this.searchAllBoards(evt.target.searchQuery.value);
+        },
+        'click .js-label-color'(evt) {
+          evt.preventDefault();
+          const input = document.getElementById('global-search-input');
+          this.query.set(
+            `${input.value} ${TAPi18n.__('operator-label')}:"${
+              evt.currentTarget.textContent
+            }"`,
+          );
+          document.getElementById('global-search-input').focus();
+        },
+        'click .js-board-title'(evt) {
+          evt.preventDefault();
+          const input = document.getElementById('global-search-input');
+          this.query.set(
+            `${input.value} ${TAPi18n.__('operator-board')}:"${
+              evt.currentTarget.textContent
+            }"`,
+          );
+          document.getElementById('global-search-input').focus();
+        },
+        'click .js-list-title'(evt) {
+          evt.preventDefault();
+          const input = document.getElementById('global-search-input');
+          this.query.set(
+            `${input.value} ${TAPi18n.__('operator-list')}:"${
+              evt.currentTarget.textContent
+            }"`,
+          );
+          document.getElementById('global-search-input').focus();
+        },
+        'click .js-label-name'(evt) {
+          evt.preventDefault();
+          const input = document.getElementById('global-search-input');
+          this.query.set(
+            `${input.value} ${TAPi18n.__('operator-label')}:"${
+              evt.currentTarget.textContent
+            }"`,
+          );
+          document.getElementById('global-search-input').focus();
+        },
+        'click .js-new-search'(evt) {
+          evt.preventDefault();
+          const input = document.getElementById('global-search-input');
+          input.value = '';
+          this.query.set('');
+          this.hasResults.set(false);
+        },
+      },
+    ];
+  }
+}
+
+GlobalSearchComponent.register('globalSearch');
@@ -0,0 +1,121 @@
+.global-search-board-wrapper
+  border-radius: 8px
+  //padding: 0.5rem
+  min-width: 400px
+  border-width: 8px
+  border-color: grey
+  border-style: solid
+  margin-bottom: 2rem
+  margin-right: auto
+  margin-left: auto
+
+.global-search-board-title
+  font-size: 1.4rem
+  font-weight: bold
+  padding: 0.5rem
+  background-color: grey
+  color: white
+
+.global-search-swimlane-title
+  font-size: 1.1rem
+  font-weight: bold
+  padding: 0.5rem
+  padding-bottom: 0.4rem
+  margin-top: 0
+  margin-bottom: 0.5rem
+  //border-top: black 1px solid
+  //border-bottom: black 1px solid
+  text-align: center
+
+.swimlane-default-color
+  background-color: lightgrey
+
+.global-search-list-title
+  font-weight: bold
+  font-size: 1.1rem
+  //padding-bottom: 0
+  //margin-bottom: 0
+  text-align: center
+  margin-bottom: 0.7rem
+
+.global-search-list-wrapper
+  margin: 1rem
+  border-radius: 5px
+  padding: 1.5rem
+  padding-top: 0.75rem
+  display: inline-block
+  min-width: 250px
+  max-width: 350px
+
+.global-search-card-wrapper
+  margin-top: 0
+  margin-bottom: 10px
+
+.global-search-results-list-wrapper
+  max-width: 500px
+  margin-right: auto
+  margin-left: auto
+
+.global-search-field-name
+  font-weight: bold
+
+.global-search-context
+  display: inline-block
+
+.global-search-context-separator
+  font-weight: bold
+
+.global-search-context-list
+  margin-bottom: 0.7rem
+
+.global-search-error-messages
+  color: darkred
+
+.global-search-page
+  width: 40%
+  min-width: 400px
+  margin-right: auto
+  margin-left: auto
+  line-height: 150%
+
+.global-search-page h1
+  margin-top: 2rem;
+
+.global-search-page h2
+  margin-top: 1rem;
+
+.global-search-query-input
+  width: 90% !important
+  margin-right: auto
+  margin-left: auto
+
+.global-search-operator
+  font-family: Courier
+
+.global-search-value
+  font-family: Courier
+  font-style: italic
+
+code
+  color: black
+  background-color: lightgrey
+  padding: 0.1rem !important
+  font-size: 0.8rem !important
+
+.list-title
+  background-color: darkgray
+
+.global-search-footer
+  border: none
+  width: 100%
+
+.global-search-next-page
+  border: none
+  text-align: right;
+
+.global-search-previous-page
+  border: none
+  text-align: left;
+
+.global-search-instructions li
+  margin-bottom: 0.3rem
@@ -7,16 +7,21 @@ template(name="header")
  if currentUser
    #header-quick-access(class=currentBoard.colorClass)
      if isMiniScreen
-        ul
-          li
-            a(href="{{pathFor 'home'}}")
-              span.fa.fa-home
+        span
+          a(href="{{pathFor 'home'}}")
+            span.fa.fa-home

+        ul.header-quick-access-list
          if currentList
            each currentBoard.lists
              li(class="{{#if $.Session.equals 'currentList' _id}}current{{/if}}")
                a.js-select-list
                  = title
+          else
+            each currentUser.starredBoards
+              li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
+                a(href="{{pathFor 'board' id=_id slug=slug}}")
+                  = title
        #header-new-board-icon
      else
        //-
@@ -32,23 +37,21 @@ template(name="header")
              img(src="{{currentSetting.customTopLeftCornerLogoImageUrl}}" height="{{#if currentSetting.customTopLeftCornerLogoHeight}}#{currentSetting.customTopLeftCornerLogoHeight}{{else}}27{{/if}}" width="auto" margin="0" padding="0")
          unless currentSetting.customTopLeftCornerLogoImageUrl
            img(src="{{pathFor '/logo-header.png'}}" alt="")
-        ul
-          li
-            a(href="{{pathFor 'home'}}")
-              span.fa.fa-home
-              | {{_ 'all-boards'}}
-          li.separator -
-          li
-            a(href="{{pathFor 'public'}}")
-              span.fa.fa-globe
-              | {{_ 'public'}}
+        span.allBoards
+          a(href="{{pathFor 'home'}}")
+            span.fa.fa-home
+            | {{_ 'all-boards'}}
+        ul.header-quick-access-list
+          //li
+          //  a(href="{{pathFor 'public'}}")
+          //    span.fa.fa-globe
+          //    | {{_ 'public'}}
          each currentUser.starredBoards
-            li.separator -
            li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
              a(href="{{pathFor 'board' id=_id slug=slug}}")
                = title
          else
-            li.current {{_ 'quick-access-description'}}
+            li.current.empty {{_ 'quick-access-description'}}

      // Next line is used only for spacing at header,
      // there is no visible clickable icon.
@@ -100,6 +100,10 @@
  font-size: 12px
  display: flex
  z-index: 21
+  padding: 10px 0px
+
+  .allBoards
+      padding: 0 0 0 10px

  #header-user-bar,
  #header-new-board-icon,
@@ -112,21 +116,31 @@
    a:hover, a.is-active
      color: white

-  ul
+  ul.header-quick-access-list
    transition: opacity 0.2s
-    margin: 4px 0 0 5px
-    overflow: hidden
+    overflow-x: auto
+    overflow-y: hidden
+    white-space: nowrap
+    padding: 10px
+    margin: -10px

    li
-      display: block
-      float: left
+      display: inline
      width: auto
      color: darken(white, 15%)
-      padding: 2px 5px 0
+      padding: 12px 0px
+      margin: -10px 0px
+
+      a
+        padding: 12px 10px
+        margin: -10px 0px

      &.current
        color: darken(white, 5%)

+      &.current.empty
+        padding: 12px 10px 12px 10px
+
      &:first-child .fa-home,&:nth-child(3) .fa-globe
        margin-right: 5px

@@ -186,37 +200,32 @@
  #header-quick-access
    transition: background-color 0.4s
    width: 100%
-    padding: 10px 0px
    z-index: 30

    ul
      width: calc(100% - 60px)
-      overflow: ellipsis
-      padding: 10px
-      margin: -10px
+      margin-right: 10px

      li
        height: 100%
-        padding: 12px 0px
-        margin: -10px 0px

        a
          height: 100%
-          padding: 12px 10px
-          margin: -10px 0px

-        .fa-home
+    span
+      .fa-home
          font-size: 26px
          margin-top: -2px
+          margin-right: 10px
+          margin-left: 10px

    #header-new-board-icon
      display: none

    #header-user-bar
-      position: absolute
      right: 0px
      padding: 10px
-      margin: -10px 0 -10px -10px
+      margin: -8px 0 -10px -10px

 .announcement .viewer
  display: inline-block
@@ -74,30 +74,48 @@ Template.userFormsLayout.helpers({
      let name = lang.name;
      if (lang.name === 'br') {
        name = 'Brezhoneg';
-      } else if (lang.name === 'Español') {
-        name = 'español';
-      } else if (lang.name === 'Español de Argentina') {
-        name = 'español de Argentina';
-      } else if (lang.name === 'Español de Chile') {
-        name = 'español de Chile';
-      } else if (lang.name === 'Español de Colombia') {
-        name = 'español de Colombia';
-      } else if (lang.name === 'Español de México') {
-        name = 'español de México';
-      } else if (lang.name === 'Español de Puerto Rico') {
-        name = 'español de Puerto Rico';
+      } else if (lang.name === 'ar-EG') {
+        // ar-EG = Arabic (Egypt), simply Masri (مَصرى, [ˈmɑsˤɾi], Egyptian, Masr refers to Cairo)
+        name = 'مَصرى';
+      } else if (lang.name === 'fa-IR') {
+        // fa-IR = Persian (Iran)
+        name = 'فارسی/پارسی (ایران‎)';
      } else if (lang.name === 'fr-BE') {
        name = 'Français (Belgique)';
      } else if (lang.name === 'fr-CA') {
        name = 'Français (Canada)';
-      } else if (lang.name === 'fr-CA') {
-        name = 'Français (Canada)';
      } else if (lang.name === 'ig') {
        name = 'Igbo';
      } else if (lang.name === 'lv') {
        name = 'Latviešu';
      } else if (lang.name === 'latviešu valoda') {
        name = 'Latviešu';
+      } else if (lang.name === 'Español') {
+        name = 'español';
+      } else if (lang.name === 'es_419') {
+        name = 'español de América Latina';
+      } else if (lang.name === 'es-419') {
+        name = 'español de América Latina';
+      } else if (lang.name === 'Español de América Latina') {
+        name = 'español de América Latina';
+      } else if (lang.name === 'es-LA') {
+        name = 'español de América Latina';
+      } else if (lang.name === 'Español de Argentina') {
+        name = 'español de Argentina';
+      } else if (lang.name === 'Español de Chile') {
+        name = 'español de Chile';
+      } else if (lang.name === 'Español de Colombia') {
+        name = 'español de Colombia';
+      } else if (lang.name === 'Español de México') {
+        name = 'español de México';
+      } else if (lang.name === 'es-PY') {
+        name = 'español de Paraguayo';
+      } else if (lang.name === 'Español de Paraguayo') {
+        name = 'español de Paraguayo';
+      } else if (lang.name === 'Español de Perú') {
+        name = 'español de Perú';
+      } else if (lang.name === 'Español de Puerto Rico') {
+        name = 'español de Puerto Rico';
      } else if (lang.name === 'oc') {
        name = 'Occitan';
      } else if (lang.name === 'st') {
@@ -0,0 +1,73 @@
+template(name="myCardsHeaderBar")
+  if currentUser
+    h1
+      //a.back-btn(href="{{pathFor 'home'}}")
+      //  i.fa.fa-chevron-left
+      i.fa.fa-list
+      | {{_ 'my-cards'}}
+
+    .board-header-btns.left
+      a.board-header-btn.js-toggle-my-cards-choose-sort(title="{{_ 'myCardsSortChange-title'}}")
+        i.fa.fa-caret-down
+        if $eq myCardsSort 'board'
+          i.fa.fa-th-large
+          | {{_ 'myCardsSortChange-choice-board'}}
+        if $eq myCardsSort 'dueAt'
+          i.fa.fa-calendar
+          | {{_ 'myCardsSortChange-choice-dueat'}}
+
+template(name="myCardsModalTitle")
+  if currentUser
+    h2
+      i.fa.fa-keyboard-o
+      | {{_ 'my-cards'}}
+
+template(name="myCards")
+  if currentUser
+    if searching.get
+      +spinner
+    else
+      .wrapper
+        if $eq myCardsSort 'board'
+          each board in myCardsList
+            .my-cards-board-wrapper
+              .my-cards-board-title(class=board.colorClass, id="header")
+                a(href=board.originRelativeUrl)
+                  +viewer
+                    = board.title
+              each swimlane in board.mySwimlanes
+                .my-cards-swimlane-title(class="{{#if swimlane.colorClass}}{{ swimlane.colorClass }}{{else}}swimlane-default-color{{/if}}")
+                  +viewer
+                    = swimlane.title
+                each list in swimlane.myLists
+                  .my-cards-list-wrapper
+                    .my-cards-list-title(class=list.colorClass)
+                      +viewer
+                        = list.title
+                    each card in list.myCards
+                      .my-cards-card-wrapper
+                        a.minicard-wrapper(href=card.originRelativeUrl)
+                          +minicard(card)
+        else
+          .my-cards-dueat-list-wrapper
+            each card in myDueCardsList
+              +resultCard(card)
+
+template(name="myCardsSortChangePopup")
+  if currentUser
+    ul.pop-over-list
+      li
+        with "my-cards-sort-board"
+          a.js-my-cards-sort-board
+            i.fa.fa-th-large.colorful
+            | {{_ 'myCardsSortChange-choice-board'}}
+            if $eq Utils.myCardsSort "board"
+              i.fa.fa-check
+      hr
+      li
+        with "my-cards-sort-dueat"
+          a.js-my-cards-sort-dueat
+            i.fa.fa-calendar.colorful
+            | {{_ 'myCardsSortChange-choice-dueat'}}
+            if $eq Utils.myCardsSort "dueAt"
+              i.fa.fa-check
@@ -0,0 +1,208 @@
+import { CardSearchPagedComponent } from '../../lib/cardSearch';
+import { QueryParams } from '../../../config/query-classes';
+import {
+  OPERATOR_LIMIT,
+  OPERATOR_SORT,
+  OPERATOR_USER,
+  ORDER_DESCENDING,
+  PREDICATE_DUE_AT,
+} from '../../../config/search-const';
+
+// const subManager = new SubsManager();
+
+BlazeComponent.extendComponent({
+  myCardsSort() {
+    // eslint-disable-next-line no-console
+    // console.log('sort:', Utils.myCardsSort());
+    return Utils.myCardsSort();
+  },
+
+  events() {
+    return [
+      {
+        'click .js-toggle-my-cards-choose-sort': Popup.open(
+          'myCardsSortChange',
+        ),
+      },
+    ];
+  },
+}).register('myCardsHeaderBar');
+
+Template.myCards.helpers({
+  userId() {
+    return Meteor.userId();
+  },
+});
+
+BlazeComponent.extendComponent({
+  events() {
+    return [
+      {
+        'click .js-my-cards-sort-board'() {
+          Utils.setMyCardsSort('board');
+          Popup.close();
+        },
+
+        'click .js-my-cards-sort-dueat'() {
+          Utils.setMyCardsSort('dueAt');
+          Popup.close();
+        },
+      },
+    ];
+  },
+}).register('myCardsSortChangePopup');
+
+class MyCardsComponent extends CardSearchPagedComponent {
+  onCreated() {
+    super.onCreated();
+
+    const queryParams = new QueryParams();
+    queryParams.addPredicate(OPERATOR_USER, Meteor.user().username);
+    queryParams.addPredicate(OPERATOR_SORT, {
+      name: PREDICATE_DUE_AT,
+      order: ORDER_DESCENDING,
+    });
+    queryParams.addPredicate(OPERATOR_LIMIT, 100);
+
+    this.runGlobalSearch(queryParams);
+    Meteor.subscribe('setting');
+  }
+
+  myCardsSort() {
+    // eslint-disable-next-line no-console
+    //console.log('sort:', Utils.myCardsSort());
+    return Utils.myCardsSort();
+  }
+
+  sortByBoard() {
+    return this.myCardsSort() === 'board';
+  }
+
+  myCardsList() {
+    const boards = [];
+    let board = null;
+    let swimlane = null;
+    let list = null;
+
+    const cursor = this.getResults();
+
+    if (cursor) {
+      let newBoard = false;
+      let newSwimlane = false;
+      let newList = false;
+
+      cursor.forEach(card => {
+        // eslint-disable-next-line no-console
+        // console.log('card:', card.title);
+        if (list === null || card.listId !== list._id) {
+          // eslint-disable-next-line no-console
+          // console.log('new list');
+          list = card.getList();
+          if (list.archived) {
+            list = null;
+            return;
+          }
+          list.myCards = [card];
+          newList = true;
+        }
+        if (swimlane === null || card.swimlaneId !== swimlane._id) {
+          // eslint-disable-next-line no-console
+          // console.log('new swimlane');
+          swimlane = card.getSwimlane();
+          if (swimlane.archived) {
+            swimlane = null;
+            return;
+          }
+          swimlane.myLists = [list];
+          newSwimlane = true;
+        }
+        if (board === null || card.boardId !== board._id) {
+          // eslint-disable-next-line no-console
+          // console.log('new board');
+          board = card.getBoard();
+          if (board.archived) {
+            board = null;
+            return;
+          }
+          // eslint-disable-next-line no-console
+          // console.log('board:', b, b._id, b.title);
+          board.mySwimlanes = [swimlane];
+          newBoard = true;
+        }
+
+        if (newBoard) {
+          boards.push(board);
+        } else if (newSwimlane) {
+          board.mySwimlanes.push(swimlane);
+        } else if (newList) {
+          swimlane.myLists.push(list);
+        } else {
+          list.myCards.push(card);
+        }
+
+        newBoard = false;
+        newSwimlane = false;
+        newList = false;
+      });
+
+      // sort the data structure
+      boards.forEach(board => {
+        board.mySwimlanes.forEach(swimlane => {
+          swimlane.myLists.forEach(list => {
+            list.myCards.sort((a, b) => {
+              return a.sort - b.sort;
+            });
+          });
+          swimlane.myLists.sort((a, b) => {
+            return a.sort - b.sort;
+          });
+        });
+        board.mySwimlanes.sort((a, b) => {
+          return a.sort - b.sort;
+        });
+      });
+
+      boards.sort((a, b) => {
+        let x = a.sort;
+        let y = b.sort;
+
+        // show the template board last
+        if (a.type === 'template-container') {
+          x = 99999999;
+        } else if (b.type === 'template-container') {
+          y = 99999999;
+        }
+        return x - y;
+      });
+
+      // eslint-disable-next-line no-console
+      // console.log('boards:', boards);
+      return boards;
+    }
+
+    return [];
+  }
+
+  myDueCardsList() {
+    const cursor = this.getResults();
+    const cards = [];
+    cursor.forEach(card => {
+      cards.push(card);
+    });
+
+    cards.sort((a, b) => {
+      const x = a.dueAt === null ? new Date('2100-12-31') : a.dueAt;
+      const y = b.dueAt === null ? new Date('2100-12-31') : b.dueAt;
+
+      if (x > y) return 1;
+      else if (x < y) return -1;
+
+      return 0;
+    });
+
+    // eslint-disable-next-line no-console
+    // console.log('cursor:', cards);
+    return cards;
+  }
+}
+MyCardsComponent.register('myCards');
@@ -0,0 +1,57 @@
+.my-cards-board-wrapper
+  border-radius: 0 0 4px 4px;
+  //padding: 0.5rem
+  min-width: 400px
+  margin-bottom: 2rem
+  margin-right: auto
+  margin-left: auto
+  border-width: 2px
+  border-style: solid
+  border-color: #a2a2a2
+  
+.my-cards-board-title
+  font-size: 1.4rem
+  font-weight: bold
+  padding: 0.5rem
+  background-color: grey
+  color: white
+
+.my-cards-swimlane-title
+  font-size: 1.1rem
+  font-weight: bold
+  padding: 0.5rem
+  padding-bottom: 0.4rem
+  margin-top: 0
+  margin-bottom: 0.5rem
+  //border-top: black 1px solid
+  //border-bottom: black 1px solid
+  text-align: center
+
+.swimlane-default-color
+  background-color: lightgrey
+
+.my-cards-list-title
+  font-weight: bold
+  font-size: 1.1rem
+  //padding-bottom: 0
+  //margin-bottom: 0
+  text-align: center
+  margin-bottom: 0.7rem
+
+.my-cards-list-wrapper
+  margin: 1rem
+  border-radius: 5px
+  //padding: 1.5rem
+  //padding-top: 0.75rem
+  display: inline-grid
+  min-width: 250px
+  max-width: 350px
+
+.my-cards-card-wrapper
+  margin-top: 0
+  margin-bottom: 10px
+
+.my-cards-dueat-list-wrapper
+  max-width: 500px
+  margin-right: auto
+  margin-left: auto
@@ -5,7 +5,7 @@
  .notification
    display: flex
    float: none
-    padding: 12px 8px 8px
+    padding: 15px 8px 8px
    color: black
    border-bottom: 1px solid #dbdbdb

@@ -14,6 +14,7 @@

    .read-status
      width: 30px
+      padding: 0px 10px 0px 0px

      input
        width: 24px
@@ -28,13 +29,16 @@
        color: #bbb

    .details
-      width: calc(100% - 30px)
-
      .activity
-        display: flex
+        a.member
+          margin: 0px 0px 0px 0px
+          padding: 0px
+
+          svg
+            padding: 3px

        .activity-desc
-          width: 100%;
+          margin: 0px 0px 0px 5px

        .activity-comment
          display: block
@@ -55,3 +59,14 @@
    .remove
      a:hover
        color #eb4646 !important
+
+@media screen and (max-width: 800px)
+  #notifications-drawer
+    .notification
+      height: auto
+
+      .details
+        .activity
+          a.member
+            height: 36px
+            width: 36px
@@ -2,7 +2,7 @@ belize = #2980b9

 section#notifications-drawer
  position: fixed
-  top: 28px
+  top: 48px
  right: 0
  width: 400px
  background-color: #fafafa
@@ -17,7 +17,7 @@ section#notifications-drawer

  .header
    position: fixed
-    top 28px
+    top 48px
    right 0
    width calc(400px - 32px)
    padding: 8px 16px
@@ -63,7 +63,7 @@ section#notifications-drawer

  ul.notifications
    display: block
-    padding: 0px 16px
+    padding: 0px 16px 0px 16px
    margin: 0
-    height: calc(100vh - 102px)
+    height: calc(100vh - 122px)
    overflow-y: scroll
@@ -3,32 +3,32 @@ template(name="cardActions")
    div.trigger-content
      div.trigger-dropdown
        select(id="setdate-action")
-          option(value="setDate") {{{_'r-set'}}}
-          option(value="updateDate") {{{_'r-update'}}}
+          option(value="setDate") {{_'r-set'}}
+          option(value="updateDate") {{_'r-update'}}
      div.trigger-text
-        | {{{_'r-datefield'}}}
+        | {{_'r-datefield'}}
      div.trigger-dropdown
        select(id="setdate-datefield")
-          option(value="startAt") {{{_'r-df-start-at'}}}
-          option(value="dueAt") {{{_'r-df-due-at'}}}
-          option(value="endAt") {{{_'r-df-end-at'}}}
-          option(value="receivedAt") {{{_'r-df-received-at'}}}
+          option(value="startAt") {{_'r-df-start-at'}}
+          option(value="dueAt") {{_'r-df-due-at'}}
+          option(value="endAt") {{_'r-df-end-at'}}
+          option(value="receivedAt") {{_'r-df-received-at'}}
      div.trigger-text
-        | {{{_'r-to-current-datetime'}}}
+        | {{_'r-to-current-datetime'}}
    div.trigger-button.js-set-date-action.js-goto-rules
      i.fa.fa-plus

  div.trigger-item
    div.trigger-content
      div.trigger-text
-        | {{{_'r-remove-value-from'}}}
-        | {{{_'r-datefield'}}}
+        | {{_'r-remove-value-from'}}
+        | {{_'r-datefield'}}
      div.trigger-dropdown
        select(id="setdate-removedatefieldvalue")
-          option(value="startAt") {{{_'r-df-start-at'}}}
-          option(value="dueAt") {{{_'r-df-due-at'}}}
-          option(value="endAt") {{{_'r-df-end-at'}}}
-          option(value="receivedAt") {{{_'r-df-received-at'}}}
+          option(value="startAt") {{_'r-df-start-at'}}
+          option(value="dueAt") {{_'r-df-due-at'}}
+          option(value="endAt") {{_'r-df-end-at'}}
+          option(value="receivedAt") {{_'r-df-received-at'}}
    div.trigger-button.js-remove-datevalue-action.js-goto-rules
      i.fa.fa-plus

@@ -36,10 +36,10 @@ template(name="cardActions")
    div.trigger-content
      div.trigger-dropdown
        select(id="label-action")
-          option(value="add") {{{_'r-add'}}}
-          option(value="remove") {{{_'r-remove'}}}
+          option(value="add") {{_'r-add'}}
+          option(value="remove") {{_'r-remove'}}
      div.trigger-text
-        | {{{_'r-label'}}}
+        | {{_'r-label'}}
      div.trigger-dropdown
        select(id="label-id")
          each labels
@@ -52,26 +52,26 @@ template(name="cardActions")
    div.trigger-content
      div.trigger-dropdown
        select(id="member-action")
-          option(value="add") {{{_'r-add'}}}
-          option(value="remove") {{{_'r-remove'}}}
+          option(value="add") {{_'r-add'}}
+          option(value="remove") {{_'r-remove'}}
      div.trigger-text
-        | {{{_'r-member'}}}
+        | {{_'r-member'}}
      div.trigger-dropdown
-        input(id="member-name",type=text,placeholder="{{{_'r-name'}}}")
+        input(id="member-name",type=text,placeholder="{{_'r-name'}}")
    div.trigger-button.js-add-member-action.js-goto-rules
      i.fa.fa-plus

  div.trigger-item
    div.trigger-content
      div.trigger-text
-        | {{{_'r-remove-all'}}}
+        | {{_'r-remove-all'}}
    div.trigger-button.js-add-removeall-action.js-goto-rules
      i.fa.fa-plus

  div.trigger-item
    div.trigger-content
      div.trigger-text
-        | {{{_'r-set-color'}}}
+        | {{_'r-set-color'}}
        button.trigger-button.trigger-button-color.js-show-color-palette(
          id="color-action"
          class="card-details-{{cardColorButton}}")
@@ -3,12 +3,12 @@ template(name="checklistActions")
    div.trigger-content
      div.trigger-dropdown
        select(id="check-action")
-          option(value="add") {{{_'r-add'}}}
-          option(value="remove") {{{_'r-remove'}}}
+          option(value="add") {{_'r-add'}}
+          option(value="remove") {{_'r-remove'}}
      div.trigger-text 
-        | {{{_'r-checklist'}}}
+        | {{_'r-checklist'}}
      div.trigger-dropdown
-        input(id="checklist-name",type=text,placeholder="{{{_'r-name'}}}")  
+        input(id="checklist-name",type=text,placeholder="{{_'r-name'}}")  
    div.trigger-button.js-add-checklist-action.js-goto-rules
      i.fa.fa-plus  

@@ -16,12 +16,12 @@ template(name="checklistActions")
    div.trigger-content
      div.trigger-dropdown
        select(id="checkall-action")
-          option(value="check") {{{_'r-check-all'}}}
-          option(value="uncheck") {{{_'r-uncheck-all'}}}
+          option(value="check") {{_'r-check-all'}}
+          option(value="uncheck") {{_'r-uncheck-all'}}
      div.trigger-text 
-        | {{{_'r-items-check'}}}
+        | {{_'r-items-check'}}
      div.trigger-dropdown
-        input(id="checklist-name2",type=text,placeholder="{{{_'r-name'}}}")  
+        input(id="checklist-name2",type=text,placeholder="{{_'r-name'}}")  
    div.trigger-button.js-add-checkall-action.js-goto-rules
      i.fa.fa-plus

@@ -30,36 +30,36 @@ template(name="checklistActions")
    div.trigger-content
      div.trigger-dropdown
        select(id="check-item-action")
-          option(value="check") {{{_'r-check'}}}
-          option(value="uncheck") {{{_'r-uncheck'}}}
+          option(value="check") {{_'r-check'}}
+          option(value="uncheck") {{_'r-uncheck'}}
      div.trigger-text 
-        | {{{_'r-item'}}}
+        | {{_'r-item'}}
      div.trigger-dropdown
-        input(id="checkitem-name",type=text,placeholder="{{{_'r-name'}}}")
+        input(id="checkitem-name",type=text,placeholder="{{_'r-name'}}")
      div.trigger-text 
-        | {{{_'r-of-checklist'}}}
+        | {{_'r-of-checklist'}}
      div.trigger-dropdown
-        input(id="checklist-name3",type=text,placeholder="{{{_'r-name'}}}")  
+        input(id="checklist-name3",type=text,placeholder="{{_'r-name'}}")  
    div.trigger-button.js-add-check-item-action.js-goto-rules
      i.fa.fa-plus

  div.trigger-item
      div.trigger-content
        div.trigger-text 
-          | {{{_'r-add-checklist'}}}
+          | {{_'r-add-checklist'}}
        div.trigger-dropdown
-          input(id="checklist-name-3",type=text,placeholder="{{{_'r-name'}}}")
+          input(id="checklist-name-3",type=text,placeholder="{{_'r-name'}}")
        div.trigger-text 
-          | {{{_'r-with-items'}}}
+          | {{_'r-with-items'}}
        div.trigger-dropdown
-          input(id="checklist-items",type=text,placeholder="{{{_'r-items-list'}}}")    
+          input(id="checklist-items",type=text,placeholder="{{_'r-items-list'}}")    
      div.trigger-button.js-add-checklist-items-action.js-goto-rules
        i.fa.fa-plus  

  div.trigger-item
      div.trigger-content
        div.trigger-text 
-          | {{{_'r-checklist-note'}}}
+          | {{_'r-checklist-note'}}



@@ -2,7 +2,7 @@ template(name="ruleDetails")
  .rules
    h2
      i.fa.fa-magic
-      | {{{_ 'r-rule-details' }}}
+      | {{_ 'r-rule-details' }}
    .triggers-content
        .triggers-body
            .triggers-main-body
@@ -21,4 +21,4 @@ template(name="ruleDetails")
    div.rules-back
        button.js-goback
          i.fa.fa-chevron-left
-          | {{{_ 'back'}}}
+          | {{_ 'back'}}
@@ -1,7 +1,7 @@
 template(name="rulesActions")
  h2
    i.fa.fa-magic
-    | {{{_ 'r-rule' }}} "#{data.ruleName.get}" - {{{_ 'r-add-action'}}}
+    | {{_ 'r-rule' }} "#{data.ruleName.get}" - {{_ 'r-add-action'}}
  .triggers-content
    .triggers-body
      .triggers-side-menu
@@ -26,4 +26,4 @@ template(name="rulesActions")
  div.rules-back
        button.js-goback
          i.fa.fa-chevron-left
-          | {{{_ 'back'}}}
+          | {{_ 'back'}}
@@ -2,7 +2,7 @@ template(name="rulesList")
  .rules
    h2
      i.fa.fa-magic
-      | {{{_ 'r-board-rules' }}}
+      | {{_ 'r-board-rules' }}

    ul.rules-list
      each rules
@@ -12,26 +12,26 @@ template(name="rulesList")
          div.rules-btns-group
            button.js-goto-details
              i.fa.fa-eye
-              | {{{_ 'r-view-rule'}}}
+              | {{_ 'r-view-rule'}}
            if currentUser.isAdmin
              button.js-delete-rule
                i.fa.fa-trash-o
-                | {{{_ 'r-delete-rule'}}}
+                | {{_ 'r-delete-rule'}}
            else if currentUser.isBoardAdmin
              button.js-delete-rule
                i.fa.fa-trash-o
-                | {{{_ 'r-delete-rule'}}}
+                | {{_ 'r-delete-rule'}}
      else
-        li.no-items-message {{{_ 'r-no-rules' }}}
+        li.no-items-message {{_ 'r-no-rules' }}
    if currentUser.isAdmin
      div.rules-add
        button.js-goto-trigger
          i.fa.fa-plus
-          | {{{_ 'r-add-rule'}}}
-        input(type=text,placeholder="{{{_ 'r-new-rule-name' }}}",id="ruleTitle")
+          | {{_ 'r-add-rule'}}
+        input(type=text,placeholder="{{_ 'r-new-rule-name' }}",id="ruleTitle")
    else if currentUser.isBoardAdmin
      div.rules-add
        button.js-goto-trigger
          i.fa.fa-plus
-          | {{{_ 'r-add-rule'}}}
-        input(type=text,placeholder="{{{_ 'r-new-rule-name' }}}",id="ruleTitle")
+          | {{_ 'r-add-rule'}}
+        input(type=text,placeholder="{{_ 'r-new-rule-name' }}",id="ruleTitle")
@@ -1,7 +1,7 @@
 template(name="rulesTriggers")
  h2
    i.fa.fa-magic
-    | {{{_ 'r-rule' }}} "#{data.ruleName.get}" - {{{_ 'r-add-trigger'}}}
+    | {{_ 'r-rule' }} "#{data.ruleName.get}" - {{_ 'r-add-trigger'}}
  .triggers-content
    .triggers-body
      .triggers-side-menu
@@ -22,4 +22,4 @@ template(name="rulesTriggers")
  div.rules-back
        button.js-goback
          i.fa.fa-chevron-left
-          | {{{_ 'back'}}}
+          | {{_ 'back'}}
@@ -100,7 +100,7 @@ template(name="boardTriggers")
  div.trigger-item
      div.trigger-content
        div.trigger-text 
-          | {{{_'r-board-note'}}}
+          | {{_'r-board-note'}}

 template(name="boardCardTitlePopup")
    form
@@ -109,8 +109,3 @@ template(name="boardCardTitlePopup")
        input.js-card-filter-name(type="text" value=title autofocus)
      input.js-card-filter-button.primary.wide(type="submit" value="{{_ 'set-filter'}}")

-   
-  
-
-
-
@@ -5,50 +5,199 @@ template(name="people")
    else
      .content-title.ext-box
        .ext-box-left
-          span
-            i.fa.fa-users
-            | {{_ 'people'}}
-          input#searchInput(placeholder="{{_ 'search'}}")
-          button#searchButton
-            i.fa.fa-search
-            | {{_ 'search'}}
-        .ext-box-right
-          span {{_ 'people-number'}} #{peopleNumber}
+          if loading.get
+            +spinner
+          else if orgSetting.get
+            span
+              i.fa.fa-sitemap
+              unless isMiniScreen
+                | {{_ 'organizations'}}
+            input#searchOrgInput(placeholder="{{_ 'search'}}")
+            button#searchOrgButton
+              i.fa.fa-search
+              | {{_ 'search'}}
+            .ext-box-right
+              span {{#unless isMiniScreen}}{{_ 'org-number'}}{{/unless}} #{orgNumber}
+          else if teamSetting.get
+            span
+              i.fa.fa-users
+              unless isMiniScreen
+                | {{_ 'teams'}}
+            input#searchTeamInput(placeholder="{{_ 'search'}}")
+            button#searchTeamButton
+              i.fa.fa-search
+              | {{_ 'search'}}
+            .ext-box-right
+              span {{#unless isMiniScreen}}{{_ 'team-number'}}{{/unless}} #{teamNumber}
+          else if peopleSetting.get
+            span
+              i.fa.fa-user
+              unless isMiniScreen
+                | {{_ 'people'}}
+            input#searchInput(placeholder="{{_ 'search'}}")
+            button#searchButton
+              i.fa.fa-search
+              | {{_ 'search'}}
+            .ext-box-right
+              span {{#unless isMiniScreen}}{{_ 'people-number'}}{{/unless}} #{peopleNumber}
      .content-body
        .side-menu
          ul
            li.active
-              a.js-setting-menu(data-id="people-setting")
+              a.js-org-menu(data-id="org-setting")
+                i.fa.fa-sitemap
+                | {{_ 'organizations'}}
+            li
+              a.js-team-menu(data-id="team-setting")
                i.fa.fa-users
+                | {{_ 'teams'}}
+            li
+              a.js-people-menu(data-id="people-setting")
+                i.fa.fa-user
                | {{_ 'people'}}
        .main-body
          if loading.get
            +spinner
-          else if people.get
+          else if orgSetting.get
+            +orgGeneral
+          else if teamSetting.get
+            +teamGeneral
+          else if peopleSetting.get
            +peopleGeneral

+
+template(name="orgGeneral")
+  table
+    tbody
+      tr
+        th {{_ 'displayName'}}
+        th {{_ 'description'}}
+        th {{_ 'shortName'}}
+        th {{_ 'website'}}
+        th {{_ 'createdAt'}}
+        th {{_ 'active'}}
+        th
+          +newOrgRow
+      each org in orgList
+        +orgRow(orgId=org._id)
+
+template(name="teamGeneral")
+  table
+    tbody
+      tr
+        th {{_ 'displayName'}}
+        th {{_ 'description'}}
+        th {{_ 'shortName'}}
+        th {{_ 'website'}}
+        th {{_ 'createdAt'}}
+        th {{_ 'active'}}
+        th
+          +newTeamRow
+      each team in teamList
+        +teamRow(teamId=team._id)
+
 template(name="peopleGeneral")
  table
    tbody
      tr
        th {{_ 'username'}}
        th {{_ 'fullname'}}
+        th {{_ 'initials'}}
        th {{_ 'admin'}}
        th {{_ 'email'}}
        th {{_ 'verified'}}
        th {{_ 'createdAt'}}
        th {{_ 'active'}}
        th {{_ 'authentication-method'}}
+        th {{_ 'import-usernames'}}
        th
          +newUserRow
      each user in peopleList
        +peopleRow(userId=user._id)

+template(name="newOrgRow")
+  a.new-org
+    i.fa.fa-plus-square
+    | {{_ 'new'}}
+
+template(name="newTeamRow")
+  a.new-team
+    i.fa.fa-plus-square
+    | {{_ 'new'}}
+
 template(name="newUserRow")
  a.new-user
-    i.fa.fa-edit
+    i.fa.fa-plus-square
    | {{_ 'new'}}

+template(name="orgRow")
+  tr
+    if orgData.loginDisabled
+      td <s>{{ orgData.orgDisplayName }}</s>
+    else
+      td {{ orgData.orgDisplayName }}
+    if orgData.loginDisabled
+      td <s>{{ orgData.orgDesc }}</s>
+    else
+      td {{ orgData.orgDesc }}
+    if orgData.loginDisabled
+      td <s>{{ orgData.orgName }}</s>
+    else
+      td {{ orgData.orgName }}
+    if orgData.loginDisabled
+      td <s>{{ orgData.orgWebsite }}</s>
+    else
+      td {{ orgData.orgWebsite }}
+    if orgData.loginDisabled
+      td <s>{{ moment orgData.createdAt 'LLL' }}</s>
+    else
+      td {{ moment orgData.createdAt 'LLL' }}
+    td
+      if orgData.loginDisabled
+        | {{_ 'no'}}
+      else
+        | {{_ 'yes'}}
+    td
+      a.edit-org
+        i.fa.fa-edit
+        | {{_ 'edit'}}
+      a.more-settings-org
+        i.fa.fa-ellipsis-h
+
+template(name="teamRow")
+  tr
+    if teamData.loginDisabled
+      td <s>{{ teamData.teamDisplayName }}</s>
+    else
+      td {{ teamData.teamDisplayName }}
+    if teamData.loginDisabled
+      td <s>{{ teamData.teamDesc }}</s>
+    else
+      td {{ teamData.teamDesc }}
+    if teamData.loginDisabled
+      td <s>{{ teamData.teamName }}</s>
+    else
+      td {{ teamData.teamName }}
+    if teamData.loginDisabled
+      td <s>{{ teamData.teamWebsite }}</s>
+    else
+      td {{ teamData.teamWebsite }}
+    if orgData.loginDisabled
+      td <s>{{ moment teamData.createdAt 'LLL' }}</s>
+    else
+      td {{ moment teamData.createdAt 'LLL' }}
+    td
+      if teamData.loginDisabled
+        | {{_ 'no'}}
+      else
+        | {{_ 'yes'}}
+    td
+      a.edit-team
+        i.fa.fa-edit
+        | {{_ 'edit'}}
+      a.more-settings-team
+        i.fa.fa-ellipsis-h
+
 template(name="peopleRow")
  tr
    if userData.loginDisabled
@@ -59,6 +208,10 @@ template(name="peopleRow")
      td <s>{{ userData.profile.fullname }}</s>
    else
      td {{ userData.profile.fullname }}
+    if userData.loginDisabled
+      td <s>{{ userData.profile.initials }}</s>
+    else
+      td {{ userData.profile.initials }}
    if userData.loginDisabled
      td
        if userData.isAdmin
@@ -100,6 +253,10 @@ template(name="peopleRow")
      td <s>{{_ userData.authenticationMethod }}</s>
    else
      td {{_ userData.authenticationMethod }}
+    if userData.loginDisabled
+      td <s>{{ userData.importUsernamesString }}</s>
+    else
+      td {{ userData.importUsernamesString }}
    td
      a.edit-user
        i.fa.fa-edit
@@ -107,12 +264,61 @@ template(name="peopleRow")
      a.more-settings-user
        i.fa.fa-ellipsis-h

+template(name="editOrgPopup")
+  form
+    label.hide.orgId(type="text" value=org._id)
+    label
+      | {{_ 'displayName'}}
+      input.js-orgDisplayName(type="text" value=org.displayName required)
+      span.error.hide.orgname-taken
+        | {{_ 'error-orgname-taken'}}
+    label
+      | {{_ 'description'}}
+      input.js-orgDesc(type="text" value=org.orgDesc required)
+    label
+      | {{_ 'shortName'}}
+      input.js-orgShortName(type="text" value=org.orgShortName required)
+    label
+      | {{_ 'website'}}
+      input.js-orgWebsite(type="text" value=org.orgWebsite required)
+    label
+      | {{_ 'active'}}
+      select.select-active.js-org-isactive
+        option(value="false") {{_ 'yes'}}
+        option(value="true" selected="{{org.loginDisabled}}") {{_ 'no'}}
+    hr
+    div.buttonsContainer
+      input.primary.wide(type="submit" value="{{_ 'save'}}")
+
+template(name="editTeamPopup")
+  form
+    label.hide.teamId(type="text" value=team._id)
+    label
+      | {{_ 'displayName'}}
+      input.js-teamDisplayName(type="text" value=team.teamDisplayName required)
+      span.error.hide.teamname-taken
+        | {{_ 'error-teamname-taken'}}
+    label
+      | {{_ 'description'}}
+      input.js-teamDesc(type="text" value=team.teamDesc required)
+    label
+      | {{_ 'shortName'}}
+      input.js-teamShortName(type="text" value=team.teamShortName required)
+    label
+      | {{_ 'website'}}
+      input.js-teamWebsite(type="text" value=team.teamWebsite required)
+    label
+      | {{_ 'active'}}
+      select.select-active.js-team-isactive
+        option(value="false") {{_ 'yes'}}
+        option(value="true" selected="{{team.loginDisabled}}") {{_ 'no'}}
+    hr
+    div.buttonsContainer
+      input.primary.wide(type="submit" value="{{_ 'save'}}")
+
 template(name="editUserPopup")
  form
    label.hide.userId(type="text" value=user._id)
-    label
-      | {{_ 'fullname'}}
-      input.js-profile-fullname(type="text" value=user.profile.fullname)
    label
      | {{_ 'username'}}
      span.error.hide.username-taken
@@ -120,7 +326,18 @@ template(name="editUserPopup")
      if isLdap
        input.js-profile-username(type="text" value=user.username readonly)
      else
-        input.js-profile-username(type="text" value=user.username)
+        input.js-profile-username(type="text" value=user.username required)
+    label
+      | {{_ 'fullname'}}
+      input.js-profile-fullname(type="text" value=user.profile.fullname required)
+    label
+      | {{_ 'initials'}}
+      input.js-profile-initials(type="text" value=user.profile.initials required)
+    label
+      | {{_ 'admin'}}
+      select.select-role.js-profile-isadmin
+        option(value="false") {{_ 'no'}}
+        option(value="true" selected="{{user.isAdmin}}") {{_ 'yes'}}
    label
      | {{_ 'email'}}
      span.error.hide.email-taken
@@ -128,12 +345,15 @@ template(name="editUserPopup")
      if isLdap
        input.js-profile-email(type="email" value="{{user.emails.[0].address}}" readonly)
      else
-        input.js-profile-email(type="email" value="{{user.emails.[0].address}}")
+        input.js-profile-email(type="email" value="{{user.emails.[0].address}}" required)
    label
-      | {{_ 'admin'}}
-      select.select-role.js-profile-isadmin
+      | {{_ 'import-usernames'}}
+      input.js-import-usernames(type="text" value=user.importUsernames)
+    label
+      | {{_ 'verified'}}
+      select.select-verified.js-profile-email-verified
        option(value="false") {{_ 'no'}}
-        option(value="true" selected="{{user.isAdmin}}") {{_ 'yes'}}
+        option(value="true" selected="{{userData.emails.[0].verified}}") {{_ 'yes'}}
    label
      | {{_ 'active'}}
      select.select-active.js-profile-isactive
@@ -153,15 +373,61 @@ 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'}}")
+
+template(name="newOrgPopup")
+  form
+    //label.hide.userId(type="text" value=user._id)
+    label
+      | {{_ 'displayName'}}
+      input.js-orgDisplayName(type="text" value="" required)
+    label
+      | {{_ 'description'}}
+      input.js-orgDesc(type="text" value="" required)
+    label
+      | {{_ 'shortName'}}
+      input.js-orgName(type="text" value="" required)
+    label
+      | {{_ 'website'}}
+      input.js-orgWebsite(type="text" value="" required)
+    label
+      | {{_ 'active'}}
+      select.select-active.js-org-isactive
+        option(value="false" selected="selected") {{_ 'yes'}}
+        option(value="true") {{_ 'no'}}
+    hr
+    div.buttonsContainer
+      input.primary.wide(type="submit" value="{{_ 'save'}}")
+
+template(name="newTeamPopup")
+  form
+    //label.hide.teamId(type="text" value=team._id)
+    label
+      | {{_ 'displayName'}}
+      input.js-teamDisplayName(type="text" value="" required)
+    label
+      | {{_ 'description'}}
+      input.js-teamDesc(type="text" value="" required)
+    label
+      | {{_ 'shortName'}}
+      input.js-teamName(type="text" value="" required)
+    label
+      | {{_ 'website'}}
+      input.js-teamWebsite(type="text" value="" required)
+    label
+      | {{_ 'active'}}
+      select.select-active.js-team-isactive
+        option(value="false" selected="selected") {{_ 'yes'}}
+        option(value="true") {{_ 'no'}}
+    hr
+    div.buttonsContainer
+      input.primary.wide(type="submit" value="{{_ 'save'}}")

 template(name="newUserPopup")
  form
    //label.hide.userId(type="text" value=user._id)
    label
      | {{_ 'fullname'}}
-      input.js-profile-fullname(type="text" value="")
+      input.js-profile-fullname(type="text" value="" required)
    label
      | {{_ 'username'}}
      span.error.hide.username-taken
@@ -169,7 +435,10 @@ template(name="newUserPopup")
      //if isLdap
      //  input.js-profile-username(type="text" value=user.username readonly)
      //else
-      input.js-profile-username(type="text" value="")
+      input.js-profile-username(type="text" value="" required)
+    label
+      | {{_ 'initials'}}
+      input.js-profile-initials(type="text" value="" required)
    label
      | {{_ 'email'}}
      span.error.hide.email-taken
@@ -177,7 +446,10 @@ template(name="newUserPopup")
      //if isLdap
      //  input.js-profile-email(type="email" value="{{user.emails.[0].address}}" readonly)
      //else
-      input.js-profile-email(type="email" value="")
+      input.js-profile-email(type="email" value="" required)
+    label
+      | {{_ 'import-usernames'}}
+      input.js-import-usernames(type="text" value="")
    label
      | {{_ 'admin'}}
      select.select-role.js-profile-isadmin
@@ -199,13 +471,56 @@ template(name="newUserPopup")
    hr
    label
      | {{_ 'password'}}
-      input.js-profile-password(type="password")
+      input.js-profile-password(type="password" required)
    div.buttonsContainer
      input.primary.wide(type="submit" value="{{_ 'save'}}")

+template(name="settingsOrgPopup")
+  ul.pop-over-list
+    li
+      a.impersonate-org
+        i.fa.fa-user
+        | {{_ 'impersonate-org'}}
+  // Delete is not enabled yet, because it does leave empty user avatars
+  // to boards: boards members, card members and assignees have
+  // empty users. See:
+  // - wekan/client/components/settings/peopleBody.jade deleteButton
+  // - wekan/client/components/settings/peopleBody.js deleteButton
+  // - wekan/client/components/sidebar/sidebar.js Popup.afterConfirm('removeMember'
+  //   that does now remove member from board, card members and assignees correctly,
+  //   but that should be used to remove user from all boards similarly
+  // - wekan/models/users.js Delete is not enabled
+  //li
+  //  br
+  //  br
+  //  hr
+  //li
+  //  form
+  //    label.hide.userId(type="text" value=user._id)
+  //    div.buttonsContainer
+  //      input#deleteButton.card-details-red.right.wide(type="button" value="{{_ 'delete'}}")
+
 template(name="settingsUserPopup")
  ul.pop-over-list
    li
      a.impersonate-user
        i.fa.fa-user
        | {{_ 'impersonate-user'}}
+  // Delete is not enabled yet, because it does leave empty user avatars
+  // to boards: boards members, card members and assignees have
+  // empty users. See:
+  // - wekan/client/components/settings/peopleBody.jade deleteButton
+  // - wekan/client/components/settings/peopleBody.js deleteButton
+  // - wekan/client/components/sidebar/sidebar.js Popup.afterConfirm('removeMember'
+  //   that does now remove member from board, card members and assignees correctly,
+  //   but that should be used to remove user from all boards similarly
+  // - wekan/models/users.js Delete is not enabled
+  //li
+  //  br
+  //  br
+  //  hr
+  //li
+  //  form
+  //    label.hide.userId(type="text" value=user._id)
+  //    div.buttonsContainer
+  //      input#deleteButton.card-details-red.right.wide(type="button" value="{{_ 'delete'}}")
@@ -1,3 +1,5 @@
+const orgsPerPage = 25;
+const teamsPerPage = 25;
 const usersPerPage = 25;

 BlazeComponent.extendComponent({
@@ -7,17 +9,45 @@ BlazeComponent.extendComponent({
  onCreated() {
    this.error = new ReactiveVar('');
    this.loading = new ReactiveVar(false);
-    this.people = new ReactiveVar(true);
+    this.orgSetting = new ReactiveVar(true);
+    this.teamSetting = new ReactiveVar(true);
+    this.peopleSetting = new ReactiveVar(true);
+    this.findOrgsOptions = new ReactiveVar({});
+    this.findTeamsOptions = new ReactiveVar({});
    this.findUsersOptions = new ReactiveVar({});
-    this.number = new ReactiveVar(0);
+    this.numberOrgs = new ReactiveVar(0);
+    this.numberTeams = new ReactiveVar(0);
+    this.numberPeople = new ReactiveVar(0);

    this.page = new ReactiveVar(1);
    this.loadNextPageLocked = false;
    this.callFirstWith(null, 'resetNextPeak');
    this.autorun(() => {
-      const limit = this.page.get() * usersPerPage;
+      const limitOrgs = this.page.get() * orgsPerPage;
+      const limitTeams = this.page.get() * teamsPerPage;
+      const limitUsers = this.page.get() * usersPerPage;

-      this.subscribe('people', this.findUsersOptions.get(), limit, () => {
+      this.subscribe('org', this.findOrgsOptions.get(), limitOrgs, () => {
+        this.loadNextPageLocked = false;
+        const nextPeakBefore = this.callFirstWith(null, 'getNextPeak');
+        this.calculateNextPeak();
+        const nextPeakAfter = this.callFirstWith(null, 'getNextPeak');
+        if (nextPeakBefore === nextPeakAfter) {
+          this.callFirstWith(null, 'resetNextPeak');
+        }
+      });
+
+      this.subscribe('team', this.findTeamsOptions.get(), limitTeams, () => {
+        this.loadNextPageLocked = false;
+        const nextPeakBefore = this.callFirstWith(null, 'getNextPeak');
+        this.calculateNextPeak();
+        const nextPeakAfter = this.callFirstWith(null, 'getNextPeak');
+        if (nextPeakBefore === nextPeakAfter) {
+          this.callFirstWith(null, 'resetNextPeak');
+        }
+      });
+
+      this.subscribe('people', this.findUsersOptions.get(), limitUsers, () => {
        this.loadNextPageLocked = false;
        const nextPeakBefore = this.callFirstWith(null, 'getNextPeak');
        this.calculateNextPeak();
@@ -31,6 +61,22 @@ BlazeComponent.extendComponent({
  events() {
    return [
      {
+        'click #searchOrgButton'() {
+          this.filterOrg();
+        },
+        'keydown #searchOrgInput'(event) {
+          if (event.keyCode === 13 && !event.shiftKey) {
+            this.filterOrg();
+          }
+        },
+        'click #searchTeamButton'() {
+          this.filterTeam();
+        },
+        'keydown #searchTeamInput'(event) {
+          if (event.keyCode === 13 && !event.shiftKey) {
+            this.filterTeam();
+          }
+        },
        'click #searchButton'() {
          this.filterPeople();
        },
@@ -39,9 +85,18 @@ BlazeComponent.extendComponent({
            this.filterPeople();
          }
        },
+        'click #newOrgButton'() {
+          Popup.open('newOrg');
+        },
+        'click #newTeamButton'() {
+          Popup.open('newTeam');
+        },
        'click #newUserButton'() {
          Popup.open('newUser');
        },
+        'click a.js-org-menu': this.switchMenu,
+        'click a.js-team-menu': this.switchMenu,
+        'click a.js-people-menu': this.switchMenu,
      },
    ];
  },
@@ -84,18 +139,63 @@ BlazeComponent.extendComponent({
  setLoading(w) {
    this.loading.set(w);
  },
+  orgList() {
+    const orgs = Org.find(this.findOrgsOptions.get(), {
+      fields: { _id: true },
+    });
+    this.numberOrgs.set(orgs.count(false));
+    return orgs;
+  },
+  teamList() {
+    const teams = Team.find(this.findTeamsOptions.get(), {
+      fields: { _id: true },
+    });
+    this.numberTeams.set(team.count(false));
+    return teams;
+  },
  peopleList() {
    const users = Users.find(this.findUsersOptions.get(), {
      fields: { _id: true },
    });
-    this.number.set(users.count(false));
+    this.numberPeople.set(users.count(false));
    return users;
  },
+  orgNumber() {
+    return this.numberOrgs.get();
+  },
+  teamNumber() {
+    return this.numberTeams.get();
+  },
  peopleNumber() {
-    return this.number.get();
+    return this.numberPeople.get();
+  },
+  switchMenu(event) {
+    const target = $(event.target);
+    if (!target.hasClass('active')) {
+      $('.side-menu li.active').removeClass('active');
+      target.parent().addClass('active');
+      const targetID = target.data('id');
+      this.orgSetting.set('org-setting' === targetID);
+      this.teamSetting.set('team-setting' === targetID);
+      this.peopleSetting.set('people-setting' === targetID);
+    }
  },
 }).register('people');

+Template.orgRow.helpers({
+  orgData() {
+    const orgCollection = this.esSearch ? ESSearchResults : Org;
+    return orgCollection.findOne(this.orgId);
+  },
+});
+
+Template.teamRow.helpers({
+  teamData() {
+    const teamCollection = this.esSearch ? ESSearchResults : Team;
+    return teamCollection.findOne(this.teamId);
+  },
+});
+
 Template.peopleRow.helpers({
  userData() {
    const userCollection = this.esSearch ? ESSearchResults : Users;
@@ -122,6 +222,24 @@ Template.editUserPopup.onCreated(function() {
  });
 });

+Template.editOrgPopup.helpers({
+  org() {
+    return Org.findOne(this.orgId);
+  },
+  errorMessage() {
+    return Template.instance().errorMessage.get();
+  },
+});
+
+Template.editTeamPopup.helpers({
+  team() {
+    return Team.findOne(this.teamId);
+  },
+  errorMessage() {
+    return Template.instance().errorMessage.get();
+  },
+});
+
 Template.editUserPopup.helpers({
  user() {
    return Users.findOne(this.userId);
@@ -144,6 +262,14 @@ Template.editUserPopup.helpers({
  },
 });

+Template.newOrgPopup.onCreated(function() {
+  this.errorMessage = new ReactiveVar('');
+});
+
+Template.newTeamPopup.onCreated(function() {
+  this.errorMessage = new ReactiveVar('');
+});
+
 Template.newUserPopup.onCreated(function() {
  this.authenticationMethods = new ReactiveVar([]);
  this.errorMessage = new ReactiveVar('');
@@ -163,28 +289,76 @@ Template.newUserPopup.onCreated(function() {
  });
 });

-Template.newUserPopup.helpers({
-  //user() {
-  //  return Users.findOne(this.userId);
-  //},
-  authentications() {
-    return Template.instance().authenticationMethods.get();
+Template.newOrgPopup.helpers({
+  org() {
+    return Org.findOne(this.orgId);
  },
-  //isSelected(match) {
-  //  const userId = Template.instance().data.userId;
-  //  const selected = Users.findOne(userId).authenticationMethod;
-  //  return selected === match;
-  //},
-  //isLdap() {
-  //  const userId = Template.instance().data.userId;
-  //  const selected = Users.findOne(userId).authenticationMethod;
-  //  return selected === 'ldap';
-  //},
  errorMessage() {
    return Template.instance().errorMessage.get();
  },
 });

+Template.newTeamPopup.helpers({
+  team() {
+    return Team.findOne(this.teamId);
+  },
+  errorMessage() {
+    return Template.instance().errorMessage.get();
+  },
+});
+
+Template.newUserPopup.helpers({
+  user() {
+    return Users.findOne(this.userId);
+  },
+  authentications() {
+    return Template.instance().authenticationMethods.get();
+  },
+  isSelected(match) {
+    const userId = Template.instance().data.userId;
+    const selected = Users.findOne(userId).authenticationMethod;
+    return selected === match;
+  },
+  isLdap() {
+    const userId = Template.instance().data.userId;
+    const selected = Users.findOne(userId).authenticationMethod;
+    return selected === 'ldap';
+  },
+  errorMessage() {
+    return Template.instance().errorMessage.get();
+  },
+});
+
+BlazeComponent.extendComponent({
+  onCreated() {},
+  org() {
+    return Org.findOne(this.orgId);
+  },
+  events() {
+    return [
+      {
+        'click a.edit-org': Popup.open('editOrg'),
+        'click a.more-settings-org': Popup.open('settingsOrg'),
+      },
+    ];
+  },
+}).register('orgRow');
+
+BlazeComponent.extendComponent({
+  onCreated() {},
+  team() {
+    return Team.findOne(this.teamId);
+  },
+  events() {
+    return [
+      {
+        'click a.edit-team': Popup.open('editTeam'),
+        'click a.more-settings-team': Popup.open('settingsTeam'),
+      },
+    ];
+  },
+}).register('teamRow');
+
 BlazeComponent.extendComponent({
  onCreated() {},
  user() {
@@ -200,6 +374,26 @@ BlazeComponent.extendComponent({
  },
 }).register('peopleRow');

+BlazeComponent.extendComponent({
+  events() {
+    return [
+      {
+        'click a.new-org': Popup.open('newOrg'),
+      },
+    ];
+  },
+}).register('newOrgRow');
+
+BlazeComponent.extendComponent({
+  events() {
+    return [
+      {
+        'click a.new-team': Popup.open('newTeam'),
+      },
+    ];
+  },
+}).register('newTeamRow');
+
 BlazeComponent.extendComponent({
  events() {
    return [
@@ -210,24 +404,121 @@ BlazeComponent.extendComponent({
  },
 }).register('newUserRow');

+Template.editOrgPopup.events({
+  submit(event, templateInstance) {
+    event.preventDefault();
+    const org = Orgs.findOne(this.orgId);
+
+    const orgDisplayName = templateInstance
+      .find('.js-orgDisplayName')
+      .value.trim();
+    const orgDesc = templateInstance.find('.js-orgDesc').value.trim();
+    const orgShortName = templateInstance.find('.js-orgShortName').value.trim();
+    const orgWebsite = templateInstance.find('.js-orgWebsite').value.trim();
+    const orgIsActive = templateInstance.find('.js-org-isactive').value.trim();
+
+    const isChangeOrgDisplayName = orgDisplayName !== org.orgDisplayName;
+    const isChangeOrgDesc = orgDesc !== org.orgDesc;
+    const isChangeOrgShortName = orgShortName !== org.orgShortName;
+    const isChangeOrgWebsite = orgWebsite !== org.orgWebsite;
+    const isChangeOrgIsActive = orgIsActive !== org.orgIsActive;
+
+    if (isChangeOrgDisplayName) {
+      Meteor.call('setOrgDisplayName', org, orgDisplayName);
+    }
+
+    if (isChangeOrgDesc) {
+      Meteor.call('setOrgDesc', org, orgDesc);
+    }
+
+    if (isChangeOrgShortName) {
+      Meteor.call('setOrgShortName', org, orgShortName);
+    }
+
+    if (isChangeOrgIsActive) {
+      Meteor.call('setOrgIsActive', org, orgIsActive);
+    }
+
+    Popup.close();
+  },
+});
+
+Template.editTeamPopup.events({
+  submit(event, templateInstance) {
+    event.preventDefault();
+    const team = Teams.findOne(this.teamId);
+
+    const teamDisplayName = templateInstance
+      .find('.js-teamDisplayName')
+      .value.trim();
+    const teamDesc = templateInstance.find('.js-teamDesc').value.trim();
+    const teamShortName = templateInstance
+      .find('.js-teamShortName')
+      .value.trim();
+    const teamWebsite = templateInstance.find('.js-teamWebsite').value.trim();
+    const teamIsActive = templateInstance
+      .find('.js-team-isactive')
+      .value.trim();
+
+    const isChangeTeamDisplayName = teamDisplayName !== team.teamDisplayName;
+    const isChangeTeamDesc = teamDesc !== team.teamDesc;
+    const isChangeTeamShortName = teamShortName !== team.teamShortName;
+    const isChangeTeamWebsite = teamWebsite !== team.teamWebsite;
+    const isChangeTeamIsActive = teamIsActive !== team.teamIsActive;
+
+    if (isChangeTeamDisplayName) {
+      Meteor.call('setTeamDisplayName', team, teamDisplayName);
+    }
+
+    if (isChangeTeamDesc) {
+      Meteor.call('setTeamDesc', team, teamDesc);
+    }
+
+    if (isChangeTeamShortName) {
+      Meteor.call('setTeamShortName', team, teamShortName);
+    }
+
+    if (isChangeTeamIsActive) {
+      Meteor.call('setTeamIsActive', team, teamIsActive);
+    }
+
+    Popup.close();
+  },
+});
+
 Template.editUserPopup.events({
  submit(event, templateInstance) {
    event.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 fullname = templateInstance.find('.js-profile-fullname').value.trim();
+    const initials = templateInstance.find('.js-profile-initials').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 verified = templateInstance
+      .find('.js-profile-email-verified')
+      .value.trim();
    const authentication = templateInstance
      .find('.js-authenticationMethod')
      .value.trim();
+    const importUsernames = templateInstance
+      .find('.js-import-usernames')
+      .value.trim();

    const isChangePassword = password.length > 0;
    const isChangeUserName = username !== user.username;
+    const isChangeInitials = initials.length > 0;
+    const isChangeEmailVerified = verified !== user.emails[0].verified;
+
+    // If previously email address has not been set, it is undefined,
+    // check for undefined, and allow adding email address.
    const isChangeEmail =
-      email.toLowerCase() !== user.emails[0].address.toLowerCase();
+      email.toLowerCase() !==
+      (typeof user.emails !== 'undefined'
+        ? user.emails[0].address.toLowerCase()
+        : false);

    Users.update(this.userId, {
      $set: {
@@ -235,6 +526,7 @@ Template.editUserPopup.events({
        isAdmin: isAdmin === 'true',
        loginDisabled: isActive === 'true',
        authenticationMethod: authentication,
+        importUsernames: Users.parseImportUsernames(importUsernames),
      },
    });

@@ -242,6 +534,14 @@ Template.editUserPopup.events({
      Meteor.call('setPassword', password, this.userId);
    }

+    if (isChangeEmailVerified) {
+      Meteor.call('setEmailVerified', email, verified === 'true', this.userId);
+    }
+
+    if (isChangeInitials) {
+      Meteor.call('setInitials', initials, this.userId);
+    }
+
    if (isChangeUserName && isChangeEmail) {
      Meteor.call(
        'setUsernameAndEmail',
@@ -297,11 +597,56 @@ Template.editUserPopup.events({
      });
    } else Popup.close();
  },
+});

-  'click #deleteButton': Popup.afterConfirm('userDelete', function() {
-    Users.remove(this.userId);
+Template.newOrgPopup.events({
+  submit(event, templateInstance) {
+    event.preventDefault();
+    const orgDisplayName = templateInstance
+      .find('.js-orgDisplayName')
+      .value.trim();
+    const orgDesc = templateInstance.find('.js-orgDesc').value.trim();
+    const orgShortName = templateInstance.find('.js-orgShortName').value.trim();
+    const orgWebsite = templateInstance.find('.js-orgWebsite').value.trim();
+    const orgIsActive = templateInstance.find('.js-org-isactive').value.trim();
+
+    Meteor.call(
+      'setCreateOrg',
+      orgDisplayName,
+      orgDesc,
+      orgShortName,
+      orgWebsite,
+      orgIsActive,
+    );
    Popup.close();
-  }),
+  },
+});
+
+Template.newTeamPopup.events({
+  submit(event, templateInstance) {
+    event.preventDefault();
+    const teamDisplayName = templateInstance
+      .find('.js-teamDisplayName')
+      .value.trim();
+    const teamDesc = templateInstance.find('.js-teamDesc').value.trim();
+    const teamShortName = templateInstance
+      .find('.js-teamShortName')
+      .value.trim();
+    const teamWebsite = templateInstance.find('.js-teamWebsite').value.trim();
+    const teamIsActive = templateInstance
+      .find('.js-team-isactive')
+      .value.trim();
+
+    Meteor.call(
+      'setCreateTeam',
+      teamDisplayName,
+      teamDesc,
+      teamShortName,
+      teamWebsite,
+      teamIsActive,
+    );
+    Popup.close();
+  },
 });

 Template.newUserPopup.events({
@@ -309,19 +654,25 @@ Template.newUserPopup.events({
    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 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 importUsernames = Users.parseImportUsernames(
+      templateInstance.find('.js-import-usernames').value,
+    );

    Meteor.call(
      'setCreateUser',
      fullname,
      username,
+      initials,
      password,
      isAdmin,
      isActive,
      email.toLowerCase(),
+      importUsernames,
      function(error) {
        const usernameMessageElement = templateInstance.$('.username-taken');
        const emailMessageElement = templateInstance.$('.email-taken');
@@ -356,4 +707,58 @@ Template.settingsUserPopup.events({
      }
    });
  },
+  'click #deleteButton'(event) {
+    event.preventDefault();
+    /*
+    // Delete is not enabled yet, because it does leave empty user avatars
+    // to boards: boards members, card members and assignees have
+    // empty users. See:
+    // - wekan/client/components/settings/peopleBody.jade deleteButton
+    // - wekan/client/components/settings/peopleBody.js deleteButton
+    // - wekan/client/components/sidebar/sidebar.js Popup.afterConfirm('removeMember'
+    //   that does now remove member from board, card members and assignees correctly,
+    //   but that should be used to remove user from all boards similarly
+    // - wekan/models/users.js Delete is not enabled
+    //
+    //console.log('user id: ' + this.userId);
+    //Popup.afterConfirm('userDelete', function(event) {
+    //Boards.find({ members: this.userId }).forEach(board => {
+    //  console.log('board id: ' + board._id);
+      //Cards.find({ boardId: board._id, members: this.userId }).forEach(card => {
+      //  card.unassignMember(this.userId);
+      //});
+      //Cards.find({ boardId: board._id, members: this.userId }).forEach(card => {
+      //  card.unassignMember(this.userId);
+      //});
+      //Cards.find({ boardId: board._id, assignees: this.userId }).forEach(card => {
+      //  card.unassignAssignee(this.userId);
+      //});
+      //Boards.findOne({ boardId: board._id }).removeMember(this.userId);
+    //});
+    //Users.remove(this.userId);
+    */
+    Popup.close();
+  },
+});
+
+Template.settingsUserPopup.helpers({
+  user() {
+    return Users.findOne(this.userId);
+  },
+  authentications() {
+    return Template.instance().authenticationMethods.get();
+  },
+  isSelected(match) {
+    const userId = Template.instance().data.userId;
+    const selected = Users.findOne(userId).authenticationMethod;
+    return selected === match;
+  },
+  isLdap() {
+    const userId = Template.instance().data.userId;
+    const selected = Users.findOne(userId).authenticationMethod;
+    return selected === 'ldap';
+  },
+  errorMessage() {
+    return Template.instance().errorMessage.get();
+  },
 });
@@ -21,7 +21,7 @@ table

  .ext-box-left
    display: flex;
-    width: 40%
+    width: 100%

  span
    vertical-align: center;
@@ -47,5 +47,5 @@ table
  div
    margin: auto

-.more-settings-user
+.more-settings-user,.more-settings-team,.more-settings-org
  margin-left: 10px;
@@ -13,10 +13,11 @@ template(name="setting")
              a.js-setting-menu(data-id="registration-setting")
                i.fa.fa-sign-in
                | {{_ 'registration'}}
-            li
-              a.js-setting-menu(data-id="email-setting")
-                i.fa.fa-envelope
-                | {{_ 'email'}}
+            unless isSandstorm
+              li
+                a.js-setting-menu(data-id="email-setting")
+                  i.fa.fa-envelope
+                  | {{_ 'email'}}
            li
              a.js-setting-menu(data-id="account-setting")
                i.fa.fa-users
@@ -39,7 +40,8 @@ template(name="setting")
          else if generalSetting.get
            +general
          else if emailSetting.get
-            +email
+            unless isSandstorm
+              +email
          else if accountSetting.get
            +accountSettings
          else if announcementSetting.get
@@ -80,45 +82,48 @@ template(name="general")

 template(name='email')
  ul#email-setting.setting-detail
-    li.smtp-form
-      .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}}")
-    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}}")
-    li.smtp-form
-      .title {{_ 'smtp-username'}}
-      .form-group
-        input.wekan-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}}")
-    li.smtp-form
-      .title {{_ 'smtp-tls'}}
-      .form-group
-        a.flex.js-toggle-tls
-          .materialCheckBox#mail-server-tls(class="{{#if currentSetting.mailServer.enableTLS}}is-checked{{/if}}")
-
-          span {{_ 'smtp-tls-description'}}
-
-    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}}")
-
-    li
-      button.js-save.primary {{_ 'save'}}
+    //if isSandstorm
+    //  li.smtp-form
+    //    .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}}")
+    //  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}}")
+    //  li.smtp-form
+    //    .title {{_ 'smtp-username'}}
+    //    .form-group
+    //      input.wekan-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="")
+    //  li.smtp-form
+    //    .title {{_ 'smtp-tls'}}
+    //    .form-group
+    //      a.flex.js-toggle-tls
+    //        .materialCheckBox#mail-server-tls(class="{{#if currentSetting.mailServer.enableTLS}}is-checked{{/if}}")
+    //
+    //        span {{_ 'smtp-tls-description'}}
+    //
+    //  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}}")
+    //
+    //  li
+    //    button.js-save.primary {{_ 'save'}}

    li
      button.js-send-smtp-test-email.primary {{_ 'send-smtp-test'}}

 template(name='accountSettings')
  ul#account-setting.setting-detail
+    li
+      button.js-all-hide-system-messages.primary {{_ 'hide-system-messages-of-all-users'}}
    li.accounts-form
      .title {{_ 'accounts-allowEmailChange'}}
      .form-group.flex
@@ -126,23 +131,18 @@ template(name='accountSettings')
        span {{_ 'yes'}}
        input.wekan-form-control#accounts-allowEmailChange(type="radio" name="allowEmailChange" value="false" checked="{{#unless allowEmailChange}}checked{{/unless}}")
        span {{_ 'no'}}
-    li
-    li.accounts-form
      .title {{_ 'accounts-allowUserNameChange'}}
      .form-group.flex
        input.wekan-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}}")
        span {{_ 'no'}}
-    li
      button.js-accounts-save.primary {{_ 'save'}}

 template(name='announcementSettings')
@@ -208,6 +208,10 @@ template(name='layoutSettings')
      .title {{_ 'custom-top-left-corner-logo-height'}}
      .form-group
        input.wekan-form-control#custom-top-left-corner-logo-height(type="text", placeholder="" value="{{currentSetting.customTopLeftCornerLogoHeight}}")
+    li.layout-form
+      .title {{_ 'automatic-linked-url-schemes'}}
+      .form-group
+        textarea#automatic-linked-url-schemes.wekan-form-control= currentSetting.automaticLinkedUrlSchemes
    li
      button.js-save-layout.primary {{_ 'save'}}

@@ -176,6 +176,9 @@ BlazeComponent.extendComponent({
    const textBelowCustomLoginLogo = $('#text-below-custom-login-logo')
      .val()
      .trim();
+    const automaticLinkedUrlSchemes = $('#automatic-linked-url-schemes')
+      .val()
+      .trim();
    const customTopLeftCornerLogoImageUrl = $(
      '#custom-top-left-corner-logo-image-url',
    )
@@ -209,6 +212,7 @@ BlazeComponent.extendComponent({
          customTopLeftCornerLogoHeight,
          displayAuthenticationMethod,
          defaultAuthenticationMethod,
+          automaticLinkedUrlSchemes,
        },
      });
    } catch (e) {
@@ -270,7 +274,6 @@ BlazeComponent.extendComponent({
      $set: { booleanValue: allowUserDelete },
    });
  },
-
  allowEmailChange() {
    return AccountSettings.findOne('accounts-allowEmailChange').booleanValue;
  },
@@ -280,12 +283,31 @@ BlazeComponent.extendComponent({
  allowUserDelete() {
    return AccountSettings.findOne('accounts-allowUserDelete').booleanValue;
  },
+  allHideSystemMessages() {
+    Meteor.call('setAllUsersHideSystemMessages', (err, ret) => {
+      if (!err && ret) {
+        if (ret === true) {
+          const message = `${TAPi18n.__(
+            'now-system-messages-of-all-users-are-hidden',
+          )}`;
+          alert(message);
+        }
+      } else {
+        const reason = err.reason || '';
+        const message = `${TAPi18n.__(err.error)}\n${reason}`;
+        alert(message);
+      }
+    });
+  },

  events() {
    return [
      {
        'click button.js-accounts-save': this.saveAccountsChange,
      },
+      {
+        'click button.js-all-hide-system-messages': this.allHideSystemMessages,
+      },
    ];
  },
 }).register('accountSettings');
@@ -3,22 +3,21 @@ template(name="settingHeaderBar")
    span {{_ 'admin-panel'}}

  .setting-header-btns.left
-    unless isMiniScreen
-      if currentUser
-        a.setting-header-btn.settings(href="{{pathFor 'setting'}}")
-          i.fa(class="fa-cog")
-          span {{_ 'settings'}}
+    if currentUser
+      a.setting-header-btn.settings(href="{{pathFor 'setting'}}")
+        i.fa(class="fa-cog")
+        span {{_ 'settings'}}

-        a.setting-header-btn.people(href="{{pathFor 'people'}}")
-          i.fa(class="fa-users")
-          span {{_ 'people'}}
+      a.setting-header-btn.people(href="{{pathFor 'people'}}")
+        i.fa(class="fa-users")
+        span {{_ 'people'}}

-        a.setting-header-btn.informations(href="{{pathFor 'information'}}")
-          i.fa(class="fa-info-circle")
-          span {{_ 'info'}}
+      a.setting-header-btn.informations(href="{{pathFor 'information'}}")
+        i.fa(class="fa-info-circle")
+        span {{_ 'info'}}

-      else
-        a.setting-header-btn.js-log-in(
-          title="{{_ 'log-in'}}")
-          i.fa.fa-sign-in
-          span {{_ 'log-in'}}
+    else
+      a.setting-header-btn.js-log-in(
+        title="{{_ 'log-in'}}")
+        i.fa.fa-sign-in
+        span {{_ 'log-in'}}
@@ -269,14 +269,16 @@ template(name="outgoingWebhooksPopup")

 template(name="boardMenuPopup")
  ul.pop-over-list
-    li
-      a.js-open-rules-view(title="{{_ 'rules'}}")
-        i.fa.fa-magic
-        | {{_ 'rules'}}
-    li
-      a.js-custom-fields
-        i.fa.fa-list-alt
-        | {{_ 'custom-fields'}}
+    if currentUser.isBoardAdmin
+      li
+        a.js-open-rules-view(title="{{_ 'rules'}}")
+          i.fa.fa-magic
+          | {{_ 'rules'}}
+    if currentUser.isBoardAdmin
+      li
+        a.js-custom-fields
+          i.fa.fa-list-alt
+          | {{_ 'custom-fields'}}
    li
      a.js-open-archives
        i.fa.fa-archive
@@ -286,79 +288,35 @@ template(name="boardMenuPopup")
        a.js-change-board-color
          i.fa.fa-paint-brush
          | {{_ 'board-change-color'}}
-
-    //-
-      XXX Language should be handled by sandstorm, but for now display a
-      language selection link in the board menu. This link is normally present
-      in the header bar that is not displayed on sandstorm.
-    if isSandstorm
-      li
-        a.js-change-language
-          i.fa.fa-flag
-          | {{_ 'language'}}
-  unless isSandstorm
-    if currentUser.isBoardAdmin
-      hr
-      ul.pop-over-list
-        if withApi
-          li
-            a.js-export-board
-              i.fa.fa-share-alt
-              | {{_ 'export-board'}}
-        li
-          a.js-outgoing-webhooks
-            i.fa.fa-globe
-            | {{_ 'outgoing-webhooks'}}
-        li
-          a.js-card-settings
-            i.fa.fa-id-card-o
-            | {{_ 'card-settings'}}
-        li
-          a.js-subtask-settings
-            i.fa.fa-sitemap
-            | {{_ 'subtask-settings'}}
-      unless currentBoard.isTemplatesBoard
-        hr
-        ul.pop-over-list
-          li
-            a.js-archive-board
-              i.fa.fa-arrow-right
-              i.fa.fa-archive
-              | {{_ 'archive-board'}}
-
-  if isSandstorm
-    hr
-    ul.pop-over-list
+  hr
+  ul.pop-over-list
+    if withApi
      li
        a.js-export-board
          i.fa.fa-share-alt
          | {{_ 'export-board'}}
-      li
-        a.js-import-board
-          i.fa.fa-share-alt
-          i.fa.fa-sign-in
-          | {{_ 'import-board-c'}}
-      li
-        a.js-archive-board
-          i.fa.fa-arrow-right
-          i.fa.fa-archive
-          | {{_ 'archive-board'}}
+    if currentUser.isBoardAdmin
      li
        a.js-outgoing-webhooks
          i.fa.fa-globe
          | {{_ 'outgoing-webhooks'}}
-    hr
-    ul.pop-over-list
      li
        a.js-card-settings
          i.fa.fa-id-card-o
          | {{_ 'card-settings'}}
-    hr
-    ul.pop-over-list
      li
        a.js-subtask-settings
          i.fa.fa-sitemap
          | {{_ 'subtask-settings'}}
+  unless currentBoard.isTemplatesBoard
+    if currentUser.isBoardAdmin
+      hr
+      ul.pop-over-list
+        li
+          a.js-archive-board
+            i.fa.fa-arrow-right
+            i.fa.fa-archive
+            | {{_ 'archive-board'}}

 template(name="exportBoard")
  ul.pop-over-list
@@ -366,6 +324,10 @@ template(name="exportBoard")
      a.download-json-link(href="{{exportUrl}}", download="{{exportJsonFilename}}")
        i.fa.fa-share-alt
        | {{_ 'export-board-json'}}
+    li
+      a(href="{{exportUrlExcel}}", download="{{exportFilenameExcel}}")
+        i.fa.fa-share-alt
+        | {{_ 'export-board-excel'}}
    li
      a(href="{{exportCsvUrl}}", download="{{exportCsvFilename}}")
        i.fa.fa-share-alt
@@ -155,6 +155,9 @@ Template.memberPopup.helpers({
  user() {
    return Users.findOne(this.userId);
  },
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
  memberType() {
    const type = Users.findOne(this.userId).isBoardAdmin() ? 'admin' : 'normal';
    if (type === 'normal') {
@@ -163,16 +166,16 @@ Template.memberPopup.helpers({
      const noComments = currentBoard.hasNoComments(this.userId);
      const worker = currentBoard.hasWorker(this.userId);
      if (commentOnly) {
-        return TAPi18n.__('comment-only').toLowerCase();
+        return TAPi18n.__('comment-only');
      } else if (noComments) {
-        return TAPi18n.__('no-comments').toLowerCase();
+        return TAPi18n.__('no-comments');
      } else if (worker) {
-        return TAPi18n.__('worker').toLowerCase();
+        return TAPi18n.__('worker');
      } else {
-        return TAPi18n.__(type).toLowerCase();
+        return TAPi18n.__(type);
      }
    } else {
-      return TAPi18n.__(type).toLowerCase();
+      return TAPi18n.__(type);
    }
  },
  isInvited() {
@@ -224,6 +227,9 @@ Template.boardMenuPopup.onCreated(function() {
 });

 Template.boardMenuPopup.helpers({
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
  withApi() {
    return Template.instance().apiEnabled.get();
  },
@@ -238,7 +244,7 @@ Template.boardMenuPopup.helpers({
  },
  exportFilename() {
    const boardId = Session.get('currentBoard');
-    return `wekan-export-board-${boardId}.json`;
+    return `export-board-${boardId}.json`;
  },
 });

@@ -249,11 +255,15 @@ Template.memberPopup.events({
  },
  'click .js-change-role': Popup.open('changePermissions'),
  'click .js-remove-member': Popup.afterConfirm('removeMember', function() {
+    // This works from removing member from board, card members and assignees.
    const boardId = Session.get('currentBoard');
    const memberId = this.userId;
    Cards.find({ boardId, members: memberId }).forEach(card => {
      card.unassignMember(memberId);
    });
+    Cards.find({ boardId, assignees: memberId }).forEach(card => {
+      card.unassignAssignee(memberId);
+    });
    Boards.findOne(boardId).removeMember(memberId);
    Popup.close();
  }),
@@ -294,6 +304,9 @@ Template.membersWidget.helpers({
      return false;
    }
  },
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
 });

 Template.membersWidget.events({
@@ -422,6 +435,23 @@ BlazeComponent.extendComponent({
    };
    return FlowRouter.path('/api/boards/:boardId/export', params, queryParams);
  },
+  exportUrlExcel() {
+    const params = {
+      boardId: Session.get('currentBoard'),
+    };
+    const queryParams = {
+      authToken: Accounts._storedLoginToken(),
+    };
+    return FlowRouter.path(
+      '/api/boards/:boardId/exportExcel',
+      params,
+      queryParams,
+    );
+  },
+  exportFilenameExcel() {
+    const boardId = Session.get('currentBoard');
+    return `export-board-excel-${boardId}.xlsx`;
+  },
  exportCsvUrl() {
    const params = {
      boardId: Session.get('currentBoard'),
@@ -451,15 +481,15 @@ BlazeComponent.extendComponent({
  },
  exportJsonFilename() {
    const boardId = Session.get('currentBoard');
-    return `wekan-export-board-${boardId}.json`;
+    return `export-board-${boardId}.json`;
  },
  exportCsvFilename() {
    const boardId = Session.get('currentBoard');
-    return `wekan-export-board-${boardId}.csv`;
+    return `export-board-${boardId}.csv`;
  },
  exportTsvFilename() {
    const boardId = Session.get('currentBoard');
-    return `wekan-export-board-${boardId}.tsv`;
+    return `export-board-${boardId}.tsv`;
  },
 }).register('exportBoardPopup');

@@ -475,6 +505,12 @@ Template.labelsWidget.events({
  'click .js-add-label': Popup.open('createLabel'),
 });

+Template.labelsWidget.helpers({
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+});
+
 // Board members can assign people or labels by drag-dropping elements from the
 // sidebar to the cards on the board. In order to re-initialize the jquery-ui
 // plugin any time a draggable member or label is modified or removed we use a
@@ -5,17 +5,24 @@ template(name="archivesSidebar")
        unless isWorker
          p.quiet
            a.js-restore-all-cards {{_ 'restore-all'}}
-            | -
-            a.js-delete-all-cards {{_ 'delete-all'}}
+            if currentUser.isBoardAdmin
+              | -
+              a.js-delete-all-cards {{_ 'delete-all'}}
        each archivedCards
          .minicard-wrapper.js-minicard
            +minicard(this)
          if currentUser.isBoardMember
            unless isWorker
              p.quiet
+                if this.archivedAt
+                  | {{_ 'archived-at' }}
+                  | 
+                  | {{ moment this.archivedAt 'LLL' }}
+                  br
                a.js-restore-card {{_ 'restore'}}
-                | -
-                a.js-delete-card {{_ 'delete'}}
+                if currentUser.isBoardAdmin
+                  | -
+                  a.js-delete-card {{_ 'delete'}}
            if cardIsInArchivedList
              p.quiet.small ({{_ 'warn-list-archived'}})
        else
@@ -25,8 +32,9 @@ template(name="archivesSidebar")
        unless isWorker
          p.quiet
            a.js-restore-all-lists {{_ 'restore-all'}}
-            | -
-            a.js-delete-all-lists {{_ 'delete-all'}}
+            if currentUser.isBoardAdmin
+              | -
+              a.js-delete-all-lists {{_ 'delete-all'}}
        ul.archived-lists
          each archivedLists
            li.archived-lists-item
@@ -34,9 +42,15 @@ template(name="archivesSidebar")
              if currentUser.isBoardMember
                unless isWorker
                  p.quiet
+                    if this.archivedAt
+                      | {{_ 'archived-at' }}
+                      | 
+                      | {{ moment this.archivedAt 'LLL' }}
+                      br
                    a.js-restore-list {{_ 'restore'}}
-                    | -
-                    a.js-delete-list {{_ 'delete'}}
+                    if currentUser.isBoardAdmin
+                      | -
+                      a.js-delete-list {{_ 'delete'}}
          else
            li.no-items-message {{_ 'no-archived-lists'}}

@@ -44,8 +58,9 @@ template(name="archivesSidebar")
        unless isWorker
          p.quiet
            a.js-restore-all-swimlanes {{_ 'restore-all'}}
-            | -
-            a.js-delete-all-swimlanes {{_ 'delete-all'}}
+            if currentUser.isBoardAdmin
+              | -
+              a.js-delete-all-swimlanes {{_ 'delete-all'}}
        ul.archived-lists
          each archivedSwimlanes
            li.archived-lists-item
@@ -53,9 +68,15 @@ template(name="archivesSidebar")
              if currentUser.isBoardMember
                unless isWorker
                  p.quiet
+                    if this.archivedAt
+                      | {{_ 'archived-at' }}
+                      | 
+                      | {{ moment this.archivedAt 'LLL' }}
+                      br
                    a.js-restore-swimlane {{_ 'restore'}}
-                    | -
-                    a.js-delete-swimlane {{_ 'delete'}}
+                    if currentUser.isBoardAdmin
+                      | -
+                      a.js-delete-swimlane {{_ 'delete'}}
          else
            li.no-items-message {{_ 'no-archived-swimlanes'}}
  else
@@ -31,24 +31,39 @@ BlazeComponent.extendComponent({
  },

  archivedCards() {
-    return Cards.find({
-      archived: true,
-      boardId: Session.get('currentBoard'),
-    });
+    return Cards.find(
+      {
+        archived: true,
+        boardId: Session.get('currentBoard'),
+      },
+      {
+        sort: { archivedAt: -1, modifiedAt: -1 },
+      },
+    );
  },

  archivedLists() {
-    return Lists.find({
-      archived: true,
-      boardId: Session.get('currentBoard'),
-    });
+    return Lists.find(
+      {
+        archived: true,
+        boardId: Session.get('currentBoard'),
+      },
+      {
+        sort: { archivedAt: -1, modifiedAt: -1 },
+      },
+    );
  },

  archivedSwimlanes() {
-    return Swimlanes.find({
-      archived: true,
-      boardId: Session.get('currentBoard'),
-    });
+    return Swimlanes.find(
+      {
+        archived: true,
+        boardId: Session.get('currentBoard'),
+      },
+      {
+        sort: { archivedAt: -1, modifiedAt: -1 },
+      },
+    );
  },

  cardIsInArchivedList() {
@@ -141,6 +156,9 @@ BlazeComponent.extendComponent({
 }).register('archivesSidebar');

 Template.archivesSidebar.helpers({
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
  isWorker() {
    const currentBoard = Boards.findOne(Session.get('currentBoard'));
    return (
@@ -59,6 +59,10 @@ template(name="createCustomFieldPopup")

            span {{_ 'automatically-field-on-card'}}

+        a.flex.js-field-always-on-card(class="{{#if alwaysOnCard}}is-checked{{/if}}")
+            .materialCheckBox(class="{{#if alwaysOnCard}}is-checked{{/if}}")
+            span {{_ 'always-field-on-card'}}
+
        a.flex.js-field-showLabel-on-card(class="{{#if showLabelOnMiniCard}}is-checked{{/if}}")
            .materialCheckBox(class="{{#if showLabelOnMiniCard}}is-checked{{/if}}")

@@ -16,7 +16,7 @@ BlazeComponent.extendComponent({
 }).register('customFieldsSidebar');

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

  _currencyList: [
    {
@@ -174,6 +174,14 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
          $target.find('.materialCheckBox').toggleClass('is-checked');
          $target.toggleClass('is-checked');
        },
+        'click .js-field-always-on-card'(evt) {
+          let $target = $(evt.target);
+          if (!$target.hasClass('js-field-always-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')) {
@@ -194,6 +202,8 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
              this.find('.js-field-showLabel-on-card.is-checked') !== null,
            automaticallyOnCard:
              this.find('.js-field-automatically-on-card.is-checked') !== null,
+            alwaysOnCard:
+              this.find('.js-field-always-on-card.is-checked') !== null,
          };

          // insert or update
@@ -155,7 +155,7 @@ template(name="multiselectionSidebar")
              i.fa.fa-check
            else if someSelectedElementHave 'member' _id
              i.fa.fa-ellipsis-h
-  unless currentUser.isWorker
+  if currentUser.isBoardAdmin
    hr
    a.sidebar-btn.js-move-selection
      i.fa.fa-share
@@ -134,6 +134,15 @@ BlazeComponent.extendComponent({
  },
 }).register('multiselectionSidebar');

+Template.multiselectionSidebar.helpers({
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+  isCommentOnly() {
+    return Meteor.user().isCommentOnly();
+  },
+});
+
 Template.disambiguateMultiLabelPopup.events({
  'click .js-remove-label'() {
    mutateSelectedCards('removeLabel', this._id);
@@ -157,7 +166,7 @@ Template.disambiguateMultiMemberPopup.events({
 });

 Template.moveSelectionPopup.events({
-  'click .js-select-list'(event) {
+  'click .js-select-list'() {
    // Move the minicard to the end of the target list
    mutateSelectedCards('moveToEndOfList', { listId: this._id });
    EscapeActions.executeUpTo('multiselection');
@@ -4,9 +4,9 @@ template(name="searchSidebar")
  .list-body
    .minilists.clearfix.js-minilists
      each (lists)
-        a.minilist-wrapper.js-minilist(href=absoluteUrl)
+        a.minilist-wrapper.js-minilist(href=originRelativeUrl)
          +minilist(this)
    .minicards.clearfix.js-minicards
      each (results)
-        a.minicard-wrapper.js-minicard(href=absoluteUrl)
+        a.minicard-wrapper.js-minicard(href=originRelativeUrl)
          +minicard(this)
@@ -1,5 +1,5 @@
 template(name="swimlaneHeader")
-  .swimlane-header-wrap.js-swimlane-header(class='{{#if colorClass}}swimlane-{{colorClass}}{{/if}}')
+  .swimlane-header-wrap.js-swimlane-header(class=colorClass)
    if this.isTemplateContainer
        +swimlaneFixedHeader(this)
    else
@@ -15,8 +15,9 @@ template(name="swimlaneFixedHeader")
        = title
  .swimlane-header-menu
    unless currentUser.isCommentOnly
-      a.fa.fa-plus.js-open-add-swimlane-menu.swimlane-header-plus-icon
-      a.fa.fa-navicon.js-open-swimlane-menu
+      if currentUser.isBoardAdmin
+        a.fa.fa-plus.js-open-add-swimlane-menu.swimlane-header-plus-icon
+        a.fa.fa-navicon.js-open-swimlane-menu
      unless isMiniScreen
        if showDesktopDragHandles
          a.swimlane-header-handle.handle.fa.fa-arrows.js-swimlane-header-handle
@@ -38,6 +39,8 @@ template(name="swimlaneActionPopup")
      hr
      ul.pop-over-list
        li: a.js-close-swimlane {{_ 'archive-swimlane'}}
+      ul.pop-over-list
+        li: a.js-move-swimlane {{_ 'move-swimlane'}}

 template(name="swimlaneAddPopup")
  unless currentUser.isCommentOnly
@@ -41,6 +41,12 @@ Template.swimlaneHeader.helpers({
  },
 });

+Template.swimlaneFixedHeader.helpers({
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+});
+
 Template.swimlaneActionPopup.events({
  'click .js-set-swimlane-color': Popup.open('setSwimlaneColor'),
  'click .js-close-swimlane'(event) {
@@ -48,6 +54,13 @@ Template.swimlaneActionPopup.events({
    this.archive();
    Popup.close();
  },
+  'click .js-move-swimlane': Popup.open('moveSwimlane'),
+});
+
+Template.swimlaneActionPopup.events({
+  isCommentOnly() {
+    return Meteor.user().isCommentOnly();
+  },
 });

 BlazeComponent.extendComponent({
@@ -45,18 +45,29 @@ template(name="listsGroup")
 template(name="addListForm")
  unless currentUser.isWorker
    .list.list-composer.js-list-composer(class="{{#if isMiniScreen}}mini-list{{/if}}")
-      .list-header-add
-        +inlinedForm(autoclose=false)
-          input.list-name-input.full-line(type="text" placeholder="{{_ 'add-list'}}"
-            autocomplete="off" autofocus)
-          .edit-controls.clearfix
-            button.primary.confirm(type="submit") {{_ 'save'}}
-            unless currentBoard.isTemplatesBoard
-              unless currentBoard.isTemplateBoard
-                span.quiet
-                  | {{_ 'or'}}
-                  a.js-list-template {{_ 'template'}}
-        else
-          a.open-list-composer.js-open-inlined-form
-            i.fa.fa-plus
-            | {{_ 'add-list'}}
+      if currentUser.isBoardAdmin
+        .list-header-add
+          +inlinedForm(autoclose=false)
+            input.list-name-input.full-line(type="text" placeholder="{{_ 'add-list'}}"
+              autocomplete="off" autofocus)
+            .edit-controls.clearfix
+              button.primary.confirm(type="submit") {{_ 'save'}}
+              unless currentBoard.isTemplatesBoard
+                unless currentBoard.isTemplateBoard
+                  span.quiet
+                    | {{_ 'or'}}
+                    a.js-list-template {{_ 'template'}}
+          else
+            a.open-list-composer.js-open-inlined-form
+              i.fa.fa-plus
+              | {{_ 'add-list'}}
+
+template(name="moveSwimlanePopup")
+  unless currentUser.isWorker
+    label {{_ 'boards'}}:
+    select.js-select-boards(autofocus)
+      each toBoard in toBoards
+        option(value="{{toBoard._id}}") {{toBoard.title}}
+
+  .edit-controls.clearfix
+    button.primary.confirm.js-done {{_ 'done'}}
@@ -85,14 +85,14 @@ function initSortable(boardComponent, $listsDom) {
    },
  });

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

  boardComponent.autorun(() => {
    let showDesktopDragHandles = false;
@@ -122,7 +122,8 @@ function initSortable(boardComponent, $listsDom) {
        'option',
        'disabled',
        // Disable drag-dropping when user is not member/is worker
-        !userIsMember() || Meteor.user().isWorker(),
+        //!userIsMember() || Meteor.user().isWorker(),
+        !Meteor.user().isBoardAdmin(),
        // Not disable drag-dropping while in multi-selection mode
        // MultiSelection.isActive() || !userIsMember(),
      );
@@ -274,12 +275,13 @@ Template.swimlane.helpers({
    }
  },
  canSeeAddList() {
-    return (
+    return Meteor.user().isBoardAdmin();
+    /*
      Meteor.user() &&
      Meteor.user().isBoardMember() &&
      !Meteor.user().isCommentOnly() &&
      !Meteor.user().isWorker()
-    );
+      */
  },
 });

@@ -321,3 +323,46 @@ BlazeComponent.extendComponent({
    initSortable(boardComponent, $listsDom);
  },
 }).register('listsGroup');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentSwimlane = this.currentData();
+  },
+
+  board() {
+    return Boards.findOne(Session.get('currentBoard'));
+  },
+
+  toBoards() {
+    const boards = Boards.find(
+      {
+        archived: false,
+        'members.userId': Meteor.userId(),
+        type: 'board',
+        _id: { $ne: this.board()._id },
+      },
+      {
+        sort: { title: 1 },
+      },
+    );
+
+    return boards;
+  },
+
+  events() {
+    return [
+      {
+        'click .js-done'() {
+          const swimlane = Swimlanes.findOne(this.currentSwimlane._id);
+          const bSelect = $('.js-select-boards')[0];
+          let boardId;
+          if (bSelect) {
+            boardId = bSelect.options[bSelect.selectedIndex].value;
+            Meteor.call('moveSwimlane', this.currentSwimlane._id, boardId);
+          }
+          Popup.close();
+        },
+      },
+    ];
+  },
+}).register('moveSwimlanePopup');