improve version listing

readthedocs · Mar 8, 2018 · cb30e4f · cb30e4f
1 parent a5675c5
commit cb30e4f
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 183 deletions.
diff --git a/media/css/core.css b/media/css/core.css
@@ -278,6 +278,10 @@ div.menu-user div.menu-dropdown.menu-dropped {
     opacity: 1;
 }
 
+/* version-property */
+
+.version-property { border-color: #E6E6E6; padding: 5px; border-style: solid; background-color: white; border-width: 8px 8px 6px 8px; }
+
 /* home */
 
 #home-header { background: url(../images/header-home-bg.svg) top left repeat #465158; border-bottom: 1px solid #333; padding: 65px 0 35px 0; color: #fff; }

diff --git a/readthedocs/builds/models.py b/readthedocs/builds/models.py
@@ -230,6 +230,11 @@ def get_conf_py_path(self):
         conf_py_path = os.path.relpath(conf_py_path, checkout_prefix)
         return conf_py_path
 
+    def get_build(self):
+        project = Project.objects.get(slug=self.project)
+        build = Build.objects.filter(project=self.project, version=self).first()
+        return build
+
     def get_build_path(self):
         """Return version build path if path exists, otherwise `None`."""
         path = self.project.checkout_path(version=self.slug)

diff --git a/readthedocs/gold/migrations/0002_auto_20180307_0807.py b/readthedocs/gold/migrations/0002_auto_20180307_0807.py
diff --git a/readthedocs/integrations/migrations/0003_auto_20180307_0807.py b/readthedocs/integrations/migrations/0003_auto_20180307_0807.py
diff --git a/readthedocs/projects/migrations/0024_auto_20180307_0807.py b/readthedocs/projects/migrations/0024_auto_20180307_0807.py
diff --git a/readthedocs/redirects/migrations/0002_auto_20180307_0807.py b/readthedocs/redirects/migrations/0002_auto_20180307_0807.py
diff --git a/readthedocs/templates/core/project_details.html b/readthedocs/templates/core/project_details.html
@@ -18,10 +18,12 @@
   <div class="module-header">
     <h3>{% trans "Versions" %}</h3>
   </div>
-
-   {% for version in versions|sort_version_aware %}
+  <br>
+
+  {% for version in versions|sort_version_aware %}
     <h4>
-    {% if version.uploaded or version.built %}
+      <span>
+        {% if version.uploaded or version.built %}
           {# Link to the docs #}
           <a class="module-item-title" href="{{ version.get_absolute_url }}">
             {{ version.slug }}
@@ -30,42 +32,37 @@ <h4>
           <a class="module-item-title" href="{{ version.project.get_builds_url }}">
             {{ version.slug }}
           </a>
-    {% endif %}
-    {% if request.user|is_admin:project %}
-    <ul class="module-item-menu">
-      <li><a href="{% url "project_version_detail" project.slug version.slug %}">{% trans "Edit" %}</a></li>
-    </ul>
-    {% endif %}
+        {% endif %}
+        {% if request.user|is_admin:project %}
+          <a class ="right-menu quiet" href="{% url "project_version_detail" project.slug version.slug %}">{% trans "Edit" %}</a>
+        {% endif %}
+      </span>
     </h4>
-
     <ul>
-    <li>
-    {% if request.user in project.users.all %}
-      Privacy level: {{ version.get_privacy_level_display }}
-    {% endif %}
-    </li>
-    <li> 
-      Build state: {% if version.get_build.success %} Success {% else %} Failed {% endif %}
-    </li>
-    <li>
-      Build date: {{ version.get_build.date }}
-    <li>
-      Branch name: {% if not version.slug in version.identifier %}
-                  {{ version.identifier_friendly|truncatechars:24 }}
-                {% endif %} 
-    }
-    </li>
-    </ul>
-
-
+      <li class="version-property">
+        Latest build state: {% if version.get_build.success %} Passed {% else %} Failed {% endif %}
+      </li>
+      <li class="version-property">
+        Latest build date: {{ version.get_build.date }}
+      </li>
+      <li class="version-property">
+        {% if request.user in project.users.all %}
+          Privacy: {{ version.get_privacy_level_display }}
+        {% endif %}
+      </li>
+      <li class="version-property">
+        {% if not version.slug in version.identifier %}
+          Branch: {{  version.identifier_friendly|truncatechars:24 }}
+        {% endif %}
+      </li>
+      <br>
+      <br>
       {% empty %}
       <p>
       {% trans "No active versions." %}
       </p>
-      {% endfor %}
-      </ul>
-    </div>
-  </div>
+    </ul>
+  {% endfor %}
 
 {% block build_versions %}
 {% if versions and request.user|is_admin:project %}
@@ -86,6 +83,7 @@ <h3>{% trans "Build a version" %}</h3>
 {% endif %}
 {% endblock %}
 
+
 </div>{# END .module #}
 
 <div class="project_details">