From ba1b4586422a8b926c3ec021367d4c2316a7fd0b Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Wed, 5 Feb 2025 13:38:30 +0100 Subject: [PATCH 1/3] Filetreediff: expose it for users that have it enabled We don't expose it to all the users yet, but we want to expose it for those that we already enabled it on the Django Admin. Requires https://github.com/readthedocs/readthedocs.org/pull/11977 --- .../theme/templates/projects/addons_form.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/readthedocsext/theme/templates/projects/addons_form.html b/readthedocsext/theme/templates/projects/addons_form.html index 30bb6a92..dcbd6620 100644 --- a/readthedocsext/theme/templates/projects/addons_form.html +++ b/readthedocsext/theme/templates/projects/addons_form.html @@ -48,6 +48,10 @@ {% trans "Notifications" %} {% trans "Analytics" %} {% trans "Visual diff" %} + {# Only show File Tree Diff if it was previously enabled from Django Admin #} + {% if form.filetreediff_enabled %} + {% trans "File tree diff" %} + {% endif %} {% trans "Link previews" %} {% trans "Hotkeys" %} {% trans "Advanced" %} @@ -98,6 +102,15 @@ {% endblock addons_docdiff %} + {% block addons_filetreediff %} + {% if form.filetreediff_enabled %} +
+ {{ form.filetreediff_enabled | as_crispy_field }} + {{ form.filetreediff_ignored_files | as_crispy_field }} +
+ {% endif %} + {% endblock addons_filetreediff %} + {% block addons_link_previews %}
{{ form.linkpreviews_enabled | as_crispy_field }} From bec1c49c456741a0630b60ca0b633dd4d3e2dc73 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Tue, 11 Feb 2025 09:54:07 +0100 Subject: [PATCH 2/3] Only expose it if it's not null --- readthedocsext/theme/templates/projects/addons_form.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readthedocsext/theme/templates/projects/addons_form.html b/readthedocsext/theme/templates/projects/addons_form.html index dcbd6620..5cfaa271 100644 --- a/readthedocsext/theme/templates/projects/addons_form.html +++ b/readthedocsext/theme/templates/projects/addons_form.html @@ -49,7 +49,7 @@ {% trans "Analytics" %} {% trans "Visual diff" %} {# Only show File Tree Diff if it was previously enabled from Django Admin #} - {% if form.filetreediff_enabled %} + {% if form.filetreediff_enabled.data is not None %} {% trans "File tree diff" %} {% endif %} {% trans "Link previews" %} @@ -103,7 +103,7 @@ {% endblock addons_docdiff %} {% block addons_filetreediff %} - {% if form.filetreediff_enabled %} + {% if form.filetreediff_enabled.data is not None %}
{{ form.filetreediff_enabled | as_crispy_field }} {{ form.filetreediff_ignored_files | as_crispy_field }} From 3c0d19a3ac2b1bfd027dc619b5936cad1e3ff6d8 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Wed, 19 Feb 2025 16:03:11 +0100 Subject: [PATCH 3/3] Show file tree diff to everybody --- .../theme/templates/projects/addons_form.html | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/readthedocsext/theme/templates/projects/addons_form.html b/readthedocsext/theme/templates/projects/addons_form.html index 5cfaa271..2867d2a6 100644 --- a/readthedocsext/theme/templates/projects/addons_form.html +++ b/readthedocsext/theme/templates/projects/addons_form.html @@ -48,10 +48,7 @@ {% trans "Notifications" %} {% trans "Analytics" %} {% trans "Visual diff" %} - {# Only show File Tree Diff if it was previously enabled from Django Admin #} - {% if form.filetreediff_enabled.data is not None %} - {% trans "File tree diff" %} - {% endif %} + {% trans "File tree diff" %} {% trans "Link previews" %} {% trans "Hotkeys" %} {% trans "Advanced" %} @@ -103,12 +100,10 @@ {% endblock addons_docdiff %} {% block addons_filetreediff %} - {% if form.filetreediff_enabled.data is not None %} -
- {{ form.filetreediff_enabled | as_crispy_field }} - {{ form.filetreediff_ignored_files | as_crispy_field }} -
- {% endif %} +
+ {{ form.filetreediff_enabled | as_crispy_field }} + {{ form.filetreediff_ignored_files | as_crispy_field }} +
{% endblock addons_filetreediff %} {% block addons_link_previews %}