From 9fbcccff060e08240b014974413ca3ba3003f109 Mon Sep 17 00:00:00 2001
From: rukwashai <rukwashai@berea.edu>
Date: Thu, 18 Jun 2026 11:01:30 -0400
Subject: [PATCH 01/10] We created the back button for create event tab pages

---
 app/templates/events/createEvent.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/templates/events/createEvent.html b/app/templates/events/createEvent.html
index 7b8a2b346..f562efb35 100644
--- a/app/templates/events/createEvent.html
+++ b/app/templates/events/createEvent.html
@@ -58,6 +58,7 @@
       {% else %}
         <div class="text-center">
           <h1 id="pageTitle">{{page_title}}</h1>
+      
         </div>
       {% endif %}
 
@@ -312,8 +313,11 @@ <h1 id="pageTitle">{{page_title}}</h1>
   </div>
   <div class="row justify-content-left mt-2">
     <div class="col-md-6 offset-md-3">
-      <div class="text-center mb-2">
+      <div class="w-100 m-auto">
         <!--Submission buttons-->
+            {% if not event %}
+        <a href="javascript:window.history.back();" class="btn btn-secondary" btn-sm m-2> Back</a>
+         {% endif %}
         {% if event %}
         <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#deleteWarning">Delete
           Event</button>
@@ -326,7 +330,7 @@ <h1 id="pageTitle">{{page_title}}</h1>
         <button type="button" class="btn btn-success" data-bs-toggle="modal" data-bs-target="#renewWarning">Renew
           Event</button>
         {% endif %}
-        <input type="button" class="btn btn-primary" id="saveButton" value="Save" />
+            <input type="button" class="btn btn-primary" id="saveButton" value="Save" /> 
       </div>
     </div>
   </div>

From 9f328276c7bfef1a4284883d762d7004b2abf469 Mon Sep 17 00:00:00 2001
From: rukwashai <rukwashai@berea.edu>
Date: Thu, 18 Jun 2026 11:34:19 -0400
Subject: [PATCH 02/10] Back button added to student search and create event

---
 app/templates/events/createEvent.html | 2 +-
 app/templates/main/userProfile.html   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/templates/events/createEvent.html b/app/templates/events/createEvent.html
index f562efb35..c85da8125 100644
--- a/app/templates/events/createEvent.html
+++ b/app/templates/events/createEvent.html
@@ -317,7 +317,7 @@ <h1 id="pageTitle">{{page_title}}</h1>
         <!--Submission buttons-->
             {% if not event %}
         <a href="javascript:window.history.back();" class="btn btn-secondary" btn-sm m-2> Back</a>
-         {% endif %}
+            {% endif %}
         {% if event %}
         <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#deleteWarning">Delete
           Event</button>
diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index 75fa86a11..69d48213d 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -13,7 +13,9 @@
 {% endblock %}
 
 {% block app_content %}
+{% if g.current_user.isAdmin or g.current_user.isCeltsStudentStaff %}
 
+{% endif %}
 <div class="row">
   <h1>{{volunteer.firstName}} {{volunteer.lastName}}</h1>
 </div>
@@ -662,6 +664,7 @@ <h6 align="left" class="d-inline-flex" id="unbanVolunteerEndDate">End Date: &nbs
 </div>
 <!-- ################# Ban or Unban Modal ################ -->
 
+<a href="javascript:window.history.back();" class="btn btn-secondary btn-s my-3">Back </a> 
 
 <!-- ################# Edit Volunteer Information Modal ################ -->
 <div class="modal fade" id="editVolunteerModal" tabindex="-1" aria-labelledby="editVolunteerModalLabel" aria-hidden="true">
@@ -714,3 +717,4 @@ <h5>Dietary Restrictions</h5>
 <!-- ################# Edit Volunteer Information Modal ################ -->
 
 {% endblock %}
+

From edd1c0a8a6d4ebb3c49cdf84e741b4c657b1ef45 Mon Sep 17 00:00:00 2001
From: rukwashai <rukwashai@berea.edu>
Date: Thu, 18 Jun 2026 14:35:35 -0400
Subject: [PATCH 03/10] back button fix

---
 app/templates/main/userProfile.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index 69d48213d..631d3fd97 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -13,9 +13,7 @@
 {% endblock %}
 
 {% block app_content %}
-{% if g.current_user.isAdmin or g.current_user.isCeltsStudentStaff %}
 
-{% endif %}
 <div class="row">
   <h1>{{volunteer.firstName}} {{volunteer.lastName}}</h1>
 </div>
@@ -664,7 +662,11 @@ <h6 align="left" class="d-inline-flex" id="unbanVolunteerEndDate">End Date: &nbs
 </div>
 <!-- ################# Ban or Unban Modal ################ -->
 
