Merge pull request #33 from Amsterdam/improvement/open-documents

All links are views
Amsterdam · Sep 18, 2024 · dc11d23 · dc11d23
2 parents 9f0855d + c0c1eac
commit dc11d23
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/app/web/cases/templates/cases/case_document_list_page.html b/app/web/cases/templates/cases/case_document_list_page.html
@@ -36,7 +36,7 @@ <h2>Alle bijlagen bij cliënt: {{ case.client_name }}</h2>
                 <tr>
                     <td>
                         <span class="show-on-mobile">Naam:</span>
-                        <a href="{% url 'download_case_document' object.id document.id %}" target="_blank" rel="noopener noreferrer"><span>{{ document.name }}</span></a>
+                        <a href="{% url 'view_case_document' object.id document.id %}" target="_blank" rel="noopener noreferrer"><span>{{ document.name }}</span></a>
                     </td>
                     <td>
                         <span class="show-on-mobile">Bestandstype:</span>
@@ -49,6 +49,10 @@ <h2>Alle bijlagen bij cliënt: {{ case.client_name }}</h2>
                     {% if not object.delete_request_date %}
                     <td>
                         <span class="show-on-mobile">Bewerk:</span>
+                        <a href="{% url 'download_case_document' object.id document.id %}" title="Bijlage downloaden" target="_blank" rel="noopener noreferrer" class="u-margin-right u-color-black" >
+                            <svg class="button__icon"  width="20" height="20" >
+                                <use href="#download" xlink:href="#download"  width="20" height="20"></use>
+                            </svg></a>
                         <a href="#" title="Bijlage aanpassen" class="u-margin-right u-color-black" data-handler="modal" data-contentid="modalDocumentUpdate-{{ document.id }}">
                             <svg class="button__icon"  width="20" height="20" >
                                 <use href="#edit-document" xlink:href="#edit-document"  width="20" height="20"></use>

diff --git a/app/web/cases/templates/cases/case_form_status.html b/app/web/cases/templates/cases/case_form_status.html
@@ -103,9 +103,17 @@ <h2 class="h3">Bijlagen <small>({{ document_list|length }})</small></h2>
             {% if document_list %}
             {% for document in document_list %}
                 <li>
-                    <div><a href="{% url 'download_case_document' object.id document.id %}
-                    " target="_blank" rel="noopener noreferrer"><span>{{ document.name }}</span></a> <span>{{ document.extension }}</span><span> {{ document.uploaded|timezone:FRONTEND_TIMEZONE|date:DATE_FORMAT }} </span></div>
-
+                    <div>
+                        <a href="{% url 'view_case_document' object.id document.id %}" target="_blank" rel="noopener noreferrer">
+                            <span>{{ document.name }}</span>
+                        </a> 
+                        <span>{{ document.extension }}</span>
+                        <span> {{ document.uploaded|timezone:FRONTEND_TIMEZONE|date:DATE_FORMAT }} </span>
+                        <a href="{% url 'download_case_document' object.id document.id %}" title="Bijlage downloaden" target="_blank" rel="noopener noreferrer" class="u-margin-right u-color-black" >
+                            <svg class="button__icon"  width="20" height="20" >
+                                <use href="#download" xlink:href="#download"  width="20" height="20"></use>
+                            </svg></a>
+                    </div>
                 </li>
             {% endfor %}
             {% else %}

diff --git a/app/web/cases/templates/cases/caseversion_page.html b/app/web/cases/templates/cases/caseversion_page.html
@@ -67,9 +67,17 @@ <h2 class="h3">Bijlagen <small>({{ document_list|length }})</small></h2>
             {% if document_list %}
             {% for document in document_list %}
                 <li>
-                    <div><a href="{% url 'download_case_document' object.id document.id %}
-                    " target="_blank" rel="noopener noreferrer"><span>{{ document.name }}</span></a> <span>{{ document.extension }}</span><span> {{ document.uploaded|timezone:FRONTEND_TIMEZONE|date:DATE_FORMAT }} </span></div>
-
+                    <div>
+                        <a href="{% url 'view_case_document' object.id document.id %}" target="_blank" rel="noopener noreferrer">
+                            <span>{{ document.name }}</span>
+                        </a> 
+                        <span>{{ document.extension }}</span>
+                        <span> {{ document.uploaded|timezone:FRONTEND_TIMEZONE|date:DATE_FORMAT }} </span>
+                        <a href="{% url 'download_case_document' object.id document.id %}" title="Bijlage downloaden" target="_blank" rel="noopener noreferrer" class="u-margin-right u-color-black" >
+                            <svg class="button__icon"  width="20" height="20" >
+                                <use href="#download" xlink:href="#download"  width="20" height="20"></use>
+                            </svg></a>
+                    </div>
                 </li>
             {% endfor %}
             {% else %}

diff --git a/app/web/forms/templates/forms/checkbox_option_document.html b/app/web/forms/templates/forms/checkbox_option_document.html
@@ -4,7 +4,7 @@
 
 <div>
     <span>
-        <a href="{% url 'download_case_document' document.case.id document.id %}" target="_blank" rel="noopener noreferrer">
+        <a href="{% url 'view_case_document' document.case.id document.id %}" target="_blank" rel="noopener noreferrer">
             {{ document.name }}
         </a>
     </span>
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     <div>
         <span>
-            <a href="{% url 'download_case_document' document.case.id document.id %}" target="_blank" rel="noopener noreferrer">
+            <a href="{% url 'view_case_document' document.case.id document.id %}" target="_blank" rel="noopener noreferrer">
                 {{ document.name }}
             </a>
         </span>
@@ Expand Down @@