You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2017/02/23 16:33:54 UTC

incubator-ponymail git commit: Add unsubscribe button

Repository: incubator-ponymail
Updated Branches:
  refs/heads/master 3883b89ab -> 1d1d07b96


Add unsubscribe button

This fixes #362

Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/1d1d07b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/1d1d07b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/1d1d07b9

Branch: refs/heads/master
Commit: 1d1d07b96dc87ebd14a6e9ec7a5d2d68ced3fee0
Parents: 3883b89
Author: Sebb <se...@apache.org>
Authored: Thu Feb 23 16:33:49 2017 +0000
Committer: Sebb <se...@apache.org>
Committed: Thu Feb 23 16:33:49 2017 +0000

----------------------------------------------------------------------
 CHANGELOG.md                              |  1 +
 site/js/dev/ponymail_listview_flat.js     |  3 +++
 site/js/dev/ponymail_listview_threaded.js |  4 +++-
 site/js/dev/ponymail_listview_tree.js     |  4 ++++
 site/js/ponymail.js                       | 11 ++++++++++-
 5 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/1d1d07b9/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0395879..705d3b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -138,6 +138,7 @@
 - Cookie should use httpOnly and Secure (#355)
 - crash in import-mbox when list-id is missing and --lid is not provided (#358)
 - archiver traverses multi-part message parts twice (#359)
+- Add unsubscribe button (#362)
 
 
 ## CHANGES in 0.9b:

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/1d1d07b9/site/js/dev/ponymail_listview_flat.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_listview_flat.js b/site/js/dev/ponymail_listview_flat.js
index 27d66f7..147722a 100644
--- a/site/js/dev/ponymail_listview_flat.js
+++ b/site/js/dev/ponymail_listview_flat.js
@@ -191,6 +191,9 @@ function loadList_flat(mjson, limit, start, deep) {
     var sublist = xlist.replace(/@/, "-subscribe@")
     var innerbuttons = '<a href="mailto:' + sublist + '" title="Click to subscribe to this list" style="margin: 0 auto" class="btn btn-primary">Subscribe</a>'
     
+    var unsublist = xlist.replace(/@/, "-unsubscribe@")
+    innerbuttons += ' &nbsp; <a href="mailto:' + unsublist + '" title="Click to unsubscribe from this list" style="margin: 0 auto" class="btn btn-primary">Unsubscribe</a>'
+
     if (login && login.credentials) {
         innerbuttons += ' &nbsp; <a href="javascript:void(0);" style="margin: 0 auto" class="btn btn-danger" onclick="compose(null, \'' + xlist + '\');">Start a new thread</a>'
     }

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/1d1d07b9/site/js/dev/ponymail_listview_threaded.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_listview_threaded.js b/site/js/dev/ponymail_listview_threaded.js
index f86166d..6c4ab3f 100644
--- a/site/js/dev/ponymail_listview_threaded.js
+++ b/site/js/dev/ponymail_listview_threaded.js
@@ -246,7 +246,9 @@ function loadList_threaded(mjson, limit, start, deep) {
     var sublist = xlist.replace(/@/, "-subscribe@")
     var innerbuttons = '<a href="mailto:' + sublist + '" title="Click to subscribe to this list" style="margin: 0 auto" class="btn btn-primary">Subscribe</a>'
     
-    // show subscribe button if logged in
+    var unsublist = xlist.replace(/@/, "-unsubscribe@")
+    innerbuttons += ' &nbsp; <a href="mailto:' + unsublist + '" title="Click to unsubscribe from this list" style="margin: 0 auto" class="btn btn-primary">Unsubscribe</a>'
+
     if (login && login.credentials) {
         innerbuttons += ' &nbsp; <a href="javascript:void(0);" style="margin: 0 auto" class="btn btn-danger" onclick="compose(null, \'' + xlist + '\');">Start a new thread</a>'
     }

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/1d1d07b9/site/js/dev/ponymail_listview_tree.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_listview_tree.js b/site/js/dev/ponymail_listview_tree.js
index 4ca1047..1a3420a 100644
--- a/site/js/dev/ponymail_listview_tree.js
+++ b/site/js/dev/ponymail_listview_tree.js
@@ -211,6 +211,10 @@ function loadList_treeview(mjson, limit, start, deep) {
     
     var sublist = xlist.replace(/@/, "-subscribe@")
     var innerbuttons = '<a href="mailto:' + sublist + '" title="Click to subscribe to this list" style="margin: 0 auto" class="btn btn-primary">Subscribe</a>'
+
+    var unsublist = xlist.replace(/@/, "-unsubscribe@")
+    innerbuttons += ' &nbsp; <a href="mailto:' + unsublist + '" title="Click to unsubscribe from this list" style="margin: 0 auto" class="btn btn-primary">Unsubscribe</a>'
+
     if (login && login.credentials) {
         innerbuttons += ' &nbsp; <a href="javascript:void(0);" style="margin: 0 auto" class="btn btn-danger" onclick="compose(null, \'' + xlist + '\');">Start a new thread</a>'
     }

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/1d1d07b9/site/js/ponymail.js
----------------------------------------------------------------------
diff --git a/site/js/ponymail.js b/site/js/ponymail.js
index 444118d..24d6348 100644
--- a/site/js/ponymail.js
+++ b/site/js/ponymail.js
@@ -2496,6 +2496,9 @@ function loadList_flat(mjson, limit, start, deep) {
     var sublist = xlist.replace(/@/, "-subscribe@")
     var innerbuttons = '<a href="mailto:' + sublist + '" title="Click to subscribe to this list" style="margin: 0 auto" class="btn btn-primary">Subscribe</a>'
     
+    var unsublist = xlist.replace(/@/, "-unsubscribe@")
+    innerbuttons += ' &nbsp; <a href="mailto:' + unsublist + '" title="Click to unsubscribe from this list" style="margin: 0 auto" class="btn btn-primary">Unsubscribe</a>'
+
     if (login && login.credentials) {
         innerbuttons += ' &nbsp; <a href="javascript:void(0);" style="margin: 0 auto" class="btn btn-danger" onclick="compose(null, \'' + xlist + '\');">Start a new thread</a>'
     }
@@ -2805,7 +2808,9 @@ function loadList_threaded(mjson, limit, start, deep) {
     var sublist = xlist.replace(/@/, "-subscribe@")
     var innerbuttons = '<a href="mailto:' + sublist + '" title="Click to subscribe to this list" style="margin: 0 auto" class="btn btn-primary">Subscribe</a>'
     
-    // show subscribe button if logged in
+    var unsublist = xlist.replace(/@/, "-unsubscribe@")
+    innerbuttons += ' &nbsp; <a href="mailto:' + unsublist + '" title="Click to unsubscribe from this list" style="margin: 0 auto" class="btn btn-primary">Unsubscribe</a>'
+
     if (login && login.credentials) {
         innerbuttons += ' &nbsp; <a href="javascript:void(0);" style="margin: 0 auto" class="btn btn-danger" onclick="compose(null, \'' + xlist + '\');">Start a new thread</a>'
     }
@@ -3052,6 +3057,10 @@ function loadList_treeview(mjson, limit, start, deep) {
     
     var sublist = xlist.replace(/@/, "-subscribe@")
     var innerbuttons = '<a href="mailto:' + sublist + '" title="Click to subscribe to this list" style="margin: 0 auto" class="btn btn-primary">Subscribe</a>'
+
+    var unsublist = xlist.replace(/@/, "-unsubscribe@")
+    innerbuttons += ' &nbsp; <a href="mailto:' + unsublist + '" title="Click to unsubscribe from this list" style="margin: 0 auto" class="btn btn-primary">Unsubscribe</a>'
+
     if (login && login.credentials) {
         innerbuttons += ' &nbsp; <a href="javascript:void(0);" style="margin: 0 auto" class="btn btn-danger" onclick="compose(null, \'' + xlist + '\');">Start a new thread</a>'
     }