summaryrefslogtreecommitdiffstats
path: root/client/components
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2017-02-03 11:07:48 +0200
committerGitHub <noreply@github.com>2017-02-03 11:07:48 +0200
commit8bd7d624da47c7958052806b3443c4e59804103b (patch)
treef02fd2f40e8005cc4122eb3d1149958837031727 /client/components
parent40594485d869be1638ea619bf655cc1de2e079db (diff)
parent5b58b0b40c876ed58fb40f51436d05505d8b1548 (diff)
downloadwekan-8bd7d624da47c7958052806b3443c4e59804103b.tar.gz
wekan-8bd7d624da47c7958052806b3443c4e59804103b.tar.bz2
wekan-8bd7d624da47c7958052806b3443c4e59804103b.zip
Merge pull request #65 from BaobabCoder/devel
Remove a list
Diffstat (limited to 'client/components')
-rw-r--r--client/components/activities/activities.jade3
-rw-r--r--client/components/lists/listHeader.jade3
-rw-r--r--client/components/lists/listHeader.js6
3 files changed, 12 insertions, 0 deletions
diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade
index 9bbcd055..fad147fc 100644
--- a/client/components/activities/activities.jade
+++ b/client/components/activities/activities.jade
@@ -47,6 +47,9 @@ template(name="boardActivities")
if($eq activityType 'createList')
| {{_ 'activity-added' list.title boardLabel}}.
+ if($eq activityType 'removeList')
+ | {{_ 'activity-removed' title boardLabel}}.
+
if($eq activityType 'importBoard')
| {{{_ 'activity-imported-board' boardLabel sourceLink}}}.
diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade
index 4171f824..29aa4282 100644
--- a/client/components/lists/listHeader.jade
+++ b/client/components/lists/listHeader.jade
@@ -33,6 +33,9 @@ template(name="listActionPopup")
hr
ul.pop-over-list
li: a.js-close-list {{_ 'archive-list'}}
+ hr
+ ul.pop-over-list
+ li: a.js-remove-list {{_ 'remove-list'}}
template(name="boardLists")
ul.pop-over-list
diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js
index 4d468f21..f352022d 100644
--- a/client/components/lists/listHeader.js
+++ b/client/components/lists/listHeader.js
@@ -60,4 +60,10 @@ Template.listActionPopup.events({
this.archive();
Popup.close();
},
+ 'click .js-remove-list'(evt) {
+ const currentList = this;
+ evt.preventDefault();
+ Lists.remove(currentList._id);
+ Popup.close();
+ },
});