Fixed rule allows

21 files changed, 244 insertions, 197 deletions

diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js
index 11b39126..f1414e44 100644
--- a/client/components/activities/activities.js
+++ b/client/components/activities/activities.js
@@ -67,9 +67,6 @@ BlazeComponent.extendComponent({
   lastLabel(){
     const lastLabelId = this.currentData().labelId;
     const lastLabel = Boards.findOne(Session.get('currentBoard')).getLabelById(lastLabelId);
-    console.log("LAST");
-    console.log(lastLabel);
-
     if(lastLabel.name == undefined || lastLabel.name == ""){
       return lastLabel.color;
     }else{
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade
index 5116de28..dfd281de 100644
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@@ -89,7 +89,7 @@ template(name="boardHeaderBar")
             i.fa.fa-times-thin
 
       a.board-header-btn.js-open-rules-view(title="{{_ 'rules'}}")
-        i.fa.fa-cutlery
+        i.fa.fa-magic
         span {{_ 'rules'}}
 
       a.board-header-btn.js-open-search-view(title="{{_ 'search'}}")
diff --git a/client/components/main/layouts.styl b/client/components/main/layouts.styl
index 109dcf7b..3457a028 100644
--- a/client/components/main/layouts.styl
+++ b/client/components/main/layouts.styl
@@ -64,7 +64,7 @@ body
   
   .modal-content-wide
     width: 800px
-    min-height: 160px
+    min-height: 0px
     margin: 42px auto
     padding: 12px
     border-radius: 4px
diff --git a/client/components/rules/actions/boardActions.jade b/client/components/rules/actions/boardActions.jade
index 81b2023d..dfeb3d84 100644
--- a/client/components/rules/actions/boardActions.jade
+++ b/client/components/rules/actions/boardActions.jade
@@ -2,28 +2,28 @@ template(name="boardActions")
   div.trigger-item
     div.trigger-content
       div.trigger-text 
-        | Move card to 
+        | {{{_'r-move-card-to'}}}
       div.trigger-dropdown
         select(id="move-gen-action")
-          option(value="top") Top of
-          option(value="bottom") Bottom of
+          option(value="top") {{{_'r-top-of'}}}
+          option(value="bottom") {{{_'r-bottom-of'}}}
       div.trigger-text 
-        | its list
+        | {{{_'r-its-list'}}}
     div.trigger-button.js-add-gen-move-action.js-goto-rules
       i.fa.fa-plus
 
   div.trigger-item
     div.trigger-content
       div.trigger-text 
-        | Move card to 
+        | {{{_'r-move-card-to'}}}
       div.trigger-dropdown
         select(id="move-spec-action")
-          option(value="top") Top of
-          option(value="bottom") Bottom of
+          option(value="top") {{{_'r-top-of'}}}
+          option(value="bottom") {{{_'r-bottom-of'}}}
       div.trigger-text 
-        | list
+        | {{{_'r-list'}}}
       div.trigger-dropdown
-        input(id="listName",type=text,placeholder="List Name")  
+        input(id="listName",type=text,placeholder="{{{_'r-name'}}}")  
     div.trigger-button.js-add-spec-move-action.js-goto-rules
       i.fa.fa-plus
 
@@ -31,10 +31,10 @@ template(name="boardActions")
     div.trigger-content
       div.trigger-dropdown
         select(id="arch-action")
-          option(value="archive") Archive
-          option(value="unarchive") Unarchive
+          option(value="archive") {{{_'r-archive'}}}
+          option(value="unarchive") {{{_'r-unarchive'}}}
       div.trigger-text 
-        | card
+        | {{{_'r-card'}}}
     div.trigger-button.js-add-arch-action.js-goto-rules
       i.fa.fa-plus  
 
diff --git a/client/components/rules/actions/boardActions.js b/client/components/rules/actions/boardActions.js
index 94c2778d..2b6fed57 100644
--- a/client/components/rules/actions/boardActions.js
+++ b/client/components/rules/actions/boardActions.js
@@ -12,48 +12,53 @@ BlazeComponent.extendComponent({
       const trigger = this.data().triggerVar.get();
       const actionSelected = this.find('#move-spec-action').value;
       const listTitle = this.find('#listName').value;
+      const boardId = Session.get('currentBoard');
+
       if(actionSelected == "top"){
        const triggerId = Triggers.insert(trigger);
-       const actionId = Actions.insert({actionType: "moveCardToTop","listTitle":listTitle});
-       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId});  
+       const actionId = Actions.insert({actionType: "moveCardToTop","listTitle":listTitle,"boardId":boardId});
+       console.log("Action inserted");
+       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
      }
      if(actionSelected == "bottom"){
        const triggerId = Triggers.insert(trigger);
-       const actionId = Actions.insert({actionType: "moveCardToBottom","listTitle":listTitle});
-       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId});  
+       const actionId = Actions.insert({actionType: "moveCardToBottom","listTitle":listTitle,"boardId":boardId});
+       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
      }
    },
    'click .js-add-gen-move-action'(event) {
-      const ruleName = this.data().ruleName.get();
-      const trigger = this.data().triggerVar.get();
-      const actionSelected = this.find('#move-gen-action').value;
-      if(actionSelected == "top"){
-       const triggerId = Triggers.insert(trigger);
-       const actionId = Actions.insert({actionType: "moveCardToTop","listTitle":"*"});
-       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId});  
-     }
-     if(actionSelected == "bottom"){
-       const triggerId = Triggers.insert(trigger);
-       const actionId = Actions.insert({actionType: "moveCardToBottom","listTitle":"*"});
-       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId});  
-     }
-   },
-   'click .js-add-arch-action'(event) {
-      const ruleName = this.data().ruleName.get();
-      const trigger = this.data().triggerVar.get();
-      const actionSelected = this.find('#arch-action').value;
-      if(actionSelected == "archive"){
-       const triggerId = Triggers.insert(trigger);
-       const actionId = Actions.insert({actionType: "archive"});
-       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId});  
-     }
-     if(actionSelected == "unarchive"){
-       const triggerId = Triggers.insert(trigger);
-       const actionId = Actions.insert({actionType: "unarchive"});
-       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId});  
-     }
-   },
- }];
+    const boardId = Session.get('currentBoard');
+    const ruleName = this.data().ruleName.get();
+    const trigger = this.data().triggerVar.get();
+    const actionSelected = this.find('#move-gen-action').value;
+    if(actionSelected == "top"){
+     const triggerId = Triggers.insert(trigger);
+     const actionId = Actions.insert({actionType: "moveCardToTop","listTitle":"*","boardId":boardId});
+     Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
+   }
+   if(actionSelected == "bottom"){
+     const triggerId = Triggers.insert(trigger);
+     const actionId = Actions.insert({actionType: "moveCardToBottom","listTitle":"*","boardId":boardId});
+     Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
+   }
+ },
+ 'click .js-add-arch-action'(event) {
+  const boardId = Session.get('currentBoard');
+  const ruleName = this.data().ruleName.get();
+  const trigger = this.data().triggerVar.get();
+  const actionSelected = this.find('#arch-action').value;
+  if(actionSelected == "archive"){
+   const triggerId = Triggers.insert(trigger);
+   const actionId = Actions.insert({actionType: "archive"});
+   Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
+ }
+ if(actionSelected == "unarchive"){
+   const triggerId = Triggers.insert(trigger);
+   const actionId = Actions.insert({actionType: "unarchive"});
+   Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
+ }
+},
+}];
 },
 
 }).register('boardActions');