-<a href="javascript:window.history.back();" class="btn btn-secondary btn-s my-3">Back </a> 
+
+{% if volunteer != g.current_user %}
+<a href="javascript:window.history.back();" class="btn btn-secondary btn-s my-3">Back</a>
+{% endif %}
+
 
 <!-- ################# Edit Volunteer Information Modal ################ -->
 <div class="modal fade" id="editVolunteerModal" tabindex="-1" aria-labelledby="editVolunteerModalLabel" aria-hidden="true">
@@ -710,7 +712,7 @@ <h5>Dietary Restrictions</h5>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-danger" data-bs-dismiss="modal">Close</button>
-      </div>
+      </div> 
     </div>
   </div>
 </div>

From 0cbe105575eaa21a1ff962a79595b39b0be5654a Mon Sep 17 00:00:00 2001
From: rukwashai <rukwashai@berea.edu>
Date: Thu, 18 Jun 2026 15:50:18 -0400
Subject: [PATCH 04/10] Back button centered

---
 app/templates/main/userProfile.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index 631d3fd97..917993e41 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -664,7 +664,9 @@ <h6 align="left" class="d-inline-flex" id="unbanVolunteerEndDate">End Date: &nbs
 
 
 {% if volunteer != g.current_user %}
-<a href="javascript:window.history.back();" class="btn btn-secondary btn-s my-3">Back</a>
+<div class="text-center my-3">
+  <a href="javascript:window.history.back();" class="btn btn-secondary">Back</a>
+</div>
 {% endif %}
 
 

From 27c2eb03ddfb2b9ebe64df34791694ece2d33556 Mon Sep 17 00:00:00 2001
From: rukwashai <rukwashai@berea.edu>
Date: Fri, 19 Jun 2026 10:48:21 -0400
Subject: [PATCH 05/10] Fix back button: replace javascript href with explicit
 routes, center buttons

---
 app/templates/events/createEvent.html | 4 ++--
 app/templates/main/userProfile.html   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/templates/events/createEvent.html b/app/templates/events/createEvent.html
index c85da8125..71f6f59c0 100644
--- a/app/templates/events/createEvent.html
+++ b/app/templates/events/createEvent.html
@@ -311,12 +311,12 @@ <h1 id="pageTitle">{{page_title}}</h1>
       {% endif %}
     </div>
   </div>
-  <div class="row justify-content-left mt-2">
+  <div class="row justify-content-center mt-2">
     <div class="col-md-6 offset-md-3">
       <div class="w-100 m-auto">
         <!--Submission buttons-->
             {% if not event %}
-        <a href="javascript:window.history.back();" class="btn btn-secondary" btn-sm m-2> Back</a>
+        <a href="{{ url_for('admin.templateSelect') }}" class="btn btn-secondary btn-sm m-2">Back</a>
             {% endif %}
         {% if event %}
         <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#deleteWarning">Delete
diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index 8061bdf71..45275fbad 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -665,7 +665,7 @@ <h6 align="left" class="d-inline-flex" id="unbanVolunteerEndDate">End Date: &nbs
 
 {% if volunteer != g.current_user %}
 <div class="text-center my-3">
-  <a href="javascript:window.history.back();" class="btn btn-secondary">Back</a>
+  <a href="{{ url_for('admin.studentSearchPage') }}" class="btn btn-secondary">Back</a>
 </div>
 {% endif %}
 

From f1825cd5f4efee369e3dceccc1aa67a6d6fe8680 Mon Sep 17 00:00:00 2001
From: rukwashai <rukwashai@berea.edu>
Date: Fri, 19 Jun 2026 10:56:20 -0400
Subject: [PATCH 06/10] Remove btn-sm from back button to match save button
 size

---
 app/templates/events/createEvent.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/events/createEvent.html b/app/templates/events/createEvent.html
index 71f6f59c0..610864950 100644
--- a/app/templates/events/createEvent.html
+++ b/app/templates/events/createEvent.html
@@ -316,7 +316,7 @@ <h1 id="pageTitle">{{page_title}}</h1>
       <div class="w-100 m-auto">
         <!--Submission buttons-->
             {% if not event %}
-        <a href="{{ url_for('admin.templateSelect') }}" class="btn btn-secondary btn-sm m-2">Back</a>
+        <a href="{{ url_for('admin.templateSelect') }}" class="btn btn-secondary m-2">Back</a>
             {% endif %}
         {% if event %}
         <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#deleteWarning">Delete

