moved messages template

mmcinnestaylor · mmcinnestaylor · Aug 31, 2023 · Apr 4, 2023 · Apr 7, 2023 · Apr 7, 2023
commit 81ac2c54cb1945d8109b5c9f7597502941d6348b
diff --git a/src/checkin/templates/checkin/checkin.html b/src/checkin/templates/checkin/checkin.html
@@ -13,7 +13,7 @@
 <h1 class="text-center">Contest Check-in</h1>
 
 <!-- Messages -->
-{% include 'core/messages.html' %}
+{% include 'messages.html' %}
 <!-- End Messages -->
 
 <div class="jumbotron text-center mt-4" style="background-color: #787878; margin-top: 1em;">

diff --git a/src/checkin/templates/checkin/checkin_result.html b/src/checkin/templates/checkin/checkin_result.html
@@ -9,28 +9,8 @@
 
 {% block content %}
 
-{% for message in messages %}
-	{% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}
-		<div class="alert alert-danger alert-dismissible fade show mt-3">
-			<button type="button" class="close" data-dismiss="alert">&times;</button>
-			<h1 class="display-3 text-center">{{ message }}</h1>
-		</div>
-	{% elif message.level == DEFAULT_MESSAGE_LEVELS.SUCCESS %}
-		<div class="alert alert-success alert-dismissible fade show mt-5">
-			<button type="button" class="close" data-dismiss="alert">&times;</button>
-			<h1 class="display-3 text-center">{{ message }}</h1>
-		</div>
-	{% elif message.level == DEFAULT_MESSAGE_LEVELS.WARNING %}
-		<div class="alert alert-warning alert-dismissible fade show mt-5">
-			<button type="button" class="close" data-dismiss="alert">&times;</button>
-			<h1 class="display-3 text-center">{{ message }}</h1>
-		</div>
-	{% elif message.level == DEFAULT_MESSAGE_LEVELS.INFO %}
-		<div class="alert alert-info alert-dismissible fade show mt-5">
-			<button type="button" class="close" data-dismiss="alert">&times;</button>
-			<h1 class="display-3 text-center">{{ message }}</h1>
-		</div>
-	{% endif %}
-{% endfor %}
+<!-- Messages -->
+{% include 'messages.html' %}
+<!-- End Messages -->
 
-{% endblock %}
+{% endblock %}
diff --git a/src/checkin/templates/checkin/volunteer_checkin.html b/src/checkin/templates/checkin/volunteer_checkin.html
@@ -8,7 +8,7 @@
 <h1 class="text-center">Volunteer Check-in</h1>
 
 <!-- Messages -->
-{% include 'core/messages.html' %}
+{% include 'messages.html' %}
 <!-- End Messages -->
 <div class="row justify-content-center">
     <form method="post">

diff --git a/src/contestadmin/templates/contestadmin/dashboard.html b/src/contestadmin/templates/contestadmin/dashboard.html
@@ -8,7 +8,7 @@
 	<h1 class="text-center">Contest Dashboard</h1>
 
 	<!-- Messages -->
-	{% include 'core/messages.html' %}
+	{% include 'messages.html' %}
 	<!-- End Messages -->
 
 	<!-- Contest Control Card deck -->

diff --git a/src/core/templates/core/index.html b/src/core/templates/core/index.html
@@ -10,7 +10,7 @@
 {% block content %}
 
 <!-- Messages -->
-{% include 'core/messages.html' %}
+{% include 'messages.html' %}
 <!-- End Messages -->
 
 {% cache CACHE_TIMEOUT homepage %}

diff --git a/src/lfg/templates/lfg/dashboard.html b/src/lfg/templates/lfg/dashboard.html
@@ -8,7 +8,7 @@
 	<h1 class="text-center">Looking For Group</h1>
 
 	<!-- Messages -->
-	{% include 'core/messages.html' %}
+	{% include 'messages.html' %}
 	<!-- End Messages -->
 
 	<div class="row mt-4">

