Skip to content
Permalink
Browse files

#MC-371 Add Work Development 1h adds credit display to artefact view …

…and update pages

- adds credit display to artefact view and update pages
- also fixes images column width discrepency between edit mode (c6) and view (c12)
  • Loading branch information...
bletourmy committed Aug 23, 2019
1 parent 11fb134 commit 95106db0fcbf32cb0da9b08778f2b3936831877a
@@ -137,14 +137,23 @@ <h1>{{ object.artefact_verbose_description_short }}</h1>
<div class="line lightbox">
{% if form %}
<div class="row">
<div class="c6" id="image_section_{{ s.section.id }}">
<div class="c12" id="image_section_{{ s.section.id }}">
{% endif %}{# form #}
{% for image in s.section.image_set.all %}
<div class="row">
{% if image.image %}
<div class="c6">
<a href="{{ image.image.url }}" class="image-popup"><img
src="{{ image.image.url }}" class="img-responsive"></a>
<a href="{{ image.image.url }}" class="image-popup">
<img src="{{ image.image.url }}" class="img-responsive">
</a>
{% if image.credit_url %}
<i>credit:</i>
<a href="{{ image.credit_url | safe}}" target="_blank">
<i>{{ image.credit | safe }}</i>
</a>
{% else %}
<i>credit: {{ image.credit | safe }}</i>
{% endif %}
</div>
<div class="c6">
<p><a name="fig1"></a>
@@ -153,8 +162,9 @@ <h1>{{ object.artefact_verbose_description_short }}</h1>
{% endfilter %}
{% if form %}
<a onclick="window.open('{% url 'artefacts:image-update' section_id=s.section.id pk=image.id %}', 'newwindow', 'height=450px, width=700px, scrollbars=1');"><i class="fa fa-pencil"></i></a>
<a onclick="window.open('{% url 'artefacts:image-delete' image.id %}', 'newwindow', 'height=450px, width=700px, scrollbars=1');"><i class="fa fa-trash"></i></a></p>
<a onclick="window.open('{% url 'artefacts:image-delete' image.id %}', 'newwindow', 'height=450px, width=700px, scrollbars=1');"><i class="fa fa-trash"></i></a>
{% endif %}
</p>
</div>
{% endif %}
</div>
@@ -1,8 +1,16 @@
{% for image in object_section.image_set.all %}
<div class="row">
<div class="c6">
<a href="{{ image.image.url }}" class="image-popup"><img src="{{ image.image.url }}" class="img-responsive"></a>
</div>
<div class="c6">
<a href="{{ image.image.url }}" class="image-popup"><img src="{{ image.image.url }}" class="img-responsive"></a>
{% if image.credit_url %}
<i>credit:</i>
<a href="{{ image.credit_url | safe }}" target="_blank">
<i>{{ image.credit | safe }}</i>
</a>
{% else %}
<i>credit: {{ image.credit | safe }}</i>
{% endif %}
</div>
<div class="c6">
<p>
{{ image.legend | safe }}

0 comments on commit 95106db

Please sign in to comment.
You can’t perform that action at this time.