Skip to content

C
course-discovery
Commit 9c487206 by tasawernawaz Committed by Tasawer Nawaz
Options

show new label on course run detail page and drupal tab 

ECOM-7751
parent 908572fb
Showing with 41 additions and 10 deletions
course_discovery/apps/publisher/tests/test_wrapper.py
...@@ -178,6 +178,8 @@ class CourseRunWrapperTests(TestCase): ...@@ -178,6 +178,8 @@ class CourseRunWrapperTests(TestCase):
def test_course_staff(self): def test_course_staff(self):
"""Verify that the wrapper return staff list.""" """Verify that the wrapper return staff list."""
staff = PersonFactory() staff = PersonFactory()
staff.profile_image_url = None
staff.save()
# another staff with position by default staff has no position associated. # another staff with position by default staff has no position associated.
staff_2 = PersonFactory() staff_2 = PersonFactory()
...@@ -196,7 +198,8 @@ class CourseRunWrapperTests(TestCase): ...@@ -196,7 +198,8 @@ class CourseRunWrapperTests(TestCase):
'image_url': staff.get_profile_image_url, 'image_url': staff.get_profile_image_url,
'profile_url': staff.profile_url, 'profile_url': staff.profile_url,
'social_networks': {}, 'social_networks': {},
'bio': staff.bio 'bio': staff.bio,
'is_new': True,
}, },
{ {
'uuid': str(staff_2.uuid), 'uuid': str(staff_2.uuid),
...@@ -205,6 +208,7 @@ class CourseRunWrapperTests(TestCase): ...@@ -205,6 +208,7 @@ class CourseRunWrapperTests(TestCase):
'position': position.title, 'position': position.title,
'organization': position.organization_name, 'organization': position.organization_name,
'profile_url': staff.profile_url, 'profile_url': staff.profile_url,
'is_new': False,
'social_networks': {'facebook': facebook.value, 'twitter': twitter.value}, 'social_networks': {'facebook': facebook.value, 'twitter': twitter.value},
'bio': staff_2.bio 'bio': staff_2.bio
} }
......
course_discovery/apps/publisher/wrappers.py
...@@ -201,7 +201,8 @@ class CourseRunWrapper(BaseWrapper): ...@@ -201,7 +201,8 @@ class CourseRunWrapper(BaseWrapper):
'social_networks': { 'social_networks': {
staff.type: staff.value staff.type: staff.value
for staff in staff.person_networks.all() for staff in staff.person_networks.all()
} },
'is_new': False if staff.profile_image_url else True
} }
if hasattr(staff, 'position'): if hasattr(staff, 'position'):
......
course_discovery/conf/locale/en/LC_MESSAGES/django.po
...@@ -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-03 14:54+0500\n" "POT-Creation-Date: 2017-05-03 17:40+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
...@@ -2119,6 +2119,11 @@ msgstr "" ...@@ -2119,6 +2119,11 @@ msgstr ""
#: templates/publisher/course_run_detail/_all.html #: templates/publisher/course_run_detail/_all.html
#: templates/publisher/course_run_detail/_drupal.html #: templates/publisher/course_run_detail/_drupal.html
msgid "New"
msgstr ""
#: templates/publisher/course_run_detail/_all.html
#: templates/publisher/course_run_detail/_drupal.html
msgid "Estimated Effort" msgid "Estimated Effort"
msgstr "" msgstr ""
......
course_discovery/conf/locale/en/LC_MESSAGES/djangojs.po
...@@ -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-03 14:54+0500\n" "POT-Creation-Date: 2017-05-03 17:40+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"
......
course_discovery/conf/locale/eo/LC_MESSAGES/django.po
...@@ -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-03 14:54+0500\n" "POT-Creation-Date: 2017-05-03 17:40+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
...@@ -2534,6 +2534,11 @@ msgstr "Çöürsé Stäff Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#" ...@@ -2534,6 +2534,11 @@ msgstr "Çöürsé Stäff Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
#: templates/publisher/course_run_detail/_all.html #: templates/publisher/course_run_detail/_all.html
#: templates/publisher/course_run_detail/_drupal.html #: templates/publisher/course_run_detail/_drupal.html
msgid "New"
msgstr "Néw Ⱡ'σяєм#"
#: templates/publisher/course_run_detail/_all.html
#: templates/publisher/course_run_detail/_drupal.html
msgid "Estimated Effort" msgid "Estimated Effort"
msgstr "Éstïmätéd Éffört Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#" msgstr "Éstïmätéd Éffört Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
......
course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.po
...@@ -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-03 14:54+0500\n" "POT-Creation-Date: 2017-05-03 17:40+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
......
course_discovery/static/sass/publisher/publisher.scss
...@@ -623,6 +623,7 @@ ...@@ -623,6 +623,7 @@
} }
.name { .name {
color: #169BD5; color: #169BD5;
margin-bottom: 5px;
} }
.organization{ .organization{
font-weight: 600; font-weight: 600;
...@@ -697,3 +698,12 @@ ...@@ -697,3 +698,12 @@
} }
} }
} }
.new-staff {
color: black;
border: 1px #666666 solid;
border-radius: 9px;
font-size: 12px;
padding: 4px;
background-color: #F2F2F2;
}
course_discovery/templates/publisher/course_run_detail/_all.html
...@@ -61,6 +61,9 @@ ...@@ -61,6 +61,9 @@
<div class="staff-detail"> <div class="staff-detail">
<div class="name"> <div class="name">
{% if obj.is_new %}
<span class="new-staff">{% trans "New" %}</span>
{% endif %}
<a href="#" class="btn-instructor-detail" data-staff_id="{{ obj.uuid }}">{{ obj.full_name }}</a> <a href="#" class="btn-instructor-detail" data-staff_id="{{ obj.uuid }}">{{ obj.full_name }}</a>
</div> </div>
<div>{{ obj.position }}</div> <div>{{ obj.position }}</div>
......
course_discovery/templates/publisher/course_run_detail/_drupal.html
...@@ -94,6 +94,9 @@ ...@@ -94,6 +94,9 @@
<div class="staff-detail"> <div class="staff-detail">
<div class="name"> <div class="name">
{% if obj.is_new %}
<span class="new-staff">{% trans "New" %}</span>
{% endif %}
<a href="#" class="btn-instructor-detail" data-staff_id="{{ obj.uuid }}">{{ obj.full_name }}</a> <a href="#" class="btn-instructor-detail" data-staff_id="{{ obj.uuid }}">{{ obj.full_name }}</a>
</div> </div>
<div>{{ obj.position }}</div> <div>{{ obj.position }}</div>
......
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