Merge branch 'devel'

6 files changed, 51 insertions, 22 deletions

diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade
index 37f537db..738cb598 100644
--- a/client/components/cards/minicard.jade
+++ b/client/components/cards/minicard.jade
@@ -4,10 +4,6 @@ template(name="minicard")
     class="{{#if isLinkedBoard}}linked-board{{/if}}")
     if cover
       .minicard-cover(style="background-image: url('{{cover.url}}');")
-    if labels
-      .minicard-labels
-        each labels
-          .minicard-label(class="card-label-{{color}}" title="{{name}}")
     .minicard-title
       if $eq 'prefix-with-full-path' currentBoard.presentParentTask
         .parent-prefix
@@ -80,3 +76,8 @@ template(name="minicard")
         .badge(class="{{#if checklistFinished}}is-finished{{/if}}")
           span.badge-icon.fa.fa-check-square-o
           span.badge-text.check-list-text {{checklistFinishedCount}}/{{checklistItemCount}}
+
+    if labels
+      .minicard-labels
+        each labels
+          .minicard-label(class="card-label-{{color}}" title="{{name}}")
diff --git a/client/components/lists/listBody.jade b/client/components/lists/listBody.jade
index 8069717e..f2b3e941 100644
--- a/client/components/lists/listBody.jade
+++ b/client/components/lists/listBody.jade
@@ -70,7 +70,7 @@ template(name="linkCardPopup")
   label {{_ 'cards'}}:
   select.js-select-cards
     each cards
-      option(value="{{_id}}") {{title}}
+      option(value="{{getId}}") {{getTitle}}
 
   .edit-controls.clearfix
     input.primary.confirm.js-done(type="button" value="{{_ 'link'}}")
diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js
index 83592a64..896bf178 100644
--- a/client/components/lists/listBody.js
+++ b/client/components/lists/listBody.js
@@ -333,21 +333,22 @@ BlazeComponent.extendComponent({
   },
 
   cards() {
+    const ownCardsIds = this.board.cards().map((card) => { return card.linkedId || card._id; });
     return Cards.find({
       boardId: this.selectedBoardId.get(),
       swimlaneId: this.selectedSwimlaneId.get(),
       listId: this.selectedListId.get(),
       archived: false,
-      linkedId: null,
-      _id: {$nin: this.board.cards().map((card) => { return card.linkedId || card._id; })},
+      linkedId: {$nin: ownCardsIds},
+      _id: {$nin: ownCardsIds},
     });
   },
 
   events() {
     return [{
       'change .js-select-boards'(evt) {
+        subManager.subscribe('board', $(evt.currentTarget).val());
         this.selectedBoardId.set($(evt.currentTarget).val());
-        subManager.subscribe('board', this.selectedBoardId.get());
       },
       'change .js-select-swimlanes'(evt) {
         this.selectedSwimlaneId.set($(evt.currentTarget).val());
@@ -438,14 +439,14 @@ BlazeComponent.extendComponent({
 
   results() {
     const board = Boards.findOne(this.selectedBoardId.get());
-    return board.searchCards(this.term.get(), true);
+    return board.searchCards(this.term.get(), false);
   },
 
   events() {
     return [{
       'change .js-select-boards'(evt) {
+        subManager.subscribe('board', $(evt.currentTarget).val());
         this.selectedBoardId.set($(evt.currentTarget).val());
-        subManager.subscribe('board', this.selectedBoardId.get());
       },
       'submit .js-search-term-form'(evt) {
         evt.preventDefault();
@@ -461,7 +462,7 @@ BlazeComponent.extendComponent({
           boardId: this.boardId,
           sort: Lists.findOne(this.listId).cards().count(),
           type: 'cardType-linkedCard',
-          linkedId: card._id,
+          linkedId: card.linkedId || card._id,
         });
         Filter.addException(_id);
         Popup.close();
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index 911f23f4..b0024b33 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -9,6 +9,7 @@ head
     packages.
   link(rel="shortcut icon" href="/wekan-favicon.png")
   link(rel="apple-touch-icon" href="/wekan-favicon.png")
+  link(rel="mask-icon" href="/wekan-150.svg")
   link(rel="manifest" href="/wekan-manifest.json")
 
 template(name="userFormsLayout")
diff --git a/client/components/settings/settingBody.jade b/client/components/settings/settingBody.jade
index 1832894c..dcf71f4d 100644
--- a/client/components/settings/settingBody.jade
+++ b/client/components/settings/settingBody.jade
@@ -55,6 +55,40 @@ template(name="general")
 
 template(name='email')
   ul#email-setting.setting-detail
+    li.smtp-form
+      .title {{_ 'smtp-host'}}
+      .description {{_ 'smtp-host-description'}}
+      .form-group
+        input.form-control#mail-server-host(type="text", placeholder="smtp.domain.com" value="{{currentSetting.mailServer.host}}")
+    li.smtp-form
+      .title {{_ 'smtp-port'}}
+      .description {{_ 'smtp-port-description'}}
+      .form-group
+        input.form-control#mail-server-port(type="text", placeholder="25" value="{{currentSetting.mailServer.port}}")
+    li.smtp-form
+      .title {{_ 'smtp-username'}}
+      .form-group
+        input.form-control#mail-server-username(type="text", placeholder="{{_ 'username'}}" value="{{currentSetting.mailServer.username}}")
+    li.smtp-form
+      .title {{_ 'smtp-password'}}
+      .form-group
+        input.form-control#mail-server-password(type="text", 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.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'}}
 
diff --git a/client/components/settings/settingBody.js b/client/components/settings/settingBody.js
index de96c100..7230d893 100644
--- a/client/components/settings/settingBody.js
+++ b/client/components/settings/settingBody.js
@@ -20,7 +20,7 @@ BlazeComponent.extendComponent({
   setLoading(w) {
     this.loading.set(w);
   },
-  /*
+
   checkField(selector) {
     const value = $(selector).val();
     if (!value || value.trim() === '') {
@@ -30,7 +30,7 @@ BlazeComponent.extendComponent({
       return value;
     }
   },
-*/
+
   currentSetting() {
     return Settings.findOne();
   },
@@ -55,11 +55,9 @@ BlazeComponent.extendComponent({
       $('.invite-people').slideDown();
     }
   },
-  /*
   toggleTLS() {
     $('#mail-server-tls').toggleClass('is-checked');
   },
-*/
   switchMenu(event) {
     const target = $(event.target);
     if (!target.hasClass('active')) {
@@ -101,13 +99,11 @@ BlazeComponent.extendComponent({
         // if (!err) {
         //   TODO - show more info to user
         // }
-
         this.setLoading(false);
       });
     }
   },
 
-  /*
   saveMailServerInfo() {
     this.setLoading(true);
     $('li').removeClass('has-error');
@@ -132,7 +128,7 @@ BlazeComponent.extendComponent({
     }
 
   },
-*/
+
   sendSMTPTestEmail() {
     Meteor.call('sendSMTPTestEmail', (err, ret) => {
       if (!err && ret) { /* eslint-disable no-console */
@@ -152,15 +148,11 @@ BlazeComponent.extendComponent({
   events() {
     return [{
       'click a.js-toggle-registration': this.toggleRegistration,
-      /*
       'click a.js-toggle-tls': this.toggleTLS,
-*/
       'click a.js-setting-menu': this.switchMenu,
       'click a.js-toggle-board-choose': this.checkBoard,
       'click button.js-email-invite': this.inviteThroughEmail,
-      /*
       'click button.js-save': this.saveMailServerInfo,
-*/
       'click button.js-send-smtp-test-email': this.sendSMTPTestEmail,
     }];
   },