update branch with current code

tamuhack-org · Nov 24, 2024 · d54a830 · d54a830
2 parents 5572567 + 69c5cbb
commit d54a830
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/hiss/static/style.css b/hiss/static/style.css
@@ -1,3 +1,5 @@
+@import url('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css');
+
 html, body {
     overflow-x: hidden;
 }
@@ -725,8 +727,6 @@ button {
     color: white;
 }
 
-@import url('//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css');
-
 .errorlist > li {
     color: #721c24;
     font-size: 14px;

diff --git a/hiss/templates/400.html b/hiss/templates/400.html
@@ -6,7 +6,7 @@
         <h1>400</h1>
         <h2>Bad Request</h2>
         <h4>Whoops! The request you made isn't valid.</h4>
-        <p>If you think this is a mistake, email us at <a href="mailto: {{ organizer_email }}">{{ organizer_email }}</a></p>
+        <p>If you think this is a mistake, email us at <a href="mailto: {{ ORGANIZER_EMAIL }}">{{ ORGANIZER_EMAIL }}</a></p>
         <a class="btn btn-lg btn-block btn-login" href="{% url 'status' %}">
             Take Me Back
         </a>

diff --git a/hiss/templates/403.html b/hiss/templates/403.html
@@ -6,7 +6,7 @@
         <h1>403</h1>
         <h2>Page Forbidden</h2>
         <h4>Whoops! It looks like you do not have access to this page.</h4>
-        <p>If you think this is a mistake, email us at <a href="mailto: {{ organizer_email }}">{{ organizer_email }}</a></p>
+        <p>If you think this is a mistake, email us at <a href="mailto: {{ ORGANIZER_EMAIL }}">{{ ORGANIZER_EMAIL }}</a></p>
         <a class="btn btn-lg btn-block btn-login" href="{% url 'status' %}">
             Take Me Back
         </a>

diff --git a/hiss/templates/404.html b/hiss/templates/404.html
@@ -6,7 +6,7 @@
         <h1>404</h1>
         <h2>Page Not Found</h2>
         <h4>Whoops! It looks like the page you are looking for doesn't exist.</h4>
-        <p>If you think this is a mistake, email us at <a href="mailto: {{ organizer_email }}">{{ organizer_email }}</a></p>
+        <p>If you think this is a mistake, email us at <a href="mailto: {{ ORGANIZER_EMAIL }}">{{ ORGANIZER_EMAIL }}</a></p>
         <a class="btn btn-lg btn-block btn-login" href="{% url 'status' %}">
             Take Me Back
         </a>

diff --git a/hiss/templates/500.html b/hiss/templates/500.html
@@ -6,7 +6,7 @@
         <h1>500</h1>
         <h2>Internal Server Error</h2>
         <h4>Whoops! There's an issue on our end. We're working to fix it!</h4>
-        <p>If you think this is a mistake, email us at <a href="mailto: {{ organizer_email }}">{{ organizer_email }}</a></p>
+        <p>If you think this is a mistake, email us at <a href="mailto: {{ ORGANIZER_EMAIL }}">{{ ORGANIZER_EMAIL }}</a></p>
         <a class="btn btn-lg btn-block btn-login" href="{% url 'status' %}">
             Take Me Back
         </a>

diff --git a/hiss/templates/application/emails/approved.html b/hiss/templates/application/emails/approved.html
@@ -45,7 +45,7 @@ <h2 style="margin-bottom: 20px; font-size: 16px; color: #777777">
           margin-bottom: 20px;
         "
       >
-        You have been accepted to {{event_name}} {{event_year}}! We were impressed by your application and we’re excited to see you  
+        You have been accepted to {{EVENT_NAME}} {{EVENT_YEAR}}! We were impressed by your application and we’re excited to see you  
         <span style="color: #ADD8E6; font-weight: 700"
         >September 28-29, 2024.</span>
       </p>
@@ -122,7 +122,7 @@ <h2 style="margin-bottom: 20px; font-size: 16px; color: #777777">
       </h3>
 
       <strong style="color: #ADD8E6; font-size: 16px">
-        The {{ organizer_name }} Team
+        The {{ ORGANIZER_NAME }} Team
       </strong>
     </div>
   </div>

diff --git a/hiss/templates/application/emails/rejected.html b/hiss/templates/application/emails/rejected.html
@@ -22,7 +22,7 @@ <h2 style="margin-bottom: 20px; font-size: 14px; color: #777777">Dear {{ first_n
 					font-weight: normal;
 					color: #777777;
 					margin-bottom: 20px;">
-					Thank you so much for applying to {{ event_name }} {{ event_year }}. We really appreciate the time you took to share your
+					Thank you so much for applying to {{ EVENT_NAME }} {{ EVENT_YEAR }}. We really appreciate the time you took to share your
 				interests and skills with us. Unfortunately, due to space limitations of the MSC, we are only able to accept a limited number hackers, and we are unable to grant you an acceptance. If you're still interested in hacking with us, our spring hackathon, TAMUhack, has a bigger capacity and more awesome prizes to win! We hope to see you there!
 				<br>
 			</p>
@@ -64,7 +64,7 @@ <h2 style="margin-bottom: 20px; font-size: 14px; color: #777777">Dear {{ first_n
 
 			<strong style=" color: #ADD8E6;
 							font-size: 14px;">
-				The {{ organizer_name }} Team
+				The {{ ORGANIZER_NAME }} Team
 			</strong>
 
 		</div>