4 files changed, 73 insertions, 23 deletions
diff --git a/client/components/rules/actions/cardActions.jade b/client/components/rules/actions/cardActions.jade
index 74ad9ab5..dd92d8fe 100644
--- a/client/components/rules/actions/cardActions.jade
+++ b/client/components/rules/actions/cardActions.jade
@@ -35,9 +35,36 @@ template(name="cardActions")
     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'}}}
+      div.trigger-dropdown
+        select(id="color-action")
+          option(value="white")         {{{_'color-white'}}}
+          option(value="green")         {{{_'color-green'}}}
+          option(value="yellow")        {{{_'color-yellow'}}}
+          option(value="orange")        {{{_'color-orange'}}}
+          option(value="red")           {{{_'color-red'}}}
+          option(value="purple")        {{{_'color-purple'}}}
+          option(value="blue")          {{{_'color-blue'}}}
+          option(value="sky")           {{{_'color-sky'}}}
+          option(value="lime")          {{{_'color-lime'}}}
+          option(value="pink")          {{{_'color-pink'}}}
+          option(value="black")         {{{_'color-black'}}}
+          option(value="silver")        {{{_'color-silver'}}}
+          option(value="peachpuff")     {{{_'color-peachpuff'}}}
+          option(value="crimson")       {{{_'color-crimson'}}}
+          option(value="plum")          {{{_'color-plum'}}}
+          option(value="darkgreen")     {{{_'color-darkgreen'}}}
+          option(value="slateblue")     {{{_'color-slateblue'}}}
+          option(value="magenta")       {{{_'color-magenta'}}}
+          option(value="gold")          {{{_'color-gold'}}}
+          option(value="navy")          {{{_'color-navy'}}}
+          option(value="gray")          {{{_'color-gray'}}}
+          option(value="saddlebrown")   {{{_'color-saddlebrown'}}}
+          option(value="paleturquoise") {{{_'color-paleturquoise'}}}
+          option(value="mistyrose")     {{{_'color-mistyrose'}}}
+          option(value="indigo")        {{{_'color-indigo'}}}
+    div.trigger-button.js-set-color-action.js-goto-rules
+      i.fa.fa-plus
diff --git a/client/components/rules/actions/cardActions.js b/client/components/rules/actions/cardActions.js
index b04440bd..b66556b4 100644
--- a/client/components/rules/actions/cardActions.js
+++ b/client/components/rules/actions/cardActions.js
@@ -112,6 +112,26 @@ BlazeComponent.extendComponent({
           boardId,
         });
       },
+      'click .js-set-color-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const selectedColor = this.find('#color-action').value;
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const triggerId = Triggers.insert(trigger);
+        const actionId = Actions.insert({
+          actionType: 'setColor',
+          selectedColor,
+          boardId,
+          desc,
+        });
+        Rules.insert({
+          title: ruleName,
+          triggerId,
+          actionId,
+          boardId,
+        });
+      },
     }];
   },
 
diff --git a/client/components/rules/triggers/cardTriggers.jade b/client/components/rules/triggers/cardTriggers.jade
index 4492502b..72c4b8db 100644
--- a/client/components/rules/triggers/cardTriggers.jade
+++ b/client/components/rules/triggers/cardTriggers.jade
@@ -1,13 +1,13 @@
 template(name="cardTriggers")
   div.trigger-item
     div.trigger-content
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-when-a-label-is'}}
       div.trigger-dropdown
         select(id="label-action")
           option(value="added") {{_'r-added-to'}}
           option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-a-card'}}
       div.trigger-button.trigger-button-person.js-show-user-field
         i.fa.fa-user
@@ -21,20 +21,20 @@ template(name="cardTriggers")
 
   div.trigger-item
     div.trigger-content
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-when-the-label-is'}}
       div.trigger-dropdown
         select(id="spec-label")
           each labels
-            option(value="#{_id}")
-              = name
-      div.trigger-text 
+            option(value="#{_id}" style="background-color: #{name}")
+              = translatedname
+      div.trigger-text
         | {{_'r-is'}}
       div.trigger-dropdown
         select(id="spec-label-action")
           option(value="added") {{_'r-added-to'}}
           option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-a-card'}}
       div.trigger-button.trigger-button-person.js-show-user-field
         i.fa.fa-user
@@ -48,13 +48,13 @@ template(name="cardTriggers")
 
   div.trigger-item
     div.trigger-content
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-when-a-member'}}
       div.trigger-dropdown
         select(id="gen-member-action")
           option(value="added") {{_'r-added-to'}}
           option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-a-card'}}
       div.trigger-button.trigger-button-person.js-show-user-field
         i.fa.fa-user
@@ -69,17 +69,17 @@ template(name="cardTriggers")
 
   div.trigger-item
     div.trigger-content
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-when-the-member'}}
       div.trigger-dropdown
-        input(id="spec-member",type=text,placeholder="{{_'r-name'}}") 
-      div.trigger-text 
+        input(id="spec-member",type=text,placeholder="{{_'r-name'}}")
+      div.trigger-text
         | {{_'r-is'}}
       div.trigger-dropdown
         select(id="spec-member-action")
           option(value="added") {{_'r-added-to'}}
           option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-a-card'}}
       div.trigger-button.trigger-button-person.js-show-user-field
         i.fa.fa-user
@@ -93,15 +93,15 @@ template(name="cardTriggers")
 
   div.trigger-item
     div.trigger-content
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-when-a-attach'}}
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-is'}}
       div.trigger-dropdown
         select(id="attach-action")
           option(value="added") {{_'r-added-to'}}
           option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-a-card'}}
       div.trigger-button.trigger-button-person.js-show-user-field
         i.fa.fa-user
diff --git a/client/components/rules/triggers/cardTriggers.js b/client/components/rules/triggers/cardTriggers.js
index 2303a85b..82b21d61 100644
--- a/client/components/rules/triggers/cardTriggers.js
+++ b/client/components/rules/triggers/cardTriggers.js
@@ -6,7 +6,10 @@ BlazeComponent.extendComponent({
     const labels = Boards.findOne(Session.get('currentBoard')).labels;
     for (let i = 0; i < labels.length; i++) {
       if (labels[i].name === '' || labels[i].name === undefined) {
-        labels[i].name = labels[i].color.toUpperCase();
+        labels[i].name = labels[i].color;
+        labels[i].translatedname = `${TAPi18n.__(`color-${  labels[i].color}`)}`;
+      } else {
+        labels[i].translatedname = labels[i].name;
       }
     }
     return labels;