summaryrefslogtreecommitdiffstats
path: root/client/components
diff options
context:
space:
mode:
authorAngelo Gallarello <angelo.gallarell@gmail.com>2018-12-31 00:45:11 +0100
committerAngelo Gallarello <angelo.gallarell@gmail.com>2018-12-31 00:45:11 +0100
commit196fef3a1bca7d2d4fbb07e6134c1de2a4338a97 (patch)
tree6705ca5d2163fcf4901a5afa8539f1c93a9a2be0 /client/components
parenta2d756074f05299248944ecce2cc87a9a28ab020 (diff)
downloadwekan-196fef3a1bca7d2d4fbb07e6134c1de2a4338a97.tar.gz
wekan-196fef3a1bca7d2d4fbb07e6134c1de2a4338a97.tar.bz2
wekan-196fef3a1bca7d2d4fbb07e6134c1de2a4338a97.zip
Added popup
Diffstat (limited to 'client/components')
-rw-r--r--client/components/rules/rules.styl9
-rw-r--r--client/components/rules/rulesMain.jade8
-rw-r--r--client/components/rules/rulesMain.js1
-rw-r--r--client/components/rules/triggers/boardTriggers.jade2
4 files changed, 19 insertions, 1 deletions
diff --git a/client/components/rules/rules.styl b/client/components/rules/rules.styl
index 4679e039..27463d12 100644
--- a/client/components/rules/rules.styl
+++ b/client/components/rules/rules.styl
@@ -123,6 +123,15 @@
.trigger-text
font-size: 16px
display:inline-block
+ .trigger-inline-button
+ font-size: 16px
+ display: inline;
+ padding: 6px;
+ border: 1px solid #eee
+ border-radius: 4px
+ box-shadow: inset -1px -1px 3px rgba(0,0,0,.05)
+ &:hover, &.is-active
+ box-shadow: 0 0 0 2px darken(white, 60%) inset
.trigger-text.trigger-text-email
margin-left: 5px;
margin-top: 10px;
diff --git a/client/components/rules/rulesMain.jade b/client/components/rules/rulesMain.jade
index dc33ee4e..d01d9f77 100644
--- a/client/components/rules/rulesMain.jade
+++ b/client/components/rules/rulesMain.jade
@@ -6,4 +6,10 @@ template(name="rulesMain")
if($eq rulesCurrentTab.get 'action')
+rulesActions(ruleName=ruleName triggerVar=triggerVar)
if($eq rulesCurrentTab.get 'ruleDetails')
- +ruleDetails(ruleId=ruleId) \ No newline at end of file
+ +ruleDetails(ruleId=ruleId)
+
+template(name="boardCardTitlePopup")
+ form
+ label
+ | Card Title Filter
+ input.js-board-name(type="text" value=title autofocus) \ No newline at end of file
diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js
index 566fd3e5..373c7502 100644
--- a/client/components/rules/rulesMain.js
+++ b/client/components/rules/rulesMain.js
@@ -31,6 +31,7 @@ BlazeComponent.extendComponent({
Triggers.remove(rule.triggerId);
},
+ 'click .js-open-card-title-popup': Popup.open('boardCardTitle'),
'click .js-goto-trigger' (event) {
event.preventDefault();
const ruleTitle = this.find('#ruleTitle').value;
diff --git a/client/components/rules/triggers/boardTriggers.jade b/client/components/rules/triggers/boardTriggers.jade
index abf2ee6d..f8767974 100644
--- a/client/components/rules/triggers/boardTriggers.jade
+++ b/client/components/rules/triggers/boardTriggers.jade
@@ -21,6 +21,8 @@ template(name="boardTriggers")
div.trigger-content
div.trigger-text
| {{_'r-when-a-card-is'}}
+ div.trigger-inline-button.js-open-card-title-popup
+ i.fa.fa-filter
div.trigger-text
| {{_'r-added-to'}}
div.trigger-text