diff --git a/web-app/django/VIM/templates/instruments/detail.html b/web-app/django/VIM/templates/instruments/detail.html index a3e5f3b6..edbb9a06 100644 --- a/web-app/django/VIM/templates/instruments/detail.html +++ b/web-app/django/VIM/templates/instruments/detail.html @@ -65,12 +65,6 @@

{{ active_instrument_label.name }}

Name - - Alias - - - Source - {% if user.is_authenticated %} Verification Status @@ -82,6 +76,15 @@

{{ active_instrument_label.name }}

{% endif %} + {% if user.is_authenticated %} + + Alias + + {% else %} + + Alias + + {% endif %} {% if user.is_authenticated %} Actions @@ -105,21 +108,6 @@

{{ active_instrument_label.name }}

- -
-
- {% for alias in names.aliases %} - {{ alias.name }} - {% endfor %} -
-
- - -
- {{ names.label.source_name }} -
- {% if user.is_authenticated %}
@@ -135,8 +123,55 @@

{{ active_instrument_label.name }}

{% endif %} + + {% if user.is_authenticated %} + {% for alias in names.aliases %} +
+
+ {{ alias.name }} +
+ {% if alias.verification_status == 'verified' %} + Verified + {% elif alias.verification_status == 'unverified' %} + Unverified + {% elif alias.verification_status == 'rejected' %} + Rejected + {% else %} + Under Review + {% endif %} +
+
+
+ +
+
+ {% endfor %} + {% else %} +
+
+ {% for alias in names.aliases %} + + {{ alias.name }} + {% if not forloop.last %}|{% endif %} + + {% endfor %} +
+
+ {% endif %} + {% if user.is_authenticated %} +
- -
-
Alias
-
- {% for alias in names.aliases %} - {{ alias.name }} - {% endfor %} -
-
- -
-
Source
- {{ names.label.source_name }} -
{% if user.is_authenticated %} -
+
Verification Status {{ active_instrument_label.name }}
{% endif %} + +
+ {% if names.aliases %} +
Alias
+
+ {% for alias in names.aliases %} + {% if user.is_authenticated %} +
+
+ {{ alias.name }} +
+ {% if alias.verification_status == 'verified' %} + Verified + {% elif alias.verification_status == 'unverified' %} + Unverified + {% elif alias.verification_status == 'rejected' %} + Rejected + {% else %} + Under Review + {% endif %} +
+
+ +
+ +
+
+ {% else %} + {{ alias.name }} + {% if not forloop.last %}|{% endif %} + + {% endif %} + {% endfor %} +
+ {% endif %} +
+ {% if user.is_authenticated %} -
+ +
@@ -268,7 +336,8 @@

{{ active_instrument_label.name }}

class="rounded mw-50" /> View image in full size + target="_blank">View image in full + size