\ No newline at end of file
diff --git a/client/components/rules/actions/cardActions.jade b/client/components/rules/actions/cardActions.jade
index 8d218a49..74ad9ab5 100644
--- a/client/components/rules/actions/cardActions.jade
+++ b/client/components/rules/actions/cardActions.jade
@@ -3,10 +3,10 @@ template(name="cardActions")
     div.trigger-content
       div.trigger-dropdown
         select(id="label-action")
-          option(value="add") Add
-          option(value="remove") Remove
+          option(value="add") {{{_'r-add'}}}
+          option(value="remove") {{{_'r-remove'}}}
       div.trigger-text 
-        | label
+        | {{{_'r-label'}}}
       div.trigger-dropdown
         select(id="label-id")
           each labels
@@ -19,19 +19,19 @@ template(name="cardActions")
     div.trigger-content
       div.trigger-dropdown
         select(id="member-action")
-          option(value="add") Add
-          option(value="remove") Removed
+          option(value="add") {{{_'r-add'}}}
+          option(value="remove") {{{_'r-remove'}}}
       div.trigger-text 
-        | member
+        | {{{_'r-member'}}}
       div.trigger-dropdown
-        input(id="member-name",type=text,placeholder="Member 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 
-        | Remove all member from the card 
+        | {{{_'r-remove-all'}}}
     div.trigger-button.js-add-removeall-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 48120d91..571020a8 100644
--- a/client/components/rules/actions/cardActions.js
+++ b/client/components/rules/actions/cardActions.js
@@ -24,16 +24,17 @@ BlazeComponent.extendComponent({
       const trigger = this.data().triggerVar.get();
       const actionSelected = this.find('#label-action').value;
       const labelId = this.find('#label-id').value;
+      const boardId = Session.get('currentBoard');
 
       if(actionSelected == "add"){
        const triggerId = Triggers.insert(trigger);
-       const actionId = Actions.insert({actionType: "addLabel","labelId":labelId});
-       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId});  
+       const actionId = Actions.insert({actionType: "addLabel","labelId":labelId,"boardId":boardId});
+       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
      }
      if(actionSelected == "remove"){
        const triggerId = Triggers.insert(trigger);
-       const actionId = Actions.insert({actionType: "removeLabel","labelId":labelId});
-       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId});  
+       const actionId = Actions.insert({actionType: "removeLabel","labelId":labelId,"boardId":boardId});
+       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
      }
 
    },
