Merge design and dev JS/UI for verify student

common/djangoapps/course_modes/views.py

@@ -58,9 +58,11 @@ class ChooseModeView(View):
             donation_for_course[course_id] = float(amount)
             request.session["donation_for_course"] = donation_for_course
 
+            # TODO: Check here for minimum pricing
+
             return redirect(
                 "{}?{}".format(
-                    reverse('verify_student_verify'),
+                    reverse('verify_student_show_requirements'),
                     urlencode(dict(course_id=course_id))
                 )
             )

lms/djangoapps/verify_student/urls.py

@@ -6,11 +6,6 @@ from verify_student import views
 urlpatterns = patterns(
     '',
     url(
-        r'^show_requirements',
-        views.show_requirements,
-        name="verify_student/show_requirements"
-    ),
-    url(
         r'^face_upload',
         views.face_upload,
         name="verify_student/face_upload"
@@ -29,9 +24,9 @@ urlpatterns = patterns(
     # The above are what we did for the design mockups, but what we're really
     # looking at now is:
     url(
-        r'^show_verification_page',
-        views.show_verification_page,
-        name="verify_student/show_verification_page"
+        r'^show_requirements',
+        views.show_requirements,
+        name="verify_student_show_requirements"
     ),
 
     url(
@@ -44,6 +39,12 @@ urlpatterns = patterns(
         r'^create_order',
         views.create_order,
         name="verify_student_create_order"
-    )
+    ),
+
+    url(
+        r'^show_verification_page',
+        views.show_verification_page,
+        name="verify_student/show_verification_page"
+    ),
 
 )

lms/djangoapps/verify_student/views.py

@@ -77,7 +77,7 @@ def create_order(request):
 
 def show_requirements(request):
     """This might just be a plain template without a view."""
-    context = { "course_id" : "edX/Certs101/2013_Test" }
+    context = { "course_id" : request.GET.get("course_id") }
     return render_to_response("verify_student/show_requirements.html", context)
 
 def face_upload(request):

lms/templates/courseware/course_about.html

@@ -101,7 +101,7 @@
         %else:
             <a href="#" class="register">${_("Register for {course.display_number_with_default}").format(course=course) | h}</a>
 
-            <a href="${reverse('verify_student/show_requirements')}">Mock Verify Enrollment</a>
+            <a href="${reverse('verify_student_show_requirements')}">Mock Verify Enrollment</a>
 
             <div id="register_error"></div>
         %endif

lms/templates/verify_student/photo_id_upload.html

@@ -122,7 +122,7 @@ $(document).ready(function() {
           </p>
 
           <p class="m-btn-primary green">
-            <a href="${reverse('verify_student/show_requirements')}">Select Certificate</a>
+            <a href="${reverse('verify_student_show_requirements')}">Select Certificate</a>
           </p>
       </div>
 

lms/templates/verify_student/show_requirements.html

@@ -8,7 +8,7 @@
   <section class="wrapper">
 
   <header class="page-header header-white">
-    <h2 class="title header-white-title">You are registering for [coursename] (ID Verified)</h2>
+    <h2 class="title header-white-title">You are registering for ${course_id} (ID Verified)</h2>
   </header>
 
   <section class="progress">
@@ -52,7 +52,7 @@
     <h3 class="title">Steps to get Verified</h3>
 
       <div class="next-step">
-        <p class="m-btn-primary"><a href="${reverse('verify_student/face_upload')}">Go to Step 1: Take my Photo</a></p>
+        <p class="m-btn-primary"><a href="${reverse('verify_student_verify') + '?course_id=' + course_id}">Go to Step 1: Take my Photo</a></p>
       </div>
 
     <h4 class="step"><span class="number">1</span> Take Your Photo</h4>
@@ -82,9 +82,8 @@
 
     <p>You are now verified. You can sign up for more courses, or get started on your course once it starts. While you will need to re-verify in the course prior to exams or expercises, you may also have to re-verify if we feel your photo we have on file may be out of date.</p>
 
-
       <div class="next-step">
-        <p class="m-btn-primary"><a href="${reverse('verify_student/face_upload')}">Go to Step 1: Take my Photo</a></p>
+        <p class="m-btn-primary"><a href="${reverse('verify_student_verify') + '?course_id=' + course_id}">Go to Step 1: Take my Photo</a></p>
       </div>
     </section>