Merge 1402501 into c0a2fb1

cjlee112 · Dec 3, 2018 · 5379c91 · 5379c91
2 parents c0a2fb1 + 1402501
commit 5379c91
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 106 deletions.
diff --git a/mysite/lms/static/css/instructor/app.css b/mysite/lms/static/css/instructor/app.css
diff --git a/mysite/lms/static/css/instructor/app.css.map b/mysite/lms/static/css/instructor/app.css.map
diff --git a/mysite/lms/static/sass/instructor/components/_auth-card.scss b/mysite/lms/static/sass/instructor/components/_auth-card.scss
@@ -37,7 +37,7 @@
     bottom: -12px;
     width: 100%;
     text-align: center;
-    margin: 0;
+    margin: 0 0 0 -24px;
 
     span {
       display: inline-block;
@@ -65,7 +65,7 @@
 }
 
 .auth-card__content--centered {
-  text-align: center; 
+  text-align: center;
 }
 
 .auth-card__actions {

diff --git a/mysite/psa/forms.py b/mysite/psa/forms.py
@@ -28,7 +28,7 @@ class SignUpForm(forms.Form):
     last_name = forms.CharField(widget=forms.TextInput(attrs={'placeholder': 'Last name'}))
     password = forms.CharField(
         widget=forms.PasswordInput(), min_length=6,
-        help_text='Create a password that at least six chars length.'
+        help_text='Choose a password that\'s at least six characters long.'
         # validators=[password_validator]
     )
 

diff --git a/mysite/templates/accounts/profile_edit.html b/mysite/templates/accounts/profile_edit.html
@@ -21,13 +21,13 @@ <h1>Almost Done</h1>
               </p>
             {{ form.institution }}
           {% elif field.name == 'what_do_you_teach'%}
-              <label for="{{ form.what_do_you_teach.auto_id }}">What do you teach?</label>
+            <label for="{{ form.what_do_you_teach.auto_id }}">What do you teach?</label>
             {{ field }}
           {% endif %}
         {% endif %}
         {% endfor %}
         {% csrf_token %}
-        <input type="submit" value="Sign Up" class=" ">
+        <input type="submit" value="Continue" class=" ">
       </form>
     </main>
   </div>

diff --git a/mysite/templates/psa/signup.html b/mysite/templates/psa/signup.html
@@ -5,7 +5,7 @@
   <header>
     <h1>Sign Up</h1>
 
-    <p>For new instructors. Already have an account? <a href="{% url 'new_login' %}{% if form.next.value %}?next={{ form.next.value }}{% endif %}">Log in</a></p>
+    <p>For new users. Already have an account? <a href="{% url 'new_login' %}{% if form.next.value %}?next={{ form.next.value }}{% endif %}">Log in</a></p>
   </header>
 
   <section class="auth-card__social-options">
@@ -22,37 +22,48 @@ <h1>Sign Up</h1>
 
       {% for field in form %}
         {% if not field.is_hidden %}
+
           {% if field.name == 'first_name' %}
             <label for="{{ field.auto_id }}">Name</label>
             <div class="row">
               <div class="col-lg-6">
                 {{ field }}
               </div>
-            {% elif field.name == 'last_name' %}
+
+          {% elif field.name == 'last_name' %}
               <div class="col-lg-6">
                 {{ field }}
               </div>
             </div>
+
             {% if form.first_name.errors or form.last_name.errors %}
-            <div class="row">
-              <div class="col-lg-6">
-                {{ form.first_name.errors }}
-              </div>
-              <div class="col-lg-6">
-                {{ form.last_name.errors }}
+              <div class="row">
+                <div class="col-lg-6">
+                  {{ form.first_name.errors }}
+                </div>
+                <div class="col-lg-6">
+                  {{ form.last_name.errors }}
+                </div>
               </div>
-            </div>
             {% endif %}
+
+          {% elif field.name == 'email_confirmation' %}
+            <label for="{{ field.auto_id }}">Repeat your email</label>
+            {{ field }}
+
           {% else %}
-        {# ALL FIELDS EXCL. first_name, last_name #}
+            {# ALL FIELDS EXCL. first_name, last_name, email_confirmation #}
             <label for="{{ field.auto_id }}">{{ field.label }}</label>
+
             {% if field.help_text %}
-              <p><span>{{ field.help_text }}</span></p>
+            <p><span>{{ field.help_text }}</span></p>
             {% endif %}
+
             {{ field }}
             {{ field.errors }}
           {% endif %}
         {% else %}
+
         {# HIDDEN FIELDS #}
           {{ field }}
         {% endif %}