@@ -42,23 +43,25 @@ BlazeComponent.extendComponent({
       const trigger = this.data().triggerVar.get();
       const actionSelected = this.find('#member-action').value;
       const memberName = this.find('#member-name').value;
+      const boardId = Session.get('currentBoard');
       if(actionSelected == "add"){
        const triggerId = Triggers.insert(trigger);
-       const actionId = Actions.insert({actionType: "addMember","memberName":memberName});
-       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId});  
+       const actionId = Actions.insert({actionType: "addMember","memberName":memberName,"boardId":boardId});
+       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
      }
      if(actionSelected == "remove"){
        const triggerId = Triggers.insert(trigger);
-       const actionId = Actions.insert({actionType: "removeMember","memberName":memberName});
-       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId});  
+       const actionId = Actions.insert({actionType: "removeMember","memberName":memberName,"boardId":boardId});
+       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
      }
    },
    'click .js-add-removeall-action'(event) {
       const ruleName = this.data().ruleName.get();
       const trigger = this.data().triggerVar.get();
       const triggerId = Triggers.insert(trigger);
-      const actionId = Actions.insert({actionType: "removeMember","memberName":"*"});
-      Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId});
+      const boardId = Session.get('currentBoard');
+      const actionId = Actions.insert({actionType: "removeMember","memberName":"*","boardId":boardId});
+      Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});
    },
  }];
 },
diff --git a/client/components/rules/actions/checklistActions.jade b/client/components/rules/actions/checklistActions.jade
index c85ec078..8414a1a5 100644
--- a/client/components/rules/actions/checklistActions.jade
+++ b/client/components/rules/actions/checklistActions.jade
@@ -3,12 +3,12 @@ template(name="checklistActions")
     div.trigger-content
       div.trigger-dropdown
         select(id="check-action")
-          option(value="add") Add
-          option(value="remove") Remove
+          option(value="add") {{{_'r-add'}}}
+          option(value="remove") {{{_'r-remove'}}}
       div.trigger-text 
-        | checklist
+        | {{{_'r-checklist'}}}
       div.trigger-dropdown
-        input(id="checklist-name",type=text,placeholder="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") Check all
-          option(value="uncheck") Unchek all
+          option(value="check") {{{_'r-check-all'}}}
+          option(value="uncheck") {{{_'r-uncheck-all'}}}
       div.trigger-text 
-        | items of checklist
+        | {{{_'r-items-check'}}}
       div.trigger-dropdown
-        input(id="checklist-name2",type=text,placeholder="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,16 +30,16 @@ template(name="checklistActions")
     div.trigger-content
       div.trigger-dropdown
         select(id="check-item-action")
-          option(value="check") Check 
-          option(value="uncheck") Unchek
+          option(value="check") {{{_'r-check'}}}
+          option(value="uncheck") {{{_'r-uncheck'}}}
       div.trigger-text 
-        | item
+        | {{{_'r-item'}}}
       div.trigger-dropdown
-        input(id="checkitem-name",type=text,placeholder="name")
+        input(id="checkitem-name",type=text,placeholder="{{{_'r-name'}}}")
       div.trigger-text 
-        | of checklist
+        | {{{_'r-of-checklist'}}}
       div.trigger-dropdown
-        input(id="checklist-name3",type=text,placeholder="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
 
diff --git a/client/components/rules/actions/checklistActions.js b/client/components/rules/actions/checklistActions.js
index 2a70ca7f..e6989fc6 100644
--- a/client/components/rules/actions/checklistActions.js
+++ b/client/components/rules/actions/checklistActions.js
@@ -9,16 +9,17 @@ BlazeComponent.extendComponent({
       const trigger = this.data().triggerVar.get();
       const actionSelected = this.find('#check-action').value;
       const checklistName = this.find('#checklist-name').value;
+      const boardId = Session.get('currentBoard');
 
       if(actionSelected == "add"){
        const triggerId = Triggers.insert(trigger);
-       const actionId = Actions.insert({actionType: "addChecklist","checklistName":checklistName});
-       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId});  
+       const actionId = Actions.insert({actionType: "addChecklist","checklistName":checklistName,"boardId":boardId});
+       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
      }
      if(actionSelected == "remove"){
        const triggerId = Triggers.insert(trigger);
-       const actionId = Actions.insert({actionType: "removeChecklist","checklistName":checklistName});
-       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId});  
+       const actionId = Actions.insert({actionType: "removeChecklist","checklistName":checklistName,"boardId":boardId});
+       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
      }
 
    },
