Skip to content

C
course-discovery
Commit e8628423 by Dennis Jen Committed by Dennis Jen
Options

Remove start and end dates from the table and replace with modified date.

parent 11da3045
Showing with 35 additions and 52 deletions
README.rst
...@@ -25,6 +25,14 @@ How To Contribute ...@@ -25,6 +25,14 @@ How To Contribute
Contributions are welcome. Please read `How To Contribute <https://github.com/edx/edx-platform/blob/master/CONTRIBUTING.rst>`_ for details. Even though it was written with ``edx-platform`` in mind, these guidelines should be followed for Open edX code in general. Contributions are welcome. Please read `How To Contribute <https://github.com/edx/edx-platform/blob/master/CONTRIBUTING.rst>`_ for details. Even though it was written with ``edx-platform`` in mind, these guidelines should be followed for Open edX code in general.
Development
-----------
Is the build failing because translations are out of date?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Run ``make check_translations_up_to_date`` and check in the generated *.mo & *.po files to your PR.
Reporting Security Issues Reporting Security Issues
------------------------- -------------------------
......
course_discovery/apps/publisher/templates/publisher/dashboard/_in_preview.html
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
{% trans "Status" %} {% trans "Status" %}
</th> </th>
<th> <th>
{% trans "Course start date" %} {% trans "Modified" %}
</th> </th>
</tr> </tr>
</thead> </thead>
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
{% endif %} {% endif %}
{{ course_run.owner_role_modified }} {{ course_run.owner_role_modified }}
</td> </td>
<td data-order="{{ course_run.start|date:"Y-m-d" }}"> <td data-order="{{ course_run.modified|date:"Y-m-d" }}">
{{ course_run.start }} {{ course_run.modified }}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
......
course_discovery/apps/publisher/templates/publisher/dashboard/_in_progress.html
...@@ -27,10 +27,7 @@ ...@@ -27,10 +27,7 @@
{% trans "Organization" %} {% trans "Organization" %}
</th> </th>
<th role="button"> <th role="button">
{% trans "Start" %} {% trans "Modified" %}
</th>
<th role="button">
{% trans "End" %}
</th> </th>
<th role="button"> <th role="button">
{% trans "Course Team" %} {% trans "Course Team" %}
...@@ -53,8 +50,7 @@ ...@@ -53,8 +50,7 @@
</td> </td>
<td>{{ course_run.number }}</td> <td>{{ course_run.number }}</td>
<td>{{ course_run.course.organization_name }}</td> <td>{{ course_run.course.organization_name }}</td>
<td>{{ course_run.start|date:"Y-m-d" }}</td> <td>{{ course_run.modified|date:"Y-m-d" }}</td>
<td>{{ course_run.end|date:"Y-m-d" }}</td>
<td>{{ course_run.course_team_status }}</td> <td>{{ course_run.course_team_status }}</td>
<td>{{ course_run.internal_user_status }}</td> <td>{{ course_run.internal_user_status }}</td>
<td>{{ course_run.owner_role_last_modified }}</td> <td>{{ course_run.owner_role_last_modified }}</td>
......
course_discovery/apps/publisher/templates/publisher/dashboard/_published.html
...@@ -20,12 +20,6 @@ ...@@ -20,12 +20,6 @@
{% trans "Organization" %} {% trans "Organization" %}
</th> </th>
<th role="button"> <th role="button">
{% trans "Start" %}
</th>
<th role="button">
{% trans "End" %}
</th>
<th role="button">
{% trans "Published Date" %} {% trans "Published Date" %}
</th> </th>
</tr> </tr>
...@@ -43,12 +37,6 @@ ...@@ -43,12 +37,6 @@
{{ course_run.course.organization_name }} {{ course_run.course.organization_name }}
</td> </td>
<td> <td>
{{ course_run.start|date:"Y-m-d" }}
</td>
<td>
{{ course_run.end|date:"Y-m-d" }}
</td>
<td>
{{ course_run.course_run_state.modified|date:"Y-m-d" }} {{ course_run.course_run_state.modified|date:"Y-m-d" }}
</td> </td>
</tr> </tr>
......
course_discovery/apps/publisher/templates/publisher/dashboard/_studio_requests.html
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
{% trans "Organization" %} {% trans "Organization" %}
</th> </th>
<th role="button"> <th role="button">
{% trans "Start Date" %} {% trans "Modified" %}
</th> </th>
<th role="button"> <th role="button">
{% trans "Course Number" %} {% trans "Course Number" %}
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
<td> <td>
{{ course_run.course.organization_name }} {{ course_run.course.organization_name }}
</td> </td>
<td id="course-start"> <td id="course-modified">
{{ course_run.start|date:"Y-m-d" }} {{ course_run.modified|date:"Y-m-d" }}
</td> </td>
<td> <td>
{{ course_run.number }} {{ course_run.number }}
......
course_discovery/conf/locale/en/LC_MESSAGES/djangojs.po
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-18 11:01+0000\n" "POT-Creation-Date: 2018-05-24 15:22+0000\n"
"PO-Revision-Date: 2018-04-09 20:13+0000\n" "PO-Revision-Date: 2018-04-09 20:13+0000\n"
"Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n" "Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n" "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
...@@ -81,13 +81,13 @@ msgstr "" ...@@ -81,13 +81,13 @@ msgstr ""
msgid "Please enter a valid URL." msgid "Please enter a valid URL."
msgstr "" msgstr ""
#: static/js/publisher/views/courserun_list.js:22 #: static/js/publisher/views/courserun_list.js:21
msgid "" msgid ""
"You have successfully created a Studio URL ({studioLinkTag}) for " "You have successfully created a Studio URL ({studioLinkTag}) for "
"{courseRunDetail} with a start date of {startDate}" "{courseRunDetail}"
msgstr "" msgstr ""
#: static/js/publisher/views/courserun_list.js:52 #: static/js/publisher/views/courserun_list.js:50
msgid "There was an error in saving your data." msgid "There was an error in saving your data."
msgstr "" msgstr ""
......
course_discovery/conf/locale/eo/LC_MESSAGES/django.po
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-18 11:01+0000\n" "POT-Creation-Date: 2018-05-24 15:22+0000\n"
"PO-Revision-Date: 2018-04-09 20:13+0000\n" "PO-Revision-Date: 2018-04-09 20:13+0000\n"
"Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n" "Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n" "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
...@@ -3052,7 +3052,6 @@ msgid "MDC Submission Due Date" ...@@ -3052,7 +3052,6 @@ msgid "MDC Submission Due Date"
msgstr "MDÇ Süßmïssïön Düé Däté Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σ#" msgstr "MDÇ Süßmïssïön Düé Däté Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σ#"
#: apps/publisher/templates/publisher/course_run_detail/_salesforce.html #: apps/publisher/templates/publisher/course_run_detail/_salesforce.html
#: apps/publisher/templates/publisher/dashboard/_studio_requests.html
msgid "Start Date" msgid "Start Date"
msgstr "Stärt Däté Ⱡ'σяєм ιρѕυм ∂σłσ#" msgstr "Stärt Däté Ⱡ'σяєм ιρѕυм ∂σłσ#"
...@@ -3207,10 +3206,10 @@ msgid "Status" ...@@ -3207,10 +3206,10 @@ msgid "Status"
msgstr "Stätüs Ⱡ'σяєм ιρѕυ#" msgstr "Stätüs Ⱡ'σяєм ιρѕυ#"
#: apps/publisher/templates/publisher/dashboard/_in_preview.html #: apps/publisher/templates/publisher/dashboard/_in_preview.html
#: apps/publisher/templates/publisher/email/studio_instance_created.html #: apps/publisher/templates/publisher/dashboard/_in_progress.html
#: apps/publisher/templates/publisher/email/studio_instance_created.txt #: apps/publisher/templates/publisher/dashboard/_studio_requests.html
msgid "Course start date" msgid "Modified"
msgstr "Çöürsé stärt däté Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмє#" msgstr "Mödïfïéd Ⱡ'σяєм ιρѕυм ∂#"
#: apps/publisher/templates/publisher/dashboard/_in_preview.html #: apps/publisher/templates/publisher/dashboard/_in_preview.html
msgid "Approved since " msgid "Approved since "
...@@ -3246,16 +3245,6 @@ msgstr "Wïth Çöürsé Téäm Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм# ...@@ -3246,16 +3245,6 @@ msgstr "Wïth Çöürsé Téäm Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#
msgid "With" msgid "With"
msgstr "Wïth Ⱡ'σяєм ι#" msgstr "Wïth Ⱡ'σяєм ι#"
#: apps/publisher/templates/publisher/dashboard/_in_progress.html
#: apps/publisher/templates/publisher/dashboard/_published.html
msgid "Start"
msgstr "Stärt Ⱡ'σяєм ιρѕ#"
#: apps/publisher/templates/publisher/dashboard/_in_progress.html
#: apps/publisher/templates/publisher/dashboard/_published.html
msgid "End"
msgstr "Énd Ⱡ'σяєм#"
#: apps/publisher/templates/publisher/dashboard/_published.html #: apps/publisher/templates/publisher/dashboard/_published.html
msgid "No About pages have been published yet." msgid "No About pages have been published yet."
msgstr "" msgstr ""
...@@ -3901,6 +3890,11 @@ msgstr "" ...@@ -3901,6 +3890,11 @@ msgstr ""
#: apps/publisher/templates/publisher/email/studio_instance_created.html #: apps/publisher/templates/publisher/email/studio_instance_created.html
#: apps/publisher/templates/publisher/email/studio_instance_created.txt #: apps/publisher/templates/publisher/email/studio_instance_created.txt
msgid "Course start date"
msgstr "Çöürsé stärt däté Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмє#"
#: apps/publisher/templates/publisher/email/studio_instance_created.html
#: apps/publisher/templates/publisher/email/studio_instance_created.txt
msgid "Course end date" msgid "Course end date"
msgstr "Çöürsé énd däté Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#" msgstr "Çöürsé énd däté Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
......
course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.po
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-18 11:01+0000\n" "POT-Creation-Date: 2018-05-24 15:22+0000\n"
"PO-Revision-Date: 2018-04-09 20:13+0000\n" "PO-Revision-Date: 2018-04-09 20:13+0000\n"
"Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n" "Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n" "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
...@@ -94,11 +94,10 @@ msgstr "Pléäsé éntér ä välïd ÛRL. Ⱡ'σяєм ιρѕυм ∂σłσя ...@@ -94,11 +94,10 @@ msgstr "Pléäsé éntér ä välïd ÛRL. Ⱡ'σяєм ιρѕυм ∂σłσя
#: static/js/publisher/views/courserun_list.js #: static/js/publisher/views/courserun_list.js
msgid "" msgid ""
"You have successfully created a Studio URL ({studioLinkTag}) for " "You have successfully created a Studio URL ({studioLinkTag}) for "
"{courseRunDetail} with a start date of {startDate}" "{courseRunDetail}"
msgstr "" msgstr ""
"Ýöü hävé süççéssfüllý çréätéd ä Stüdïö ÛRL ({studioLinkTag}) för " "Ýöü hävé süççéssfüllý çréätéd ä Stüdïö ÛRL ({studioLinkTag}) för "
"{courseRunDetail} wïth ä stärt däté öf {startDate} Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт " "{courseRunDetail} Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α#"
"αмєт, ¢σηѕє¢тє#"
#: static/js/publisher/views/courserun_list.js #: static/js/publisher/views/courserun_list.js
msgid "There was an error in saving your data." msgid "There was an error in saving your data."
......
course_discovery/static/js/publisher/views/courserun_list.js
...@@ -15,15 +15,13 @@ $(document).ready(function() { ...@@ -15,15 +15,13 @@ $(document).ready(function() {
var updateCourseKeyURL = $(this).data('update-course-key-url'), var updateCourseKeyURL = $(this).data('update-course-key-url'),
courseKeyValue = courseKeyInput.val().trim(), courseKeyValue = courseKeyInput.val().trim(),
courseTitleTag = $courseRunParentTag.find("#course-title").html().trim(), courseTitleTag = $courseRunParentTag.find("#course-title").html().trim(),
startDateTag = $courseRunParentTag.find("#course-start").html().trim(),
$studioInstanceSuccess = $(".studio-instance-success"), $studioInstanceSuccess = $(".studio-instance-success"),
$studioInstanceError = $(".studio-instance-error"), $studioInstanceError = $(".studio-instance-error"),
successMessage = interpolateString( successMessage = interpolateString(
gettext("You have successfully created a Studio URL ({studioLinkTag}) for {courseRunDetail} with a start date of {startDate}"), gettext("You have successfully created a Studio URL ({studioLinkTag}) for {courseRunDetail}"),
{ {
"studioLinkTag": "<a href=''>"+ courseKeyValue +"</a>", "studioLinkTag": "<a href=''>"+ courseKeyValue +"</a>",
"courseRunDetail": courseTitleTag, "courseRunDetail": courseTitleTag
"startDate": startDateTag
} }
); );
e.preventDefault(); e.preventDefault();
......
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