Added countries and other demographics to be stored in db.

common/djangoapps/student/models.py

@@ -13,6 +13,7 @@ import uuid
 from django.db import models
 from django.contrib.auth.models import User
 import json
+from django_countries import CountryField
 
 #from cache_toolbox import cache_model, cache_relation
 
@@ -34,7 +35,7 @@ class UserProfile(models.Model):
     gender = models.CharField(blank=True, null=True, max_length=6, choices=GENDER_CHOICES)
     date_of_birth = models.DateField(blank=True, null=True)
     mailing_address = models.TextField(blank=True, null=True)
-    country = models.CharField(blank=True, null=True, max_length=255)
+    country = CountryField(blank=True, null=True)
     telephone_number = models.CharField(blank=True, null=True, max_length=25)
     occupation = models.CharField(blank=True, null=True, max_length=255)
 

common/djangoapps/student/views.py

@@ -169,7 +169,7 @@ def create_account(request, post_override=None):
     post_vars = post_override if post_override else request.POST
 
     # Confirm we have a properly formed request
-    for a in ['username', 'email', 'password', 'location', 'language', 'name']:
+    for a in ['username', 'email', 'password', 'language', 'name']:
         if a not in post_vars:
             js['value'] = "Error (401 {field}). E-mail us.".format(field=a)
             return HttpResponse(json.dumps(js))
@@ -235,9 +235,11 @@ def create_account(request, post_override=None):
     r.register(u)
 
     up = UserProfile(user=u)
-    up.name = post_vars['name']
-    up.language = post_vars['language']
-    up.location = post_vars['location']
+    up.name=post_vars['name']
+    up.language=post_vars['language']
+    up.country=post_vars['country']
+    up.gender=post_vars['gender']
+    up.mailing_address=post_vars['mailing_address']
     up.save()
 
     # TODO (vshnayder): the LMS should probably allow signups without a particular course too

lms/templates/signup_modal.html

 <%namespace name='static' file='static_content.html'/>
 <%! from django.core.urlresolvers import reverse %>
+<%! from django_countries import countries %>
+<%! from student.models import UserProfile %>
 
 <section id="signup-modal" class="modal signup-modal">
   <div class="inner-wrapper">
@@ -21,12 +23,24 @@
         <input name="username" type="text" placeholder="Public Username">
         <label>Full Name</label>
         <input name="name" type="text" placeholder="Full Name">
-        <label>Mailing address</label>
-        <textarea name="mailing_address" placeholder="Mailing address"></textarea>
-        <label>Country</label>
-        <input name="country" type="text" placeholder="Country of citizenship">
+        <p>
+            <label>Mailing address</label>
+            <textarea name="mailing_address" placeholder="Mailing address"></textarea>
+        </p>
+        <label>Country of citizenship</label>
+        <select name="country">
+            %for code, country in countries.COUNTRIES:
+                <option value="${code}">${country}</option>
+            %endfor
+        </select>
         <label>Preferred Language</label>
         <input name="language" type="text" placeholder="Preferred Language">
+        <label>Gender</label>
+        <select name="gender">
+            %for code, gender in UserProfile.GENDER_CHOICES:
+                <option value="${code}">${gender}</option>
+            %endfor
+        </select>
         <label class="terms-of-service">
           <input name="terms_of_service" type="checkbox" value="true">
           I agree to the