System - Ensure import+API update values are verified types

* Set Cache-Control: no-store on dynamic responses by default

Pages with per-session content (settings, CSRF-token-bearing forms,
watch data) had no Cache-Control header, so a misconfigured CDN or
reverse proxy sitting in front of the app could cache and replay them
across requests/sessions — most commonly surfacing as "CSRF tokens do
not match" after the edge served a stale cached page. Routes that
already set their own Cache-Control (static assets, screenshots,
favicons) are left untouched.

* Adding tests and moving function

---------

Co-authored-by: dgtlmoon <dgtlmoon@gmail.com>

.github/workflows/test-stack-reusable-workflow.yml

@@ -62,6 +62,18 @@ jobs:
           echo "---- Built for Python ${{ env.PYTHON_VERSION }} -----"
           docker run test-changedetectionio bash -c 'pip list'
 
+      - name: License compliance - no strong copyleft in shipped image
+        run: |
+          # Runs against the built image, i.e. exactly what ships, with the entrypoint
+          # bypassed so EXTRA_PACKAGES cannot pull in the opt-in AGPL osint plugin.
+          # --partial-match is required: plain --fail-on is an exact string match and
+          # would silently miss declarations like "GPL-2.0-or-later".
+          docker run --rm --entrypoint /bin/bash test-changedetectionio -c '
+            pip install --quiet pip-licenses &&
+            pip-licenses --partial-match \
+              --fail-on="GPL-2.0;GPL-3.0;AGPL;GNU General Public License;GNU Affero General Public License"
+          '
+
       - name: We should be Python ${{ env.PYTHON_VERSION }} ...
         run: |
           docker run test-changedetectionio bash -c 'python3 --version'
@@ -201,10 +213,20 @@ jobs:
 
       - name: Playwright - Specific tests in built container
         run: |
-          docker run --rm -e "FLASK_SERVER_NAME=cdio" -e "PLAYWRIGHT_DRIVER_URL=ws://sockpuppetbrowser:3000" --network changedet-network --hostname=cdio test-changedetectionio bash -c 'cd changedetectionio;pytest -vv --capture=tee-sys --showlocals --tb=long --live-server-host=0.0.0.0 --live-server-port=5004 tests/fetchers/test_content.py'
-          docker run --rm -e "FLASK_SERVER_NAME=cdio" -e "PLAYWRIGHT_DRIVER_URL=ws://sockpuppetbrowser:3000" --network changedet-network --hostname=cdio test-changedetectionio bash -c 'cd changedetectionio;pytest -vv --capture=tee-sys --showlocals --tb=long --live-server-host=0.0.0.0 --live-server-port=5004 tests/test_errorhandling.py'
-          docker run --rm -e "FLASK_SERVER_NAME=cdio" -e "PLAYWRIGHT_DRIVER_URL=ws://sockpuppetbrowser:3000" --network changedet-network --hostname=cdio test-changedetectionio bash -c 'cd changedetectionio;pytest -vv --capture=tee-sys --showlocals --tb=long --live-server-host=0.0.0.0 --live-server-port=5004 tests/visualselector/test_fetch_data.py'
-          docker run --rm -e "FLASK_SERVER_NAME=cdio" -e "PLAYWRIGHT_DRIVER_URL=ws://sockpuppetbrowser:3000" --network changedet-network --hostname=cdio test-changedetectionio bash -c 'cd changedetectionio;pytest -vv --capture=tee-sys --showlocals --tb=long --live-server-host=0.0.0.0 --live-server-port=5004 tests/fetchers/test_custom_js_before_content.py'
+          # Deliberately fail fast - the first failure is nearly always the real problem and it
+          # keeps the run short. Each file is wrapped in its own log group and the failing one is
+          # named explicitly, because everything after it is SKIPPED rather than run, and that is
+          # otherwise easy to misread as "the whole browser suite broke".
+          for t in tests/fetchers/test_content.py tests/test_errorhandling.py tests/visualselector/test_fetch_data.py tests/fetchers/test_custom_js_before_content.py tests/fetchers/test_renavigation.py; do
+            echo "::group::pytest $t"
+            if ! docker run --rm -e "FLASK_SERVER_NAME=cdio" -e "PLAYWRIGHT_DRIVER_URL=ws://sockpuppetbrowser:3000" --network changedet-network --hostname=cdio test-changedetectionio \
+                 bash -c "cd changedetectionio;pytest -vv --capture=tee-sys --showlocals --tb=long --live-server-host=0.0.0.0 --live-server-port=5004 $t"; then
+              echo "::endgroup::"
+              echo "::error::$t FAILED - stopping here. Any later test file and the remaining steps of this job were SKIPPED, not failed."
+              exit 1
+            fi
+            echo "::endgroup::"
+          done
 
       - name: Playwright - Headers and requests
         run: |
@@ -242,10 +264,17 @@ jobs:
 
       - name: Pyppeteer - Specific tests in built container
         run: |
-          docker run --rm -e "FLASK_SERVER_NAME=cdio" -e "FAST_PUPPETEER_CHROME_FETCHER=True" -e "PLAYWRIGHT_DRIVER_URL=ws://sockpuppetbrowser:3000" --network changedet-network --hostname=cdio test-changedetectionio bash -c 'cd changedetectionio;pytest --live-server-host=0.0.0.0 --live-server-port=5004 tests/fetchers/test_content.py'
-          docker run --rm -e "FLASK_SERVER_NAME=cdio" -e "FAST_PUPPETEER_CHROME_FETCHER=True" -e "PLAYWRIGHT_DRIVER_URL=ws://sockpuppetbrowser:3000" --network changedet-network --hostname=cdio test-changedetectionio bash -c 'cd changedetectionio;pytest --live-server-host=0.0.0.0 --live-server-port=5004 tests/test_errorhandling.py'
-          docker run --rm -e "FLASK_SERVER_NAME=cdio" -e "FAST_PUPPETEER_CHROME_FETCHER=True" -e "PLAYWRIGHT_DRIVER_URL=ws://sockpuppetbrowser:3000" --network changedet-network --hostname=cdio test-changedetectionio bash -c 'cd changedetectionio;pytest --live-server-host=0.0.0.0 --live-server-port=5004 tests/visualselector/test_fetch_data.py'
-          docker run --rm -e "FLASK_SERVER_NAME=cdio" -e "FAST_PUPPETEER_CHROME_FETCHER=True" -e "PLAYWRIGHT_DRIVER_URL=ws://sockpuppetbrowser:3000" --network changedet-network --hostname=cdio test-changedetectionio bash -c 'cd changedetectionio;pytest --live-server-host=0.0.0.0 --live-server-port=5004 tests/fetchers/test_custom_js_before_content.py'
+          # Fail fast, but name the file that failed - see the note in the playwright job above
+          for t in tests/fetchers/test_content.py tests/test_errorhandling.py tests/visualselector/test_fetch_data.py tests/fetchers/test_custom_js_before_content.py tests/fetchers/test_renavigation.py; do
+            echo "::group::pytest $t"
+            if ! docker run --rm -e "FLASK_SERVER_NAME=cdio" -e "FAST_PUPPETEER_CHROME_FETCHER=True" -e "PLAYWRIGHT_DRIVER_URL=ws://sockpuppetbrowser:3000" --network changedet-network --hostname=cdio test-changedetectionio \
+                 bash -c "cd changedetectionio;pytest --live-server-host=0.0.0.0 --live-server-port=5004 $t"; then
+              echo "::endgroup::"
+              echo "::error::$t FAILED - stopping here. Any later test file and the remaining steps of this job were SKIPPED, not failed."
+              exit 1
+            fi
+            echo "::endgroup::"
+          done
 
       - name: Pyppeteer - Headers and requests checks
         run: |

COMMERCIAL_LICENCE.md

@@ -1,54 +0,0 @@
-# Generally
-
-In any commercial activity involving 'Hosting' (as defined herein), whether in part or in full, this license must be executed and adhered to.
-
-# Commercial License Agreement
-
-This Commercial License Agreement ("Agreement") is entered into by and between Web Technologies s.r.o. here-in ("Licensor") and (your company or personal name) _____________ ("Licensee"). This Agreement sets forth the terms and conditions under which Licensor provides its software ("Software") and services to Licensee for the purpose of reselling the software either in part or full, as part of any commercial activity where the activity involves a third party.
-
-### Definition of Hosting
-
-For the purposes of this Agreement, "hosting" means making the functionality of the Program or modified version available to third parties as a service. This includes, without limitation:
-- Enabling third parties to interact with the functionality of the Program or modified version remotely through a computer network.
-- Offering a service the value of which entirely or primarily derives from the value of the Program or modified version.
-- Offering a service that accomplishes for users the primary purpose of the Program or modified version.
-
-## 1. Grant of License
-Subject to the terms and conditions of this Agreement, Licensor grants Licensee a non-exclusive, non-transferable license to install, use, and resell the Software. Licensee may:
-- Resell the Software as part of a service offering or as a standalone product.
-- Host the Software on a server and provide it as a hosted service (e.g., Software as a Service - SaaS).
-- Integrate the Software into a larger product or service that is then sold or provided for commercial purposes, where the software is used either in part or full.
-
-## 2. License Fees
-Licensee agrees to pay Licensor the license fees specified in the ordering document. License fees are due and payable as specified in the ordering document. The fees may include initial licensing costs and recurring fees based on the number of end users, instances of the Software resold, or revenue generated from the resale activities.
-
-## 3. Resale Conditions
-Licensee must comply with the following conditions when reselling the Software, whether the software is resold in part or full:
-- Provide end users with access to the source code under the same open-source license conditions as provided by Licensor.
-- Clearly state in all marketing and sales materials that the Software is provided under a commercial license from Licensor, and provide a link back to https://changedetection.io.
-- Ensure end users are aware of and agree to the terms of the commercial license prior to resale.
-- Do not sublicense or transfer the Software to third parties except as part of an authorized resale activity.
-
-## 4. Hosting and Provision of Services
-Licensee may host the Software (either in part or full) on its servers and provide it as a hosted service to end users. The following conditions apply:
-- Licensee must ensure that all hosted versions of the Software comply with the terms of this Agreement.
-- Licensee must provide Licensor with regular reports detailing the number of end users and instances of the hosted service.
-- Any modifications to the Software made by Licensee for hosting purposes must be made available to end users under the same open-source license conditions, unless agreed otherwise.
-
-## 5. Services
-Licensor will provide support and maintenance services as described in the support policy referenced in the ordering document should such an agreement be signed by all parties. Additional fees may apply for support services provided to end users resold by Licensee.
-
-## 6. Reporting and Audits
-Licensee agrees to provide Licensor with regular reports detailing the number of instances, end users, and revenue generated from the resale of the Software. Licensor reserves the right to audit Licensee’s records to ensure compliance with this Agreement.
-
-## 7. Term and Termination
-This Agreement shall commence on the effective date and continue for the period set forth in the ordering document unless terminated earlier in accordance with this Agreement. Either party may terminate this Agreement if the other party breaches any material term and fails to cure such breach within thirty (30) days after receipt of written notice.
-
-## 8. Limitation of Liability and Disclaimer of Warranty
-Executing this commercial license does not waive the Limitation of Liability or Disclaimer of Warranty as stated in the open-source LICENSE provided with the Software. The Software is provided "as is," without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose, and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages, or other liability, whether in an action of contract, tort, or otherwise, arising from, out of, or in connection with the Software or the use or other dealings in the Software.
-
-## 9. Governing Law
-This Agreement shall be governed by and construed in accordance with the laws of the Czech Republic.
-
-## Contact Information
-For commercial licensing inquiries, please contact contact@changedetection.io and dgtlmoon@gmail.com.

CONTRIBUTING.md

@@ -9,3 +9,10 @@ Install the development and test dependencies with `pip install -r requirements-
 Please be sure that all new functionality has a matching test!
 
 Use `pytest` to validate/test, you can run the existing tests as `pytest tests/test_notification.py` for example
+
+### New dependencies
+
+Please check the licence before adding anything to `requirements.txt`. MIT, BSD,
+Apache-2.0, LGPL and MPL are fine; GPL and AGPL are not, since they would
+relicense the whole project. CI enforces this. There is usually a permissive
+equivalent - ask in the PR if you're not sure.

Dockerfile

@@ -101,6 +101,31 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libxrender-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
+# Actually generate the locales. Installing the `locales` package above only
+# ships /etc/locale.gen - it does not build any locale, so the image had just
+# C, C.utf8 and POSIX. That made the `ENV LC_ALL=en_US.UTF-8` below unsatisfiable:
+# locale.setlocale() in flask_app.py failed, fell back to C, and the
+# format_number_locale / format_int_locale Jinja filters silently lost their
+# thousands separators - 1234567.89 rendered as "1234567.89" rather than
+# "1,234,567.89" in the restock/price overview, which is the very thing the
+# `locales` package was added for.
+#
+# More than en_US is generated so that operators can override LC_ALL / LANG and
+# get formatting for their own region (de_DE gives 1.234.567,89, fr_FR gives
+# 1 234 567,89). Costs ~21MB and ~16s of build time.
+#
+# This list mirrors the UI translations in changedetectionio/translations - one
+# glibc locale per language we ship a translation for, so any language a user
+# can pick in the UI also has a working locale. Keep the two in sync when adding
+# a translation. The territory for each bare language code comes from CLDR's
+# likely-subtags (cs -> cs_CZ, ja -> ja_JP, ko -> ko_KR, uk -> uk_UA, zh ->
+# zh_CN, zh_Hant_TW -> zh_TW), NOT from uppercasing the language code.
+RUN for l in cs_CZ de_DE en_GB en_US es_ES fr_FR id_ID it_IT ja_JP ko_KR \
+             pl_PL pt_BR ru_RU tr_TR uk_UA zh_CN zh_TW; do \
+      sed -i "s/^# *${l}.UTF-8 UTF-8/${l}.UTF-8 UTF-8/" /etc/locale.gen; \
+    done \
+    && locale-gen
+
 
 # https://stackoverflow.com/questions/58701233/docker-logs-erroneously-appears-empty-until-container-stops
 ENV PYTHONUNBUFFERED=1

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2025 Web Technologies s.r.o.
+   Copyright (c) Leigh Morresi and the changedetection.io contributors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -66,6 +66,11 @@ Easily organise and monitor prices for products from the dashboard, get alerts a
 
 [<img src="docs/restock-overview.png" style="max-width:100%;" alt="Easily keep an eye on product price changes directly from the UI"  title="Easily keep an eye on product price changes directly from the UI" />](https://changedetection.io?src=github)
 
+
+#### Monitor price change and restock trends over time as a graph, identify patterns, buy at the right time!
+
+[<img src="docs/price-tracking.jpeg" style="max-width:100%;" />](https://changedetection.io?src=github)
+
 Set price change notification parameters, upper and lower price, price change percentage and more.
 Always know when a product for sale drops in price.
 

changedetectionio/__init__.py

@@ -2,7 +2,7 @@
 
 # Read more https://github.com/dgtlmoon/changedetection.io/wiki
 # Semver means never use .01, or 00. Should be .1.
-__version__ = '0.60.3'
+__version__ = '0.60.7'
 
 from changedetectionio.strtobool import strtobool
 from json.decoder import JSONDecodeError

changedetectionio/api/Import.py

@@ -9,6 +9,10 @@ import json
 # Number of URLs above which import switches to background processing
 IMPORT_SWITCH_TO_BACKGROUND_THRESHOLD = 20
 
+# Query params whose accepted values are wider than the `enum:` in the spec and are checked
+# separately further down (plugin processors aren't listed in the static spec enum).
+ENUM_VALIDATED_ELSEWHERE = {'processor'}
+
 
 def default_content_type(content_type='text/plain'):
     """Decorator to set a default Content-Type header if none is provided."""
@@ -143,10 +147,23 @@ class Import(Resource):
             # Convert to appropriate type based on schema
             try:
                 converted_value = convert_query_param_to_type(param_value, schema_properties[param_name])
-                extras[param_name] = converted_value
             except (ValueError, json.JSONDecodeError) as e:
                 return f"Invalid value for parameter '{param_name}': {str(e)}", 400
 
+            # Enforce any `enum:` declared in the OpenAPI spec (notification_format, method,
+            # conditions_match_logic ...). /api/v1/watch gets this for free because its JSON body is
+            # unmarshalled against the spec, but the import query params never were - so something
+            # like ?notification_format=Text used to be stored verbatim and then raise
+            # "Invalid notification format" at notification-send time, long after the import.
+            # `processor` is exempt: plugin processors are legal but aren't in the static spec enum,
+            # it has its own check against available_processors() below.
+            allowed_values = schema_properties[param_name].get('enum')
+            if allowed_values and param_name not in ENUM_VALIDATED_ELSEWHERE and converted_value not in allowed_values:
+                return (f"Invalid value for parameter '{param_name}': '{param_value}'. "
+                        f"Must be one of: {', '.join(str(v) for v in allowed_values)}"), 400
+
+            extras[param_name] = converted_value
+
         # Validate processor if provided
         if 'processor' in extras:
             from changedetectionio.processors import available_processors

changedetectionio/api/Watch.py

@@ -141,6 +141,7 @@ class Watch(Resource):
         watch['last_changed'] = watch_obj.last_changed
         watch['viewed'] = watch_obj.viewed
         watch['link'] = watch_obj.link
+        watch['open_link'] = watch_obj.open_link
 
         # Resolved processor config: tag override wins over watch-level config (mirrors restock processor logic)
         import json
@@ -293,6 +294,20 @@ class WatchHistory(Resource):
             abort(404, message='No watch exists with the UUID of {}'.format(uuid))
         return watch.history, 200
 
+    # Delete all history/snapshots for a watch, but keep the watch itself
+    # curl -X DELETE http://localhost:5000/api/v1/watch/<uuid_str:uuid>/history
+    @auth.check_token
+    @validate_openapi_request('deleteWatchHistory')
+    def delete(self, uuid):
+        """Clear all snapshot history for a watch (the watch itself is kept)."""
+        if not self.datastore.data['watching'].get(uuid):
+            abort(404, message='No watch exists with the UUID of {}'.format(uuid))
+
+        # Same call as the UI "Clear history" button - wipes snapshots/screenshots and
+        # resets last_checked etc, while preserving the watch and its processor config
+        self.datastore.clear_watch_history(uuid)
+        return 'OK', 204
+
 
 class WatchSingleHistory(Resource):
     def __init__(self, **kwargs):
@@ -596,6 +611,7 @@ class CreateWatch(Resource):
                 'last_checked': watch['last_checked'],
                 'last_error': watch['last_error'],
                 'link': watch.link,
+                'open_link': watch.open_link,
                 'page_title': watch['page_title'],
                 'tags': [*tags],  # Unpack dict keys to list (can't use list() since variable named 'list')
                 'title': watch['title'],

changedetectionio/blueprint/add_watch_ui/__init__.py

@@ -1,8 +1,10 @@
+import os
+
 from flask import Blueprint, render_template, request, jsonify, make_response, flash, redirect, url_for
 from flask_babel import gettext
 from loguru import logger
 
-from changedetectionio import forms
+from changedetectionio import forms, strtobool
 from changedetectionio.auth_decorator import login_optionally_required
 from . import browser_config
 from changedetectionio.store import ChangeDetectionStore
@@ -34,6 +36,7 @@ def construct_blueprint(datastore: ChangeDetectionStore):
 
         return render_template(
             "add-watch-ui.html",
+            browser_backend_disabled=strtobool(os.getenv('ADD_WATCH_UI_BROWSER_BACKEND_DISABLED', 'False')),
             form=form,
             llm_configured=llm_configured,
             llm_intent_watch_placeholder=LLM_INTENT_WATCH_PLACEHOLDER,
@@ -76,6 +79,9 @@ def construct_blueprint(datastore: ChangeDetectionStore):
         # Note this fetch never reaches difference_detection_processor.call_browser(), so it gets
         # no gating from there - it has to validate for itself.
         url = (request.form.get('url') or '').strip()
+        if not url.lower().startswith('http'):
+            url='https://' + url
+
         ok, reason = is_fetch_url_allowed(url)
         if not ok:
             logger.warning(f"Add-watch snapshot: refused '{url}' - {reason}")

changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html

@@ -15,7 +15,7 @@
 
             <!-- TOP : enter the URL and fetch a live preview -->
             <div id="add-watch-url-row">
-                {{ render_nolabel_field(form.url, placeholder="https://...", required=true, class="pure-input-1") }}
+                {{ render_nolabel_field(form.url, placeholder="www.website.com/page.html", required=true, class="pure-input-1") }}
                 <button type="button" id="add-watch-go" class="pure-button pure-button-primary">{{ _('Go') }}</button>
             </div>
 
@@ -51,14 +51,14 @@
                 <!-- RIGHT : options -->
                 <div id="add-watch-options-pane">
                     <div class="add-watch-option-group" id="quick-watch-processor-type">
-                        {{ render_simple_field(form.processor) }}
+                        {{ render_simple_field(form.processor, label=_('What do you want to achieve?')) }}
                     </div>
-
+{%- if not browser_backend_disabled -%}
                     <div class="add-watch-option-group" id="quick-watch-fetch-backend">
                         {# Rendered by hand rather than with render_field(): the system-default entry
                            is listed for explanation and has to render disabled, and WTForms can't
                            carry a per-option disabled attribute through a RadioField's choices. #}
-                        <span class="label"><label>{{ form.fetch_backend.label.text }}</label></span>
+                        <label>{{ _('Select a browser') }}</label>
                         <ul>
                             {%- for browser in form.fetch_backend -%}
                             {%- set unusable = browser.data in unusable_browsers -%}
@@ -68,7 +68,7 @@
                             {%- endfor -%}
                         </ul>
                     </div>
-
+{%- endif -%}
                     <div class="add-watch-option-group" id="by-element-toggle-group">
                         {%- if llm_configured -%}
                         <label class="pure-checkbox" for="by-element-toggle">
@@ -78,7 +78,6 @@
                         {# No LLM intent available? Then narrowing by element is the only thing this
                            page can do - selection is always on, so nothing is labelled or offered
                            here, just the hint on how to use the preview. #}
-                        <span class="pure-form-message-inline">{{ _('Hover & click the preview to watch just one part of the page.') }}</span>
                         <a id="clear-selector" class="pure-button button-secondary button-xsmall" style="display: none;">{{ _('Clear selection') }}</a>
                     </div>
 

changedetectionio/blueprint/menu_modes.py

@@ -0,0 +1,16 @@
+"""Left-rail (action sidebar) display modes.
+
+A leaf module on purpose: forms.py, flask_app.py and model/App.py all need these, and
+model/App.py seeding its default from forms.py would drag the whole form stack (~550
+modules) into the model layer.
+"""
+from flask_babel import lazy_gettext as _l
+
+# The complete set of left-rail modes - flask_app.get_sidebar_mode_class() maps these
+# (and only these) onto body classes, so a new mode here needs a new mapping there.
+MENU_SIDEBAR_ACTIONMODES = [
+    ('expandable', _l('Expand on hover')),  # Slim icon rail that expands on hover/focus
+    ('pinned-expanded', _l('Always expanded')),  # Always expanded, never collapses
+    ('minimal', _l('Stays minimal')),  # Always small, never expands
+]
+MENU_SIDEBAR_ACTIONMODES_DEFAULT = 'expandable'

changedetectionio/blueprint/rss/__init__.py

@@ -24,4 +24,4 @@ RSS_TEMPLATE_PLAINTEXT_DEFAULT = "<pre>{{watch_label}} had a change.\n\n{{diff}}
 
 # @todo add some [edit]/[history]/[goto] etc links
 # @todo need {{watch_edit_link}} + delete + history link token
-RSS_TEMPLATE_HTML_DEFAULT = "<html><body>\n<h4><a href=\"{{watch_url}}\">{{watch_label}}</a></h4>\n<p>{{diff}}</p>\n</body></html>\n"
+RSS_TEMPLATE_HTML_DEFAULT = "<html><body>\n<h4><a href=\"{{watch_open_url}}\">{{watch_label}}</a></h4>\n<p>{{diff}}</p>\n</body></html>\n"

changedetectionio/blueprint/rss/single_watch.py

@@ -105,7 +105,7 @@ def construct_single_watch_routes(rss_blueprint, datastore):
             fe = fg.add_entry()
             title_suffix = f"Change @ {res['original_context']['change_datetime']}"
             populate_feed_entry(fe, watch, res.get('body', ''), guid, timestamp_to,
-                              link={'href': watch.get('url')}, title_suffix=title_suffix)
+                              link={'href': watch.open_link_override or watch.get('url')}, title_suffix=title_suffix)
             add_watch_categories(fe, watch, datastore)
 
         response = make_response(fg.rss_str())

changedetectionio/blueprint/settings/templates/settings.html

@@ -281,11 +281,16 @@ nav
                 </div>
                 <div class="pure-control-group">
                     {{ render_checkbox_field(form.application.form.ui.form.favicons_enabled, class="") }}
-                    <span class="pure-form-message-inline">{{ _('Enable or Disable Favicons next to the watch list') }}</span>
+                    <span class="pure-form-message-inline">{{ _('Enable or Disable Favicons next to the watch list') }}</span><br>
+                    <span class="pure-form-message-inline">{{ _('Disabling this can speed up your page fetches because the favicon does not need to be fetched.') }}</span>
                 </div>
                 <div class="pure-control-group">
                     {{ render_checkbox_field(form.application.form.ui.use_page_title_in_list) }}
                 </div>
+                <div class="pure-control-group">
+                    {{ render_checkbox_field(form.application.form.ui.use_share_watch) }}
+                    <span class="pure-form-message-inline">{{ _('This copies your watch to a temporary hosted database and returns a link to make sharing/copying the watch to other people') }}</span>
+                </div>
                 <div class="pure-control-group">
                     {{ render_field(form.application.form.pager_size) }}
                     <span class="pure-form-message-inline">{{ _('Number of items per page in the watch overview list, 0 to disable.') }}</span>

changedetectionio/blueprint/tags/templates/groups-overview.html

@@ -64,23 +64,18 @@ html[data-darkmode="true"] .watch-tag-list.tag-{{ class_name }} {
                 <td colspan="3">{{ _('No website organisational tags/groups configured') }}</td>
             </tr>
             {% endif %}
+            <form method="POST" style="display: inline;">
+            <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
             {% for uuid, tag in available_tags  %}
-                {#-{{ loop.cycle('pure-table-odd', 'pure-table-even') }}-#}
             <tr id="{{ uuid }}" class="">
                 <td class="watch-controls">
-                    <form method="POST" action="{{url_for('tags.mute', uuid=tag.uuid)}}" style="display: inline;">
-                        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-                        <button type="submit" class="bare-btn link-mute state-{{'on' if tag.notification_muted else 'off'}}" aria-label="{{ _('Mute notifications') }}" title="{{ _('Mute notifications') }}"><i data-feather="{{ 'bell-off' if tag.notification_muted else 'bell' }}" class="icon icon-mute"></i></button>
-                    </form>
+                    <button formaction="{{url_for('tags.mute', uuid=tag.uuid)}}"  type="submit" class="bare-btn link-mute state-{{'on' if tag.notification_muted else 'off'}}" aria-label="{{ _('Mute notifications') }}" title="{{ _('Mute notifications') }}"><i data-feather="{{ 'bell-off' if tag.notification_muted else 'bell' }}" class="icon icon-mute"></i></button>
                 </td>
                 <td class="watch-count">{{ "{:,}".format(tag_count[uuid]) if uuid in tag_count else 0 }}</td>
                 <td class="title-col inline"> <a href="{{url_for('watchlist.index', tag=uuid) }}" class="watch-tag-list tag-{{ tag.title|sanitize_tag_class }}">{{ tag.title }}</a></td>
                 <td>
+                    <button formaction="{{ url_for('ui.form_watch_checknow', tag=uuid) }}" type="submit" class="cdio-btn"><i data-feather="refresh-cw"></i>{{ _('Recheck') }}</button>
                     <a class="cdio-btn" href="{{ url_for('tags.form_tag_edit', uuid=uuid) }}">{{ _('Edit') }}</a>
-                    <form method="POST" action="{{ url_for('ui.form_watch_checknow', tag=uuid) }}" style="display: inline;">
-                        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-                        <button type="submit" class="cdio-btn"><i data-feather="refresh-cw"></i>{{ _('Recheck') }}</button>
-                    </form>
                     <a class="cdio-btn cdio-btn--danger"
                        href="{{ url_for('tags.delete', uuid=uuid) }}"
                        data-method="POST"
@@ -103,6 +98,7 @@ html[data-darkmode="true"] .watch-tag-list.tag-{{ class_name }} {
                 </td>
             </tr>
             {% endfor %}
+            </form>
             </tbody>
         </table>
         </div>

changedetectionio/blueprint/ui/__init__.py

@@ -1,7 +1,7 @@
 import time
 import threading
 from blinker import signal
-from flask import Blueprint, request, redirect, url_for, flash, render_template, session, current_app
+from flask import Blueprint, request, redirect, url_for, flash, render_template, session, current_app, abort
 from flask_babel import gettext
 from loguru import logger
 
@@ -406,10 +406,12 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, worker_pool,
 
         return redirect(url_for('watchlist.index'))
 
-
     @ui_blueprint.route("/share-url/<uuid_str:uuid>", methods=['POST'])
     @login_optionally_required
     def form_share_put_watch(uuid):
+        if not datastore.data['settings']['application']['ui'].get('use_share_watch'):
+            abort(403, description="Access denied")
+
         """Given a watch UUID, upload the info and return a share-link
            the share-link can be imported/added"""
         import requests

changedetectionio/blueprint/ui/notification.py

@@ -70,6 +70,8 @@ def construct_blueprint(datastore: ChangeDetectionStore):
             # use the same as when it is triggered, but then override it with the form test values
             n_object = NotificationContextData({
                 'watch_url': request.form.get('window_url', "https://changedetection.io"),
+                # Falls back to watch_url when the watch has no 'Link to Open' set
+                'watch_open_url': watch.open_link_override or request.form.get('window_url', "https://changedetection.io"),
                 'notification_urls': notification_urls
             })
 

changedetectionio/blueprint/ui/preview.py

@@ -104,7 +104,8 @@ def construct_blueprint(datastore: ChangeDetectionStore):
         output = render_template("preview.html",
                                  capabilities=capabilities,
                                  content=content,
-                                 current_diff_url=watch['url'],
+                                 current_diff_label=watch.label,
+                                 current_diff_url=watch.open_link,
                                  current_version=timestamp,
                                  extra_stylesheets=extra_stylesheets,
                                  extra_title=f" - {gettext('Diff')} - {watch.label} @ {timestamp}",

changedetectionio/blueprint/ui/templates/diff.html

@@ -8,7 +8,7 @@
     {% endif %}
 
     const highlight_submit_ignore_url="{{url_for('ui.ui_edit.highlight_submit_ignore_url', uuid=uuid)}}";
-    const watch_url= {{watch_a.link|tojson}};
+    const watch_url= {{watch_a.open_link|tojson}};
 
     // Initial scroll position: if set, scroll to this line number in #difference on page load
     const initialScrollToLineNumber = {{ initial_scroll_line_number|default('null') }};
@@ -20,6 +20,7 @@
 <script src="{{url_for('static_content', group='js', filename='diff-overview.js')}}" defer></script>
 
 
+<div id="diff-header">
 <div id="settings">
     <form class="pure-form " action="{{ url_for("ui.ui_diff.diff_history_page", uuid=uuid) }}" method="GET" id="diff-form">
         <fieldset class="diff-fieldset">
@@ -49,6 +50,10 @@
                 {#<button type="submit" class="pure-button pure-button-primary reset-margin">Go</button>#}
             {% endif %}
         </fieldset>
+        {# Collapses the diff options below into a popover. Hidden until
+           diff-overview.js takes over the fieldset, so with scripting off the
+           options stay inline and reachable. #}
+        <button type="button" id="diff-filters-toggle" class="pure-button" aria-expanded="false" aria-controls="diff-style">{{ _('Filters') }} &#x25be;</button>
         <fieldset id="diff-style">
             <span>
                 <label for="diffWords" class="pure-checkbox">
@@ -87,9 +92,13 @@
         </fieldset>
         {%- if versions|length >= 2 -%}
             <div id="keyboard-nav">
+                {# In the sticky bar the prompt and the two words are hidden and
+                   only the arrows show, so each link repeats its label as the
+                   accessible name and the tooltip - without them a screen reader
+                   is left reading the arrow glyph itself. #}
                 <strong>{{ _('Keyboard:') }} </strong>
-                <a href="" class="pure-button pure-button-primary" id="btn-previous"> &larr; {{ _('Previous') }}</a>
-                &nbsp; <a class="pure-button pure-button-primary" id="btn-next" href=""> &rarr; {{ _('Next') }}</a>
+                <a href="" class="pure-button pure-button-primary" id="btn-previous" title="{{ _('Previous') }}" aria-label="{{ _('Previous') }}"> &larr; <span class="keyboard-nav-label">{{ _('Previous') }}</span></a>
+                <a class="pure-button pure-button-primary" id="btn-next" href="" title="{{ _('Next') }}" aria-label="{{ _('Next') }}"> &rarr; <span class="keyboard-nav-label">{{ _('Next') }}</span></a>
             </div>
         {%- endif -%}
     </form>
@@ -105,11 +114,13 @@
         {% if last_error_text %}<li class="tab" id="error-text-tab"><a href="#error-text">{{ _('Error Text') }}</a></li> {% endif %}
         {% if last_error_screenshot %}<li class="tab" id="error-screenshot-tab"><a href="#error-screenshot">{{ _('Error Screenshot') }}</a></li> {% endif %}
         <li class="tab" id="text-tab"><a href="#text">{{ _('Text') }}</a></li>
-        <li class="tab" id="screenshot-tab"><a href="#screenshot">{{ _('Current screenshot') }}</a></li>
+        <li class="tab" id="screenshot-tab"><a href="#screenshot">{{ _('Screenshot') }}</a></li>
         <li class="tab" id="extract-tab"><a href="{{ url_for('ui.ui_diff.diff_history_page_extract_GET', uuid=uuid)}}">{{ _('Extract Data') }}</a></li>
     </ul>
 </div>
 
+</div>{# /diff-header #}
+
 <div id="diff-ui">
     <div class="tab-pane-inner" id="error-text">
         <div class="snapshot-age error">{{watch_a.error_text_ctime|format_seconds_ago}} {{ _('seconds ago.') }}</div>

changedetectionio/blueprint/ui/templates/edit.html

@@ -100,6 +100,23 @@
                         {{ render_field(form.title, class="m-d", placeholder=watch.label) }}
                         <span class="pure-form-message-inline">{{ _('Automatically uses the page title if found, you can also use your own title/description here') }}</span>
                     </div>
+                    <div class="pure-control-group">
+                        <details class="form-wrapper">
+                            <summary>{{ _('Extra Page Title and Link options') }}</summary>
+                            <br>
+                            <div class=" border-fieldset">
+                                <div class="pure-control-group">
+                                    {{ render_field(form.link_to_open, placeholder="https://...", class="m-d") }}
+                                    <span class="pure-form-message-inline">{{ _('Optional - links in the list, history and notifications open this URL instead. Does not change the URL being checked.') }}</span>
+                                </div>
+                                <div class="pure-control-group">
+                                    {{ render_ternary_field(form.use_page_title_in_list) }}
+                                </div>
+                            </div>
+                        </details>
+
+                    </div>
+
                     <div class="pure-control-group time-between-check border-fieldset">
 
                         {{ render_checkbox_field(form.time_between_check_use_default, class="use-default-timecheck") }}
@@ -119,13 +136,6 @@
                         </div>
 <br>
               </div>
-
-                    <div class="pure-control-group">
-                        {{ render_checkbox_field(form.filter_failure_notification_send) }}
-                        <span class="pure-form-message-inline">
-                         {{ _('Sends a notification when the filter can no longer be seen on the page, good for knowing when the page changed and your filter will not work anymore.') }}
-                        </span>
-                    </div>
                     <div class="pure-control-group">
                         {{ render_field(form.history_snapshot_max_length, class="history_snapshot_max_length") }}
                         <span class="pure-form-message-inline">{{ _('Limit collection of history snapshots for each watch to this number of history items.') }}
@@ -133,9 +143,7 @@
                         {{ _('Set to empty to use system settings default') }}
                         </span>
                     </div>
-                    <div class="pure-control-group">
-                        {{ render_ternary_field(form.use_page_title_in_list) }}
-                    </div>
+
                 </fieldset>
             </div>
 
@@ -250,7 +258,7 @@ Math: {{ 1 + 1 }}") }}
                         <div class="flex-wrapper" >
 
                             <div id="browser-steps-ui" class="noselect">
-                                <div class="noselect"  id="browsersteps-selector-wrapper" style="width: 100%">
+                                <div class="noselect"  id="browsersteps-selector-wrapper">
                                     <span class="loader" >
                                         <span id="browsersteps-click-start">
                                             <h2 >{{ _('Click here to Start') }}</h2>
@@ -295,6 +303,12 @@ Math: {{ 1 + 1 }}") }}
                         </span>
                     </div>
                     {% endif %}
+                    <div class="pure-control-group">
+                        {{ render_checkbox_field(form.filter_failure_notification_send) }}
+                        <span class="pure-form-message-inline">
+                         {{ _('Sends a notification when the filter can no longer be seen on the page, good for knowing when the page changed and your filter will not work anymore.') }}
+                        </span>
+                    </div>
                     <div class="field-group" id="notification-field-group">
                         {% if has_default_notification_urls %}
                         <div class="inline-warning">
@@ -507,6 +521,26 @@ Math: {{ 1 + 1 }}") }}
                             <td>{{ _('Server type reply') }}</td>
                             <td>{{ watch.get('remote_server_reply') }}</td>
                         </tr>
+                        <tr>
+                            <td><code>capabilities.supports_xpath_element_data</code></td>
+                            <td>{{ _('Yes') if capabilities.supports_xpath_element_data else _('No') }}</td>
+                        </tr>
+                        <tr>
+                            <td><code>capabilities.supports_screenshots</code></td>
+                            <td>{{ _('Yes') if capabilities.supports_screenshots else _('No') }}</td>
+                        </tr>
+                        <tr>
+                            <td><code>capabilities.supports_visual_selector</code></td>
+                            <td>{{ _('Yes') if capabilities.supports_visual_selector else _('No') }}</td>
+                        </tr>
+                        <tr>
+                            <td><code>supports_browser_steps</code></td>
+                            <td>{{ _('Yes') if capabilities.supports_browser_steps else _('No') }}</td>
+                        </tr>
+                        <tr>
+                            <td><code>visual_selector_data_ready</code></td>
+                            <td>{{ _('Yes') if visual_selector_data_ready else _('No') }}</td>
+                        </tr>
                         {% if not llm_features_disabled and settings_application.get('llm', {}).get('model') %}
                         <tr>
                             <td>{{ _('AI tokens (last check)') }}</td>

changedetectionio/blueprint/watchlist/row_context.py

@@ -30,10 +30,10 @@ def watch_row_context(datastore, active_tag_uuid=None, queued_uuids=None):
 
     return {
         'active_tag_uuid': active_tag_uuid,
-        # Kept 0 (rather than any_watches_have_processor_by_name) while the price column is
-        # disabled — it also decides cols_required on the page, so page and row must agree or
-        # a pushed row ends up with a different <td> count than the table header.
-        'any_has_restock_price_processor': 0,
+        # Also decides cols_required on the page, so page and row must agree or a pushed row
+        # ends up with a different <td> count than the table header — which is why it is
+        # computed here and not passed separately by the page.
+        'any_has_restock_price_processor': datastore.any_watches_have_processor_by_name("restock_diff"),
         'datastore': datastore,
         'has_proxies': datastore.proxy_list,
         'processor_descriptions': processors.get_processor_descriptions(),

changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html

@@ -11,8 +11,12 @@
                 {%- set checking_now = is_checking_now(watch) -%}
                 {%- set history_n = watch.history_n -%}
                 {%- set favicon = watch.get_favicon_filename() -%}
+                {#  Resolved once per row: each read re-validates the URL and, for a Jinja2 templated
+                    URL, builds a fresh sandboxed environment - see validate_url.py #}
+                {%- set open_link = watch.open_link -%}
                 {%- set error_texts = watch.compile_error_texts(has_proxies=has_proxies) -%}
                 {%- set system_use_url_watchlist = datastore.data['settings']['application']['ui'].get('use_page_title_in_list')  -%}
+                {%- set system_use_share = datastore.data['settings']['application']['ui'].get('use_share_watch')  -%}
                 {#  Class settings mirrored in changedetectionio/static/js/realtime.js for the frontend #}
 {#                    loop.cycle('pure-table-odd', 'pure-table-even'),#}
                 {%- set row_classes = [
@@ -43,12 +47,17 @@
                         <button type="submit" formmethod="post" formaction="{{ mute_action }}" class="bare-btn ajax-op state-on mute-toggle" data-op="mute" style="display: none" aria-label="{{ _('UnMute notification') }}" title="{{ _('UnMute notification') }}"><i data-feather="bell-off" class="icon icon-mute"></i></button>
                     </div>
                 </td>
-
+                <td class="watch-processor">
+                    {%- if watch['processor'] and watch['processor'] in processor_badge_texts -%}
+                        <a href="{{ url_for('watchlist.index', tag=active_tag_uuid, processor=watch['processor']) }}"  class="processor-badge processor-badge-{{ watch['processor'] }}{{ ' active' if active_processor == watch['processor'] else '' }}"
+                           title="{{ processor_descriptions.get(watch['processor'], watch['processor']) }}">{{ processor_badge_texts[watch['processor']] }}</a>
+                    {%- endif -%}
+                </td>
                 <td class="title-col inline">
                     <div class="grid-wrapper">
                     {% if 'favicons_enabled' not in ui_settings or ui_settings['favicons_enabled'] %}
                         <div class="favicon">
-                            <a target="_blank" rel="noopener" href="{{ watch.link.replace('source:','') }}">
+                            <a target="_blank" rel="noopener" href="{{ open_link }}">
                                 {# Intersection Observer lazy loading: store real URL in data-src, load only when visible in viewport #}
                                 <img alt="Favicon thumbnail"
                                      class="favicon lazy-favicon"
@@ -65,16 +74,13 @@
                         </div>
                     {%  endif %}
                         <div class="watch-text-info">
-                            {%- if watch['processor'] and watch['processor'] in processor_badge_texts -%}
-                                <a href="{{ url_for('watchlist.index', tag=active_tag_uuid, processor=watch['processor']) }}" class="processor-badge processor-badge-{{ watch['processor'] }}{{ ' active' if active_processor == watch['processor'] else '' }}" title="{{ processor_descriptions.get(watch['processor'], watch['processor']) }}">{{ processor_badge_texts[watch['processor']] }}</a>
-                            {%- endif -%}
                             <span class="watch-title">
                                 {% if system_use_url_watchlist or watch.get('use_page_title_in_list') %}
                                     {{ watch.label }}
                                 {% else %}
                                     {{ watch.get('title') or watch.link }}
                                 {% endif %}
-                                <a class="external" target="_blank" rel="noopener" href="{{ watch.link.replace('source:','') }}">&nbsp;</a>
+                                <a class="external" target="_blank" rel="noopener" href="{{ open_link }}" title="{{ open_link }}"><i data-feather="external-link"></i></a>
                             </span>
 
                             {%- for watch_tag_uuid, watch_tag in datastore.get_all_tags_for_watch(watch['uuid']).items() -%}
@@ -89,14 +95,21 @@
 
                         </div>
                     <div class="status-icons">
-                            <button type="submit" formmethod="post" formaction="{{url_for('ui.form_share_put_watch', uuid=watch.uuid)}}" class="bare-btn link-spread"><img src="{{url_for('static_content', group='images', filename='spread.svg')}}" class="status-icon icon icon-spread" title="{{ _('Create a link to share watch config with others') }}" ></button>
+{%- if system_use_share -%}  <button type="submit" formmethod="post" formaction="{{url_for('ui.form_share_put_watch', uuid=watch.uuid)}}" class="bare-btn link-spread"><img src="{{url_for('static_content', group='images', filename='spread.svg')}}" class="status-icon icon icon-spread" title="{{ _('Create a link to share watch config with others') }}" ></button>{%-  endif -%}
                             {%- set effective_fetcher = watch.get_fetch_backend if watch.get_fetch_backend != "system" else system_default_fetcher -%}
                             {%- if effective_fetcher and ("html_webdriver" in effective_fetcher or "html_" in effective_fetcher or "extra_browser_" in effective_fetcher) -%}
                                 {{ effective_fetcher|fetcher_status_icons }}
                             {%- endif -%}
-                            {%- if watch.is_pdf  -%}<img class="status-icon" src="{{url_for('static_content', group='images', filename='pdf-icon.svg')}}" alt="Converting PDF to text" >{%- endif -%}
+                            {%- if watch.is_pdf  -%}<img class="status-icon" src="{{url_for('static_content', group='images', filename='pdf-icon.svg')}}" title="Converting PDF to text" alt="Converting PDF to text" >{%- endif -%}
                             {%- if watch.has_browser_steps -%}<img class="status-icon status-browsersteps" src="{{url_for('static_content', group='images', filename='steps.svg')}}" alt="Browser Steps is enabled" >{%- endif -%}
                     </div>
+
+                </div>
+
+                </td>
+
+{%- if any_has_restock_price_processor -%}
+                <td class="restock-and-price col-restock-price">
 {%- if watch['processor'] == 'restock_diff'  -%}
     {#-  @todo - this could be injected somehow watch.extra_row_info or something -#}
                     <div class="restock-info-wrap">
@@ -137,15 +150,9 @@
                             {%- endif -%}
                     </div>
 {%- endif -%}
-                </div>
-
-                </td>
-{#
-{%- if any_has_restock_price_processor -%}
-                <td class="restock-and-price">
                 </td>
 {%- endif -%}
-#}
+
             {#last_checked becomes fetch-start-time#}
                 <td class="last-checked" data-timestamp="{{ watch.last_checked }}" data-fetchduration={{ watch.fetch_time }} data-eta_complete="{{ watch.last_checked+watch.fetch_time }}" data-label="{{ _('Checked') }}">
                     <div class="spinner-wrapper" style="display:none;" >

changedetectionio/blueprint/watchlist/templates/watch-overview.html

@@ -140,8 +140,10 @@ window.watchOverviewI18n = {
     priceLow:          {{ _('Currently low')|tojson }},
     priceTypical:      {{ _('Currently typical')|tojson }},
     priceHigh:         {{ _('Currently high')|tojson }},
-    cheaperThan:       {{ _('cheaper than %s% of tracked prices')|tojson }},
-    pricierThan:       {{ _('more expensive than %s% of tracked prices')|tojson }},
+    {# TRANSLATORS: {pct} is a percentage including the % sign, e.g. "80%" #}
+    cheaperThan:       {{ _('cheaper than {pct} of tracked prices')|tojson }},
+    {# TRANSLATORS: {pct} is a percentage including the % sign, e.g. "80%" #}
+    pricierThan:       {{ _('more expensive than {pct} of tracked prices')|tojson }},
     typicalNote:       {{ _('around the usual price')|tojson }},
     avgLabel:          {{ _('avg')|tojson }}
 };
@@ -153,8 +155,8 @@ window.watchOverviewI18n = {
     <form class="pure-form" action="{{ url_for('ui.ui_views.form_quick_watch_add') }}" method="POST" id="new-watch-form">
         <div id="add-watch-url-row">
             <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-            <label for="url"><strong>{{ _('Web page URL') }}</strong></label><br>
-            {{ render_nolabel_field(form.url, placeholder="https://...", required=true, class="pure-input-1") }}
+            <label for="url"><strong>{{ _('Web page URL') }}</strong></label>
+            {{ render_nolabel_field(form.url, placeholder="www.website.com/page.html", required=true, class="pure-input-1", span_wrap=false) }}
             <button type="submit"  id="add-watch-go" class="pure-button pure-button-primary">{{ _('Watch') }}</button>
         </div>
         {% if llm_configured %}
@@ -193,13 +195,6 @@ window.watchOverviewI18n = {
         {% endfor %}
     </template>
     {% endif %}
-    {# "Select all matching" banner — shown by watch-overview.js when the whole
-       visible page is selected but more matching rows exist on other pages. #}
-    <div id="select-all-banner" class="select-all-banner" style="display: none;"
-         data-select-all-tmpl="{{ _('All %(page)s on this page are selected.') }}"
-         data-select-all-action="{{ _('Select all %(total)s matching') }}"
-         data-all-selected-tmpl="{{ _('All %(total)s matching are selected.') }}"
-         data-clear-action="{{ _('Clear selection') }}"></div>
 
     <div id="stats_row">
         <div class="left">{%- if watches|length >= pagination.per_page -%}{{ pagination.info }}{%- endif -%}
@@ -208,11 +203,7 @@ window.watchOverviewI18n = {
         </div>
     </div>
 
-
-
     {%- if search_q -%}<div id="search-result-info">{{ _('Searching') }} "<strong><i>{{search_q}}</i></strong>"</div>{%- endif -%}
-
-
     {%- set sort_order = sort_order or 'asc' -%}
     {%- set sort_attribute = sort_attribute or 'last_changed'  -%}
     {%- set pagination_page = request.args.get('page', 0) -%}
@@ -287,6 +278,7 @@ window.watchOverviewI18n = {
         </div>
 
     <div id="checkbox-operations">
+        <button type="button" class="pure-button button-xsmall" id="check-cancel" style="background: var(--color-background-button-cancel); color: #333;"><i data-feather="x" ></i>&nbsp;{{ _('Close') }}</button>
         <button type="button" class="pure-button button-secondary button-xsmall" id="check-invert"><i data-feather="repeat" ></i>&nbsp;{{ _('Invert') }}</button>
         <button class="pure-button button-secondary button-xsmall"  name="op" value="pause"><i data-feather="pause" ></i>&nbsp;{{ _('Pause') }}</button>
         <button class="pure-button button-secondary button-xsmall"  name="op" value="unpause"><i data-feather="play" ></i>&nbsp;{{ _('UnPause') }}</button>
@@ -321,9 +313,13 @@ window.watchOverviewI18n = {
                        data-confirm-title="{{ _('Delete Watches?') }}"
                        data-confirm-message="{{ _('<p><strong>Are you sure you want to delete the selected watches?</strong></p><p>This action cannot be undone.</p>') }}"
                        data-confirm-button="{{ _('Delete') }}"><i data-feather="trash" ></i>&nbsp;{{ _('Delete') }}</button>
-        <button type="button" class="pure-button button-xsmall" id="check-cancel" style="background: var(--color-background-button-cancel); color: #333;"><i data-feather="x" ></i>&nbsp;{{ _('Close') }}</button>
     </div>
-
+        <div id="select-all-banner" class="select-all-banner" style="display: none;"
+             data-select-all-tmpl="{{ _('All %(page)s on this page are selected.') }}"
+             data-select-all-action="{{ _('Select all %(total)s matching') }}"
+             data-all-selected-tmpl="{{ _('All %(total)s matching are selected.') }}"
+             data-clear-action="{{ _('Clear selection') }}">
+        </div>
         {%- set table_classes = [
             'favicon-enabled' if 'favicons_enabled' not in ui_settings or ui_settings['favicons_enabled'] else 'favicon-not-enabled',
         ] -%}
@@ -340,9 +336,10 @@ window.watchOverviewI18n = {
                         <a class="{{ 'active '+link_order if sort_attribute == 'notification_muted' else 'inactive' }}" href="{{url_for('watchlist.index', sort='notification_muted', order=link_order, **active_filters)}}"><i data-feather="volume-2" style="width: 16px; height: 16px;"></i><span class='arrow {{link_order}}'></span></a>
                     </div>
                 </th>
+                <th><!-- processor/mode --></th>
                 <th id="th-webpage"><a class="{{ 'active '+link_order if sort_attribute == 'label' else 'inactive' }}" href="{{url_for('watchlist.index', sort='label', order=link_order, **active_filters)}}">{{ _('Web page') }} <span class='arrow {{link_order}}'></span></a></th>
              {%- if any_has_restock_price_processor -%}
-                <th>{{ _('Restock & Price') }}</th>
+                <th class="col-restock-price">{{ _('Restock & Price') }}</th>
              {%- endif -%}
                 <th id="h-lastchecked"><a class="{{ 'active '+link_order if sort_attribute == 'last_checked' else 'inactive' }}" href="{{url_for('watchlist.index', sort='last_checked', order=link_order, **active_filters)}}"><span class="hide-on-mobile">{{ _('Checked') }}</span><span class="hide-on-desktop">{{ _('Checked') }}</span> <span class='arrow {{link_order}}'></span></a></th>
                 <th id="h-lastchanged"><a class="{{ 'active '+link_order if sort_attribute == 'last_changed' else 'inactive' }}" href="{{url_for('watchlist.index', sort='last_changed', order=link_order, **active_filters)}}"><span class="hide-on-mobile">{{ _('Changed') }}</span><span class="hide-on-desktop">{{ _('Changed') }}</span> <span class='arrow {{link_order}}'></span></a></th>
@@ -356,12 +353,24 @@ window.watchOverviewI18n = {
             </tr>
             {%- endif -%}
 
+            {%- set ns = namespace(any_in_page_had_restock=false) -%}
             {%- for watch in (watches|sort(attribute=sort_attribute, reverse=sort_order == 'asc'))|pagination_slice(skip=pagination.skip) -%}
                 {%- include "watch-overview-single-row.html" -%}
+
+                {%- if watch['processor'] == 'restock_diff' -%}
+                    {%- set ns.any_in_page_had_restock = true -%}
+                {%- endif -%}
             {%- endfor -%}
             </tbody>
         </table>
         </div>
+        {%- if not ns.any_in_page_had_restock %}
+            <style>
+                .col-restock-price {
+                    display: none;
+                }
+            </style>
+        {%- endif %}
         {{ pagination.links }}
     </div>
     </form>

changedetectionio/browser_steps/browser_steps.py

@@ -9,6 +9,39 @@ from changedetectionio.content_fetchers.base import get_playwright_bypass_csp, m
 from changedetectionio.jinja2_custom import render as jinja_render
 from changedetectionio.validate_url import validate_fetch_url_async
 
+def track_latest_navigation_response(page):
+    """Record the latest main-frame document response seen on this page, and return the holder.
+
+    Idempotent on purpose - every navigation would otherwise add another 'response' listener, and
+    that event fires once per HTTP response (hundreds on a heavy page), so the callbacks are worth
+    not duplicating. One tracker per page is installed and then shared by the fetcher and by every
+    action_goto_url() call on it.
+
+    Returns a dict that holds {'response': <latest main-frame document response>}, or None if the
+    page does not support event listeners (the unit test stubs, mainly).
+    """
+    if not hasattr(page, 'on'):
+        return None
+
+    existing = getattr(page, '_cdio_latest_navigation_response', None)
+    if existing is not None:
+        return existing
+
+    latest = {}
+
+    def _keep(response):
+        try:
+            if response.frame == page.main_frame and response.request.is_navigation_request():
+                latest['response'] = response
+        except Exception as e:
+            # Never let a bookkeeping listener break a fetch
+            logger.debug(f"Could not record navigation response: {e}")
+
+    page.on("response", _keep)
+    page._cdio_latest_navigation_response = latest
+    return latest
+
+
 def browser_steps_get_valid_steps(browser_steps: list):
     if browser_steps is not None and len(browser_steps):
         valid_steps = list(filter(
@@ -145,8 +178,23 @@ class steppable_browser_interface():
         # and private-IP SSRF possible via a browser step (GHSA-hm22-wg2m-35v4).
         await validate_fetch_url_async(value)
 
+        # Chrome 153+ refuses to commit a navigation when an error status arrives with a
+        # zero-length body, so page.goto() raises net::ERR_HTTP_RESPONSE_CODE_FAILURE instead of
+        # handing back the response. The response was received fine, we just never get it as a
+        # return value, so fall back to the page's navigation-response tracker and hand that back -
+        # callers then report a real "Error - 404" instead of a raw net:: string.
+        navigation_response = track_latest_navigation_response(self.page)
+
         now = time.time()
-        response = await self.page.goto(value, timeout=0, wait_until='load')
+        try:
+            response = await self.page.goto(value, timeout=0, wait_until='load')
+        except Exception as e:
+            if 'ERR_HTTP_RESPONSE_CODE_FAILURE' not in str(e) or not navigation_response:
+                raise
+            response = navigation_response['response']
+            logger.debug(f"Navigation was aborted by the browser (empty body on an error status), "
+                         f"recovered status {response.status} from the response event")
+
         logger.debug(f"Time to goto URL {time.time()-now:.2f}s")
         return response
 

changedetectionio/conditions/plugins/levenshtein_plugin.py

@@ -14,7 +14,11 @@ global_hookimpl = pluggy.HookimplMarker("changedetectionio")
 
 def levenshtein_ratio_recent_history(watch, incoming_text=None):
     try:
-        from Levenshtein import ratio, distance
+        # rapidfuzz (MIT) instead of Levenshtein (GPL-2.0-or-later), to keep the
+        # shipped deps free of strong copyleft. Indel.normalized_similarity is the
+        # exact equivalent of Levenshtein.ratio - Levenshtein.normalized_similarity is not.
+        from rapidfuzz.distance.Levenshtein import distance
+        from rapidfuzz.distance.Indel import normalized_similarity as ratio
         k = list(watch.history.keys())
         a = None
         b = None

changedetectionio/content_fetchers/base.py

@@ -90,6 +90,7 @@ class Fetcher():
     screenshot_format = None
     status_code = None
     webdriver_js_execute_code = None
+    worker_id = None
     xpath_data = None
     xpath_element_js = ""
 
@@ -120,6 +121,11 @@ class Fetcher():
         if kwargs and 'lock_viewport_elements' in kwargs:
             self.lock_viewport_elements = kwargs.get('lock_viewport_elements')
 
+        # Which async worker is driving this fetch, subclasses use it to keep per-worker browser
+        # state (profile dirs etc) apart, stays None when we're not called from a worker
+        if kwargs and 'worker_id' in kwargs:
+            self.worker_id = kwargs.get('worker_id')
+
 
     @classmethod
     def get_status_icon_data(cls):

changedetectionio/content_fetchers/playwright.py

@@ -296,6 +296,20 @@ class fetcher(Fetcher):
 
             self.page = await context.new_page()
 
+            # Track the LATEST main-frame document response for the whole fetch, not just the one
+            # goto() returns. This app compares the text of the page the browser ends up on, and a
+            # site that gates with an interstitial (503/429 + meta-refresh) navigates to the real
+            # page *during* the extra_wait below - judging the fetch on the first response fails a
+            # watch whose content is present and fine. Same for plain client-side redirects.
+            # Shared with action_goto_url() so only one 'response' listener exists on the page.
+            from changedetectionio.browser_steps.browser_steps import track_latest_navigation_response
+            # Must be an identity check - the tracker hands back the same (initially empty, so
+            # falsy) dict the listener writes into, and `or {}` would quietly swap in a different
+            # one that never gets updated.
+            latest_navigation_response = track_latest_navigation_response(self.page)
+            if latest_navigation_response is None:
+                latest_navigation_response = {}
+
             # Listen for all console events and handle errors
             self.page.on("console", lambda msg: logger.debug(f"Playwright console: Watch URL: {url} {msg.type}: {msg.text} {msg.args}"))
 
@@ -336,6 +350,25 @@ class fetcher(Fetcher):
             extra_wait = int(os.getenv("WEBDRIVER_DELAY_BEFORE_CONTENT_READY", 5)) + self.render_extract_delay
             await self.page.wait_for_timeout(extra_wait * 1000)
 
+            # A meta-refresh or client-side redirect usually lands during that wait, so judge the
+            # fetch on the document we are actually about to extract rather than the first one.
+            latest = latest_navigation_response.get('response')
+            if latest is not None and latest is not response:
+                logger.debug(f"Page navigated again while waiting, judging the fetch on {latest.url} "
+                             f"(status {latest.status}) instead of the first response for {url}")
+                response = latest
+                try:
+                    self.headers = await response.all_headers()
+                except Exception as e:
+                    logger.debug(f"Could not refresh headers from the final document: {e}")
+
+            # Don't extract while a navigation is mid-flight, that is what produces
+            # "Execution context was destroyed, most likely because of a navigation"
+            try:
+                await self.page.wait_for_load_state('load', timeout=extra_wait * 1000)
+            except Exception as e:
+                logger.debug(f"Page did not reach a settled load state, continuing anyway: {e}")
+
             try:
                 self.status_code = response.status
             except Exception as e:

changedetectionio/content_fetchers/puppeteer.py

@@ -1,5 +1,4 @@
 import asyncio
-import gc
 import json
 import os
 import websockets.exceptions
@@ -10,6 +9,7 @@ from loguru import logger
 from changedetectionio.content_fetchers import SCREENSHOT_MAX_HEIGHT_DEFAULT, visualselector_xpath_selectors, \
     SCREENSHOT_SIZE_STITCH_THRESHOLD, SCREENSHOT_DEFAULT_QUALITY, XPATH_ELEMENT_JS, INSTOCK_DATA_JS, \
     SCREENSHOT_MAX_TOTAL_HEIGHT, FAVICON_FETCHER_JS
+from changedetectionio import gc_debounce
 from changedetectionio.content_fetchers.base import Fetcher, get_playwright_bypass_csp, manage_user_agent
 from changedetectionio.content_fetchers.exceptions import PageUnloadable, Non200ErrorCodeReceived, EmptyReply, BrowserFetchTimedOut, \
     BrowserConnectError
@@ -236,6 +236,7 @@ class fetcher(Fetcher):
 
     async def quit(self, watch=None):
         watch_uuid = watch.get('uuid') if watch else 'unknown'
+        closed_something = bool(getattr(self, 'page', None) or getattr(self, 'browser', None))
 
         # Close page
         try:
@@ -263,8 +264,16 @@ class fetcher(Fetcher):
 
         logger.info(f"[{watch_uuid}] Cleanup puppeteer complete")
 
-        # Force garbage collection to release resources
-        gc.collect()
+        # Only collect if this call actually closed something.
+        #
+        # quit() runs twice per check - from run()'s finally, then again from the worker's
+        # safety net - and it sets self.page/self.browser to None in its own finally
+        # blocks. The second call therefore closes nothing, creates no garbage and breaks
+        # no cycles, but still paid for a full stop-the-world collection: measured at 88
+        # calls across 51 checks, roughly half of them reclaiming nothing. The pyppeteer
+        # page/connection/session graph is genuinely cyclic, so the first call still runs.
+        if closed_something:
+            gc_debounce.collect('puppeteer.quit')
 
     async def fetch_page(self,
                          current_include_filters,
@@ -399,56 +408,192 @@ class fetcher(Fetcher):
         # Enable Network domain to detect when first bytes arrive
         await self.page._client.send('Network.enable')
 
-        # Now set up the frame navigation handlers
-        async def handle_frame_navigation(event=None):
-            # Wait n seconds after the frameStartedLoading, not from any frameStartedLoading/frameStartedNavigating
-            logger.debug(f"Frame navigated: {event}")
-            w = extra_wait - 2 if extra_wait > 4 else 2
-            logger.debug(f"Waiting {w} seconds before calling Page.stopLoading...")
-            await asyncio.sleep(w)
+        # Navigate (bounded), then wait the configured "wait n seconds before extracting text"
+        # delay, then stop whatever is still loading, then extract. The delay is measured from
+        # when navigation finished, not from when it started, because the point of it is to let
+        # JS-rendered content appear *after* load - anchoring it to the start would quietly give a
+        # slow-loading page almost no settle time.
+        #
+        # Only that delay is a user-facing setting. The navigation bound above is a safety net with
+        # a sane default, not a tuning knob, so there is still one number for users to think about.
+        #
+        # There is no way to know a page is "finished" - plenty of sites navigate as part of their
+        # normal design, and some sit forever on a subresource that never answers. So the delay
+        # restarts if the MAIN frame replaces its document (a redirect or interstitial gets the
+        # same settle time the first document got), iframes do not restart it, and it is capped so
+        # a page that re-navigates in a loop cannot extend it indefinitely.
+        max_content_ready_resets = int(os.getenv("BROWSER_CONTENT_READY_MAX_RESETS", 2))
 
-            # Check if page still exists (might have been closed due to error during sleep)
-            if not self.page or not hasattr(self.page, '_client'):
-                logger.debug("Page already closed, skipping stopLoading")
-                return
+        async def wait_for_content_ready_then_stop_loading():
+            main_frame_id = self.page.mainFrame._id
+            renavigated = asyncio.Event()
 
-            logger.debug("Issuing stopLoading command...")
-            await self.page._client.send('Page.stopLoading')
-            logger.debug("stopLoading command sent!")
+            def _on_main_frame_navigation(event):
+                if event.get('frameId') == main_frame_id:
+                    renavigated.set()
 
-        async def setup_frame_handlers_on_first_response(event):
-            # Only trigger for the main document response
-            if event.get('type') == 'Document':
-                logger.debug("First response received, setting up frame handlers for forced page stop load.")
-                self.page._client.on('Page.frameStartedNavigating', lambda e: asyncio.create_task(handle_frame_navigation(e)))
-                self.page._client.on('Page.frameStartedLoading', lambda e: asyncio.create_task(handle_frame_navigation(e)))
-                self.page._client.on('Page.frameStoppedLoading', lambda e: logger.debug(f"Frame stopped loading: {e}"))
-                logger.debug("First response received, setting up frame handlers for forced page stop load DONE SETUP")
-                # De-register this listener - we only need it once
-                self.page._client.remove_listener('Network.responseReceived', setup_frame_handlers_on_first_response)
+            self.page._client.on('Page.frameStartedLoading', _on_main_frame_navigation)
+            self.page._client.on('Page.frameStoppedLoading', lambda e: logger.debug(f"Frame stopped loading: {e}"))
+            try:
+                resets = 0
+                while True:
+                    renavigated.clear()
+                    try:
+                        await asyncio.wait_for(renavigated.wait(), timeout=extra_wait)
+                        # Main frame started a new document
+                        resets += 1
+                        if resets > max_content_ready_resets:
+                            # The cap is there to stop a page that re-navigates in a loop from
+                            # extending the fetch forever - it is NOT permission to extract
+                            # immediately. Breaking straight out here landed on whatever document
+                            # happened to be mid-flight, with zero settle time: measured against a
+                            # page that hops every 500ms, the fetch ended after 2.7s holding 130
+                            # bytes of an intermediate hop, no final document and no JS-rendered
+                            # content, while logging "content-ready wait of 12s elapsed".
+                            #
+                            # So spend the delay one last time, just without arming another reset.
+                            # Total stays bounded at (max_resets + 2) * extra_wait, and whatever we
+                            # extract has had the same settle time every other fetch gets.
+                            logger.debug(f"Main frame re-navigated {resets} times (cap "
+                                         f"{max_content_ready_resets}), waiting {extra_wait}s once "
+                                         f"more without restarting, then extracting regardless")
+                            await asyncio.sleep(extra_wait)
+                            break
+                        logger.debug(f"Main frame started a new document, restarting the {extra_wait}s "
+                                     f"content-ready wait ({resets}/{max_content_ready_resets})")
+                    except asyncio.TimeoutError:
+                        # Quiet for the whole delay - the page is as ready as it is going to get
+                        break
+            finally:
+                self.page._client.remove_listener('Page.frameStartedLoading', _on_main_frame_navigation)
 
-        # Listen for first response to trigger frame handler setup
-        self.page._client.on('Network.responseReceived', setup_frame_handlers_on_first_response)
+            # Stop whatever is still in flight so the DOM and screenshot come from what rendered,
+            # rather than waiting on a subresource that may never answer
+            try:
+                logger.debug(f"Content-ready wait finished, issuing Page.stopLoading before extracting")
+                await self.page._client.send('Page.stopLoading')
+                logger.debug("stopLoading command sent!")
+
+                # stopLoading stops the network, not script execution. A page whose JS has pegged
+                # the renderer's main thread (a runaway loop, a rAF that never settles) holds that
+                # thread indefinitely, and every CDP call that needs to run script then queues
+                # behind it and never returns - page.content, the xPath scraper, the favicon
+                # fetcher. The fetch dies at PUPPETEER_MAX_PROCESSING_TIMEOUT_SECONDS having
+                # extracted nothing, with a core spinning the entire time.
+                #
+                # Nothing else recovers this. Runtime.evaluate's own `timeout` parameter bounds an
+                # evaluation once it starts, not time spent queued behind the running task, and
+                # wrapping the call in asyncio.wait_for is worse than useless: cancelling a
+                # pyppeteer request mid-flight leaves the connection unusable ("Target closed" on
+                # everything after it). Terminating execution is what releases the thread -
+                # measured against a deliberately spinning page, extraction went from timing out
+                # to returning the full DOM in 0.0s and the renderer dropped from 1.00 to 0.08
+                # cores. Safe here because stopLoading has already declared "give me what
+                # rendered", and the content-ready wait above has already had its chance to let
+                # late JS-rendered content appear.
+                await self.page._client.send('Runtime.terminateExecution')
+                logger.debug("Runtime.terminateExecution sent, any runaway page script is stopped")
+            except Exception as e:
+                logger.debug(f"Page.stopLoading/Runtime.terminateExecution skipped, page is most "
+                             f"likely already gone: {e}")
+
+        # Track the LATEST main-frame document response for the whole fetch, not just the one that
+        # goto() happens to return. This app compares the text of the page the browser ends up on,
+        # and plenty of sites navigate again after the first response:
+        #  - an interstitial answering 503/429 with a meta-refresh into the real 200 page, where
+        #    judging the first response fails a watch whose content is sitting right there
+        #  - a plain client-side redirect to another host (slated.com -> get.slated.com)
+        # It also covers Chrome 153+, which refuses to commit a navigation when an error status
+        # arrives with a zero-length body: goto() raises net::ERR_HTTP_RESPONSE_CODE_FAILURE rather
+        # than returning the response, but the response itself still arrives on this event.
+        navigation_response = {}
+
+        def _keep_navigation_response(response):
+            # Note pyppeteer exposes these as properties, unlike playwright where they are methods
+            if response.frame == self.page.mainFrame and response.request.isNavigationRequest:
+                navigation_response['response'] = response
+
+        self.page.on('response', _keep_navigation_response)
+
+        # pyppeteer's navigation watcher is bound to the loaderId of the navigation it started. If
+        # the page replaces that document (redirect/interstitial) the 'load' it waits for never
+        # arrives for that loaderId, so goto() never returns - and with timeout=0 it would block
+        # until the hard PUPPETEER_MAX_PROCESSING_TIMEOUT_SECONDS kill, burning a worker slot for
+        # minutes on a page that is fully loaded. Bound it, then fall back to the document we can
+        # see. Verified against slated.com and getastra.com, which hang indefinitely otherwise.
+        nav_timeout = int(os.getenv("BROWSER_NAVIGATION_TIMEOUT_SECONDS", 30))
 
         response = None
         attempt=0
-        while not response:
-            logger.debug(f"Attempting page fetch {url} attempt {attempt}")
-            asyncio.create_task(handle_frame_navigation())
-            response = await self.page.goto(url, timeout=0)
-            await asyncio.sleep(1 + extra_wait)
-            # Check if page still exists before sending command
-            if self.page and hasattr(self.page, '_client'):
-                await self.page._client.send('Page.stopLoading')
+        try:
+            while not response:
+                logger.debug(f"Attempting page fetch {url} attempt {attempt}")
+                # Race goto() against the main frame actually firing 'load'. In the re-navigation
+                # case goto() can never resolve, but the replacement document does fire 'load' -
+                # usually within a few seconds - so this returns then instead of sitting out the
+                # whole nav_timeout. Whichever arrives first means "the document is loaded".
+                main_frame_loaded = asyncio.Event()
+                main_frame_id = self.page.mainFrame._id
 
-            if response:
-                break
-            if not response:
-                logger.warning("Page did not fetch! trying again!")
-            if response is None and attempt>=2:
-                logger.warning(f"Content Fetcher > Response object was none (as in, the response from the browser was empty, not just the content) exiting attempt {attempt}")
-                raise EmptyReply(url=url, status_code=None)
-            attempt+=1
+                def _on_lifecycle(event):
+                    if event.get('name') == 'load' and event.get('frameId') == main_frame_id:
+                        main_frame_loaded.set()
+
+                self.page._client.on('Page.lifecycleEvent', _on_lifecycle)
+                goto_task = asyncio.ensure_future(self.page.goto(url, timeout=0))
+                load_task = asyncio.ensure_future(main_frame_loaded.wait())
+                try:
+                    done, _pending = await asyncio.wait({goto_task, load_task},
+                                                        timeout=nav_timeout,
+                                                        return_when=asyncio.FIRST_COMPLETED)
+
+                    if goto_task in done:
+                        try:
+                            response = goto_task.result()
+                        except Exception as e:
+                            if 'ERR_HTTP_RESPONSE_CODE_FAILURE' not in str(e) or not navigation_response:
+                                raise
+                            response = navigation_response['response']
+                            logger.debug(f"Navigation was aborted by the browser (empty body on an error status), "
+                                         f"recovered status {response.status} from the response event")
+                    else:
+                        # Either the replacement document loaded, or we ran out of patience
+                        response = navigation_response.get('response')
+                        if not response:
+                            raise BrowserFetchTimedOut(msg=f"Browser did not finish navigating to {url} within "
+                                                           f"{nav_timeout}s and no main-frame response was seen.")
+                        why = ("the page replaced the document it started on" if load_task in done
+                               else f"navigation did not settle within {nav_timeout}s")
+                        logger.warning(f"Continuing with the document actually loaded ({why}) - "
+                                       f"status {response.status} for {response.url}")
+                finally:
+                    self.page._client.remove_listener('Page.lifecycleEvent', _on_lifecycle)
+                    for t in (goto_task, load_task):
+                        if not t.done():
+                            t.cancel()
+                if response:
+                    break
+                if not response:
+                    logger.warning("Page did not fetch! trying again!")
+                if response is None and attempt>=2:
+                    logger.warning(f"Content Fetcher > Response object was none (as in, the response from the browser was empty, not just the content) exiting attempt {attempt}")
+                    raise EmptyReply(url=url, status_code=None)
+                attempt+=1
+
+            # Navigation is done; now honour "wait n seconds before extracting text" and then
+            # force-stop whatever is still loading, so extraction always gets what rendered.
+            # Awaited inline rather than fired off as a task, so nothing can outlive the fetch.
+            await wait_for_content_ready_then_stop_loading()
+
+            # That wait is where a meta-refresh interstitial typically swaps in the real page, so
+            # re-check which document we are actually on before judging the status code.
+            latest = navigation_response.get('response')
+            if latest is not None and latest is not response:
+                logger.debug(f"Page navigated again while waiting, judging the fetch on {latest.url} "
+                             f"(status {latest.status}) instead of {response.url} (status {response.status})")
+                response = latest
+        finally:
+            self.page.remove_listener('response', _keep_navigation_response)
 
         self.headers = response.headers
 
@@ -509,8 +654,7 @@ class fetcher(Fetcher):
         self.screenshot = await capture_full_page(page=self.page, screenshot_format=self.screenshot_format, watch_uuid=watch_uuid, lock_viewport_elements=self.lock_viewport_elements)
 
         # Force garbage collection - pyppeteer base64 decode creates temporary buffers
-        import gc
-        gc.collect()
+        gc_debounce.collect('puppeteer.after_screenshot')
         self.xpath_data = await self.page.evaluate(XPATH_ELEMENT_JS, {
             "visualselector_xpath_selectors": visualselector_xpath_selectors,
             "max_height": MAX_TOTAL_HEIGHT

changedetectionio/content_fetchers/res/favicon-fetcher.js

@@ -54,57 +54,98 @@
       return 0;
     });
 
-    const timeoutMs = 2000;
+    // All candidates are fetched concurrently under one shared deadline.
+    //
+    // Sequentially, each icon got its own fresh 2s AbortController, so a site declaring
+    // five <link rel="icon"> variants spent 10s+ here - inside the page, holding a browser
+    // and a worker the whole time. Simply capping the total made it worse: giving up early
+    // returns no icon, nothing gets saved, favicon_is_expired() stays true and the cost is
+    // paid again on the very next check, forever. Fetching in parallel bounds the wall time
+    // *and* still finds a working icon, so it saves and the watch stops asking.
+    //
+    // Measured against a page with five hanging icons, one 404 and one good one:
+    //   sequential, 2s each : 10.1s, found the icon
+    //   total cap only      :  3.0s, found nothing (then repeats every check)
+    //   parallel + deadline :  ~3s,  found the icon
+    const TOTAL_BUDGET_MS = 3000;
     // 1 MB — matches the server-side limit in bump_favicon()
     const MAX_BYTES = 1 * 1024 * 1024;
 
-    for (const icon of icons) {
+    const toBase64 = (blob) => new Promise(resolve => {
+      // Always resolves. The previous version resolved only from onloadend and read
+      // reader.result unguarded, so a FileReader failure threw inside the callback and left
+      // the promise permanently pending - the whole favicon fetch then hung with nothing
+      // bounding it, because clearTimeout had already fired.
+      try {
+        const reader = new FileReader();
+        reader.onerror = () => resolve(null);
+        reader.onloadend = () => {
+          try {
+            const result = reader.result;
+            resolve(result ? String(result).split(',')[1] : null);
+          } catch (e) {
+            resolve(null);
+          }
+        };
+        reader.readAsDataURL(blob);
+      } catch (e) {
+        resolve(null);
+      }
+    });
+
+    const controller = new AbortController();
+    const budget = setTimeout(() => controller.abort(), TOTAL_BUDGET_MS);
+
+    const fetchOne = async (icon) => {
       try {
         // Inline data URI — no network fetch needed, data is already here
         if (icon.href.startsWith('data:')) {
           const match = icon.href.match(/^data:([^;]+);base64,([A-Za-z0-9+/=]+)$/);
-          if (!match) continue;
+          if (!match) return null;
           const mime_type = match[1];
           const base64 = match[2];
           // Rough size check: base64 is ~4/3 the binary size
-          if (base64.length * 0.75 > MAX_BYTES) continue;
+          if (base64.length * 0.75 > MAX_BYTES) return null;
           return { url: icon.href, mime_type, base64 };
         }
 
-        const controller = new AbortController();
-        const timeout = setTimeout(() => controller.abort(), timeoutMs);
-
         const resp = await fetch(icon.href, {
           signal: controller.signal,
           redirect: 'follow'
         });
 
-        clearTimeout(timeout);
+        if (!resp.ok) return null;
 
-        if (!resp.ok) {
-          continue;
-        }
+        // Skip an oversized icon before pulling its body down the wire, where the server
+        // tells us the size up front.
+        const declared = parseInt(resp.headers.get('content-length') || '0', 10);
+        if (declared > MAX_BYTES) return null;
 
+        // Still covered by the shared signal: aborting errors the body stream too. The
+        // previous version cleared its timer before this line, leaving a slow or
+        // never-ending body read completely unguarded.
         const blob = await resp.blob();
+        if (blob.size > MAX_BYTES) return null;
 
-        if (blob.size > MAX_BYTES) continue;
-
-        // Convert blob to base64
-        const reader = new FileReader();
-        return await new Promise(resolve => {
-          reader.onloadend = () => {
-            resolve({
-              url: icon.href,
-              mime_type: blob.type,
-              base64: reader.result.split(",")[1]
-            });
-          };
-          reader.readAsDataURL(blob);
-        });
+        const base64 = await toBase64(blob);
+        if (!base64) return null;
 
+        return { url: icon.href, mime_type: blob.type, base64 };
       } catch (e) {
-        continue;
+        return null;
       }
+    };
+
+    try {
+      const settled = await Promise.all(icons.map(fetchOne));
+      // icons[] is already in preference order (largest, then apple-touch-icon), so the
+      // first success in that order is the one we want - not merely the fastest to answer.
+      const best = settled.find(r => r);
+      if (best) return best;
+    } catch (e) {
+      // fall through to "nothing found"
+    } finally {
+      clearTimeout(budget);
     }
 
     // nothing found

changedetectionio/content_fetchers/res/stock-not-in-stock.js

@@ -71,6 +71,7 @@ async () => {
             'out of stock',
             'out-of-stock',
             'plus disponible',
+            'producto sin stock',
             'prodotto esaurito',
             'produkt niedostępny',
             'rupture',

changedetectionio/flask_app.py

@@ -19,6 +19,7 @@ from flask import (
     Flask,
     abort,
     flash,
+    g,
     redirect,
     render_template,
     request,
@@ -26,6 +27,7 @@ from flask import (
     session,
     url_for,
 )
+from flask.sessions import SecureCookieSessionInterface
 from flask_cors import CORS
 from flask_restful import Api, abort
 
@@ -56,6 +58,7 @@ from changedetectionio.api import (
     WatchSingleHistory,
 )
 from changedetectionio.api.Search import Search
+from changedetectionio.blueprint.menu_modes import MENU_SIDEBAR_ACTIONMODES, MENU_SIDEBAR_ACTIONMODES_DEFAULT
 from changedetectionio.favicon_utils import get_favicon_mime_type
 from changedetectionio.languages import (
     get_available_languages,
@@ -138,7 +141,8 @@ if strtobool(os.getenv("FLASK_ENABLE_COMPRESSION")):
 app.config['TEMPLATES_AUTO_RELOAD'] = False
 
 
-# Stop browser caching of assets
+# Default to revalidate-always for anything served with send_file(); static_content() then
+# opts the fingerprinted asset URLs into real caching (see _fingerprint_static_urls).
 app.config['SEND_FILE_MAX_AGE_DEFAULT'] = 0
 app.config.exit = Event()
 
@@ -213,15 +217,40 @@ def _configure_plugin_templates():
 _configure_plugin_templates()
 csrf = CSRFProtect()
 csrf.init_app(app)
+
 notification_debug_log = []
 
-# Locale for correct presentation of prices etc
+# Locale for correct presentation of prices etc.
+#
+# Deliberately NOT locale.LC_ALL - LC_COLLATE must stay in the "C" locale.
+#
+# elementpath implements the XPath string functions on top of locale.strxfrm:
+#
+#     def contains(self, a, b):  return self.strxfrm(b) in self.strxfrm(a)
+#
+# Under LC_COLLATE=C, strxfrm() is the identity function and that substring test means what it
+# says. Under any real locale it returns a binary collation key, and a substring of a collation
+# key is not the collation key of the substring - so contains(), starts-with(), ends-with() and
+# substring-before/after() silently return false for EVERY input. Every xPath filter using
+# contains() then matches nothing and the watch reports "no filters were found" on a page whose
+# HTML plainly contains the target (#4437).
+#
+# That stayed hidden until the image actually generated its locales: before then this call raised
+# locale.Error, we logged a warning and stayed in C. Once en_US.UTF-8 existed the call succeeded
+# and took LC_COLLATE with it. Setting the presentation categories individually keeps what this
+# block is for - 1234567 still renders as "1,234,567" - without touching collation.
+#
+# Per XPath 3.1 the default collation is codepoint and must not consult LC_COLLATE at all, so
+# this is arguably an elementpath bug; html_tools.xpath_filter() pins the collation explicitly as
+# well, so a filter is correct even if an operator sets LC_COLLATE themselves.
 default_locale = locale.getdefaultlocale()
 logger.info(f"System locale default is {default_locale}")
-try:
-    locale.setlocale(locale.LC_ALL, default_locale)
-except locale.Error:
-    logger.warning(f"Unable to set locale {default_locale}, locale is not installed maybe?")
+for _category in (locale.LC_CTYPE, locale.LC_NUMERIC, locale.LC_MONETARY, locale.LC_TIME):
+    try:
+        locale.setlocale(_category, default_locale)
+    except locale.Error:
+        logger.warning(f"Unable to set locale {default_locale} for category {_category}, "
+                       f"locale is not installed maybe?")
 
 watch_api = Api(app, decorators=[csrf.exempt])
 
@@ -265,6 +294,103 @@ def get_css_version():
     return hashlib.sha256(f"{salt}{__version__}".encode()).hexdigest()[:10]
 
 
+# Static groups that are plain files on disk under changedetectionio/static/<group>/ - the
+# same bytes for every visitor, so they can be fingerprinted and cached hard. Deliberately
+# excludes the dynamic groups handled inside static_content() ('screenshot', 'favicon',
+# 'visual_selector_data', 'plugin'), which are per-watch and/or password protected.
+STATIC_CACHEABLE_GROUPS = frozenset(['favicons', 'images', 'js', 'styles'])
+
+# How long a fingerprint is trusted before the file is stat()ed again. The lookup sits in the
+# hot path (one watch-list render emits hundreds of asset url_for() calls) so it can't stat
+# per URL, but the URLs we hand out are served `immutable` - an edited .js/.css that never
+# re-fingerprinted would be pinned in the browser for a year. A few seconds of staleness is
+# the compromise: invisible in production (files only change on upgrade, and the container
+# restarts) and self-correcting while developing.
+STATIC_FINGERPRINT_TTL = 10.0
+_static_fingerprints = {}
+_static_fingerprints_expires = 0.0
+
+
+def get_static_fingerprint(group, filename):
+    """Short token identifying this exact revision of a static file, for `?v=` cache busting.
+
+    Built from the file's own mtime+size rather than get_css_version()'s app-version token:
+    a version-wide token silently serves a stale asset whenever content changes without a
+    release (local dev, a patched image, a rebuilt styles.css), which is not survivable once
+    the response says `immutable`. Returns '' when the file can't be stat()ed, so the request
+    stays unversioned (and revalidating) rather than being pinned under a made-up token.
+    """
+    global _static_fingerprints_expires
+
+    now = time.monotonic()
+    if now > _static_fingerprints_expires:
+        _static_fingerprints.clear()
+        _static_fingerprints_expires = now + STATIC_FINGERPRINT_TTL
+
+    key = (group, filename)
+    token = _static_fingerprints.get(key)
+    if token is None:
+        try:
+            st = os.stat(os.path.join(app.static_folder, group, filename))
+            token = f"{int(st.st_mtime)}-{st.st_size}"
+        except OSError:
+            token = ''
+        _static_fingerprints[key] = token
+
+    return token
+
+
+@app.url_defaults
+def _fingerprint_static_urls(endpoint, values):
+    """Pin every static asset URL to the revision of the file it resolves to.
+
+    Doing it here rather than in the templates means an asset can't be added without its
+    cache-buster - the `?v=` is what lets static_content() answer with a year-long
+    `immutable` instead of making the browser revalidate on every page load.
+    """
+    if endpoint != 'static_content' or 'v' in values:
+        return
+
+    if values.get('group') in STATIC_CACHEABLE_GROUPS:
+        token = get_static_fingerprint(values['group'], values.get('filename', ''))
+        if token:
+            values['v'] = token
+
+
+class PublicStaticAssetSessionInterface(SecureCookieSessionInterface):
+    """Keeps "Vary: Cookie" and the session cookie refresh off public static asset responses.
+
+    Flask tags any response whose session was touched with "Vary: Cookie", and flask_login's
+    auth check touches it on every single request. Since Flask 3.1.3 the request context sets
+    `session.accessed` itself, so a view or an after_request hook can't opt out - the header is
+    added in save_session(), which runs last. It has to go for the files marked by
+    static_content(): our session cookie is permanent and re-signed (fresh timestamp) on every
+    response, so the Cookie request header keeps changing, and a browser honouring
+    "Vary: Cookie" would then miss its cache on every asset of every page load - the immutable
+    caching would never be used at all. Nothing in those groups depends on the session.
+    """
+
+    def save_session(self, app, session, response):
+        public_asset = g.get('public_static_asset', False)
+
+        if public_asset and not session.modified:
+            # Same bytes for every visitor and nothing to persist: skip the cookie refresh
+            # and the Vary entirely.
+            return
+
+        super().save_session(app, session, response)
+
+        if public_asset and 'Set-Cookie' in response.headers:
+            # Shouldn't happen (these requests don't write to the session), but if something
+            # ever does, the response now carries one visitor's cookie - it must not be stored
+            # by a shared cache under the long-lived header static_content() just set.
+            response.cache_control.public = False
+            response.cache_control.private = True
+
+
+app.session_interface = PublicStaticAssetSessionInterface()
+
+
 @app.template_global('filtered_action_url')
 def _filtered_action_url(endpoint, **overrides):
     """Build a URL to `endpoint` carrying the CURRENT watch-list filters (query args)
@@ -286,20 +412,32 @@ def _filter_url(**overrides):
 
 @app.template_global()
 def get_sidebar_mode_class():
-    """Body class that drives the left-rail behaviour (see parts/_action_sidebar.scss).
+    """Body class(es) that drive the left-rail behaviour (see parts/_action_sidebar.scss).
 
-    'collapsed' -> slim icon rail that expands on hover/focus (actionsidebar-minimal)
-    'pinned'    -> rail always expanded with labels visible (actionside-bar-on)
+    Only the modes offered by MENU_SIDEBAR_ACTIONMODES are honoured - anything else in the
+    datastore (a stale value from an older release, hand-edited JSON) falls back to
+    MENU_SIDEBAR_ACTIONMODES_DEFAULT rather than leaking through as a body class.
+
+    'expandable'      -> icon-only rail, rolls out over the content on hover/focus
+    'pinned-expanded' -> rail always expanded, labels visible at rest
+    'minimal'         -> icon-only rail that never expands
     """
-    mode = datastore.data['settings']['application'].get('ui', {}).get('sidebar_mode', 'collapsed')
-    # Pinned mode is permanently expanded, so it carries 'action-side-bar-expanded'
-    # from the start. In collapsed mode that class is toggled on hover/focus by
-    # static/js/sidebar.js.
-    return (
-        'actionside-bar-on action-side-bar-expanded'
-        if mode == 'pinned'
-        else 'actionsidebar-minimal'
-    )
+
+    # 'actionsidebar-minimal'   - collapsed icon rail (hover-to-expand lives in CSS + static/js/sidebar.js)
+    # 'actionsidebar-no-expand' - opts that rail out of hover-to-expand
+    # 'actionside-bar-on'       - always-open rail
+    # 'actionsidebar-expanded'- expanded logo/stats block
+    body_classes = {
+        'expandable': 'actionsidebar-minimal',
+        'pinned-expanded': 'actionside-bar-on actionsidebar-expanded',
+        'minimal': 'actionsidebar-minimal actionsidebar-no-expand',
+    }
+
+    mode = datastore.data['settings']['application'].get('ui', {}).get('sidebar_mode')
+    if mode not in {choice for choice, _label in MENU_SIDEBAR_ACTIONMODES} or mode not in body_classes:
+        mode = MENU_SIDEBAR_ACTIONMODES_DEFAULT
+
+    return body_classes[mode]
 
 
 @app.template_global()
@@ -767,6 +905,32 @@ def changedetection_app(config=None, datastore_o=None):
             else:
                 return login_manager.unauthorized()
 
+    # #4299: werkzeug's send_file() (via make_conditional) injects a Date
+    # header into the WSGI response for conditional/static responses, and the
+    # Werkzeug built-in server (allow_unsafe_werkzeug=True) then writes its own
+    # Date via BaseHTTPRequestHandler.send_response() — emitting the Date
+    # header line twice, which RFC 9110 forbids and nginx rejects ("upstream
+    # sent duplicate header line"). Strip the application-side copy so the
+    # server's single header is what reaches the wire.
+    @app.after_request
+    def strip_duplicate_date_header(response):
+        if request.environ.get('SERVER_SOFTWARE', '').startswith('Werkzeug'):
+            response.headers.pop("Date", None)
+        return response
+
+    # Dynamic/authenticated pages (forms carrying a CSRF token, watch data, settings) must not
+    # be stored by an intermediate CDN or reverse proxy. Flask already sends "Vary: Cookie" on
+    # these, but an edge cache configured to key purely on URL will ignore it and can serve a
+    # stale CSRF token (breaking form submits) or one session's page to another visitor.
+    # Only fills in the header when the route didn't set one, so the explicit Cache-Control on
+    # static assets, screenshots, favicons and plugin files is left untouched. Note that
+    # werkzeug's send_file() always sets Cache-Control, so file responses never reach here.
+    @app.after_request
+    def add_no_cache_headers(response):
+        if 'Cache-Control' not in response.headers:
+            response.headers['Cache-Control'] = 'no-cache, no-store, must-revalidate'
+        return response
+
     watch_api.add_resource(
         WatchHistoryDiff,
         '/api/v1/watch/<uuid_str:uuid>/difference/<string:from_timestamp>/<string:to_timestamp>',
@@ -958,6 +1122,9 @@ def changedetection_app(config=None, datastore_o=None):
                 response = make_response(send_from_directory(f"static/flags/{subdir}", svg_file))
                 response.headers['Content-type'] = 'image/svg+xml'
                 response.headers['Cache-Control'] = 'max-age=86400, public'  # Cache for 24 hours
+                # Same for everyone, and the language modal pulls a few hundred of them - see
+                # PublicStaticAssetSessionInterface for why the "Vary: Cookie" has to go.
+                g.public_static_asset = True
                 return response
             except FileNotFoundError:
                 abort(404)
@@ -1107,10 +1274,35 @@ def changedetection_app(config=None, datastore_o=None):
 
         # These files should be in our subdirectory
         try:
-            return send_from_directory(f"static/{group}", path=filename)
+            response = make_response(send_from_directory(f"static/{group}", path=filename))
         except FileNotFoundError:
             abort(404)
 
+        # SEND_FILE_MAX_AGE_DEFAULT=0 means werkzeug hands these out as "no-cache, max-age=0",
+        # so every asset on every page load costs a request - a 304, but still a round trip.
+        # A `?v=` matching the file's current fingerprint (added by _fingerprint_static_urls)
+        # means the caller asked for this exact revision and can keep it for good; the next
+        # upgrade changes the URL, not the cache entry. Anything unversioned - older cached
+        # HTML, a hand-typed or third-party URL - keeps revalidating, where the ETag werkzeug
+        # already set turns the round trip into a 304 rather than a re-download.
+        if group in STATIC_CACHEABLE_GROUPS and request.args.get('v') == get_static_fingerprint(
+            group, filename
+        ):
+            response.headers['Cache-Control'] = 'public, max-age=31536000, immutable'
+            # werkzeug derived an "Expires: <now>" from SEND_FILE_MAX_AGE_DEFAULT=0. Cache-Control
+            # wins over it for anything HTTP/1.1, but leaving the two contradicting each other
+            # means an HTTP/1.0-era cache treats the file as already stale.
+            response.expires = int(time.time()) + 31536000
+        else:
+            response.headers['Cache-Control'] = 'public, max-age=0, must-revalidate'
+
+        # Identical for every visitor (the password-protected groups returned further up), so
+        # let PublicStaticAssetSessionInterface strip the "Vary: Cookie" that would otherwise
+        # key each of these on the caller's cookies and defeat the caching above.
+        g.public_static_asset = True
+
+        return response
+
     import changedetectionio.blueprint.browser_steps as browser_steps
 
     app.register_blueprint(

changedetectionio/forms.py

@@ -4,6 +4,7 @@ from loguru import logger
 from wtforms.widgets.core import TimeInput
 from flask_babel import lazy_gettext as _l, gettext
 
+from changedetectionio.blueprint.menu_modes import MENU_SIDEBAR_ACTIONMODES, MENU_SIDEBAR_ACTIONMODES_DEFAULT
 from changedetectionio.blueprint.rss import RSS_FORMAT_TYPES, RSS_TEMPLATE_TYPE_OPTIONS, RSS_TEMPLATE_HTML_DEFAULT
 from changedetectionio.llm.ui_strings import LLM_INTENT_WATCH_PLACEHOLDER
 from changedetectionio.llm.evaluator import (
@@ -696,14 +697,18 @@ class ValidateCSSJSONXPATHInput(object):
                     raise ValidationError("XPath not permitted in this field!")
                 from lxml import etree, html
                 import elementpath
-                from changedetectionio.html_tools import get_safe_xpath3_parser, lxml_guard, lxml_html_parser
+                from changedetectionio.html_tools import get_safe_xpath3_parser, lxml_guard, lxml_html_parser, \
+                    XPATH_CODEPOINT_COLLATION
                 line = line.replace('xpath:', '')
 
                 try:
                     # Runs on a Flask request thread - must share the worker's lxml lock.
                     with lxml_guard():
                         tree = html.fromstring("<html></html>", parser=lxml_html_parser())
-                        elementpath.select(tree, line.strip(), parser=get_safe_xpath3_parser())
+                        # Same collation the filter will actually run under, so validation
+                        # cannot accept an expression that then behaves differently at check time.
+                        elementpath.select(tree, line.strip(), parser=get_safe_xpath3_parser(),
+                                           default_collation=XPATH_CODEPOINT_COLLATION)
                 except elementpath.ElementPathError as e:
                     message = field.gettext('\'%(expression)s\' is not a valid XPath expression. (%(error)s)')
                     raise ValidationError(message % {'expression': line, 'error': str(e)})
@@ -939,6 +944,7 @@ class SingleBrowserStep(Form):
 class processor_text_json_diff_form(commonSettingsForm):
 
     url = StringField(_l('Web Page URL'), validators=[validateURL()])
+    link_to_open = StringField(_l('Open Link Override'), validators=[validators.Optional(), validateURL()], default='')
     tags = StringTagUUID(_l('Group Tag'), [validators.Optional()], default='')
 
     time_between_check = EnhancedFormField(
@@ -1046,6 +1052,19 @@ class processor_text_json_diff_form(commonSettingsForm):
             self.url.errors.append(gettext('Invalid template syntax: %(error)s') % {'error': e})
             result = False
 
+        # Attempt to validate jinja2 templates in the optional "Link to Open"
+        if self.link_to_open.data and self.link_to_open.data.strip():
+            try:
+                jinja_render(template_str=self.link_to_open.data)
+            except ModuleNotFoundError as e:
+                logger.error(e)
+                self.link_to_open.errors.append(gettext('Invalid template syntax configuration: %(error)s') % {'error': e})
+                result = False
+            except Exception as e:
+                logger.error(e)
+                self.link_to_open.errors.append(gettext('Invalid template syntax: %(error)s') % {'error': e})
+                result = False
+
         # Attempt to validate jinja2 templates in the body
         if self.body.data and self.body.data.strip():
             try:
@@ -1160,13 +1179,13 @@ class globalSettingsApplicationUIForm(Form):
     socket_io_enabled = BooleanField(_l('Realtime UI Updates Enabled'), default=True, validators=[validators.Optional()])
     favicons_enabled = BooleanField(_l('Favicons Enabled'), default=True, validators=[validators.Optional()])
     use_page_title_in_list = BooleanField(_l('Use page <title> in watch overview list')) #BooleanField=True
+    use_share_watch = BooleanField(_l('Enable watch "sharing"'))
     timeago_format = SelectField(_l('Relative time format'),
                                  choices=[('long', _l('Long (1 minute ago)')), ('short', _l('Short (1m ago)'))],
                                  default='long', validators=[validators.Optional()])
     sidebar_mode = SelectField(_l('Navigation sidebar'),
-                               choices=[('collapsed', _l('Collapsed icon rail (expands on hover)')),
-                                        ('pinned', _l('Always expanded'))],
-                               default='collapsed', validators=[validators.Optional()])
+                               choices=MENU_SIDEBAR_ACTIONMODES,
+                               default=MENU_SIDEBAR_ACTIONMODES_DEFAULT, validators=[validators.Optional()])
 
 # datastore.data['settings']['application']..
 class globalSettingsApplicationForm(commonSettingsForm):

changedetectionio/gc_debounce.py

@@ -0,0 +1,73 @@
+"""
+Debounced explicit garbage collection for the watch-check hot path.
+
+Several places call gc.collect() after a check to keep C-level memory (pyppeteer buffers,
+libxml2 documents, PIL, brotli) from accumulating. Individually each is reasonable. Run
+concurrently by many fetch workers they become a storm: with FETCH_WORKERS=50 and roughly
+five call sites per check, the process spends most of its time stopped in the collector,
+because every gc.collect() is a full stop-the-world pass that walks the entire heap while
+holding the GIL.
+
+Measured on 153 real puppeteer checks of a live site, FETCH_WORKERS=50, an `//div` filter
+so the lxml document tree is realistic:
+
+                       collects  objects freed   gc time  checks/sec  CPU/check  RSS plateau
+  one per call site         790      2,594,098     91.3s       0.766     1.373s      279.6MB
+  debounced to 1s            48      2,219,010      7.3s       1.433     0.731s      275.3MB
+  none at all                 0              0      0.0s       1.503     0.685s      287.7MB
+
+Debouncing keeps 86% of the reclamation for 6% of the collections, and resident memory
+ends up LOWER than collecting every time. It works because the collector is process-wide:
+any worker's collection breaks every other worker's cycles too, so with many workers the
+calls are overwhelmingly redundant duplicates rather than independently necessary.
+
+Removing them entirely was also measured. It is slightly faster still, but it was the only
+configuration whose RSS had not plateaued by the end of the run, so it is not offered.
+
+Collecting a younger generation was measured and rejected: gen 0 freed 1,136 objects
+against the full pass's 2,594,098, because objects that survive a 10-30 second fetch have
+already been promoted out of gen 0. It is cheap because it does almost nothing.
+
+Environment:
+  EXPLICIT_GC_MIN_INTERVAL   seconds between explicit collections, process-wide.
+                             Default 1.0. Set 0 to collect at every call site as before.
+  EXPLICIT_GC_COLLECT        set false to disable explicit collection entirely. A
+                             measurement switch for attributing a slowdown, not a
+                             recommended setting - expect resident memory to drift.
+"""
+
+import gc
+import os
+import threading
+import time
+
+from changedetectionio.strtobool import strtobool
+
+ENABLED = strtobool(os.getenv('EXPLICIT_GC_COLLECT', 'true'))
+MIN_INTERVAL = float(os.getenv('EXPLICIT_GC_MIN_INTERVAL', '1.0') or 0)
+
+_last_collect = 0.0
+_lock = threading.Lock()
+
+
+def collect(where=None):
+    """Explicit collection for the per-check hot path, rate-limited process-wide.
+
+    `where` is a short label for the call site, kept so callers read clearly and so a
+    future caller can log it. Returns the number of objects collected, or 0 when the call
+    was debounced or disabled - matching gc.collect()'s return, so this is a drop-in
+    replacement for it.
+    """
+    global _last_collect
+
+    if not ENABLED:
+        return 0
+
+    if MIN_INTERVAL > 0:
+        now = time.monotonic()
+        with _lock:
+            if now - _last_collect < MIN_INTERVAL:
+                return 0
+            _last_collect = now
+
+    return gc.collect()

changedetectionio/html_tools.py

@@ -164,6 +164,25 @@ _DEFAULT_UNSAFE_XPATH3_FUNCTIONS = [
 ]
 
 
+# XPath 3.1 says the default collation is Unicode codepoint collation. elementpath instead leaves
+# its collation functions pointing at locale.strxfrm / locale.strcoll, so the process-wide
+# LC_COLLATE decides what contains() means:
+#
+#     def contains(self, a, b):  return self.strxfrm(b) in self.strxfrm(a)
+#
+# With LC_COLLATE=C, strxfrm() is the identity and that is an ordinary substring test. With
+# LC_COLLATE=en_US.UTF-8 it returns a binary collation key, and a substring of a collation key is
+# not the collation key of the substring - so contains(), starts-with(), ends-with() and
+# substring-before/after() return false for every input, and a filter that matches 67 elements
+# matches 0 (#4437). Name tests, axes and '=' are unaffected, which is what made it look like the
+# page had changed layout.
+#
+# flask_app.py keeps LC_COLLATE in "C" for this reason, but a filter must not depend on a distant
+# module's locale bookkeeping, nor on what an operator puts in LANG/LC_ALL. Pinning the collation
+# per evaluation makes the filter mean the same thing in every deployment.
+XPATH_CODEPOINT_COLLATION = 'http://www.w3.org/2005/xpath-functions/collation/codepoint'
+
+
 def get_safe_xpath3_parser():
     """Return an XPath3Parser subclass with filesystem/environment access functions removed.
 
@@ -383,7 +402,9 @@ def xpath_filter(xpath_filter, html_content, append_pretty_line_formatting=False
             # This allows //title to match elements in the default namespace
             namespaces[''] = tree.nsmap[None]
 
-        r = elementpath.select(tree, xpath_filter.strip(), namespaces=namespaces, parser=get_safe_xpath3_parser())
+        r = elementpath.select(tree, xpath_filter.strip(), namespaces=namespaces,
+                               parser=get_safe_xpath3_parser(),
+                               default_collation=XPATH_CODEPOINT_COLLATION)
         #@note: //title/text() now works with default namespaces (fixed by registering '' prefix)
         #@note: //title/text() wont work where <title>CDATA.. (use cdata_in_document_to_text first)
 

changedetectionio/languages.py

@@ -19,6 +19,7 @@ def get_timeago_locale(flask_locale, short=False):
     - Swedish: Flask uses 'sv', timeago uses 'sv_SE'
     - Norwegian: Flask uses 'no', timeago uses 'nb_NO' or 'nn_NO'
     - Hindi: Flask uses 'hi', timeago uses 'in_HI'
+    - Indonesian: Flask uses 'id', timeago uses 'in_ID'
     - Czech: Flask uses 'cs', but timeago doesn't support Czech - fallback to English
 
     Args:
@@ -46,6 +47,7 @@ def get_timeago_locale(flask_locale, short=False):
         'sv': 'sv_SE',          # Swedish
         'no': 'nb_NO',          # Norwegian Bokmål
         'hi': 'in_HI',          # Hindi
+        'id': 'in_ID',          # Indonesian
         'cs': 'en',             # Czech not supported by timeago, fallback to English
         'ja': 'ja',             # Japanese
         'uk': 'uk',             # Ukrainian
@@ -156,6 +158,7 @@ LANGUAGE_DATA = {
     'tr': {'flag': 'fi fi-tr fis', 'name': 'Türkçe'},
     'ar': {'flag': 'fi fi-sa fis', 'name': 'العربية'},
     'hi': {'flag': 'fi fi-in fis', 'name': 'हिन्दी'},
+    'id': {'flag': 'fi fi-id fis', 'name': 'Bahasa Indonesia'},
     'uk': {'flag': 'fi fi-ua fis', 'name': 'Українська'},
 }
 

changedetectionio/model/App.py

@@ -1,6 +1,7 @@
 from os import getenv
 from copy import deepcopy
 
+from changedetectionio.blueprint.menu_modes import MENU_SIDEBAR_ACTIONMODES_DEFAULT
 from changedetectionio.blueprint.rss import RSS_FORMAT_TYPES, RSS_CONTENT_FORMAT_DEFAULT
 from changedetectionio.model.Tags import TagsDict
 
@@ -76,11 +77,12 @@ class model(dict):
                     'webdriver_delay': None , # Extra delay in seconds before extracting text
                     'ui': {
                         'use_page_title_in_list': True,
+                        'use_share_watch': False,  # "Share watch" link is a power-user feature, off by default
                         'open_diff_in_new_tab': True,
                         'socket_io_enabled': True,
                         'favicons_enabled': True,
                         'timeago_format': 'long',  # 'long' = "1 minute ago", 'short' = "1m ago"
-                        'sidebar_mode': 'collapsed',  # 'collapsed' = slim icon rail, expands on hover; 'pinned' = always expanded
+                        'sidebar_mode': MENU_SIDEBAR_ACTIONMODES_DEFAULT,  # one of blueprint.menu_modes.MENU_SIDEBAR_ACTIONMODES
                     },
                 }
             }

changedetectionio/model/Watch.py

@@ -30,6 +30,7 @@ from changedetectionio.validate_url import is_safe_valid_url
 
 from changedetectionio.strtobool import strtobool
 from changedetectionio.jinja2_custom import render as jinja_render
+from changedetectionio import gc_debounce
 from . import watch_base
 from .persistence import EntityPersistenceMixin
 import os
@@ -107,9 +108,21 @@ def _brotli_save(contents, filepath, mode=None, fallback_uncompressed=False):
 
         logger.debug(f"Finished brotli compression - From {original_size} to {total_compressed_size} bytes.")
 
-        # Cleanup: Delete compressor, force Python GC, then force C-level memory release
+        # Cleanup: drop the compressor, then force C-level memory back to the OS.
+        #
+        # There is deliberately no gc.collect() here. brotli.Compressor is not gc-tracked,
+        # so the collector can never reclaim it - `del` frees it immediately by refcount.
+        # Measured over 60 x 2.2MB compressions, RSS growth was:
+        #
+        #   neither              +0.9MB
+        #   gc.collect() only    +0.2MB
+        #   malloc_trim() only   +0.0MB   <- does all of the work
+        #   both (previous)      +0.0MB   <- the collect contributed nothing
+        #
+        # malloc_trim below is the load-bearing line: brotli's retention is glibc holding
+        # freed arenas, which only a trim returns. The collect cost ~31ms of stop-the-world
+        # per snapshot save for no reclamation.
         del compressor
-        gc.collect()
 
         # Force release of C-level memory back to OS (since brotli is a C library)
         try:
@@ -272,10 +285,12 @@ class model(EntityPersistenceMixin, watch_base):
     def has_unviewed(self):
         return int(self.newest_history_key) > int(self['last_viewed']) and self.__history_n >= 2
 
-    @property
-    def link(self):
+    def _resolve_link(self, url, flash_on_template_error=True):
+        """Validate, Jinja2-render and de-'source:' a URL so it is safe to put in an href.
 
-        url = self.get('url', '')
+        Returns 'DISABLED' when the URL is missing/unsafe, or '' when its Jinja2 template
+        could not be rendered.
+        """
         if not is_safe_valid_url(url):
             return 'DISABLED'
 
@@ -286,11 +301,15 @@ class model(EntityPersistenceMixin, watch_base):
                 ready_url = jinja_render(template_str=url)
             except Exception as e:
                 logger.critical(f"Invalid URL template for: '{url}' - {str(e)}")
-                from flask import flash, url_for
-                from markupsafe import Markup
-                message = Markup('<a href="{}#general">The URL {} is invalid and cannot be used, click to edit</a>'.format(
-                    url_for('ui.ui_edit.edit_page', uuid=self.get('uuid')), self.get('url', '')))
-                flash(message, 'error')
+                # has_request_context() guard: this is also reached from worker threads and the
+                # notification path, where flash() would raise "Working outside of request context".
+                from flask import has_request_context
+                if flash_on_template_error and has_request_context():
+                    from flask import flash, url_for
+                    from markupsafe import Markup
+                    message = Markup('<a href="{}#general">The URL {} is invalid and cannot be used, click to edit</a>'.format(
+                        url_for('ui.ui_edit.edit_page', uuid=self.get('uuid')), url))
+                    flash(message, 'error')
                 return ''
 
         if ready_url.startswith('source:'):
@@ -301,6 +320,34 @@ class model(EntityPersistenceMixin, watch_base):
             return 'DISABLED'
         return ready_url
 
+    @property
+    def link(self):
+        """The URL that actually gets fetched/checked."""
+        return self._resolve_link(self.get('url', ''))
+
+    @property
+    def open_link_override(self):
+        """The resolved optional 'Link to Open', or '' when unset/unusable."""
+        override = str(self.get('link_to_open') or '').strip()
+        if not override:
+            return ''
+
+        # Don't flash on a broken template here - `link` already surfaces that for the watched URL,
+        # and a bad "Link to Open" should never stop the page rendering.
+        ready = self._resolve_link(override, flash_on_template_error=False)
+        if not ready or ready == 'DISABLED':
+            return ''
+        return ready
+
+    @property
+    def open_link(self):
+        """The URL a human should be sent to when they click through to "the site".
+
+        Some watches point at an API endpoint or RSS feed that is useless in a browser -
+        'Link to Open' lets the user store the real page for those. Falls back to `link`.
+        """
+        return self.open_link_override or self.link
+
     @property
     def domain_only_from_link(self):
         from urllib.parse import urlparse
@@ -655,7 +702,7 @@ class model(EntityPersistenceMixin, watch_base):
 
         # reimport
         bump = self.history
-        gc.collect()
+        gc_debounce.collect('watch.history_bump')
 
     # Save some text file to the appropriate path and bump the history
     # result_obj from fetch_site_status.run()

changedetectionio/model/__init__.py

@@ -207,6 +207,7 @@ class watch_base(dict):
             'last_error': False,
             'last_notification_error': None,
             'last_viewed': 0,  # history key value of the last viewed via the [diff] link
+            'link_to_open': '',  # Optional human-facing URL to open instead of 'url' (eg. watch an API/RSS endpoint, open the real page)
             'llm_backend_profile': True, # @note - now its just a bool but in the near future we can select a LLM profile or 'off'/false
             'llm_change_summary': '',        # Prompt for AI Change Summary — replaces {{ diff }} in notifications
             'llm_change_summary_mode': 'replace',  # 'replace' the inherited prompt, or 'append' to it

changedetectionio/notification_service.py

@@ -241,6 +241,7 @@ class NotificationContextData(dict):
             'watch_tag': None,
             'watch_title': None,
             'watch_url': 'https://WATCH-PLACE-HOLDER/',
+            'watch_open_url': 'https://WATCH-PLACE-HOLDER/',  # watch['link_to_open'] when set, otherwise the same as watch_url
             'watch_uuid': 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX',  # Converted to 'watch_uuid' in create_notification_parameters
         })
 
@@ -350,6 +351,7 @@ def set_basic_notification_vars(current_snapshot, prev_snapshot, watch, triggere
         'triggered_text': triggered_text,
         'uuid': watch.get('uuid') if watch else None,
         'watch_url': watch.get('url') if watch else None,
+        'watch_open_url': (watch.open_link_override or watch.get('url')) if watch else None,
         'watch_uuid': watch.get('uuid') if watch else None,
         'watch_mime_type': watch.get('content-type')
     }
@@ -511,6 +513,7 @@ Thanks - Your omniscient changedetection.io installation.
         if 'notification_urls' in n_object:
             n_object.update({
                 'watch_url': watch['url'],
+                'watch_open_url': watch.open_link_override or watch['url'],
                 'uuid': watch_uuid,
                 'screenshot': None
             })
@@ -560,6 +563,7 @@ Thanks - Your omniscient changedetection.io installation.
         if 'notification_urls' in n_object:
             n_object.update({
                 'watch_url': watch['url'],
+                'watch_open_url': watch.open_link_override or watch['url'],
                 'uuid': watch_uuid
             })
             self.notification_q.put(n_object)

changedetectionio/processors/base.py

@@ -22,11 +22,16 @@ class difference_detection_processor():
     preferred_proxy = None
     screenshot_format = SCREENSHOT_FORMAT_JPEG
     last_raw_content_checksum = None
+    worker_id = None
 
-    def __init__(self, datastore, watch_uuid):
+    def __init__(self, datastore, watch_uuid, worker_id=None):
         self.datastore = datastore
         self.watch_uuid = watch_uuid
 
+        # Which async worker is driving this check, passed down to the fetcher in call_browser()
+        # so it can keep per-worker browser state apart, None when we're not called from a worker
+        self.worker_id = worker_id
+
         # Create a stable snapshot of the watch for processing
         # Why deepcopy?
         # 1. Prevents "dict changed during iteration" errors if watch is modified during processing
@@ -201,7 +206,8 @@ class difference_detection_processor():
         # When browser_connection_url is None, it method should default to working out whats the best defaults (os env vars etc)
         self.fetcher = fetcher_obj(proxy_override=proxy_url,
                                    custom_browser_connection_url=custom_browser_connection_url,
-                                   screenshot_format=self.screenshot_format
+                                   screenshot_format=self.screenshot_format,
+                                   worker_id=self.worker_id
                                    )
 
         # Stamp the resolved backend name so downstream consumers (processors, plugins)
@@ -261,7 +267,7 @@ class difference_detection_processor():
         await self.fetcher.run(
             current_include_filters=self.watch.get('include_filters'),
             empty_pages_are_a_change=empty_pages_are_a_change,
-            fetch_favicon=self.watch.favicon_is_expired(),
+            fetch_favicon=self.watch.favicon_is_expired() and self.datastore.data['settings']['application'].get('ui', {}).get('favicons_enabled', True),
             ignore_status_codes=ignore_status_codes,
             is_binary=is_binary,
             request_body=request_body,

changedetectionio/processors/image_ssim_diff/difference.py

@@ -430,7 +430,8 @@ def render(watch, datastore, request, url_for, render_template, flash, redirect)
         change_percentage=change_percentage,
         comparison_data=comparison_data,  # Full history for charts/visualization
         comparison_method=method_display,
-        current_diff_url=watch['url'],
+        current_diff_label=watch.label,
+        current_diff_url=watch.open_link,
         from_version=from_version,
         percentage_different=change_percentage,
         threshold=pixel_difference_threshold_sensitivity,

changedetectionio/processors/image_ssim_diff/preview.py

@@ -106,5 +106,6 @@ def render(watch, datastore, request, url_for, render_template, flash, redirect)
         uuid=watch.get('uuid'),
         versions=versions,
         timestamp=timestamp,
-        current_diff_url=watch['url']
+        current_diff_label=watch.label,
+        current_diff_url=watch.open_link
     )

changedetectionio/processors/restock_diff/difference.py

@@ -191,7 +191,8 @@ def render(watch, datastore, request, url_for, render_template, flash, redirect,
         'restock_diff/difference.html',
         uuid=uuid,
         watch=watch,
-        current_diff_url=watch['url'],
+        current_diff_label=watch.label,
+        current_diff_url=watch.open_link,
         extra_title=f" - {watch.label} - {gettext('Price history')}",
         last_error=watch['last_error'],
         screenshot=watch.get_screenshot(),

changedetectionio/processors/restock_diff/templates/restock_diff/difference.html

@@ -86,8 +86,10 @@
         price_low: {{ _('Currently low')|tojson }},
         price_typical: {{ _('Currently typical')|tojson }},
         price_high: {{ _('Currently high')|tojson }},
-        cheaper_than: {{ _('cheaper than %s% of tracked prices')|tojson }},
-        pricier_than: {{ _('more expensive than %s% of tracked prices')|tojson }},
+        {# TRANSLATORS: {pct} is a percentage including the % sign, e.g. "80%" #}
+        cheaper_than: {{ _('cheaper than {pct} of tracked prices')|tojson }},
+        {# TRANSLATORS: {pct} is a percentage including the % sign, e.g. "80%" #}
+        pricier_than: {{ _('more expensive than {pct} of tracked prices')|tojson }},
         typical_note: {{ _('around the usual price')|tojson }},
         avg_label: {{ _('avg')|tojson }}
     };

changedetectionio/processors/text_json_diff/difference.py

@@ -216,7 +216,8 @@ def render(watch, datastore, request, url_for, render_template, flash, redirect,
                              #initial_scroll_line_number=100,
                              bottom_horizontal_offscreen_contents=offscreen_content,
                              content=content,
-                             current_diff_url=watch['url'],
+                             current_diff_label=watch.label,
+                             current_diff_url=watch.open_link,
                              diff_cell_grid=diff_cell_grid,
                              diff_prefs=diff_prefs,
                              extra_classes=' '.join(filter(None, ['difference-page', 'llm-configured' if llm_configured else ''])),

changedetectionio/run_basic_tests.sh

@@ -9,6 +9,12 @@
 # exit when any command fails
 set -e
 
+# Failing fast is deliberate here (the first failure is usually the real problem, and it keeps
+# the run short) - but this script runs 8 independent pytest groups, so make it obvious that the
+# groups after the failure were SKIPPED rather than passed. Otherwise one failing test reads as
+# "the whole basic suite is broken".
+trap 'rc=$?; echo "::error::run_basic_tests.sh aborted at line $LINENO (exit $rc) - the test groups after this point were SKIPPED, not run"' ERR
+
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 rm tests/logs/* -f
 

changedetectionio/static/js/browser-steps.js

@@ -78,7 +78,9 @@ $(document).ready(function () {
     // bootstrap it, this will trigger everything else
     $('#browsersteps-img').bind('load', function () {
         $('body').addClass('full-width');
-        console.log("Loaded background...");
+        console.log(`Loaded background ${this.naturalWidth}px` );
+        // For the UI width of the whole edit area
+        document.documentElement.style.setProperty('--browser-steps-max-width', `${this.naturalWidth+200}px` );
 
         document.getElementById("browsersteps-selector-canvas");
         c = document.getElementById("browsersteps-selector-canvas");

changedetectionio/static/js/diff-overview.js

@@ -1,74 +1,205 @@
+// Previous / Next step both version selects one position back or forward and
+// rebuild the href from the current diff options; the arrow keys do the same
+// thing. Recomputed at press time rather than cached, because changing either
+// select submits the form and re-renders them.
+function diffStepHref(direction) {
+    var $from = $('#diff-from-version option:selected')[direction]();
+    var $to = $('#diff-to-version option:selected')[direction]();
+    if (!$from.length || !$to.length) {
+        return null;
+    }
+    var params = new URLSearchParams(window.location.search);
+    params.set('from_version', $from.val());
+    params.set('to_version', $to.val());
+    return '?' + params.toString();
+}
+
 function setupDiffNavigation() {
-    var $fromSelect = $('#diff-from-version');
-    var $toSelect = $('#diff-to-version');
-    var $fromSelected = $fromSelect.find('option:selected');
-    var $toSelected = $toSelect.find('option:selected');
+    var BUTTONS = {prev: '#btn-previous', next: '#btn-next'};
 
-    if ($fromSelected.length && $toSelected.length) {
-        // Find the previous pair (move both back one position)
-        var $prevFrom = $fromSelected.prev();
-        var $prevTo = $toSelected.prev();
+    if ($('#diff-from-version option:selected').length && $('#diff-to-version option:selected').length) {
+        $.each(BUTTONS, function (direction, selector) {
+            var href = diffStepHref(direction);
+            // Nothing to step to that way: drop the button rather than leave a
+            // dead one on the bar.
+            if (href) {
+                $(selector).attr('href', href);
+            } else {
+                $(selector).remove();
+            }
+        });
+    }
 
-        // Find the next pair (move both forward one position)
-        var $nextFrom = $fromSelected.next();
-        var $nextTo = $toSelected.next();
+    $(window).on('keydown', function (event) {
+        // Not while someone is typing or working a select.
+        if (/^(INPUT|TEXTAREA|SELECT)$/.test(event.target.tagName)) {
+            return;
+        }
+        var direction = {ArrowLeft: 'prev', ArrowRight: 'next'}[event.key];
+        var href = direction && diffStepHref(direction) && $(BUTTONS[direction]).attr('href');
+        if (href) {
+            event.preventDefault();
+            window.location.href = href;
+        }
+    });
+}
 
-        // Build URL with current diff preferences
-        var currentParams = new URLSearchParams(window.location.search);
+// The seven diff options collapse behind the 'Filters' button so the sticky bar
+// stays one toolbar row. Wired up here rather than purely in CSS: until this
+// runs the fieldset is inline and the toggle hidden, so with scripting off the
+// options are still reachable and still submit with the form.
+function setupDiffFilters() {
+    var $header = $('#diff-header');
+    var $toggle = $('#diff-filters-toggle');
+    var $panel = $('#diff-style');
+    if (!$header.length || !$toggle.length || !$panel.length) {
+        return;
+    }
+    var header = $header[0], toggle = $toggle[0], panel = $panel[0];
 
-        // Previous button: only show if both can move back
-        if ($prevFrom.length && $prevTo.length) {
-            currentParams.set('from_version', $prevFrom.val());
-            currentParams.set('to_version', $prevTo.val());
-            $('#btn-previous').attr('href', '?' + currentParams.toString());
-        } else {
-            $('#btn-previous').remove();
+    $header.addClass('diff-filters-js');
+
+    function isOpen() {
+        return $header.hasClass('diff-filters-open');
+    }
+
+    var EDGE_GAP = 8;   // keep the panel clear of the viewport edges
+    var BUTTON_GAP = 4; // between the toggle and the panel
+
+    // position: fixed, because #diff-header's overflow: auto would clip an absolute
+    // panel - which means parking it by hand, and that scrolling will never bring a
+    // row hanging off the bottom back into reach. So it has to fit at placement time
+    // or not at all: cap it to the room there is and let it scroll (see diff.scss).
+    function place() {
+        var button = toggle.getBoundingClientRect();
+        // A fixed element is positioned against the layout viewport, but iOS
+        // shrinks the *visual* one behind its toolbars, so budget with whichever
+        // is smaller.
+        var viewportHeight = document.documentElement.clientHeight;
+        if (window.visualViewport) {
+            viewportHeight = Math.min(viewportHeight, window.visualViewport.height);
         }
 
-        // Next button: only show if both can move forward
-        if ($nextFrom.length && $nextTo.length) {
-            currentParams.set('from_version', $nextFrom.val());
-            currentParams.set('to_version', $nextTo.val());
-            $('#btn-next').attr('href', '?' + currentParams.toString());
-        } else {
-            $('#btn-next').remove();
+        // Measure unconstrained: a cap left over from the previous placement would
+        // otherwise read back as the panel's natural height.
+        panel.style.maxHeight = '';
+
+        // Pick the roomier side rather than assume one: below used to be roomier by
+        // construction, but diff.scss's short-viewport breakpoint drops the bar's
+        // 50svh cap and at 280x300 above wins 147.6px to 104.2px.
+        var roomBelow = viewportHeight - button.bottom - BUTTON_GAP - EDGE_GAP;
+        var roomAbove = button.top - BUTTON_GAP - EDGE_GAP;
+        var above = roomAbove > roomBelow;
+        var room = above ? roomAbove : roomBelow;
+
+        if (panel.offsetHeight > room) {
+            // max-height caps the content box, and the panel must stay content-box
+            // (border-box would fold the padding into min-width and narrow it by
+            // 24px) - so subtract its own padding and borders.
+            var style = window.getComputedStyle(panel);
+            var trim = parseFloat(style.paddingTop) + parseFloat(style.paddingBottom) +
+                       parseFloat(style.borderTopWidth) + parseFloat(style.borderBottomWidth);
+            panel.style.maxHeight = Math.max(room - trim, 0) + 'px';
+        }
+
+        // offsetHeight after the cap: parking above measures from the panel's bottom.
+        var top = above ? button.top - BUTTON_GAP - panel.offsetHeight
+                        : button.bottom + BUTTON_GAP;
+        panel.style.top = top + 'px';
+
+        var available = document.documentElement.clientWidth - panel.offsetWidth - EDGE_GAP;
+        var left = Math.max(EDGE_GAP, Math.min(button.left, available));
+
+        // The panel paints the page's own backdrop (see diff.scss), aligned by
+        // geometry because iOS Safari ignores background-attachment: fixed. Negative
+        // because the copy's top-left corner belongs at the viewport's.
+        $panel.css({left: left + 'px', backgroundPosition: (-left) + 'px ' + (-top) + 'px'});
+    }
+
+    function open() {
+        $header.addClass('diff-filters-open');
+        $toggle.attr('aria-expanded', 'true');
+        place();
+    }
+
+    function close(restoreFocus) {
+        if (!isOpen()) {
+            return;
+        }
+        $header.removeClass('diff-filters-open');
+        $toggle.attr('aria-expanded', 'false');
+        if (restoreFocus) {
+            $toggle.trigger('focus');
         }
     }
 
-    // Keyboard navigation
-    window.addEventListener('keydown', function (event) {
-        // Don't trigger if user is typing in an input field
-        if (event.target.tagName === 'INPUT' || event.target.tagName === 'TEXTAREA' || event.target.tagName === 'SELECT') {
+    $toggle.on('click', function (event) {
+        event.preventDefault();
+        if (isOpen()) {
+            close(false);
+        } else {
+            open();
+        }
+    });
+
+    $(document).on('click', function (event) {
+        if (isOpen() && !panel.contains(event.target) && !toggle.contains(event.target)) {
+            close(false);
+        }
+    });
+
+    $(document).on('keydown', function (event) {
+        if (event.key === 'Escape') {
+            close(true);
+        }
+    });
+
+    // A tab switch hides #settings and the panel with it, so drop the open state
+    // rather than leave aria-expanded lying.
+    $(window).on('hashchange', function () {
+        close(false);
+    });
+
+    $(window).on('resize', function () {
+        if (isOpen()) {
+            place();
+        }
+    });
+
+    // The button can drift out from under the fixed panel two ways: #settings
+    // scrolling inside a sticky bar (16px at 390x390, 30px at 320x480), or the whole
+    // bar scrolling away below diff.scss's max-height: 500px breakpoint. Opposite
+    // causes, one follow/close rule; each closing test is inert in the other mode.
+    function followButton() {
+        if (!isOpen()) {
             return;
         }
-
-        var $fromSelected = $fromSelect.find('option:selected');
-        var $toSelected = $toSelect.find('option:selected');
-
-        if ($fromSelected.length && $toSelected.length) {
-            if (event.key === 'ArrowLeft') {
-                var $prevFrom = $fromSelected.prev();
-                var $prevTo = $toSelected.prev();
-                if ($prevFrom.length && $prevTo.length) {
-                    var prevHref = $('#btn-previous').attr('href');
-                    if (prevHref) {
-                        event.preventDefault();
-                        window.location.href = prevHref;
-                    }
-                }
-            } else if (event.key === 'ArrowRight') {
-                var $nextFrom = $fromSelected.next();
-                var $nextTo = $toSelected.next();
-                if ($nextFrom.length && $nextTo.length) {
-                    var nextHref = $('#btn-next').attr('href');
-                    if (nextHref) {
-                        event.preventDefault();
-                        window.location.href = nextHref;
-                    }
-                }
-            }
+        var bar = header.getBoundingClientRect();
+        var button = toggle.getBoundingClientRect();
+        var viewportHeight = document.documentElement.clientHeight;
+        if (button.bottom <= bar.top || button.top >= bar.bottom ||
+            button.bottom <= 0 || button.top >= viewportHeight) {
+            close(false);
+        } else {
+            place();
         }
-    }, false);
+    }
+
+    // Native, not jQuery: .on() cannot pass passive or capture. Capture is required
+    // because scroll does not bubble and the element that scrolls is #settings, a
+    // descendant; the window registration covers the static mode's document scroll.
+    header.addEventListener('scroll', followButton, {passive: true, capture: true});
+    window.addEventListener('scroll', followButton, {passive: true});
+    // On iOS the visual viewport shrinks on its own - a toolbar or the keyboard -
+    // without resizing the layout viewport, so no window resize fires and the cap
+    // place() budgeted stays wrong. Reproduced in Chromium via CDP pinch-zoom.
+    if (window.visualViewport) {
+        window.visualViewport.addEventListener('resize', function () {
+            if (isOpen()) {
+                place();
+            }
+        });
+    }
 }
 
 $(document).ready(function () {
@@ -87,10 +218,70 @@ $(document).ready(function () {
         setupDiffNavigation();
     }
 
+    setupDiffFilters();
+
     // Load it when the #screenshot tab is in use, so we dont give a slow experience when waiting for the text diff to load
-    window.addEventListener('hashchange', function (e) {
+    $(window).on('hashchange', function () {
         toggle(location.hash);
-    }, false);
+        realignPane();
+    });
+
+    // Where the last alignment we performed left the page, so a later one can tell
+    // "still where we put them" from "the reader has moved since", and the
+    // scroll-margin-top it was computed against.
+    var alignedY = null;
+    var alignedMargin = null;
+
+    function targetPane() {
+        var pane = location.hash.length > 1 &&
+            document.getElementById(location.hash.slice(1));
+        return pane && pane.classList.contains('tab-pane-inner') ? pane : null;
+    }
+
+    // The fragment jump runs before toggle() hides #settings, which collapses the
+    // ~8000px document; the engine then clamps its held offset rather than re-running
+    // the jump, and on iOS that clamp is never 0. So re-run it once the layout has
+    // settled. scrollIntoView, not scrollTo(0, 0): .tab-pane-inner already declares
+    // the sticky stack's offset as scroll-margin-top. setTimeout(0) rather than rAF,
+    // because that margin resolves against --diff-header-height, which
+    // diff-render.js's ResizeObserver updates after frame callbacks have run.
+    function realignPane() {
+        var pane = targetPane();
+        if (!pane) {
+            return;
+        }
+        setTimeout(function () {
+            alignedMargin = parseFloat(getComputedStyle(pane).scrollMarginTop);
+            pane.scrollIntoView({block: 'start', inline: 'nearest'});
+            alignedY = window.scrollY;
+        }, 0);
+    }
+
+    // The load path is stale for a nearer reason: tabs.js rewrites an empty hash and
+    // the browser jumps before diff-render.js has measured the bar, so
+    // scroll-margin-top is still on its --diff-header-height: 0 fallback. Traced at
+    // 844x390: landed at scrollY 231 against a 16px margin that then became 202px.
+    // Below the short-viewport breakpoint the bar is in flow, so that puts every
+    // control off the top of the page. Re-run when the bar resizes - comparing the
+    // margin, so it only fires on a real change - and only while the reader is still
+    // where we left them, since rotating the phone resizes the bar too.
+    var bar = document.getElementById('diff-header');
+    if (bar && typeof ResizeObserver !== 'undefined') {
+        new ResizeObserver(function () {
+            var pane = targetPane();
+            if (!pane) {
+                return;
+            }
+            if (alignedY !== null && Math.abs(window.scrollY - alignedY) > 2) {
+                return;
+            }
+            var margin = parseFloat(getComputedStyle(pane).scrollMarginTop);
+            if (alignedMargin !== null && Math.abs(margin - alignedMargin) < 0.5) {
+                return;
+            }
+            realignPane();
+        }).observe(bar);
+    }
 
     toggle(location.hash);
 
@@ -108,23 +299,14 @@ $(document).ready(function () {
         }
     }
 
-    const article = $('#difference')[0];
+    // We could also add the 'touchend' event for touch devices, but since most
+    // iOS/Android browsers already show a dialog when you select text (often with a
+    // Share option) we'll skip that. mouseup goes on the page rather than the
+    // article, because they might 'mouse up' outside it.
+    $('#difference').on('mousedown', clean);
+    $('.difference-page').on('mouseup', dragTextHandler);
 
-    // We could also add the  'touchend' event for touch devices, but since
-    // most iOS/Android browsers already show a dialog when you select
-    // text (often with a Share option) we'll skip that
-    if (article) {
-        article.addEventListener('mousedown', clean, false);
-    }
-
-    // Because they might 'mouse up' outside the article but on the page
-    const d_page = $(".difference-page")[0]
-    if (d_page ) {
-        d_page.addEventListener('mouseup', dragTextHandler, false);
-    }
-
-
-    $('#highlightSnippetActions a').bind('click', function (e) {
+    $('#highlightSnippetActions a').on('click', function (e) {
         if (!window.getSelection().toString().trim().length) {
             alert('Oops no text selected!');
             return;
@@ -155,12 +337,11 @@ $(document).ready(function () {
         $('#bottom-horizontal-offscreen').hide();
     }
 
-    // Listen for Escape key press
-    window.addEventListener('keydown', function (e) {
+    $(window).on('keydown', function (e) {
         if (e.key === 'Escape') {
             clean();
         }
-    }, false);
+    });
 
     function dragTextHandler(event) {
         console.log('mouseupped');

changedetectionio/static/js/diff-render.js

@@ -11,6 +11,59 @@ $(document).ready(function () {
     var visualizerResolutionCells = $cells.length;
     var cellHeight;
 
+    var header = document.getElementById('diff-header');
+    // The app top menu, sticky above #diff-header on the diff page.
+    var appHeader = document.querySelector('.app-main > .header');
+
+    // Controls can wrap or disappear when switching tabs, and the top menu
+    // rewraps on narrow viewports. Keep each sticky layer, the minimap and the
+    // anchor links below the actual measured heights instead of fixed offsets.
+    // Order matters: #diff-header's max-height is calc(50dvh - the app header),
+    // so store that first and measure the diff header against the new cap. The
+    // other way round reads it under the previous cap and one pass is not enough
+    // to settle.
+    function updateHeaderHeight() {
+        if (appHeader) {
+            document.body.style.setProperty('--app-header-height', appHeader.offsetHeight + 'px');
+        }
+        if (header) {
+            document.body.style.setProperty('--diff-header-height', header.offsetHeight + 'px');
+        }
+    }
+    if (header || appHeader) {
+        // Measure once regardless of observer support, so the offsets are never
+        // left at their 0 fallback.
+        updateHeaderHeight();
+        if (typeof ResizeObserver !== 'undefined') {
+            var headerObserver = new ResizeObserver(updateHeaderHeight);
+            if (header) headerObserver.observe(header);
+            if (appHeader) headerObserver.observe(appHeader);
+        } else {
+            // Without it, catch the two things that actually resize the bars:
+            // the window rewrapping them, and the tab switch that shows or hides
+            // #settings. diff-overview.js toggles that from its own hashchange
+            // handler, so defer past it rather than depend on listener order.
+            $(window).on('resize.diffheader', updateHeaderHeight.debounce(100));
+            $(window).on('hashchange.diffheader', function () {
+                setTimeout(updateHeaderHeight, 0);
+            });
+            // Opening a link straight at #screenshot / #extract hides #settings
+            // from diff-overview.js's ready handler, with no hashchange to
+            // follow. Re-measure once the whole ready pass has run.
+            setTimeout(updateHeaderHeight, 0);
+        }
+    }
+
+    // Centre of the region left visible below the sticky stack, not of the whole
+    // viewport - every sticky layer above the diff has to be counted or jumps
+    // land half its height too high.
+    function viewportCenterOffset() {
+        var appHeaderHeight = appHeader ? appHeader.offsetHeight : 0;
+        var headerHeight = header ? header.offsetHeight : 0;
+        var visualizerHeight = $visualizer.is(':visible') ? $visualizer.outerHeight() : 0;
+        return (appHeaderHeight + headerHeight + visualizerHeight + $(window).height()) / 2;
+    }
+
     if ($difference.length && visualizerResolutionCells > 0) {
         var docHeight = $difference[0].scrollHeight;
         cellHeight = docHeight / visualizerResolutionCells;
@@ -21,11 +74,10 @@ $(document).ready(function () {
             $(this).on('click', function() {
                 var cellIndex = $(this).data('cellIndex');
                 var targetPositionInDifference = cellIndex * cellHeight;
-                var viewportHeight = $(window).height();
 
                 // Scroll so target is at viewport center (where eyes expect it)
                 window.scrollTo({
-                    top: $difference.offset().top + targetPositionInDifference - (viewportHeight / 2),
+                    top: $difference.offset().top + targetPositionInDifference - viewportCenterOffset(),
                     behavior: "smooth"
                 });
             });
@@ -37,8 +89,7 @@ $(document).ready(function () {
 
         // Find the next change after current scroll position
         var currentScrollPos = $(window).scrollTop();
-        var viewportHeight = $(window).height();
-        var currentCenter = currentScrollPos + (viewportHeight / 2);
+        var currentCenter = currentScrollPos + viewportCenterOffset();
 
         // Add small buffer (50px) to jump past changes already near center
         var searchFromPosition = currentCenter + 50;
@@ -59,7 +110,7 @@ $(document).ready(function () {
 
         // Scroll to position the element at viewport center
         var elementTop = $(nextElement).offset().top;
-        var targetScrollPos = elementTop - (viewportHeight / 2);
+        var targetScrollPos = elementTop - viewportCenterOffset();
 
         window.scrollTo({
             top: targetScrollPos,
@@ -73,7 +124,7 @@ $(document).ready(function () {
 
         var scrollTop = $(window).scrollTop();
         var viewportHeight = $(window).height();
-        var viewportCenter = scrollTop + (viewportHeight / 2);
+        var viewportCenter = scrollTop + viewportCenterOffset();
         var differenceTop = $difference.offset().top;
         var differenceHeight = $difference[0].scrollHeight;
         var positionInDifference = viewportCenter - differenceTop;
@@ -129,10 +180,9 @@ $(document).ready(function () {
             var estimatedTop = (charPosition / totalChars) * totalHeight;
 
             // Scroll to position with line at viewport center
-            var viewportHeight = $(window).height();
             setTimeout(function() {
                 window.scrollTo({
-                    top: $difference.offset().top + estimatedTop - (viewportHeight / 2),
+                    top: $difference.offset().top + estimatedTop - viewportCenterOffset(),
                     behavior: "smooth"
                 });
             }, 100); // Small delay to ensure page is fully loaded
@@ -149,4 +199,3 @@ $(document).ready(function () {
     }
 
 });
-

changedetectionio/static/js/restock-price-graph.js

@@ -23,8 +23,11 @@
         no_data: 'No price data available to graph yet.', load_error: 'Could not load price history.',
         changes: 'Changes', avg_price: 'Average price',
         price_low: 'Currently low', price_typical: 'Currently typical', price_high: 'Currently high',
-        cheaper_than: 'cheaper than %s% of tracked prices',
-        pricier_than: 'more expensive than %s% of tracked prices',
+        // {pct} is substituted with an already-formatted percentage, e.g. "80%". The percent sign is
+        // NOT part of the msgid on purpose: a bare "%" followed by a letter (" of") parses as a
+        // python-format conversion ("% o"), which makes pybabel reject any translation of it.
+        cheaper_than: 'cheaper than {pct} of tracked prices',
+        pricier_than: 'more expensive than {pct} of tracked prices',
         typical_note: 'around the usual price', avg_label: 'avg' };
     const OVERLAY_MIN_POINTS = 5; // need enough history for low/typical/high to be meaningful
 
@@ -260,9 +263,9 @@
             $pill.append($('<span class="rg-status-label"></span>').text(i18n['price_' + summary.status] || ''));
             let sub;
             if (summary.status === 'low') {
-                sub = (i18n.cheaper_than || '').replace('%s', summary.cheaper_than_pct);
+                sub = (i18n.cheaper_than || '').replace('{pct}', summary.cheaper_than_pct + '%');
             } else if (summary.status === 'high') {
-                sub = (i18n.pricier_than || '').replace('%s', summary.pricier_than_pct);
+                sub = (i18n.pricier_than || '').replace('{pct}', summary.pricier_than_pct + '%');
             } else {
                 sub = i18n.typical_note || '';
             }

changedetectionio/static/js/scrollable-title.js

@@ -0,0 +1,30 @@
+// The watch title in the top menu is a horizontal scroll container (see
+// parts/_top_menu.scss), so a long one can be dragged or swiped to read its end.
+// The CSS ships a fixed right-hand fade for the no-JS case; once this is
+// running, the fade has to follow the scroll instead, or the ending the reader
+// just dragged over is the part that is dimmed.
+//
+// Global rather than part of diff-overview.js: the restock difference page and
+// the image-SSIM preview page render the same line and neither loads that file.
+$(function () {
+    var $title = $('.current-diff-url');
+    if (!$title.length) return;
+    var el = $title[0];
+
+    function updateFades() {
+        // The 1px slack absorbs the sub-pixel gap a fractional layout leaves
+        // between scrollWidth and clientWidth, which would otherwise hold
+        // fade-right on for a line that is not actually cut off.
+        $title
+            .toggleClass('fade-left', el.scrollLeft > 1)
+            .toggleClass('fade-right', el.scrollLeft + el.clientWidth < el.scrollWidth - 1);
+    }
+
+    // The class and the first state are set in the same task, so the no-JS mask
+    // is never seen to blink off before its replacement arrives.
+    $title.addClass('js-fades').on('scroll', updateFades);
+    // Resizing changes what fits without scrolling the line, so the state can
+    // become wrong without a scroll event: rotating a phone is the common case.
+    $(window).on('resize', updateFades);
+    updateFades();
+});

changedetectionio/static/js/search-modal.js

@@ -7,7 +7,6 @@
     // The Search button is rendered in the left rail and the mobile drawer.
     const openSearchButtons = document.querySelectorAll('.js-open-search-modal');
     const closeSearchButton = document.getElementById('close-search-modal');
-    const searchForm = document.getElementById('search-form');
     const searchInput = document.getElementById('search-modal-input');
 
     if (!searchModal || openSearchButtons.length === 0) {
@@ -63,6 +62,15 @@
 
     // Close modal when clicking the backdrop
     searchModal.addEventListener('click', function(e) {
+      // Only real pointer clicks can land on the backdrop. Keyboard-synthesised clicks
+      // report detail 0 and coordinates of 0,0, which the geometry test below reads as
+      // "outside the dialog" - and implicit form submission (Enter in the input) fires
+      // exactly such a click at the Search button. That closed the modal and blanked
+      // the input mid-dispatch, so the submit that followed hit an empty `required`
+      // field and was rejected: Enter appeared to just dismiss the form.
+      if (e.detail === 0) {
+        return;
+      }
       const rect = searchModal.getBoundingClientRect();
       const isInDialog = (
         rect.top <= e.clientY &&
@@ -93,43 +101,8 @@
       }
     });
 
-    // Handle Enter key in search input
-    if (searchInput) {
-      searchInput.addEventListener('keydown', function(e) {
-        if (e.key === 'Enter') {
-          e.preventDefault();
-          if (searchForm) {
-            // Trigger form submission programmatically
-            searchForm.dispatchEvent(new Event('submit'));
-          }
-        }
-      });
-    }
-
-    // Handle form submission
-    if (searchForm) {
-      searchForm.addEventListener('submit', function(e) {
-        e.preventDefault();
-
-        // Get form data
-        const formData = new FormData(searchForm);
-        const searchQuery = formData.get('q');
-        const tags = formData.get('tags');
-
-        // Build URL
-        const params = new URLSearchParams();
-        if (searchQuery) {
-          params.append('q', searchQuery);
-        }
-        if (tags) {
-          params.append('tags', tags);
-        }
-
-        // Navigate to search results (always redirect to watchlist home)
-        // Use base_path if available (for sub-path deployments like /enlighten-richerx)
-        const basePath = typeof base_path !== 'undefined' ? base_path : '';
-        window.location.href = basePath + '/?' + params.toString();
-      });
-    }
+    // Submission is left to the browser: the form carries a server-rendered action
+    // (correct under a reverse-proxy sub-path) and Enter in the input triggers implicit
+    // submission via the footer's submit button, which also runs `required` validation.
   });
 })();

changedetectionio/static/js/sidebar.js

@@ -1,13 +1,15 @@
 // Left-rail expand/collapse state.
-// Adds `action-side-bar-expanded` to <body> whenever the rail is showing its
-// labels. In pinned mode (body.actionside-bar-on) the class is already present
-// from page load; in collapsed mode (body.actionsidebar-minimal) the rail only
-// expands on hover/focus, so we toggle the class to match.
+// Adds `actionsidebar-expanded` to <body> whenever the rail is showing its
+// labels. In 'pinned-expanded' mode (body.actionside-bar-on) the class is already
+// present from page load; in 'expandable' mode (body.actionsidebar-minimal) the rail
+// only expands on hover/focus, so we toggle the class to match. 'minimal' mode is
+// also the collapsed rail but carries `actionsidebar-no-expand` and never rolls out.
 (function() {
   'use strict';
 
   document.addEventListener('DOMContentLoaded', function() {
-    if (!document.body.classList.contains('actionsidebar-minimal')) {
+    if (!document.body.classList.contains('actionsidebar-minimal') ||
+        document.body.classList.contains('actionsidebar-no-expand')) {
       return;
     }
 
@@ -16,8 +18,8 @@
       return;
     }
 
-    const expand = () => document.body.classList.add('action-side-bar-expanded');
-    const collapse = () => document.body.classList.remove('action-side-bar-expanded');
+    const expand = () => document.body.classList.add('actionsidebar-expanded');
+    const collapse = () => document.body.classList.remove('actionsidebar-expanded');
 
     inner.addEventListener('mouseenter', expand);
     inner.addEventListener('mouseleave', collapse);

changedetectionio/static/js/visual-selector.js

@@ -115,7 +115,9 @@ window.initVisualSelector = function (opts) {
                 $('#selector-current-xpath, #clear-selector').hide();
             })
             .on('load', () => {
-                console.log("Loaded background...");
+                console.log(`Loaded background ${$selectorBackgroundElem[0].naturalWidth}px`);
+                // For the UI width of the whole edit area
+                document.documentElement.style.setProperty('--visualselector-max-width', `${$selectorBackgroundElem[0].naturalWidth}px` );
                 c = $selectorCanvasElem[0];
                 xctx = c.getContext("2d");
                 ctx = c.getContext("2d");

changedetectionio/static/styles/scss/diff.scss

@@ -1,3 +1,48 @@
+@use "settings" as *;
+
+// Paint the page's own background (page colour + the fixed 130deg gradient at
+// 0.91, pre-composited with color-mix) so a sticky bar stays opaque to content
+// scrolling under it while looking identical to the page behind it.
+//
+// styles.scss paints that backdrop as a real fixed layer: body::after is a
+// `position: fixed` box at the viewport's top-left corner, viewport-wide and
+// `height: 100vh` tall. Anything that has to disappear into it must show the
+// slice of that box it covers. background-attachment: fixed asks the engine for
+// exactly that, and iOS Safari does not honour it - it anchors the layer to the
+// document instead, so the bar sweeps the whole ramp (cyan to purple over a
+// long page) while the gutters beside it hold still. Chromium does honour it,
+// which is why only a device caught this.
+//
+// So derive the alignment from geometry and ask for no feature at all. Each bar
+// keeps a constant viewport offset - .header at the top, #diff-header directly
+// below it - and both are flush with the viewport's right edge at every width:
+// the action rail insets them from the *left* on a wide screen and widens again
+// on hover, but nothing moves their right edge. Anchor a viewport-sized copy of
+// the gradient to that edge and push it up by the bar's own offset, and the bar
+// paints body::after's slice by construction, on any engine.
+//
+// $y-offset: the bar's distance from the top of the viewport.
+@mixin page-surface-gradient($y-offset: 0px) {
+  background: var(--color-background-gradient-second); // fallback, no color-mix
+  // Longhands from here down, and no second `background:` shorthand after them -
+  // one would silently reset size/position/origin back to their initial values.
+  background-image: linear-gradient(130deg,
+    color-mix(in srgb, var(--color-background-gradient-first) 91%, var(--color-background-page)),
+    color-mix(in srgb, var(--color-background-gradient-second) 91%, var(--color-background-page)) 41.07%,
+    color-mix(in srgb, var(--color-background-gradient-third) 91%, var(--color-background-page)) 84.05%);
+  // 100vh to match body::after's own height: 100vh - same unit, so the two
+  // resolve to the same number on iOS, where it means the large (toolbar
+  // collapsed) viewport and therefore holds still as the toolbar moves.
+  // 100vw for the width: the bars are as wide as the viewport only on a narrow
+  // screen, so 100% would compress the ramp into the rail's leftovers on a
+  // desktop one.
+  background-size: 100vw 100vh;
+  background-repeat: no-repeat;
+  // border-box, or the bar's own padding would offset the copy by that much.
+  background-origin: border-box;
+  background-position: right 0 top calc(-1 * #{$y-offset});
+}
+
 #diff-form {
 
   background: rgba(0, 0, 0, .05);
@@ -40,8 +85,451 @@
 }
 
 body.difference-page {
-  section.content {
-    padding-top: 40px;
+  // Keep the top menu (watch URL, EDIT, theme/GitHub icons) on screen while the
+  // diff scrolls, stacked above #diff-header. Scoped to the diff page on
+  // purpose - upstream's @todo in parts/_top_menu.scss wants this globally, but
+  // that is a separate change.
+  //
+  // Sticky makes .header a stacking context, so its mobile drawer / overlay
+  // (z-index 10000 / 9999) are now capped by this value. 30 clears #diff-header
+  // below and still leaves toasts (10000, fixed) painting over the bar.
+  .header {
+    position: sticky;
+    top: 0;
+    z-index: 30;
+    @include page-surface-gradient(0px);
+  }
+
+  // The top line now carries the watch's name, so give it back the room the two
+  // stacked left insets were taking. Its text starts $common-gap twice in: the
+  // menu row's own padding, which every item on the row needs to clear the edge,
+  // plus the link's own left margin, which on the row's first item only repeats
+  // that padding. Drop the repeat and keep the row's padding: 8.8px back, and
+  // the line still sits on the same left edge as the diff below it rather than
+  // hard against the viewport. The right side of both is untouched - the link's
+  // right margin still separates it from the menu icons.
+  .current-diff-url {
+    margin-left: 0;
+  }
+
+  // Wherever the hamburger is (max-width: $desktop-wide-breakpoint, set in
+  // parts/_hamburger_menu.scss), the menu row is at its tightest and every item
+  // on it competes with the watch name for the same line. The heart is the one
+  // item on that row that is neither navigation nor status, so it is what gives
+  // way - on this page only, and only under that width. Desktop diff pages and
+  // every other page keep it.
+  //
+  // CSS rather than a {% if %} in base.html: the heart's own reason to exist is
+  // that it is always there, and a template branch would take it off the page
+  // entirely rather than fold it away with the rest of the row.
+  @media only screen and (max-width: $desktop-wide-breakpoint) {
+    #heart-us {
+      display: none;
+    }
+  }
+
+  // .app-main's 0.55rem gap sits between the two sticky bars, so #diff-header
+  // starts 8.8px below the top menu and then slides up to meet it over the
+  // first 8.8px of scroll - a visible twitch right as scrolling begins. The gap
+  // can't be preserved once stuck (it is outside both bars, so the diff would
+  // scroll through it), so close it here and let them sit flush at every scroll
+  // position. Only the .header/section.content pair is affected; .app-main has
+  // no other children.
+  .app-main {
+    gap: 0;
+  }
+
+  .tab-pane-inner {
+    scroll-margin-top: calc(var(--app-header-height, 0px) + var(--diff-header-height, 0px) + 1rem);
+  }
+
+  // The 2px activity strip is fixed on body, so it lives in the root stacking
+  // context and would paint over the mobile drawer now that the drawer is capped
+  // inside .header's context above. Drop it below .header rather than raising
+  // .header past the action rail (60), which would hide the rail's hover flyout.
+  // Still above #diff-header (20) and the minimap (10); on this page it now also
+  // passes under the rail's flyout, which is 2px of imperceptible overlap.
+  #pure-menu-horizontal-spinner {
+    z-index: 29;
+  }
+
+  // The thin blue line under the active tab. Nothing at that boundary has a
+  // border - the active tab and #diff-ui are both var(--color-background) - so
+  // it can only be the page gradient showing through a device-pixel row where
+  // neither white paints. Whether such a row exists comes down to one number,
+  // the bar's bottom edge minus the card's top edge, and measured across 14
+  // viewports at three device pixel ratios that number is 0.813, 0.203 or
+  // exactly 0.000 and never a whole pixel. At 0.000 the outcome belongs
+  // entirely to the engine's sub-pixel rounding - which is why a DPR 3 phone
+  // can show a line a DPR 1 desktop does not, and why 390x844 on the Screenshot
+  // tab, the exact case reported, measures 0.000.
+  //
+  // So take the margin out of the engine's hands instead of hoping two white
+  // edges land on the same device row. A pixel of overlap covers the gradient
+  // on any grid; measured the same way afterwards, the worst case over those 42
+  // readings becomes exactly 1.000px.
+  //
+  // The other candidate was a white skirt under the active tab
+  // (box-shadow: 0 1px 0) which would have touched nothing else, and it does not
+  // work: the shadow hangs below the bar's last child and #diff-header's
+  // overflow: auto - the thing enforcing its height cap - clips it. Measured
+  // with the card held 3px away so the skirt and the card are separable, it
+  // painted 0 device rows of the 3 it needs at 844x390 and 926x428, and 0 to 2
+  // in the sticky modes. Recorded here so it is not proposed again.
+  //
+  // What the overlap costs, stated rather than discovered later: where the bar
+  // is sticky it is invisible, and a device-pixel diff of the seam band at
+  // 390x844 and DPR 3 says so exactly - zero differing pixels, because the bar
+  // is opaque and paints over the card. Below the short-viewport breakpoint the
+  // bar has no background of its own, so the card's white also reaches the
+  // bottom pixel of the *inactive* tabs and the 5px gaps between them: 4374
+  // device pixels at 844x390, gradient turning white. The tab row ends up
+  // sitting flush on the card rather than floating a pixel above it, which is
+  // how tabs normally meet their panel and is the same continuity the active
+  // tab was asked for.
+  //
+  // Scoped to the diff page deliberately. diff.css is NOT diff-page-only - it
+  // is also served to the preview page (blueprint/ui/preview.py) and the
+  // extract page (processors/extract.py), and both have a #diff-ui of their own
+  // with no bar above it to absorb the pixel. Only difference.py sets the
+  // difference-page class.
+  #diff-ui {
+    margin-top: -1px;
+  }
+}
+
+#diff-header {
+  position: sticky;
+  // Sits directly under the now-sticky top menu. The 0 fallback (JS off) just
+  // slides this under the bar - the same degradation the minimap already takes.
+  top: var(--app-header-height, 0px);
+  z-index: 20;
+  // section.content insets its children by $common-gap so they clear the left
+  // rail, while the top menu above stays flush against it. A bar that paints
+  // the page's own backdrop therefore leaves an 8.8px strip of real page
+  // background down each side, and on a device those strips read as mismatched
+  // borders. Cancel the inset rather than try to blend across it: with no
+  // gutter there is nothing left to keep aligned, and the flush right edge is
+  // what page-surface-gradient anchors its copy of the page gradient to. The
+  // controls do not move - the bar grows outwards by exactly the margin it
+  // takes back.
+  //
+  // The width has to come from align-self, not width: 100%. .content-main
+  // centres its children, so an item is fit-content unless it stretches, and a
+  // percentage width resolves against the parent without the negative margins -
+  // it would leave the bar short by 17.6px.
+  align-self: stretch;
+  margin-left: -$common-gap;
+  margin-right: -$common-gap;
+  box-sizing: border-box;
+  // Center children at their intrinsic width, the same way section.content does
+  // for the non-sticky siblings it still lays out (align-items: center).
+  // Two rows: the toolbar and the tabs.
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 0.25rem;
+  // No bottom padding: the tab row is the bar's last child, and the active tab
+  // and #diff-ui below it are both var(--color-background). 4px of gradient
+  // between them reads as a seam across an otherwise continuous white surface -
+  // the same tabs on the extract page, which are not in a bar, measure 0. The
+  // top padding stays; nothing sits above the toolbar.
+  padding: 0.25rem 1rem 0;
+  // Keep the diff readable even with wrapped controls, zoom, or a short viewport.
+  // The budget is for the whole sticky stack, so the top menu above comes out of
+  // it - otherwise the two bars together take 64% of a 390px-tall landscape phone.
+  //
+  // svh, not dvh. dvh tracks the dynamic viewport, which on iOS Safari grows and
+  // shrinks as the browser's own toolbar collapses and expands while you scroll:
+  // the cap would then breathe mid-scroll, changing the header's height and
+  // shifting everything below it, and each transition also fires resize and
+  // re-runs the sticky measurement behind it. svh is defined as the
+  // toolbar-expanded minimum and holds still for the life of the page, so the
+  // budget is a constant. It is the smaller of the two, which is the safe side to
+  // be wrong on for a cap. The plain vh line stays as the fallback for engines
+  // without the new units.
+  max-height: calc(50vh - var(--app-header-height, 0px));
+  max-height: calc(50svh - var(--app-header-height, 0px));
+  overflow: auto;
+
+  // Same offset as `top` above: the bar's constant distance from the top of the
+  // viewport. With JS off the var is absent and the copy is misaligned by the
+  // top menu's height - the same tier of degradation `top` itself already takes.
+  @include page-surface-gradient(var(--app-header-height, 0px));
+
+  > * {
+    // A centered flex item is sized to fit-content, which has a min-content
+    // floor (the version <select> is as wide as its longest option). Without
+    // this cap a narrow viewport would centre an over-wide child and spill it
+    // out of both sides of the header.
+    max-width: 100%;
+  }
+
+  // base.html's wrap detector decides body.wrapped-tabs by flipping the tab <ul>
+  // to flex-wrap and seeing whether any tab lands on a second row - so what it
+  // measures against is the width of .tabs. _tabs.scss says in upstream's own
+  // words that .tabs has to take the full width of the centred column "so the
+  // wrap-detector JS has the real available space to measure against", and the
+  // two properties that would do it are commented out directly underneath. As
+  // shipped, .tabs is fit-content inside any centred column, so the detector
+  // measures a container that moves with the layout state it is judging: the
+  // active tab's label is bold, and selecting the widest one ("Current
+  // screenshot") grows .tabs by ~9px. In the band where that crosses the
+  // available width the verdict flips per tab - measured here at 350, 355 and
+  // 358px, where Text and Extract Data report one row and Current screenshot
+  // reports three. iOS puts the same band at 390px because its fonts are wider,
+  // which is how a phone showed one row in a screenshot and a vertical stack in
+  // a video of the same page.
+  //
+  // Give the detector a fixed target on this page only. Un-commenting the lines
+  // in _tabs.scss would fix it everywhere and change every page upstream owns;
+  // this PR does not have the standing to do that.
+  .tabs {
+    align-self: stretch;
+    // Never give up height to keep the controls whole - see #settings below.
+    flex: none;
+
+    // .tabs no longer shrink-wraps, so the grid would sit left-aligned in it.
+    ul {
+      justify-content: center;
+
+      // Stretching the container fixes one side of the detector's comparison;
+      // this fixes the other. `.active a { font-weight: bold }` in _tabs.scss
+      // makes the row's width depend on which label is currently bold: at 355px
+      // the Text and Extract states measure 332.9 and 330.5 against a 339.0
+      // container and stay on one row, while Current screenshot - the widest
+      // label - measures over it and wraps to three. Neutralising just that rule
+      // collapses all three states to 330.5 and the flipping stops, which is what
+      // identifies the weight as the variable rather than the container.
+      //
+      // So drop the bold here rather than reserve room for it. Reserving the bold
+      // width on every tab (a hidden bold copy behind each label) also stabilises
+      // it, but it makes the row ~14px wider in every state and that pushes 360px
+      // - a common Android width that fits on one row today - into the stacked
+      // layout. The active tab does not need the third signal: _tabs.scss already
+      // gives it its own background-color and its own text colour.
+      li.active a,
+      li :target a {
+        font-weight: inherit;
+      }
+    }
+  }
+
+  // The bar's height budget (max-height above) is smaller than its contents on a
+  // landscape phone: iOS gives the two datetime <select>s enough intrinsic width
+  // that From and To each take their own row, and From + To + Filters + tabs is
+  // then taller than 50svh minus the top menu. With overflow: auto on the bar
+  // itself the row that leaves the visible box is the last one - the tabs, which
+  // are the page's navigation and have no scrollbar to advertise themselves. Measured in Chromium with no iOS emulation at 736x414, 667x375,
+  // 780x360 and 844x330: the tab row sits outside #diff-header's own rect.
+  //
+  // So spend the budget on the row that can afford it. #settings is the only
+  // child allowed to shrink, and it is what scrolls; the tab row never does and
+  // is therefore always inside the bar at any viewport height. The shrink needs
+  // min-height: 0 - a flex item's automatic minimum size is its content, which
+  // is what would otherwise push the tabs back out.
+  #settings {
+    min-width: 0;
+    display: flex;
+    justify-content: center;
+    flex: 0 1 auto;
+    min-height: 0;
+    overflow-y: auto;
+    // Same reason the Filters popover carries it: a nested scroller inside a
+    // sticky bar that chains its overscroll to the diff behind is worse than no
+    // scroller at all on a touch screen.
+    overscroll-behavior: contain;
+  }
+
+  // One toolbar row: From/To chips and their selects, the version arrows, and
+  // the Filters toggle.
+  #diff-form {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    justify-content: center;
+    gap: 0.25rem 0.9rem;
+    padding: 0.2rem 0.7rem;
+    margin-bottom: 0;
+
+    fieldset {
+      margin: 0;
+      padding: 0;
+      border: 0;
+    }
+
+    // The From/To labels shrink to chips rather than hiding: display:none takes
+    // the <label> out of the accessibility tree and the selects lose their
+    // accessible name entirely, and two identically formatted datetime selects
+    // side by side need the red/green cue sighted users already know. The
+    // shipped width: 4rem is what makes them full-size plates. "From" is wider
+    // than "To", which left-ragged the selects once they stack, so the floor is
+    // wide enough for the longer word - it costs width only, never height.
+    .from-to-label {
+      width: auto;
+      min-width: 2.4rem;
+      text-align: center;
+      font-size: 0.75rem;
+      padding: 0.1rem 0.35rem;
+      border-radius: 3px;
+      line-height: 1.5;
+    }
+  }
+
+  #keyboard-nav {
+    display: flex;
+    align-items: center;
+    gap: 0.3rem;
+
+    // The arrows speak for themselves at this size; the links keep the full
+    // wording as aria-label and title (see diff.html).
+    strong,
+    .keyboard-nav-label {
+      display: none;
+    }
+  }
+
+  // Seven set-once options are a popover, not a permanent row of the bar. The
+  // swap happens only once diff-overview.js has wired the toggle up, so with
+  // scripting off the fieldset stays inline and submits as it does today.
+  #diff-filters-toggle {
+    display: none;
+    font-size: 0.85rem;
+    padding: 0.3em 0.8em;
+  }
+
+  &.diff-filters-js {
+    #diff-filters-toggle {
+      display: inline-block;
+    }
+
+    #diff-style {
+      display: none;
+    }
+  }
+
+  &.diff-filters-js.diff-filters-open {
+    #diff-style {
+      // fixed, not absolute: #diff-header carries overflow: auto to enforce the
+      // 50svh cap above, which clips an absolutely positioned descendant at the
+      // bar's bottom edge. The bar is sticky with no transform/filter/contain,
+      // so it is not a containing block for fixed and the panel escapes the
+      // clip. diff-overview.js parks it under the toggle.
+      display: block;
+      position: fixed;
+      z-index: 25;
+      min-width: 14rem;
+      // diff-overview.js caps max-height to the room below the button that the
+      // viewport actually has - on a landscape phone that is less than the
+      // seven rows need. The rows past the cap have to stay reachable, and the
+      // scroll must not chain out to the diff behind once they run out.
+      overflow-y: auto;
+      overscroll-behavior: contain;
+      padding: 0.5rem 0.75rem;
+      border-radius: 8px;
+      box-shadow: 0 4px 14px rgba(0, 0, 0, .28);
+      text-align: left;
+
+      // The bar repaints the page's own backdrop; so must anything that has to
+      // be opaque over the scrolling diff. This one is not pinned to an edge of
+      // the viewport - diff-overview.js decides where it goes - so the same
+      // file overwrites background-position from the coordinates it just set.
+      // The declaration here is what a placement-less first paint falls back to.
+      @include page-surface-gradient;
+    }
+
+    // Out-specifies #diff-form #diff-style > span's inline-block above.
+    #diff-form #diff-style > span {
+      display: block;
+      padding: 0.2em 0;
+    }
+  }
+
+  .diff-fieldset {
+    min-width: 0;
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
+    gap: 0.5rem;
+
+    > span {
+      max-width: 100%;
+      min-width: 0;
+      gap: 0.25rem;
+      // Size to content so From/To stay side-by-side on desktop (as they were
+      // before the header existed); shrink and wrap only when the row can't fit.
+      flex: 0 1 auto;
+      display: flex;
+      align-items: center;
+      // A <select> keeps the intrinsic min-content width of its longest option
+      // (min-width: 0 does not lower it), so label + select cannot fit a phone
+      // viewport side by side. Let the label drop above it instead of forcing
+      // the whole header wider than the screen.
+      flex-wrap: wrap;
+    }
+
+    select {
+      min-width: 0;
+      max-width: 100%;
+      flex: 1;
+    }
+
+    label {
+      flex-shrink: 0;
+    }
+  }
+}
+
+// The one narrow-viewport breakpoint for the whole bar - title, fit and
+// gutters all hang off it rather than letting magic numbers multiply.
+//
+// Every selector below carries an ID on purpose. The rules it has to beat are
+// written above as `#diff-header .diff-fieldset > span` and friends, and a
+// single ID outranks any number of classes, so a class-only override loses
+// silently and the chain goes on shrink-wrapping. Please don't tidy the IDs
+// away.
+@media (max-width: 700px) {
+  // Once the From/To chip takes inline width the <select> clips its own
+  // displayed value, and two snapshots from the same day differ only by the
+  // meridiem - so they read identically while closed. Shrinking the font alone
+  // cannot fix that: #settings, #diff-form, .diff-fieldset and the span are all
+  // sized to max-content, which *is* the select's text, so the container
+  // shrinks by exactly as much as the text does and the headroom stays pinned
+  // at zero at every font size. Pin the chain to the row first; only then does
+  // the smaller font buy anything.
+  #diff-header > #settings {
+    width: 100%;
+  }
+
+  #diff-header #diff-form {
+    width: 100%;
+    box-sizing: border-box;
+    // 16px of bar gutter plus 11.2px of form gutter a side is 54px of a 390px
+    // row spent on nothing.
+    padding-left: 0.2rem;
+    padding-right: 0.2rem;
+  }
+
+  #diff-header {
+    padding-left: 0.5rem;
+    padding-right: 0.5rem;
+  }
+
+  #diff-header #diff-form > .diff-fieldset {
+    flex: 1 1 100%;
+  }
+
+  #diff-header .diff-fieldset > span {
+    flex: 1 1 100%;
+  }
+
+  // With the chain pinned the select holds its width, so this is what actually
+  // buys the room. The worst realistic English value - a two-digit day, the
+  // longest month and a two-digit hour - still clips at 0.8rem.
+  #diff-header .diff-fieldset select {
+    font-size: 0.75rem;
+    padding-left: 0.3em;
+    padding-right: 0.3em;
   }
 }
 
@@ -170,7 +658,7 @@ body.difference-page {
     border-radius: 3px;
     overflow-x: hidden;
     position: sticky;
-    top: 0;
+    top: calc(var(--app-header-height, 0px) + var(--diff-header-height, 0px));
     z-index: 10;
     padding-top: 1rem;
     padding-bottom: 1rem;
@@ -246,3 +734,82 @@ body.difference-page {
     }
   }
 }
+
+// Placed last on purpose. Several of these rules out-specify nothing - they
+// tie with the rule they are overriding, and a tie is decided by source
+// order. The minimap's sticky offset is written further down this file as
+// `#diff-ui #cell-diff-jump-visualiser`, so a block that sits above it loses
+// silently. Keep this one at the bottom.
+//
+// A phone held sideways is the one place the sticky design cannot pay for
+// itself. 50svh of a 390px-tall viewport is 195px, the top menu takes 55 of it,
+// and what is left has to hold From, To, Filters and the tab row - three of
+// those on their own lines, because iOS gives the two datetime selects enough
+// width that From and To cannot share one. #settings shrinking and scrolling
+// (see above) keeps the tabs inside the bar, but a bar you have to scroll
+// *inside* to reach half its controls is still a bar in the way, and no amount
+// of trimming decoration finds 195px.
+//
+// So stop compensating for the budget here and give up the budget instead.
+// Below 500px of viewport height both bars are ordinary static blocks: no
+// height cap, no inner scroller, title and every control present at once, and
+// the page scrolls as one document. The trade is the sticky guarantee itself -
+// the controls and the tab row scroll away with the diff, so switching tabs
+// means scrolling back up - which is the right side to be wrong on when the
+// alternative is controls you cannot see. Portrait is untouched.
+//
+// Keyed on viewport height rather than orientation: a short desktop window has
+// the identical problem for the identical reason.
+@media (max-height: 500px) {
+  body.difference-page .header {
+    // Not a new state: parts/_top_menu.scss ships .header with its sticky
+    // commented out, so this is the position every other page's top menu is
+    // already in. z-index goes inert along with it, which hands the mobile
+    // drawer's 10000 back to the root stacking context.
+    position: static;
+    // Nothing scrolls underneath a static bar, so it neither needs its
+    // pre-composited copy of the page gradient nor may keep it: the copy is
+    // aligned by pushing it up by the bar's own *constant* viewport offset, and
+    // a bar that scrolls has no constant offset. It would slide out of phase
+    // with body::after's fixed layer and read as a moving seam. The shorthand,
+    // not background-image - it resets size, origin and position too.
+    background: none;
+  }
+
+  #diff-header {
+    position: static;
+    // The cap and the scroller are what the sticky design pays for its
+    // guarantee that the diff keeps half the viewport. There is no longer a
+    // guarantee to pay for.
+    max-height: none;
+    overflow: visible;
+    background: none;
+
+    #settings {
+      // Same: it only shrank and scrolled to keep the tab row inside the cap.
+      min-height: auto;
+      overflow-y: visible;
+    }
+  }
+
+  // .tab-pane-inner's scroll-margin-top is deliberately NOT overridden here,
+  // and dropping it to a bare 1rem is a trap worth naming. It reads as an
+  // allowance for pinned chrome, so with nothing pinned it looks like dead
+  // weight - but upstream's tabs.js rewrites an empty hash to the first tab's
+  // (tabs.js:15) and the browser then jumps to that pane on load, before any
+  // of this is a choice. At 1rem that jump lands with the whole static bar
+  // already scrolled off the top: measured -175.8px at 844x390, a landscape
+  // page that opens with no controls on it at all. The existing formula is the
+  // right number in both modes for two different reasons - in the sticky one it
+  // clears chrome that is pinned over the pane, in the static one it keeps
+  // chrome that sits above the pane on screen. Leave it alone.
+
+  // The minimap is sticky inside the diff card, offset to sit directly below
+  // the sticky stack. With that stack gone its offset would pin it a top menu
+  // plus a whole toolbar down the viewport - past halfway on a 390px-tall one,
+  // a strip floating in mid-screen beneath nothing. It is still worth pinning;
+  // pin it to the viewport, which is now free.
+  #diff-ui #cell-diff-jump-visualiser {
+    top: 0;
+  }
+}

changedetectionio/static/styles/scss/parts/_action_sidebar.scss

@@ -32,21 +32,27 @@ $action-sidebar-content-slot: 1100px;
     // Hidden on mobile: the mobile drawer (hamburger) carries these items
     display: none;
   }
-}
 
-body.actionside-bar-on {
-  .action-sidebar {
-/*      width: $action-sidebar-width-expanded; // reserve enough to host the expanded inner block*/
+  // MINIMAL MODE: the rail's footprint in the flex row is frozen at the
+  // collapsed width (+ the inner block's horizontal padding, which is
+  // content-box). The inner block is taken out of flow (absolute, below) so
+  // its hover expansion rolls out ON TOP of the page content instead of
+  // widening this flex item and reflowing `.app-main`.
+  body.actionsidebar-minimal & {
+    flex: 0 0 auto;
+    width: calc(#{$action-sidebar-width-collapsed} + #{$common-gap * 2});
+    overflow: visible;   // let the expanded inner block escape the frame
   }
 }
 
 // The actual interactive item block — wraps only the items, not the whole height.
 //
-// Two body-level modes drive the rail's display state:
-//   body.actionside-bar-on     → always expanded (icons + labels visible all the time)
-//   body.actionsidebar-minimal → icon-only collapsed rail; expands on hover/focus
-// `actionside-bar-on` is the default applied in templates/base.html. Both the
-// hover-to-expand width animation and the label fade-in are gated on the
+// Body-level classes drive the rail's display state (emitted by
+// flask_app.get_sidebar_mode_class() from the `sidebar_mode` setting):
+//   body.actionside-bar-on       → always expanded (icons + labels visible all the time)
+//   body.actionsidebar-minimal   → icon-only collapsed rail; expands on hover/focus
+//   body.actionsidebar-no-expand → alongside the above: stays collapsed, no hover-out
+// Both the hover-to-expand width animation and the label fade-in are gated on the
 // minimal class so that the always-expanded mode (or no mode) doesn't trigger
 // a needless layout jump when the user mouses across the rail.
 .action-sidebar-inner {
@@ -64,12 +70,40 @@ body.actionside-bar-on {
   padding-left: $common-gap;
   padding-right: $common-gap;
 
-  // Hover-to-expand only fires in minimal mode.
-  body.actionsidebar-minimal &:hover,
-  body.actionsidebar-minimal &:focus-within {
+  // MINIMAL MODE: lift the block out of the flex flow so growing it can't
+  // resize the rail (and therefore can't shift the content column). The rail
+  // is `position: sticky`, i.e. a positioned element, so top/left/bottom here
+  // anchor to it; top+bottom keep the column full-height, which the footer
+  // list's `margin-top: auto` still needs.
+  //
+  // Once it floats above the page it needs its own backdrop, or the content
+  // it rolls over would read straight through the rail's translucent 5% white.
+  // It can't just be a flat colour: the page background is a fixed, viewport-
+  // sized gradient (`body:after`), so the rail repaints that same gradient with
+  // `background-attachment: fixed` — which makes the viewport the positioning
+  // area — and lays the rail's own 5% white on top. Result: opaque, but
+  // pixel-identical to the translucent rail it replaces, at rest and rolled out.
+  body.actionsidebar-minimal & {
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    z-index: 1;
+    background-color: var(--color-background-page);   // fallback under the gradient
+    background-image:
+      linear-gradient(rgba(255, 255, 255, 0.05), rgba(255, 255, 255, 0.05)),
+      var(--page-background-gradient);
+    background-attachment: fixed, fixed;
+  }
+
+  // Hover-to-expand only fires in minimal mode, and not for 'minimal' (no-expand).
+  body.actionsidebar-minimal:not(.actionsidebar-no-expand) &:hover,
+  body.actionsidebar-minimal:not(.actionsidebar-no-expand) &:focus-within {
     width: $action-sidebar-width-expanded;
     // Enter is smoother.
     transition: width 0.22s cubic-bezier(0.2, 0.7, 0.2, 1);
+    // Lift it off the page while it's rolled out over the content.
+    box-shadow: var(--color-sidebar-shadow);
   }
 
   // Always-expanded mode: no hover gate; the rail just sits open.
@@ -228,7 +262,7 @@ ul.action-sidebar-list {
     letter-spacing: 0.06em;
     font-weight: 700;
     pointer-events: none;
-    opacity: 0;
+    opacity: 0.9;
     transition: opacity 0.05s ease-out;
 
     // Unread-count variant: a small accent bubble pinned to the right of the row
@@ -247,11 +281,17 @@ ul.action-sidebar-list {
   }
 }
 
+// Count badges (unread, queue) are always visible in minimal mode so users
+// can see at a glance how many items need attention without expanding the rail.
+body.actionsidebar-minimal .action-badge--count {
+  opacity: 1;
+}
+
 // When the inner block expands in MINIMAL mode, reveal every label/badge
 // together with a smooth enter. Always-expanded mode handles labels via the
 // `body.actionside-bar-on` block below — no hover gate needed there.
-body.actionsidebar-minimal .action-sidebar-inner:hover,
-body.actionsidebar-minimal .action-sidebar-inner:focus-within {
+body.actionsidebar-minimal:not(.actionsidebar-no-expand) .action-sidebar-inner:hover,
+body.actionsidebar-minimal:not(.actionsidebar-no-expand) .action-sidebar-inner:focus-within {
   .action-sidebar-item {
     .action-label {
       opacity: 1;
@@ -441,7 +481,7 @@ body.actionside-bar-on {
     }
   }
 
-  &.action-side-bar-expanded {
+  &.actionsidebar-expanded {
     #checking-now-stats-sidebar{
       display: block;
     }
@@ -449,15 +489,29 @@ body.actionside-bar-on {
       #logo-expanded {
         display: inline-block;
       }
+      #logo-short {
+        display: none;
+      }
     }
+
   }
-
-}
-
-.action-side-bar-expanded {
-  #cdio-logo {
-    #logo-short {
+  &:not(.actionsidebar-expanded) {
+    .action-label {
       display: none;
     }
+    .action-badge--count {
+      position: relative;
+      left: -8px;
+      top: -8px;
+    }
+    .action-sidebar-item.is-disabled {
+      .action-badge {
+        display: none;
+      }
+    }
+
   }
+
 }
+
+

changedetectionio/static/styles/scss/parts/_add-watch.scss

@@ -158,63 +158,37 @@ body {
     display: flex;
     flex-direction: column;
     gap: 1.1rem;
+    color: #fff;
 
     @media (max-width: 900px) {
       flex: 1 1 auto;
     }
 
-    .add-watch-option-group {
-      label {
-        display: inline-block;
+    span.label {
+      padding-bottom: 0.5rem;
+      display: inline-block !important;
+    }
+    label {
+      margin: 0 !important;; /* override */
+    }
+    li {
+      list-style: none;
+      font-size: .9rem;
+      display: grid;
+      grid-template-columns: auto 1fr;
+      align-items: center;
+      gap: .5rem;
+
+      input[type="radio"] {
+        flex: 0 0 auto;
+      }
+
+      > label {
+        font-weight: normal;
       }
     }
-
-    // Browser picker: fetcher descriptions are long (they carry the driver URL), so this is
-    // a radio list whose labels wrap inside the narrow pane instead of a <select> that would
-    // overflow it. The system-default entry is listed even when it can't render a preview.
-    #quick-watch-fetch-backend {
-      ul {
-        margin: 0.35rem 0 0 0;
-        padding: 0;
-        list-style: none;
-      }
-
-      li {
-        display: flex;
-        align-items: flex-start;
-        gap: 0.5em;
-        padding: 0.15rem 0;
-
-        input[type="radio"] {
-          flex: 0 0 auto;
-          margin-top: 0.2em;
-        }
-
-        label {
-          // Wrap rather than push the pane wider
-          display: block;
-          min-width: 0;
-          overflow-wrap: anywhere;
-          font-size: 0.85rem;
-          line-height: 1.35;
-        }
-      }
-
-      li.unusable {
-        opacity: 0.55;
-        cursor: not-allowed;
-
-        label {
-          cursor: not-allowed;
-        }
-      }
-
-      .pure-form-message-inline {
-        display: block;
-        margin-top: 0.35rem;
-        font-size: 0.8rem;
-        opacity: 0.8;
-      }
+    li + li { /* gap between */
+      margin-top: .75rem;
     }
 
     #by-element-toggle-group {

changedetectionio/static/styles/scss/parts/_browser-steps.scss

@@ -79,7 +79,6 @@
   width: 100%;
   overflow-y: scroll;
   position: relative;
-  height: 80vh;
 
   > img {
     position: absolute;

changedetectionio/static/styles/scss/parts/_button.scss

@@ -3,9 +3,13 @@
 // Clean outline button — surface background, hairline border, muted label that
 // darkens on hover. The app's neutral/secondary action button (toolbars, list
 // actions), a calmer alternative to the solid pure-button. Pairs with .seg.
+
 .cdio-btn {
   display: inline-flex;
   align-items: center;
+  vertical-align: middle;
+  box-sizing: border-box;
+
   gap: 6px;
   height: 32px;
   padding: 0 12px;

changedetectionio/static/styles/scss/parts/_hamburger_menu.scss

@@ -95,7 +95,9 @@
   overflow-y: auto;
   padding-top: 60px;
 
-
+  .action-label {
+    display: block !important;
+  }
   #cdio-logo {
     color: var(--color-text);
 

changedetectionio/static/styles/scss/parts/_language.scss

@@ -1,7 +1,7 @@
 #language-selector-flag {
   display: inline-block;
-  width: 1.2em;
-  height: 1.2em;
+  width: 22px;
+  height: 22px;
   vertical-align: middle;
   border-radius: 50%;
   overflow: hidden;

changedetectionio/static/styles/scss/parts/_toast.scss

@@ -16,7 +16,7 @@
   }
 
   &.toast-top-center {
-    top: 100px;
+    top: 120px;
     left: 50%;
     transform: translateX(-50%);
   }

changedetectionio/static/styles/scss/parts/_top_menu.scss

@@ -25,6 +25,9 @@
       rgba(200, 200, 200, 0.02),
       rgba(200, 200, 200, 0.6));
   }
+  .bare-btn {
+    color: var(--color-text-menu-heading);
+  }
 }
 
 ul#top-right-menu {
@@ -47,9 +50,18 @@ ul#top-right-menu {
   }
 }
 
+$current-diff-url-fade: 2.5em;
+
+// -webkit- is still required for the mask on Safari, so every fade state has to
+// set the pair.
+@mixin current-diff-url-mask($image) {
+  -webkit-mask-image: $image;
+  mask-image: $image;
+}
+
 // The current diff URL sits between the logo and the right-hand menu in the
 // horizontal nav. It can be arbitrarily long, so it must never push the
-// surrounding items around: it absorbs the available middle space and trims
+// surrounding items around: it absorbs the available middle space and scrolls
 // its own text, fading out toward the cut edge instead of a hard clip.
 .current-diff-url {
   // Fill the space between the logo and the right-hand menu so the URL block
@@ -58,19 +70,54 @@ ul#top-right-menu {
   // min-width:0 is required for a flex item to shrink below its content width,
   // otherwise the long URL forces the row to grow and shoves the menu off-screen.
   min-width: 0;
-  overflow: hidden;
+  // A scroll container rather than a clip, so the trimmed end can be reached by
+  // dragging or swiping the line instead of only by hovering it. Browsers tell a
+  // pan apart from a tap, so the anchor still navigates on a tap.
+  //
+  // overflow-y stays hidden: the content is one non-wrapping line, and an axis
+  // that can scroll by a sub-pixel rounding error lets a diagonal swipe jog the
+  // text vertically. The scrollbar is hidden in both engines - this is a nav
+  // line a few characters tall, and a bar across it would cost more than it
+  // says; the fades below are the affordance instead.
+  overflow-x: auto;
+  overflow-y: hidden;
+  scrollbar-width: none;
+  &::-webkit-scrollbar {
+    display: none;
+  }
   white-space: nowrap;
   // Anchor the text to the start of the href so the beginning of the URL is
   // always visible; only the far (right) end gets trimmed when it overflows.
   text-align: left;
   margin: 0 $common-gap;
 
-  // Fade the text toward the trimmed (right) edge. On short URLs the text ends
-  // before this region, so the fade falls over empty space and stays invisible;
-  // only an overflowing URL actually shows the fade-out.
-  $fade-width: 2.5em;
-  -webkit-mask-image: linear-gradient(to right, #000 calc(100% - #{$fade-width}), transparent);
-  mask-image: linear-gradient(to right, #000 calc(100% - #{$fade-width}), transparent);
+  // No-JS default: without a scroll handler the line can only ever be cut at its
+  // right edge, because nothing moves it. On short URLs the text ends before this
+  // region, so the fade falls over empty space and stays invisible.
+  @include current-diff-url-mask(linear-gradient(to right, #000 calc(100% - #{$current-diff-url-fade}), transparent));
+
+  // static/js/scrollable-title.js sets .js-fades once it is maintaining the
+  // state, and from there the fade belongs on whichever edge is actually cut
+  // off - a fixed right-hand fade would dim the ending the reader just dragged
+  // over to read. No state class means nothing is cut off (a short title, or a
+  // long one scrolled to neither end, which cannot happen on one axis), so no
+  // mask at all. The mask tracks the element's own box, not its scrolled
+  // content, so each fade stays pinned to the edge it names.
+  &.js-fades {
+    @include current-diff-url-mask(none);
+
+    &.fade-right {
+      @include current-diff-url-mask(linear-gradient(to right, #000 calc(100% - #{$current-diff-url-fade}), transparent));
+    }
+
+    &.fade-left {
+      @include current-diff-url-mask(linear-gradient(to right, transparent, #000 #{$current-diff-url-fade}));
+    }
+
+    &.fade-left.fade-right {
+      @include current-diff-url-mask(linear-gradient(to right, transparent, #000 #{$current-diff-url-fade}, #000 calc(100% - #{$current-diff-url-fade}), transparent));
+    }
+  }
 
   span {
     overflow: visible;
@@ -146,9 +193,11 @@ ul#top-right-menu {
 
   // Paused = steady amber dot (no pulse).
   &.paused .live-dot {
-    background: #e8a33d;
-    box-shadow: 0 0 0 3px rgba(232, 163, 61, 0.3);
+    background: #e83d3d;
+    box-shadow: 0 0 0 3px rgb(232 61 61 / 0.3);
     animation: none;
+    width: 12px;
+    height: 12px;
   }
 
   // Icon-led pills (e.g. the mute toggle) keep the feather icon compact.

changedetectionio/static/styles/scss/parts/_variables.scss

@@ -27,6 +27,12 @@
   --color-background-gradient-first: #5ad8f7;
   --color-background-gradient-second: #2f50af;
   --color-background-gradient-third: #9150bf;
+  // The page's atmosphere gradient, shared so anything that needs to sit ON the
+  // page background (e.g. the left rail rolling out over content) can repaint
+  // an identical copy instead of approximating it with a flat colour. The
+  // referenced gradient stops are re-declared per theme below, so this single
+  // definition follows light/dark automatically.
+  --page-background-gradient: linear-gradient(130deg, var(--color-background-gradient-first), var(--color-background-gradient-second) 41.07%, var(--color-background-gradient-third) 84.05%);
   --color-background: var(--color-white);
   --color-text: var(--color-grey-200);
   --color-link: #1b98f8;
@@ -70,7 +76,7 @@
   --color-background-messages-notice: rgba(255, 255, 255, .5);
   --color-border-notification: #ccc;
 
-  --color-background-checkbox-operations: rgba(0, 0, 0, 0.05);
+  --color-background-checkbox-operations: rgba(255, 255, 255, 0.7);
   --color-warning: #ff3300;
   --color-border-warning: var(--color-warning);
   --color-text-legend: var(--color-white);
@@ -118,7 +124,6 @@
   --color-sidebar-shadow: 6px 0 28px rgba(0, 0, 0, 0.18);
   --color-sidebar-item-hover-bg: rgba(0, 0, 0, 0.06);
   --color-sidebar-item-active-bg: rgba(0, 0, 0, 0.10);
-
   --common-round-border: 8px;
 }
 
@@ -136,7 +141,7 @@ html[data-darkmode="true"] {
   --color-background-table-thead: var(--color-grey-200);
   --color-table-background: var(--color-grey-300);
   --color-table-stripe: var(--color-grey-325);
-
+  --color-background-checkbox-operations: rgba(50, 50, 50, 0.7);
   --watchlist-row-selected: #1e3a5f; // darker blue highlight for selected rows in dark mode
   --watchlist-row-hover: #2a2a2a;     // subtle grey highlight on row hover (dark mode)
 

changedetectionio/static/styles/scss/parts/_visualselector.scss

@@ -1,3 +1,12 @@
+body:has(#browser-steps:target) .edit-form {
+  max-width: min(var(--browser-steps-max-width, 1280px), 95vw);
+  width: 95%;
+}
+
+body:has(#visualselector:target) .edit-form {
+  width: 95%;
+  max-width: min(var(--visualselector-max-width, 1280px), 95vw);
+}
 
 #selector-wrapper {
   height: 100%;

changedetectionio/static/styles/scss/parts/_watch_table-mobile.scss

@@ -93,8 +93,11 @@ $watch-table-mobile-max: 767px;
   .watch-table {
     tbody {
       tr {
-        padding-bottom: 10px;
-        padding-top: 10px;
+
+        padding-inline: 12px;
+        padding-top: 12px;
+        padding-bottom: 12px;
+
         display: grid;
         grid-template-columns: $grid-col-checkbox 1fr $grid-col-watch;
         grid-template-rows: auto auto auto auto;
@@ -148,7 +151,7 @@ $watch-table-mobile-max: 767px;
           grid-row: 4;
           display: flex;
           align-items: center;
-          justify-content: flex-start;
+          justify-content: center;
         }
 
         > td.watch-controls {

changedetectionio/static/styles/scss/parts/_watch_table.scss

@@ -22,13 +22,9 @@ $title-col-stack-breakpoint: 1200px;
 // "Select all matching" banner shown under the bulk-operations bar when the
 // whole visible page is selected but more matching rows exist on other pages.
 .select-all-banner {
-  margin: 0.4rem 0;
   padding: 0.5rem 0.75rem;
-  border-radius: var(--common-round-border);
-  background: var(--watchlist-row-selected);
-  color: var(--color-watch-table-row-text);
+  color: #fff;
   font-size: var(--body-main-text-size);
-
   button {
     margin-left: 0.5rem;
     vertical-align: baseline;
@@ -58,11 +54,6 @@ $title-col-stack-breakpoint: 1200px;
   }
   .left {
     text-align: left;
-
-    .records-selected {
-      margin-top: 0.25rem;
-      opacity: 0.9;
-    }
   }
 
   .right {
@@ -82,8 +73,7 @@ body.has-queue {
 
 
 #checkbox-operations {
-  margin-bottom: $common-gap;
-  background: var(--color-background-new-watch-form);
+  background: var(--color-background-checkbox-operations);
   padding: 1em;
   border-radius: 10px;
   max-width: 100%;
@@ -99,10 +89,12 @@ body.has-queue {
     /* vertically center icon and text */
     display: inline-flex;
     align-items: center;
+    background: #00125b;
+    font-weight: bold;
   }
     i,svg {
-    width: 14px;
-    height: 14px;
+    width: 16px;
+    height: 16px;
     stroke: white;
   }
 }
@@ -111,10 +103,19 @@ body.watch-selection-active #checkbox-operations {
   display: block;
 }
 
-
-
 // Watch-list-specific styling layered on top of the shared .cdio-table base.
 .watch-table {
+  td,th {
+    padding-block: $common-gap; /* top/bottom*/
+    padding-inline: $common-gap/2; /*side to side */
+    &:first-child {
+      padding-left: 1rem;
+    }
+    &:last-child {
+      padding-right: 1rem;
+    }
+  }
+
   .checkbox-uuid {
     >* {
       vertical-align: middle;
@@ -142,6 +143,7 @@ body.watch-selection-active #checkbox-operations {
        The restock column is optional; below $title-col-stack-breakpoint it drops
        onto its own row, centered beneath the three columns above it.
     */
+
     td.inline.title-col {
       width: 100%;
       .grid-wrapper {
@@ -170,6 +172,27 @@ body.watch-selection-active #checkbox-operations {
       }
     }
 
+    /* page title and external link, needs to align center in its own container */
+    .watch-title {
+      display: inline-flex;
+      align-items: center;
+      gap: .25rem;
+
+      > * {
+        display: inline-flex;
+        align-items: center;
+      }
+
+      a.external {
+        width: 18px;
+        height: 18px;
+        margin-bottom: 4px;
+      }
+    }
+    .watch-tag-list {
+      margin-left: 10px;
+    }
+
     .watch-text-info {
       line-height: 1.5; /* lots of text and CSS tags etc here that can wrap at any time, add some breathability */
     }
@@ -279,9 +302,11 @@ body.watch-selection-active #checkbox-operations {
         display: inline-flex;
         align-items: center;
         gap: 6px;
-        > * {
-          opacity: 0;
-          transition: opacity 0.12s ease;
+        @media (min-width: 767px) {
+          > * {
+            opacity: 0.2;
+            transition: opacity 0.12s ease;
+          }
         }
       }
     }
@@ -290,20 +315,6 @@ body.watch-selection-active #checkbox-operations {
       white-space: normal;
     }
 
-    a.external::after {
-      // Inline "external link" glyph (open-cornered square + outbound arrow) as a
-      // background image so its box can be sized off the doc text-size variable
-      // (a data-URI in `content:url()` can't be reliably resized). Neutral grey so
-      // it reads on light backgrounds; dark mode lightens it via the existing
-      // invert filter on .title-col a[target="_blank"]::after.
-      content: "";
-      display: inline-block;
-      width: var(--body-main-text-size);
-      height: var(--body-main-text-size);
-      vertical-align: -0.1em;
-      background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%23777' stroke-width='2.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6'/%3E%3Cpolyline points='15 3 21 3 21 9'/%3E%3Cline x1='10' y1='14' x2='21' y2='3'/%3E%3C/svg%3E") no-repeat center / contain;
-      margin: 0 3px 0 5px;
-    }
     &.watch-controls {
       > div {
         display: flex;
@@ -359,6 +370,7 @@ body.watch-selection-active #checkbox-operations {
     gap: 4px; /* Space between image and text */
     > * {
       vertical-align: middle;
+      height: 1.4rem;
     }
   }
 
@@ -525,10 +537,51 @@ body.blueprint-watchlist {
   #add-watch-url-row {
     margin-bottom: 0 !important;
   }
+
   #quick-watch-llm-intent {
     margin-top: $common-gap;
   }
 
+  #quick-watch-processor-type {
+    span.label {
+      display: none;
+    }
+
+    label {
+      font-weight: normal;
+      font-size: .9rem;
+      margin: 0;
+    }
+
+    ul {
+      list-style: none;
+      margin-left: 0;
+      padding-left: 0;
+    }
+
+    li {
+      list-style: none;
+      font-size: .9rem;
+      display: grid;
+      grid-template-columns: auto 1fr;
+      align-items: center;
+      gap: .5rem;
+
+      input[type="radio"] {
+        flex: 0 0 auto;
+      }
+
+      > label {
+        font-weight: normal;
+      }
+    }
+
+    li + li { /* gap between */
+      margin-top: .75rem;
+    }
+
+  }
+
   // Let the URL field grow with what's typed, from a compact minimum up to 80% of
   // the row, instead of always filling it. `field-sizing: content` is the pure-CSS
   // auto-grow (Chromium 123+); other browsers fall back to the min-width below.
@@ -557,4 +610,8 @@ body.blueprint-watchlist {
   #new-watch-form:has(#url:not(:placeholder-shown)) #quick-watch-processor-type {
     display: block;
   }
+
+  #add-watch-url-row {
+
+  }
 }

changedetectionio/static/styles/scss/styles.scss

@@ -42,7 +42,8 @@
 @use "parts/sub_tabs";
 
 // Smooth transitions for theme switching
-body,
+// Disabled - people complained
+/*body,
 .pure-table,
 .pure-table thead,
 .pure-table td,
@@ -65,7 +66,7 @@ code,
 a,
 .watch-controls img {
   transition: color 0.4s ease, background-color 0.4s ease, background 0.4s ease, border-color 0.4s ease, box-shadow 0.4s ease;
-}
+}*/
 
 body {
   color: var(--color-text);
@@ -305,7 +306,7 @@ code {
 
 body:after {
   content: "";
-  background: linear-gradient(130deg, var(--color-background-gradient-first), var(--color-background-gradient-second) 41.07%, var(--color-background-gradient-third) 84.05%);
+  background: var(--page-background-gradient);
 }
 
 body:after,
@@ -477,10 +478,6 @@ label {
     color: var(--color-text-new-watch-input);
   }
 
-  .label {
-    display: none;
-  }
-
   legend {
     color: var(--color-text-legend);
     font-weight: bold;
@@ -697,12 +694,12 @@ footer {
   }
 }
 
-
 @media only screen and (max-width: 760px),
 (min-device-width: 768px) and (max-device-width: $desktop-wide-breakpoint) {
   .edit-form {
     padding: 0.5em;
     margin: 0;
+    width: 100%;
   }
 
   #nav-menu {
@@ -1002,27 +999,6 @@ ul {
   vertical-align: middle;
 }
 
-
-#quick-watch-processor-type {
-  ul#processor {
-    color: #fff;
-    padding-left: 0px;
-    li {
-      list-style: none;
-      font-size: 0.9rem;
-      display: grid;
-      grid-template-columns: auto 1fr;
-      align-items: center;
-      gap: 0.5rem;
-      margin-bottom: 0.5rem;
-    }
-  }
-  label, input {
-    padding: 0;
-    margin: 0;
-  }
-}
-
 .restock-label {
   &.in-stock {
     background-color: #7a0cc5;
@@ -1156,4 +1132,10 @@ header {
 
 textarea::placeholder {
     white-space: pre-wrap;
-}
+}
+
+@media only screen and (max-width: 480px) {
+  .pure-form button[type=submit] {
+    margin: 0 !important; /*override*/
+  }
+}

changedetectionio/templates/_common_fields.html

@@ -25,6 +25,10 @@
                 <td><code>{{ '{{watch_url}}' }}</code></td>
                 <td>{{ _('The URL being watched.') }}</td>
             </tr>
+            <tr>
+                <td><code>{{ '{{watch_open_url}}' }}</code></td>
+                <td>{{ _('The Open Link Override set on the watch, otherwise the same as watch_url. Use this when the watched URL is an API endpoint or RSS feed but you want to link to the real page.') }}</td>
+            </tr>
             <tr>
                 <td><code>{{ '{{watch_uuid}}' }}</code></td>
                 <td>{{ _('The UUID of the watch.') }}</td>

changedetectionio/templates/_helpers.html

@@ -75,8 +75,8 @@
 {% endmacro %}
 
 
-{% macro render_simple_field(field) %}
-  <span class="label {% if field.errors %}error{% endif %}"><label for="{{ field.id }}">{{ field.label.text | string | forceescape }}</label></span>
+{% macro render_simple_field(field, label=None) %}
+  <span class="label {% if field.errors %}error{% endif %}"><label for="{{ field.id }}">{{ (label if label is not none else field.label.text) | string | forceescape }}</label></span>
   <span {% if field.errors %} class="error" {% endif %}>{{ field(**kwargs)|safe }}
   {% if field.errors %}
     <ul class=errors>
@@ -89,8 +89,8 @@
 {% endmacro %}
 
 
-{% macro render_nolabel_field(field) %}
-    <span>
+{% macro render_nolabel_field(field, span_wrap=True) %}
+    {%- if span_wrap %}<span>{% endif %}
     {{ field(**kwargs)|safe }}
         {% if field.errors %}
             <span class="error">
@@ -103,7 +103,7 @@
       {% endif %}
       </span>
         {% endif %}
-    </span>
+    {%- if span_wrap %}</span>{% endif %}
 {% endmacro %}
 
 

changedetectionio/templates/base.html

@@ -16,8 +16,9 @@
         {%- endif -%}
     {%- endif -%}
     <link rel="stylesheet" href="{{url_for('static_content', group='styles', filename='pure-min.css')}}" >
-    <link rel="stylesheet" href="{{url_for('static_content', group='styles', filename='flag-icons.min.css')}}" >
-    <link rel="stylesheet" href="{{url_for('static_content', group='styles', filename='styles.css')}}?v={{ get_css_version() }}" >
+    <link rel="stylesheet" href="{{url_for('static_content', group='styles', filename='flag-icons.min.css')}}"  >
+    {# ?v= is appended automatically for static_content (see _fingerprint_static_urls) #}
+    <link rel="stylesheet" href="{{url_for('static_content', group='styles', filename='styles.css')}}" >
     {% if extra_stylesheets %}
       {% for m in extra_stylesheets %}
         <link rel="stylesheet" href="{{ m }}?ver={{ get_css_version() }}" >
@@ -87,8 +88,10 @@
         };
     </script>
     <script src="{{url_for('static_content', group='js', filename='jquery-3.6.0.min.js')}}"></script>
+    <script src="{{url_for('static_content', group='js', filename='feather-icons.min.js')}}"></script>
+    <script src="{{url_for('static_content', group='js', filename='sidebar.js')}}"></script>
+
     <script src="{{url_for('static_content', group='js', filename='csrf.js')}}" defer></script>
-    <script src="{{url_for('static_content', group='js', filename='feather-icons.min.js')}}" defer></script>
     {# Render all <i data-feather="..."> icons app-wide (jQuery ready), so individual pages don't each need their own feather.replace() call. #}
     <script>$(function () { if (window.feather) feather.replace(); });</script>
     {% if socket_io_enabled %}
@@ -117,8 +120,12 @@
     <div>
       <div class="home-menu pure-menu pure-menu-horizontal" id="nav-menu">
           {% if current_diff_url and is_safe_valid_url(current_diff_url) %}
-          <a class="current-diff-url" href="{{ current_diff_url }}" title="{{ current_diff_url }}">
-            <span>{{ current_diff_url }}</span></a>
+          {# The watch's own name when it has one, so the diff/preview pages do not print
+             the same URL twice. The title attribute keeps the full text reachable on hover
+             or long-press once the line truncates, and keeps the URL discoverable when a
+             title is covering it. #}
+          <a class="current-diff-url" href="{{ current_diff_url }}" title="{% if current_diff_label and current_diff_label != current_diff_url %}{{ current_diff_label }}&#10;{% endif %}{{ current_diff_url }}">
+            <span>{{ current_diff_label or current_diff_url }}</span></a>
         {% endif %}
 
         <ul class="top-menu-list" id="top-right-menu">
@@ -252,8 +259,9 @@
     </div><!-- /.app -->
     <script src="{{url_for('static_content', group='js', filename='toggle-theme.js')}}" defer></script>
     <script src="{{url_for('static_content', group='js', filename='hamburger-menu.js')}}" defer></script>
-    <script src="{{url_for('static_content', group='js', filename='sidebar.js')}}" defer></script>
+
     <script src="{{url_for('static_content', group='js', filename='menu-pop.js')}}" defer></script>
+    <script src="{{url_for('static_content', group='js', filename='scrollable-title.js')}}" defer></script>
 
     <div id="checking-now-fixed-tab" style="display: none;"><span class="spinner"></span><span class="status-text">&nbsp;{{ _('Checking now') }}</span></div>
     <div id="realtime-conn-error" style="display:none">{{ _('Real-time updates offline') }}</div>
@@ -317,11 +325,18 @@
         <h2 class="modal-title" id="search-modal-title">{{ _('Search') }}</h2>
       </div>
       <div class="modal-body">
-        <form id="search-form" method="GET">
+        {# Plain GET submit to the watchlist - url_for() carries the reverse-proxy sub-path
+           (SCRIPT_NAME), so no client-side URL building is needed. #}
+        <form id="search-form" method="GET" action="{{ url_for('watchlist.index') }}">
           <div class="pure-control-group">
-            <label for="search-modal-input">{% if active_tag_uuid %}{{ _("URL or Title in '%(title)s'", title=active_tag.title) }}{% else %}{{ _('URL or Title') }}{% endif %}</label>
+            {# Matches watch_passes_search() in blueprint/watchlist/filters.py - title, URL and last error text #}
+            <label for="search-modal-input">{{ _('URL, title or error text') }}</label>
             <input id="search-modal-input" class="m-d" name="q" placeholder="{{ _('Enter search term...') }}" required type="text" value="" autofocus>
-            <input name="tags" type="hidden" value="{% if active_tag_uuid %}{{active_tag_uuid}}{% endif %}">
+            {# 'tag' (not 'tags') - that's the arg the watchlist filters on #}
+            {% if active_tag_uuid %}
+            <input name="tag" type="hidden" value="{{ active_tag_uuid }}">
+            <span class="pure-form-message-inline">{{ _("Searching in current group '%(title)s' only", title=active_tag.title) }}</span>
+            {% endif %}
           </div>
         </form>
       </div>

changedetectionio/templates/sidebar-nav.html

@@ -7,12 +7,12 @@
     <li class="action-sidebar-li" id="action-sidebar-logo">
 
         {%- if has_password and not current_user.is_authenticated -%}
-          <a id="cdio-logo" href="https://changedetection.io" rel="noopener">
+          <a id="cdio-logo" href="https://changedetection.io" rel="noopener" title="ChangeDetection.io intelligent web page change detection.">
               <span id="logo-expanded"><strong>Change</strong>Detection.io</span>
               <span id="logo-short"><strong>CD</strong>IO</span>
           </a>
         {%- else -%}
-          <a id="cdio-logo" href="{{url_for('watchlist.index')}}">
+          <a id="cdio-logo" href="{{url_for('watchlist.index')}}" title="ChangeDetection.io intelligent web page change detection.">
               <span id="logo-expanded"><strong>Change</strong>Detection.io</span>
               <span id="logo-short"><strong>CD</strong>IO</span>
           </a>

changedetectionio/tests/fetchers/test_renavigation.py

@@ -0,0 +1,60 @@
+#!/usr/bin/env python3
+
+"""The browser fetchers must judge a fetch on the document they end up extracting.
+
+Plenty of sites answer the first request with an interstitial carrying an error status and a
+client-side redirect, then serve the real page. Judging the fetch on the first navigation fails a
+watch whose content is present and fine (reported against fotokoch.de: 503 + meta refresh -> 200),
+and on the pyppeteer fetcher a replaced document used to hang goto() until the hard processing
+timeout because its navigation watcher is bound to the loaderId it started on.
+"""
+
+import os
+from flask import url_for
+from ..util import wait_for_all_checks
+
+
+def _cdio(url):
+    # The browser runs in another container in CI and reaches the test server as 'cdio'
+    return url.replace('localhost.localdomain', 'cdio').replace('localhost', 'cdio')
+
+
+def test_interstitial_redirect_is_followed(client, live_server, measure_memory_usage, datastore_path):
+    assert os.getenv('PLAYWRIGHT_DRIVER_URL'), "Needs PLAYWRIGHT_DRIVER_URL set for this test"
+
+    res = client.post(
+        url_for("settings.settings_page"),
+        data={
+            "application-empty_pages_are_a_change": "",
+            "requests-time_between_check-minutes": 180,
+            'application-fetch_backend': "html_webdriver",
+        },
+        follow_redirects=True
+    )
+    assert b"Settings updated." in res.data
+
+    test_url = _cdio(url_for('test_interstitial', key='renav', _external=True))
+
+    res = client.post(
+        url_for("imports.import_page"),
+        data={"urls": test_url},
+        follow_redirects=True
+    )
+    assert b"1 Imported" in res.data
+    wait_for_all_checks(client)
+
+    # The interstitial answered 503, so judging the first navigation would have failed the watch
+    uuid = next(iter(live_server.app.config['DATASTORE'].data['watching']))
+    watch = live_server.app.config['DATASTORE'].data['watching'][uuid]
+    assert not watch.get('last_error'), \
+        f"Watch was judged on the interstitial instead of the page it landed on: {watch.get('last_error')}"
+
+    res = client.get(url_for("watchlist.index"))
+    assert b'Error - 503' not in res.data
+
+    assert watch.history_n >= 1, "Fetch succeeded but no snapshot was stored"
+    snapshot = watch.get_history_snapshot(list(watch.history.keys())[-1])
+    assert 'The real page content is here' in snapshot
+    assert 'Browser check in progress' not in snapshot
+
+    client.post(url_for("ui.form_delete", uuid="all"), follow_redirects=True)

changedetectionio/tests/test_api.py

@@ -338,6 +338,84 @@ def test_api_simple(client, live_server, measure_memory_usage, datastore_path):
     )
     assert len(res.json) == 0, "Watch list should be empty"
 
+def test_api_delete_watch_history(client, live_server, measure_memory_usage, datastore_path):
+    """DELETE /api/v1/watch/<uuid>/history should wipe the snapshots but keep the watch (#4397)"""
+
+    api_key = live_server.app.config['DATASTORE'].data['settings']['application'].get('api_access_token')
+
+    set_original_response(datastore_path=datastore_path)
+    test_url = url_for('test_endpoint', _external=True)
+
+    res = client.post(
+        url_for("createwatch"),
+        data=json.dumps({"url": test_url}),
+        headers={'content-type': 'application/json', 'x-api-key': api_key},
+        follow_redirects=True
+    )
+    assert res.status_code == 201
+    watch_uuid = res.json.get('uuid')
+    wait_for_all_checks(client)
+
+    # A second snapshot so we know we're clearing more than one
+    set_modified_response(datastore_path=datastore_path)
+    client.get(url_for("watch", uuid=watch_uuid, recheck='1'), headers={'x-api-key': api_key})
+    wait_for_all_checks(client)
+
+    res = client.get(
+        url_for("watchhistory", uuid=watch_uuid),
+        headers={'x-api-key': api_key},
+    )
+    assert len(res.json) == 2, "Should have two history entries before clearing"
+
+    # Unknown watch UUID should 404 and not blow up
+    res = client.delete(
+        url_for("watchhistory", uuid='4d8b5b4a-8e0b-4d4a-9f57-3f2b1c0d9e11'),
+        headers={'x-api-key': api_key},
+    )
+    assert res.status_code == 404
+
+    # Requires the API key
+    res = client.delete(url_for("watchhistory", uuid=watch_uuid))
+    assert res.status_code == 403
+
+    # Pause it first - clearing resets last_checked to 0 which otherwise makes the ticker
+    # queue an instant recheck, and that would race with the assertions below
+    client.get(url_for("watch", uuid=watch_uuid, paused='paused'), headers={'x-api-key': api_key})
+
+    # Now really clear it
+    res = client.delete(
+        url_for("watchhistory", uuid=watch_uuid),
+        headers={'x-api-key': api_key},
+    )
+    assert res.status_code == 204
+
+    res = client.get(
+        url_for("watchhistory", uuid=watch_uuid),
+        headers={'x-api-key': api_key},
+    )
+    assert res.json == {}, "History should be empty after DELETE"
+
+    # The watch itself must survive, with its state reset
+    res = client.get(
+        url_for("watch", uuid=watch_uuid),
+        headers={'x-api-key': api_key}
+    )
+    assert res.status_code == 200
+    assert res.json.get('url') == test_url
+    assert res.json.get('history_n') == 0
+    assert res.json.get('last_checked') == 0
+    assert res.json.get('previous_md5') == False
+
+    # And a snapshot fetch now has nothing to give
+    res = client.get(
+        url_for("watchsinglehistory", uuid=watch_uuid, timestamp='latest'),
+        headers={'x-api-key': api_key},
+    )
+    assert res.status_code == 404
+
+    delete_all_watches(client)
+
+
 def test_roundtrip_API(client, live_server, measure_memory_usage, datastore_path):
     """
     Test the full round trip, this way we test the default Model fits back into OpenAPI spec

changedetectionio/tests/test_api_openapi.py

@@ -56,6 +56,62 @@ def test_openapi_merged_spec_contains_restock_fields():
         f"WatchBase.processor_config_restock_diff should $ref the schema, got: {ref}"
 
 
+def test_openapi_notification_format_enum_matches_code():
+    """
+    Unit test: the notification_format enum in api-spec.yaml must stay in step with
+    valid_notification_formats, otherwise the API either rejects a format the UI offers or
+    accepts one that blows up when the notification object is built.
+    """
+    from changedetectionio.api import build_merged_spec_dict
+    from changedetectionio.notification import valid_notification_formats
+
+    spec = build_merged_spec_dict()
+    spec_enum = spec['components']['schemas']['WatchBase']['properties']['notification_format'].get('enum')
+
+    assert spec_enum is not None, "notification_format must declare an enum in api-spec.yaml"
+    assert set(spec_enum) == set(valid_notification_formats.keys()), \
+        (f"api-spec.yaml notification_format enum {spec_enum} does not match "
+         f"valid_notification_formats {list(valid_notification_formats.keys())}")
+
+
+def test_openapi_import_rejects_invalid_enum_query_param(client, live_server, measure_memory_usage, datastore_path):
+    """
+    /api/v1/import takes watch config as query params - those must honour the `enum:` in the spec.
+    'Text' is the classic one: it was the display name in an old release, so people still pass it,
+    and a stored 'Text' makes every notification for that watch raise ValueError at send time.
+    """
+    api_key = live_server.app.config['DATASTORE'].data['settings']['application'].get('api_access_token')
+
+    res = client.post(
+        url_for("import") + "?notification_format=Text",
+        data='https://website1.com',
+        headers={'x-api-key': api_key, 'content-type': 'text/plain'},
+    )
+    assert res.status_code == 400, f"Expected 400 but got {res.status_code}"
+    assert b'notification_format' in res.data
+    assert not live_server.app.config['DATASTORE'].data['watching'], "Nothing should have been imported"
+
+    # Another enum field on the same code path
+    res = client.post(
+        url_for("import") + "?method=FETCH",
+        data='https://website1.com',
+        headers={'x-api-key': api_key, 'content-type': 'text/plain'},
+    )
+    assert res.status_code == 400, f"Expected 400 but got {res.status_code}"
+
+    # ...and a valid value still imports and is stored
+    res = client.post(
+        url_for("import") + "?notification_format=htmlcolor",
+        data='https://website1.com',
+        headers={'x-api-key': api_key, 'content-type': 'text/plain'},
+    )
+    assert res.status_code == 200, f"Expected 200 but got {res.status_code}"
+    watch = live_server.app.config['DATASTORE'].data['watching'][res.json[0]]
+    assert watch.get('notification_format') == 'htmlcolor'
+
+    delete_all_watches(client)
+
+
 def test_openapi_validation_invalid_content_type_on_create_watch(client, live_server, measure_memory_usage, datastore_path):
     """Test that creating a watch with invalid content-type triggers OpenAPI validation error."""
     api_key = live_server.app.config['DATASTORE'].data['settings']['application'].get('api_access_token')

changedetectionio/tests/test_cache_control_headers.py

@@ -0,0 +1,97 @@
+#!/usr/bin/env python3
+"""
+PR #4319: dynamic pages went out with no Cache-Control at all.
+
+Flask does send "Vary: Cookie" on any response that touched the session, so a
+spec-compliant shared cache would already key these per-session. An edge cache
+configured to key purely on URL ignores that, and one reporter's Cloudflare
+Worker did exactly that: it cached /settings, including the csrf_token embedded
+in the form, and every later save failed with "The CSRF tokens do not match" -
+or, worse, could hand one session's authenticated page to another visitor.
+
+An app-wide after_request fills in Cache-Control when the route didn't set one,
+so the explicit headers on assets/screenshots/favicons still win.
+"""
+
+import re
+
+
+def test_dynamic_pages_are_not_storable(client, live_server):
+    # Any page carrying session state or a CSRF token - the cached copy is what
+    # breaks form submits and leaks across sessions.
+    for path in ['/', '/settings', '/login']:
+        response = client.get(path)
+        cache_control = response.headers.get('Cache-Control')
+        assert cache_control is not None, (
+            f"{path} sent no Cache-Control - a URL-keyed edge cache is free to store and "
+            f"replay it, stale CSRF token and all"
+        )
+        assert 'no-store' in cache_control, (
+            f"{path} must not be storable by an intermediary, got {cache_control!r}"
+        )
+
+
+def test_routes_keep_their_own_cache_control(client, live_server):
+    # The hook only fills in a missing header, so routes that deliberately
+    # allow caching must come through untouched.
+
+    # static_content() sets its own header on assets (see the two tests below), so they
+    # never reach the hook at all.
+    response = client.get('/static/styles/styles.css')
+    assert response.status_code == 200
+    assert 'no-store' not in response.headers.get('Cache-Control', ''), (
+        f"static assets should keep werkzeug's own header, got "
+        f"{response.headers.get('Cache-Control')!r}"
+    )
+
+    # And a route with an explicit long-lived, publicly cacheable header.
+    response = client.get('/static/flags/4x3/ad.svg')
+    assert response.status_code == 200
+    assert response.headers.get('Cache-Control') == 'max-age=86400, public', (
+        f"flag SVGs set their own 24h public cache header, got "
+        f"{response.headers.get('Cache-Control')!r}"
+    )
+
+
+def test_static_assets_are_cacheable(client, live_server):
+    # Assets used to go out as "no-cache, max-age=0", so every CSS/JS/image on every page
+    # load cost a request (a 304, but still a round trip). url_for() now fingerprints the
+    # URL with the file's mtime+size, and a matching ?v= is what buys the long cache.
+    res = client.get('/')
+    assert res.status_code == 200
+
+    versioned = re.findall(r'(/static/(?:js|styles|images|favicons)/[^"?]+\?v=[0-9-]+)', res.data.decode())
+    assert versioned, "no fingerprinted asset URLs in the rendered page - ?v= is what unlocks caching"
+
+    for url in set(versioned):
+        response = client.get(url)
+        assert response.status_code == 200, url
+        assert response.headers.get('Cache-Control') == 'public, max-age=31536000, immutable', (
+            f"{url} is pinned to one file revision so it should be cacheable forever, got "
+            f"{response.headers.get('Cache-Control')!r}"
+        )
+        # The session cookie is permanent and re-signed on every response, so its value keeps
+        # changing - a "Vary: Cookie" here would miss the cache on every asset of every page load.
+        assert 'cookie' not in response.headers.get('Vary', '').lower(), (
+            f"{url} must not vary by cookie, got {response.headers.get('Vary')!r}"
+        )
+        assert 'Set-Cookie' not in response.headers, (
+            f"{url} is publicly cacheable, it must not carry a session cookie"
+        )
+        assert response.headers.get('ETag'), f"{url} sent no ETag"
+
+
+def test_unversioned_static_assets_still_revalidate(client, live_server):
+    # Older cached HTML (or a hand-typed URL) has no ?v=, and a stale one must not be trusted
+    # either - both have to keep revalidating so an upgrade can't serve the wrong file forever.
+    for url in ['/static/js/toggle-theme.js', '/static/js/toggle-theme.js?v=1-1']:
+        response = client.get(url)
+        assert response.status_code == 200, url
+        assert response.headers.get('Cache-Control') == 'public, max-age=0, must-revalidate', (
+            f"{url} isn't pinned to a known file revision so it must be revalidated, got "
+            f"{response.headers.get('Cache-Control')!r}"
+        )
+        etag = response.headers.get('ETag')
+        assert etag, f"{url} sent no ETag - revalidation would re-download the whole file"
+        # ETag is werkzeug's own mtime-size-path token, so revalidation is a cheap 304.
+        assert client.get(url, headers={'If-None-Match': etag}).status_code == 304

changedetectionio/tests/test_diff_header.py

@@ -0,0 +1,182 @@
+from flask import url_for
+from bs4 import BeautifulSoup
+import pytest
+
+
+@pytest.mark.parametrize('title,page_title,expected', [
+    ('Release notes <script>alert(1)</script>', 'Fetched title', 'Release notes <script>alert(1)</script>'),
+    ('', 'Fetched title', 'Fetched title'),
+    ('', '', 'https://example.com/releases'),
+])
+def test_diff_header_watch_label(client, title, page_title, expected):
+    """The top line of the menu names the watch, so the page does not print the
+    same URL twice: the watch's own title when it has one, the fetched page title
+    next, and the URL only when neither is set."""
+    datastore = client.application.config['DATASTORE']
+    uuid = datastore.add_watch(url='https://example.com/releases', extras={
+        'title': title, 'page_title': page_title, 'paused': True,
+    })
+    watch = datastore.data['watching'][uuid]
+    watch.save_history_blob('First release', 1700000000, 'first')
+    watch.save_history_blob('Second release', 1700000060, 'second')
+
+    response = client.get(url_for('ui.ui_diff.diff_history_page', uuid=uuid))
+    assert response.status_code == 200
+    page = BeautifulSoup(response.data, 'html.parser')
+    heading = page.select_one('.header .current-diff-url')
+    assert heading.get_text(strip=True) == expected
+    assert heading.find('script') is None
+    # Clicking it still goes to the watched page - only the text changed.
+    assert heading.get('href') == 'https://example.com/releases'
+    # The separate heading this replaced is gone, so the bar is one row shorter.
+    assert page.select_one('#diff-watch-title') is None
+    assert page.select_one('#diff-header #diff-form') is not None
+    assert page.select_one('#diff-header .tabs') is not None
+    assert page.select_one('#diff-header #difference') is None
+    assert 'Second release' in page.select_one('#difference').get_text()
+    # The line is one line and fades out when it outgrows the bar, so the
+    # untruncated text has to stay reachable on hover / long-press.
+    assert expected in heading.get('title')
+
+
+def test_diff_header_label_keeps_the_url_reachable(client):
+    """A title covers the URL that used to be printed here, so the hover text has
+    to carry both - otherwise the only way to read the URL is to follow it."""
+    datastore = client.application.config['DATASTORE']
+    uuid = datastore.add_watch(url='https://example.com/releases', extras={
+        'title': 'Release notes', 'paused': True,
+    })
+    watch = datastore.data['watching'][uuid]
+    watch.save_history_blob('First release', 1700000000, 'first')
+    watch.save_history_blob('Second release', 1700000060, 'second')
+
+    page = BeautifulSoup(client.get(url_for('ui.ui_diff.diff_history_page', uuid=uuid)).data,
+                         'html.parser')
+    link = page.select_one('.header .current-diff-url')
+    hover = link.get('title')
+    assert 'Release notes' in hover
+    assert 'https://example.com/releases' in hover
+
+    # Without a title the line already *is* the URL, so hover must not repeat it.
+    untitled = datastore.add_watch(url='https://example.com/other', extras={'paused': True})
+    other = datastore.data['watching'][untitled]
+    other.save_history_blob('First', 1700000000, 'first')
+    other.save_history_blob('Second', 1700000060, 'second')
+    page = BeautifulSoup(client.get(url_for('ui.ui_diff.diff_history_page', uuid=untitled)).data,
+                         'html.parser')
+    link = page.select_one('.header .current-diff-url')
+    assert link.get('title') == 'https://example.com/other'
+
+
+def test_diff_header_heart_stays_in_the_markup(client):
+    """The heart is folded away by a media query on this page, not removed from
+    it - so it has to still be in the DOM. Its visibility is in diff.scss and
+    cannot be seen from here."""
+    datastore = client.application.config['DATASTORE']
+    uuid = datastore.add_watch(url='https://example.com/releases', extras={'paused': True})
+    watch = datastore.data['watching'][uuid]
+    watch.save_history_blob('First release', 1700000000, 'first')
+    watch.save_history_blob('Second release', 1700000060, 'second')
+
+    page = BeautifulSoup(client.get(url_for('ui.ui_diff.diff_history_page', uuid=uuid)).data,
+                         'html.parser')
+    assert page.select_one('#heart-us') is not None
+
+
+def _seeded_diff_page(client, **extras):
+    datastore = client.application.config['DATASTORE']
+    extras.setdefault('paused', True)
+    uuid = datastore.add_watch(url='https://example.com/releases', extras=extras)
+    watch = datastore.data['watching'][uuid]
+    watch.save_history_blob('First release', 1700000000, 'first')
+    watch.save_history_blob('Second release', 1700000060, 'second')
+    response = client.get(url_for('ui.ui_diff.diff_history_page', uuid=uuid))
+    assert response.status_code == 200
+    return BeautifulSoup(response.data, 'html.parser')
+
+
+def test_diff_filters_toggle_degrades_without_javascript(client):
+    """The diff options collapse into a popover, but only once diff-overview.js
+    has taken them over: the toggle ships hidden and the fieldset ships inline
+    and inside the form, so with scripting off the options are still reachable
+    and still submit."""
+    page = _seeded_diff_page(client)
+
+    toggle = page.select_one('#diff-form #diff-filters-toggle')
+    assert toggle is not None
+    # Inside a form, anything but type=button submits it.
+    assert toggle.get('type') == 'button'
+    assert toggle.get('aria-expanded') == 'false'
+    assert toggle.get('aria-controls') == 'diff-style'
+
+    options = page.select_one('#diff-form #diff-style')
+    assert options is not None
+    assert options.get('hidden') is None
+    assert page.select_one('#diff-form #diff-style #ignoreWhitespace') is not None
+
+
+def test_diff_version_arrows_are_named(client):
+    """Only the arrow glyphs are visible in the compact bar, so each link has to
+    carry the wording itself rather than lean on text the CSS hides."""
+    page = _seeded_diff_page(client)
+
+    for element_id in ('btn-previous', 'btn-next'):
+        link = page.select_one(f'#keyboard-nav #{element_id}')
+        assert link is not None
+        assert link.get('aria-label')
+        assert link.get('title') == link.get('aria-label')
+        label = link.select_one('.keyboard-nav-label')
+        assert label is not None
+        # The accessible name has to be the same word the hidden label shows, so
+        # that it comes from a msgid the catalogs already translate rather than a
+        # longer phrase invented for this bar that only screen readers ever hear.
+        assert link.get('aria-label') == label.get_text(strip=True)
+
+
+def test_difference_page_class_scopes_sticky_header(client):
+    """The sticky top menu is styled off body.difference-page, so only the diff
+    page may carry that class - the extract page shares the same blueprint."""
+    datastore = client.application.config['DATASTORE']
+    uuid = datastore.add_watch(url='https://example.com/releases', extras={'paused': True})
+    watch = datastore.data['watching'][uuid]
+    watch.save_history_blob('First release', 1700000000, 'first')
+    watch.save_history_blob('Second release', 1700000060, 'second')
+
+    diff = BeautifulSoup(client.get(url_for('ui.ui_diff.diff_history_page', uuid=uuid)).data,
+                         'html.parser')
+    assert 'difference-page' in diff.select_one('body').get('class')
+
+    extract = client.get(url_for('ui.ui_diff.diff_history_page_extract_GET', uuid=uuid))
+    assert extract.status_code == 200
+    assert 'difference-page' not in BeautifulSoup(extract.data, 'html.parser').select_one('body').get('class')
+
+
+def test_scrollable_title_script_is_global(client):
+    """The top line is a scroll container whose fades are maintained by JS. The
+    restock difference page and the image-SSIM preview page both render that line
+    and neither loads diff-overview.js, so the script belongs in base.html - which
+    is what putting it on a page with no title line at all demonstrates."""
+    datastore = client.application.config['DATASTORE']
+    uuid = datastore.add_watch(url='https://example.com/releases', extras={'paused': True})
+    watch = datastore.data['watching'][uuid]
+    watch.save_history_blob('First release', 1700000000, 'first')
+    watch.save_history_blob('Second release', 1700000060, 'second')
+
+    def scripts(response):
+        assert response.status_code == 200
+        page = BeautifulSoup(response.data, 'html.parser')
+        return page, {s['src'] for s in page.select('script[src]')}
+
+    page, srcs = scripts(client.get(url_for('ui.ui_diff.diff_history_page', uuid=uuid)))
+    assert page.select_one('.header .current-diff-url') is not None
+    script = page.select_one('script[src*="scrollable-title.js"]')
+    assert script is not None
+    # Deferred, so jQuery and the markup both exist by the time it runs.
+    assert script.has_attr('defer')
+
+    # The watch overview has no title line, and still serves the script: that is
+    # only true of a base.html script, and it is what the other pages rely on.
+    overview, srcs = scripts(client.get(url_for('watchlist.index')))
+    assert overview.select_one('.header .current-diff-url') is None
+    assert any('scrollable-title.js' in src for src in srcs)
+    assert not any('diff-overview.js' in src for src in srcs)

changedetectionio/tests/test_duplicate_date_header.py

@@ -0,0 +1,48 @@
+#!/usr/bin/env python3
+"""
+Issue #4299: static resources went out with two Date header lines.
+
+werkzeug's send_file() (via make_conditional) puts a Date header on the WSGI
+response, and the built-in server we run in production - started through
+socketio.run(..., allow_unsafe_werkzeug=True) - writes its own Date in
+BaseHTTPRequestHandler.send_response() before copying the app's headers
+through verbatim, so the response on the wire carried Date twice. RFC 9110
+forbids that and nginx drops the whole field with "upstream sent duplicate
+header line".
+
+The duplicate is only visible over a real socket, hence live_server and
+http.client here: the Flask test client talks to the WSGI app directly and
+never sees the server-added header, and requests/urllib3 would merge the two
+header lines into one before we could count them.
+"""
+
+import http.client
+import re
+from urllib.parse import urlparse
+
+
+def test_no_duplicate_date_header_on_static_resources(live_server):
+    # Served by send_from_directory(), which is the path that makes werkzeug
+    # attach its own Date - any static file exercises the same code.
+    url = urlparse(live_server.url('/static/styles/styles.css'))
+    conn = http.client.HTTPConnection(url.hostname, url.port, timeout=10)
+    try:
+        conn.request('GET', url.path)
+        response = conn.getresponse()
+        response.read()
+        # getheaders() keeps repeated header lines as separate entries
+        headers = response.getheaders()
+        status = response.status
+    finally:
+        conn.close()
+
+    assert status == 200, f"expected 200 for the static file, got {status}"
+
+    dates = [value for key, value in headers if key.lower() == 'date']
+    assert len(dates) == 1, (
+        f"expected exactly 1 Date header, got {len(dates)}: {dates!r} - RFC 9110 forbids a "
+        f"duplicated Date, and nginx logs 'upstream sent duplicate header line' and ignores it"
+    )
+    assert re.match(r'^\w{3}, \d{2} \w{3} \d{4} \d{2}:\d{2}:\d{2} GMT$', dates[0]), (
+        f"Date header is not a valid IMF-fixdate: {dates[0]!r}"
+    )

changedetectionio/tests/test_link_to_open.py

@@ -0,0 +1,171 @@
+"""
+Tests for the optional per-watch "Link to Open" (`link_to_open`).
+
+A watch may point at something that is useless in a browser - an API endpoint or an RSS
+feed - while the human-readable page lives somewhere else. `link_to_open` stores that page,
+and every "go to the site" affordance (watch list, history/preview header, the
+{{watch_open_url}} notification token) uses it in preference to the watched URL.
+"""
+
+import os
+
+from flask import url_for
+
+from .util import set_original_response, set_modified_response, wait_for_all_checks, \
+    wait_for_notification_endpoint_output
+
+OPEN_URL = "https://example.com/the-real-human-page"
+
+
+def _add_watch(client, test_url):
+    res = client.post(
+        url_for("ui.ui_views.form_quick_watch_add"),
+        data={"url": test_url, "tags": ''},
+        follow_redirects=True
+    )
+    assert b"Watch added" in res.data
+    wait_for_all_checks(client)
+
+
+def _edit_watch(client, test_url, **extra):
+    data = {
+        "url": test_url,
+        "tags": "",
+        "headers": "",
+        "fetch_backend": "html_requests",
+        "time_between_check_use_default": "y",
+    }
+    data.update(extra)
+    return client.post(url_for("ui.ui_edit.edit_page", uuid="first"), data=data, follow_redirects=True)
+
+
+def test_link_to_open_is_saved_and_used_in_the_watch_list(client, live_server, measure_memory_usage, datastore_path):
+    set_original_response(datastore_path=datastore_path)
+    test_url = url_for('test_endpoint', _external=True)
+    _add_watch(client, test_url)
+
+    # Without an override, the watch list links to the watched URL
+    res = client.get(url_for("watchlist.index"))
+    assert f'href="{test_url}"'.encode('utf-8') in res.data
+    assert OPEN_URL.encode('utf-8') not in res.data
+
+    res = _edit_watch(client, test_url, link_to_open=OPEN_URL)
+    assert b"Updated watch." in res.data
+
+    # It round-trips back into the edit form
+    res = client.get(url_for("ui.ui_edit.edit_page", uuid="first"))
+    assert OPEN_URL.encode('utf-8') in res.data
+
+    # ...and the watch list now points at it instead of the watched URL
+    res = client.get(url_for("watchlist.index"))
+    assert f'href="{OPEN_URL}"'.encode('utf-8') in res.data
+    assert f'href="{test_url}"'.encode('utf-8') not in res.data
+
+
+def test_link_to_open_used_in_history_header(client, live_server, measure_memory_usage, datastore_path):
+    set_original_response(datastore_path=datastore_path)
+    test_url = url_for('test_endpoint', _external=True)
+    _add_watch(client, test_url)
+
+    set_modified_response(datastore_path=datastore_path)
+    client.post(url_for("ui.form_watch_checknow"), follow_redirects=True)
+    wait_for_all_checks(client)
+
+    assert b"Updated watch." in _edit_watch(client, test_url, link_to_open=OPEN_URL).data
+
+    uuid = next(iter(client.application.config.get('DATASTORE').data['watching'].keys()))
+
+    # Top-of-page link on the history/diff page
+    res = client.get(url_for("ui.ui_diff.diff_history_page", uuid=uuid))
+    assert f'class="current-diff-url" href="{OPEN_URL}"'.encode('utf-8') in res.data
+
+    # ...and on the preview page
+    res = client.get(url_for("ui.ui_preview.preview_page", uuid=uuid))
+    assert f'class="current-diff-url" href="{OPEN_URL}"'.encode('utf-8') in res.data
+
+
+def test_invalid_link_to_open_is_rejected(client, live_server, measure_memory_usage, datastore_path):
+    set_original_response(datastore_path=datastore_path)
+    test_url = url_for('test_endpoint', _external=True)
+    _add_watch(client, test_url)
+
+    res = _edit_watch(client, test_url, link_to_open="javascript:alert(1)")
+    assert b"Updated watch." not in res.data
+    assert b"Watch protocol is not permitted or invalid URL format" in res.data
+
+    # Blank is fine - it means "use the watched URL"
+    res = _edit_watch(client, test_url, link_to_open="")
+    assert b"Updated watch." in res.data
+    watch = list(client.application.config.get('DATASTORE').data['watching'].values())[0]
+    assert watch.open_link == test_url
+
+
+def test_watch_open_url_notification_token(client, live_server, measure_memory_usage, datastore_path):
+    set_original_response(datastore_path=datastore_path)
+    notification_file = os.path.join(datastore_path, "notification.txt")
+    if os.path.isfile(notification_file):
+        os.unlink(notification_file)
+
+    test_url = url_for('test_endpoint', _external=True)
+    _add_watch(client, test_url)
+
+    notification_url = url_for('test_notification_endpoint', _external=True).replace('http://', 'post://')
+
+    res = _edit_watch(
+        client,
+        test_url,
+        link_to_open=OPEN_URL,
+        notification_urls=notification_url,
+        notification_title="Test",
+        notification_body="watched={{watch_url}}\nopen={{watch_open_url}}",
+        notification_format="text",
+    )
+    assert b"Updated watch." in res.data
+    wait_for_all_checks(client)
+
+    set_modified_response(datastore_path=datastore_path)
+    client.post(url_for("ui.form_watch_checknow"), follow_redirects=True)
+    wait_for_all_checks(client)
+    assert wait_for_notification_endpoint_output(datastore_path=datastore_path)
+
+    with open(notification_file, 'r') as f:
+        body = f.read()
+
+    assert f"watched={test_url}" in body
+    assert f"open={OPEN_URL}" in body
+    os.unlink(notification_file)
+
+
+def test_watch_open_url_token_falls_back_to_watch_url(client, live_server, measure_memory_usage, datastore_path):
+    """With no 'Link to Open' set, {{watch_open_url}} must still render the watched URL."""
+    set_original_response(datastore_path=datastore_path)
+    notification_file = os.path.join(datastore_path, "notification.txt")
+    if os.path.isfile(notification_file):
+        os.unlink(notification_file)
+
+    test_url = url_for('test_endpoint', _external=True)
+    _add_watch(client, test_url)
+
+    notification_url = url_for('test_notification_endpoint', _external=True).replace('http://', 'post://')
+
+    res = _edit_watch(
+        client,
+        test_url,
+        notification_urls=notification_url,
+        notification_title="Test",
+        notification_body="open={{watch_open_url}}",
+        notification_format="text",
+    )
+    assert b"Updated watch." in res.data
+    wait_for_all_checks(client)
+
+    set_modified_response(datastore_path=datastore_path)
+    client.post(url_for("ui.form_watch_checknow"), follow_redirects=True)
+    wait_for_all_checks(client)
+    assert wait_for_notification_endpoint_output(datastore_path=datastore_path)
+
+    with open(notification_file, 'r') as f:
+        body = f.read()
+
+    assert f"open={test_url}" in body
+    os.unlink(notification_file)

changedetectionio/tests/test_search.py

@@ -1,5 +1,6 @@
 from flask import url_for
 from .util import set_original_response, set_modified_response, live_server_setup
+import re
 import time
 
 
@@ -71,3 +72,43 @@ def test_search_in_tag_limit(client, live_server, measure_memory_usage, datastor
     assert urls[0].split(' ')[0].encode('utf-8') in res.data, urls[0].encode('utf-8')
     assert urls[1].split(' ')[0].encode('utf-8') not in res.data, urls[0].encode('utf-8')
 
+
+
+def test_search_modal_form_action(client, live_server, measure_memory_usage, datastore_path):
+    # The search modal submits as a plain GET form, so its action has to carry the
+    # reverse-proxy sub-path (SCRIPT_NAME), otherwise search jumps to the host root.
+    res = client.get(url_for("watchlist.index"))
+    assert b'<form id="search-form" method="GET" action="/">' in res.data
+
+    res = client.get("/", base_url="http://localhost/sub-path")
+    assert b'<form id="search-form" method="GET" action="/sub-path/">' in res.data
+
+
+def test_search_modal_tag_field_is_filterable(client, live_server, measure_memory_usage, datastore_path):
+    # The modal carries the active tag as a hidden field so a search stays scoped to the
+    # tag you were viewing. The field name has to be the one the watchlist filters on.
+    urls = ['https://localhost:12300?first-result=1 tag-one',
+            'https://localhost:5000?second-result=1 tag-two'
+            ]
+    res = client.post(
+        url_for("imports.import_page"),
+        data={"urls": "\r\n".join(urls)},
+        follow_redirects=True
+    )
+    assert b"2 Imported" in res.data
+
+    res = client.get(url_for("watchlist.index") + "?tag=tag-one")
+    form = re.search(rb'<form id="search-form".*?</form>', res.data, re.DOTALL)
+    assert form, "search modal form not rendered"
+    field = re.search(rb'<input name="([^"]+)" type="hidden" value="([^"]+)"', form.group(0))
+    assert field, f"no populated hidden tag field in {form.group(0)}"
+    name, value = field.group(1).decode(), field.group(2).decode()
+
+    # The scoping is spelled out in the modal, so narrowed results aren't a surprise
+    assert b'Searching in current group' in form.group(0)
+    assert b'tag-one' in form.group(0)
+
+    # 'localhost' matches both watches, so only the tag field can narrow it down
+    res = client.get(url_for("watchlist.index") + f"?q=localhost&{name}={value}")
+    assert urls[0].split(' ')[0].encode('utf-8') in res.data
+    assert urls[1].split(' ')[0].encode('utf-8') not in res.data, f"'{name}' is not filtered on by the watchlist"

changedetectionio/tests/test_share_watch.py

@@ -9,8 +9,17 @@ import re
 def test_share_watch(client, live_server, measure_memory_usage, datastore_path):
     set_original_response(datastore_path=datastore_path)
 
-   #  live_server_setup(live_server) # Setup on conftest per function
+    # Turn it on
+    res = client.post(
+        url_for('settings.settings_page'),
+        data={
+            'application-ui-use_share_watch': '1',
+            'requests-timeout': '60',
+        },
+        follow_redirects=True,
+    )
 
+    assert res.status_code == 200
     test_url = url_for('test_endpoint', _external=True)
     include_filters = ".nice-filter"
 
@@ -72,4 +81,21 @@ def test_share_watch(client, live_server, measure_memory_usage, datastore_path):
     res = client.get(url_for("watchlist.index"))
     assert bytes(test_url.encode('utf-8')) in res.data
 
+    # Turn it off
+    res = client.post(
+        url_for('settings.settings_page'),
+        data={
+            'application-ui-use_share_watch': '',
+            'requests-timeout': '60',
+        },
+        follow_redirects=True,
+    )
+
+    # click share the link
+    res = client.post(
+        url_for("ui.form_share_put_watch", uuid=uuid),
+        follow_redirects=True
+    )
+    assert res.status_code == 403
+
     delete_all_watches(client)

changedetectionio/tests/unit/test_watch_model.py

@@ -370,6 +370,23 @@ class TestHistoryPathTraversal(unittest.TestCase):
         history = watch.history
         self.assertEqual(history, {}, "Path traversal entry must be rejected")
 
+    def test_parent_dir_entry_is_rejected_by_the_containment_check(self):
+        """A bare '..' is the shortest entry that reaches and fails the containment check.
+
+        os.path.basename() reduces '/etc/passwd' and '../../etc/passwd' to
+        'passwd', so those two stop at the os.path.exists() check below the
+        guard rather than at the guard itself. '..' survives basename() intact
+        and resolves to the parent of data_dir, which does exist, so the
+        containment check is what rejects it. Not the only such input —
+        '../..' and 'foo/..' collapse to the same thing — and not the only
+        reason the check exists: it also blocks a filename inside data_dir
+        that is itself a symlink pointing outside.
+        """
+        watch = self._make_watch()
+        self._write_history_txt(watch, ['1000000000,..\n'])
+        history = watch.history
+        self.assertEqual(history, {}, "Parent-directory entry must be rejected")
+
     def test_normal_snapshot_entry_is_accepted(self):
         """A bare filename written by save_history_blob must still load correctly."""
         import uuid as uuid_builder
@@ -377,8 +394,11 @@ class TestHistoryPathTraversal(unittest.TestCase):
         watch.save_history_blob(contents="hello world", timestamp=1000000000, snapshot_id=str(uuid_builder.uuid4()))
         history = watch.history
         self.assertEqual(len(history), 1, "Normal snapshot entry must be accepted")
+        # Watch.history resolves entries with os.path.realpath, so compare against a
+        # resolved data_dir. On macOS the datastore lives under /tmp, which is a symlink
+        # to /private/tmp, and an unresolved comparison fails there for a correct path.
         self.assertTrue(
-            list(history.values())[0].startswith(watch.data_dir),
+            list(history.values())[0].startswith(os.path.realpath(watch.data_dir)),
             "Resolved path must be inside the watch data directory"
         )
 
@@ -408,5 +428,47 @@ class TestHistoryPathTraversal(unittest.TestCase):
             )
 
 
+class TestLinkToOpen(unittest.TestCase):
+    """`link_to_open` - the optional human-facing URL used instead of the watched URL."""
+
+    def _make_watch(self, **fields):
+        mock_datastore = {'settings': {'application': {}}, 'watching': {}}
+        return Watch.model(datastore_path='/tmp', __datastore=mock_datastore, default=fields)
+
+    def test_defaults_to_the_watched_url(self):
+        watch = self._make_watch(url='https://example.com/feed.xml')
+        assert watch.open_link_override == ''
+        assert watch.open_link == 'https://example.com/feed.xml'
+        assert watch.open_link == watch.link
+
+    def test_override_wins_when_set(self):
+        watch = self._make_watch(url='https://example.com/api/v1/items.json',
+                                 link_to_open='https://example.com/shop/items')
+        assert watch.link == 'https://example.com/api/v1/items.json'
+        assert watch.open_link == 'https://example.com/shop/items'
+        assert watch.open_link_override == 'https://example.com/shop/items'
+
+    def test_whitespace_only_override_is_ignored(self):
+        watch = self._make_watch(url='https://example.com/feed.xml', link_to_open='   ')
+        assert watch.open_link_override == ''
+        assert watch.open_link == 'https://example.com/feed.xml'
+
+    def test_unsafe_override_falls_back_to_the_watched_url(self):
+        watch = self._make_watch(url='https://example.com/feed.xml',
+                                 link_to_open='javascript:alert(1)')
+        assert watch.open_link_override == ''
+        assert watch.open_link == 'https://example.com/feed.xml'
+
+    def test_source_prefix_is_stripped_from_the_override(self):
+        watch = self._make_watch(url='source:https://example.com/feed.xml',
+                                 link_to_open='source:https://example.com/page')
+        assert watch.open_link == 'https://example.com/page'
+
+    def test_jinja2_in_the_override_is_rendered(self):
+        watch = self._make_watch(url='https://example.com/feed.xml',
+                                 link_to_open='https://example.com/page?id={{ 1+1 }}')
+        assert watch.open_link == 'https://example.com/page?id=2'
+
+
 if __name__ == '__main__':
     unittest.main()

changedetectionio/tests/unit/test_xpath_collation_locale.py

@@ -0,0 +1,105 @@
+#!/usr/bin/env python3
+
+"""An xPath filter must mean the same thing whatever LC_COLLATE the process is in.
+
+elementpath implements the XPath string functions on top of locale.strxfrm:
+
+    def contains(self, a, b):  return self.strxfrm(b) in self.strxfrm(a)
+
+Under LC_COLLATE=C, strxfrm() is the identity and that is an ordinary substring test. Under a
+real locale it returns a binary collation key, and a substring of a collation key is not the
+collation key of the substring - so contains(), starts-with(), ends-with() and
+substring-before/after() return false for EVERY input.
+
+That shipped the day the Docker image started generating its locales: `ENV LC_ALL=en_US.UTF-8`
+became satisfiable, flask_app's setlocale() stopped failing, LC_COLLATE went with it, and every
+watch whose filter used contains() reported "no filters were found" against a page whose HTML
+plainly contained the target (#4437). Nothing in the codebase changed - which is why it survived
+a bisect back to 0.60.2 and could only be found by diffing the containers.
+
+Both halves of the fix are asserted here: the filter pins the codepoint collation itself, and
+flask_app leaves LC_COLLATE alone.
+"""
+
+import locale
+import unittest
+
+from changedetectionio import html_tools
+
+HTML = """<html><body>
+  <div id="price_box"><p>Only $9.99 per month</p></div>
+  <div id="other">nothing to see</div>
+</body></html>"""
+
+# Locales that are actually present vary by image; skip rather than fail on a bare CI box.
+CANDIDATE_LOCALES = ['en_US.UTF-8', 'C.UTF-8', 'en_GB.UTF-8', 'de_DE.UTF-8']
+
+
+def _first_available_collate_locale():
+    original = locale.setlocale(locale.LC_COLLATE)
+    try:
+        for loc in CANDIDATE_LOCALES:
+            try:
+                locale.setlocale(locale.LC_COLLATE, loc)
+                return loc
+            except locale.Error:
+                continue
+        return None
+    finally:
+        locale.setlocale(locale.LC_COLLATE, original)
+
+
+class TestXpathCollationIsLocaleIndependent(unittest.TestCase):
+
+    def setUp(self):
+        self.original_collate = locale.setlocale(locale.LC_COLLATE)
+
+    def tearDown(self):
+        locale.setlocale(locale.LC_COLLATE, self.original_collate)
+
+    def test_string_functions_survive_a_utf8_collation(self):
+        loc = _first_available_collate_locale()
+        if loc is None:
+            self.skipTest("no UTF-8 locale generated in this environment")
+
+        # Every one of these is strxfrm-based inside elementpath, and every one of them appears
+        # in filters reported against #4437.
+        rules = [
+            '//*[self::div or self::p][contains(.,"month")]',
+            '//div[contains(@id, "_")]',
+            '//p[starts-with(., "Only")]',
+            '//p[ends-with(., "month")]',
+        ]
+
+        locale.setlocale(locale.LC_COLLATE, 'C')
+        baseline = {r: html_tools.xpath_filter(xpath_filter=r, html_content=HTML).strip() for r in rules}
+        for rule, out in baseline.items():
+            self.assertTrue(out, f"{rule} matched nothing even under LC_COLLATE=C")
+
+        locale.setlocale(locale.LC_COLLATE, loc)
+        for rule in rules:
+            out = html_tools.xpath_filter(xpath_filter=rule, html_content=HTML).strip()
+            self.assertEqual(
+                out, baseline[rule],
+                f"xPath filter {rule!r} behaves differently under LC_COLLATE={loc} than under C - "
+                f"the collation is leaking into the filter (#4437)"
+            )
+
+    def test_flask_app_does_not_touch_lc_collate(self):
+        """The presentation locale must not drag LC_COLLATE along with it.
+
+        flask_app sets LC_CTYPE/LC_NUMERIC/LC_MONETARY/LC_TIME individually rather than LC_ALL.
+        A future edit back to locale.LC_ALL would silently reintroduce the bug, so pin it here -
+        the source is the honest thing to assert, because the import has long since run.
+        """
+        from pathlib import Path
+        src = Path(html_tools.__file__).parent.joinpath('flask_app.py').read_text()
+        self.assertNotIn(
+            'locale.setlocale(locale.LC_ALL', src,
+            "flask_app must not setlocale(LC_ALL, ...) - it takes LC_COLLATE with it and breaks "
+            "every xPath contains() filter (#4437)"
+        )
+
+
+if __name__ == '__main__':
+    unittest.main()

changedetectionio/tests/util.py

@@ -249,6 +249,31 @@ def new_live_server_setup(live_server):
         import secrets
         return "Random content - {}\n".format(secrets.token_hex(64))
 
+    # Re-navigation gate: the first hit answers with an error status AND a client-side meta
+    # refresh, the second serves the real page. This mirrors sites that gate visitors they have
+    # not seen recently (reported against fotokoch.de, which answers 503 + meta refresh and then
+    # serves a 200). The browser follows the refresh, so the fetch has to be judged on the
+    # document we actually end up extracting rather than on the interstitial.
+    # Keyed on last-seen time rather than a hit count, so EVERY fresh check starts out gated -
+    # a counter would serve a clean 200 to the second check and let the test pass without the fix.
+    _interstitial_last_seen = {}
+
+    @live_server.app.route('/test-interstitial')
+    def test_interstitial():
+        key = request.args.get('key', 'default')
+        now = time.time()
+        seen_recently = (now - _interstitial_last_seen.get(key, 0)) < 10
+        _interstitial_last_seen[key] = now
+        if not seen_recently:
+            resp = make_response(
+                '<html><head><meta http-equiv="refresh" content="1"></head>'
+                '<body>Browser check in progress, you will be redirected</body></html>', 503)
+        else:
+            resp = make_response(
+                '<html><body><h1>The real page content is here</h1></body></html>', 200)
+        resp.headers['Content-Type'] = 'text/html'
+        return resp
+
     @live_server.app.route('/test-endpoint2')
     def test_endpoint2():
         return "<html><body>some basic content</body></html>"

changedetectionio/translations/README.md

@@ -198,6 +198,7 @@ Never fix one language and move on.
 | `en_US` | English (US) |
 | `es` | Spanish (Español) |
 | `fr` | French (Français) |
+| `id` | Indonesian (Bahasa Indonesia) |
 | `it` | Italian (Italiano) |
 | `ja` | Japanese (日本語) |
 | `ko` | Korean (한국어) |

changedetectionio/translations/cs/LC_MESSAGES/messages.po

@@ -57,6 +57,14 @@ msgstr ""
 msgid "Currently:"
 msgstr "V současné době:"
 
+#: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
+msgid "What do you want to achieve?"
+msgstr ""
+
+#: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
+msgid "Select a browser"
+msgstr ""
+
 #: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
 #, python-format
 msgid "%(browser)s cannot render a live preview, choose a browser below"
@@ -66,10 +74,6 @@ msgstr ""
 msgid "Select by element"
 msgstr "Vyberte podle prvku"
 
-#: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
-msgid "Hover & click the preview to watch just one part of the page."
-msgstr ""
-
 #: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html changedetectionio/blueprint/ui/templates/edit.html
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 msgid "Clear selection"
@@ -376,6 +380,18 @@ msgstr "Znovu zkontrolovat po (minuty)"
 msgid "Import"
 msgstr "Importovat"
 
+#: changedetectionio/blueprint/menu_modes.py
+msgid "Expand on hover"
+msgstr ""
+
+#: changedetectionio/blueprint/menu_modes.py
+msgid "Always expanded"
+msgstr ""
+
+#: changedetectionio/blueprint/menu_modes.py
+msgid "Stays minimal"
+msgstr ""
+
 #: changedetectionio/blueprint/rss/single_watch.py
 #, python-format
 msgid "Watch with UUID %(uuid)s not found"
@@ -821,6 +837,16 @@ msgstr "Povolit aktualizace UI v reálném čase - (změna vyžaduje restart)"
 msgid "Enable or Disable Favicons next to the watch list"
 msgstr ""
 
+#: changedetectionio/blueprint/settings/templates/settings.html
+msgid "Disabling this can speed up your page fetches because the favicon does not need to be fetched."
+msgstr ""
+
+#: changedetectionio/blueprint/settings/templates/settings.html
+msgid ""
+"This copies your watch to a temporary hosted database and returns a link to make sharing/copying the watch to other "
+"people"
+msgstr ""
+
 #: changedetectionio/blueprint/settings/templates/settings.html
 msgid "Number of items per page in the watch overview list, 0 to disable."
 msgstr ""
@@ -1440,17 +1466,17 @@ msgstr "Žádné skupiny/značky zatím nebyly nastaveny"
 msgid "Mute notifications"
 msgstr "Ztlumit oznámení"
 
-#: changedetectionio/blueprint/tags/templates/groups-overview.html changedetectionio/blueprint/ui/edit.py
-#: changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html
-msgid "Edit"
-msgstr "Upravit"
-
 #: changedetectionio/blueprint/tags/templates/groups-overview.html
 #: changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 msgid "Recheck"
 msgstr "Znovu zkontrolovat"
 
+#: changedetectionio/blueprint/tags/templates/groups-overview.html changedetectionio/blueprint/ui/edit.py
+#: changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html
+msgid "Edit"
+msgstr "Upravit"
+
 #: changedetectionio/blueprint/tags/templates/groups-overview.html
 msgid "Delete Group?"
 msgstr "Smazat skupinu?"
@@ -1767,6 +1793,10 @@ msgctxt "diff version"
 msgid "To"
 msgstr "Na"
 
+#: changedetectionio/blueprint/ui/templates/diff.html
+msgid "Filters"
+msgstr "Filtry"
+
 #: changedetectionio/blueprint/ui/templates/diff.html
 msgid "Words"
 msgstr "Slova"
@@ -1838,10 +1868,9 @@ msgstr "Snímek obrazovky s chybou"
 msgid "Text"
 msgstr "Text"
 
-#: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/blueprint/ui/templates/preview.html
-#: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
-msgid "Current screenshot"
-msgstr "Aktuální snímek obrazovky"
+#: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/processors/templates/extract.html
+msgid "Screenshot"
+msgstr "Snímek obrazovky"
 
 #: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/processors/extract.py
 #: changedetectionio/processors/templates/extract.html
@@ -1947,15 +1976,17 @@ msgid "Automatically uses the page title if found, you can also use your own tit
 msgstr ""
 
 #: changedetectionio/blueprint/ui/templates/edit.html
-msgid "The interval/amount of time between each check."
-msgstr "Interval/doba mezi jednotlivými kontrolami."
+msgid "Extra Page Title and Link options"
+msgstr ""
 
 #: changedetectionio/blueprint/ui/templates/edit.html
-msgid ""
-"Sends a notification when the filter can no longer be seen on the page, good for knowing when the page changed and "
-"your filter will not work anymore."
+msgid "Optional - links in the list, history and notifications open this URL instead. Does not change the URL being checked."
 msgstr ""
 
+#: changedetectionio/blueprint/ui/templates/edit.html
+msgid "The interval/amount of time between each check."
+msgstr "Interval/doba mezi jednotlivými kontrolami."
+
 #: changedetectionio/blueprint/ui/templates/edit.html
 msgid "Set to empty to use system settings default"
 msgstr ""
@@ -2054,6 +2085,12 @@ msgstr "musíte"
 msgid "Set the fetch method"
 msgstr "Nastavte metodu načítání"
 
+#: changedetectionio/blueprint/ui/templates/edit.html
+msgid ""
+"Sends a notification when the filter can no longer be seen on the page, good for knowing when the page changed and "
+"your filter will not work anymore."
+msgstr ""
+
 #: changedetectionio/blueprint/ui/templates/edit.html
 msgid "Use the verify (✓) button to test if a condition passes against the current snapshot."
 msgstr ""
@@ -2205,6 +2242,14 @@ msgstr "Počet upozornění na upozornění"
 msgid "Server type reply"
 msgstr "Odpověď typu serveru"
 
+#: changedetectionio/blueprint/ui/templates/edit.html changedetectionio/widgets/ternary_boolean.py
+msgid "Yes"
+msgstr "Ano"
+
+#: changedetectionio/blueprint/ui/templates/edit.html changedetectionio/widgets/ternary_boolean.py
+msgid "No"
+msgstr "Ne"
+
 #: changedetectionio/blueprint/ui/templates/edit.html
 msgid "AI tokens (last check)"
 msgstr ""
@@ -2257,6 +2302,11 @@ msgstr "Duplikovat a upravit"
 msgid "Select timestamp"
 msgstr "Vybrat časové razítko"
 
+#: changedetectionio/blueprint/ui/templates/preview.html
+#: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
+msgid "Current screenshot"
+msgstr "Aktuální snímek obrazovky"
+
 #: changedetectionio/blueprint/ui/templates/preview.html
 msgid "Current erroring screenshot from most recent request"
 msgstr "Aktuální chybový snímek obrazovky z posledního požadavku"
@@ -2520,16 +2570,18 @@ msgstr ""
 msgid "Currently high"
 msgstr ""
 
+#. {pct} is a percentage including the % sign, e.g. "80%"
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 #: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
-#, python-format
-msgid "cheaper than %s% of tracked prices"
+#, python-brace-format
+msgid "cheaper than {pct} of tracked prices"
 msgstr ""
 
+#. {pct} is a percentage including the % sign, e.g. "80%"
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 #: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
-#, python-format
-msgid "more expensive than %s% of tracked prices"
+#, python-brace-format
+msgid "more expensive than {pct} of tracked prices"
 msgstr ""
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
@@ -2546,21 +2598,6 @@ msgstr ""
 msgid "Web page URL"
 msgstr ""
 
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
-#, python-format
-msgid "All %(page)s on this page are selected."
-msgstr ""
-
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
-#, python-format
-msgid "Select all %(total)s matching"
-msgstr ""
-
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
-#, python-format
-msgid "All %(total)s matching are selected."
-msgstr ""
-
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 #, python-format
 msgid "%(count)s records selected"
@@ -2615,6 +2652,10 @@ msgstr "v '%(title)s'"
 msgid "RSS Feed"
 msgstr ""
 
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html changedetectionio/templates/base.html
+msgid "Close"
+msgstr ""
+
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 msgid "Invert"
 msgstr ""
@@ -2688,8 +2729,19 @@ msgstr "Smazat sledování?"
 msgid "<p><strong>Are you sure you want to delete the selected watches?</strong></p><p>This action cannot be undone.</p>"
 msgstr "<p><strong>Opravdu chcete smazat vybraná sledování?</strong></p><p>Tuto akci nelze vzít zpět.</p>"
 
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html changedetectionio/templates/base.html
-msgid "Close"
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
+#, python-format
+msgid "All %(page)s on this page are selected."
+msgstr ""
+
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
+#, python-format
+msgid "Select all %(total)s matching"
+msgstr ""
+
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
+#, python-format
+msgid "All %(total)s matching are selected."
 msgstr ""
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
@@ -3188,6 +3240,10 @@ msgstr ""
 msgid "Web Page URL"
 msgstr ""
 
+#: changedetectionio/forms.py
+msgid "Open Link Override"
+msgstr ""
+
 #: changedetectionio/forms.py
 msgid "Group Tag"
 msgstr ""
@@ -3445,6 +3501,10 @@ msgstr "Povolit favikony"
 msgid "Use page <title> in watch overview list"
 msgstr "Použijte stránku <title> v přehledu sledování"
 
+#: changedetectionio/forms.py
+msgid "Enable watch \"sharing\""
+msgstr ""
+
 #: changedetectionio/forms.py
 msgid "Relative time format"
 msgstr ""
@@ -3461,14 +3521,6 @@ msgstr ""
 msgid "Navigation sidebar"
 msgstr ""
 
-#: changedetectionio/forms.py
-msgid "Collapsed icon rail (expands on hover)"
-msgstr ""
-
-#: changedetectionio/forms.py
-msgid "Always expanded"
-msgstr ""
-
 #: changedetectionio/forms.py
 msgid "API access token security check enabled"
 msgstr "Kontrola zabezpečení přístupového tokenu API povolena"
@@ -3934,10 +3986,6 @@ msgstr ""
 msgid "Not enough price data points yet to draw a graph - keep monitoring and the price history will appear here."
 msgstr ""
 
-#: changedetectionio/processors/templates/extract.html
-msgid "Screenshot"
-msgstr ""
-
 #: changedetectionio/processors/templates/extract.html
 msgid "This tool will extract text data from all of the watch history."
 msgstr ""
@@ -4020,6 +4068,12 @@ msgstr ""
 msgid "The URL being watched."
 msgstr ""
 
+#: changedetectionio/templates/_common_fields.html
+msgid ""
+"The Open Link Override set on the watch, otherwise the same as watch_url. Use this when the watched URL is an API "
+"endpoint or RSS feed but you want to link to the real page."
+msgstr ""
+
 #: changedetectionio/templates/_common_fields.html
 msgid "The UUID of the watch."
 msgstr "UUID monitoru."
@@ -4539,18 +4593,18 @@ msgid "Search"
 msgstr "Hledat"
 
 #: changedetectionio/templates/base.html
-#, python-format
-msgid "URL or Title in '%(title)s'"
-msgstr ""
-
-#: changedetectionio/templates/base.html
-msgid "URL or Title"
-msgstr ""
+msgid "URL, title or error text"
+msgstr "URL, název nebo text chyby"
 
 #: changedetectionio/templates/base.html
 msgid "Enter search term..."
 msgstr ""
 
+#: changedetectionio/templates/base.html
+#, python-format
+msgid "Searching in current group '%(title)s' only"
+msgstr "Hledá se pouze ve skupině '%(title)s'"
+
 #: changedetectionio/templates/edit/include_llm_intent.html
 msgid ""
 "<strong>On</strong> &ndash; every watch in this group uses the AI settings below, unless it fills in its own. "
@@ -4959,14 +5013,6 @@ msgid ""
 "ALLOW_IANA_RESTRICTED_ADDRESSES=true and restart."
 msgstr ""
 
-#: changedetectionio/widgets/ternary_boolean.py
-msgid "Yes"
-msgstr "Ano"
-
-#: changedetectionio/widgets/ternary_boolean.py
-msgid "No"
-msgstr "Ne"
-
 #: changedetectionio/widgets/ternary_boolean.py
 msgid "Main settings"
 msgstr "Hlavní nastavení"

changedetectionio/translations/de/LC_MESSAGES/messages.po

@@ -57,6 +57,14 @@ msgstr ""
 msgid "Currently:"
 msgstr "Momentan:"
 
+#: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
+msgid "What do you want to achieve?"
+msgstr ""
+
+#: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
+msgid "Select a browser"
+msgstr ""
+
 #: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
 #, python-format
 msgid "%(browser)s cannot render a live preview, choose a browser below"
@@ -66,10 +74,6 @@ msgstr ""
 msgid "Select by element"
 msgstr "Nach Element auswählen"
 
-#: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
-msgid "Hover & click the preview to watch just one part of the page."
-msgstr ""
-
 #: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html changedetectionio/blueprint/ui/templates/edit.html
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 msgid "Clear selection"
@@ -382,6 +386,18 @@ msgstr "Nachprüfzeit (Minuten)"
 msgid "Import"
 msgstr "IMPORT"
 
+#: changedetectionio/blueprint/menu_modes.py
+msgid "Expand on hover"
+msgstr ""
+
+#: changedetectionio/blueprint/menu_modes.py
+msgid "Always expanded"
+msgstr ""
+
+#: changedetectionio/blueprint/menu_modes.py
+msgid "Stays minimal"
+msgstr ""
+
 #: changedetectionio/blueprint/rss/single_watch.py
 #, python-format
 msgid "Watch with UUID %(uuid)s not found"
@@ -837,6 +853,16 @@ msgstr ""
 msgid "Enable or Disable Favicons next to the watch list"
 msgstr ""
 
+#: changedetectionio/blueprint/settings/templates/settings.html
+msgid "Disabling this can speed up your page fetches because the favicon does not need to be fetched."
+msgstr ""
+
+#: changedetectionio/blueprint/settings/templates/settings.html
+msgid ""
+"This copies your watch to a temporary hosted database and returns a link to make sharing/copying the watch to other "
+"people"
+msgstr ""
+
 #: changedetectionio/blueprint/settings/templates/settings.html
 msgid "Number of items per page in the watch overview list, 0 to disable."
 msgstr ""
@@ -1459,17 +1485,17 @@ msgstr "Keine Gruppen/Labels konfiguriert"
 msgid "Mute notifications"
 msgstr "Benachrichtigungen stummschalten"
 
-#: changedetectionio/blueprint/tags/templates/groups-overview.html changedetectionio/blueprint/ui/edit.py
-#: changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html
-msgid "Edit"
-msgstr "Bearbeiten"
-
 #: changedetectionio/blueprint/tags/templates/groups-overview.html
 #: changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 msgid "Recheck"
 msgstr "Neu prüfen"
 
+#: changedetectionio/blueprint/tags/templates/groups-overview.html changedetectionio/blueprint/ui/edit.py
+#: changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html
+msgid "Edit"
+msgstr "Bearbeiten"
+
 #: changedetectionio/blueprint/tags/templates/groups-overview.html
 msgid "Delete Group?"
 msgstr "Gruppe löschen?"
@@ -1790,6 +1816,10 @@ msgctxt "diff version"
 msgid "To"
 msgstr "Zu"
 
+#: changedetectionio/blueprint/ui/templates/diff.html
+msgid "Filters"
+msgstr "Filter"
+
 #: changedetectionio/blueprint/ui/templates/diff.html
 msgid "Words"
 msgstr "Wörter"
@@ -1861,10 +1891,9 @@ msgstr "Fehler-Screenshot"
 msgid "Text"
 msgstr "Text"
 
-#: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/blueprint/ui/templates/preview.html
-#: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
-msgid "Current screenshot"
-msgstr "Aktueller Screenshot"
+#: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/processors/templates/extract.html
+msgid "Screenshot"
+msgstr "Screenshot"
 
 #: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/processors/extract.py
 #: changedetectionio/processors/templates/extract.html
@@ -1974,16 +2003,16 @@ msgstr ""
 "Beschreibung verwenden."
 
 #: changedetectionio/blueprint/ui/templates/edit.html
-msgid "The interval/amount of time between each check."
-msgstr "Das Intervall/die Zeitdauer zwischen den einzelnen Überprüfungen."
+msgid "Extra Page Title and Link options"
+msgstr ""
 
 #: changedetectionio/blueprint/ui/templates/edit.html
-msgid ""
-"Sends a notification when the filter can no longer be seen on the page, good for knowing when the page changed and "
-"your filter will not work anymore."
+msgid "Optional - links in the list, history and notifications open this URL instead. Does not change the URL being checked."
 msgstr ""
-"Sendet eine Benachrichtigung, wenn der Filter auf der Seite nicht mehr sichtbar ist. So wissen Sie, wann sich die "
-"Seite geändert hat und Ihr Filter nicht mehr funktioniert."
+
+#: changedetectionio/blueprint/ui/templates/edit.html
+msgid "The interval/amount of time between each check."
+msgstr "Das Intervall/die Zeitdauer zwischen den einzelnen Überprüfungen."
 
 #: changedetectionio/blueprint/ui/templates/edit.html
 msgid "Set to empty to use system settings default"
@@ -2087,6 +2116,14 @@ msgstr "Das musst du"
 msgid "Set the fetch method"
 msgstr "Legen Sie die Fetch-Methode fest"
 
+#: changedetectionio/blueprint/ui/templates/edit.html
+msgid ""
+"Sends a notification when the filter can no longer be seen on the page, good for knowing when the page changed and "
+"your filter will not work anymore."
+msgstr ""
+"Sendet eine Benachrichtigung, wenn der Filter auf der Seite nicht mehr sichtbar ist. So wissen Sie, wann sich die "
+"Seite geändert hat und Ihr Filter nicht mehr funktioniert."
+
 #: changedetectionio/blueprint/ui/templates/edit.html
 msgid "Use the verify (✓) button to test if a condition passes against the current snapshot."
 msgstr ""
@@ -2250,6 +2287,14 @@ msgstr "Anzahl der Benachrichtigungsalarme"
 msgid "Server type reply"
 msgstr "Antwort vom Servertyp"
 
+#: changedetectionio/blueprint/ui/templates/edit.html changedetectionio/widgets/ternary_boolean.py
+msgid "Yes"
+msgstr "Ja"
+
+#: changedetectionio/blueprint/ui/templates/edit.html changedetectionio/widgets/ternary_boolean.py
+msgid "No"
+msgstr "Nein"
+
 #: changedetectionio/blueprint/ui/templates/edit.html
 msgid "AI tokens (last check)"
 msgstr ""
@@ -2302,6 +2347,11 @@ msgstr "Klonen und bearbeiten"
 msgid "Select timestamp"
 msgstr "Zeitstempel auswählen"
 
+#: changedetectionio/blueprint/ui/templates/preview.html
+#: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
+msgid "Current screenshot"
+msgstr "Aktueller Screenshot"
+
 #: changedetectionio/blueprint/ui/templates/preview.html
 msgid "Current erroring screenshot from most recent request"
 msgstr "Aktueller fehlerhafter Screenshot aus der letzten Anfrage"
@@ -2565,16 +2615,18 @@ msgstr ""
 msgid "Currently high"
 msgstr ""
 
+#. {pct} is a percentage including the % sign, e.g. "80%"
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 #: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
-#, python-format
-msgid "cheaper than %s% of tracked prices"
+#, python-brace-format
+msgid "cheaper than {pct} of tracked prices"
 msgstr ""
 
+#. {pct} is a percentage including the % sign, e.g. "80%"
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 #: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
-#, python-format
-msgid "more expensive than %s% of tracked prices"
+#, python-brace-format
+msgid "more expensive than {pct} of tracked prices"
 msgstr ""
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
@@ -2591,21 +2643,6 @@ msgstr ""
 msgid "Web page URL"
 msgstr ""
 
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
-#, python-format
-msgid "All %(page)s on this page are selected."
-msgstr ""
-
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
-#, python-format
-msgid "Select all %(total)s matching"
-msgstr ""
-
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
-#, python-format
-msgid "All %(total)s matching are selected."
-msgstr ""
-
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 #, python-format
 msgid "%(count)s records selected"
@@ -2660,6 +2697,10 @@ msgstr "in '%(title)s'"
 msgid "RSS Feed"
 msgstr ""
 
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html changedetectionio/templates/base.html
+msgid "Close"
+msgstr ""
+
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 msgid "Invert"
 msgstr ""
@@ -2737,8 +2778,19 @@ msgstr ""
 "<p><strong>Möchten Sie die ausgewählten Überwachungen wirklich löschen?</strong></p><p>Diese Aktion kann nicht "
 "rückgängig gemacht werden.</p>"
 
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html changedetectionio/templates/base.html
-msgid "Close"
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
+#, python-format
+msgid "All %(page)s on this page are selected."
+msgstr ""
+
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
+#, python-format
+msgid "Select all %(total)s matching"
+msgstr ""
+
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
+#, python-format
+msgid "All %(total)s matching are selected."
 msgstr ""
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
@@ -3237,6 +3289,10 @@ msgstr ""
 msgid "Web Page URL"
 msgstr ""
 
+#: changedetectionio/forms.py
+msgid "Open Link Override"
+msgstr ""
+
 #: changedetectionio/forms.py
 msgid "Group Tag"
 msgstr ""
@@ -3495,6 +3551,10 @@ msgstr "Favicons Aktiviert"
 msgid "Use page <title> in watch overview list"
 msgstr "Verwenden Sie die Seite <title> in der Übersichtsliste der Beobachtungen"
 
+#: changedetectionio/forms.py
+msgid "Enable watch \"sharing\""
+msgstr ""
+
 #: changedetectionio/forms.py
 msgid "Relative time format"
 msgstr ""
@@ -3511,14 +3571,6 @@ msgstr ""
 msgid "Navigation sidebar"
 msgstr ""
 
-#: changedetectionio/forms.py
-msgid "Collapsed icon rail (expands on hover)"
-msgstr ""
-
-#: changedetectionio/forms.py
-msgid "Always expanded"
-msgstr ""
-
 #: changedetectionio/forms.py
 msgid "API access token security check enabled"
 msgstr "Sicherheitsüberprüfung des API-Zugriffstokens aktiviert"
@@ -3986,10 +4038,6 @@ msgstr ""
 msgid "Not enough price data points yet to draw a graph - keep monitoring and the price history will appear here."
 msgstr ""
 
-#: changedetectionio/processors/templates/extract.html
-msgid "Screenshot"
-msgstr ""
-
 #: changedetectionio/processors/templates/extract.html
 msgid "This tool will extract text data from all of the watch history."
 msgstr ""
@@ -4072,6 +4120,12 @@ msgstr ""
 msgid "The URL being watched."
 msgstr ""
 
+#: changedetectionio/templates/_common_fields.html
+msgid ""
+"The Open Link Override set on the watch, otherwise the same as watch_url. Use this when the watched URL is an API "
+"endpoint or RSS feed but you want to link to the real page."
+msgstr ""
+
 #: changedetectionio/templates/_common_fields.html
 msgid "The UUID of the watch."
 msgstr "Die UUID der Überwachung."
@@ -4593,18 +4647,18 @@ msgid "Search"
 msgstr "Suchen"
 
 #: changedetectionio/templates/base.html
-#, python-format
-msgid "URL or Title in '%(title)s'"
-msgstr "URL oder Titel in '%(title)s'"
-
-#: changedetectionio/templates/base.html
-msgid "URL or Title"
-msgstr "URL oder Titel"
+msgid "URL, title or error text"
+msgstr "URL, Titel oder Fehlertext"
 
 #: changedetectionio/templates/base.html
 msgid "Enter search term..."
 msgstr "Suchbegriff eingeben..."
 
+#: changedetectionio/templates/base.html
+#, python-format
+msgid "Searching in current group '%(title)s' only"
+msgstr "Suche nur in Gruppe '%(title)s'"
+
 #: changedetectionio/templates/edit/include_llm_intent.html
 msgid ""
 "<strong>On</strong> &ndash; every watch in this group uses the AI settings below, unless it fills in its own. "
@@ -5013,14 +5067,6 @@ msgid ""
 "ALLOW_IANA_RESTRICTED_ADDRESSES=true and restart."
 msgstr ""
 
-#: changedetectionio/widgets/ternary_boolean.py
-msgid "Yes"
-msgstr "Ja"
-
-#: changedetectionio/widgets/ternary_boolean.py
-msgid "No"
-msgstr "Nein"
-
 #: changedetectionio/widgets/ternary_boolean.py
 msgid "Main settings"
 msgstr "Haupteinstellungen"

changedetectionio/translations/en_GB/LC_MESSAGES/messages.po

@@ -57,6 +57,14 @@ msgstr ""
 msgid "Currently:"
 msgstr ""
 
+#: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
+msgid "What do you want to achieve?"
+msgstr ""
+
+#: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
+msgid "Select a browser"
+msgstr ""
+
 #: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
 #, python-format
 msgid "%(browser)s cannot render a live preview, choose a browser below"
@@ -66,10 +74,6 @@ msgstr ""
 msgid "Select by element"
 msgstr ""
 
-#: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
-msgid "Hover & click the preview to watch just one part of the page."
-msgstr ""
-
 #: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html changedetectionio/blueprint/ui/templates/edit.html
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 msgid "Clear selection"
@@ -374,6 +378,18 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: changedetectionio/blueprint/menu_modes.py
+msgid "Expand on hover"
+msgstr ""
+
+#: changedetectionio/blueprint/menu_modes.py
+msgid "Always expanded"
+msgstr ""
+
+#: changedetectionio/blueprint/menu_modes.py
+msgid "Stays minimal"
+msgstr ""
+
 #: changedetectionio/blueprint/rss/single_watch.py
 #, python-format
 msgid "Watch with UUID %(uuid)s not found"
@@ -819,6 +835,16 @@ msgstr ""
 msgid "Enable or Disable Favicons next to the watch list"
 msgstr ""
 
+#: changedetectionio/blueprint/settings/templates/settings.html
+msgid "Disabling this can speed up your page fetches because the favicon does not need to be fetched."
+msgstr ""
+
+#: changedetectionio/blueprint/settings/templates/settings.html
+msgid ""
+"This copies your watch to a temporary hosted database and returns a link to make sharing/copying the watch to other "
+"people"
+msgstr ""
+
 #: changedetectionio/blueprint/settings/templates/settings.html
 msgid "Number of items per page in the watch overview list, 0 to disable."
 msgstr ""
@@ -1436,17 +1462,17 @@ msgstr ""
 msgid "Mute notifications"
 msgstr ""
 
-#: changedetectionio/blueprint/tags/templates/groups-overview.html changedetectionio/blueprint/ui/edit.py
-#: changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html
-msgid "Edit"
-msgstr ""
-
 #: changedetectionio/blueprint/tags/templates/groups-overview.html
 #: changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 msgid "Recheck"
 msgstr ""
 
+#: changedetectionio/blueprint/tags/templates/groups-overview.html changedetectionio/blueprint/ui/edit.py
+#: changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html
+msgid "Edit"
+msgstr ""
+
 #: changedetectionio/blueprint/tags/templates/groups-overview.html
 msgid "Delete Group?"
 msgstr ""
@@ -1761,6 +1787,10 @@ msgctxt "diff version"
 msgid "To"
 msgstr ""
 
+#: changedetectionio/blueprint/ui/templates/diff.html
+msgid "Filters"
+msgstr ""
+
 #: changedetectionio/blueprint/ui/templates/diff.html
 msgid "Words"
 msgstr ""
@@ -1832,9 +1862,8 @@ msgstr ""
 msgid "Text"
 msgstr ""
 
-#: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/blueprint/ui/templates/preview.html
-#: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
-msgid "Current screenshot"
+#: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/processors/templates/extract.html
+msgid "Screenshot"
 msgstr ""
 
 #: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/processors/extract.py
@@ -1941,13 +1970,15 @@ msgid "Automatically uses the page title if found, you can also use your own tit
 msgstr ""
 
 #: changedetectionio/blueprint/ui/templates/edit.html
-msgid "The interval/amount of time between each check."
+msgid "Extra Page Title and Link options"
 msgstr ""
 
 #: changedetectionio/blueprint/ui/templates/edit.html
-msgid ""
-"Sends a notification when the filter can no longer be seen on the page, good for knowing when the page changed and "
-"your filter will not work anymore."
+msgid "Optional - links in the list, history and notifications open this URL instead. Does not change the URL being checked."
+msgstr ""
+
+#: changedetectionio/blueprint/ui/templates/edit.html
+msgid "The interval/amount of time between each check."
 msgstr ""
 
 #: changedetectionio/blueprint/ui/templates/edit.html
@@ -2048,6 +2079,12 @@ msgstr ""
 msgid "Set the fetch method"
 msgstr ""
 
+#: changedetectionio/blueprint/ui/templates/edit.html
+msgid ""
+"Sends a notification when the filter can no longer be seen on the page, good for knowing when the page changed and "
+"your filter will not work anymore."
+msgstr ""
+
 #: changedetectionio/blueprint/ui/templates/edit.html
 msgid "Use the verify (✓) button to test if a condition passes against the current snapshot."
 msgstr ""
@@ -2199,6 +2236,14 @@ msgstr ""
 msgid "Server type reply"
 msgstr ""
 
+#: changedetectionio/blueprint/ui/templates/edit.html changedetectionio/widgets/ternary_boolean.py
+msgid "Yes"
+msgstr ""
+
+#: changedetectionio/blueprint/ui/templates/edit.html changedetectionio/widgets/ternary_boolean.py
+msgid "No"
+msgstr ""
+
 #: changedetectionio/blueprint/ui/templates/edit.html
 msgid "AI tokens (last check)"
 msgstr ""
@@ -2251,6 +2296,11 @@ msgstr ""
 msgid "Select timestamp"
 msgstr ""
 
+#: changedetectionio/blueprint/ui/templates/preview.html
+#: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
+msgid "Current screenshot"
+msgstr ""
+
 #: changedetectionio/blueprint/ui/templates/preview.html
 msgid "Current erroring screenshot from most recent request"
 msgstr ""
@@ -2514,16 +2564,18 @@ msgstr ""
 msgid "Currently high"
 msgstr ""
 
+#. {pct} is a percentage including the % sign, e.g. "80%"
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 #: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
-#, python-format
-msgid "cheaper than %s% of tracked prices"
+#, python-brace-format
+msgid "cheaper than {pct} of tracked prices"
 msgstr ""
 
+#. {pct} is a percentage including the % sign, e.g. "80%"
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 #: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
-#, python-format
-msgid "more expensive than %s% of tracked prices"
+#, python-brace-format
+msgid "more expensive than {pct} of tracked prices"
 msgstr ""
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
@@ -2540,21 +2592,6 @@ msgstr ""
 msgid "Web page URL"
 msgstr ""
 
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
-#, python-format
-msgid "All %(page)s on this page are selected."
-msgstr ""
-
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
-#, python-format
-msgid "Select all %(total)s matching"
-msgstr ""
-
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
-#, python-format
-msgid "All %(total)s matching are selected."
-msgstr ""
-
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 #, python-format
 msgid "%(count)s records selected"
@@ -2609,6 +2646,10 @@ msgstr ""
 msgid "RSS Feed"
 msgstr ""
 
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html changedetectionio/templates/base.html
+msgid "Close"
+msgstr ""
+
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 msgid "Invert"
 msgstr ""
@@ -2682,8 +2723,19 @@ msgstr ""
 msgid "<p><strong>Are you sure you want to delete the selected watches?</strong></p><p>This action cannot be undone.</p>"
 msgstr ""
 
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html changedetectionio/templates/base.html
-msgid "Close"
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
+#, python-format
+msgid "All %(page)s on this page are selected."
+msgstr ""
+
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
+#, python-format
+msgid "Select all %(total)s matching"
+msgstr ""
+
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
+#, python-format
+msgid "All %(total)s matching are selected."
 msgstr ""
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
@@ -3180,6 +3232,10 @@ msgstr ""
 msgid "Web Page URL"
 msgstr ""
 
+#: changedetectionio/forms.py
+msgid "Open Link Override"
+msgstr ""
+
 #: changedetectionio/forms.py
 msgid "Group Tag"
 msgstr ""
@@ -3437,6 +3493,10 @@ msgstr ""
 msgid "Use page <title> in watch overview list"
 msgstr ""
 
+#: changedetectionio/forms.py
+msgid "Enable watch \"sharing\""
+msgstr ""
+
 #: changedetectionio/forms.py
 msgid "Relative time format"
 msgstr ""
@@ -3453,14 +3513,6 @@ msgstr ""
 msgid "Navigation sidebar"
 msgstr ""
 
-#: changedetectionio/forms.py
-msgid "Collapsed icon rail (expands on hover)"
-msgstr ""
-
-#: changedetectionio/forms.py
-msgid "Always expanded"
-msgstr ""
-
 #: changedetectionio/forms.py
 msgid "API access token security check enabled"
 msgstr ""
@@ -3926,10 +3978,6 @@ msgstr ""
 msgid "Not enough price data points yet to draw a graph - keep monitoring and the price history will appear here."
 msgstr ""
 
-#: changedetectionio/processors/templates/extract.html
-msgid "Screenshot"
-msgstr ""
-
 #: changedetectionio/processors/templates/extract.html
 msgid "This tool will extract text data from all of the watch history."
 msgstr ""
@@ -4012,6 +4060,12 @@ msgstr ""
 msgid "The URL being watched."
 msgstr ""
 
+#: changedetectionio/templates/_common_fields.html
+msgid ""
+"The Open Link Override set on the watch, otherwise the same as watch_url. Use this when the watched URL is an API "
+"endpoint or RSS feed but you want to link to the real page."
+msgstr ""
+
 #: changedetectionio/templates/_common_fields.html
 msgid "The UUID of the watch."
 msgstr ""
@@ -4531,18 +4585,18 @@ msgid "Search"
 msgstr ""
 
 #: changedetectionio/templates/base.html
-#, python-format
-msgid "URL or Title in '%(title)s'"
-msgstr ""
-
-#: changedetectionio/templates/base.html
-msgid "URL or Title"
-msgstr ""
+msgid "URL, title or error text"
+msgstr "URL, title or error text"
 
 #: changedetectionio/templates/base.html
 msgid "Enter search term..."
 msgstr ""
 
+#: changedetectionio/templates/base.html
+#, python-format
+msgid "Searching in current group '%(title)s' only"
+msgstr "Searching in current group '%(title)s' only"
+
 #: changedetectionio/templates/edit/include_llm_intent.html
 msgid ""
 "<strong>On</strong> &ndash; every watch in this group uses the AI settings below, unless it fills in its own. "
@@ -4951,14 +5005,6 @@ msgid ""
 "ALLOW_IANA_RESTRICTED_ADDRESSES=true and restart."
 msgstr ""
 
-#: changedetectionio/widgets/ternary_boolean.py
-msgid "Yes"
-msgstr ""
-
-#: changedetectionio/widgets/ternary_boolean.py
-msgid "No"
-msgstr ""
-
 #: changedetectionio/widgets/ternary_boolean.py
 msgid "Main settings"
 msgstr ""

changedetectionio/translations/en_US/LC_MESSAGES/messages.po

@@ -57,6 +57,14 @@ msgstr ""
 msgid "Currently:"
 msgstr ""
 
+#: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
+msgid "What do you want to achieve?"
+msgstr ""
+
+#: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
+msgid "Select a browser"
+msgstr ""
+
 #: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
 #, python-format
 msgid "%(browser)s cannot render a live preview, choose a browser below"
@@ -66,10 +74,6 @@ msgstr ""
 msgid "Select by element"
 msgstr ""
 
-#: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
-msgid "Hover & click the preview to watch just one part of the page."
-msgstr ""
-
 #: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html changedetectionio/blueprint/ui/templates/edit.html
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 msgid "Clear selection"
@@ -374,6 +378,18 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: changedetectionio/blueprint/menu_modes.py
+msgid "Expand on hover"
+msgstr ""
+
+#: changedetectionio/blueprint/menu_modes.py
+msgid "Always expanded"
+msgstr ""
+
+#: changedetectionio/blueprint/menu_modes.py
+msgid "Stays minimal"
+msgstr ""
+
 #: changedetectionio/blueprint/rss/single_watch.py
 #, python-format
 msgid "Watch with UUID %(uuid)s not found"
@@ -819,6 +835,16 @@ msgstr ""
 msgid "Enable or Disable Favicons next to the watch list"
 msgstr ""
 
+#: changedetectionio/blueprint/settings/templates/settings.html
+msgid "Disabling this can speed up your page fetches because the favicon does not need to be fetched."
+msgstr ""
+
+#: changedetectionio/blueprint/settings/templates/settings.html
+msgid ""
+"This copies your watch to a temporary hosted database and returns a link to make sharing/copying the watch to other "
+"people"
+msgstr ""
+
 #: changedetectionio/blueprint/settings/templates/settings.html
 msgid "Number of items per page in the watch overview list, 0 to disable."
 msgstr ""
@@ -1436,17 +1462,17 @@ msgstr "No website organizational tags/groups configured"
 msgid "Mute notifications"
 msgstr ""
 
-#: changedetectionio/blueprint/tags/templates/groups-overview.html changedetectionio/blueprint/ui/edit.py
-#: changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html
-msgid "Edit"
-msgstr ""
-
 #: changedetectionio/blueprint/tags/templates/groups-overview.html
 #: changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 msgid "Recheck"
 msgstr ""
 
+#: changedetectionio/blueprint/tags/templates/groups-overview.html changedetectionio/blueprint/ui/edit.py
+#: changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html
+msgid "Edit"
+msgstr ""
+
 #: changedetectionio/blueprint/tags/templates/groups-overview.html
 msgid "Delete Group?"
 msgstr ""
@@ -1761,6 +1787,10 @@ msgctxt "diff version"
 msgid "To"
 msgstr ""
 
+#: changedetectionio/blueprint/ui/templates/diff.html
+msgid "Filters"
+msgstr ""
+
 #: changedetectionio/blueprint/ui/templates/diff.html
 msgid "Words"
 msgstr ""
@@ -1832,9 +1862,8 @@ msgstr ""
 msgid "Text"
 msgstr ""
 
-#: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/blueprint/ui/templates/preview.html
-#: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
-msgid "Current screenshot"
+#: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/processors/templates/extract.html
+msgid "Screenshot"
 msgstr ""
 
 #: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/processors/extract.py
@@ -1941,13 +1970,15 @@ msgid "Automatically uses the page title if found, you can also use your own tit
 msgstr ""
 
 #: changedetectionio/blueprint/ui/templates/edit.html
-msgid "The interval/amount of time between each check."
+msgid "Extra Page Title and Link options"
 msgstr ""
 
 #: changedetectionio/blueprint/ui/templates/edit.html
-msgid ""
-"Sends a notification when the filter can no longer be seen on the page, good for knowing when the page changed and "
-"your filter will not work anymore."
+msgid "Optional - links in the list, history and notifications open this URL instead. Does not change the URL being checked."
+msgstr ""
+
+#: changedetectionio/blueprint/ui/templates/edit.html
+msgid "The interval/amount of time between each check."
 msgstr ""
 
 #: changedetectionio/blueprint/ui/templates/edit.html
@@ -2048,6 +2079,12 @@ msgstr ""
 msgid "Set the fetch method"
 msgstr ""
 
+#: changedetectionio/blueprint/ui/templates/edit.html
+msgid ""
+"Sends a notification when the filter can no longer be seen on the page, good for knowing when the page changed and "
+"your filter will not work anymore."
+msgstr ""
+
 #: changedetectionio/blueprint/ui/templates/edit.html
 msgid "Use the verify (✓) button to test if a condition passes against the current snapshot."
 msgstr ""
@@ -2199,6 +2236,14 @@ msgstr ""
 msgid "Server type reply"
 msgstr ""
 
+#: changedetectionio/blueprint/ui/templates/edit.html changedetectionio/widgets/ternary_boolean.py
+msgid "Yes"
+msgstr ""
+
+#: changedetectionio/blueprint/ui/templates/edit.html changedetectionio/widgets/ternary_boolean.py
+msgid "No"
+msgstr ""
+
 #: changedetectionio/blueprint/ui/templates/edit.html
 msgid "AI tokens (last check)"
 msgstr ""
@@ -2251,6 +2296,11 @@ msgstr ""
 msgid "Select timestamp"
 msgstr ""
 
+#: changedetectionio/blueprint/ui/templates/preview.html
+#: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
+msgid "Current screenshot"
+msgstr ""
+
 #: changedetectionio/blueprint/ui/templates/preview.html
 msgid "Current erroring screenshot from most recent request"
 msgstr ""
@@ -2514,16 +2564,18 @@ msgstr ""
 msgid "Currently high"
 msgstr ""
 
+#. {pct} is a percentage including the % sign, e.g. "80%"
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 #: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
-#, python-format
-msgid "cheaper than %s% of tracked prices"
+#, python-brace-format
+msgid "cheaper than {pct} of tracked prices"
 msgstr ""
 
+#. {pct} is a percentage including the % sign, e.g. "80%"
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 #: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
-#, python-format
-msgid "more expensive than %s% of tracked prices"
+#, python-brace-format
+msgid "more expensive than {pct} of tracked prices"
 msgstr ""
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
@@ -2540,21 +2592,6 @@ msgstr ""
 msgid "Web page URL"
 msgstr ""
 
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
-#, python-format
-msgid "All %(page)s on this page are selected."
-msgstr ""
-
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
-#, python-format
-msgid "Select all %(total)s matching"
-msgstr ""
-
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
-#, python-format
-msgid "All %(total)s matching are selected."
-msgstr ""
-
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 #, python-format
 msgid "%(count)s records selected"
@@ -2609,6 +2646,10 @@ msgstr ""
 msgid "RSS Feed"
 msgstr ""
 
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html changedetectionio/templates/base.html
+msgid "Close"
+msgstr ""
+
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 msgid "Invert"
 msgstr ""
@@ -2682,8 +2723,19 @@ msgstr ""
 msgid "<p><strong>Are you sure you want to delete the selected watches?</strong></p><p>This action cannot be undone.</p>"
 msgstr ""
 
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html changedetectionio/templates/base.html
-msgid "Close"
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
+#, python-format
+msgid "All %(page)s on this page are selected."
+msgstr ""
+
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
+#, python-format
+msgid "Select all %(total)s matching"
+msgstr ""
+
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
+#, python-format
+msgid "All %(total)s matching are selected."
 msgstr ""
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
@@ -3180,6 +3232,10 @@ msgstr ""
 msgid "Web Page URL"
 msgstr ""
 
+#: changedetectionio/forms.py
+msgid "Open Link Override"
+msgstr ""
+
 #: changedetectionio/forms.py
 msgid "Group Tag"
 msgstr ""
@@ -3437,6 +3493,10 @@ msgstr ""
 msgid "Use page <title> in watch overview list"
 msgstr ""
 
+#: changedetectionio/forms.py
+msgid "Enable watch \"sharing\""
+msgstr ""
+
 #: changedetectionio/forms.py
 msgid "Relative time format"
 msgstr ""
@@ -3453,14 +3513,6 @@ msgstr ""
 msgid "Navigation sidebar"
 msgstr ""
 
-#: changedetectionio/forms.py
-msgid "Collapsed icon rail (expands on hover)"
-msgstr ""
-
-#: changedetectionio/forms.py
-msgid "Always expanded"
-msgstr ""
-
 #: changedetectionio/forms.py
 msgid "API access token security check enabled"
 msgstr ""
@@ -3926,10 +3978,6 @@ msgstr ""
 msgid "Not enough price data points yet to draw a graph - keep monitoring and the price history will appear here."
 msgstr ""
 
-#: changedetectionio/processors/templates/extract.html
-msgid "Screenshot"
-msgstr ""
-
 #: changedetectionio/processors/templates/extract.html
 msgid "This tool will extract text data from all of the watch history."
 msgstr ""
@@ -4012,6 +4060,12 @@ msgstr ""
 msgid "The URL being watched."
 msgstr ""
 
+#: changedetectionio/templates/_common_fields.html
+msgid ""
+"The Open Link Override set on the watch, otherwise the same as watch_url. Use this when the watched URL is an API "
+"endpoint or RSS feed but you want to link to the real page."
+msgstr ""
+
 #: changedetectionio/templates/_common_fields.html
 msgid "The UUID of the watch."
 msgstr ""
@@ -4531,18 +4585,18 @@ msgid "Search"
 msgstr ""
 
 #: changedetectionio/templates/base.html
-#, python-format
-msgid "URL or Title in '%(title)s'"
-msgstr ""
-
-#: changedetectionio/templates/base.html
-msgid "URL or Title"
-msgstr ""
+msgid "URL, title or error text"
+msgstr "URL, title or error text"
 
 #: changedetectionio/templates/base.html
 msgid "Enter search term..."
 msgstr ""
 
+#: changedetectionio/templates/base.html
+#, python-format
+msgid "Searching in current group '%(title)s' only"
+msgstr "Searching in current group '%(title)s' only"
+
 #: changedetectionio/templates/edit/include_llm_intent.html
 msgid ""
 "<strong>On</strong> &ndash; every watch in this group uses the AI settings below, unless it fills in its own. "
@@ -4951,14 +5005,6 @@ msgid ""
 "ALLOW_IANA_RESTRICTED_ADDRESSES=true and restart."
 msgstr ""
 
-#: changedetectionio/widgets/ternary_boolean.py
-msgid "Yes"
-msgstr ""
-
-#: changedetectionio/widgets/ternary_boolean.py
-msgid "No"
-msgstr ""
-
 #: changedetectionio/widgets/ternary_boolean.py
 msgid "Main settings"
 msgstr ""

changedetectionio/translations/es/LC_MESSAGES/messages.po

@@ -53,6 +53,14 @@ msgstr ""
 msgid "Currently:"
 msgstr "Actualmente:"
 
+#: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
+msgid "What do you want to achieve?"
+msgstr ""
+
+#: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
+msgid "Select a browser"
+msgstr ""
+
 #: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
 #, python-format
 msgid "%(browser)s cannot render a live preview, choose a browser below"
@@ -62,10 +70,6 @@ msgstr ""
 msgid "Select by element"
 msgstr "Seleccionar por elemento"
 
-#: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
-msgid "Hover & click the preview to watch just one part of the page."
-msgstr ""
-
 #: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html changedetectionio/blueprint/ui/templates/edit.html
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 msgid "Clear selection"
@@ -380,6 +384,18 @@ msgstr "Tiempo de revisión (minutos)"
 msgid "Import"
 msgstr "Importar"
 
+#: changedetectionio/blueprint/menu_modes.py
+msgid "Expand on hover"
+msgstr ""
+
+#: changedetectionio/blueprint/menu_modes.py
+msgid "Always expanded"
+msgstr ""
+
+#: changedetectionio/blueprint/menu_modes.py
+msgid "Stays minimal"
+msgstr ""
+
 #: changedetectionio/blueprint/rss/single_watch.py
 #, python-format
 msgid "Watch with UUID %(uuid)s not found"
@@ -855,6 +871,16 @@ msgstr "Actualizaciones de UI en tiempo real habilitadas: (es necesario reinicia
 msgid "Enable or Disable Favicons next to the watch list"
 msgstr "Habilitar o deshabilitar favicons junto a la lista de monitores"
 
+#: changedetectionio/blueprint/settings/templates/settings.html
+msgid "Disabling this can speed up your page fetches because the favicon does not need to be fetched."
+msgstr ""
+
+#: changedetectionio/blueprint/settings/templates/settings.html
+msgid ""
+"This copies your watch to a temporary hosted database and returns a link to make sharing/copying the watch to other "
+"people"
+msgstr ""
+
 #: changedetectionio/blueprint/settings/templates/settings.html
 msgid "Number of items per page in the watch overview list, 0 to disable."
 msgstr "Número de elementos por página en la lista general de monitores, 0 para desactivar."
@@ -1479,17 +1505,17 @@ msgstr "No hay etiquetas/grupos organizativos del sitio web configurados"
 msgid "Mute notifications"
 msgstr "Silenciar notificaciones"
 
-#: changedetectionio/blueprint/tags/templates/groups-overview.html changedetectionio/blueprint/ui/edit.py
-#: changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html
-msgid "Edit"
-msgstr "Editar"
-
 #: changedetectionio/blueprint/tags/templates/groups-overview.html
 #: changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 msgid "Recheck"
 msgstr "Vuelva a comprobar"
 
+#: changedetectionio/blueprint/tags/templates/groups-overview.html changedetectionio/blueprint/ui/edit.py
+#: changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html
+msgid "Edit"
+msgstr "Editar"
+
 #: changedetectionio/blueprint/tags/templates/groups-overview.html
 msgid "Delete Group?"
 msgstr "¿Eliminar grupo?"
@@ -1810,6 +1836,10 @@ msgctxt "diff version"
 msgid "To"
 msgstr "A"
 
+#: changedetectionio/blueprint/ui/templates/diff.html
+msgid "Filters"
+msgstr "Filtros"
+
 #: changedetectionio/blueprint/ui/templates/diff.html
 msgid "Words"
 msgstr "Palabras"
@@ -1881,10 +1911,9 @@ msgstr "Captura de pantalla de error"
 msgid "Text"
 msgstr "Texto"
 
-#: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/blueprint/ui/templates/preview.html
-#: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
-msgid "Current screenshot"
-msgstr "Captura de pantalla actual"
+#: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/processors/templates/extract.html
+msgid "Screenshot"
+msgstr "Captura de pantalla"
 
 #: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/processors/extract.py
 #: changedetectionio/processors/templates/extract.html
@@ -1992,16 +2021,16 @@ msgid "Automatically uses the page title if found, you can also use your own tit
 msgstr "Utiliza automáticamente el título de la página si la encuentra, también puede usar su propio título/descripción aquí"
 
 #: changedetectionio/blueprint/ui/templates/edit.html
-msgid "The interval/amount of time between each check."
-msgstr "El intervalo/cantidad de tiempo entre cada verificación."
+msgid "Extra Page Title and Link options"
+msgstr ""
 
 #: changedetectionio/blueprint/ui/templates/edit.html
-msgid ""
-"Sends a notification when the filter can no longer be seen on the page, good for knowing when the page changed and "
-"your filter will not work anymore."
+msgid "Optional - links in the list, history and notifications open this URL instead. Does not change the URL being checked."
 msgstr ""
-"Envía una notificación cuando el filtro ya no se puede ver en la página, lo cual es bueno para saber cuándo cambió la"
-" página y su filtro ya no funcionará."
+
+#: changedetectionio/blueprint/ui/templates/edit.html
+msgid "The interval/amount of time between each check."
+msgstr "El intervalo/cantidad de tiempo entre cada verificación."
 
 #: changedetectionio/blueprint/ui/templates/edit.html
 msgid "Set to empty to use system settings default"
@@ -2103,6 +2132,14 @@ msgstr "Necesitas"
 msgid "Set the fetch method"
 msgstr "Establecer el método de recuperación"
 
+#: changedetectionio/blueprint/ui/templates/edit.html
+msgid ""
+"Sends a notification when the filter can no longer be seen on the page, good for knowing when the page changed and "
+"your filter will not work anymore."
+msgstr ""
+"Envía una notificación cuando el filtro ya no se puede ver en la página, lo cual es bueno para saber cuándo cambió la"
+" página y su filtro ya no funcionará."
+
 #: changedetectionio/blueprint/ui/templates/edit.html
 msgid "Use the verify (✓) button to test if a condition passes against the current snapshot."
 msgstr "Utilice el botón de verificación ( ✓ ) para probar si una condición se cumple con la instantánea actual."
@@ -2264,6 +2301,14 @@ msgstr "Recuento de alertas de notificación"
 msgid "Server type reply"
 msgstr "Respuesta de tipo de servidor"
 
+#: changedetectionio/blueprint/ui/templates/edit.html changedetectionio/widgets/ternary_boolean.py
+msgid "Yes"
+msgstr "Sí"
+
+#: changedetectionio/blueprint/ui/templates/edit.html changedetectionio/widgets/ternary_boolean.py
+msgid "No"
+msgstr "No"
+
 #: changedetectionio/blueprint/ui/templates/edit.html
 msgid "AI tokens (last check)"
 msgstr ""
@@ -2316,6 +2361,11 @@ msgstr "Clonar y editar"
 msgid "Select timestamp"
 msgstr "Seleccionar marca de tiempo"
 
+#: changedetectionio/blueprint/ui/templates/preview.html
+#: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
+msgid "Current screenshot"
+msgstr "Captura de pantalla actual"
+
 #: changedetectionio/blueprint/ui/templates/preview.html
 msgid "Current erroring screenshot from most recent request"
 msgstr "Captura de pantalla con error actual de la solicitud más reciente"
@@ -2581,16 +2631,18 @@ msgstr ""
 msgid "Currently high"
 msgstr ""
 
+#. {pct} is a percentage including the % sign, e.g. "80%"
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 #: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
-#, python-format
-msgid "cheaper than %s% of tracked prices"
+#, python-brace-format
+msgid "cheaper than {pct} of tracked prices"
 msgstr ""
 
+#. {pct} is a percentage including the % sign, e.g. "80%"
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 #: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
-#, python-format
-msgid "more expensive than %s% of tracked prices"
+#, python-brace-format
+msgid "more expensive than {pct} of tracked prices"
 msgstr ""
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
@@ -2607,21 +2659,6 @@ msgstr ""
 msgid "Web page URL"
 msgstr ""
 
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
-#, python-format
-msgid "All %(page)s on this page are selected."
-msgstr ""
-
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
-#, python-format
-msgid "Select all %(total)s matching"
-msgstr ""
-
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
-#, python-format
-msgid "All %(total)s matching are selected."
-msgstr ""
-
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 #, python-format
 msgid "%(count)s records selected"
@@ -2676,6 +2713,10 @@ msgstr "en '%(title)s'"
 msgid "RSS Feed"
 msgstr ""
 
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html changedetectionio/templates/base.html
+msgid "Close"
+msgstr ""
+
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 msgid "Invert"
 msgstr ""
@@ -2753,8 +2794,19 @@ msgstr ""
 "<p><strong>¿Está seguro de que desea eliminar los monitores seleccionados?</strong></p><p>Esta acción no se puede "
 "deshacer.</p>"
 
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html changedetectionio/templates/base.html
-msgid "Close"
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
+#, python-format
+msgid "All %(page)s on this page are selected."
+msgstr ""
+
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
+#, python-format
+msgid "Select all %(total)s matching"
+msgstr ""
+
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
+#, python-format
+msgid "All %(total)s matching are selected."
 msgstr ""
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
@@ -3253,6 +3305,10 @@ msgstr ""
 msgid "Web Page URL"
 msgstr ""
 
+#: changedetectionio/forms.py
+msgid "Open Link Override"
+msgstr ""
+
 #: changedetectionio/forms.py
 msgid "Group Tag"
 msgstr ""
@@ -3510,6 +3566,10 @@ msgstr "Favicones habilitados"
 msgid "Use page <title> in watch overview list"
 msgstr "Usar <title> de la página en la lista general de monitores"
 
+#: changedetectionio/forms.py
+msgid "Enable watch \"sharing\""
+msgstr ""
+
 #: changedetectionio/forms.py
 msgid "Relative time format"
 msgstr ""
@@ -3526,14 +3586,6 @@ msgstr ""
 msgid "Navigation sidebar"
 msgstr ""
 
-#: changedetectionio/forms.py
-msgid "Collapsed icon rail (expands on hover)"
-msgstr ""
-
-#: changedetectionio/forms.py
-msgid "Always expanded"
-msgstr ""
-
 #: changedetectionio/forms.py
 msgid "API access token security check enabled"
 msgstr "Comprobación de seguridad del token de acceso API habilitada"
@@ -3999,10 +4051,6 @@ msgstr ""
 msgid "Not enough price data points yet to draw a graph - keep monitoring and the price history will appear here."
 msgstr ""
 
-#: changedetectionio/processors/templates/extract.html
-msgid "Screenshot"
-msgstr ""
-
 #: changedetectionio/processors/templates/extract.html
 msgid "This tool will extract text data from all of the watch history."
 msgstr ""
@@ -4085,6 +4133,12 @@ msgstr "La URL de la instancia de changetection.io que está ejecutando."
 msgid "The URL being watched."
 msgstr "La URL que se está viendo."
 
+#: changedetectionio/templates/_common_fields.html
+msgid ""
+"The Open Link Override set on the watch, otherwise the same as watch_url. Use this when the watched URL is an API "
+"endpoint or RSS feed but you want to link to the real page."
+msgstr ""
+
 #: changedetectionio/templates/_common_fields.html
 msgid "The UUID of the watch."
 msgstr "El UUID del monitor."
@@ -4608,18 +4662,18 @@ msgid "Search"
 msgstr "Buscar"
 
 #: changedetectionio/templates/base.html
-#, python-format
-msgid "URL or Title in '%(title)s'"
-msgstr "URL o título en '%(title)s'"
-
-#: changedetectionio/templates/base.html
-msgid "URL or Title"
-msgstr "URL o título"
+msgid "URL, title or error text"
+msgstr "URL, título o texto de error"
 
 #: changedetectionio/templates/base.html
 msgid "Enter search term..."
 msgstr "Introduzca el término de búsqueda..."
 
+#: changedetectionio/templates/base.html
+#, python-format
+msgid "Searching in current group '%(title)s' only"
+msgstr "Buscando solo en el grupo '%(title)s'"
+
 #: changedetectionio/templates/edit/include_llm_intent.html
 msgid ""
 "<strong>On</strong> &ndash; every watch in this group uses the AI settings below, unless it fills in its own. "
@@ -5037,14 +5091,6 @@ msgid ""
 "ALLOW_IANA_RESTRICTED_ADDRESSES=true and restart."
 msgstr ""
 
-#: changedetectionio/widgets/ternary_boolean.py
-msgid "Yes"
-msgstr "Sí"
-
-#: changedetectionio/widgets/ternary_boolean.py
-msgid "No"
-msgstr "No"
-
 #: changedetectionio/widgets/ternary_boolean.py
 msgid "Main settings"
 msgstr "Configuraciones principales"

changedetectionio/translations/fr/LC_MESSAGES/messages.po

@@ -57,6 +57,14 @@ msgstr ""
 msgid "Currently:"
 msgstr "Actuellement:"
 
+#: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
+msgid "What do you want to achieve?"
+msgstr ""
+
+#: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
+msgid "Select a browser"
+msgstr ""
+
 #: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
 #, python-format
 msgid "%(browser)s cannot render a live preview, choose a browser below"
@@ -66,10 +74,6 @@ msgstr ""
 msgid "Select by element"
 msgstr "Sélectionner par élément"
 
-#: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html
-msgid "Hover & click the preview to watch just one part of the page."
-msgstr ""
-
 #: changedetectionio/blueprint/add_watch_ui/templates/add-watch-ui.html changedetectionio/blueprint/ui/templates/edit.html
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 msgid "Clear selection"
@@ -378,6 +382,18 @@ msgstr "Temps de revérification (minutes)"
 msgid "Import"
 msgstr "IMPORTER"
 
+#: changedetectionio/blueprint/menu_modes.py
+msgid "Expand on hover"
+msgstr ""
+
+#: changedetectionio/blueprint/menu_modes.py
+msgid "Always expanded"
+msgstr ""
+
+#: changedetectionio/blueprint/menu_modes.py
+msgid "Stays minimal"
+msgstr ""
+
 #: changedetectionio/blueprint/rss/single_watch.py
 #, python-format
 msgid "Watch with UUID %(uuid)s not found"
@@ -825,6 +841,16 @@ msgstr ""
 msgid "Enable or Disable Favicons next to the watch list"
 msgstr ""
 
+#: changedetectionio/blueprint/settings/templates/settings.html
+msgid "Disabling this can speed up your page fetches because the favicon does not need to be fetched."
+msgstr ""
+
+#: changedetectionio/blueprint/settings/templates/settings.html
+msgid ""
+"This copies your watch to a temporary hosted database and returns a link to make sharing/copying the watch to other "
+"people"
+msgstr ""
+
 #: changedetectionio/blueprint/settings/templates/settings.html
 msgid "Number of items per page in the watch overview list, 0 to disable."
 msgstr ""
@@ -1445,17 +1471,17 @@ msgstr "Aucun groupe/étiquette configuré"
 msgid "Mute notifications"
 msgstr "Désactiver les notifications"
 
-#: changedetectionio/blueprint/tags/templates/groups-overview.html changedetectionio/blueprint/ui/edit.py
-#: changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html
-msgid "Edit"
-msgstr "Modifier"
-
 #: changedetectionio/blueprint/tags/templates/groups-overview.html
 #: changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 msgid "Recheck"
 msgstr "Revérifier"
 
+#: changedetectionio/blueprint/tags/templates/groups-overview.html changedetectionio/blueprint/ui/edit.py
+#: changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html
+msgid "Edit"
+msgstr "Modifier"
+
 #: changedetectionio/blueprint/tags/templates/groups-overview.html
 msgid "Delete Group?"
 msgstr "Supprimer le groupe ?"
@@ -1770,6 +1796,10 @@ msgctxt "diff version"
 msgid "To"
 msgstr "À"
 
+#: changedetectionio/blueprint/ui/templates/diff.html
+msgid "Filters"
+msgstr "Filtres"
+
 #: changedetectionio/blueprint/ui/templates/diff.html
 msgid "Words"
 msgstr "Mots"
@@ -1812,7 +1842,7 @@ msgstr "Clavier:"
 
 #: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/blueprint/ui/templates/preview.html
 msgid "Previous"
-msgstr "Aperçu"
+msgstr "Précédent"
 
 #: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/blueprint/ui/templates/preview.html
 msgid "Next"
@@ -1841,10 +1871,9 @@ msgstr "Capture d'écran d'erreur"
 msgid "Text"
 msgstr "Texte"
 
-#: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/blueprint/ui/templates/preview.html
-#: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
-msgid "Current screenshot"
-msgstr "Capture d'écran actuelle"
+#: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/processors/templates/extract.html
+msgid "Screenshot"
+msgstr "Capture d'écran"
 
 #: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/processors/extract.py
 #: changedetectionio/processors/templates/extract.html
@@ -1952,15 +1981,17 @@ msgid "Automatically uses the page title if found, you can also use your own tit
 msgstr ""
 
 #: changedetectionio/blueprint/ui/templates/edit.html
-msgid "The interval/amount of time between each check."
-msgstr "L'intervalle/la durée entre chaque vérification."
+msgid "Extra Page Title and Link options"
+msgstr ""
 
 #: changedetectionio/blueprint/ui/templates/edit.html
-msgid ""
-"Sends a notification when the filter can no longer be seen on the page, good for knowing when the page changed and "
-"your filter will not work anymore."
+msgid "Optional - links in the list, history and notifications open this URL instead. Does not change the URL being checked."
 msgstr ""
 
+#: changedetectionio/blueprint/ui/templates/edit.html
+msgid "The interval/amount of time between each check."
+msgstr "L'intervalle/la durée entre chaque vérification."
+
 #: changedetectionio/blueprint/ui/templates/edit.html
 msgid "Set to empty to use system settings default"
 msgstr ""
@@ -2059,6 +2090,12 @@ msgstr "Vous devez"
 msgid "Set the fetch method"
 msgstr "Définir la méthode de récupération"
 
+#: changedetectionio/blueprint/ui/templates/edit.html
+msgid ""
+"Sends a notification when the filter can no longer be seen on the page, good for knowing when the page changed and "
+"your filter will not work anymore."
+msgstr ""
+
 #: changedetectionio/blueprint/ui/templates/edit.html
 msgid "Use the verify (✓) button to test if a condition passes against the current snapshot."
 msgstr ""
@@ -2210,6 +2247,14 @@ msgstr "Nombre d'alertes de notification"
 msgid "Server type reply"
 msgstr "Réponse du type de serveur"
 
+#: changedetectionio/blueprint/ui/templates/edit.html changedetectionio/widgets/ternary_boolean.py
+msgid "Yes"
+msgstr "Oui"
+
+#: changedetectionio/blueprint/ui/templates/edit.html changedetectionio/widgets/ternary_boolean.py
+msgid "No"
+msgstr "Non"
+
 #: changedetectionio/blueprint/ui/templates/edit.html
 msgid "AI tokens (last check)"
 msgstr ""
@@ -2262,6 +2307,11 @@ msgstr "Cloner et modifier"
 msgid "Select timestamp"
 msgstr "Sélectionnez l'horodatage"
 
+#: changedetectionio/blueprint/ui/templates/preview.html
+#: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
+msgid "Current screenshot"
+msgstr "Capture d'écran actuelle"
+
 #: changedetectionio/blueprint/ui/templates/preview.html
 msgid "Current erroring screenshot from most recent request"
 msgstr "Capture d'écran erronée actuelle de la demande la plus récente"
@@ -2525,16 +2575,18 @@ msgstr ""
 msgid "Currently high"
 msgstr ""
 
+#. {pct} is a percentage including the % sign, e.g. "80%"
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 #: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
-#, python-format
-msgid "cheaper than %s% of tracked prices"
+#, python-brace-format
+msgid "cheaper than {pct} of tracked prices"
 msgstr ""
 
+#. {pct} is a percentage including the % sign, e.g. "80%"
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 #: changedetectionio/processors/restock_diff/templates/restock_diff/difference.html
-#, python-format
-msgid "more expensive than %s% of tracked prices"
+#, python-brace-format
+msgid "more expensive than {pct} of tracked prices"
 msgstr ""
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
@@ -2551,21 +2603,6 @@ msgstr ""
 msgid "Web page URL"
 msgstr ""
 
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
-#, python-format
-msgid "All %(page)s on this page are selected."
-msgstr ""
-
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
-#, python-format
-msgid "Select all %(total)s matching"
-msgstr ""
-
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
-#, python-format
-msgid "All %(total)s matching are selected."
-msgstr ""
-
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 #, python-format
 msgid "%(count)s records selected"
@@ -2620,6 +2657,10 @@ msgstr "dans '%(title)s'"
 msgid "RSS Feed"
 msgstr ""
 
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html changedetectionio/templates/base.html
+msgid "Close"
+msgstr ""
+
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
 msgid "Invert"
 msgstr ""
@@ -2693,8 +2734,19 @@ msgstr "Supprimer les montres ?"
 msgid "<p><strong>Are you sure you want to delete the selected watches?</strong></p><p>This action cannot be undone.</p>"
 msgstr ""
 
-#: changedetectionio/blueprint/watchlist/templates/watch-overview.html changedetectionio/templates/base.html
-msgid "Close"
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
+#, python-format
+msgid "All %(page)s on this page are selected."
+msgstr ""
+
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
+#, python-format
+msgid "Select all %(total)s matching"
+msgstr ""
+
+#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
+#, python-format
+msgid "All %(total)s matching are selected."
 msgstr ""
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html
@@ -3193,6 +3245,10 @@ msgstr ""
 msgid "Web Page URL"
 msgstr ""
 
+#: changedetectionio/forms.py
+msgid "Open Link Override"
+msgstr ""
+
 #: changedetectionio/forms.py
 msgid "Group Tag"
 msgstr ""
@@ -3450,6 +3506,10 @@ msgstr "Favicons Activés"
 msgid "Use page <title> in watch overview list"
 msgstr "Utiliser la page <title> dans la liste de présentation des moniteurs"
 
+#: changedetectionio/forms.py
+msgid "Enable watch \"sharing\""
+msgstr ""
+
 #: changedetectionio/forms.py
 msgid "Relative time format"
 msgstr ""
@@ -3466,14 +3526,6 @@ msgstr ""
 msgid "Navigation sidebar"
 msgstr ""
 
-#: changedetectionio/forms.py
-msgid "Collapsed icon rail (expands on hover)"
-msgstr ""
-
-#: changedetectionio/forms.py
-msgid "Always expanded"
-msgstr ""
-
 #: changedetectionio/forms.py
 msgid "API access token security check enabled"
 msgstr "Contrôle de sécurité du jeton d'accès à l'API activé"
@@ -3939,10 +3991,6 @@ msgstr ""
 msgid "Not enough price data points yet to draw a graph - keep monitoring and the price history will appear here."
 msgstr ""
 
-#: changedetectionio/processors/templates/extract.html
-msgid "Screenshot"
-msgstr ""
-
 #: changedetectionio/processors/templates/extract.html
 msgid "This tool will extract text data from all of the watch history."
 msgstr ""
@@ -4025,6 +4073,12 @@ msgstr ""
 msgid "The URL being watched."
 msgstr ""
 
+#: changedetectionio/templates/_common_fields.html
+msgid ""
+"The Open Link Override set on the watch, otherwise the same as watch_url. Use this when the watched URL is an API "
+"endpoint or RSS feed but you want to link to the real page."
+msgstr ""
+
 #: changedetectionio/templates/_common_fields.html
 msgid "The UUID of the watch."
 msgstr "L'UUID du moniteur."
@@ -4546,18 +4600,18 @@ msgid "Search"
 msgstr "Rechercher"
 
 #: changedetectionio/templates/base.html
-#, python-format
-msgid "URL or Title in '%(title)s'"
-msgstr ""
-
-#: changedetectionio/templates/base.html
-msgid "URL or Title"
-msgstr ""
+msgid "URL, title or error text"
+msgstr "URL, titre ou texte d'erreur"
 
 #: changedetectionio/templates/base.html
 msgid "Enter search term..."
 msgstr ""
 
+#: changedetectionio/templates/base.html
+#, python-format
+msgid "Searching in current group '%(title)s' only"
+msgstr "Recherche uniquement dans le groupe '%(title)s'"
+
 #: changedetectionio/templates/edit/include_llm_intent.html
 msgid ""
 "<strong>On</strong> &ndash; every watch in this group uses the AI settings below, unless it fills in its own. "
@@ -4966,14 +5020,6 @@ msgid ""
 "ALLOW_IANA_RESTRICTED_ADDRESSES=true and restart."
 msgstr ""
 
-#: changedetectionio/widgets/ternary_boolean.py
-msgid "Yes"
-msgstr "Oui"
-
-#: changedetectionio/widgets/ternary_boolean.py
-msgid "No"
-msgstr "Non"
-
 #: changedetectionio/widgets/ternary_boolean.py
 msgid "Main settings"
 msgstr "Paramètres principaux"