diff --git a/web-app/django/VIM/apps/instruments/static/instruments/css/detail.css b/web-app/django/VIM/apps/instruments/static/instruments/css/detail.css index 7cb5e4f..c0376bf 100644 --- a/web-app/django/VIM/apps/instruments/static/instruments/css/detail.css +++ b/web-app/django/VIM/apps/instruments/static/instruments/css/detail.css @@ -25,14 +25,20 @@ } .detail-image { display: flex; - flex-direction: row; + flex-direction: column; flex-wrap: nowrap; justify-content: flex-start; align-items: flex-start; } +.image-container { + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: flex-start; + margin-bottom: 30px; +} .instrument-image { - max-width: 50%; - margin-right: 10px; + max-width: 25%; } .detail-image-caption { display: flex; @@ -97,3 +103,21 @@ th[scope='row'] { .btn.publish { background-color: #28a745; } +.btn-primary { + background-color: #435334; + border: 1px solid #435334; +} +.btn-primary:hover { + background-color: #9eb384; + border: 1px solid #9eb384; +} +.form-label { + color: #435334; +} +.image-header { + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: space-between; + align-items: flex-start; +} diff --git a/web-app/django/VIM/apps/instruments/templates/instruments/detail.html b/web-app/django/VIM/apps/instruments/templates/instruments/detail.html index 2fe1dc7..e46b208 100644 --- a/web-app/django/VIM/apps/instruments/templates/instruments/detail.html +++ b/web-app/django/VIM/apps/instruments/templates/instruments/detail.html @@ -27,40 +27,6 @@

- - - - - - - - - - - - @@ -131,20 +103,70 @@

- + + + + + + + + + + + + +
Wikidata ID - -
Hornbostel-Sachs Classification -
-
- {{ instrument.hornbostel_sachs_class }} -
-
-
MIMO Classification - -
Instrument Names in Different Languages @@ -89,11 +55,13 @@

type="text" value="{{ instrumentname.language.en_label }}" /> -
- - - -
+ {% if user.is_authenticated %} +
+ + + +
+ {% endif %}

@@ -102,11 +70,13 @@

{{ instrumentname.name }} -
- - - -
+ {% if user.is_authenticated %} +
+ + + +
+ {% endif %}

@@ -117,11 +87,13 @@

type="text" value="{{ instrumentname.source_name }}" /> -
- - - -
+ {% if user.is_authenticated %} +
+ + + +
+ {% endif %}

Image +
+ Image + {% if user.is_authenticated %} + + {% include "instruments/includes/imageUploadModal.html" %} + + {% endif %} +
+
Wikidata ID + +
Hornbostel-Sachs Classification +
+
+ {{ instrument.hornbostel_sachs_class }} +
+
+
MIMO Classification + +
diff --git a/web-app/django/VIM/apps/instruments/templates/instruments/includes/imageUploadModal.html b/web-app/django/VIM/apps/instruments/templates/instruments/includes/imageUploadModal.html new file mode 100644 index 0000000..9c8824a --- /dev/null +++ b/web-app/django/VIM/apps/instruments/templates/instruments/includes/imageUploadModal.html @@ -0,0 +1,31 @@ +