@@ -27,15 +28,16 @@ BlazeComponent.extendComponent({
     const trigger = this.data().triggerVar.get();
     const actionSelected = this.find('#checkall-action').value;
     const checklistName = this.find('#checklist-name2').value;
+    const boardId = Session.get('currentBoard');
     if(actionSelected == "check"){
      const triggerId = Triggers.insert(trigger);
-     const actionId = Actions.insert({actionType: "checkAll","checklistName":checklistName});
-     Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId});  
+     const actionId = Actions.insert({actionType: "checkAll","checklistName":checklistName,"boardId":boardId});
+     Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
    }
    if(actionSelected == "uncheck"){
      const triggerId = Triggers.insert(trigger);
-     const actionId = Actions.insert({actionType: "uncheckAll","checklistName":checklistName});
-     Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId});  
+     const actionId = Actions.insert({actionType: "uncheckAll","checklistName":checklistName,"boardId":boardId});
+     Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
    }
  },
  'click .js-add-check-item-action'(event) {
@@ -44,15 +46,16 @@ BlazeComponent.extendComponent({
   const checkItemName = this.find("#checkitem-name");
   const checklistName = this.find("#checklist-name3");
   const actionSelected = this.find('#check-item-action').value;
+  const boardId = Session.get('currentBoard');
   if(actionSelected == "check"){
     const triggerId = Triggers.insert(trigger);
-    const actionId = Actions.insert({actionType: "checkItem","checklistName":checklistName,"checkItemName":checkItemName});
-    Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId});  
+    const actionId = Actions.insert({actionType: "checkItem","checklistName":checklistName,"checkItemName":checkItemName,"boardId":boardId});
+    Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
   }
   if(actionSelected == "uncheck"){
     const triggerId = Triggers.insert(trigger);
-    const actionId = Actions.insert({actionType: "uncheckItem","checklistName":checklistName,"checkItemName":checkItemName});
-    Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId});  
+    const actionId = Actions.insert({actionType: "uncheckItem","checklistName":checklistName,"checkItemName":checkItemName,"boardId":boardId});
+    Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
   }
 },
 }];
diff --git a/client/components/rules/actions/mailActions.jade b/client/components/rules/actions/mailActions.jade
index 5680d430..c10fb384 100644
--- a/client/components/rules/actions/mailActions.jade
+++ b/client/components/rules/actions/mailActions.jade
@@ -2,10 +2,10 @@ template(name="mailActions")
   div.trigger-item.trigger-item-mail
     div.trigger-content.trigger-content-mail
       div.trigger-text.trigger-text-email
-        | Send an email
+        | {{{_'r-send-email'}}}
       div.trigger-dropdown-mail
-        input(id="email-to",type=text,placeholder="to")
-      input(id="email-subject",type=text,placeholder="subject")
+        input(id="email-to",type=text,placeholder="{{{_'r-to'}}}")
+      input(id="email-subject",type=text,placeholder="{{{_'r-subject'}}}")
       textarea(id="email-msg")  
     div.trigger-button.trigger-button-email.js-mail-action.js-goto-rules
       i.fa.fa-plus  
\ No newline at end of file
diff --git a/client/components/rules/actions/mailActions.js b/client/components/rules/actions/mailActions.js
index 0e4b539e..74f6659b 100644
--- a/client/components/rules/actions/mailActions.js
+++ b/client/components/rules/actions/mailActions.js
@@ -12,8 +12,9 @@ BlazeComponent.extendComponent({
       const trigger = this.data().triggerVar.get();
       const ruleName = this.data().ruleName.get();
       const triggerId = Triggers.insert(trigger);
-      const actionId = Actions.insert({actionType: "sendEmail","emailTo":emailTo,"emailSubject":emailSubject,"emailMsg":emailMsg});
-      Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId});  
+      const boardId = Session.get('currentBoard');
+      const actionId = Actions.insert({actionType: "sendEmail","emailTo":emailTo,"emailSubject":emailSubject,"emailMsg":emailMsg,"boardId":boardId});
+      Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
     },
   }];
 },