From 3702f32c0ee36ce8933082d2c0b9b5dd3ec33187 Mon Sep 17 00:00:00 2001
From: rukwashai <rukwashai@berea.edu>
Date: Mon, 22 Jun 2026 13:52:27 -0400
Subject: [PATCH 07/10] Show back button on expired and incomplete events

Previously the back button only appeared during event creation. Added back button for existing events (expired and not-yet-completed) that navigates to the event view page, as requested in PR review.
---
 app/templates/events/createEvent.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/templates/events/createEvent.html b/app/templates/events/createEvent.html
index 610864950..09838195f 100644
--- a/app/templates/events/createEvent.html
+++ b/app/templates/events/createEvent.html
@@ -317,6 +317,8 @@ <h1 id="pageTitle">{{page_title}}</h1>
         <!--Submission buttons-->
             {% if not event %}
         <a href="{{ url_for('admin.templateSelect') }}" class="btn btn-secondary m-2">Back</a>
+            {% else %}
+        <a href="{{ url_for('admin.eventDisplay', eventId=event.id) }}" class="btn btn-secondary m-2">Back</a>
             {% endif %}
         {% if event %}
         <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#deleteWarning">Delete

From f4e3773536b91f3d98897ab112e016f722cdf07b Mon Sep 17 00:00:00 2001
From: rukwashai <rukwashai@berea.edu>
Date: Tue, 23 Jun 2026 10:29:30 -0400
Subject: [PATCH 08/10] Removed of back button on create event

---
 app/templates/events/createEvent.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/templates/events/createEvent.html b/app/templates/events/createEvent.html
index 09838195f..648286302 100644
--- a/app/templates/events/createEvent.html
+++ b/app/templates/events/createEvent.html
@@ -316,8 +316,6 @@ <h1 id="pageTitle">{{page_title}}</h1>
       <div class="w-100 m-auto">
         <!--Submission buttons-->
             {% if not event %}
-        <a href="{{ url_for('admin.templateSelect') }}" class="btn btn-secondary m-2">Back</a>
-            {% else %}
         <a href="{{ url_for('admin.eventDisplay', eventId=event.id) }}" class="btn btn-secondary m-2">Back</a>
             {% endif %}
         {% if event %}

From 05215b0dfe1f475814b0ae09f708d4f8b19734c0 Mon Sep 17 00:00:00 2001
From: nahom70 <terrefen@berea.edu>
Date: Tue, 23 Jun 2026 11:09:55 -0400
Subject: [PATCH 09/10] error fixed

---
 app/templates/events/createEvent.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/events/createEvent.html b/app/templates/events/createEvent.html
index 648286302..2e9b35673 100644
--- a/app/templates/events/createEvent.html
+++ b/app/templates/events/createEvent.html
@@ -316,7 +316,7 @@ <h1 id="pageTitle">{{page_title}}</h1>
       <div class="w-100 m-auto">
         <!--Submission buttons-->
             {% if not event %}
-        <a href="{{ url_for('admin.eventDisplay', eventId=event.id) }}" class="btn btn-secondary m-2">Back</a>
+         <a href="{{ url_for('admin.templateSelect') }}" class="btn btn-secondary m-2">Back</a>
             {% endif %}
         {% if event %}
         <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#deleteWarning">Delete

From b813b54ae16c85e36cb1c5d99bc2f64dbbb8fe77 Mon Sep 17 00:00:00 2001
From: nahom70 <terrefen@berea.edu>
Date: Tue, 23 Jun 2026 11:25:25 -0400
Subject: [PATCH 10/10] adjusted code position of back button on userprofile

---
 app/templates/main/userProfile.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index 45275fbad..5b6d80474 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -541,6 +541,13 @@ <h5>Requirement Progress</h5>
   {% endif %}
 <!-- ################# Bonner Scholar ################ -->
 
+{% if volunteer != g.current_user %}
+<div class="my-3">
+  <a href="{{ url_for('admin.studentSearchPage') }}" class="btn btn-secondary">Back</a>
+</div>
+{% endif %}
+
+
 </div>
 <!-- ################# Add Notes Modal ################ -->
 <div class="modal fade" id="noteModal" tabindex="-1" aria-labelledby="addProfileNoteModalLabel" aria-hidden="true" style="width:-60px;">
@@ -663,11 +670,6 @@ <h6 align="left" class="d-inline-flex" id="unbanVolunteerEndDate">End Date: &nbs
 <!-- ################# Ban or Unban Modal ################ -->
 
 
-{% if volunteer != g.current_user %}
-<div class="text-center my-3">
-  <a href="{{ url_for('admin.studentSearchPage') }}" class="btn btn-secondary">Back</a>
-</div>
-{% endif %}
 
 
 <!-- ################# Edit Volunteer Information Modal ################ -->