Merge pull request #385 from ComputerScienceHouse/develop

Update Packet Start Email, Zoom Photo, Alumni + Upperclassmen

Author: costowell

packet/static/js/pfp-zoom.js

@@ -0,0 +1,36 @@
+$(document).ready(function () {
+    let photos = Array.from(document.querySelectorAll('.eval-user-img'))
+
+    top.onclick = function (e) {
+        let tsib = e.target.previousElementSibling
+        if (tsib != null) {
+            if (tsib.classList.contains('eval-user-img')) {
+                return;
+            }
+        }
+        if (e.target.classList.contains('eval-user-img')) {
+            return;
+        }
+        document.querySelector('#zoom-photo').remove()
+    }
+
+    photos.forEach((photo) => {
+        photo.addEventListener('click', (e) => {
+            let other = document.querySelector('#zoom-photo')
+            if (other != null) {
+                other.remove()
+            }
+            photo.insertAdjacentHTML('afterend', `
+                <div id="zoom-photo" style="position: fixed; z-index: 1050; display: block">
+                    <img class="eval-user-img"
+                        alt=${photo.alt}
+                        src=${photo.src}
+                        style="max-width: 200px; max-height: 200px; border: 1px solid #666"
+                        >
+                </div>
+                `)
+            e.preventDefault();
+        })
+    })
+
+})

packet/templates/active_packets.html

@@ -111,6 +111,7 @@ <h4 class="page-title">Active Packets</h4>
 
 {% block scripts %}
     {{ super() }}
+    <script src="{{ url_for('static', filename='js/pfp-zoom.min.js') }}"></script>
     {% if info.realm == "csh" %}
         <script src="{{ url_for('static', filename='js/tables.min.js') }}"></script>
     {% endif %}

packet/templates/mail/packet_start.html

@@ -6,10 +6,9 @@ <h2>Hello {{ packet.freshman.name }},</h2>
         <h3>Welcome to Computer Science House!</h3>
         <p>Soon you'll starting the introductory process for CSH, and the first part of that is Packet.</p>
         <p>Your packet will start on <span class="badge">{{ packet.start.strftime('%A, %B %-d') }} at {{ packet.start.strftime('%-I:%M %p') }}</span></p>
-        <p>You can view your packet at <a href="{{ config["PROTOCOL"] + config["PACKET_INTRO"] }}">{{ config["PACKET_INTRO"] }}</a> with
-            the credentials you should have been sent.</p>
-        <p>If you don't know your credentials, reach out to an <a href="mailto:[email protected]">RTP</a></p>
-        <p>If you have any questions about Packet or the introductory process, email <a href="mailto:[email protected]">[email protected]</a></p>
-        <p>If you have any questions about login credentials or any technical issues, email <a href="mailto:[email protected]">[email protected]</a></p>
+        <p>You can view your packet at <a href="{{ config["PROTOCOL"] + config["PACKET_INTRO"] }}">{{ config["PACKET_INTRO"] }}</a> once you receive credentials.</p>
+        <p>If it is <b>past the start date</b> and you have still not received credentials, please reach out to an <a href="mailto:[email protected]">RTP</a></p>
+        <p>If it is <b>past the start date</b> and you have any questions about Packet or the introductory process, email <a href="mailto:[email protected]">[email protected]</a></p>
+        <p>If it is <b>past the start date</b> and you have any questions about login credentials or any technical issues, email <a href="mailto:[email protected]">[email protected]</a></p>
     </div>
 {% endblock %}

packet/templates/mail/packet_start.txt

@@ -6,9 +6,9 @@ Soon you'll starting the introductory process for CSH, and the first part of tha
 
 Your packet will start on {{ packet.start.strftime('%A, %B %-d') }} at {{ packet.start.strftime('%-I:%M %p') }}
 
-You can view your packet at {{ config["PROTOCOL"] + config["PACKET_INTRO"] }} with the credentials you should have been sent.
-If you don't know your credentials, reach out to an RTP
+You can view your packet at {{ config["PROTOCOL"] + config["PACKET_INTRO"] }} once you receive credentials.
+If it is past the start date and you don't know your credentials, reach out to an RTP
 
-If you have any questions about Packet or the introductory process, email [email protected]
+If it is past the start date and you have any questions about Packet or the introductory process, email [email protected]
 
-If you have any questions about login credentials or any technical issues, email [email protected]
+If it is past the start date and you have any questions about login credentials or any technical issues, email [email protected]

packet/templates/packet.html

@@ -50,7 +50,7 @@ <h5>Total Score - {{ '%0.2f' % total_score }}%</h5>
                                  aria-valuemax="100" style="width: {{ total_score }}%"></div>
                         </div>
                         {% set upper_score = received.member_total / required.member_total * 100 %}
-                        <h5>Upperclassmen Score - {{ '%0.2f' % upper_score }}%</h5>
+                        <h5>Upperclassmen + Alumni Score - {{ '%0.2f' % upper_score }}%</h5>
                         <div class="progress">
                             <div class="progress-bar bg-warning progress-bar-striped progress-bar-animated"
                                  role="progressbar" aria-valuenow="{{ upper_score }}" aria-valuemin="0"
@@ -192,3 +192,7 @@ <h5>Upperclassmen Score - {{ '%0.2f' % upper_score }}%</h5>
         </div>
     </div>
 {% endblock %}
+{% block scripts %}
+    {{ super() }}
+    <script src="{{ url_for('static', filename='js/pfp-zoom.min.js') }}"></script>
+{% endblock %}