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 2021/12/01 17:51:39 UTC
[incubator-ponymail-foal] 03/03: Regen and update links
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 2ba2966b16636239930fdc6857e44c744cef529d
Author: Sebb <se...@apache.org>
AuthorDate: Wed Dec 1 17:49:15 2021 +0000
Regen and update links
This fixes #166
---
webui/admin.html | 8 ++++----
webui/index.html | 6 +++---
webui/js/ponymail.js | 29 +++++++++++++++++++++++++----
webui/list.html | 8 ++++----
webui/oauth.html | 8 ++++----
webui/thread.html | 8 ++++----
6 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/webui/admin.html b/webui/admin.html
index 112b385..225185c 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=ae9032f" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=ff56c7e" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -79,9 +79,9 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=ae9032f"></script>
- <script src="js/wordcloud.js?revision=ae9032f"></script>
- <script src="js/ponymail.js?revision=ae9032f"></script>
+ <script src="js/config.js?revision=ff56c7e"></script>
+ <script src="js/wordcloud.js?revision=ff56c7e"></script>
+ <script src="js/ponymail.js?revision=ff56c7e"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
</body>
diff --git a/webui/index.html b/webui/index.html
index f695c61..45a4492 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=ae9032f" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=ff56c7e" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -60,8 +60,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=ae9032f"></script>
- <script src="js/ponymail.js?revision=ae9032f"></script>
+ <script src="js/config.js?revision=ff56c7e"></script>
+ <script src="js/ponymail.js?revision=ff56c7e"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index e99ab14..9af1896 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
*/
// THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
-const PONYMAIL_REVISION = 'ae9032f';
+const PONYMAIL_REVISION = 'ff56c7e';
/******************************************
@@ -2156,6 +2156,18 @@ function listview_flat_element(eml, idx) {
}, authorName);
element.inject(author);
+ // reasons to show the list name
+ let showList = G_current_domain == 'inbox' || G_current_list == '*' || G_current_domain == '*';
+
+ // If space and needed, inject ML name
+ if (!G_current_listmode_compact && showList) {
+ author.style.lineHeight = '16px';
+ author.inject(new HTML('br'));
+ author.inject(new HTML('span', {
+ class: "label label-primary",
+ style: "font-style: italic; font-size: 1rem;"
+ }, eml.list_raw.replace(/[<>]/g, '').replace('.', '@', 1)));
+ }
// Combined space for subject + body teaser
let as = new HTML('div', {
@@ -2163,6 +2175,12 @@ function listview_flat_element(eml, idx) {
});
let suba = new HTML('a', {}, eml.subject === '' ? '(No subject)' : eml.subject);
+ if (G_current_listmode_compact && showList) {
+ let kbd = new HTML('kbd', {
+ class: 'listview_kbd'
+ }, eml.list_raw.replace(/[<>]/g, '').replace('.', '@', 1))
+ suba = [kbd, suba];
+ }
let subject = new HTML('div', {
class: 'listview_email_subject email_unread'
}, suba);
@@ -2654,8 +2672,11 @@ function listview_threaded_element(thread, idx) {
}, authorName);
element.inject(author);
- // If needed, inject ML name
- if (G_current_domain == 'inbox' || G_current_list == '*') {
+ // reasons to show the list name
+ let showList = G_current_domain == 'inbox' || G_current_list == '*' || G_current_domain == '*';
+
+ // If space and needed, inject ML name
+ if (!G_current_listmode_compact && showList) {
author.style.lineHeight = '16px';
author.inject(new HTML('br'));
author.inject(new HTML('span', {
@@ -2672,7 +2693,7 @@ function listview_threaded_element(thread, idx) {
});
let suba = new HTML('a', {}, eml.subject === '' ? '(No subject)' : eml.subject);
- if (G_current_json.list.match(/\*/) || G_current_json.domain == '*') {
+ if (G_current_listmode_compact && showList) {
let kbd = new HTML('kbd', {
class: 'listview_kbd'
}, eml.list_raw.replace(/[<>]/g, '').replace('.', '@', 1))
diff --git a/webui/list.html b/webui/list.html
index 54e9da4..6de1985 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=ae9032f" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=ff56c7e" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -173,9 +173,9 @@ the License. -->
</script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=ae9032f"></script>
- <script src="js/wordcloud.js?revision=ae9032f"></script>
- <script src="js/ponymail.js?revision=ae9032f"></script>
+ <script src="js/config.js?revision=ff56c7e"></script>
+ <script src="js/wordcloud.js?revision=ff56c7e"></script>
+ <script src="js/ponymail.js?revision=ff56c7e"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
<script type="text/javascript">
diff --git a/webui/oauth.html b/webui/oauth.html
index ed2d789..57978e1 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
<!-- CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=ae9032f" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=ff56c7e" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
@@ -54,8 +54,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=ae9032f"></script>
- <script src="js/ponymail.js?revision=ae9032f"></script>
- <script src="js/oauth.js?revision=ae9032f"></script>
+ <script src="js/config.js?revision=ff56c7e"></script>
+ <script src="js/ponymail.js?revision=ff56c7e"></script>
+ <script src="js/oauth.js?revision=ff56c7e"></script>
</body>
</html>
diff --git a/webui/thread.html b/webui/thread.html
index 71b08aa..cbddf95 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=ae9032f" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=ff56c7e" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -97,9 +97,9 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=ae9032f"></script>
- <script src="js/wordcloud.js?revision=ae9032f"></script>
- <script src="js/ponymail.js?revision=ae9032f"></script>
+ <script src="js/config.js?revision=ff56c7e"></script>
+ <script src="js/wordcloud.js?revision=ff56c7e"></script>
+ <script src="js/ponymail.js?revision=ff56c7e"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
</body>