From 227977b01e6aaa212c9a203f9550c3e8837d3d89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Aug 2023 11:28:06 +0200 Subject: [PATCH 1/2] Bump uwsgi from 2.0.21 to 2.0.22 in /rocky (#1669) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- rocky/poetry.lock | 10 +++++----- rocky/pyproject.toml | 2 +- rocky/requirements-dev.txt | 2 +- rocky/requirements.txt | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rocky/poetry.lock b/rocky/poetry.lock index 6b22f87ca85..8b9b5a12a5d 100644 --- a/rocky/poetry.lock +++ b/rocky/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. [[package]] name = "arabic-reshaper" @@ -2028,7 +2028,7 @@ name = "prompt-toolkit" version = "2.0.10" description = "Library for building powerful interactive command lines in Python" optional = false -python-versions = ">=2.6,<3.0.0 || >=3.3.0" +python-versions = ">=2.6,<3.0.dev0 || >=3.3.dev0" files = [ {file = "prompt_toolkit-2.0.10-py2-none-any.whl", hash = "sha256:e7f8af9e3d70f514373bf41aa51bc33af12a6db3f71461ea47fea985defb2c31"}, {file = "prompt_toolkit-2.0.10-py3-none-any.whl", hash = "sha256:46642344ce457641f28fc9d1c9ca939b63dadf8df128b86f1b9860e59c73a5e4"}, @@ -3192,12 +3192,12 @@ zstd = ["zstandard (>=0.18.0)"] [[package]] name = "uwsgi" -version = "2.0.21" +version = "2.0.22" description = "The uWSGI server" optional = false python-versions = "*" files = [ - {file = "uwsgi-2.0.21.tar.gz", hash = "sha256:35a30d83791329429bc04fe44183ce4ab512fcf6968070a7bfba42fc5a0552a9"}, + {file = "uwsgi-2.0.22.tar.gz", hash = "sha256:4cc4727258671ac5fa17ab422155e9aaef8a2008ebb86e4404b66deaae965db2"}, ] [[package]] @@ -3373,4 +3373,4 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "8711720bd3815ba47a1e3224c13d225678df03e3bc9b95ae260904f8c8e95216" +content-hash = "e3df40f0917a6d6570aaa76d659e7d493a5d1cfa343817fab73a686231c78ea6" diff --git a/rocky/pyproject.toml b/rocky/pyproject.toml index d7388e99ff1..6cd6c0df178 100644 --- a/rocky/pyproject.toml +++ b/rocky/pyproject.toml @@ -39,7 +39,7 @@ dnspython = "^2.1.0" django-password-validators = "^1.7.1" colorama = "^0.4.6" django-csp = "^3.7" -uwsgi = "^2.0.21" +uwsgi = "^2.0.22" djangorestframework = "^3.14.0" django-tagulous = "^1.3.3" drf-standardized-errors = "^0.12.5" diff --git a/rocky/requirements-dev.txt b/rocky/requirements-dev.txt index 73a8aa3f158..810d1d991d6 100644 --- a/rocky/requirements-dev.txt +++ b/rocky/requirements-dev.txt @@ -147,7 +147,7 @@ tzdata==2023.3 ; python_version >= "3.8" and python_version < "4.0" and (sys_pla tzlocal==5.0.1 ; python_version >= "3.8" and python_version < "4.0" uritools==4.0.1 ; python_version >= "3.8" and python_version < "4.0" urllib3==2.0.3 ; python_version >= "3.8" and python_version < "4.0" -uwsgi==2.0.21 ; python_version >= "3.8" and python_version < "4.0" +uwsgi==2.0.22 ; python_version >= "3.8" and python_version < "4.0" vulture==2.7 ; python_version >= "3.8" and python_version < "4.0" wcwidth==0.2.6 ; python_version >= "3.8" and python_version < "4.0" webencodings==0.5.1 ; python_version >= "3.8" and python_version < "4.0" diff --git a/rocky/requirements.txt b/rocky/requirements.txt index b52b784ceb3..f5b3161a10a 100644 --- a/rocky/requirements.txt +++ b/rocky/requirements.txt @@ -759,8 +759,8 @@ uritools==4.0.1 ; python_version >= "3.8" and python_version < "4.0" \ urllib3==2.0.3 ; python_version >= "3.8" and python_version < "4.0" \ --hash=sha256:48e7fafa40319d358848e1bc6809b208340fafe2096f1725d05d67443d0483d1 \ --hash=sha256:bee28b5e56addb8226c96f7f13ac28cb4c301dd5ea8a6ca179c0b9835e032825 -uwsgi==2.0.21 ; python_version >= "3.8" and python_version < "4.0" \ - --hash=sha256:35a30d83791329429bc04fe44183ce4ab512fcf6968070a7bfba42fc5a0552a9 +uwsgi==2.0.22 ; python_version >= "3.8" and python_version < "4.0" \ + --hash=sha256:4cc4727258671ac5fa17ab422155e9aaef8a2008ebb86e4404b66deaae965db2 webencodings==0.5.1 ; python_version >= "3.8" and python_version < "4.0" \ --hash=sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78 \ --hash=sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923 From b40d59ad0771ecdfa333acd1f4b43121af841ecf Mon Sep 17 00:00:00 2001 From: ammar92 Date: Fri, 25 Aug 2023 13:23:09 +0200 Subject: [PATCH 2/2] Updated `djLint` version and `pre-commit` hook configs (#1664) Signed-off-by: ammar Co-authored-by: Mark Janssen <20283+praseodym@users.noreply.github.com> Co-authored-by: Patrick Co-authored-by: Patrick Darwinkel --- .pre-commit-config.yaml | 213 +- rocky/account/templates/login.html | 26 +- .../fmea/fmea_department_heatmap.html | 2 +- rocky/fmea/templates/fmea/fmea_index.html | 24 +- .../templates/change_clearance_level.html | 10 +- rocky/katalogus/templates/katalogus.html | 3 +- .../templates/partials/objects_to_scan.html | 12 +- .../templates/partials/plugin_tile.html | 3 +- .../partials/single_action_checkbox_form.html | 9 +- .../partials/single_action_form.html | 5 +- rocky/katalogus/templates/plugin_detail.html | 14 +- .../templates/plugin_settings_list.html | 8 +- .../account/step_1_registration_intro.html | 28 +- .../account/step_2a_organization_setup.html | 10 +- .../account/step_2a_organization_update.html | 8 +- .../account/step_2c_account_setup_intro.html | 22 +- .../account/step_3_account_user_type.html | 8 +- .../account/step_4_account_setup_admin.html | 8 +- .../account/step_6_account_setup_client.html | 6 +- rocky/onboarding/templates/dns_report.html | 9 +- .../partials/boefje_tile_static.html | 2 +- .../templates/partials/cat_loader.html | 16 +- .../templates/step_1_introduction.html | 26 +- .../templates/step_2a_choose_report_info.html | 36 +- .../templates/step_2b_choose_report_type.html | 14 +- .../step_3a_setup_scan_ooi_info.html | 26 +- .../templates/step_3b_setup_scan_ooi_add.html | 32 +- .../step_3c_setup_scan_ooi_detail.html | 30 +- .../step_3f_set_clearance_level.html | 2 +- .../step_3g_setup_scan_select_plugins.html | 45 +- rocky/onboarding/templates/step_4_report.html | 21 +- rocky/poetry.lock | 1747 +++++++++-------- rocky/pyproject.toml | 2 +- rocky/requirements-dev.txt | 106 +- rocky/requirements.txt | 977 ++++----- rocky/rocky/locale/nl/LC_MESSAGES/django.po | 21 +- rocky/rocky/locale/pap/LC_MESSAGES/django.po | 21 +- .../templates/findings/finding_list.html | 3 +- .../templates/findings/findings_filter.html | 3 +- rocky/rocky/templates/footer.html | 4 +- .../templates/forms/json_schema_form.html | 14 +- .../widgets/checkbox_group_boefje_tiles.html | 2 +- .../forms/widgets/checkbox_group_columns.html | 12 +- .../forms/widgets/checkbox_group_table.html | 4 +- .../templates/forms/widgets/widget_label.html | 2 +- rocky/rocky/templates/graph-d3.html | 6 +- rocky/rocky/templates/head.html | 2 +- rocky/rocky/templates/header.html | 2 +- rocky/rocky/templates/landing_page.html | 61 +- .../templates/legal/privacy_statement.html | 10 +- rocky/rocky/templates/oois/ooi_add.html | 4 +- rocky/rocky/templates/oois/ooi_detail.html | 20 +- .../oois/ooi_detail_add_related_object.html | 18 +- .../templates/oois/ooi_detail_object.html | 4 +- .../oois/ooi_detail_origins_inference.html | 7 +- rocky/rocky/templates/oois/ooi_edit.html | 5 +- rocky/rocky/templates/oois/ooi_findings.html | 3 +- rocky/rocky/templates/oois/ooi_list.html | 101 +- .../templates/oois/ooi_mute_finding.html | 48 +- rocky/rocky/templates/oois/ooi_page_tabs.html | 14 +- .../templates/oois/ooi_past_due_warning.html | 6 +- rocky/rocky/templates/oois/ooi_report.html | 13 +- .../rocky/templates/oois/ooi_report_404.html | 14 +- rocky/rocky/templates/oois/ooi_summary.html | 4 +- rocky/rocky/templates/oois/ooi_tree.html | 3 +- .../organizations/organization_add.html | 8 +- .../organization_crisis_room.html | 88 +- .../organization_member_edit.html | 3 +- .../organization_member_list.html | 3 +- .../organization_member_upload.html | 15 +- .../organizations/organization_settings.html | 143 +- .../select_clearance_level_radio_input.html | 8 +- .../elements/ooi_add_type_select_form.html | 18 +- .../elements/ooi_list_settings_form.html | 20 +- .../elements/ooi_report_settings.html | 4 +- .../ooi_tree_condensed_table_row.html | 15 +- .../templates/partials/explanations.html | 18 +- .../partials/form/boefje_tiles_form.html | 2 +- .../templates/partials/form/field_input.html | 75 +- .../partials/form/field_input_checkbox.html | 28 +- .../form/field_input_multiselect.html | 2 +- .../partials/form/field_input_radio.html | 2 +- .../partials/form/field_input_wrapper.html | 2 + .../templates/partials/form/fieldset.html | 7 +- .../templates/partials/form/form_errors.html | 4 +- .../form/indemnification_add_form.html | 24 +- .../partials/hyperlink_ooi_type.html | 2 +- .../templates/partials/list_filters.html | 6 +- .../partials/ooi_detail_toolbar.html | 30 +- .../ooi_report_findings_block_table.html | 4 +- ...ort_findings_block_table_expanded_row.html | 26 +- .../templates/partials/ooi_summary_block.html | 8 +- .../partials/ooi_summary_finding.html | 8 +- .../templates/partials/ooi_type_filters.html | 12 +- .../partials/ooi_type_filters_linklist.html | 2 +- .../organization_member_list_filters.html | 36 +- .../templates/partials/scan_history.html | 8 +- .../templates/partials/secondary-menu.html | 74 +- rocky/rocky/templates/rest_framework/api.html | 21 +- .../scan_profiles/scan_profile_detail.html | 2 +- .../scan_profiles/scan_profile_reset.html | 15 +- .../templates/tasks/boefje_task_detail.html | 26 +- rocky/rocky/templates/tasks/normalizers.html | 3 +- .../tasks/partials/tab_navigation.html | 4 +- .../templates/tasks/partials/task_filter.html | 60 +- .../templates/two_factor/_base_focus.html | 3 +- .../two_factor/core/backup_tokens.html | 12 +- .../templates/two_factor/core/login.html | 18 +- .../two_factor/core/otp_required.html | 16 +- .../two_factor/core/phone_register.html | 14 +- .../templates/two_factor/core/setup.html | 7 +- .../two_factor/core/setup_complete.html | 8 +- .../templates/two_factor/profile/disable.html | 6 +- .../templates/two_factor/profile/profile.html | 34 +- 114 files changed, 2530 insertions(+), 2365 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a87e6fc51fa..d1faf2d863d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,118 +1,121 @@ repos: - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 - hooks: - - id: trailing-whitespace - - id: mixed-line-ending - args: ["--fix=lf"] - - id: detect-private-key - - id: check-case-conflict - - id: check-yaml - - id: check-json - - id: check-toml - - id: debug-statements - - id: end-of-file-fixer - exclude: | - (?x)( - ^boefjes/tests/examples/rdns-nxdomain.txt$ - ) +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.4.0 + hooks: + - id: trailing-whitespace + - id: mixed-line-ending + args: ["--fix=lf"] + - id: detect-private-key + - id: check-case-conflict + - id: check-yaml + - id: check-json + - id: check-toml + - id: debug-statements + - id: end-of-file-fixer + exclude: | + (?x)( + ^boefjes/tests/examples/rdns-nxdomain.txt$ + ) - - repo: https://github.com/abravalheri/validate-pyproject - rev: v0.12.2 - hooks: - - id: validate-pyproject - files: pyproject.toml$ +- repo: https://github.com/abravalheri/validate-pyproject + rev: v0.12.2 + hooks: + - id: validate-pyproject + files: pyproject.toml$ - - repo: https://github.com/rstcheck/rstcheck - rev: v6.1.2 - hooks: - - id: rstcheck - # https://github.com/rstcheck/rstcheck-core/issues/4 - args: ["--ignore-messages", "Hyperlink target .* is not referenced", "--ignore-directives", "mermaid"] - additional_dependencies: ["rstcheck[sphinx]"] +- repo: https://github.com/rstcheck/rstcheck + rev: v6.1.2 + hooks: + - id: rstcheck + # https://github.com/rstcheck/rstcheck-core/issues/4 + args: ["--ignore-messages", "Hyperlink target .* is not referenced", "--ignore-directives", "mermaid"] + additional_dependencies: ["rstcheck[sphinx]"] - - repo: https://github.com/MarketSquare/robotframework-tidy - rev: "4.1.0" - hooks: - - id: robotidy +- repo: https://github.com/MarketSquare/robotframework-tidy + rev: "4.1.0" + hooks: + - id: robotidy - - repo: https://github.com/jendrikseipp/vulture - rev: v2.7 - hooks: - - id: vulture - exclude: | - /tests/ +- repo: https://github.com/jendrikseipp/vulture + rev: v2.7 + hooks: + - id: vulture + exclude: | + /tests/ - - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: 'v0.0.263' - hooks: - - id: ruff +- repo: https://github.com/charliermarsh/ruff-pre-commit + rev: 'v0.0.263' + hooks: + - id: ruff - - repo: https://github.com/psf/black - rev: "23.3.0" - hooks: - - id: black +- repo: https://github.com/psf/black + rev: "23.3.0" + hooks: + - id: black - - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.2.0 - hooks: - - id: mypy - additional_dependencies: ['types-PyYAML', 'types-requests', 'types-cachetools', 'pydantic', 'pynacl'] - exclude: | - (?x)( - ^boefjes/ | - ^keiko/templates | - ^mula/whitelist\.py$ | - ^octopoes/ | - ^rocky/ | - /tests/ | - docs/source/conf\.py$ | - setup\.py$ - ) +- repo: https://github.com/pre-commit/mirrors-mypy + rev: v1.2.0 + hooks: + - id: mypy + additional_dependencies: ['types-PyYAML', 'types-requests', 'types-cachetools', 'pydantic', 'pynacl'] + exclude: | + (?x)( + ^boefjes/ | + ^keiko/templates | + ^mula/whitelist\.py$ | + ^octopoes/ | + ^rocky/ | + /tests/ | + docs/source/conf\.py$ | + setup\.py$ + ) - - repo: https://github.com/codespell-project/codespell - rev: v2.2.4 - hooks: - - id: codespell - additional_dependencies: ['tomli'] - args: [-L, lama] - exclude: | - (?x)( - \.po$ | - \.xml$ | - poetry.lock$ | - pyproject.toml$ | - requirements-.*.txt$ | - retirejs.json$ | - ^boefjes/boefjes/plugins/kat_fierce/lists | - ^boefjes/tests/examples | - ^keiko/glossaries | - ^keiko/templates/.*/template.tex$ | - ^rocky/assets/js/vendor | - ^rocky/assets/src/bundles/app/css/themes/soft/fonts/tabler-icons/tabler-icons.scss$ | - ^rocky/tests/stubs | - ^docs/source/_static - ) +- repo: https://github.com/codespell-project/codespell + rev: v2.2.4 + hooks: + - id: codespell + additional_dependencies: ['tomli'] + args: [-L, lama] + exclude: | + (?x)( + \.po$ | + \.xml$ | + poetry.lock$ | + pyproject.toml$ | + requirements-.*.txt$ | + retirejs.json$ | + ^boefjes/boefjes/plugins/kat_fierce/lists | + ^boefjes/tests/examples | + ^keiko/glossaries | + ^keiko/templates/.*/template.tex$ | + ^rocky/assets/js/vendor | + ^rocky/assets/src/bundles/app/css/themes/soft/fonts/tabler-icons/tabler-icons.scss$ | + ^rocky/tests/stubs | + ^docs/source/_static + ) - - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.19.16 - hooks: - - id: djlint-django - files: '^rocky/.*/templates/.*$' +- repo: https://github.com/Riverside-Healthcare/djLint + rev: v1.32.1 + hooks: + - id: djlint-reformat-django + files: '^rocky/.*/templates/.*$' - # - repo: https://github.com/thibaudcolas/pre-commit-stylelint - # rev: v15.4.0 - # hooks: - # - id: stylelint - # args: [--fix] - # additional_dependencies: - # - stylelint@15.4.0 - # - stylelint-config-standard-scss@8.0.0 - # files: "^(rocky\/assets\/src\/|docs\/source\/).*.(css|scss|sass)$" + - id: djlint-django + files: '^rocky/.*/templates/.*$' - - repo: https://github.com/shellcheck-py/shellcheck-py - rev: v0.9.0.5 - hooks: - - id: shellcheck - args: ["-e", "SC1091"] +# - repo: https://github.com/thibaudcolas/pre-commit-stylelint +# rev: v15.4.0 +# hooks: +# - id: stylelint +# args: [--fix] +# additional_dependencies: +# - stylelint@15.4.0 +# - stylelint-config-standard-scss@8.0.0 +# files: "^(rocky\/assets\/src\/|docs\/source\/).*.(css|scss|sass)$" + +- repo: https://github.com/shellcheck-py/shellcheck-py + rev: v0.9.0.5 + hooks: + - id: shellcheck + args: ["-e", "SC1091"] diff --git a/rocky/account/templates/login.html b/rocky/account/templates/login.html index 66e8560209b..bb3ddb8b3f5 100644 --- a/rocky/account/templates/login.html +++ b/rocky/account/templates/login.html @@ -12,7 +12,7 @@

{% trans "You are logged in." %}

{% translate "Two factor authentication is enabled for your account." %}

{% else %}

{% translate "Two factor authentication is not enabled for your account. Enable it to continue." %}

- {% trans "Setup two factor authentication" %} + {% trans "Setup two factor authentication" %} {% endif %} {% else %}

{% translate "Login" %}

@@ -20,26 +20,24 @@

{% translate "Login" %}

{% csrf_token %}
{% if wizard.steps.current == "auth" %} - - {% translate "Credentials" %} - + {% translate "Credentials" %} {% elif wizard.steps.current == "token" %}

+ role="group" + aria-label="{% translate "explanation" %}"> {% translate "Explanation" %}: {% translate "Please enter the token generated by your token generator." %}

{% elif wizard.steps.current == "backup" %}

+ role="group" + aria-label="{% translate "explanation" %}"> {% translate "Explanation" %}: {% blocktrans trimmed %} - Use this form for entering backup tokens for logging in. - These tokens have been generated for you to print and keep safe. Please - enter one of these backup tokens to login to your account. - {% endblocktrans %} + Use this form for entering backup tokens for logging in. + These tokens have been generated for you to print and keep safe. Please + enter one of these backup tokens to login to your account. + {% endblocktrans %}

{% endif %} {% include "partials/form/form_errors.html" %} @@ -53,9 +51,7 @@

{% translate "Login" %}

+ class="secondary">{% translate "Use Backup Token" %}

{% endif %} {% include "two_factor/_wizard_actions.html" with step=wizard.steps.current %} diff --git a/rocky/fmea/templates/fmea/fmea_department_heatmap.html b/rocky/fmea/templates/fmea/fmea_department_heatmap.html index 7969fb27cb2..2ea02d8af7e 100644 --- a/rocky/fmea/templates/fmea/fmea_department_heatmap.html +++ b/rocky/fmea/templates/fmea/fmea_department_heatmap.html @@ -23,7 +23,7 @@ {{ data.failure_mode }} {% for department in departments %} {% if department in data.affected_departments %} - + {{ data.risk_class }} {% else %} diff --git a/rocky/fmea/templates/fmea/fmea_index.html b/rocky/fmea/templates/fmea/fmea_index.html index 5a619f23d03..730c3c592d3 100644 --- a/rocky/fmea/templates/fmea/fmea_index.html +++ b/rocky/fmea/templates/fmea/fmea_index.html @@ -12,21 +12,21 @@

{% translate "FMEA introduction" %}

{% blocktranslate trimmed %} - FMEA (failure mode and effective analysis) is a step-by-step approach - for collecting knowledge about possible points of failure in a design, - manufacturing process, product or service. - {% endblocktranslate %} + FMEA (failure mode and effective analysis) is a step-by-step approach + for collecting knowledge about possible points of failure in a design, + manufacturing process, product or service. + {% endblocktranslate %}

{% blocktranslate trimmed %} - Failure mode (FM) refers to the way in which something might break - down and includes potential errors that may occur, especially errors - that may affect a system. Effective analysis (EA) involves - deciphering the consequences of those break downs by making sure - that all failures can be detected, determining how frequently a - failure might occur and identifying which potential failures should be - prioritized. - {% endblocktranslate %} + Failure mode (FM) refers to the way in which something might break + down and includes potential errors that may occur, especially errors + that may affect a system. Effective analysis (EA) involves + deciphering the consequences of those break downs by making sure + that all failures can be detected, determining how frequently a + failure might occur and identifying which potential failures should be + prioritized. + {% endblocktranslate %}

+ diff --git a/rocky/rocky/templates/forms/widgets/checkbox_group_boefje_tiles.html b/rocky/rocky/templates/forms/widgets/checkbox_group_boefje_tiles.html index ac3af25adda..7e7a1ddc37a 100644 --- a/rocky/rocky/templates/forms/widgets/checkbox_group_boefje_tiles.html +++ b/rocky/rocky/templates/forms/widgets/checkbox_group_boefje_tiles.html @@ -1,7 +1,7 @@ {% load i18n %} {% with id=widget.attrs.id %} -
{% for group, options, index in widget.optgroups %} {% for option in options %} diff --git a/rocky/rocky/templates/forms/widgets/checkbox_group_columns.html b/rocky/rocky/templates/forms/widgets/checkbox_group_columns.html index d32ed9f030a..6f221bca02b 100644 --- a/rocky/rocky/templates/forms/widgets/checkbox_group_columns.html +++ b/rocky/rocky/templates/forms/widgets/checkbox_group_columns.html @@ -2,12 +2,12 @@ {% with id=widget.attrs.id %}
+ {% if id %}id="{{ id }}"{% endif %} + {% if widget.attrs.class %}class="checkbox-group {{ widget.attrs.class }}"{% endif %}> {% for group, options, index in widget.optgroups %} {% if group %} {{ group }} -
+
{% endif %} {% for option in options %}
@@ -16,6 +16,6 @@
{% endfor %} {% if group %}
{% endif %} - {% endfor %} -
- {% endwith %} + {% endfor %} +
+{% endwith %} diff --git a/rocky/rocky/templates/forms/widgets/checkbox_group_table.html b/rocky/rocky/templates/forms/widgets/checkbox_group_table.html index 8b73d831311..6591d33f1ba 100644 --- a/rocky/rocky/templates/forms/widgets/checkbox_group_table.html +++ b/rocky/rocky/templates/forms/widgets/checkbox_group_table.html @@ -1,7 +1,7 @@ {% load i18n %} {% with id=widget.attrs.id %} -
@@ -25,7 +25,7 @@ {% for cell in option.label %} - + {% endfor %} diff --git a/rocky/rocky/templates/oois/ooi_edit.html b/rocky/rocky/templates/oois/ooi_edit.html index 1f4ff8b6591..145541689ae 100644 --- a/rocky/rocky/templates/oois/ooi_edit.html +++ b/rocky/rocky/templates/oois/ooi_edit.html @@ -15,15 +15,14 @@

{% blocktranslate %}Edit {{ type }}: {{ ooi_human_readable }}{% endblocktran {% csrf_token %} {% if form.non_field_errors %}
{{ form.non_field_errors }}
{% endif %}
- - {% translate type %} - + {% translate type %}
{% for field in form %} {% include "partials/form/field_input_wrapper.html" %} + {% endfor %}
diff --git a/rocky/rocky/templates/oois/ooi_findings.html b/rocky/rocky/templates/oois/ooi_findings.html index 72d942c1969..e047f7cdd90 100644 --- a/rocky/rocky/templates/oois/ooi_findings.html +++ b/rocky/rocky/templates/oois/ooi_findings.html @@ -26,6 +26,5 @@ {% endblock content %} {% block html_at_end_body %} {{ block.super }} - + {% endblock html_at_end_body %} diff --git a/rocky/rocky/templates/oois/ooi_list.html b/rocky/rocky/templates/oois/ooi_list.html index 97739e29b65..bdeafcec550 100644 --- a/rocky/rocky/templates/oois/ooi_list.html +++ b/rocky/rocky/templates/oois/ooi_list.html @@ -10,63 +10,62 @@
-

{% translate "Object list" %} @ {% if observed_at %}{{ observed_at|date:'DATE_FORMAT' }}{% endif %}

- +

+ {% translate "Object list" %} @ + {% if observed_at %}{{ observed_at|date:'DATE_FORMAT' }}{% endif %} +

{% blocktranslate trimmed %} - An overview of your object list. Objects can be added manually or by running boefjes.
- Click an object for additional information. - {% endblocktranslate %} -

-

- {% translate "Currently filtered on:" %} {{ types_display }} -

- {% include "partials/ooi_list_toolbar.html" %} - - {% translate "Filter" as filter_title %} - {% include "partials/ooi_list_filters.html" with title=filter_title clearance_level_filter_form=clearance_level_filter_form %} + An overview of your object list. Objects can be added manually or by running boefjes. +
+ Click an object for additional information. + {% endblocktranslate %} +

+

+ {% translate "Currently filtered on:" %} {{ types_display }} +

+ {% include "partials/ooi_list_toolbar.html" %} -

- {% blocktranslate with length=ooi_list|length total=total_oois %}Showing {{ length }} of {{ total }} objects{% endblocktranslate %} -

+ {% translate "Filter" as filter_title %} + {% include "partials/ooi_list_filters.html" with title=filter_title clearance_level_filter_form=clearance_level_filter_form %} -
- {% csrf_token %} -
- {% include "partials/form/form_errors.html" with form=select_oois_form %} +

+ {% blocktranslate with length=ooi_list|length total=total_oois %}Showing {{ length }} of {{ total }} objects{% endblocktranslate %} +

+ + {% csrf_token %} +
+ {% include "partials/form/form_errors.html" with form=select_oois_form %} - {% for field in select_oois_form %}{{ field }}{% endfor %} -
- {% if ooi_list %} -
-
- {% if may_update_clearance_level %} - - - {% endif %} - {% if perms.tools.can_delete_oois %} - - {% endif %} -
-
- {% endif %} - - {% include "partials/list_paginator.html" %} + {% for field in select_oois_form %}{{ field }}{% endfor %} +
+ {% if ooi_list %} +
+
+ {% if may_update_clearance_level %} + + + {% endif %} + {% if perms.tools.can_delete_oois %} + + {% endif %} +
+
+ {% endif %} + + {% include "partials/list_paginator.html" %} -
-
-
+ + + {% endblock content %} {% block html_at_end_body %} {{ block.super }} diff --git a/rocky/rocky/templates/oois/ooi_mute_finding.html b/rocky/rocky/templates/oois/ooi_mute_finding.html index 559cff707c5..4f3512fbfde 100644 --- a/rocky/rocky/templates/oois/ooi_mute_finding.html +++ b/rocky/rocky/templates/oois/ooi_mute_finding.html @@ -4,30 +4,30 @@ {% load i18n %} {% block content %} - {% include "header.html" %} + {% include "header.html" %} -
-
-
-

{% translate "Mute finding" %}: {{ ooi.human_readable }}

-

{% translate "Give a reason below why you want to mute this finding." %}

-
- {% csrf_token %} - {% translate "Mute finding" as fieldset_legend %} - {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %} +
+
+
+

{% translate "Mute finding" %}: {{ ooi.human_readable }}

+

{% translate "Give a reason below why you want to mute this finding." %}

+ + {% csrf_token %} + {% translate "Mute finding" as fieldset_legend %} + {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %} -
- - {% translate "Cancel" %} -
- -
-
-
+
+ + {% translate "Cancel" %} +
+ +
+
+
{% endblock content %} diff --git a/rocky/rocky/templates/oois/ooi_page_tabs.html b/rocky/rocky/templates/oois/ooi_page_tabs.html index 0aab7cfe788..cc75110d18a 100644 --- a/rocky/rocky/templates/oois/ooi_page_tabs.html +++ b/rocky/rocky/templates/oois/ooi_page_tabs.html @@ -3,25 +3,25 @@

{% for hydr in object_list %} {% with ft=hydr.finding_type ooi=hydr.ooi finding=hydr.finding %} - - - - - - - - + + + + + + + + {% endwith %} {% endfor %} diff --git a/rocky/rocky/templates/organizations/organization_member_edit.html b/rocky/rocky/templates/organizations/organization_member_edit.html index 6c02bcbdc31..8b3bdb9f42d 100644 --- a/rocky/rocky/templates/organizations/organization_member_edit.html +++ b/rocky/rocky/templates/organizations/organization_member_edit.html @@ -26,6 +26,5 @@

{% translate "Edit member" %} {{ object.user.full_name }}

{% endblock content %} {% block html_at_end_body %} {{ block.super }} - + {% endblock html_at_end_body %} diff --git a/rocky/rocky/templates/organizations/organization_member_list.html b/rocky/rocky/templates/organizations/organization_member_list.html index e807bae2e69..4d966042248 100644 --- a/rocky/rocky/templates/organizations/organization_member_list.html +++ b/rocky/rocky/templates/organizations/organization_member_list.html @@ -126,6 +126,5 @@

{% translate "Members" %}

{% endblock content %} {% block html_at_end_body %} {{ block.super }} - + {% endblock html_at_end_body %} diff --git a/rocky/rocky/templates/organizations/organization_member_upload.html b/rocky/rocky/templates/organizations/organization_member_upload.html index ccba930a4be..ddf5b37448c 100644 --- a/rocky/rocky/templates/organizations/organization_member_upload.html +++ b/rocky/rocky/templates/organizations/organization_member_upload.html @@ -11,16 +11,19 @@

{% translate "Upload a csv file with members for organisation" %} "{{ organization }}"

- - {% translate "Download the template" %} - - {% translate "or create a csv file with the following criteria" %} + + {% translate "Download the template" %} + + {% translate "or create a csv file with the following criteria" %}

{% translate "These are the criteria for CSV upload:" %}

    - {% for criterion in criteria %}
  • {{ criterion }}
    • {% endfor %} + {% for criterion in criteria %}
  • {{ criterion }}
    • {% endfor %}
- + {% csrf_token %} {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %} diff --git a/rocky/rocky/templates/organizations/organization_settings.html b/rocky/rocky/templates/organizations/organization_settings.html index 4b83f98a2a4..dc49a397324 100644 --- a/rocky/rocky/templates/organizations/organization_settings.html +++ b/rocky/rocky/templates/organizations/organization_settings.html @@ -4,89 +4,86 @@ {% load static %} {% block content %} - {% include "header.html" %} + {% include "header.html" %} -
-
-
-

{% translate "Organization" %}: {{ organization.name }}

-

- {% blocktranslate with organization_name=organization.name %} +

+
+
+

{% translate "Organization" %}: {{ organization.name }}

+

+ {% blocktranslate with organization_name=organization.name %} An overview of "{{ organization_name }}". This shows general information and its settings. {% endblocktranslate %} -

- {% if not indemnification_present %} -

- {% url "organization_settings" organization.code as organization_settings %} - {% blocktranslate %} +

+ {% if not indemnification_present %} +

+ {% url "organization_settings" organization.code as organization_settings %} + {% blocktranslate %} Warning: Indemnification is not set for this organization. {% endblocktranslate %} -

- {% endif %} -

{% translate "Organization details" %}

-
-
- {{ inference.origin.source }} {% for param in inference.params %}{{ param.reference }}
{% endfor %}		 + {% for param in inference.params %} + {{ param.reference }} +
+ {% endfor %} +
- {{ ft.risk_severity|capfirst }} - - {{ finding.human_readable }} - - -
- - - - - - - - - - - - - -
{% translate "Finding type" %}: - {{ ft.human_readable }} -
{% translate "OOI type" %}: - {{ ooi.object_type }} -
{% translate "Source OOI" %}: - {{ ooi.human_readable }} -
-
+ {{ ft.risk_severity|capfirst }} + + {{ finding.human_readable }} + + +
+ + + + + + + + + + + + + +
{% translate "Finding type" %}: + {{ ft.human_readable }} +
{% translate "OOI type" %}: + {{ ooi.object_type }} +
{% translate "Source OOI" %}: + {{ ooi.human_readable }} +
+
- - - - - {% if perms.tools.change_organization %} - +

{% endif %} - - - - - - - {% if perms.tools.change_organization %} - +

{% translate "Organization details" %}

+
+
{% translate "Name" %}{% translate "Code" %}{% translate "Edit" %}
{{ organization.name }}{{ organization.code }} - {% spaceless %} - - - - {% endspaceless %} -
+ + + + + {% if perms.tools.change_organization %} + + {% endif %} + + + + + + + {% if perms.tools.change_organization %} + + {% endif %} + + +
{% translate "Name" %}{% translate "Code" %}{% translate "Edit" %}
{{ organization.name }}{{ organization.code }} + {% spaceless %} + + + + {% endspaceless %} +
+
+

{% translate "Settings" %}

+ {% if perms.tools.add_indemnification %} + {% translate "Add indemnification" %} {% endif %} - - - -
-

{% translate "Settings" %}

- {% if perms.tools.add_indemnification %} - {% translate "Add indemnification" %} - {% endif %} +

{% translate "Actions" %}

+ {% if perms.tools.can_recalculate_bits %} + + {% csrf_token %} + + + {% endif %} + + + {% if organization.tags.all %} +
+
+

{% translate "Tags" %}

+ {% include "organizations/organization_tags.html" %} -

{% translate "Actions" %}

- {% if perms.tools.can_recalculate_bits %} -
- {% csrf_token %} - -
+
+
{% endif %} - - - {% if organization.tags.all %} -
-
-

{% translate "Tags" %}

- {% include "organizations/organization_tags.html" %} - -
-
- {% endif %} - + {% endblock content %} {% block html_at_end_body %} - {{ block.super }} - + {{ block.super }} + {% endblock html_at_end_body %} diff --git a/rocky/rocky/templates/organizations/select_clearance_level_radio_input.html b/rocky/rocky/templates/organizations/select_clearance_level_radio_input.html index 9c12e42ec2b..fecf05fa08b 100644 --- a/rocky/rocky/templates/organizations/select_clearance_level_radio_input.html +++ b/rocky/rocky/templates/organizations/select_clearance_level_radio_input.html @@ -1,17 +1,15 @@ {% load i18n %}
- - {{ field.label_tag }} - + {{ field.label_tag }} {% for choice in field %}
+ {% if choice.data.attrs.disabled %}disabled{% endif %} + {% if choice.data.attrs.checked %}checked{% endif %} />