diff --git a/src/backend/funmooc/static/images/edulib_blanc.png b/src/backend/funmooc/static/richie/images/edulib_blanc.png similarity index 100% rename from src/backend/funmooc/static/images/edulib_blanc.png rename to src/backend/funmooc/static/richie/images/edulib_blanc.png diff --git a/src/backend/funmooc/static/images/edulib_bleu.png b/src/backend/funmooc/static/richie/images/edulib_bleu.png similarity index 100% rename from src/backend/funmooc/static/images/edulib_bleu.png rename to src/backend/funmooc/static/richie/images/edulib_bleu.png diff --git a/src/backend/funmooc/templates/courses/cms/course_detail.html b/src/backend/funmooc/templates/courses/cms/course_detail.html index 1e4ea2f6..63e61797 100644 --- a/src/backend/funmooc/templates/courses/cms/course_detail.html +++ b/src/backend/funmooc/templates/courses/cms/course_detail.html @@ -1,10 +1,21 @@ {% extends "richie/fullwidth.html" %} {% load cms_tags i18n extra_tags thumbnail %} -{% block meta %} -{# Make sure course snapshot pages are not indexed by search engines #} -{% if current_page.parent_page.course %}{% endif %} -{% endblock meta %} +{% block breadcrumbs %}{% endblock breadcrumbs %} + +{% block meta_index_rules %} + {# Make sure course snapshot pages are not indexed by search engines #} + {% if current_page.parent_page.course %} + + {% else %} + {{ block.super }} + {% endif %} +{% endblock meta_index_rules %} + +{% block meta_opengraph_contextuals %} + + +{% endblock meta_opengraph_contextuals %} {% block content %}{% spaceless %}
diff --git a/src/backend/funmooc/templates/courses/cms/fragment_organization_glimpse.html b/src/backend/funmooc/templates/courses/cms/fragment_organization_glimpse.html index 6dab4468..757f7a78 100644 --- a/src/backend/funmooc/templates/courses/cms/fragment_organization_glimpse.html +++ b/src/backend/funmooc/templates/courses/cms/fragment_organization_glimpse.html @@ -1,7 +1,13 @@ {% load i18n cms_tags extra_tags thumbnail %} {% comment %}Obviously, the context template variable "organization" is required and must be an Organization page extension{% endcomment %} {% with organization_page=organization.extended_object %} - +
@@ -43,6 +75,11 @@ {% endblock body_header %}
+ {% block breadcrumbs %} +
    + {% block breadcrumbs_content %}{% show_breadcrumb 0 "menu/breadcrumb_item.html" %}{% endblock breadcrumbs_content %} +
+ {% endblock breadcrumbs %} {% block content %}{% endblock content %}
@@ -50,17 +87,17 @@
    - {% show_menu_below_id "annex" 0 100 100 100 "menu/footer_menu.html" %} + {% show_menu_below_id "annex" 0 2 100 100 "menu/footer_menu.html" %}
- + {% include "social-networks/footer-badges.html" %}
-

{% now "Y" %} © EDUlib {% trans "All Rights Reserved." %}

+

{% now "Y" %} © EDUlib {% blocktrans %}All Rights Reserved.{% endblocktrans %}

diff --git a/src/backend/funmooc/templates/richie/large_banner/large_banner.html b/src/backend/funmooc/templates/richie/large_banner/large_banner.html index 3cf3587d..8fcc3856 100644 --- a/src/backend/funmooc/templates/richie/large_banner/large_banner.html +++ b/src/backend/funmooc/templates/richie/large_banner/large_banner.html @@ -14,5 +14,8 @@ {% if instance.logo %} {% endif %} + {% if instance.content %} +
{{ instance.content|safe }}
+ {% endif %}
diff --git a/src/backend/funmooc/templates/social-networks/blogpost-badges.html b/src/backend/funmooc/templates/social-networks/blogpost-badges.html index e2cb0bba..ace4206e 100644 --- a/src/backend/funmooc/templates/social-networks/blogpost-badges.html +++ b/src/backend/funmooc/templates/social-networks/blogpost-badges.html @@ -3,13 +3,25 @@ {% blocktrans with title=page_title asvar mailto_subject %}EDUlib news: {{ title }}{% endblocktrans %} {% blocktrans with title=page_title|safe url=full_page_url asvar shared_sentence %}EDUlib news: {{ title }} {{ url }}{% endblocktrans %} diff --git a/src/backend/funmooc/templates/social-networks/course-badges.html b/src/backend/funmooc/templates/social-networks/course-badges.html index 878dde59..a47bbfa9 100644 --- a/src/backend/funmooc/templates/social-networks/course-badges.html +++ b/src/backend/funmooc/templates/social-networks/course-badges.html @@ -3,13 +3,25 @@ {% blocktrans asvar shared_subject %}Follow a course online with EDUlib{% endblocktrans %} {% blocktrans with title=page_title|safe url=full_page_url asvar shared_sentence %}I just enrolled to the course "{{ title }}" on EDUlib: {{ url }}{% endblocktrans %} diff --git a/src/backend/funmooc/templates/social-networks/footer-badges.html b/src/backend/funmooc/templates/social-networks/footer-badges.html index 4900d2f2..1bd4a1a4 100644 --- a/src/backend/funmooc/templates/social-networks/footer-badges.html +++ b/src/backend/funmooc/templates/social-networks/footer-badges.html @@ -1,8 +1,16 @@ {% load i18n %}{% spaceless %} - - {% endspaceless %}