2 files changed, 60 insertions, 45 deletions
diff --git a/client/components/rules/triggers/boardTriggers.jade b/client/components/rules/triggers/boardTriggers.jade
index f8767974..dae3351e 100644
--- a/client/components/rules/triggers/boardTriggers.jade
+++ b/client/components/rules/triggers/boardTriggers.jade
@@ -1,29 +1,13 @@
 template(name="boardTriggers")
-  div.trigger-item
+  div.trigger-item#trigger-two
     div.trigger-content
       div.trigger-text 
-        | {{_'r-when-a-card-is'}}
-      div.trigger-text 
-        | {{_'r-added-to'}}
-      div.trigger-text 
-        | {{_'r-the-board'}}
-      div.trigger-button.trigger-button-person.js-show-user-field
-        i.fa.fa-user
-      div.user-details.hide-element
-        div.trigger-text
-          | {{_'r-by'}}
-        div.trigger-dropdown
-          input(class="user-name",type=text,placeholder="{{_'r-user-name'}}") 
-    div.trigger-button.js-add-gen-trigger.js-goto-action
-      i.fa.fa-plus
-
-  div.trigger-item
-    div.trigger-content
-      div.trigger-text 
-        | {{_'r-when-a-card-is'}}
+        | {{_'r-when-a-card'}}
       div.trigger-inline-button.js-open-card-title-popup 
         i.fa.fa-filter
       div.trigger-text 
+        | {{_'r-is'}}
+      div.trigger-text 
         | {{_'r-added-to'}}
       div.trigger-text 
         | {{_'r-list'}}
@@ -43,10 +27,14 @@ template(name="boardTriggers")
     div.trigger-button.js-add-create-trigger.js-goto-action
       i.fa.fa-plus
 
-  div.trigger-item
+  div.trigger-item#trigger-three
     div.trigger-content
       div.trigger-text 
-        | {{_'r-when-a-card-is-moved'}}
+        | {{_'r-when-a-card'}}
+      div.trigger-inline-button.js-open-card-title-popup 
+        i.fa.fa-filter
+      div.trigger-text 
+        | {{_'r-is-moved'}}
       div.trigger-button.trigger-button-person.js-show-user-field
         i.fa.fa-user
       div.user-details.hide-element
@@ -57,10 +45,14 @@ template(name="boardTriggers")
     div.trigger-button.js-add-gen-moved-trigger.js-goto-action
       i.fa.fa-plus
 
-  div.trigger-item
+  div.trigger-item#trigger-four
     div.trigger-content
       div.trigger-text 
-        | {{_'r-when-a-card-is'}}
+        | {{_'r-when-a-card'}}
+      div.trigger-inline-button.js-open-card-title-popup 
+        i.fa.fa-filter
+      div.trigger-text 
+        | {{_'r-is'}}
       div.trigger-dropdown
         select(id="move-action")
           option(value="moved-to") {{_'r-moved-to'}}
@@ -84,10 +76,14 @@ template(name="boardTriggers")
     div.trigger-button.js-add-moved-trigger.js-goto-action
       i.fa.fa-plus
 
-  div.trigger-item
+  div.trigger-item#trigger-five
     div.trigger-content
       div.trigger-text 
-        | {{_'r-when-a-card-is'}}
+        | {{_'r-when-a-card'}}
+      div.trigger-inline-button.js-open-card-title-popup 
+        i.fa.fa-filter
+      div.trigger-text 
+        | {{_'r-is'}}
       div.trigger-dropdown
         select(id="arch-action")
           option(value="archived") {{_'r-archived'}}
@@ -102,6 +98,12 @@ template(name="boardTriggers")
     div.trigger-button.js-add-arch-trigger.js-goto-action
       i.fa.fa-plus
 
+template(name="boardCardTitlePopup")
+    form
+      label
+        | Card Title Filter
+        input.js-card-filter-name(type="text" value=title autofocus)
+      input.js-card-filter-button.primary.wide(type="submit" value="{{_ 'set-filter'}}")
 
    
   
diff --git a/client/components/rules/triggers/boardTriggers.js b/client/components/rules/triggers/boardTriggers.js
index b822d643..1a7948de 100644
--- a/client/components/rules/triggers/boardTriggers.js
+++ b/client/components/rules/triggers/boardTriggers.js
@@ -1,34 +1,36 @@
 BlazeComponent.extendComponent({
   onCreated() {
-
+    this.provaVar = new ReactiveVar('');
+    this.currentPopupTriggerId = "def";
+    this.cardTitleFilters = {};
+  },
+  setNameFilter(name){
+    this.cardTitleFilters[this.currentPopupTriggerId] =  name;
   },
 
   events() {
     return [{
-      'click .js-add-gen-trigger' (event) {
-        const desc = Utils.getTriggerActionDesc(event, this);
-        const datas = this.data();
-        const boardId = Session.get('currentBoard');
-        datas.triggerVar.set({
-            activityType: 'createCard',
-            boardId,
-            'listName': '*',
-            desc,
-          });
-
+      'click .js-open-card-title-popup'(event){
+        var funct = Popup.open('boardCardTitle');
+        let divId = $(event.currentTarget.parentNode.parentNode).attr("id");
+        console.log("current popup");
+        console.log(this.currentPopupTriggerId);
+        this.currentPopupTriggerId = divId;
+        funct.call(this,event);
       },
       'click .js-add-create-trigger' (event) {
         const desc = Utils.getTriggerActionDesc(event, this);
         const datas = this.data();
         const listName = this.find('#create-list-name').value;
         const swimlaneName = this.find('#create-swimlane-name').value;
-        if(swimlaneName == undefined || swimlaneName == ""){
-          swimlaneName = "*";
-        }
         const boardId = Session.get('currentBoard');
+        const divId = $(event.currentTarget.parentNode).attr("id");
+        const cardTitle = this.cardTitleFilters[divId];
+        // move to generic funciont
         datas.triggerVar.set({
             activityType: 'createCard',
             boardId,
+            cardTitle,
             swimlaneName,
             listName,
             desc,
@@ -41,9 +43,6 @@ BlazeComponent.extendComponent({
         const actionSelected = this.find('#move-action').value;
         const listName = this.find('#move-list-name').value;
         const boardId = Session.get('currentBoard');
-        if(swimlaneName == undefined || swimlaneName == ""){
-          swimlaneName = "*";
-        }
         if (actionSelected === 'moved-to') {
           datas.triggerVar.set({
             activityType: 'moveCard',
@@ -71,8 +70,9 @@ BlazeComponent.extendComponent({
         const boardId = Session.get('currentBoard');
 
         datas.triggerVar.set({
-          activityType: 'moveCard',
+          'activityType': 'moveCard',
           boardId,
+          'swimlaneName': '*',
           'listName':'*',
           'oldListName': '*',
           desc,
@@ -103,3 +103,16 @@ BlazeComponent.extendComponent({
   },
 
 }).register('boardTriggers');
+
+
+
+
+
+Template.boardCardTitlePopup.events({
+  submit(evt, tpl) {
+    const title = tpl.$('.js-card-filter-name').val().trim();
+    Popup.getOpenerComponent().setNameFilter(title);
+    evt.preventDefault();
+    Popup.close();
+  },
+});