Move version "Clean" button to details page (#5706)

Move version "Clean" button to details page
readthedocs · May 30, 2019 · 6a84ae6 · 6a84ae6
2 parents 900c575 + 243c193
commit 6a84ae6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/readthedocs/templates/projects/project_version_detail.html b/readthedocs/templates/projects/project_version_detail.html
@@ -1,6 +1,7 @@
 {% extends "projects/base_project.html" %}
 
 {% load i18n %}
+{% load privacy_tags %}
 
 {% block title %}{{ version.slug }} - {{ version.project.name }}{% endblock %}
 
@@ -15,6 +16,20 @@
 
 {% block content %}
     <h2> Editing {{ version.slug }} </h2>
+
+    {% if request.user|is_admin:project %}
+      {% if not version.active and version.built %}
+        <p class="empty">
+          {% url "project_version_delete_html" project.slug version.slug as version_delete_url %}
+          {% blocktrans trimmed %}
+            This version is inactive but its documentation is still available online.
+            You can <a href="{{ version_delete_url }}">delete this version's documentation</a> if you want to remove it completely.
+          {% endblocktrans %}
+        </p>
+      {% endif %}
+    {% endif %}
+
+
     <form method="post" action=".">
       {% csrf_token %}
       {{ form.as_p }}

diff --git a/readthedocs/templates/projects/project_version_list.html b/readthedocs/templates/projects/project_version_list.html
@@ -104,9 +104,6 @@ <h1>{% trans "Inactive Versions" %}</h1>
 
                       {% if request.user|is_admin:project %}
                         <ul class="module-item-menu">
-                          {% if version.built %}
-                            <li><a href="{% url "project_version_delete_html" project.slug version.slug %}">{% trans "Clean" %}</a></li>
-                          {% endif %}
                           <li><a href="{% url "project_version_detail" project.slug version.slug %}">{% trans "Edit" %}</a></li>
                         </ul>
                       {% endif %}