Merge pull request #872 from edx/christina/about-page

Don't show course about page link when we have the marketing site.

cms/djangoapps/contentstore/tests/test_course_settings.py

@@ -118,7 +118,8 @@ class CourseDetailsTestCase(CourseTestCase):
 
         with mock.patch.dict('django.conf.settings.MITX_FEATURES', {'ENABLE_MKTG_SITE': True}):
             response = self.client.get(settings_details_url)
-            self.assertContains(response, "Course Summary Page")
+            self.assertNotContains(response, "Course Summary Page")
+            self.assertNotContains(response, "Send a note to students via email")
             self.assertContains(response, "course summary page will not be viewable")
 
             self.assertContains(response, "Course Start Date")
@@ -143,6 +144,7 @@ class CourseDetailsTestCase(CourseTestCase):
         with mock.patch.dict('django.conf.settings.MITX_FEATURES', {'ENABLE_MKTG_SITE': False}):
             response = self.client.get(settings_details_url)
             self.assertContains(response, "Course Summary Page")
+            self.assertContains(response, "Send a note to students via email")
             self.assertNotContains(response, "course summary page will not be viewable")
 
             self.assertContains(response, "Course Start Date")

cms/templates/settings.html

@@ -91,6 +91,7 @@ from contentstore import utils
             </li>
           </ol>
 
+          % if about_page_editable:
           <div class="note note-promotion note-promotion-courseURL has-actions">
             <h3 class="title">${_("Course Summary Page")} <span class="tip">${_("(for student enrollment and access)")}</span></h3>
             <div class="copy">
@@ -103,6 +104,7 @@ from contentstore import utils
               </li>
             </ul>
           </div>
+          % endif
 
           % if not about_page_editable:
           <div class="notice notice-incontext notice-workflow">