Merge branch 'drupal-new' of github.com:MITx/mitx into drupal-new

common/djangoapps/student/views.py

@@ -212,7 +212,7 @@ def _cert_info(user, course, cert_status):
     return d
 
 
-def login_user(request):
+def signin_user(request):
     """
     This view will display the non-modal login form
     """

lms/urls.py

@@ -15,7 +15,7 @@ urlpatterns = ('',
     url(r'^update_certificate$', 'certificates.views.update_certificate'),
     url(r'^$', 'branding.views.index', name="root"),   # Main marketing page, or redirect to courseware
     url(r'^dashboard$', 'student.views.dashboard', name="dashboard"),
-    url(r'^signin$', 'student.views.login_user', name="login_user"),
+    url(r'^signin$', 'student.views.signin_user', name="signin_user"),
     url(r'^register$', 'student.views.register_user', name="register_user"),
 
     url(r'^admin_dashboard$', 'dashboard.views.dashboard'),