Merge pull request #624 from MITx/rocha/master

Cleanup of 'About Course' page link to its Courseware

lms/djangoapps/courseware/views.py

@@ -264,10 +264,19 @@ def registered_for_course(course, user):
 def course_about(request, course_id):
     course = get_course_with_access(request.user, course_id, 'see_exists')
     registered = registered_for_course(course, request.user)
-    show_courseware_link = has_access(request.user, course, 'load')
+
+    if has_access(request.user, course, 'load'):
+        course_target = reverse('info', args=[course.id])
+    else:
+        course_target = reverse('about_course', args=[course.id])
+
+    show_courseware_link = (has_access(request.user, course, 'load') or
+                            settings.MITX_FEATURES.get('ENABLE_LMS_MIGRATION'))
+
     return render_to_response('portal/course_about.html',
                               {'course': course,
-                               'registered': registered, 
+                               'registered': registered,
+                               'course_target': course_target,
                                'show_courseware_link' : show_courseware_link})
 
 

lms/templates/portal/course_about.html

@@ -61,33 +61,23 @@
         </hgroup>
 
         <div class="main-cta">
-          %if user.is_authenticated():
+        %if user.is_authenticated():
             %if registered:
-   	        <%
-		  ## TODO: move this logic into a view
-                  if has_access(user, course, 'load'):
-                      course_target = reverse('info', args=[course.id])
-                  else:
-                      course_target = reverse('about_course', args=[course.id])
-                  show_link = settings.MITX_FEATURES.get('ENABLE_LMS_MIGRATION')
-                %>
-	        %if show_link or show_courseware_link:
-                <a href="${course_target}">
+	              %if show_courseware_link:
+                    <a href="${course_target}">
                 %endif
                 <span class="register disabled">You are registered for this course (${course.number})</span>
-                % if show_courseware_link:
-                  <strong>View Courseware</strong>
-                % endif
-	        %if show_link or show_courseware_link:
-                </a>
+                %if show_courseware_link:
+                    <strong>View Courseware</strong>
+                    </a>
                 %endif
             %else:
-                <a href="#" class="register">Register for ${course.number}</a>
-	        <div id="register_message"></div>
+               <a href="#" class="register">Register for ${course.number}</a>
+	             <div id="register_message"></div>
             %endif
-          %else:
+        %else:
             <a href="#signup-modal" class="register" rel="leanModal" data-notice='You must Sign Up or <a href="#login-modal" rel="leanModal">Log In</a> to enroll.'>Register for ${course.number}</a>
-          %endif
+        %endif
         </div>
 
       </section>