Course-run edit page text changes.

ECOM-7414

course_discovery/apps/publisher/tests/test_views.py

@@ -2366,7 +2366,7 @@ class CourseRunEditViewTests(TestCase):
         """
         toggle_switch('publisher_hide_features_for_pilot', True)
         response = self.client.get(self.edit_page_url)
-        self.assertContains(response, '<div id="about-page" class="layout-full publisher-layout layout hidden">')
+        self.assertContains(response, '<div id="about-page" class="course-information hidden">')
 
     def test_page_with_disable_waffle_switch(self):
         """
@@ -2375,7 +2375,7 @@ class CourseRunEditViewTests(TestCase):
         """
         toggle_switch('publisher_hide_features_for_pilot', False)
         response = self.client.get(self.edit_page_url)
-        self.assertContains(response, '<div id="about-page" class="layout-full publisher-layout layout ">')
+        self.assertContains(response, '<div id="about-page" class="course-information ">')
 
 
 class CourseRevisionViewTests(TestCase):

course_discovery/conf/locale/en/LC_MESSAGES/django.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-14 12:15+0500\n"
+"POT-Creation-Date: 2017-03-14 14:33+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #: apps/api/filters.py
 #, python-brace-format
@@ -1241,7 +1241,6 @@ msgid "etc."
 msgstr ""
 
 #: templates/publisher/add_courserun_form.html
-#: templates/publisher/add_update_course_form.html
 #: templates/publisher/course_edit_form.html
 msgid "About page information"
 msgstr ""
@@ -1273,17 +1272,29 @@ msgid "Save Draft"
 msgstr ""
 
 #: templates/publisher/add_update_course_form.html
-msgid "Course Form"
+msgid "Edit Course Run"
 msgstr ""
 
 #: templates/publisher/add_update_course_form.html
-#: templates/publisher/course_edit_form.html
-msgid "Edit Course"
+#: templates/publisher/courses.html
+msgid "Create New Course"
 msgstr ""
 
 #: templates/publisher/add_update_course_form.html
-#: templates/publisher/courses.html
-msgid "Create New Course"
+#, python-format
+msgid ""
+"To add or edit information about this course run, make changes on this page "
+"and then select %(strong_start)sUpdate Course Run%(strong_end)s. All "
+"required fields must be complete before this course run can be sent for "
+"review."
+msgstr ""
+
+#: templates/publisher/add_update_course_form.html
+#, python-format
+msgid ""
+"%(strong_start)sNote:%(strong_end)s If you edit course information after edX"
+" marketing has reviewed the course, you have to send the course to edX "
+"marketing for review again."
 msgstr ""
 
 #: templates/publisher/add_update_course_form.html
@@ -1298,6 +1309,10 @@ msgid "All of the following information is required."
 msgstr ""
 
 #: templates/publisher/add_update_course_form.html
+msgid "About Page Information"
+msgstr ""
+
+#: templates/publisher/add_update_course_form.html
 #: templates/publisher/course_edit_form.html
 msgid "Studio Instance"
 msgstr ""
@@ -1829,6 +1844,10 @@ msgid ""
 "publishes the course About page."
 msgstr ""
 
+#: templates/publisher/add_update_course_form.html
+msgid "Update Course Run"
+msgstr ""
+
 #: templates/publisher/admin/add_user_form.html
 msgid ""
 "First, enter a username and select a group. Then, you'll be able to edit "
@@ -1911,6 +1930,10 @@ msgid ""
 msgstr ""
 
 #: templates/publisher/course_edit_form.html
+msgid "Edit Course"
+msgstr ""
+
+#: templates/publisher/course_edit_form.html
 msgid ""
 "The information in the Studio Instance section is required before edX can "
 "create a Studio instance for the course run."

course_discovery/conf/locale/en/LC_MESSAGES/djangojs.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-14 12:15+0500\n"
+"POT-Creation-Date: 2017-03-14 14:33+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #: static/js/catalogs-change-form.js
 msgid "Preview"

course_discovery/conf/locale/eo/LC_MESSAGES/django.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-14 12:15+0500\n"
+"POT-Creation-Date: 2017-03-14 14:33+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: apps/api/filters.py
@@ -1445,7 +1445,6 @@ msgid "etc."
 msgstr "étç. Ⱡ'σяєм ι#"
 
 #: templates/publisher/add_courserun_form.html
-#: templates/publisher/add_update_course_form.html
 #: templates/publisher/course_edit_form.html
 msgid "About page information"
 msgstr "Àßöüt pägé ïnförmätïön Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢#"
@@ -1481,13 +1480,8 @@ msgid "Save Draft"
 msgstr "Sävé Dräft Ⱡ'σяєм ιρѕυм ∂σłσ#"
 
 #: templates/publisher/add_update_course_form.html
-msgid "Course Form"
-msgstr "Çöürsé Förm Ⱡ'σяєм ιρѕυм ∂σłσя #"
-
-#: templates/publisher/add_update_course_form.html
-#: templates/publisher/course_edit_form.html
-msgid "Edit Course"
-msgstr "Édït Çöürsé Ⱡ'σяєм ιρѕυм ∂σłσя #"
+msgid "Edit Course Run"
+msgstr "Édït Çöürsé Rün Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
 
 #: templates/publisher/add_update_course_form.html
 #: templates/publisher/courses.html
@@ -1497,6 +1491,40 @@ msgstr "Çréäté Néw Çöürsé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α
 #: templates/publisher/add_update_course_form.html
 #, python-format
 msgid ""
+"To add or edit information about this course run, make changes on this page "
+"and then select %(strong_start)sUpdate Course Run%(strong_end)s. All "
+"required fields must be complete before this course run can be sent for "
+"review."
+msgstr ""
+"Tö ädd ör édït ïnförmätïön äßöüt thïs çöürsé rün, mäké çhängés ön thïs pägé "
+"änd thén séléçt %(strong_start)sÛpdäté Çöürsé Rün%(strong_end)s. Àll "
+"réqüïréd fïélds müst ßé çömplété ßéföré thïs çöürsé rün çän ßé sént för "
+"révïéw. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ "
+"єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє мαgηα αłιqυα. υт єηιм α∂ мιηιм"
+" νєηιαм, qυιѕ ησѕтяυ∂ єχєя¢ιтαтιση υłłαм¢σ łαвσяιѕ ηιѕι υт αłιqυιρ єχ єα "
+"¢σммσ∂σ ¢σηѕєqυαт. ∂υιѕ αυтє ιяυяє ∂σłσя ιη яєρяєнєη∂єяιт ιη νσłυρтαтє νєłιт"
+" єѕѕє ¢ιłłυм ∂σłσяє єυ ƒυgιαт ηυłłα ραяιαтυя. єχ¢єρтєυя ѕιηт σ¢¢αє¢αт#"
+
+#: templates/publisher/add_update_course_form.html
+#, python-format
+msgid ""
+"%(strong_start)sNote:%(strong_end)s If you edit course information after edX"
+" marketing has reviewed the course, you have to send the course to edX "
+"marketing for review again."
+msgstr ""
+"%(strong_start)sNöté:%(strong_end)s Ìf ýöü édït çöürsé ïnförmätïön äftér édX"
+" märkétïng häs révïéwéd thé çöürsé, ýöü hävé tö sénd thé çöürsé tö édX "
+"märkétïng för révïéw ägäïn. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя "
+"α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє мαgηα"
+" αłιqυα. υт єηιм α∂ мιηιм νєηιαм, qυιѕ ησѕтяυ∂ єχєя¢ιтαтιση υłłαм¢σ łαвσяιѕ "
+"ηιѕι υт αłιqυιρ єχ єα ¢σммσ∂σ ¢σηѕєqυαт. ∂υιѕ αυтє ιяυяє ∂σłσя ιη "
+"яєρяєнєη∂єяιт ιη νσłυρтαтє νєłιт єѕѕє ¢ιłłυм ∂σłσяє єυ ƒυgιαт ηυłłα "
+"ραяιαтυя. єχ¢єρтєυя ѕιηт σ¢¢αє¢αт ¢υρι∂αтαт ηση ρяσι∂єηт, ѕυηт ιη ¢υłρα qυι "
+"σƒƒι¢ια ∂єѕєяυηт мσłłιт αη#"
+
+#: templates/publisher/add_update_course_form.html
+#, python-format
+msgid ""
 "To create a parent course, enter the following information about the course "
 "and select %(strong_start)sCreate New Course%(strong_end)s."
 msgstr ""
@@ -1511,6 +1539,10 @@ msgstr ""
 "¢σηѕє¢тєтυя #"
 
 #: templates/publisher/add_update_course_form.html
+msgid "About Page Information"
+msgstr "Àßöüt Pägé Ìnförmätïön Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢#"
+
+#: templates/publisher/add_update_course_form.html
 #: templates/publisher/course_edit_form.html
 msgid "Studio Instance"
 msgstr "Stüdïö Ìnstänçé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
@@ -2205,6 +2237,10 @@ msgstr ""
 "яєρяєнєη∂єяιт ιη νσłυρтαтє νєłιт єѕѕє ¢ιłłυм ∂σłσяє єυ ƒυgιαт ηυłłα "
 "ραяιαтυя. єχ¢єρтєυя ѕιηт σ¢¢αє¢αт ¢υρι∂αтαт ηση ρяσι∂єηт, ѕ#"
 
+#: templates/publisher/add_update_course_form.html
+msgid "Update Course Run"
+msgstr "Ûpdäté Çöürsé Rün Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмє#"
+
 #: templates/publisher/admin/add_user_form.html
 msgid ""
 "First, enter a username and select a group. Then, you'll be able to edit "
@@ -2292,6 +2328,10 @@ msgstr ""
 "                     Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя#"
 
 #: templates/publisher/course_edit_form.html
+msgid "Edit Course"
+msgstr "Édït Çöürsé Ⱡ'σяєм ιρѕυм ∂σłσя #"
+
+#: templates/publisher/course_edit_form.html
 msgid ""
 "The information in the Studio Instance section is required before edX can "
 "create a Studio instance for the course run."

course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-14 12:15+0500\n"
+"POT-Creation-Date: 2017-03-14 14:33+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/js/catalogs-change-form.js

course_discovery/templates/publisher/add_update_course_form.html

@@ -3,14 +3,18 @@
 {% load staticfiles %}
 
 {% block title %}
-    {% trans "Course Form" %}
+    {% if edit_mode %}
+        {% trans "Edit Course Run" %}
+    {% else %}
+        {% trans "Create New Course" %}
+    {% endif %}
 {% endblock title %}
 
 {% block page_content %}
 <div>
 <h1 class="hd-1 emphasized">
     {% if edit_mode %}
-        {% trans "Edit Course" %}
+        {% trans "Edit Course Run" %}
     {% else %}
         {% trans "Create New Course" %}
     {% endif %}
@@ -24,17 +28,36 @@
     </div>
     {% endfor %}
 {% endif %}
-<p>
-    {% blocktrans with strong_start='<strong>' strong_end='</strong>' trimmed %}
-        To create a parent course, enter the following information about the course and select {{ strong_start }}Create New Course{{  strong_end }}.
-    {% endblocktrans %}
-    <strong class="required">{% trans "All of the following information is required." %}</strong>
-</p>
+{% if edit_mode %}
+    <p>
+        {% blocktrans with strong_start='<strong>' strong_end='</strong>' trimmed %}
+            To add or edit information about this course run, make changes on this page and then select {{ strong_start }}Update Course Run{{  strong_end }}. All required fields must be complete before this course run can be sent for review.
+        {% endblocktrans %}
+    </p>
+    <p>
+        {% blocktrans with strong_start='<strong>' strong_end='</strong>' trimmed %}
+            {{ strong_start }}Note:{{  strong_end }} If you edit course information after edX marketing has reviewed the course, you have to send the course to edX marketing for review again.
+        {% endblocktrans %}
+    </p>
+{% else %}
+    <p>
+        {% blocktrans with strong_start='<strong>' strong_end='</strong>' trimmed %}
+            To create a parent course, enter the following information about the course and select {{ strong_start }}Create New Course{{  strong_end }}.
+        {% endblocktrans %}
+        <strong class="required">{% trans "All of the following information is required." %}</strong>
+    </p>
+{% endif %}
 <form class="form" method="post" action="" enctype="multipart/form-data">
 {% csrf_token %}
 <div class="layout-full publisher-layout layout">
 
-    <h2 class="layout-title">{% trans "Studio Instance" %}</h2>
+    <h2 class="layout-title">
+        {% if edit_mode %}
+            {% trans "About Page Information" %}
+        {% else %}
+            {% trans "Studio Instance" %}
+        {% endif %}
+    </h2>
 
     <div class="card course-form">
         <div class="course-information">
@@ -213,14 +236,8 @@
                 {% endif %}
             </fieldset>
         </div>
-    </div>
-</div>
-
-{% if edit_mode %}
-    <div id="about-page" class="layout-full publisher-layout layout {% if publisher_hide_features_for_pilot %}hidden{% endif %}">
-        <h2 class="layout-title">{% trans "About page information" %}</h2>
-        <div class="card course-form">
-            <div class="course-information">
+        {% if edit_mode %}
+            <div id="about-page" class="course-information {% if publisher_hide_features_for_pilot %}hidden{% endif %}">
                 <fieldset class="form-group grid-container grid-manual">
                     <div class="field-title">{% trans "PROGRAM ASSOCIATION" %}</div>
                     <div class="row">
@@ -571,7 +588,7 @@
                             <label class="field-label ">{{ run_form.transcript_languages.label_tag }}</label>
                             {{ run_form.transcript_languages}}
 
-                            <label class="field-label ">{{ run_form.video_language.label_tag }}</label>
+                            <label class="field-label margin-top20">{{ run_form.video_language.label_tag }}</label>
                             {{ run_form.video_language}}
 
                         </div>
@@ -605,20 +622,21 @@
                     </div>
                 </fieldset>
             </div>
-        </div>
+        {% endif %}
     </div>
-{% endif %}
-<div class="layout-full layout">
-
-    <p>{% trans "After you submit this information, an edX project coordinator creates an instance for the course as well as a course run in Studio. When the Studio instance is ready, you will receive an email notification. You can then enter course content in Studio." %}</p>
-    <p>{% trans "If you have additional information for your course About page, you can enter it on the next page. You can edit this information at any time before edX publishes the course About page." %}</p>
 </div>
+{% if not edit_mode %}
+    <div class="layout-full layout">
+        <p>{% trans "After you submit this information, an edX project coordinator creates an instance for the course as well as a course run in Studio. When the Studio instance is ready, you will receive an email notification. You can then enter course content in Studio." %}</p>
+        <p>{% trans "If you have additional information for your course About page, you can enter it on the next page. You can edit this information at any time before edX publishes the course About page." %}</p>
+    </div>
+{% endif %}
 <div class="course-form">
     <div class="course-information action-buttons">
         <a href="{% url 'publisher:publisher_courses' %}">{% trans "Cancel" %}</a>
-        <button class="btn-brand btn-base" type="submit">
+        <button class="btn-brand btn-base btn-save" type="submit">
             {% if edit_mode %}
-                {% trans "Edit Course" %}
+                {% trans "Update Course Run" %}
             {% else %}
                 {% trans "Create New Course" %}
             {% endif %}