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/12/13 22:51:54 UTC
[incubator-ponymail-foal] branch master updated (3348f21 -> 82a2fba)
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 3348f21 regen JS
new d7744a8 Adjust calendar max size according to viewport
new 82a2fba 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 | 18 ++++++++++++++++--
webui/js/source/sidebar-calendar.js | 16 +++++++++++++++-
webui/list.html | 8 ++++----
webui/oauth.html | 8 ++++----
webui/thread.html | 8 ++++----
7 files changed, 50 insertions(+), 22 deletions(-)
[incubator-ponymail-foal] 02/02: Regen JS
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 82a2fba6fe76aec6ceaac9cf5e84df95f4012ec5
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Mon Dec 13 23:51:44 2021 +0100
Regen JS
---
webui/admin.html | 8 ++++----
webui/index.html | 6 +++---
webui/js/ponymail.js | 18 ++++++++++++++++--
webui/list.html | 8 ++++----
webui/oauth.html | 8 ++++----
webui/thread.html | 8 ++++----
6 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/webui/admin.html b/webui/admin.html
index 9f92858..d1be2da 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=6612556" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=d7744a8" 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=6612556"></script>
- <script src="js/wordcloud.js?revision=6612556"></script>
- <script src="js/ponymail.js?revision=6612556"></script>
+ <script src="js/config.js?revision=d7744a8"></script>
+ <script src="js/wordcloud.js?revision=d7744a8"></script>
+ <script src="js/ponymail.js?revision=d7744a8"></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 986140b..c93fc83 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=6612556" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=d7744a8" 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=6612556"></script>
- <script src="js/ponymail.js?revision=6612556"></script>
+ <script src="js/config.js?revision=d7744a8"></script>
+ <script src="js/ponymail.js?revision=d7744a8"></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 9392e43..ba45da2 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 = '6612556';
+const PONYMAIL_REVISION = 'd7744a8';
/******************************************
@@ -4239,10 +4239,24 @@ let calendar_index = 0;
let current_calendar_size = CALENDAR_YEARS_SHOWN;
let calendar_state = {}
+
+function calendar_max_height() {
+ let body = document.body;
+ let html = document.documentElement;
+ let height = Math.max(body.scrollHeight,
+ html.clientHeight, html.scrollHeight);
+ let width = Math.max(body.scrollWidth,
+ html.clientWidth, html.scrollWidth);
+ let year_height = 48; // Height of one calendar year
+ height -= document.getElementById("emails").getBoundingClientRect().y + 16; // top area height plus footer
+ let number_of_years = Math.max(5, Math.floor(height / year_height));
+ return number_of_years;
+}
+
function renderCalendar(state) {
calendar_state = state ? state : calendar_state;
calendar_index = 0;
- current_calendar_size = G_show_stats_sidebar ? CALENDAR_YEARS_SHOWN : CALENDAR_YEARS_SHOWN * 3;
+ current_calendar_size = G_show_stats_sidebar ? CALENDAR_YEARS_SHOWN : calendar_max_height();
// Only render if calendar div is present
let cal = document.getElementById('sidebar_calendar');
if (!cal) {
diff --git a/webui/list.html b/webui/list.html
index 3ac9785..4390412 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=6612556" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=d7744a8" 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"/>
@@ -178,9 +178,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=6612556"></script>
- <script src="js/wordcloud.js?revision=6612556"></script>
- <script src="js/ponymail.js?revision=6612556"></script>
+ <script src="js/config.js?revision=d7744a8"></script>
+ <script src="js/wordcloud.js?revision=d7744a8"></script>
+ <script src="js/ponymail.js?revision=d7744a8"></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 644d730..923c020 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=6612556" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=d7744a8" 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=6612556"></script>
- <script src="js/ponymail.js?revision=6612556"></script>
- <script src="js/oauth.js?revision=6612556"></script>
+ <script src="js/config.js?revision=d7744a8"></script>
+ <script src="js/ponymail.js?revision=d7744a8"></script>
+ <script src="js/oauth.js?revision=d7744a8"></script>
</body>
</html>
diff --git a/webui/thread.html b/webui/thread.html
index 8a2d073..b30c3e7 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=6612556" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=d7744a8" 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=6612556"></script>
- <script src="js/wordcloud.js?revision=6612556"></script>
- <script src="js/ponymail.js?revision=6612556"></script>
+ <script src="js/config.js?revision=d7744a8"></script>
+ <script src="js/wordcloud.js?revision=d7744a8"></script>
+ <script src="js/ponymail.js?revision=d7744a8"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
</body>
[incubator-ponymail-foal] 01/02: Adjust calendar max size according to viewport
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 d7744a88150d8a01b233ebebc91e4d965632ea88
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Mon Dec 13 23:51:33 2021 +0100
Adjust calendar max size according to viewport
---
webui/js/source/sidebar-calendar.js | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/webui/js/source/sidebar-calendar.js b/webui/js/source/sidebar-calendar.js
index 3e1ed41..5a03f5d 100644
--- a/webui/js/source/sidebar-calendar.js
+++ b/webui/js/source/sidebar-calendar.js
@@ -19,10 +19,24 @@ let calendar_index = 0;
let current_calendar_size = CALENDAR_YEARS_SHOWN;
let calendar_state = {}
+
+function calendar_max_height() {
+ let body = document.body;
+ let html = document.documentElement;
+ let height = Math.max(body.scrollHeight,
+ html.clientHeight, html.scrollHeight);
+ let width = Math.max(body.scrollWidth,
+ html.clientWidth, html.scrollWidth);
+ let year_height = 48; // Height of one calendar year
+ height -= document.getElementById("emails").getBoundingClientRect().y + 16; // top area height plus footer
+ let number_of_years = Math.max(5, Math.floor(height / year_height));
+ return number_of_years;
+}
+
function renderCalendar(state) {
calendar_state = state ? state : calendar_state;
calendar_index = 0;
- current_calendar_size = G_show_stats_sidebar ? CALENDAR_YEARS_SHOWN : CALENDAR_YEARS_SHOWN * 3;
+ current_calendar_size = G_show_stats_sidebar ? CALENDAR_YEARS_SHOWN : calendar_max_height();
// Only render if calendar div is present
let cal = document.getElementById('sidebar_calendar');
if (!cal) {