diff --git a/src/lfg/templates/lfg/profile_form.html b/src/lfg/templates/lfg/profile_form.html
@@ -6,7 +6,7 @@
 {% block content %}
 	<h1 class="text-center">Manage LFG Profile</h1>
 	<!-- Messages -->
-	{% include 'core/messages.html' %}
+	{% include 'messages.html' %}
 	<!-- End Messages -->
 	<div class="row justify-content-center">
 		<div class="col col-md-4">

diff --git a/src/manager/templates/manager/course_form.html b/src/manager/templates/manager/course_form.html
@@ -14,7 +14,7 @@
 	<h1 class="text-center">My Courses</h1>
 
 	<!-- Messages -->
-	{% include 'core/messages.html' %}
+	{% include 'messages.html' %}
 	<!-- End Messages -->
 	<div class="row justify-content-center ">
 		<div class="col col-lg-8">

diff --git a/src/manager/templates/manager/dashboard.html b/src/manager/templates/manager/dashboard.html
@@ -8,7 +8,7 @@
 	<h1 class="text-center">Account Dashboard</h1>
 
 	<!-- Messages -->
-	{% include 'core/messages.html' %}
+	{% include 'messages.html' %}
 	<!-- End Messages -->
 	<!-- Announcements Display -->
 	<div class="row justify-content-center">

diff --git a/src/manager/templates/manager/join_form.html b/src/manager/templates/manager/join_form.html
@@ -6,7 +6,7 @@
 {% block content %}
 	<h1 class="text-center">Join Team</h1>
 	<!-- Messages -->
-	{% include 'core/messages.html' %}
+	{% include 'messages.html' %}
 	<!-- End Messages -->
 	<div class="row justify-content-center">
 		<div class="col col-md-8 col-lg-5">

diff --git a/src/manager/templates/manager/profile_form.html b/src/manager/templates/manager/profile_form.html
@@ -6,7 +6,7 @@
 {% block content %}
 	<h1 class="text-center">Manage Profile</h1>
 	<!-- Messages -->
-	{% include 'core/messages.html' %}
+	{% include 'messages.html' %}
 	<!-- End Messages -->
 	<div class="row justify-content-center">
 		<div class="col col-md-6 col-lg-4">

diff --git a/src/manager/templates/manager/team_form.html b/src/manager/templates/manager/team_form.html
@@ -6,7 +6,7 @@
 {% block content %}
 	<h1 class="text-center">Manage Team</h1>
 	<!-- Messages -->
-	{% include 'core/messages.html' %}
+	{% include 'messages.html' %}
 	<!-- End Messages -->
 	<div class="row justify-content-center">
 		<div class="col col-md-6 col-lg-4">

diff --git a/src/register/templates/register/recover_username_form.html b/src/register/templates/register/recover_username_form.html
@@ -8,7 +8,7 @@
 <h1 class="text-center">Recover Username</h1>
 
 <!-- Messages -->
-{% include 'core/messages.html' %}
+{% include 'messages.html' %}
 <!-- End Messages -->
 <div class="row justify-content-center">
 	<form class="mb-3" method="post">

diff --git a/src/register/templates/register/register_form.html b/src/register/templates/register/register_form.html
@@ -8,7 +8,7 @@
 <h1 class="text-center">{{ heading }} Registration</h1>
 
 <!-- Messages -->
-{% include 'core/messages.html' %}
+{% include 'messages.html' %}
 <!-- End Messages -->
 <div class="row justify-content-center">
 	<div class="col col-md-6 col-lg-4">

diff --git a/src/core/templates/core/messages.html → src/templates/messages.html b/src/core/templates/core/messages.html → src/templates/messages.html
diff --git a/src/templates/registration/login.html b/src/templates/registration/login.html
@@ -21,7 +21,7 @@ <h1 class="text-center">Login</h1>
 	{% endif %}
 
 	<!-- Messages -->
-	{% include 'core/messages.html' %}
+	{% include 'messages.html' %}
 	<!-- End Messages -->