diff --git a/changedetectionio/flask_app.py b/changedetectionio/flask_app.py index 41f80a77..3a3bb0f8 100644 --- a/changedetectionio/flask_app.py +++ b/changedetectionio/flask_app.py @@ -124,10 +124,10 @@ def _jinja2_filter_datetime(watch_obj, format="%Y-%m-%d %H:%M:%S"): @app.template_filter('format_timestamp_timeago') def _jinja2_filter_datetimestamp(timestamp, format="%Y-%m-%d %H:%M:%S"): - if timestamp == False: + if not timestamp: return 'Not yet' - return timeago.format(timestamp, time.time()) + return timeago.format(int(timestamp), time.time()) @app.template_filter('pagination_slice') diff --git a/changedetectionio/static/js/preview.js b/changedetectionio/static/js/preview.js index a9895cb2..d85dd9fd 100644 --- a/changedetectionio/static/js/preview.js +++ b/changedetectionio/static/js/preview.js @@ -40,9 +40,13 @@ if (selectElement) { if (selectedOption) { if (selectedOption.previousElementSibling) { document.getElementById('btn-previous').href = "?version=" + selectedOption.previousElementSibling.value; + } else { + document.getElementById('btn-previous').remove() } if (selectedOption.nextElementSibling) { document.getElementById('btn-next').href = "?version=" + selectedOption.nextElementSibling.value; + } else { + document.getElementById('btn-next').remove() } } diff --git a/changedetectionio/templates/preview.html b/changedetectionio/templates/preview.html index 8bc231e1..28431fe9 100644 --- a/changedetectionio/templates/preview.html +++ b/changedetectionio/templates/preview.html @@ -66,7 +66,7 @@
-
{{ watch.snapshot_text_ctime|format_timestamp_timeago }}
+
{{ current_version|format_timestamp_timeago }}
Grey lines are ignored Blue lines are triggers Pro-tip: Highlight text to add to ignore filters diff --git a/changedetectionio/templates/watch-overview.html b/changedetectionio/templates/watch-overview.html index 15f538fb..3b5eae90 100644 --- a/changedetectionio/templates/watch-overview.html +++ b/changedetectionio/templates/watch-overview.html @@ -78,7 +78,7 @@ {% if not watches|length %} - No website watches configured, please add a URL in the box above, or import a list. + No website watches configured, please add a URL in the box above, or import a list. {% endif %} {% for watch in (watches|sort(attribute=sort_attribute, reverse=sort_order == 'asc'))|pagination_slice(skip=pagination.skip) %} diff --git a/requirements.txt b/requirements.txt index 371e5ff9..1df49746 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ pyee # eventlet 0.33.3 was related to dnspython fixes # 0.34.1 - fixes python 3.12 "AttributeError: module 'ssl' has no attribute 'wrap_socket'" -eventlet==0.34.1 # related to dnspython fixes +eventlet==0.35.2 # related to dnspython fixes feedgen~=0.9 flask-compress # 0.6.3 included compatibility fix for werkzeug 3.x (2.x had deprecation of url handlers) @@ -74,8 +74,6 @@ openpyxl jq~=1.3; python_version >= "3.8" and sys_platform == "darwin" jq~=1.3; python_version >= "3.8" and sys_platform == "linux" -# Any current modern version, required so far for screenshot PNG->JPEG conversion but will be used more in the future -pillow # playwright is installed at Dockerfile build time because it's not available on all platforms pyppeteer-ng==2.0.0rc5