From 0fcdd845b0b10401c8e350b0a0ac08d60b000443 Mon Sep 17 00:00:00 2001
From: Will Usher <wusher@kth.se>
Date: Wed, 18 Dec 2024 17:37:19 +0100
Subject: [PATCH 1/3] Replace orcid image with static file

---
 app/static/img/ORCID-iD_icon_vector.svg | 4 ++++
 app/templates/author.html               | 6 +++---
 app/templates/authors.html              | 2 +-
 app/templates/output.html               | 2 +-
 app/templates/output_list.j2            | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 app/static/img/ORCID-iD_icon_vector.svg

diff --git a/app/static/img/ORCID-iD_icon_vector.svg b/app/static/img/ORCID-iD_icon_vector.svg
new file mode 100644
index 0000000..375b457
--- /dev/null
+++ b/app/static/img/ORCID-iD_icon_vector.svg
@@ -0,0 +1,4 @@
+<svg width="32" height="32" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M32 16c0 8.837-7.163 16-16 16-8.838 0-16-7.163-16-16C0 7.162 7.162 0 16 0c8.837 0 16 7.162 16 16Z" fill="#A6CE39"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M18.813 9.637h-5.45v13.9h5.474c4.555 0 7.35-3.378 7.35-6.95 0-1.635-.562-3.372-1.77-4.704-1.215-1.336-3.065-2.246-5.605-2.246ZM18.6 21.3h-2.813v-9.425H18.5c1.823 0 3.12.552 3.96 1.4.842.849 1.252 2.021 1.252 3.312 0 .784-.239 1.967-.993 2.948-.745.969-2.01 1.765-4.119 1.765Zm5.311-4.026c-.251 1.74-1.494 4.276-5.311 4.276h-3.063H18.6c3.817 0 5.06-2.536 5.311-4.276Zm1.812-2.405c-.657-2.601-2.85-4.982-6.91-4.982h-5.2 5.2c4.06 0 6.253 2.38 6.91 4.982Zm.215 1.718ZM8.363 9.675v13.887h2.425V9.675H8.363Zm2.175 13.637H8.612h1.925ZM9.575 8.65c.84 0 1.513-.689 1.513-1.513 0-.823-.673-1.512-1.513-1.512-.838 0-1.512.674-1.512 1.513 0 .823.672 1.512 1.512 1.512Z" fill="#fff"/>
+</svg>
diff --git a/app/templates/author.html b/app/templates/author.html
index 06d48d1..c4341bc 100644
--- a/app/templates/author.html
+++ b/app/templates/author.html
@@ -8,7 +8,7 @@
             <h1>{{ author.first_name }} {{ author.last_name }}
             {% if author.orcid %}
             <a href="{{ author.orcid }}">
-                <img alt="ORCID logo" src="https://info.orcid.org/wp-content/uploads/2019/11/orcid_16x16.png" width="24" height="24" />
+                <img alt="ORCID logo" src="{{url_for('static', path='img/ORCID-iD_icon_vector.svg')}}" width="24" height="24" />
                 </a>
             {% endif %}
             </h1>
@@ -50,8 +50,8 @@ <h5 class="card-title">Collaborators</h5>
                         <li class="list-group-item"><a href="{{ url_for('author', id=colab.uuid) }}">{{ colab.first_name}} {{ colab.last_name }}</a>
                             {% if colab.orcid %}
                             <a href="{{ colab.orcid }}">
-                            <img alt="ORCID logo" src="https://info.orcid.org/wp-content/uploads/2019/11/orcid_16x16.png" width="16" height="16" /></a>
-                        {% endif %}</li>
+                            <img alt="ORCID logo" src={{url_for('static', path='img/ORCID-iD_icon_vector.svg')}} width="16" height="16" /></a>                        {% endif %}</li>
+{                           % endif %}</li>
                         {% endfor %}
                     </ul>
                 </div></div>
diff --git a/app/templates/authors.html b/app/templates/authors.html
index 7573665..f6910bc 100644
--- a/app/templates/authors.html
+++ b/app/templates/authors.html
@@ -7,7 +7,7 @@
             <a href="{{ url_for('author', id=author.uuid) }}">{{ author.first_name}} {{ author.last_name }}</a>
             {% if author.orcid %}
                 <a href="{{ author.orcid }}">
-                <img alt="ORCID logo" src="https://info.orcid.org/wp-content/uploads/2019/11/orcid_16x16.png" width="16" height="16" /></a>
+                <img alt="ORCID logo" src={{url_for('static', path='img/ORCID-iD_icon_vector.svg')}} width="16" height="16" /></a>
             {% endif %}
             {% if author.affiliation %}
                     {% for id, value in author.affiliation|dictsort %}
diff --git a/app/templates/output.html b/app/templates/output.html
index da72a9d..540f04e 100644
--- a/app/templates/output.html
+++ b/app/templates/output.html
@@ -58,7 +58,7 @@ <h5 class="card-title">Authors</h5>
                     {% for author in output.authors %}
                         <l><a href="{{ url_for('author', id=author.uuid) }}">{{ author.first_name}} {{ author.last_name }}</a>
                         {% if author.orcid %}
-                            <a href="{{ author.orcid }}"><img alt="ORCID logo" src="https://info.orcid.org/wp-content/uploads/2019/11/orcid_16x16.png" width="16" height="16" /></a>
+                        <img alt=" logo" src={{url_for('static', path='img/ORCID-iD_icon_vector.svg')}} width="16" height="16" /></a>
                         {% endif %}</l>
                     {% endfor %}
 
diff --git a/app/templates/output_list.j2 b/app/templates/output_list.j2
index 239fbff..ac8d6e6 100644
--- a/app/templates/output_list.j2
+++ b/app/templates/output_list.j2
@@ -40,7 +40,7 @@
                     {% for author in output.authors %}
                         <l><a href="{{ url_for('author', id=author.uuid) }}">{{ author.first_name}} {{ author.last_name }}</a>
                         {% if author.orcid %}
-                            <a href="{{ author.orcid }}"><img alt="ORCID logo" src="https://info.orcid.org/wp-content/uploads/2019/11/orcid_16x16.png" width="16" height="16" /></a>
+                            <img alt="ORCID logo" src={{url_for('static', path='img/ORCID-iD_icon_vector.svg')}} width="16" height="16" /></a>
                         {% endif %}</l>
                     {% endfor %}
                     {% if output.outputs.publication_year %}({{ output.outputs.publication_year }}){% endif %}

From 5bb68c1da042ba12fd4437bbbc0d0b326e582d46 Mon Sep 17 00:00:00 2001
From: Will Usher <wusher@kth.se>
Date: Wed, 18 Dec 2024 17:46:44 +0100
Subject: [PATCH 2/3] Change static specification for orcid for flask

---
 app/templates/author.html    | 4 ++--
 app/templates/authors.html   | 2 +-
 app/templates/output.html    | 2 +-
 app/templates/output_list.j2 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/templates/author.html b/app/templates/author.html
index c4341bc..a7d6525 100644
--- a/app/templates/author.html
+++ b/app/templates/author.html
@@ -8,7 +8,7 @@
             <h1>{{ author.first_name }} {{ author.last_name }}
             {% if author.orcid %}
             <a href="{{ author.orcid }}">
-                <img alt="ORCID logo" src="{{url_for('static', path='img/ORCID-iD_icon_vector.svg')}}" width="24" height="24" />
+                <img alt="ORCID logo" src="{{url_for('static', filename='img/ORCID-iD_icon_vector.svg')}}" width="24" height="24" />
                 </a>
             {% endif %}
             </h1>
@@ -50,7 +50,7 @@ <h5 class="card-title">Collaborators</h5>
                         <li class="list-group-item"><a href="{{ url_for('author', id=colab.uuid) }}">{{ colab.first_name}} {{ colab.last_name }}</a>
                             {% if colab.orcid %}
                             <a href="{{ colab.orcid }}">
-                            <img alt="ORCID logo" src={{url_for('static', path='img/ORCID-iD_icon_vector.svg')}} width="16" height="16" /></a>                        {% endif %}</li>
+                            <img alt="ORCID logo" src={{url_for('static', filename='img/ORCID-iD_icon_vector.svg')}} width="16" height="16" /></a>                        {% endif %}</li>
 {                           % endif %}</li>
                         {% endfor %}
                     </ul>
diff --git a/app/templates/authors.html b/app/templates/authors.html
index f6910bc..10de8ad 100644
--- a/app/templates/authors.html
+++ b/app/templates/authors.html
@@ -7,7 +7,7 @@
             <a href="{{ url_for('author', id=author.uuid) }}">{{ author.first_name}} {{ author.last_name }}</a>
             {% if author.orcid %}
                 <a href="{{ author.orcid }}">
-                <img alt="ORCID logo" src={{url_for('static', path='img/ORCID-iD_icon_vector.svg')}} width="16" height="16" /></a>
+                <img alt="ORCID logo" src={{url_for('static', filename='img/ORCID-iD_icon_vector.svg')}} width="16" height="16" /></a>
             {% endif %}
             {% if author.affiliation %}
                     {% for id, value in author.affiliation|dictsort %}
diff --git a/app/templates/output.html b/app/templates/output.html
index 540f04e..f556bb4 100644
--- a/app/templates/output.html
+++ b/app/templates/output.html
@@ -58,7 +58,7 @@ <h5 class="card-title">Authors</h5>
                     {% for author in output.authors %}
                         <l><a href="{{ url_for('author', id=author.uuid) }}">{{ author.first_name}} {{ author.last_name }}</a>
                         {% if author.orcid %}
-                        <img alt=" logo" src={{url_for('static', path='img/ORCID-iD_icon_vector.svg')}} width="16" height="16" /></a>
+                        <img alt=" logo" src={{url_for('static', filename='img/ORCID-iD_icon_vector.svg')}} width="16" height="16" /></a>
                         {% endif %}</l>
                     {% endfor %}
 
diff --git a/app/templates/output_list.j2 b/app/templates/output_list.j2
index ac8d6e6..7e6fdea 100644
--- a/app/templates/output_list.j2
+++ b/app/templates/output_list.j2
@@ -40,7 +40,7 @@
                     {% for author in output.authors %}
                         <l><a href="{{ url_for('author', id=author.uuid) }}">{{ author.first_name}} {{ author.last_name }}</a>
                         {% if author.orcid %}
-                            <img alt="ORCID logo" src={{url_for('static', path='img/ORCID-iD_icon_vector.svg')}} width="16" height="16" /></a>
+                            <img alt="ORCID logo" src={{url_for('static', filename='img/ORCID-iD_icon_vector.svg')}} width="16" height="16" /></a>
                         {% endif %}</l>
                     {% endfor %}
                     {% if output.outputs.publication_year %}({{ output.outputs.publication_year }}){% endif %}

From 2ccc0e83cab8718d31e6632282be5e6d07831dcf Mon Sep 17 00:00:00 2001
From: Will Usher <wusher@kth.se>
Date: Wed, 18 Dec 2024 17:51:31 +0100
Subject: [PATCH 3/3] Removed extraneous if statement

---
 app/templates/author.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/author.html b/app/templates/author.html
index a7d6525..006dd25 100644
--- a/app/templates/author.html
+++ b/app/templates/author.html
@@ -50,8 +50,8 @@ <h5 class="card-title">Collaborators</h5>
                         <li class="list-group-item"><a href="{{ url_for('author', id=colab.uuid) }}">{{ colab.first_name}} {{ colab.last_name }}</a>
                             {% if colab.orcid %}
                             <a href="{{ colab.orcid }}">
-                            <img alt="ORCID logo" src={{url_for('static', filename='img/ORCID-iD_icon_vector.svg')}} width="16" height="16" /></a>                        {% endif %}</li>
-{                           % endif %}</li>
+                            <img alt="ORCID logo" src={{url_for('static', filename='img/ORCID-iD_icon_vector.svg')}} width="16" height="16" /></a>
+                            {% endif %}</li>
                         {% endfor %}
                     </ul>
                 </div></div>