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 2024/05/11 14:51:26 UTC
(incubator-ponymail-foal) branch master updated (6b92a05 -> 75afefb)
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
from 6b92a05 Update server version
new 78ad7bf Link wordCloud entries to correct daterange
new 75afefb Regen JS
The 2 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/admin.html | 8 ++++----
webui/index.html | 6 +++---
webui/js/ponymail.js | 9 +++++++--
webui/js/source/sidebar-stats.js | 7 ++++++-
webui/js/wordcloud.js | 8 ++++----
webui/list.html | 8 ++++----
webui/oauth.html | 8 ++++----
webui/thread.html | 8 ++++----
8 files changed, 36 insertions(+), 26 deletions(-)
(incubator-ponymail-foal) 02/02: Regen JS
Posted by se...@apache.org.
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 75afefb9fa4001e7cbfa5f9b6f9530b80af34c17
Author: Sebb <se...@apache.org>
AuthorDate: Sat May 11 15:51:16 2024 +0100
Regen JS
---
webui/admin.html | 8 ++++----
webui/index.html | 6 +++---
webui/js/ponymail.js | 9 +++++++--
webui/list.html | 8 ++++----
webui/oauth.html | 8 ++++----
webui/thread.html | 8 ++++----
6 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/webui/admin.html b/webui/admin.html
index 7f9be4c..96f1e1b 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=a36fb3e" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=78ad7bf" 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=a36fb3e"></script>
- <script src="js/wordcloud.js?revision=a36fb3e"></script>
- <script src="js/ponymail.js?revision=a36fb3e"></script>
+ <script src="js/config.js?revision=78ad7bf"></script>
+ <script src="js/wordcloud.js?revision=78ad7bf"></script>
+ <script src="js/ponymail.js?revision=78ad7bf"></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 a938ac5..b844153 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=a36fb3e" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=78ad7bf" 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"/>
@@ -63,8 +63,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=a36fb3e"></script>
- <script src="js/ponymail.js?revision=a36fb3e"></script>
+ <script src="js/config.js?revision=78ad7bf"></script>
+ <script src="js/ponymail.js?revision=78ad7bf"></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 9e39231..8c049b0 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 = 'a36fb3e';
+const PONYMAIL_REVISION = '78ad7bf';
/******************************************
@@ -4600,7 +4600,12 @@ async function sidebar_stats(json) {
// word cloud is delayed by 50ms to let the rest render first
// this is a chrome-specific slowdown we're addressing.
window.setTimeout(function() {
- wordCloud(json.cloud, 220, 100, wc);
+ if (G_current_month) {
+ daterange = G_current_year + '-' + G_current_month
+ } else {
+ daterange = G_current_year
+ }
+ wordCloud(json.cloud, 220, 100, wc, daterange);
}, 50);
}
if (G_show_stats_sidebar === false) {
diff --git a/webui/list.html b/webui/list.html
index bf0458c..4a1227d 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=a36fb3e" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=78ad7bf" 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"/>
@@ -179,9 +179,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=a36fb3e"></script>
- <script src="js/wordcloud.js?revision=a36fb3e"></script>
- <script src="js/ponymail.js?revision=a36fb3e"></script>
+ <script src="js/config.js?revision=78ad7bf"></script>
+ <script src="js/wordcloud.js?revision=78ad7bf"></script>
+ <script src="js/ponymail.js?revision=78ad7bf"></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 57421c3..aa019cc 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=a36fb3e" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=78ad7bf" 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=a36fb3e"></script>
- <script src="js/ponymail.js?revision=a36fb3e"></script>
- <script src="js/oauth.js?revision=a36fb3e"></script>
+ <script src="js/config.js?revision=78ad7bf"></script>
+ <script src="js/ponymail.js?revision=78ad7bf"></script>
+ <script src="js/oauth.js?revision=78ad7bf"></script>
</body>
</html>
diff --git a/webui/thread.html b/webui/thread.html
index 6617788..f5627b4 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=a36fb3e" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=78ad7bf" 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=a36fb3e"></script>
- <script src="js/wordcloud.js?revision=a36fb3e"></script>
- <script src="js/ponymail.js?revision=a36fb3e"></script>
+ <script src="js/config.js?revision=78ad7bf"></script>
+ <script src="js/wordcloud.js?revision=78ad7bf"></script>
+ <script src="js/ponymail.js?revision=78ad7bf"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
</body>
(incubator-ponymail-foal) 01/02: Link wordCloud entries to correct daterange
Posted by se...@apache.org.
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 78ad7bf532d23fdd914da765c8be2c9b8e7cd216
Author: Sebb <se...@apache.org>
AuthorDate: Sat May 11 15:49:15 2024 +0100
Link wordCloud entries to correct daterange
---
webui/js/source/sidebar-stats.js | 7 ++++++-
webui/js/wordcloud.js | 8 ++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/webui/js/source/sidebar-stats.js b/webui/js/source/sidebar-stats.js
index a75a4b5..44241b8 100644
--- a/webui/js/source/sidebar-stats.js
+++ b/webui/js/source/sidebar-stats.js
@@ -80,7 +80,12 @@ async function sidebar_stats(json) {
// word cloud is delayed by 50ms to let the rest render first
// this is a chrome-specific slowdown we're addressing.
window.setTimeout(function() {
- wordCloud(json.cloud, 220, 100, wc);
+ if (G_current_month) {
+ daterange = G_current_year + '-' + G_current_month
+ } else {
+ daterange = G_current_year
+ }
+ wordCloud(json.cloud, 220, 100, wc, daterange);
}, 50);
}
if (G_show_stats_sidebar === false) {
diff --git a/webui/js/wordcloud.js b/webui/js/wordcloud.js
index 8594012..2fed3dd 100644
--- a/webui/js/wordcloud.js
+++ b/webui/js/wordcloud.js
@@ -33,18 +33,18 @@ function fastIntersect(x,y,nx,ny) {
|| b.bottom+spacing < (a.top+ny));
}
-function makeWord(word, size) {
+function makeWord(word, size, daterange) {
let textBox = document.createElementNS(SVG_NAMESPACE, "text");
textBox.setAttribute("font-size", size + "px")
textBox.setAttribute("x", "0")
textBox.setAttribute("y", "40")
textBox.setAttribute("class", "cloudword")
- textBox.setAttribute("onclick", "search(\"" + word + "\", 'lte=1M')")
+ textBox.setAttribute("onclick", "search(\"" + word + "\", '" + daterange + "')")
textBox.textContent = word
return textBox
}
-async function wordCloud(hash, width, height, obj) {
+async function wordCloud(hash, width, height, obj, daterange) {
let total = 0
let boxes = []
let space = width * height
@@ -85,7 +85,7 @@ async function wordCloud(hash, width, height, obj) {
// Try with random placement
- textBox = makeWord(word, size)
+ textBox = makeWord(word, size, daterange)
textBox.setAttribute("id", "svg_wc_" + word)
svg.appendChild(textBox)
if (!popped) {