diff options
| author | Angelo Gallarello <angelo.gallarell@gmail.com> | 2018-10-07 17:47:01 +0200 |
|---|---|---|
| committer | Angelo Gallarello <angelo.gallarell@gmail.com> | 2018-10-07 17:47:01 +0200 |
| commit | f19948f9936af6656d70ba629d56cbf40de77b2a (patch) | |
| tree | ea345824cdfe4b1023563d719df17be0c4883a38 /client | |
| parent | ebd884e654c45373dc56a03730a4ce670887ce8b (diff) | |
| download | wekan-f19948f9936af6656d70ba629d56cbf40de77b2a.tar.gz wekan-f19948f9936af6656d70ba629d56cbf40de77b2a.tar.bz2 wekan-f19948f9936af6656d70ba629d56cbf40de77b2a.zip | |
Added back button
Diffstat (limited to 'client')
| -rw-r--r-- | client/components/rules/ruleDetails.jade | 4 | ||||
| -rw-r--r-- | client/components/rules/rules.styl | 11 | ||||
| -rw-r--r-- | client/components/rules/rulesActions.jade | 6 | ||||
| -rw-r--r-- | client/components/rules/rulesMain.js | 9 | ||||
| -rw-r--r-- | client/components/rules/rulesTriggers.jade | 6 |
5 files changed, 34 insertions, 2 deletions
diff --git a/client/components/rules/ruleDetails.jade b/client/components/rules/ruleDetails.jade index b9a1351c..1f351357 100644 --- a/client/components/rules/ruleDetails.jade +++ b/client/components/rules/ruleDetails.jade @@ -14,5 +14,9 @@ template(name="ruleDetails") div.trigger-content div.trigger-text = action + div.rules-back + button.js-goback + i.fa.fa-chevron-left + | {{{_ 'r-back'}}}
\ No newline at end of file diff --git a/client/components/rules/rules.styl b/client/components/rules/rules.styl index 45ce4003..b52f84a7 100644 --- a/client/components/rules/rules.styl +++ b/client/components/rules/rules.styl @@ -32,6 +32,17 @@ display: inline-block float: right margin: auto +.rules-back + display: block + overflow: auto + margin-top: 15px + margin-bottom: 5px + button + display: inline-block + float: right + margin: auto + margin-right:14px + .flex display: -webkit-box display: -moz-box diff --git a/client/components/rules/rulesActions.jade b/client/components/rules/rulesActions.jade index 8dfceeeb..4bcff769 100644 --- a/client/components/rules/rulesActions.jade +++ b/client/components/rules/rulesActions.jade @@ -22,4 +22,8 @@ template(name="rulesActions") else if ($eq currentActions.get 'checklist') +checklistActions(ruleName=data.ruleName triggerVar=data.triggerVar) else if ($eq currentActions.get 'mail') - +mailActions(ruleName=data.ruleName triggerVar=data.triggerVar)
\ No newline at end of file + +mailActions(ruleName=data.ruleName triggerVar=data.triggerVar) + div.rules-back + button.js-goback + i.fa.fa-chevron-left + | {{{_ 'r-back'}}}
\ No newline at end of file diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index e0171b56..feb46d74 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -46,6 +46,15 @@ BlazeComponent.extendComponent({ event.preventDefault(); this.setRulesList(); }, + 'click .js-goback' (event) { + event.preventDefault(); + if(this.rulesCurrentTab.get() === 'trigger' || this.rulesCurrentTab.get() === 'ruleDetails' ){ + this.setRulesList(); + } + if(this.rulesCurrentTab.get() === 'action'){ + this.setTrigger(); + } + }, 'click .js-goto-details' (event) { event.preventDefault(); const rule = this.currentData(); diff --git a/client/components/rules/rulesTriggers.jade b/client/components/rules/rulesTriggers.jade index 0ef5edfa..01c0cad5 100644 --- a/client/components/rules/rulesTriggers.jade +++ b/client/components/rules/rulesTriggers.jade @@ -18,4 +18,8 @@ template(name="rulesTriggers") else if showCardTrigger.get +cardTriggers else if showChecklistTrigger.get - +checklistTriggers
\ No newline at end of file + +checklistTriggers + div.rules-back + button.js-goback + i.fa.fa-chevron-left + | {{{_ 'r-back'}}}
\ No newline at end of file |