diff --git a/client/components/rules/ruleDetails.jade b/client/components/rules/ruleDetails.jade
new file mode 100644
index 00000000..9314151d
--- /dev/null
+++ b/client/components/rules/ruleDetails.jade
@@ -0,0 +1,8 @@
+template(name="ruleDetails")
+  .rules
+    h2
+      i.fa.fa-magic
+      | {{{_ 'r-rule-details' }}}
+
+    | trigger
+    | action
\ No newline at end of file
diff --git a/client/components/rules/ruleDetails.js b/client/components/rules/ruleDetails.js
new file mode 100644
index 00000000..572978ac
--- /dev/null
+++ b/client/components/rules/ruleDetails.js
@@ -0,0 +1,28 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.subscribe('allRules');
+  },
+
+  trigger(){
+    const rule = Rules.findOne({_id:ruleId});
+    return Triggers.findOne({_id:rule.triggerId});
+  },
+  action(){
+    const rule = Rules.findOne({_id:ruleId});
+    return Triggers.findOne({_id:rule.actionId});
+  },
+
+  events() {
+    return [{
+     }];
+  },
+
+}).register('ruleDetails');
+
+
+
+
+
+
+
+
diff --git a/client/components/rules/rulesActions.jade b/client/components/rules/rulesActions.jade
index 9fcecf46..8dfceeeb 100644
--- a/client/components/rules/rulesActions.jade
+++ b/client/components/rules/rulesActions.jade
@@ -1,7 +1,7 @@
 template(name="rulesActions")
   h2
-    i.fa.fa-cutlery
-    | Rule "#{data.ruleName.get}" - Add action
+    i.fa.fa-magic
+    | {{{_ 'r-rule' }}} "#{data.ruleName.get}" - {{{_ 'r-add-action'}}}
   .triggers-content
     .triggers-body
       .triggers-side-menu
diff --git a/client/components/rules/rulesList.jade b/client/components/rules/rulesList.jade
index a0d8143c..7f9e6946 100644
--- a/client/components/rules/rulesList.jade
+++ b/client/components/rules/rulesList.jade
@@ -1,8 +1,8 @@
 template(name="rulesList")
   .rules
     h2
-      i.fa.fa-cutlery
-      | Project rules
+      i.fa.fa-magic
+      | {{{_ 'r-board-rules' }}}
 
     ul.rules-list
       each rules
@@ -12,14 +12,16 @@ template(name="rulesList")
           div.rules-btns-group
             button
               i.fa.fa-eye
-              | View rule
-            button.js-delete-rule
-              i.fa.fa-trash-o
-              | Delete rule
+              | {{{_ 'r-view-rule'}}}
+            if currentUser.isAdmin
+              button.js-delete-rule
+                i.fa.fa-trash-o
+                | {{{_ 'r-delete-rule'}}}
       else
-        li.no-items-message No rules
-    div.rules-add
-      button.js-goto-trigger
-        i.fa.fa-plus
-        | Add rule
-      input(type=text,placeholder="New rule name",id="ruleTitle")
\ No newline at end of file
+        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")
\ No newline at end of file
diff --git a/client/components/rules/rulesMain.jade b/client/components/rules/rulesMain.jade
index 2c308223..3d03372f 100644
--- a/client/components/rules/rulesMain.jade
+++ b/client/components/rules/rulesMain.jade
@@ -1,7 +1,7 @@
 template(name="rulesMain")
-  if rulesListVar.get
+  if($eq rulesCurrentTab.get 'rulesList')
     +rulesList
-  else if rulesTriggerVar.get
+  if($eq rulesCurrentTab.get 'trigger')
     +rulesTriggers(ruleName=ruleName triggerVar=triggerVar)
-  else if rulesActionVar.get
+  if($eq rulesCurrentTab.get 'action')
     +rulesActions(ruleName=ruleName triggerVar=triggerVar)
