summaryrefslogtreecommitdiffstats
path: root/client/components/boards
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-05-18 16:22:53 +0300
committerLauri Ojansivu <x@xet7.org>2018-05-18 16:22:53 +0300
commit50f751e0a9f8214d690f6fd39136d09a46a8e69a (patch)
tree3a0e58883030abbfa8eb454d181356a8be299d79 /client/components/boards
parent61b240d126bcce7adcdb303c5b01a202dc7fa395 (diff)
parent1984a6b1c80dbd8b4eff89aa92913f943bacc63b (diff)
downloadwekan-50f751e0a9f8214d690f6fd39136d09a46a8e69a.tar.gz
wekan-50f751e0a9f8214d690f6fd39136d09a46a8e69a.tar.bz2
wekan-50f751e0a9f8214d690f6fd39136d09a46a8e69a.zip
Merge branch 'devel' into greenkeeper/initial
Diffstat (limited to 'client/components/boards')
-rw-r--r--client/components/boards/boardHeader.jade1
-rw-r--r--client/components/boards/boardHeader.js4
2 files changed, 5 insertions, 0 deletions
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade
index fe0771cb..b4ccd3b3 100644
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@@ -113,6 +113,7 @@ template(name="boardHeaderBar")
template(name="boardMenuPopup")
ul.pop-over-list
+ li: a.js-custom-fields {{_ 'custom-fields'}}
li: a.js-open-archives {{_ 'archived-items'}}
if currentUser.isBoardAdmin
li: a.js-change-board-color {{_ 'board-change-color'}}
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index 2b587831..e0b19246 100644
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@@ -1,5 +1,9 @@
Template.boardMenuPopup.events({
'click .js-rename-board': Popup.open('boardChangeTitle'),
+ 'click .js-custom-fields'() {
+ Sidebar.setView('customFields');
+ Popup.close();
+ },
'click .js-open-archives'() {
Sidebar.setView('archives');
Popup.close();