Merge branch 'staging' into sandeep-dev

tamuhack-org · Nov 24, 2024 · aaf4eca · aaf4eca
2 parents ae238de + 62b2696
commit aaf4eca
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 21 deletions.
diff --git a/hiss/application/models.py b/hiss/application/models.py
@@ -67,6 +67,10 @@ class Wave(models.Model):
 
     def clean(self):
         super().clean()
+        if not (self.start and self.end):
+            raise exceptions.ValidationError(
+                {"start": "Start or End fields cannot be empty."}
+            )
         if self.start >= self.end:
             raise exceptions.ValidationError(
                 {"start": "Start date can't be after end date."}

diff --git a/hiss/static/style.css b/hiss/static/style.css
@@ -922,6 +922,11 @@ button {
         font-size: 12px;
         line-height: 14px;
     }
+
+    #resume-upload-btn {
+        float: left;
+        margin-right: 10px;
+    }
 
     .application {
         padding: 2em 1.2em;

diff --git a/hiss/templates/application/emails/approved.html b/hiss/templates/application/emails/approved.html
@@ -7,7 +7,11 @@
       padding: 20px;
     "
   >
+<<<<<<< HEAD
+  <header style='
+=======
   <!-- <header style='
+>>>>>>> origin
       max-width: 500px;
       display: block;
       margin-right: auto;
@@ -16,7 +20,11 @@
       <div id='created-banner'>
         <img src='/resources/img/tamuhack-header.jpg' alt='tamuhack banner'>
       </div>
+<<<<<<< HEAD
+  </header>
+=======
   </header> -->
+>>>>>>> origin
 
     <div
       style="

diff --git a/hiss/templates/application/emails/confirmed-th.html b/hiss/templates/application/emails/confirmed-th.html
diff --git a/hiss/templates/application/emails/confirmed.html b/hiss/templates/application/emails/confirmed.html
@@ -391,14 +391,16 @@
                         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;">
                             <tr>
                                 <td align="center" valign="top" id="templateHeader" class="bannerContainer" data-template-container="" style="background: url('https://register.tamuhack.com/static/hh24emailheader.jpg') no-repeat center/cover; background-size: contain; height: 115px; mso-line-height-rule: exactly; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; border-top: 0; border-bottom: 0; padding-top: 54px; padding-bottom: 54px;">
+>
                                     <!--[if (gte mso 9)|(IE)]>
                                     <table align="center" border="0" cellspacing="0" cellpadding="0" width="600" style="width:600px;">
                                     <tr>
                                     <td align="center" valign="top" width="600" style="width:600px;">
                                     <![endif]-->
                                     <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" class="templateContainer" style="border-collapse: collapse;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;max-width: 600px !important;">
                                         <tr>
-                                            <td valign="top" class="headerContainer" style="background: none no-repeat center/cover;mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;border-top: 0;border-bottom: 0;padding-top: 0;padding-bottom: 0;">
+                                            <td valign="top" class="headerContainer" style="background: transparent url('/resources/img/tamuhack-header.jpg') no-repeat center/cover;mso-line-height-rule: exactly;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;border-top: 0;border-bottom: 0;padding-top: 0;padding-bottom: 0;">
+
 
 </table></td>
                                         </tr>

diff --git a/hiss/templates/application/emails/created.html b/hiss/templates/application/emails/created.html
@@ -1,6 +1,20 @@
 <html>
-	<div style="max-width:800px; background-color: #ADD8E6; z-index: -1; position: absolute; top: 0; left: 0; padding: 20px">
+	<header>
+		<div id='created-banner'>
+				<img src='/resources/img/tamuhack-header.jpg' alt='tamuhack banner'>
+		</div>
+	</header>
 
+    <div style="font-family: Questrial, sans-serif;
+				background: #fff;
+				box-shadow: 0px 10px 10px rgba(0, 0, 0, 0.1);
+				border-radius: 3px;
+				padding: 50px!important;
+				max-width: 500px;
+				display: block;
+				margin: 20px auto;
+				margin-top: 0px">
+        <h2 style="margin-bottom: 20px; font-size: 14px; color: #777777">Hi {{ first_name }}!</h2>
 		<div style="font-family: Questrial, sans-serif;
 					background: #fff;
 					box-shadow: 0px 10px 10px rgba(0, 0, 0, 0.1);
@@ -20,20 +34,11 @@ <h2 style="margin-bottom: 20px; font-size: 14px; color: #777777">Hi {{ first_nam
 				{{EVENT_NAME}} {{EVENT_YEAR}} We'll be carefully reviewing your application
 				and will get back to you soon!
 			</p>
+        <strong style=" color: #ADD8E6;
+						font-size: 14px;">
+            The {{ORGANIZER_NAME}} Team
+        </strong>
 
-			<h3 style=" margin-bottom: 5px;
-						font-size: 14px;
-						line-height: 30px;
-						-webkit-font-smoothing: antialiased;
-						font-weight: normal;">
-				Thanks!
-			</h3>
-
-			<strong style=" color: #ADD8E6;
-							font-size: 14px;">
-				The {{ORGANIZER_NAME}} Team
-			</strong>
-
-		</div>
-	</div>
+    </div>
+</div>
 </html>
diff --git a/hiss/templates/application/emails/rejected.html b/hiss/templates/application/emails/rejected.html
@@ -1,11 +1,32 @@
 <html>
+<<<<<<< HEAD
+<div style="max-width:800px; background-color: #ADD8E6; z-index: -1; position: absolute; top: 0; left: 0; padding: 20px">
+
+	<header>
+		<div id='created-banner'>
+				<img src='/resources/img/tamuhack-header.jpg' alt='tamuhack banner'>
+		</div>
+	</header>
+
+    <div style="font-family: Questrial, sans-serif;
+				background: #fff;
+				box-shadow: 0px 10px 10px rgba(0, 0, 0, 0.1);
+				border-radius: 3px;
+				padding: 50px!important;
+				max-width: 500px;
+				display: block;
+				margin: 20px auto;
+				margin-top:0px">
+        <h2 style="margin-bottom: 20px; font-size: 14px; color: #777777">Dear {{ first_name }},</h2>
+=======
 	<div style="max-width:800px; background-color: #ADD8E6; z-index: -1; position: absolute; top: 0; left: 0; padding: 20px">
 
 		<!-- <header>
 			<div id='created-banner'>
 					<img src='/resources/img/tamuhack-header.jpg' alt='tamuhack banner'>
 			</div>
 		</header> -->
+>>>>>>> origin
 
 		<div style="font-family: Questrial, sans-serif;
 					background: #fff;
@@ -62,10 +83,17 @@ <h2 style="margin-bottom: 20px; font-size: 14px; color: #777777">Dear {{ first_n
 				Best regards,
 			</h3>
 
+<<<<<<< HEAD
+        <strong style=" color: #ADD8E6;
+						font-size: 14px;">
+			The {{ORGANIZER_NAME}} Team
+        </strong>
+=======
 			<strong style=" color: #ADD8E6;
 							font-size: 14px;">
 				The {{ organizer_name }} Team
 			</strong>
+>>>>>>> origin
 
 		</div>
 	</div>

diff --git a/hiss/templates/application/widgets/resume_upload_widget.html b/hiss/templates/application/widgets/resume_upload_widget.html
@@ -1,5 +1,5 @@
 {% spaceless %}
-<div class="file-input-container">
+<div class="file-input-container" id = "resume-upload-btn">
   {{ widget.label_tag }}
   {{ widget }}
   <span class="file-label">No file chosen</span>