Commit 6318abab by Sylvia Pearce Committed by Awais Qureshi

Publisher UI updates - dashboard folder

parent 8ad8f516
...@@ -1319,21 +1319,21 @@ class DashboardTests(TestCase): ...@@ -1319,21 +1319,21 @@ class DashboardTests(TestCase):
self.course_run_2.lms_course_id = 'test-2' self.course_run_2.lms_course_id = 'test-2'
self.course_run_2.save() self.course_run_2.save()
response = self.assert_dashboard_response(studio_count=0, published_count=1, progress_count=2, preview_count=1) response = self.assert_dashboard_response(studio_count=0, published_count=1, progress_count=2, preview_count=1)
self.assertContains(response, 'There are no course-runs require studio instance.') self.assertContains(response, 'No courses are currently ready for a Studio URL.')
def test_without_published_course_runs(self): def test_without_published_course_runs(self):
""" Verify that published tab indicates a message if no course-run available. """ """ Verify that published tab indicates a message if no course-run available. """
self.course_run_3.course_run_state.name = CourseRunStateChoices.Draft self.course_run_3.course_run_state.name = CourseRunStateChoices.Draft
self.course_run_3.course_run_state.save() self.course_run_3.course_run_state.save()
response = self.assert_dashboard_response(studio_count=3, published_count=0, progress_count=3, preview_count=1) response = self.assert_dashboard_response(studio_count=3, published_count=0, progress_count=3, preview_count=1)
self.assertContains(response, "Looks like you haven't published any course yet") self.assertContains(response, 'No About pages have been published yet')
self._assert_tabs_with_roles(response) self._assert_tabs_with_roles(response)
def test_published_course_runs(self): def test_published_course_runs(self):
""" Verify that published tab loads course runs list. """ """ Verify that published tab loads course runs list. """
response = self.assert_dashboard_response(studio_count=2, published_count=1, progress_count=2, preview_count=1) response = self.assert_dashboard_response(studio_count=2, published_count=1, progress_count=2, preview_count=1)
self.assertContains(response, self.table_class.format(id='published')) self.assertContains(response, self.table_class.format(id='published'))
self.assertContains(response, 'The list below contains all course runs published in the past 30 days') self.assertContains(response, 'About pages for the following course runs have been published in the')
self._assert_tabs_with_roles(response) self._assert_tabs_with_roles(response)
def test_published_course_runs_as_user_role(self): def test_published_course_runs_as_user_role(self):
...@@ -1374,7 +1374,7 @@ class DashboardTests(TestCase): ...@@ -1374,7 +1374,7 @@ class DashboardTests(TestCase):
""" Verify that preview ready tabs loads the course runs list. """ """ Verify that preview ready tabs loads the course runs list. """
response = self.assert_dashboard_response(studio_count=2, preview_count=1, progress_count=2, published_count=1) response = self.assert_dashboard_response(studio_count=2, preview_count=1, progress_count=2, published_count=1)
self.assertContains(response, self.table_class.format(id='preview')) self.assertContains(response, self.table_class.format(id='preview'))
self.assertContains(response, 'The following course run previews are available for course team approval.') self.assertContains(response, 'About page previews for the following course runs are available for course team')
self._assert_tabs_with_roles(response) self._assert_tabs_with_roles(response)
def test_without_preview_ready_course_runs(self): def test_without_preview_ready_course_runs(self):
......
...@@ -7,14 +7,14 @@ msgid "" ...@@ -7,14 +7,14 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-05-04 13:50+0500\n" "POT-Creation-Date: 2017-05-04 15:16+0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: \n"
#: apps/api/filters.py #: apps/api/filters.py
#, python-brace-format #, python-brace-format
...@@ -2501,15 +2501,17 @@ msgid "PUBLISHED ABOUT PAGES" ...@@ -2501,15 +2501,17 @@ msgid "PUBLISHED ABOUT PAGES"
msgstr "" msgstr ""
#: templates/publisher/dashboard/_in_preview.html #: templates/publisher/dashboard/_in_preview.html
msgid "No course run previews are currently available." msgid ""
"No course runs currently have an About page preview available for course "
"team review."
msgstr "" msgstr ""
#: templates/publisher/dashboard/_in_preview.html #: templates/publisher/dashboard/_in_preview.html
msgid "" msgid ""
"The following course run previews are available for course team approval. " "About page previews for the following course runs are available for course "
"After the course team approves the preview, the edX marketing team will " "team review. After the course team approves the preview, the edX marketing "
"publish the course run on edx.org. The course team will receive an email " "team will publish the About page for the course run on edx.org. The course "
"message when the course run has been published." "team will receive an email message when the About page has been published."
msgstr "" msgstr ""
#: templates/publisher/dashboard/_in_preview.html #: templates/publisher/dashboard/_in_preview.html
...@@ -2525,7 +2527,7 @@ msgid "In Review" ...@@ -2525,7 +2527,7 @@ msgid "In Review"
msgstr "" msgstr ""
#: templates/publisher/dashboard/_in_progress.html #: templates/publisher/dashboard/_in_progress.html
msgid "There are no in development course runs." msgid "No About pages for any course runs are currently in development."
msgstr "" msgstr ""
#: templates/publisher/dashboard/_in_progress.html #: templates/publisher/dashboard/_in_progress.html
...@@ -2551,13 +2553,13 @@ msgid "End" ...@@ -2551,13 +2553,13 @@ msgid "End"
msgstr "" msgstr ""
#: templates/publisher/dashboard/_published.html #: templates/publisher/dashboard/_published.html
msgid "Looks like you haven't published any course yet." msgid "No About pages have been published yet."
msgstr "" msgstr ""
#: templates/publisher/dashboard/_published.html #: templates/publisher/dashboard/_published.html
#, python-format #, python-format
msgid "" msgid ""
"The list below contains all course runs published in the past " "About pages for the following course runs have been published in the past "
"%(default_published_days)s days." "%(default_published_days)s days."
msgstr "" msgstr ""
...@@ -2570,9 +2572,7 @@ msgid "Target Content" ...@@ -2570,9 +2572,7 @@ msgid "Target Content"
msgstr "" msgstr ""
#: templates/publisher/dashboard/_studio_requests.html #: templates/publisher/dashboard/_studio_requests.html
msgid "" msgid "The following courses are ready for a Studio URL."
"The list below are the courses that need a studio instance to start "
"development."
msgstr "" msgstr ""
#: templates/publisher/dashboard/_studio_requests.html #: templates/publisher/dashboard/_studio_requests.html
...@@ -2584,7 +2584,7 @@ msgid "Add" ...@@ -2584,7 +2584,7 @@ msgid "Add"
msgstr "" msgstr ""
#: templates/publisher/dashboard/_studio_requests.html #: templates/publisher/dashboard/_studio_requests.html
msgid "There are no course-runs require studio instance." msgid "No courses are currently ready for a Studio URL."
msgstr "" msgstr ""
#: templates/publisher/email/comment.html #: templates/publisher/email/comment.html
......
...@@ -7,14 +7,14 @@ msgid "" ...@@ -7,14 +7,14 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-05-04 13:50+0500\n" "POT-Creation-Date: 2017-05-04 15:16+0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: \n"
#: static/js/catalogs-change-form.js #: static/js/catalogs-change-form.js
msgid "Preview" msgid "Preview"
......
...@@ -7,14 +7,14 @@ msgid "" ...@@ -7,14 +7,14 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-05-04 13:50+0500\n" "POT-Creation-Date: 2017-05-04 15:16+0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: \n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: apps/api/filters.py #: apps/api/filters.py
...@@ -2943,25 +2943,27 @@ msgid "PUBLISHED ABOUT PAGES" ...@@ -2943,25 +2943,27 @@ msgid "PUBLISHED ABOUT PAGES"
msgstr "PÛBLÌSHÉD ÀBÖÛT PÀGÉS Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #" msgstr "PÛBLÌSHÉD ÀBÖÛT PÀGÉS Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"
#: templates/publisher/dashboard/_in_preview.html #: templates/publisher/dashboard/_in_preview.html
msgid "No course run previews are currently available." msgid ""
"No course runs currently have an About page preview available for course "
"team review."
msgstr "" msgstr ""
"Nö çöürsé rün prévïéws äré çürréntlý äväïläßlé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт," "Nö çöürsé rüns çürréntlý hävé än Àßöüt pägé prévïéw äväïläßlé för çöürsé "
" ¢σηѕє¢тєтυя α#" "téäm révïéw. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢#"
#: templates/publisher/dashboard/_in_preview.html #: templates/publisher/dashboard/_in_preview.html
msgid "" msgid ""
"The following course run previews are available for course team approval. " "About page previews for the following course runs are available for course "
"After the course team approves the preview, the edX marketing team will " "team review. After the course team approves the preview, the edX marketing "
"publish the course run on edx.org. The course team will receive an email " "team will publish the About page for the course run on edx.org. The course "
"message when the course run has been published." "team will receive an email message when the About page has been published."
msgstr "" msgstr ""
"Thé föllöwïng çöürsé rün prévïéws äré äväïläßlé för çöürsé téäm äppröväl. " "Àßöüt pägé prévïéws för thé föllöwïng çöürsé rüns äré äväïläßlé för çöürsé "
"Àftér thé çöürsé téäm äpprövés thé prévïéw, thé édX märkétïng téäm wïll " "téäm révïéw. Àftér thé çöürsé téäm äpprövés thé prévïéw, thé édX märkétïng "
"püßlïsh thé çöürsé rün ön édx.örg. Thé çöürsé téäm wïll réçéïvé än émäïl " "téäm wïll püßlïsh thé Àßöüt pägé för thé çöürsé rün ön édx.örg. Thé çöürsé "
"méssägé whén thé çöürsé rün häs ßéén püßlïshéd. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт," "téäm wïll réçéïvé än émäïl méssägé whén thé Àßöüt pägé häs ßéén püßlïshéd. "
" ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт" "Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ "
" ∂σłσяє мαgηα αłιqυα. υт єηιм α∂ мιηιм νєηιαм, qυιѕ ησѕтяυ∂ єχєя¢ιтαтιση " "тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє мαgηα αłιqυα. υт єηιм α∂ мιηιм νєηιαм,"
"υłłαм¢σ łαвσяιѕ ηιѕι υт αłιqυιρ єχ єα ¢σммσ∂σ ¢σηѕєqυαт. ∂υιѕ αυтє#" " qυιѕ ησѕтяυ∂ єχєя¢ιтαтι#"
#: templates/publisher/dashboard/_in_preview.html #: templates/publisher/dashboard/_in_preview.html
msgid "Status" msgid "Status"
...@@ -2976,10 +2978,10 @@ msgid "In Review" ...@@ -2976,10 +2978,10 @@ msgid "In Review"
msgstr "Ìn Révïéw Ⱡ'σяєм ιρѕυм ∂σł#" msgstr "Ìn Révïéw Ⱡ'σяєм ιρѕυм ∂σł#"
#: templates/publisher/dashboard/_in_progress.html #: templates/publisher/dashboard/_in_progress.html
msgid "There are no in development course runs." msgid "No About pages for any course runs are currently in development."
msgstr "" msgstr ""
"Théré äré nö ïn dévélöpmént çöürsé rüns. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, " "Nö Àßöüt pägés för äný çöürsé rüns äré çürréntlý ïn dévélöpmént. Ⱡ'σяєм "
"¢σηѕє¢тєтυя#" "ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α#"
#: templates/publisher/dashboard/_in_progress.html #: templates/publisher/dashboard/_in_progress.html
msgid "Filter by" msgid "Filter by"
...@@ -3004,19 +3006,19 @@ msgid "End" ...@@ -3004,19 +3006,19 @@ msgid "End"
msgstr "Énd Ⱡ'σяєм#" msgstr "Énd Ⱡ'σяєм#"
#: templates/publisher/dashboard/_published.html #: templates/publisher/dashboard/_published.html
msgid "Looks like you haven't published any course yet." msgid "No About pages have been published yet."
msgstr "" msgstr ""
"Lööks lïké ýöü hävén't püßlïshéd äný çöürsé ýét. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт " "Nö Àßöüt pägés hävé ßéén püßlïshéd ýét. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
"αмєт, ¢σηѕє¢тєтυя α#" "¢σηѕє¢тєтυя#"
#: templates/publisher/dashboard/_published.html #: templates/publisher/dashboard/_published.html
#, python-format #, python-format
msgid "" msgid ""
"The list below contains all course runs published in the past " "About pages for the following course runs have been published in the past "
"%(default_published_days)s days." "%(default_published_days)s days."
msgstr "" msgstr ""
"Thé lïst ßélöw çöntäïns äll çöürsé rüns püßlïshéd ïn thé päst " "Àßöüt pägés för thé föllöwïng çöürsé rüns hävé ßéén püßlïshéd ïn thé päst "
"%(default_published_days)s däýs. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя#" "%(default_published_days)s däýs. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢т#"
#: templates/publisher/dashboard/_published.html #: templates/publisher/dashboard/_published.html
msgid "Published Date" msgid "Published Date"
...@@ -3027,12 +3029,10 @@ msgid "Target Content" ...@@ -3027,12 +3029,10 @@ msgid "Target Content"
msgstr "Tärgét Çöntént Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#" msgstr "Tärgét Çöntént Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
#: templates/publisher/dashboard/_studio_requests.html #: templates/publisher/dashboard/_studio_requests.html
msgid "" msgid "The following courses are ready for a Studio URL."
"The list below are the courses that need a studio instance to start "
"development."
msgstr "" msgstr ""
"Thé lïst ßélöw äré thé çöürsés thät nééd ä stüdïö ïnstänçé tö stärt " "Thé föllöwïng çöürsés äré réädý för ä Stüdïö ÛRL. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт "
"dévélöpmént. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тє#" "αмєт, ¢σηѕє¢тєтυя α#"
#: templates/publisher/dashboard/_studio_requests.html #: templates/publisher/dashboard/_studio_requests.html
msgid "Studio Course Run Key" msgid "Studio Course Run Key"
...@@ -3043,9 +3043,9 @@ msgid "Add" ...@@ -3043,9 +3043,9 @@ msgid "Add"
msgstr "Àdd Ⱡ'σяєм#" msgstr "Àdd Ⱡ'σяєм#"
#: templates/publisher/dashboard/_studio_requests.html #: templates/publisher/dashboard/_studio_requests.html
msgid "There are no course-runs require studio instance." msgid "No courses are currently ready for a Studio URL."
msgstr "" msgstr ""
"Théré äré nö çöürsé-rüns réqüïré stüdïö ïnstänçé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт " "Nö çöürsés äré çürréntlý réädý för ä Stüdïö ÛRL. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт "
"αмєт, ¢σηѕє¢тєтυя α#" "αмєт, ¢σηѕє¢тєтυя α#"
#: templates/publisher/email/comment.html #: templates/publisher/email/comment.html
......
...@@ -7,14 +7,14 @@ msgid "" ...@@ -7,14 +7,14 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-05-04 13:50+0500\n" "POT-Creation-Date: 2017-05-04 15:16+0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: \n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: static/js/catalogs-change-form.js #: static/js/catalogs-change-form.js
......
{% load i18n %} {% load i18n %}
{% if preview_count == 0 %} {% if preview_count == 0 %}
<div class="empty-courserun-text">{% trans "No course run previews are currently available." %}</div> <div class="empty-courserun-text">{% trans "No course runs currently have an About page preview available for course team review." %}</div>
{% else %} {% else %}
<p> <p>
{% trans "The following course run previews are available for course team approval. After the course team approves the preview, the edX marketing team will publish the course run on edx.org. The course team will receive an email message when the course run has been published." %} {% trans "About page previews for the following course runs are available for course team review. After the course team approves the preview, the edX marketing team will publish the About page for the course run on edx.org. The course team will receive an email message when the About page has been published." %}
</p> </p>
<div class="table-view"> <div class="table-view">
<table class="data-table-preview display" cellspacing="0" width="100%"> <table class="data-table-preview display" cellspacing="0" width="100%">
......
{% load i18n %} {% load i18n %}
{% if in_progress_count == 0 %} {% if in_progress_count == 0 %}
<div class="empty-courserun-text">{% trans "There are no in development course runs." %}</div> <div class="empty-courserun-text">{% trans "No About pages for any course runs are currently in development." %}</div>
{% else %} {% else %}
<table class="data-table-in-progress display" cellspacing="0" width="100%"> <table class="data-table-in-progress display" cellspacing="0" width="100%">
<div class="filters"> <div class="filters">
......
{% load i18n %} {% load i18n %}
{% if published_count == 0 %} {% if published_count == 0 %}
<div class="empty-courserun-text">{% trans "Looks like you haven't published any course yet." %}</div> <div class="empty-courserun-text">{% trans "No About pages have been published yet." %}</div>
{% else %} {% else %}
<p> <p>
{% blocktrans trimmed %} {% blocktrans trimmed %}
The list below contains all course runs published in the past {{ default_published_days }} days. About pages for the following course runs have been published in the past {{ default_published_days }} days.
{% endblocktrans %} {% endblocktrans %}
</p> </p>
<table class="data-table-published display" cellspacing="0" width="100%"> <table class="data-table-published display" cellspacing="0" width="100%">
......
{% load i18n %} {% load i18n %}
{% if studio_count > 0 %} {% if studio_count > 0 %}
<p>{% trans "The list below are the courses that need a studio instance to start development." %}</p> <p>{% trans "The following courses are ready for a Studio URL." %}</p>
<div class="studio-instance-success depth depth-0"> <div class="studio-instance-success depth depth-0">
<p class="copy-meta"></p> <p class="copy-meta"></p>
</div> </div>
...@@ -58,5 +58,5 @@ ...@@ -58,5 +58,5 @@
</div> </div>
{% else %} {% else %}
<div class="empty-courserun-text">{% trans "There are no course-runs require studio instance." %}</div> <div class="empty-courserun-text">{% trans "No courses are currently ready for a Studio URL." %}</div>
{% endif %} {% endif %}
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