From b9014f854ba25ffa621be01422a9f6bcfa1f957b Mon Sep 17 00:00:00 2001 From: Dennis Siemensma Date: Mon, 16 Jan 2023 21:52:16 +0100 Subject: [PATCH] Fix dark mode warnings in Django admin #1792 --- docs/reference/changelog.rst | 1 + dsmr_api/templates/dsmr_api/api_settings/change_form.html | 2 +- .../templates/dsmr_backend/email_settings/change_form.html | 2 +- .../templates/dsmr_backup/backup_settings/change_form.html | 2 +- .../templates/dsmr_backup/dropbox_settings/change_form.html | 2 +- .../dsmr_backup/email_backup_settings/change_form.html | 4 ++-- .../dsmr_consumption/consumption_settings/change_form.html | 2 +- .../dsmr_consumption/energy_supplier_prices/change_form.html | 4 ++-- .../dsmr_datalogger/datalogger_settings/change_form.html | 2 +- .../dsmr_datalogger/meter_statistics/change_form.html | 2 +- .../dsmr_datalogger/retention_settings/change_form.html | 2 +- .../dsmr_influxdb/influxdb_settings/change_form.html | 4 ++-- 12 files changed, 15 insertions(+), 14 deletions(-) diff --git a/docs/reference/changelog.rst b/docs/reference/changelog.rst index 9ff2c2c10..5ecce4baf 100644 --- a/docs/reference/changelog.rst +++ b/docs/reference/changelog.rst @@ -30,6 +30,7 @@ v5.10.0 - January 2023 - ``Fixed`` [`#1770 `_] Fixed not always logging the right (gas) meter positions in day statistics correctly. - ``Fixed`` [`#1770 `_] Fixed having gas consumption in day statistics being slightly off (situationally). +- ``Fixed`` [`#1792 `_] Fix dark mode warnings in Django admin - ``Fixed`` Fixed minor issues on the Dashboard notification page in favor of automatic migration messages. - ``Added`` [`#1770 `_] Now tracking meter position timestamps in day statistics. Added them to Archive (day view) and Export. diff --git a/dsmr_api/templates/dsmr_api/api_settings/change_form.html b/dsmr_api/templates/dsmr_api/api_settings/change_form.html index 943475314..7f786e391 100644 --- a/dsmr_api/templates/dsmr_api/api_settings/change_form.html +++ b/dsmr_api/templates/dsmr_api/api_settings/change_form.html @@ -3,7 +3,7 @@ {% block field_sets %} -
+
{% blocktranslate %}You will only need to enable the DSMR-reader API when using the remote datalogger (see installation guide) of when manually sending data from/to DSMR-reader (usually for advanced users).{% endblocktranslate %}
diff --git a/dsmr_backend/templates/dsmr_backend/email_settings/change_form.html b/dsmr_backend/templates/dsmr_backend/email_settings/change_form.html index ec2cf7ecf..a678eaf34 100644 --- a/dsmr_backend/templates/dsmr_backend/email_settings/change_form.html +++ b/dsmr_backend/templates/dsmr_backend/email_settings/change_form.html @@ -3,7 +3,7 @@ {% block field_sets %} -
+
{% blocktranslate %}Test your email settings with the button below.{% endblocktranslate %} {% blocktranslate %}Optional: View your settings for sending backups by email here.{% endblocktranslate %} diff --git a/dsmr_backup/templates/dsmr_backup/backup_settings/change_form.html b/dsmr_backup/templates/dsmr_backup/backup_settings/change_form.html index ba528387a..d919f25ec 100644 --- a/dsmr_backup/templates/dsmr_backup/backup_settings/change_form.html +++ b/dsmr_backup/templates/dsmr_backup/backup_settings/change_form.html @@ -6,7 +6,7 @@ {{ block.super }} -
+
{% blocktranslate %}Saving the configuration will reset the delay until the next backup.{% endblocktranslate %} {% blocktranslate %}Use Dropbox to secure all your backups{% endblocktranslate %}, {% blocktranslate %}view Dropbox settings here{% endblocktranslate %}. {% blocktranslate %}Or use GMail/email for keeping smaller backups{% endblocktranslate %}, {% blocktranslate %}view email backup settings here{% endblocktranslate %}. diff --git a/dsmr_backup/templates/dsmr_backup/dropbox_settings/change_form.html b/dsmr_backup/templates/dsmr_backup/dropbox_settings/change_form.html index b49bf87fe..e75066613 100644 --- a/dsmr_backup/templates/dsmr_backup/dropbox_settings/change_form.html +++ b/dsmr_backup/templates/dsmr_backup/dropbox_settings/change_form.html @@ -9,7 +9,7 @@ {% endblock %} {% block field_sets %} -
+
{% blocktranslate %}This will synchronize backups to your Dropbox-account using the "Official DSMR-reader" Dropbox App.{% endblocktranslate %}
  • {% blocktranslate %}Step 1: Click the authorization link below to go to Dropbox and authorize the app for a dedicated folder in your Dropbox-account.{% endblocktranslate %}
    • diff --git a/dsmr_backup/templates/dsmr_backup/email_backup_settings/change_form.html b/dsmr_backup/templates/dsmr_backup/email_backup_settings/change_form.html index ceccb287a..7b69c1918 100644 --- a/dsmr_backup/templates/dsmr_backup/email_backup_settings/change_form.html +++ b/dsmr_backup/templates/dsmr_backup/email_backup_settings/change_form.html @@ -3,7 +3,7 @@ {% block object-tools %} -
    +
    {% blocktranslate %}Emails are currently sent to{% endblocktranslate %}: {{ email_address|default:'No email address configured!' }} ({% blocktranslate %}edit email address here{% endblocktranslate %})
    @@ -17,7 +17,7 @@ {{ block.super }} -
    +
    {% blocktranslate %}Saving the configuration will reset the delay until the next email backup.{% endblocktranslate %}
    diff --git a/dsmr_consumption/templates/dsmr_consumption/consumption_settings/change_form.html b/dsmr_consumption/templates/dsmr_consumption/consumption_settings/change_form.html index d76aebff7..1cd5248f3 100644 --- a/dsmr_consumption/templates/dsmr_consumption/consumption_settings/change_form.html +++ b/dsmr_consumption/templates/dsmr_consumption/consumption_settings/change_form.html @@ -3,7 +3,7 @@ {% block field_sets %} -
    +

    {% blocktranslate %}By default DSMR v4 smart meters emit around 6 telegrams per minute and update gas usage hourly.{% endblocktranslate %} {% blocktranslate %}DSMR v5 smart meters emit around 60 telegrams per minute and update gas usage every 5 minutes.{% endblocktranslate %} diff --git a/dsmr_consumption/templates/dsmr_consumption/energy_supplier_prices/change_form.html b/dsmr_consumption/templates/dsmr_consumption/energy_supplier_prices/change_form.html index c0b9126d4..2baaf984a 100644 --- a/dsmr_consumption/templates/dsmr_consumption/energy_supplier_prices/change_form.html +++ b/dsmr_consumption/templates/dsmr_consumption/energy_supplier_prices/change_form.html @@ -2,13 +2,13 @@ {% load i18n %} {% block field_sets %} -

    +
    {% blocktranslate %}In order to use separate contract dates for electricity/gas overlapping each other, make sure to set the prices to zero not required for a contract.{% endblocktranslate %}
    {{ block.super }} -
    +
    {% blocktranslate %}Updating prices for (past) days already stored in the Archive does not affect them.{% endblocktranslate %} {% blocktranslate %}In order to reapply price changes retroactively{% endblocktranslate %} {% blocktranslate %}see the FAQ{% endblocktranslate %} {% blocktranslate %}for a how-to.{% endblocktranslate %}
    diff --git a/dsmr_datalogger/templates/dsmr_datalogger/datalogger_settings/change_form.html b/dsmr_datalogger/templates/dsmr_datalogger/datalogger_settings/change_form.html index 92ef7438e..5ccb6b7af 100644 --- a/dsmr_datalogger/templates/dsmr_datalogger/datalogger_settings/change_form.html +++ b/dsmr_datalogger/templates/dsmr_datalogger/datalogger_settings/change_form.html @@ -3,7 +3,7 @@ {% block field_sets %} -
    +
    • {% blocktranslate %}Please note that lowering the "Datalogger process sleep" setting will result in more disk activity and more data being stored, possibly degrading performance.{% endblocktranslate %}
    • {% blocktranslate %}Do not enable "Override telegram timestamp" unless your smart meter wrongly emits telegrams with an offset of multiple minutes or more.{% endblocktranslate %}
      • diff --git a/dsmr_datalogger/templates/dsmr_datalogger/meter_statistics/change_form.html b/dsmr_datalogger/templates/dsmr_datalogger/meter_statistics/change_form.html index 316257550..fe881cc8f 100644 --- a/dsmr_datalogger/templates/dsmr_datalogger/meter_statistics/change_form.html +++ b/dsmr_datalogger/templates/dsmr_datalogger/meter_statistics/change_form.html @@ -3,7 +3,7 @@ {% block field_sets %} -
      +
      {% blocktranslate %}All data here is based on the latest telegram received and should also be displayed on the Statistics page (except for the telegram). You can find the latest raw telegram below, which can be used for debugging purposes.{% endblocktranslate %}
      diff --git a/dsmr_datalogger/templates/dsmr_datalogger/retention_settings/change_form.html b/dsmr_datalogger/templates/dsmr_datalogger/retention_settings/change_form.html index 244c06fec..fee45e7b9 100644 --- a/dsmr_datalogger/templates/dsmr_datalogger/retention_settings/change_form.html +++ b/dsmr_datalogger/templates/dsmr_datalogger/retention_settings/change_form.html @@ -3,7 +3,7 @@ {% block field_sets %} -
      +
      {% blocktranslate %}Data retention policies cleans up source data after a while.{% endblocktranslate %} {% blocktranslate %}The following data is never discarded:{% endblocktranslate %}
        diff --git a/dsmr_influxdb/templates/dsmr_influxdb/influxdb_settings/change_form.html b/dsmr_influxdb/templates/dsmr_influxdb/influxdb_settings/change_form.html index e6d800646..21d9c77d9 100644 --- a/dsmr_influxdb/templates/dsmr_influxdb/influxdb_settings/change_form.html +++ b/dsmr_influxdb/templates/dsmr_influxdb/influxdb_settings/change_form.html @@ -3,13 +3,13 @@ {% block field_sets %} -
        +

        {% blocktranslate %}This integration is meant to synchronize the (parsed) source DSMR readings to your InfluxDB, in order to aggregate the data yourself. Other data or non DSMR reading fields are not supported.{% endblocktranslate %}

        -
        +

        {% blocktranslate %}Enabling this integration will only sync new readings. In order to export your existing readings retroactively, use the following utility{% endblocktranslate %}: