Skip to content

C
course-discovery
Commit 34eba539 by Sylvia Pearce Committed by Awais Qureshi
Options

Publisher UI updates 

sylvia/DOC-3639-2
parent b69a96fb
Showing with 124 additions and 119 deletions
course_discovery/apps/publisher/tests/test_views.py
......@@ -605,10 +605,10 @@ class CourseRunDetailTests(TestCase):
def _assert_non_credits_seats(self, response, seats):
""" Helper method to test to all non-credit seats. """
self.assertContains(response, 'Seat Type')
self.assertContains(response, 'Enrollment Type')
self.assertContains(response, 'Price')
self.assertContains(response, 'Currency')
self.assertContains(response, 'Upgrade Deadline')
self.assertContains(response, 'Upgrade Deadline (time in UTC)')
for seat in seats:
self.assertContains(response, seat.type)
......@@ -636,10 +636,10 @@ class CourseRunDetailTests(TestCase):
def _assert_drupal(self, response):
""" Helper method to test drupal values and labels. """
fields = [
'Title', 'Number', 'Course ID', 'Price', 'Sub Title', 'School', 'Subject', 'XSeries',
'Start Date', 'End Date', 'Self Paced', 'Staff', 'Estimated Effort', 'Languages',
'Video Translations', 'Level', 'About this Course', "What you'll learn",
'Keywords', 'Sponsors', 'Enrollments', 'Learner Testimonials', 'FAQ', 'Video Link'
'Title', 'Number', 'Course ID', 'Price', 'Subtitle', 'Organization', 'Subject', 'XSeries',
'Start Date (time in UTC)', 'End Date (time in UTC)', 'Self Paced', 'Staff', 'Estimated Effort',
'Languages', 'Video Transcript Languages', 'Level', 'Full Description', "What You'll Learn",
'Keywords', 'Sponsors', 'Enrollment Types', 'Learner Testimonials', 'FAQ', 'Course About Video'
]
for field in fields:
self.assertContains(response, field)
......@@ -663,7 +663,7 @@ class CourseRunDetailTests(TestCase):
def _assert_cat(self, response):
""" Helper method to test cat data. """
fields = [
'Course ID', 'Course Type'
'Course ID', 'Enrollment Types'
]
values = [self.course_run.lms_course_id]
for field in fields:
......@@ -980,7 +980,7 @@ class CourseRunDetailTests(TestCase):
response = self.client.get(self.page_url)
# Verify that content is sent for review and user can see `Mark as Reviewed` button.
self.assertContains(response, 'Send for Review')
self.assertContains(response, 'Sent for Review')
self.assertContains(response, '<span class="icon fa fa-check" aria-hidden="true">', count=1)
self.assertContains(response, 'Mark as Reviewed')
self.assertContains(response, self.get_expected_data(CourseRunStateChoices.Approved))
......@@ -1013,7 +1013,7 @@ class CourseRunDetailTests(TestCase):
self.assertNotContains(response, 'Mark as Reviewed')
self.assertContains(response, 'Reviewed', count=1)
self.assertContains(response, '<span class="icon fa fa-check" aria-hidden="true">', count=2)
self.assertContains(response, 'Send for Review', count=1)
self.assertContains(response, 'Sent for Review', count=1)
def test_preview_widget(self):
"""
......@@ -1118,7 +1118,7 @@ class CourseRunDetailTests(TestCase):
history_object = self.course_run_state.history.filter(
name=CourseRunStateChoices.Published
).order_by('-modified').first()
expected = 'Course run announced on {publish_date} - view it on edx.org at:'.format(
expected = 'The About page for this course run was published on {publish_date}. View it on edx.org at'.format(
publish_date=history_object.modified.strftime('%m/%d/%y')
)
self.assertContains(response, expected)
......@@ -1777,7 +1777,7 @@ class CourseDetailViewTests(TestCase):
# Verify that content is sent for review and user can see Reviewed button.
self.assertContains(response, 'Mark as Reviewed')
self.assertContains(response, '<span class="icon fa fa-check" aria-hidden="true">')
self.assertContains(response, 'Send for Review')
self.assertContains(response, 'Sent for Review')
self.assertContains(response, self.get_expected_data(CourseStateChoices.Approved))
def get_expected_data(self, state_name, disabled=False):
......@@ -1817,7 +1817,7 @@ class CourseDetailViewTests(TestCase):
self.assertNotContains(response, 'Mark as Reviewed')
self.assertContains(response, 'Reviewed', count=1)
self.assertContains(response, '<span class="icon fa fa-check" aria-hidden="true">', count=2)
self.assertContains(response, 'Send for Review', count=1)
self.assertContains(response, 'Sent for Review', count=1)
self.course_state.marketing_reviewed = True
self.course_state.owner_role = PublisherUserRole.CourseTeam
......
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-05-09 17:22+0500\n"
"POT-Creation-Date: 2017-05-11 15:39+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/djangojs.po
......@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-05-09 17:22+0500\n"
"POT-Creation-Date: 2017-05-11 15:39+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/_approval_widget.html
......@@ -81,7 +81,7 @@
{% if role_widget.sent_for_review %}
<span class="state-status">
<span class="icon fa fa-check" aria-hidden="true"></span>
{% trans "Send for Review" %}<br>
{% trans "Sent for Review" %}<br>
{{ role_widget.sent_for_review|date:'m/d/y H:i a' }}
</span>
{% elif role_widget.reviewed %}
......
course_discovery/templates/publisher/course_run/edit_run_form.html
......@@ -41,6 +41,9 @@
<div class="col col-6 help-text">
<ul>
<li>
{% trans "Note that times use UTC." %}
</li>
<li>
{% trans "Start on a Tuesday, Wednesday, or Thursday." %}
</li>
<li>
......@@ -63,7 +66,7 @@
<div class="field-title">{% trans "COURSE END DATE" %}</div>
<div class="row">
<div class="col col-6 help-text">
{% trans "Specify a month, day, and year. If you are unsure of the exact date, specify a day that is close to the estimated end date. For example, if your course will end near the end of March, specify March 31." %}
{% trans "Note that times use UTC. Specify a month, day, and year. If you are unsure of the exact date, specify a day that is close to the estimated end date. For example, if your course will end near the end of March, specify March 31." %}
</div>
<div class="col col-6">
<label class="field-label ">{{ run_form.end.label_tag }} <span class="required">*</span></label>
......
course_discovery/templates/publisher/course_run_detail/_all.html
......@@ -4,7 +4,7 @@
<div class="info-item">
<div class="heading">
{% trans "Studio instance" %}
{% trans "Studio URL" %}
</div>
<div>
{% if object.studio_url %}
......@@ -17,21 +17,21 @@
<div class="info-item">
<div class="heading">
{% trans "Start Date" %}
{% trans "Start Date (time in UTC)" %}
</div>
<div>{{ object.start }}</div>
</div>
<div class="info-item">
<div class="heading">
{% trans "End Date" %}
{% trans "End Date (time in UTC)" %}
</div>
<div>{{ object.end }}</div>
</div>
<div class="info-item">
<div class="heading">
{% trans "Certificate type" %}
{% trans "Certificate Type" %}
</div>
<div>{{ object.course_type }}</div>
</div>
......@@ -91,7 +91,7 @@
<div class="info-item">
<div class="heading">
{% trans "Course content language" %}
{% trans "Course Content Language" %}
</div>
<div>
{% with object.language.name as field %}
......@@ -102,7 +102,7 @@
<div class="info-item">
<div class="heading">
{% trans "Video Language Transcript" %}
{% trans "Video Transcript Language" %}
</div>
<div>
{% with object.transcript_languages as field %}
......@@ -113,7 +113,7 @@
<div class="info-item">
<div class="heading">
{% trans "Language spoken in course videos" %}
{% trans "Course Video Language" %}
</div>
<div>
{% with object.video_language as field %}
......
course_discovery/templates/publisher/course_run_detail/_cat.html
......@@ -15,7 +15,7 @@
</div>
<div class="info-item">
<div class="heading">
{% trans "Course Type" %}
{% trans "Enrollment Types" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.course_type|capfirst }}</div>
......
course_discovery/templates/publisher/course_run_detail/_credit_seat.html
......@@ -8,7 +8,7 @@
<th scope="col">{% trans "Price" %}</th>
<th scope="col">{% trans "Currency" %}</th>
<th scope="col">{% trans "Credit Hours" %}</th>
<th scope="col">{% trans "Upgrade Deadline" %}</th>
<th scope="col">{% trans "Upgrade Deadline (time in UTC)" %}</th>
</tr>
<tr>
<td>{{ object.credit_seat.credit_provider}}</td>
......
course_discovery/templates/publisher/course_run_detail/_drupal.html
......@@ -28,7 +28,7 @@
</div>
<div class="info-item">
<div class="heading">
{% trans "Sub Title" %}
{% trans "Subtitle" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
......@@ -39,7 +39,7 @@
</div>
<div class="info-item">
<div class="heading">
{% trans "School" %}
{% trans "Organization" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.organization_key }}</div>
......@@ -61,13 +61,13 @@
<div class="info-item">
<div class="heading">
{% trans "Start Date" %}
{% trans "Start Date (time in UTC)" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.start|date:"Y-m-d" }}</div>
</div>
<div class="info-item">
<div class="heading">{% trans "End Date" %}
<div class="heading">{% trans "End Date (time in UTC)" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.end|date:"Y-m-d" }}</div>
......@@ -134,7 +134,7 @@
</div>
<div class="info-item">
<div class="heading">
{% trans "Video Translations" %}
{% trans "Video Transcript Languages" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
......@@ -156,7 +156,7 @@
</div>
<div class="info-item">
<div class="heading">
{% trans "About this Course" %}
{% trans "Full Description" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
......@@ -167,7 +167,7 @@
</div>
<div class="info-item">
<div class="heading">
{% trans "What you'll learn" %}
{% trans "What You'll Learn" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
......@@ -195,7 +195,7 @@
</div>
<div class="info-item">
<div class="heading">
{% trans "Prerequisite" %}
{% trans "Prerequisites" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
......@@ -233,7 +233,7 @@
<div class="info-item">
<div class="heading">
{% trans "Course syllabus" %}
{% trans "Course Syllabus" %}
</div>
<div>
{% with object.syllabus as field %}
......@@ -255,7 +255,7 @@
<div class="info-item">
<div class="heading">
{% trans "Secondary Subject" %}
{% trans "Additional Subject" %}
</div>
<div>
{% with object.subjects.1 as field %}
......@@ -266,7 +266,7 @@
<div class="info-item">
<div class="heading">
{% trans "Tertiary Subject" %}
{% trans "Additional Subject" %}
</div>
<div>
{% with object.subjects.2 as field %}
......@@ -310,7 +310,7 @@
</div>
<div class="info-item">
<div class="heading">
{% trans "Video Link" %}
{% trans "Course About Video" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
{% with object.course.video_link as value %}
......@@ -322,7 +322,7 @@
{% endwith %}
</div>
<h3 class="hd-3 de-emphasized">{% trans "Enrollments" %}</h3>
<h3 class="hd-3 de-emphasized">{% trans "Enrollment Types" %}</h3>
<div class="info-item">
<div class="heading">
{% trans "Seats" %}
......
course_discovery/templates/publisher/course_run_detail/_edit_warning.html
......@@ -7,6 +7,7 @@
</h2>
<span class="sr-only">CAUTION</span>
<p>
<!-- Is "tasawer" in line 12 correct? -->
{% blocktrans trimmed with owner=object.course_run_state.owner_role reviewer_user='tasawer'%}
The {{ current_team_name }} is currently reviewing this course run. If you edit course run information, you might overwrite the team’s changes, and you will have to send the course run to the {{ team_name }} for review again.
{% endblocktrans %}
......
course_discovery/templates/publisher/course_run_detail/_instructor_profile.html
......@@ -13,28 +13,28 @@
</div>
<div class="info-item">
<div class="heading">{% trans "Name" %}:
<div class="heading">{% trans "Name" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy full_name"></div>
</div>
<div class="info-item">
<div class="heading">{% trans "Email" %}:
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy email"></div>
</div>
<div class="info-item">
<div class="heading">{% trans "Organization" %}:
<div class="heading">{% trans "Organization" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy organization"></div>
</div>
<div class="info-item">
<div class="heading">{% trans "Position" %}:
<div class="heading">{% trans "Title" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy position"></div>
......@@ -49,7 +49,7 @@
</div>
<div class="info-item">
<div class="heading">{% trans "Bio" %}:
<div class="heading">{% trans "Bio" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy bio"></div>
......@@ -57,7 +57,7 @@
<div class="social-links">
<div class="heading icon">
<a class="facebook_url" target="_blank">{% trans "FaceBook URL "%}</a>
<a class="facebook_url" target="_blank">{% trans "Facebook URL "%}</a>
{% include "publisher/course_run_detail/_clipboard.html" %}
<div class="copy facebook_url_copy hidden"></div>
</div>
......
course_discovery/templates/publisher/course_run_detail/_preview_accept_popup.html
......@@ -5,7 +5,7 @@
<h2 class="hd-2 emphasized accept-preview-heading">{% trans "Publish Course Run" %}</h2>
<div id="modal-errors" class="alert-messages"></div>
<p>
{% trans "Before this course run can be published, the Studio instance for the course run must have the following information." %}
{% trans "Before the About page for this course run can be published, the following information for the course run must be entered in Studio." %}
</p>
<ul>
<li>{% trans "The course run start and end date." %}</li>
......
course_discovery/templates/publisher/course_run_detail/_seats.html
......@@ -4,10 +4,10 @@
<div class="seat-set">
<table class="table">
<tr>
<th scope="col">{% trans "Seat Type" %}</th>
<th scope="col">{% trans "Enrollment Type" %}</th>
<th scope="col">{% trans "Price" %}</th>
<th scope="col">{% trans "Currency" %}</th>
<th scope="col">{% trans "Upgrade Deadline" %}</th>
<th scope="col">{% trans "Upgrade Deadline (time in UTC)" %}</th>
</tr>
{% for seat in object.non_credit_seats %}
<tr>
......
course_discovery/templates/publisher/course_run_detail/_studio.html
......@@ -26,21 +26,21 @@
<div class="info-item">
<div class="heading">
{% trans "Start Date" %}
{% trans "Start Date (time in UTC)" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.start|date:"M d, Y, H:i:s A" }}</div>
</div>
<div class="info-item">
<div class="heading">
{% trans "End Date" %}
{% trans "End Date (time in UTC)" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.end|date:"M d, Y, H:i:s A" }}</div>
</div>
<div class="info-item">
<div class="heading">
{% trans "Enrollment Start Date" %}
{% trans "Enrollment Start Date (time in UTC)" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
......@@ -53,7 +53,7 @@
</div>
<div class="info-item">
<div class="heading">
{% trans "Enrollment End Date" %}
{% trans "Enrollment End Date (time in UTC)" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
......
course_discovery/templates/publisher/course_run_detail/course_run_detail.html
......@@ -5,7 +5,7 @@
{% load staticfiles %}
{% block title %}
{% trans "Course Run Detail" %}
{% trans "Course Run Details" %}
{% endblock title %}
{% block page_content %}
......@@ -14,8 +14,9 @@
{% if object.course_run_state.is_published %}
<div class="depth depth-0 published-status">
<strong>
<!-- Is it possible to make "View it on edx.org" into a link? If so, make it into a link, add a period at the end, and delete "at". If not, keep "at", but remove the colon and add a period after the link. -->
{% blocktrans with publish_date|date:'m/d/y' as course_publish_date trimmed %}
Course run announced on {{ course_publish_date }} - view it on edx.org at:
The About page for this course run was published on {{ course_publish_date }}. View it on edx.org at
{% endblocktrans %}
</strong>
<a href="{{ object.preview_url }}" target="_blank">{{ object.preview_url }}</a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment