From 8e36aaa5b75d019fa87b8571fb85e255c99a98c6 Mon Sep 17 00:00:00 2001
From: paulmwatson <github.com@paulmwatson.com>
Date: Mon, 9 Dec 2024 17:07:57 +0200
Subject: [PATCH] Prefix all occurences of {{ member.profile_pic_url }} with {{
STATIC_HOST }} and fix hard-coded S3
---
pmg/templates/admin/inline_membership.html | 2 +-
pmg/templates/macros/members.html | 2 +-
pmg/templates/member_detail.html | 2 +-
pmg/templates/member_list.html | 4 ++--
pmg/templates/provincial/detail.html | 2 +-
pmg/templates/provincial/western_cape.html | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pmg/templates/admin/inline_membership.html b/pmg/templates/admin/inline_membership.html
index 521c22fb..8236560b 100644
--- a/pmg/templates/admin/inline_membership.html
+++ b/pmg/templates/admin/inline_membership.html
@@ -8,7 +8,7 @@
</div>
<div class="col-md-2 text-center">
{% if model and model.member.profile_pic_url %}
- <img src="http://pmg-assets.s3-eu-west-1.amazonaws.com/{{ model.member.profile_pic_url }}" style="max-width: 75px;"></img>
+ <img src="{{ STATIC_HOST }}{{ member.profile_pic_url }}" style="max-width: 75px;"></img>
{% endif %}
</div>
</div>
diff --git a/pmg/templates/macros/members.html b/pmg/templates/macros/members.html
index 5d7e1fd2..2d59fe09 100644
--- a/pmg/templates/macros/members.html
+++ b/pmg/templates/macros/members.html
@@ -1,6 +1,6 @@
{% macro member_badge(member, chairperson=False) -%}
{%- if member.profile_pic_url %}
- <a href="{{ member|member_url }}"><img class="member-profile-pic {% if chairperson %}chairperson{% endif %}" src="{{ member.profile_pic_url }}" alt="Profile picture: {{ member.name }}" ></a>
+ <a href="{{ member|member_url }}"><img class="member-profile-pic {% if chairperson %}chairperson{% endif %}" src="{{ STATIC_HOST }}{{ member.profile_pic_url }}" alt="Profile picture: {{ member.name }}" ></a>
{% else %}
<p class="text-muted">No image available</p>
{% endif %}
diff --git a/pmg/templates/member_detail.html b/pmg/templates/member_detail.html
index 978ee930..2fcc7cf8 100644
--- a/pmg/templates/member_detail.html
+++ b/pmg/templates/member_detail.html
@@ -13,7 +13,7 @@ <h1><i class="fa fa-user"></i> {{ member.name }}</h1>
<div class="row">
<div class="col-md-1">
- <img src="{{ member.profile_pic_url }}" alt="{{ member.name }}">
+ <img src="{{ STATIC_HOST }}{{ member.profile_pic_url }}" alt="{{ member.name }}">
</div>
<div class="col-md-4">
{{ member.bio|safe }}
diff --git a/pmg/templates/member_list.html b/pmg/templates/member_list.html
index 92ebe675..b9aabdc3 100644
--- a/pmg/templates/member_list.html
+++ b/pmg/templates/member_list.html
@@ -46,7 +46,7 @@ <h1><i class="fa fa-icon fa-user"></i> {{ province.name }} Members</h1>
{% for member in provincial_members %}
<div class="single-mp col-xs-12 col-sm-6 col-md-4 col-lg-3">
<a class="content-card flex" href="{{ member | member_url }}">
- <img class="member-profile-pic" src="{{ member.profile_pic_url or '/static/resources/images/no-profile-pic.svg' }}" alt="{{ member.name }}">
+ <img class="member-profile-pic" src="{{ STATIC_HOST }}{{ member.profile_pic_url or '/static/resources/images/no-profile-pic.svg' }}" alt="{{ member.name }}">
<div>
<h4 class="card-title name">{{ member.name }}</h4>
{% if member.party %}
@@ -75,7 +75,7 @@ <h5>{{ member.party.name }}</h5>
{% for member in members %}
<div class="single-mp col-xs-12 col-sm-6 col-md-4 col-lg-3">
<a class="content-card flex" href="{{ member | member_url }}">
- <img class="member-profile-pic" src="{{ member.profile_pic_url or '/static/resources/images/no-profile-pic.svg' }}" alt="{{ member.name }}">
+ <img class="member-profile-pic" src="{{ STATIC_HOST }}{{ member.profile_pic_url or '/static/resources/images/no-profile-pic.svg' }}" alt="{{ member.name }}">
<div>
<h4 class="card-title name">{{ member.name }}</h3>
{% if member.party %}
diff --git a/pmg/templates/provincial/detail.html b/pmg/templates/provincial/detail.html
index 0a35fa1a..9be0d209 100644
--- a/pmg/templates/provincial/detail.html
+++ b/pmg/templates/provincial/detail.html
@@ -58,7 +58,7 @@ <h2><i class="fa fa-icon fa-fw fa-user"></i>Members</h2>
{% for member in mpls %}
<div class="col-xs-12 col-sm-6 col-lg-4">
<a class="content-card flex" href="{{ member | member_url }}">
- <img class="member-profile-pic" src="{{ member.profile_pic_url or '/static/resources/images/no-profile-pic.svg' }}" alt="{{ member.name }}">
+ <img class="member-profile-pic" src="{{ STATIC_HOST }}{{ member.profile_pic_url or '/static/resources/images/no-profile-pic.svg' }}" alt="{{ member.name }}">
<div>
<h4 class="card-title">{{ member.name }}</h4>
<h5>{{ member.party.name }}</h5>
diff --git a/pmg/templates/provincial/western_cape.html b/pmg/templates/provincial/western_cape.html
index 79441c9d..b2f5310a 100644
--- a/pmg/templates/provincial/western_cape.html
+++ b/pmg/templates/provincial/western_cape.html
@@ -49,7 +49,7 @@ <h2><i class="fa fa-icon fa-fw fa-user"></i> Members</h2>
{% for member in mpls %}
<div class="col-xs-12 col-sm-6 col-lg-4">
<a class="content-card flex" href="{{ member | member_url }}">
- <img class="member-profile-pic" src="{{ member.profile_pic_url or '/static/resources/images/no-profile-pic.svg' }}" alt="{{ member.name }}">
+ <img class="member-profile-pic" src="{{ STATIC_HOST }}{{ member.profile_pic_url or '/static/resources/images/no-profile-pic.svg' }}" alt="{{ member.name }}">
<div>
<h4 class="card-title">{{ member.name }}</h4>
<h5>{{ member.party.name }}</h5>