You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by hu...@apache.org on 2016/09/05 18:21:33 UTC
[1/5] incubator-ponymail git commit: add some label styles
Repository: incubator-ponymail
Updated Branches:
refs/heads/coffee-and-cake 77393e5e0 -> 14947e0a5
add some label styles
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/928e74e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/928e74e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/928e74e7
Branch: refs/heads/coffee-and-cake
Commit: 928e74e71f889eeb79cdd45732beadcebd615d50
Parents: 77393e5
Author: Daniel Gruno <hu...@apache.org>
Authored: Mon Sep 5 20:07:16 2016 +0200
Committer: Daniel Gruno <hu...@apache.org>
Committed: Mon Sep 5 20:07:16 2016 +0200
----------------------------------------------------------------------
site/css/ponymail2.css | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 44 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/928e74e7/site/css/ponymail2.css
----------------------------------------------------------------------
diff --git a/site/css/ponymail2.css b/site/css/ponymail2.css
index 2d15ecb..9215182 100644
--- a/site/css/ponymail2.css
+++ b/site/css/ponymail2.css
@@ -461,4 +461,47 @@ a {
background: #FAFAFA;
clear: both;
width: calc(100% - 36px);
-}
\ No newline at end of file
+}
+
+/* Miscellaneous labels */
+
+.label_green {
+ border-radius: 3px;
+ background: #449D44;
+ color: #FFF;
+ font-size: 90%;
+ border: none;
+ padding: 1px;
+ margin-bottom: 2px;
+}
+
+.label_yellow {
+ border-radius: 3px;
+ background: #E5B020;
+ color: #FFF;
+ font-size: 90%;
+ border: none;
+ padding: 1px;
+ margin-bottom: 2px;
+}
+
+
+.label_red {
+ border-radius: 3px;
+ background: #CC3824;
+ color: #FFF;
+ font-size: 90%;
+ border: none;
+ padding: 1px;
+ margin-bottom: 2px;
+}
+
+.label_blue {
+ border-radius: 3px;
+ background: #2472CC;
+ color: #FFF;
+ font-size: 90%;
+ border: none;
+ padding: 1px;
+ margin-bottom: 2px;
+}
[3/5] incubator-ponymail git commit: tweak button header and labels a
bit more
Posted by hu...@apache.org.
tweak button header and labels a bit more
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/394fdd0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/394fdd0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/394fdd0b
Branch: refs/heads/coffee-and-cake
Commit: 394fdd0b9f9fac600312a3dce10dcae4b3ae8bbc
Parents: 789930c
Author: Daniel Gruno <hu...@apache.org>
Authored: Mon Sep 5 20:20:28 2016 +0200
Committer: Daniel Gruno <hu...@apache.org>
Committed: Mon Sep 5 20:20:28 2016 +0200
----------------------------------------------------------------------
site/css/ponymail2.css | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/394fdd0b/site/css/ponymail2.css
----------------------------------------------------------------------
diff --git a/site/css/ponymail2.css b/site/css/ponymail2.css
index 51e22db..d92f12e 100644
--- a/site/css/ponymail2.css
+++ b/site/css/ponymail2.css
@@ -420,8 +420,9 @@ a {
.email_header_buttons {
position: relative;
- right: 60px;
- top: 10px;
+ right: 0px;
+ top: -32px;
+ float: right;
}
.header_key {
padding-top: 0px;
@@ -482,6 +483,8 @@ a {
font-weight: bold;
margin-bottom: 2px;
text-decoration: none;
+ margin-right: 5px;
+ margin-left: 5px;
}
@@ -497,6 +500,8 @@ a {
font-weight: bold;
margin-bottom: 2px;
text-decoration: none;
+ margin-right: 5px;
+ margin-left: 5px;
}
@@ -512,6 +517,8 @@ a {
font-weight: bold;
margin-bottom: 2px;
text-decoration: none;
+ margin-right: 5px;
+ margin-left: 5px;
}
.label_blue {
@@ -526,4 +533,6 @@ a {
font-weight: bold;
margin-bottom: 2px;
text-decoration: none;
+ margin-right: 5px;
+ margin-left: 5px;
}
[2/5] incubator-ponymail git commit: tweak labels for use in the
email headers as buttons
Posted by hu...@apache.org.
tweak labels for use in the email headers as buttons
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/789930c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/789930c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/789930c3
Branch: refs/heads/coffee-and-cake
Commit: 789930c35d5c5e77114cd33a683f530f02aa6e6b
Parents: 928e74e
Author: Daniel Gruno <hu...@apache.org>
Authored: Mon Sep 5 20:13:27 2016 +0200
Committer: Daniel Gruno <hu...@apache.org>
Committed: Mon Sep 5 20:13:27 2016 +0200
----------------------------------------------------------------------
site/css/ponymail2.css | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/789930c3/site/css/ponymail2.css
----------------------------------------------------------------------
diff --git a/site/css/ponymail2.css b/site/css/ponymail2.css
index 9215182..51e22db 100644
--- a/site/css/ponymail2.css
+++ b/site/css/ponymail2.css
@@ -418,6 +418,11 @@ a {
border-top-right-radius: 4px;
}
+.email_header_buttons {
+ position: relative;
+ right: 60px;
+ top: 10px;
+}
.header_key {
padding-top: 0px;
width: 80px;
@@ -472,7 +477,12 @@ a {
font-size: 90%;
border: none;
padding: 1px;
+ padding-left: 3px;
+ padding-right: 3px;
+ font-weight: bold;
margin-bottom: 2px;
+ text-decoration: none;
+
}
.label_yellow {
@@ -482,7 +492,11 @@ a {
font-size: 90%;
border: none;
padding: 1px;
+ padding-left: 3px;
+ padding-right: 3px;
+ font-weight: bold;
margin-bottom: 2px;
+ text-decoration: none;
}
@@ -493,7 +507,11 @@ a {
font-size: 90%;
border: none;
padding: 1px;
+ padding-left: 3px;
+ padding-right: 3px;
+ font-weight: bold;
margin-bottom: 2px;
+ text-decoration: none;
}
.label_blue {
@@ -503,5 +521,9 @@ a {
font-size: 90%;
border: none;
padding: 1px;
+ padding-left: 3px;
+ padding-right: 3px;
+ font-weight: bold;
margin-bottom: 2px;
+ text-decoration: none;
}
[5/5] incubator-ponymail git commit: regen JS
Posted by hu...@apache.org.
regen JS
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/14947e0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/14947e0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/14947e0a
Branch: refs/heads/coffee-and-cake
Commit: 14947e0a5f89c14c7ea1e96610f0b34c4b42e32d
Parents: f13f37d
Author: Daniel Gruno <hu...@apache.org>
Authored: Mon Sep 5 20:21:20 2016 +0200
Committer: Daniel Gruno <hu...@apache.org>
Committed: Mon Sep 5 20:21:20 2016 +0200
----------------------------------------------------------------------
site/js/ponymail-coffee.js | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/14947e0a/site/js/ponymail-coffee.js
----------------------------------------------------------------------
diff --git a/site/js/ponymail-coffee.js b/site/js/ponymail-coffee.js
index b3523d5..9b0f28d 100644
--- a/site/js/ponymail-coffee.js
+++ b/site/js/ponymail-coffee.js
@@ -622,7 +622,7 @@ BasicEmailDisplay = (function() {
BasicEmailDisplay.prototype.render = function(json, state) {
/* Store email in cache if not there already */
- var b, date_line, from_line, headers, htmlbody, list_line, placeholder, subject_line;
+ var b, buttons, date_line, from_line, headers, htmlbody, list_line, pbutton, placeholder, rbutton, sbutton, subject_line;
if (!ponymail_stored_email[json.mid]) {
ponymail_stored_email[json.mid] = json;
}
@@ -673,6 +673,30 @@ BasicEmailDisplay = (function() {
}, this.list))
]);
headers.inject(list_line);
+
+ /* Action buttons */
+
+ /* Permalink */
+ pbutton = new HTML('a', {
+ "class": "label_yellow",
+ href: "thread.html/" + json.mid
+ }, "Permalink");
+
+ /* Source */
+ sbutton = new HTML('a', {
+ "class": "label_red",
+ href: "api/source.lua/" + json.mid
+ }, "View source");
+
+ /* Reply */
+ rbutton = new HTML('a', {
+ "class": "label_green",
+ href: "javascript:void(0);"
+ }, "Reply");
+ buttons = new HTML('div', {
+ "class": "email_header_buttons"
+ }, [pbutton, sbutton, rbutton]);
+ headers.inject(buttons);
placeholder.inject(headers);
/* parse body, convert quotes */
[4/5] incubator-ponymail git commit: add permalink-,
source- and reply-button
Posted by hu...@apache.org.
add permalink-, source- and reply-button
reply button does not do anything just yet...
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/f13f37d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/f13f37d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/f13f37d9
Branch: refs/heads/coffee-and-cake
Commit: f13f37d93d88d3d70c3d1c1a92b4502f6e131701
Parents: 394fdd0
Author: Daniel Gruno <hu...@apache.org>
Authored: Mon Sep 5 20:21:09 2016 +0200
Committer: Daniel Gruno <hu...@apache.org>
Committed: Mon Sep 5 20:21:09 2016 +0200
----------------------------------------------------------------------
site/js/coffee/email_display_basic.coffee | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/f13f37d9/site/js/coffee/email_display_basic.coffee
----------------------------------------------------------------------
diff --git a/site/js/coffee/email_display_basic.coffee b/site/js/coffee/email_display_basic.coffee
index 081b5b0..60e67f3 100644
--- a/site/js/coffee/email_display_basic.coffee
+++ b/site/js/coffee/email_display_basic.coffee
@@ -119,6 +119,21 @@ class BasicEmailDisplay
])
headers.inject(list_line)
+ ### Action buttons ###
+
+ ### Permalink ###
+ pbutton = new HTML('a', { class: "label_yellow", href: "thread.html/#{json.mid}"}, "Permalink")
+
+ ### Source ###
+ sbutton = new HTML('a', { class: "label_red", href: "api/source.lua/#{json.mid}"}, "View source")
+
+ ### Reply ###
+ rbutton = new HTML('a', { class: "label_green", href: "javascript:void(0);"}, "Reply")
+
+ buttons = new HTML('div', {class: "email_header_buttons"}, [pbutton, sbutton, rbutton])
+
+ headers.inject(buttons)
+
placeholder.inject(headers)