diff --git a/cms/models.py b/cms/models.py index 7130781175..64f99aebb6 100644 --- a/cms/models.py +++ b/cms/models.py @@ -259,13 +259,9 @@ def get_context(self, request, *args, **kwargs): .select_related("thumbnail_image") ) - featured_product = ProgramPage.objects.filter( - featured=True, program__live=True - ).select_related("program", "thumbnail_image").prefetch_related( - "program__courses__courseruns" - ) or CoursePage.objects.filter( - featured=True, course__live=True - ) + featured_product = program_page_qset.filter( + featured=True + ) or course_page_qset.filter(featured=True) all_pages, program_pages, course_pages = filter_and_sort_catalog_pages( program_page_qset, course_page_qset, diff --git a/cms/templates/partials/card_details_top.html b/cms/templates/partials/card_details_top.html index 9dfa7a3fd7..3e644596b0 100644 --- a/cms/templates/partials/card_details_top.html +++ b/cms/templates/partials/card_details_top.html @@ -5,7 +5,7 @@ {% if courseware_page.thumbnail_image %} {{ courseware_page.thumbnail_image.title }} {% else %} - Preview image + Preview image {% endif %} diff --git a/cms/templates/partials/courseware-carousel-base.html b/cms/templates/partials/courseware-carousel-base.html index e475e9aeb4..c36a9b2010 100644 --- a/cms/templates/partials/courseware-carousel-base.html +++ b/cms/templates/partials/courseware-carousel-base.html @@ -5,7 +5,7 @@ {% if courseware_page.thumbnail_image %} {{ courseware_page.title }} {% else %} - {{ courseware_page.title }} + {{ courseware_page.title }} {% endif %} {{ courseware_page.title }}

{{ courseware_page.subhead }}

diff --git a/cms/templates/partials/faculty-carousel.html b/cms/templates/partials/faculty-carousel.html index 85fa6c469d..670690c378 100644 --- a/cms/templates/partials/faculty-carousel.html +++ b/cms/templates/partials/faculty-carousel.html @@ -11,7 +11,7 @@

{{ page.subhead }}

{% for member in page.members %}
- {{ member.value.name }} + {{ member.value.name }}

{{ member.value.name }}

{{ member.value.description|richtext }} diff --git a/cms/templates/partials/learning-techniques.html b/cms/templates/partials/learning-techniques.html index 1cb0efd235..9b060ee242 100644 --- a/cms/templates/partials/learning-techniques.html +++ b/cms/templates/partials/learning-techniques.html @@ -5,7 +5,7 @@

{{ page.title }}

{% for technique in page.technique_items %}
  • - Learning technique + Learning technique

    {{ technique.value.heading }}

    {{ technique.value.sub_heading }}

    diff --git a/cms/templates/partials/testimonial-carousel.html b/cms/templates/partials/testimonial-carousel.html index d2b7d75646..f9ce2ba0d6 100644 --- a/cms/templates/partials/testimonial-carousel.html +++ b/cms/templates/partials/testimonial-carousel.html @@ -12,7 +12,7 @@

    {{ page.subhead }}

    {% if testimonial.value.image %} - {{ testimonial.value.name }} + {{ testimonial.value.name }} {% endif %}

    {{ testimonial.value.name }}, {{ testimonial.value.title }}

    {{ testimonial.value.quote|truncatechars:150 }}

    @@ -36,7 +36,7 @@

    {{ testimonial.value.name }}, {{ testimonial.value.title }}

    - Testimonial image + Testimonial image
    diff --git a/mitxpro/templates/base.html b/mitxpro/templates/base.html index cc405a7330..6743f01250 100644 --- a/mitxpro/templates/base.html +++ b/mitxpro/templates/base.html @@ -35,7 +35,7 @@ {% endblock %} {% endspaceless %} {% if zendesk_config.help_widget_enabled and not request.path|startswith:'/certificate/' %} - + {% endif %} diff --git a/mitxpro/templates/footer.html b/mitxpro/templates/footer.html index 82e4bce677..fcb87331c5 100644 --- a/mitxpro/templates/footer.html +++ b/mitxpro/templates/footer.html @@ -6,7 +6,7 @@
    - Contact Us + Contact Us

    Contact Us

    @@ -30,7 +30,7 @@

    Contact Us

    diff --git a/static/js/containers/pages/ReceiptPage.js b/static/js/containers/pages/ReceiptPage.js index 1dd8ca32b9..f5bf332b6a 100644 --- a/static/js/containers/pages/ReceiptPage.js +++ b/static/js/containers/pages/ReceiptPage.js @@ -109,6 +109,8 @@ export class ReceiptPage extends React.Component { MIT xPro

    Receipt

    diff --git a/static/scss/footer.scss b/static/scss/footer.scss index 4249bde542..2270283816 100755 --- a/static/scss/footer.scss +++ b/static/scss/footer.scss @@ -105,6 +105,7 @@ img { width: 78px; + height: 41px; margin: 0 auto 15px; @include media-breakpoint-up(md) { diff --git a/static/scss/top-app-bar.scss b/static/scss/top-app-bar.scss index 502585163f..42801aa81e 100644 --- a/static/scss/top-app-bar.scss +++ b/static/scss/top-app-bar.scss @@ -77,7 +77,7 @@ .site-logo { width: 154px; - height: auto; + height: 47.5px; } .navbar-brand {