From d655b6268c78b7593bb1cc0749e67ba7520b3801 Mon Sep 17 00:00:00 2001 From: aabboudi Date: Sat, 14 Sep 2024 19:46:29 +0100 Subject: [PATCH 1/2] Updated confirmation page --- ui/templates/contact/message-sent.html | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ui/templates/contact/message-sent.html b/ui/templates/contact/message-sent.html index 18df56f..8e3ecaf 100644 --- a/ui/templates/contact/message-sent.html +++ b/ui/templates/contact/message-sent.html @@ -9,8 +9,17 @@ {% block content %} -
-

Your message was sent successfully.

+
+
+
+ +

Your message was sent successfully. Thank you for writing to us!

+ + Home page + + +
+
From 7e999ac67677908d471dc8d4f948387890e10bca Mon Sep 17 00:00:00 2001 From: aabboudi Date: Sat, 14 Sep 2024 22:45:36 +0100 Subject: [PATCH 2/2] Made social media links dynamic on leadership cards --- executive/models.py | 4 ++- ui/static/css/input.css | 8 +++++ ui/templates/about/leadership.html | 2 +- ui/templates/components/leadershipCard.html | 38 +++++++-------------- 4 files changed, 24 insertions(+), 28 deletions(-) diff --git a/executive/models.py b/executive/models.py index f99f1d1..0ed5839 100644 --- a/executive/models.py +++ b/executive/models.py @@ -9,6 +9,7 @@ class BoardMember(models.Model): bio = models.CharField(max_length=100, blank=True, null=True) created_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) + linkedin_link = models.URLField(verbose_name="LinkedIn Profile", max_length=200, blank=True, null=True) def __str__(self): return self.name @@ -16,11 +17,12 @@ def __str__(self): class Manager(models.Model): active = models.BooleanField(default=False) name = models.CharField(max_length=100) - program = models.ForeignKey(Program, related_name='managers', on_delete=models.CASCADE, null=True) + program = models.ForeignKey(Program, related_name='managers', on_delete=models.SET_NULL, null=True) avatar = models.ImageField(upload_to='people/', blank=True, default='people/default-avatar.png', help_text='A default avatar is used if left empty.') bio = models.CharField(max_length=100, blank=True, null=True) created_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) + linkedin_link = models.URLField(verbose_name="LinkedIn Profile", max_length=200, blank=True, null=True) def __str__(self): return self.name diff --git a/ui/static/css/input.css b/ui/static/css/input.css index 8c30309..904c719 100644 --- a/ui/static/css/input.css +++ b/ui/static/css/input.css @@ -63,4 +63,12 @@ npm run watch:css dark:bg-neutral-900 dark:border-neutral-700 dark:text-neutral-400 dark:placeholder-neutral-500 dark:focus:ring-neutral-600 } /* END CONTACT PAGE */ + + /* LEADERSHIP CARD */ + .leadership-social-link-icon { + @apply inline-flex justify-center items-center size-8 text-sm font-semibold rounded-lg border border-gray-200 + text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 disabled:opacity-50 disabled:pointer-events-none + dark:text-neutral-400 dark:border-neutral-700 dark:hover:bg-neutral-700 dark:focus:bg-neutral-700 + } + /* END LEADERSHIP CARD */ } diff --git a/ui/templates/about/leadership.html b/ui/templates/about/leadership.html index a4e65eb..05ae570 100644 --- a/ui/templates/about/leadership.html +++ b/ui/templates/about/leadership.html @@ -21,7 +21,7 @@

Exec
{% for board_member in board_members %} - {% include "components/leadershipCard.html" with avatar=board_member.avatar name=board_member.name title=board_member.title bio=board_member.bio %} + {% include "components/leadershipCard.html" with avatar=board_member.avatar name=board_member.name title=board_member.title bio=board_member.bio linkedin=board_member.linkedin_link %} {% endfor %}
diff --git a/ui/templates/components/leadershipCard.html b/ui/templates/components/leadershipCard.html index 7b8e96b..b185b9b 100644 --- a/ui/templates/components/leadershipCard.html +++ b/ui/templates/components/leadershipCard.html @@ -1,9 +1,10 @@
Avatar + class="rounded-full size-20" + src={% if avatar %} {{ avatar.url }} {% endif %} + alt="Avatar" + />

{{ name }} @@ -14,31 +15,16 @@

-

- {% if bio %} {{ bio }} {% endif %} -

+ {% if bio %} +

{{ bio }}

+ {% endif %} - + {% if linkedin %} - + {% endif %}
- \ No newline at end of file + \ No newline at end of file