summaryrefslogtreecommitdiffstats
path: root/client/components/boards
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-09-16 03:33:45 +0300
committerLauri Ojansivu <x@xet7.org>2018-09-16 03:33:45 +0300
commitb23cbbf9259ac535129cbf431cefe18fa774dd7f (patch)
tree9e4cccadff9a228f6525fd5722da3a3f290d1ff7 /client/components/boards
parent053757f135b54241b4899a83cd3bb749b1e81bc9 (diff)
parent4f299b72f731ffb836871cd19361a6359e3bdfed (diff)
downloadwekan-b23cbbf9259ac535129cbf431cefe18fa774dd7f.tar.gz
wekan-b23cbbf9259ac535129cbf431cefe18fa774dd7f.tar.bz2
wekan-b23cbbf9259ac535129cbf431cefe18fa774dd7f.zip
Merge branch 'Angtrim-feature-rules' into devel
Diffstat (limited to 'client/components/boards')
-rw-r--r--client/components/boards/boardHeader.jade9
-rw-r--r--client/components/boards/boardHeader.js3
2 files changed, 12 insertions, 0 deletions
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade
index 1c6c8f8c..dfd281de 100644
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@@ -88,6 +88,10 @@ template(name="boardHeaderBar")
a.board-header-btn-close.js-filter-reset(title="{{_ 'filter-clear'}}")
i.fa.fa-times-thin
+ a.board-header-btn.js-open-rules-view(title="{{_ 'rules'}}")
+ i.fa.fa-magic
+ span {{_ 'rules'}}
+
a.board-header-btn.js-open-search-view(title="{{_ 'search'}}")
i.fa.fa-search
span {{_ 'search'}}
@@ -290,6 +294,11 @@ template(name="boardChangeTitlePopup")
textarea.js-board-desc= description
input.primary.wide(type="submit" value="{{_ 'rename'}}")
+template(name="boardCreateRulePopup")
+ p {{_ 'close-board-pop'}}
+ button.js-confirm.negate.full(type="submit") {{_ 'archive'}}
+
+
template(name="archiveBoardPopup")
p {{_ 'close-board-pop'}}
button.js-confirm.negate.full(type="submit") {{_ 'archive'}}
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index 2dfd58c1..89f686ab 100644
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@@ -108,6 +108,9 @@ BlazeComponent.extendComponent({
'click .js-open-search-view'() {
Sidebar.setView('search');
},
+ 'click .js-open-rules-view'() {
+ Modal.openWide('rulesMain');
+ },
'click .js-multiselection-activate'() {
const currentCard = Session.get('currentCard');
MultiSelection.activate();