Merge pull request #1727 from edx/christina/public

Minor cleanup around public RESTful URLs.

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -1968,22 +1968,22 @@ class EntryPageTestCase(TestCase):
         self.client = AjaxEnabledTestClient()
 
     def _test_page(self, page, status_code=200):
-        resp = self.client.get_html(reverse(page))
+        resp = self.client.get_html(page)
         self.assertEqual(resp.status_code, status_code)
         _test_no_locations(self, resp, status_code)
 
     def test_how_it_works(self):
-        self._test_page("howitworks")
+        self._test_page("/howitworks")
 
     def test_signup(self):
-        self._test_page("signup")
+        self._test_page("/signup")
 
     def test_login(self):
-        self._test_page("login")
+        self._test_page("/signin")
 
     def test_logout(self):
         # Logout redirects.
-        self._test_page("logout", 302)
+        self._test_page("/logout", 302)
 
 
 def _create_course(test, course_data):

cms/djangoapps/contentstore/views/public.py

@@ -10,7 +10,7 @@ from mitxmako.shortcuts import render_to_response
 
 from external_auth.views import ssl_login_shortcut
 
-__all__ = ['signup', 'old_login_redirect', 'login_page', 'howitworks']
+__all__ = ['signup', 'login_page', 'howitworks']
 
 
 @ensure_csrf_cookie
@@ -22,13 +22,6 @@ def signup(request):
     return render_to_response('signup.html', {'csrf': csrf_token})
 
 
-def old_login_redirect(request):
-    '''
-    Redirect to the active login url.
-    '''
-    return redirect('login', permanent=True)
-
-
 @ssl_login_shortcut
 @ensure_csrf_cookie
 def login_page(request):

cms/urls.py

@@ -11,7 +11,6 @@ from ratelimitbackend import admin
 admin.autodiscover()
 
 urlpatterns = patterns('',  # nopep8
-    url(r'^$', 'contentstore.views.howitworks', name='homepage'),
     url(r'^edit/(?P<location>.*?)$', 'contentstore.views.edit_unit', name='edit_unit'),
     url(r'^subsection/(?P<location>.*?)$', 'contentstore.views.edit_subsection', name='edit_subsection'),
 
@@ -78,18 +77,12 @@ urlpatterns = patterns('',  # nopep8
 # User creation and updating views
 urlpatterns += patterns(
     '',
-    url(r'^howitworks$', 'contentstore.views.howitworks', name='howitworks'),
-    url(r'^signup$', 'contentstore.views.signup', name='signup'),
 
     url(r'^create_account$', 'student.views.create_account'),
     url(r'^activate/(?P<key>[^/]*)$', 'student.views.activate_account', name='activate'),
 
-    # form page
-    url(r'^login$', 'contentstore.views.old_login_redirect', name='old_login'),
-    url(r'^signin$', 'contentstore.views.login_page', name='login'),
     # ajax view that actually does the work
     url(r'^login_post$', 'student.views.login_user', name='login_post'),
-
     url(r'^logout$', 'student.views.logout_user', name='logout'),
 )
 
@@ -97,7 +90,12 @@ urlpatterns += patterns(
 urlpatterns += patterns(
     'contentstore.views',
 
+    url(r'^$', 'howitworks', name='homepage'),
+    url(r'^howitworks$', 'howitworks'),
+    url(r'^signup$', 'signup', name='signup'),
+    url(r'^signin$', 'login_page', name='login'),
     url(r'^request_course_creator$', 'request_course_creator'),
+
     # (?ix) == ignore case and verbose (multiline regex)
     url(r'(?ix)^course_team/{}(/)?(?P<email>.+)?$'.format(parsers.URL_RE_SOURCE), 'course_team_handler'),
     url(r'(?ix)^course_info/{}$'.format(parsers.URL_RE_SOURCE), 'course_info_handler'),