reset password in welcome + update credits

Ion.egg-info/SOURCES.txt

@@ -1458,6 +1458,7 @@ intranet/templates/users/profile.html
 intranet/templates/welcome/base.html
 intranet/templates/welcome/eighth_policy.html
 intranet/templates/welcome/mail_forwarding.html
+intranet/templates/welcome/reset_password.html
 intranet/templates/welcome/student.html
 intranet/templates/welcome/student_old.html
 intranet/templates/welcome/teacher.html

intranet/static/css/welcome.scss

@@ -64,7 +64,7 @@ body {
     margin: -64px;
     background-image: url(/static/img/logos/touch/touch-icon128.png);
     background-position: 0;
-    border-radius: 10px;           
+    border-radius: 10px;
 }
 
 #step-3 .ion-welcome-logo {
@@ -81,7 +81,7 @@ body {
    0% {
      background-position-x: 0px;
    }
-   100% { 
+   100% {
      background-position-x: 500px;
    }
 }
@@ -90,7 +90,7 @@ body {
    0% {
      background-position-x: 0px;
    }
-   100% { 
+   100% {
      background-position-x: 500px;
    }
 }
@@ -118,6 +118,10 @@ body {
     width: 120px;
 }
 
+#reset-password {
+    display: none;
+}
+
 #mail-forwarding {
     display: none;
 }

intranet/static/js/welcome.js

@@ -12,8 +12,14 @@ $(document).ready(function() {
         scroll();
     });
 
-    $(".continue-step-1-mail").click(function() {
+    $(".continue-step-1-reset").click(function() {
         $("#step-1").slideUp(tm);
+        $("#reset-password").slideDown(tm);
+        scroll();
+    });
+
+    $(".continue-step-1-mail").click(function() {
+        $("#reset-password").slideUp(tm);
         $("#mail-forwarding").slideDown(tm);
         scroll();
     });

intranet/templates/credits.html

@@ -19,6 +19,7 @@
             <li>Jacob Ajit (2017)</li>
             <li>Eric Wang (2017)</li>
             <li>James Houghton (2017)</li>
+            <li>Naitian Zhou (2018)</li>
             <li>Omkar Kulkarni (2019)</li>
             <li>...more to come...</li>
         </ul>

intranet/templates/welcome/base.html

@@ -64,8 +64,15 @@ <h2>Welcome to the TJ Intranet</h2>
                 <p>You can access your TJ email account ({{ request.user.tj_email }}) by going to <a href="https://webmail.tjhsst.edu" target="_blank">webmail.tjhsst.edu</a>. You can also use another mail client <a href="https://livedoc.tjhsst.edu/wiki/Accessing_your_TJ_Email" target="_blank">via IMAP</a>. Use your Intranet credentials.</p>
 
                 <p>It is <b>strongly recommended</b> that you set up email forwarding, which will ensure that you see all of the messages sent to your account.</p>
+
+                <p><b>Before you set up forwarding, you will have to reset your Webmail password on the next page.</b></p>
             {% endblock %}
         </div>
+
+        <div id="reset-password">
+          {% include "welcome/reset_password.html" %}
+        </div>
+
         <div id="mail-forwarding">
             {% include "welcome/mail_forwarding.html" %}
         </div>

intranet/templates/welcome/mail_forwarding.html

@@ -1,5 +1,5 @@
 <h2>Mail Forwarding</h2>
-<p>Enter your password and the email you wish to forward to below. If you don't want to forward your email, press the next button.
+<p>Enter your Webmail password and the email you wish to forward to below. If you don't want to forward your email, press the next button.
 If you decide later you want to forward your email, you will have the option available in your preferences.</p>
 <form id="mail-forwarding-form">
     <table>

intranet/templates/welcome/reset_password.html

@@ -0,0 +1,4 @@
+<h2>Reset Webmail Password</h2>
+<p>Click <a href="{% url 'reset_password' %}?expired=True" target="_blank" />here</a> to reset your password.</p>
+<br />
+<div style="text-align:center"><button id="continue-step-1-mail" class="continue-step-1-mail">Set Up Email Forwarding <i class="fa fa-chevron-right"></i></button></div>

intranet/templates/welcome/student.html

@@ -4,7 +4,7 @@
 {% block step1 %}
     {{ block.super }}
     <center>
-        <button id="continue-step-1-mail" class="continue-step-1-mail">Set Up Email Forwarding <i class="fa fa-chevron-right"></i></button>
+        <button id="continue-step-1-reset" class="continue-step-1-reset">Set Your Webmail Password <i class="fa fa-chevron-right"></i></button>
     </center>
 {% endblock %}