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 2021/03/29 18:23:30 UTC
[incubator-ponymail-foal] branch master updated (8cd5ce6 -> 7978efc)
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git.
from 8cd5ce6 Fix an mgmt issue where source is one level too high up
new 3ad6932 reword what this button is for
new 0337ec3 tweak the email editor's design and notices
new 7978efc regenerate
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
webui/js/ponymail.js | 10 ++++++----
webui/js/source/mgmt.js | 8 +++++---
webui/js/source/render-email.js | 2 +-
3 files changed, 12 insertions(+), 8 deletions(-)
[incubator-ponymail-foal] 02/03: tweak the email editor's design
and notices
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 0337ec3f4f72dc5e841e0ad26cfff754cdc8039c
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Mon Mar 29 20:22:33 2021 +0200
tweak the email editor's design and notices
---
webui/js/source/mgmt.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/webui/js/source/mgmt.js b/webui/js/source/mgmt.js
index 2499170..be66ea9 100644
--- a/webui/js/source/mgmt.js
+++ b/webui/js/source/mgmt.js
@@ -54,7 +54,7 @@ async function admin_save_email() {
function admin_email_preview(stats, json) {
admin_current_email = json.mid;
let cp = document.getElementById("panel");
- let div = new HTML('div');
+ let div = new HTML('div', { style: { margin: '5px'}});
cp.inject(div);
div.inject(new HTML('h1', {}, "Editing email " + json.mid + ":"));
@@ -122,12 +122,14 @@ function admin_email_preview(stats, json) {
div.inject(text);
let btn_edit = new HTML('button', {onclick: "admin_save_email();"}, "Save changes to archive");
- let btn_hide = new HTML('button', {onclick: "admin_hide_email();", style: {marginLeft: "24px", color: 'red'}}, "Remove email from archives*");
+ let btn_hide = new HTML('button', {onclick: "admin_hide_email();", style: {marginLeft: "36px", color: 'red'}}, "Remove email from archives");
div.inject(new HTML('br'));
div.inject(btn_edit);
div.inject(btn_hide);
div.inject(new HTML('br'));
- div.inject(new HTML('small', {}, "* Emails that are removed may still be recovered by the base system administrator. For complete expungement, please contact the system administrator."))
+ div.inject(new HTML('small', {}, "Modifying emails will remove the option to view their sources via the web interface, as the source may contain traces that reveal the edit."))
+ div.inject(new HTML('br'));
+ div.inject(new HTML('small', {}, "Emails that are removed may still be recovered by the base system administrator. For complete expungement, please contact the system administrator."))
}
function admin_init() {
[incubator-ponymail-foal] 01/03: reword what this button is for
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 3ad6932737cc69435c5b3aa1d9d5d13972afda3d
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Mon Mar 29 20:19:51 2021 +0200
reword what this button is for
---
webui/js/source/render-email.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webui/js/source/render-email.js b/webui/js/source/render-email.js
index bfb1d90..c34291c 100644
--- a/webui/js/source/render-email.js
+++ b/webui/js/source/render-email.js
@@ -173,7 +173,7 @@ async function render_email_chatty(state, json) {
// Admin button?
if (ponymail_preferences.login && ponymail_preferences.login.credentials && ponymail_preferences.login.credentials.admin) {
- let adminbutton = new HTML('a', { href: 'admin/%s'.format(json.mid), target: '_self', title: "Administrative control", class: 'btn toolbar_btn toolbar_button_admin'}, new HTML('span', { class: 'glyphicon glyphicon-cog'}, ' '));
+ let adminbutton = new HTML('a', { href: 'admin/%s'.format(json.mid), target: '_self', title: "Modify email", class: 'btn toolbar_btn toolbar_button_admin'}, new HTML('span', { class: 'glyphicon glyphicon-cog'}, ' '));
toolbar.inject(adminbutton);
}
[incubator-ponymail-foal] 03/03: regenerate
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 7978efc3ba840252f35a022c5bf3d0a1039ea3b9
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Mon Mar 29 20:22:38 2021 +0200
regenerate
---
webui/js/ponymail.js | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 550e587..4100a35 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -2483,7 +2483,7 @@ async function admin_save_email() {
function admin_email_preview(stats, json) {
admin_current_email = json.mid;
let cp = document.getElementById("panel");
- let div = new HTML('div');
+ let div = new HTML('div', { style: { margin: '5px'}});
cp.inject(div);
div.inject(new HTML('h1', {}, "Editing email " + json.mid + ":"));
@@ -2551,12 +2551,14 @@ function admin_email_preview(stats, json) {
div.inject(text);
let btn_edit = new HTML('button', {onclick: "admin_save_email();"}, "Save changes to archive");
- let btn_hide = new HTML('button', {onclick: "admin_hide_email();", style: {marginLeft: "24px", color: 'red'}}, "Remove email from archives*");
+ let btn_hide = new HTML('button', {onclick: "admin_hide_email();", style: {marginLeft: "36px", color: 'red'}}, "Remove email from archives");
div.inject(new HTML('br'));
div.inject(btn_edit);
div.inject(btn_hide);
div.inject(new HTML('br'));
- div.inject(new HTML('small', {}, "* Emails that are removed may still be recovered by the base system administrator. For complete expungement, please contact the system administrator."))
+ div.inject(new HTML('small', {}, "Modifying emails will remove the option to view their sources via the web interface, as the source may contain traces that reveal the edit."))
+ div.inject(new HTML('br'));
+ div.inject(new HTML('small', {}, "Emails that are removed may still be recovered by the base system administrator. For complete expungement, please contact the system administrator."))
}
function admin_init() {
@@ -3036,7 +3038,7 @@ async function render_email_chatty(state, json) {
// Admin button?
if (ponymail_preferences.login && ponymail_preferences.login.credentials && ponymail_preferences.login.credentials.admin) {
- let adminbutton = new HTML('a', { href: 'admin/%s'.format(json.mid), target: '_self', title: "Administrative control", class: 'btn toolbar_btn toolbar_button_admin'}, new HTML('span', { class: 'glyphicon glyphicon-cog'}, ' '));
+ let adminbutton = new HTML('a', { href: 'admin/%s'.format(json.mid), target: '_self', title: "Modify email", class: 'btn toolbar_btn toolbar_button_admin'}, new HTML('span', { class: 'glyphicon glyphicon-cog'}, ' '));
toolbar.inject(adminbutton);
}