\ No newline at end of file
diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js
index ee4886b6..0d7a5c6a 100644
--- a/client/components/rules/rulesMain.js
+++ b/client/components/rules/rulesMain.js
@@ -1,28 +1,24 @@
 BlazeComponent.extendComponent({
   onCreated() {
-    this.rulesListVar = new ReactiveVar(true);
-    this.rulesTriggerVar = new ReactiveVar(false);
-    this.rulesActionVar = new ReactiveVar(false);
+    this.rulesCurrentTab = new ReactiveVar("rulesList")
     this.ruleName = new ReactiveVar("");
     this.triggerVar = new ReactiveVar();
+    this.ruleId = new ReactiveVar();
   },
 
   setTrigger() {
-    this.rulesListVar.set(false);
-    this.rulesTriggerVar.set(true);
-    this.rulesActionVar.set(false);
+    this.rulesCurrentTab.set("trigger")
   },
 
   setRulesList() {
-    this.rulesListVar.set(true);
-    this.rulesTriggerVar.set(false);
-    this.rulesActionVar.set(false);
+    this.rulesCurrentTab.set("rulesList")
   },
 
   setAction() {
-    this.rulesListVar.set(false);
-    this.rulesTriggerVar.set(false);
-    this.rulesActionVar.set(true);
+    this.rulesCurrentTab.set("action")
+  },
+  setRuleDetails() {
+    this.rulesCurrentTab.set("ruleDetails")
   },
 
   events() {
@@ -48,6 +44,10 @@ BlazeComponent.extendComponent({
       event.preventDefault();
       this.setRulesList();
     },
+    'click .js-goto-details'(event) {
+      event.preventDefault();
+      this.setRuleDetails();
+    },
 
 
   }];
diff --git a/client/components/rules/rulesTriggers.jade b/client/components/rules/rulesTriggers.jade
index 2848ad33..0ef5edfa 100644
--- a/client/components/rules/rulesTriggers.jade
+++ b/client/components/rules/rulesTriggers.jade
@@ -1,7 +1,7 @@
 template(name="rulesTriggers")
   h2
-    i.fa.fa-cutlery
-    | Rule "#{data.ruleName.get}" - Add trigger
+    i.fa.fa-magic
+    | {{{_ 'r-rule' }}} "#{data.ruleName.get}" - {{{_ 'r-add-trigger'}}}
   .triggers-content
     .triggers-body
       .triggers-side-menu
diff --git a/client/components/rules/triggers/boardTriggers.jade b/client/components/rules/triggers/boardTriggers.jade
index 375f50ba..dec15d86 100644
--- a/client/components/rules/triggers/boardTriggers.jade
+++ b/client/components/rules/triggers/boardTriggers.jade
@@ -2,54 +2,54 @@ template(name="boardTriggers")
   div.trigger-item
     div.trigger-content
       div.trigger-text 
-        | When a card is
+        | {{{_'r-when-a-card-is'}}}
       div.trigger-dropdown
         select(id="gen-action")
-          option(value="created") Added to
-          option(value="removed") Removed from
+          option(value="created") {{{_'r-added-to'}}}
+          option(value="removed") {{{_'r-added-to'}}}
       div.trigger-text 
-        | the board
+        | {{{_'r-the-board'}}}
     div.trigger-button.js-add-gen-trigger.js-goto-action
       i.fa.fa-plus
 
   div.trigger-item
     div.trigger-content
       div.trigger-text 
-        | When a card is
+        | {{{_'r-when-a-card-is'}}}
       div.trigger-dropdown
         select(id="create-action")
-          option(value="created") Added to
-          option(value="removed") Removed from
+          option(value="created") {{{_'r-added-to'}}}
+          option(value="removed") {{{_'r-added-to'}}}
       div.trigger-text 
-        | list
+        | {{{_'r-list'}}}
       div.trigger-dropdown
-        input(id="create-list-name",type=text,placeholder="List Name")  
+        input(id="create-list-name",type=text,placeholder="{{{_'r-list-name'}}}")  
     div.trigger-button.js-add-create-trigger.js-goto-action
       i.fa.fa-plus
 
   div.trigger-item
     div.trigger-content
       div.trigger-text 
-        | When a card is
+        | {{{_'r-when-a-card-is'}}}
       div.trigger-dropdown
         select(id="move-action")
-          option(value="moved-to") Moved to
-          option(value="moved-from") Moved from
+          option(value="moved-to") {{{_'r-moved-to'}}}
+          option(value="moved-from") {{{_'r-moved-from'}}}
       div.trigger-text 
-        | list
+        | {{{_'r-list'}}}
       div.trigger-dropdown
-        input(id="move-list-name",type=text,placeholder="List Name")  
+        input(id="move-list-name",type=text,placeholder="{{{_'r-list-name'}}}")  
     div.trigger-button.js-add-moved-trigger.js-goto-action
       i.fa.fa-plus
 
   div.trigger-item
     div.trigger-content
       div.trigger-text 
-        | When a card is
+        | {{{_'r-when-a-card-is'}}}
       div.trigger-dropdown
         select(id="arch-action")
-          option(value="archived") Archived
-          option(value="unarchived") Unarchived
+          option(value="archived") {{{_'r-archived'}}}
+          option(value="unarchived") {{{_'r-unarchived'}}}
     div.trigger-button.js-add-arch-trigger.js-goto-action
       i.fa.fa-plus
 
diff --git a/client/components/rules/triggers/cardTriggers.jade b/client/components/rules/triggers/cardTriggers.jade
index 9675324f..a459a7e0 100644
--- a/client/components/rules/triggers/cardTriggers.jade
+++ b/client/components/rules/triggers/cardTriggers.jade
@@ -2,20 +2,20 @@ template(name="cardTriggers")
   div.trigger-item
     div.trigger-content
       div.trigger-text 
-        | When a label is
+        | {{{_'r-when-a-label-is'}}}
       div.trigger-dropdown
         select(id="label-action")
-          option(value="added") Added to
-          option(value="removed") Removed from
+          option(value="added") {{{_'r-added-to'}}}
+          option(value="removed") {{{_'r-removed-from'}}}
       div.trigger-text 
-        | a card 
+        | {{{_'r-a-card'}}}
     div.trigger-button.js-add-gen-label-trigger.js-goto-action
       i.fa.fa-plus
 
   div.trigger-item
     div.trigger-content
       div.trigger-text 
-        | When the label
+        | {{{_'r-when-the-label-is'}}}
       div.trigger-dropdown
         select(id="spec-label")
           each labels
@@ -25,23 +25,23 @@ template(name="cardTriggers")
         | is
       div.trigger-dropdown
         select(id="spec-label-action")
-          option(value="added") Added to
-          option(value="removed") Removed from
+          option(value="added") {{{_'r-added-to'}}}
+          option(value="removed") {{{_'r-removed-from'}}}
       div.trigger-text 
-        | a card 
+        | {{{_'r-a-card'}}}
     div.trigger-button.js-add-spec-label-trigger.js-goto-action
       i.fa.fa-plus
 
   div.trigger-item
     div.trigger-content
       div.trigger-text 
-        | When a member is
+        | {{{_'r-when-a-member'}}}
       div.trigger-dropdown
         select(id="gen-member-action")
-          option(value="added") Added to
-          option(value="removed") Removed from
+          option(value="added") {{{_'r-added-to'}}}
+          option(value="removed") {{{_'r-removed-from'}}}
       div.trigger-text 
-        | a card 
+        | {{{_'r-a-card'}}}
     div.trigger-button.js-add-gen-member-trigger.js-goto-action
       i.fa.fa-plus
 
@@ -49,31 +49,31 @@ template(name="cardTriggers")
   div.trigger-item
     div.trigger-content
       div.trigger-text 
-        | When the member
+        | {{{_'r-when-the-member'}}}
       div.trigger-dropdown
-        input(id="spec-member",type=text,placeholder="name") 
+        input(id="spec-member",type=text,placeholder="{{{_'r-name'}}}") 
       div.trigger-text 
-        | is
+        | {{{_'r-is'}}}
       div.trigger-dropdown
         select(id="spec-member-action")
-          option(value="added") Added to
-          option(value="removed") Removed from
+          option(value="added") {{{_'r-added-to'}}}
+          option(value="removed") {{{_'r-removed-from'}}}
       div.trigger-text 
-        | a card 
+        | {{{_'r-a-card'}}}
     div.trigger-button.js-add-spec-member-trigger.js-goto-action
       i.fa.fa-plus
 
   div.trigger-item
     div.trigger-content
       div.trigger-text 
-        | When an attachment
+        | {{{_'r-when-a-attach'}}}
       div.trigger-text 
-        | is
+        | {{{_'r-is'}}}
       div.trigger-dropdown
         select(id="attach-action")
-          option(value="added") Added to
-          option(value="removed") Removed from
+          option(value="added") {{{_'r-added-to'}}}
+          option(value="removed") {{{_'r-removed-from'}}}
       div.trigger-text 
-        | a card 
+        | {{{_'r-a-card'}}}
     div.trigger-button.js-add-attachment-trigger.js-goto-action
       i.fa.fa-plus
\ No newline at end of file
diff --git a/client/components/rules/triggers/checklistTriggers.jade b/client/components/rules/triggers/checklistTriggers.jade
index e7d6d34e..465713c8 100644
--- a/client/components/rules/triggers/checklistTriggers.jade
+++ b/client/components/rules/triggers/checklistTriggers.jade
@@ -2,13 +2,13 @@ template(name="checklistTriggers")
   div.trigger-item
     div.trigger-content
       div.trigger-text 
-        | When a checklist is
+        | {{{_'r-when-a-checklist'}}}
       div.trigger-dropdown
         select(id="gen-check-action")
-          option(value="created") Added to
-          option(value="removed") Removed from
+          option(value="created") {{{_'r-added-to'}}}
+          option(value="removed") {{{_'r-removed-from'}}}
       div.trigger-text 
-        | a card 
+        | {{{_'r-a-card'}}}
     div.trigger-button.js-add-gen-check-trigger.js-goto-action
       i.fa.fa-plus
 
@@ -16,68 +16,68 @@ template(name="checklistTriggers")
   div.trigger-item
     div.trigger-content
       div.trigger-text 
-        | When the checklist
+        | {{{_'r-when-the-checklist'}}}
       div.trigger-dropdown
-        input(id="check-name",type=text,placeholder="Name") 
+        input(id="check-name",type=text,placeholder="{{{_'r-name'}}}") 
       div.trigger-text 
-        | is
+        | {{{_'r-is'}}}
       div.trigger-dropdown
         select(id="spec-check-action")
-          option(value="created") Added to
-          option(value="removed") Removed from
+          option(value="created") {{{_'r-added-to'}}}
+          option(value="removed") {{{_'r-removed-from'}}}
       div.trigger-text 
-        | a card 
+        | {{{_'r-a-card'}}}
     div.trigger-button.js-add-spec-check-trigger.js-goto-action
       i.fa.fa-plus
 
   div.trigger-item
     div.trigger-content
       div.trigger-text 
-        | When a checklist is
+        | {{{_'r-when-a-checklist'}}}
       div.trigger-dropdown
         select(id="gen-comp-check-action")
-          option(value="completed") Completed
-          option(value="uncompleted") Made incomplete
+          option(value="completed") {{{_'r-completed'}}}
+          option(value="uncompleted") {{{_'r-made-incomplete'}}}
     div.trigger-button.js-add-gen-comp-trigger.js-goto-action
       i.fa.fa-plus
 
   div.trigger-item
     div.trigger-content
       div.trigger-text 
-        | When the checklist
+        | {{{_'r-when-the-checklist'}}}
       div.trigger-dropdown
-        input(id="spec-comp-check-name",type=text,placeholder="Name") 
+        input(id="spec-comp-check-name",type=text,placeholder="{{{_'r-name'}}}") 
       div.trigger-text 
-        | is
+        | {{{_'r-is'}}}
       div.trigger-dropdown
         select(id="spec-comp-check-action")
-          option(value="completed") Completed
-          option(value="uncompleted") Made incomplete
+          option(value="completed") {{{_'r-completed'}}}
+          option(value="uncompleted") {{{_'r-made-incomplete'}}}
     div.trigger-button.js-add-spec-comp-trigger.js-goto-action
       i.fa.fa-plus
 
   div.trigger-item
     div.trigger-content
       div.trigger-text 
-        | When a checklist item is
+        | {{{_'r-when-a-item'}}}
       div.trigger-dropdown
         select(id="check-item-gen-action")
-          option(value="checked") Checked
-          option(value="unchecked") Unchecked
+          option(value="checked") {{{_'r-checked'}}}
+          option(value="unchecked") {{{_'r-unchecked'}}}
     div.trigger-button.js-add-gen-check-item-trigger.js-goto-action
       i.fa.fa-plus
 
   div.trigger-item
     div.trigger-content
       div.trigger-text 
-        | When the checklist item 
+        | {{{_'r-when-the-item'}}}
       div.trigger-dropdown
-        input(id="check-item-name",type=text,placeholder="Name") 
+        input(id="check-item-name",type=text,placeholder="{{{_'r-name'}}}") 
       div.trigger-text 
-        | is
+        | {{{_'r-is'}}}
       div.trigger-dropdown
         select(id="check-item-spec-action")
-          option(value="checked") Checked
-          option(value="unchecked") Unchecked
+          option(value="checked") {{{_'r-checked'}}}
+          option(value="unchecked") {{{_'r-unchecked'}}}
     div.trigger-button.js-add-spec-check-item-trigger.js-goto-action
       i.fa.fa-plus
\ No newline at end of file