From 1d6ea5c0a670bc49e937cea4089322549b146ee8 Mon Sep 17 00:00:00 2001
From: Jonathan Cooper <j.p.cooper@ucl.ac.uk>
Date: Wed, 15 Jan 2020 15:07:50 +0000
Subject: [PATCH] Remove obsolete Files button

And moved the list versions / add version links to buttons so we
don't just have a single button on its own! (And so the drop-down
doesn't mess up spacing.)
---
 weblab/static/sass/style.scss                 |  7 ++++---
 weblab/templates/datasets/dataset_detail.html |  1 -
 weblab/templates/entities/entity_version.html | 13 ++++---------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/weblab/static/sass/style.scss b/weblab/static/sass/style.scss
index 982bce588..4492dde67 100644
--- a/weblab/static/sass/style.scss
+++ b/weblab/static/sass/style.scss
@@ -373,12 +373,13 @@ h1#entityname,
 h2#entityversionname,
 h3#entityversionfilename
 {
-        margin-bottom:0;
+  margin-top: 0.5em;
+  margin-bottom: 0;
 }
 .suppl
 {
-        color: #888;
-        font-size: .8em;
+  color: #888;
+  font-size: .8em;
 }
 
 
diff --git a/weblab/templates/datasets/dataset_detail.html b/weblab/templates/datasets/dataset_detail.html
index ca1847853..09aa4ee7c 100644
--- a/weblab/templates/datasets/dataset_detail.html
+++ b/weblab/templates/datasets/dataset_detail.html
@@ -45,7 +45,6 @@
 
     <div id="experiment-files-switcher">
 {% comment %}
-      <button style="float:left;" id="experiment-files-switcher-files" title="View files associated with this dataset">Files</button>
       <button style="margin-left:5px; float:left;" id="experiment-files-switcher-exp" title="View &amp; compare experiments using this ${entity.type}">Compare ${otherType}s</button>
       <br/>
 {% endcomment %}
diff --git a/weblab/templates/entities/entity_version.html b/weblab/templates/entities/entity_version.html
index ce1e8aaaa..003b19ac5 100644
--- a/weblab/templates/entities/entity_version.html
+++ b/weblab/templates/entities/entity_version.html
@@ -18,14 +18,6 @@
        data-alter-file-href="{% entity_url 'alter_file' entity %}"
        data-get-proto-interfaces-href="{% url 'entities:get_protocol_interfaces' %}"
        data-version-json-href="{% entity_version_url 'version_json' entity version %}">
-    <div class="closebtn">
-      <small>
-        <a href="{% entity_url 'version_list' entity %}">list all versions</a>
-        {% if permission %}
-          | <a href="{% entity_url 'newversion' entity %}">add new version</a>
-        {% endif %}
-      </small>
-    </div>
 
     <h2 id="entityversionname">
       <small>Version:</small>
@@ -60,7 +52,10 @@ <h2 id="entityversionname">
     </div>
 
     <div id="entity-view-buttons" class="link-list">
-      <a class="button selected" href="{% entity_version_url 'version' entity version %}" title="View files associated with this {{ type }}">Files</a>
+      <a class="button" href="{% entity_url 'version_list' entity %}" title="List all versions of this {{ type }}">List versions</a>
+      {% if permission %}
+        <a class="button" href="{% entity_url 'newversion' entity %}" title="Add new version of this {{ type }}">Add version</a>
+      {% endif %}
       <div class="button hover-menu" title="Compare... (hover to see options)">Compare&hellip;<ul>
         {% if type == 'model' or type == 'protocol' %}
         <li><a href="{{ entity|url_compare_experiments:version }}" title="Compare experiment results of {% if type == 'model' %}protocols run on this model version{% else %}this protocol version run on different models{% endif %}">Results with different {{ other_type }}s</a></li>