]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' into feature/themes
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 23 Feb 2017 15:48:31 +0000 (16:48 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 23 Feb 2017 15:48:31 +0000 (16:48 +0100)
1  2 
app/themes/base/templates/agenda/event_base.html
app/themes/base/templates/agenda/event_detail.html
app/themes/base/templates/core/inc/related_content.html
app/themes/base/templates/pages/custompage.html
app/themes/base/templates/pages/mutations-creations.html
app/themes/base/templates/pages/page.html
app/themes/base/templates/projects/project_detail.html
app/themes/base/templates/twitter/tweets.html

index a089ef5371895757fd5936e6b1d43eff5683a654,0000000000000000000000000000000000000000..3710af036532efc990a68d4998dcd494618f2691
mode 100644,000000..100644
--- /dev/null
@@@ -1,160 -1,0 +1,160 @@@
-             {% with dynamic_content=page.dynamic_content_pages.all object=page %}
 +{% extends "pages/page.html" %}
 +{% load i18n mezzanine_tags keyword_tags organization_tags pages_tags %}
 +
 +{% block main %}
 +
 +    {% block hero %}
 +    {% endblock %}
 +
 +    <div class="page page--{% spaceless %}{% block page_class %}{% endblock %}{% endspaceless %}">
 +        <div class="container">
 +
 +            <div class="row">
 +
 +                <div class="col-sm-16 col-md-12 col-md-push-2 tac">
 +                    {% block page_title %}
 +                        {{ page.title }}
 +                    {% endblock %}
 +                </div>
 +
 +            </div>
 +
 +            <div class="row">
 +
 +                <div class="col-md-2 page__sidebar">
 +
 +                    <div style="position: relative;">
 +                        {% block page_sidebar %}
 +                        {% endblock %}
 +                    </div>
 +
 +                </div>
 +
 +                <div class="mb2 col-sm-16 col-md-12 page__content" data-summary-content>
 +                    {% block page_content %}
 +                        {{ page.content }}
 +                    {% endblock %}
 +                    {% block page_link %}
 +                        {% with object.links.all as links %}
 +                            {% if links %}
 +                                {% include 'core/inc/link.html' %}
 +                            {% endif %}
 +                        {% endwith %}
 +                    {% endblock %}
 +                    {% block page_file %}
 +                        {% with object.files.all as files %}
 +                            {% if files %}
 +                                {% include 'core/inc/files.html' %}
 +                            {% endif %}
 +                        {% endwith %}
 +                    {% endblock %}
 +                    {% block page_audio %}
 +                        {% for related in object.playlists.all %}
 +                            {% with related.playlist as playlist %}
 +                                {% if playlist.type == 'audio' %}
 +                                    {% include 'media/inc/playlist_audio_detail.html' %}
 +                                {% endif %}
 +                            {% endwith %}
 +                        {% endfor %}
 +                    {% endblock %}
 +                </div>
 +
 +            </div>
 +
 +        </div>
 +
 +        {% block page_slider %}
 +        {% with object.images.all|get_type:'page_slider' as slider_images %}
 +            {% if slider_images %}
 +                {% include 'core/inc/slider.html' %}
 +            {% endif %}
 +        {% endwith %}
 +        {% endblock %}
 +
 +        {% block page_video %}
 +            {% for related in object.playlists.all %}
 +                {% with related.playlist as playlist %}
 +                    {% if playlist.type == 'video' %}
 +                        {% include 'media/inc/playlist_video_slider.html' %}
 +                    {% endif %}
 +                {% endwith %}
 +            {% endfor %}
 +        {% endblock %}
 +
 +        <div class="">
 +
 +            {% block page_sub_content %}
 +                {% with object.blocks.all as blocks %}
 +                    {% include "core/inc/block.html" %}
 +                {% endwith %}
 +            {% endblock %}
 +
 +            {% block page_person_list %}
 +            {% endblock %}
 +
 +            {% block page_demo %}
 +            {% endblock %}
 +
 +            {% block page_blog %}
 +            {% endblock %}
 +
 +            {% block related_project %}
 +            {% endblock %}
 +
 +            {% block products %}
 +                {% if page.product_lists.all|length > 0 %}
 +                    {% for page_product_list in page.product_lists.all %}
 +                      {% with page_product_list.list as list %}
 +                        {% with "shop/includes/product_list_"|add:list.style|add:"_style.html" as template %}
 +                          {% include template %}
 +                        {% endwith %}
 +                      {% endwith %}
 +                    {% endfor %}
 +                {% endif %}
 +            {% endblock %}
 +
 +            {% block page_sub_content_2 %}
 +            {% endblock %}
 +
 +            {% block page_person_list_team %}
 +            {% endblock %}
 +
 +            {% block page_sub_content_3 %}
 +            {% endblock %}
 +
 +            {% block logo %}
 +                {% with page.images.all|get_type:'logo' as images %}
 +                    {% if images %}
 +                        <div class="page__block{% if block.background_color %} page__block--{{ block.background_color }}{% endif %}">
 +                            <div class="white-bg pb2">
 +                                <div class="container">
 +                                    <div class="row" data-summary-content>
 +                                        <div class="col-sm-16">
 +                                            <ul class="partners-list">
 +                                                {% include 'core/inc/logo.html' %}
 +                                            </ul>
 +                                        </div>
 +                                    </div>
 +                                </div>
 +                            </div>
 +                        </div>
 +                    {% endif %}
 +                {% endwith %}
 +            {% endblock %}
 +
 +        </div>
 +
 +    </div>
 +
 +    <div>
 +
 +        {% block page_related_content %}
++            {% with dynamic_content=page.dynamic_content_pages.all|filter_content object=page %}
 +                {% include "core/inc/related_content.html" %}
 +            {% endwith %}
 +        {% endblock %}
 +
 +    </div>
 +
 +
 +{% endblock %}
index ed7cdba6f1e7fe44f0d4efb343824882ed9ac8fc,0000000000000000000000000000000000000000..9208ba7725940a478ab2ab679255fefb463012c1
mode 100644,000000..100644
--- /dev/null
@@@ -1,152 -1,0 +1,152 @@@
-     {% with dynamic_content=event.dynamic_content_event.all object=event %}
 +{% extends "agenda/event_base.html" %}
 +{% load mezzanine_tags comment_tags keyword_tags rating_tags i18n future disqus_tags event_tags organization_tags pages_tags %}
 +
 +{% block meta_title %}{{ event.meta_title }}{% endblock %}
 +
 +{% block meta_keywords %}{% metablock %}
 +{% keywords_for event as tags %}
 +{% for tag in tags %}
 +    {% if not forloop.first %}, {% endif %}
 +    {{ tag }}
 +{% endfor %}
 +{% endmetablock %}{% endblock %}
 +
 +{% block meta_description %}{% metablock %}
 +    {{ event.description }}
 +{% endmetablock %}{% endblock %}
 +
 +{% block page_class %}
 +    event
 +{% endblock %}
 +
 +{% block page_title %}
 +    <h1 class="section-title section-title--uppercase section-title--main"><a href="{% url 'event_list' %}"><i class="fsl fa fa-angle-left"></i>{% trans "Back to events" %}</a></h1>
 +    {% include 'agenda/includes/event_linecard.html' %}
 +{% endblock %}
 +
 +{% block breadcrumb_menu %}
 +    {{ block.super }}
 +    <li class="breadcrumb__item">
 +        <a href="{% url 'event_list' %}" class="breadcrumb__link">{% trans "Agenda" %}</a>
 +    </li>
 +    <li class="breadcrumb__item active">{{ event.title }}</li>
 +{% endblock %}
 +
 +{% block page_content %}
 +    {% block event_detail_content %}
 +        {% if event.content %}
 +            {% editable event.content %}
 +                {{ event.content|richtext_filters|safe }}
 +            {% endeditable %}
 +        {% endif %}
 +    {% endblock %}
 +{% endblock %}
 +
 +{% block page_link %}
 +    {% if event.mentions or event.links.all|length > 0 %}
 +        <div class="mt4">
 +            <div class="row">
 +                {% if child %}
 +                    {% with child.links.all as links %}
 +                        {% if links %}
 +                            <div class="col-xs-8">
 +                                {% include 'core/inc/link.html' %}
 +                            </div>
 +                        {% endif %}
 +                    {% endwith %}
 +                {% else %}
 +                    {% with event.links.all as links %}
 +                        {% if links %}
 +                            <div class="col-xs-8">
 +                                {% include 'core/inc/link.html' %}
 +                            </div>
 +                        {% endif %}
 +                    {% endwith %}
 +                {% endif %}
 +                {% if event.mentions %}
 +                    <div class="col-xs-8">
 +                        <div class="small-text">
 +                            {{ event.mentions }}
 +                       </div>
 +                    </div>
 +                {% endif %}
 +            </div>
 +        </div>
 +    {% endif %}
 +{% endblock %}
 +
 +{% block page_audio %}
 +    {% with event as object %}
 +        {{ block.super }}
 +    {% endwith %}
 +{% endblock %}
 +
 +{% block page_slider %}
 +    {% with event as object %}
 +        {{ block.super }}
 +    {% endwith %}
 +{% endblock %}
 +
 +{% block page_video %}
 +    {% with event as object %}
 +        {{ block.super }}
 +    {% endwith %}
 +{% endblock %}
 +
 +{% block page_person_list %}
 +    {% if event.persons.all %}
 +        <div class="pb2">
 +            <div class="container">
 +                <div class="row">
 +                    <div class="col-xxs-16 col-md-10 col-md-push-3" data-summary-content>
 +                        <div class="tac">
 +                            <h2 class="section-title section-title--uppercase section-title--main section-title--underline">
 +                                {% if event.trainings.all %}
 +                                    {% trans "Trainers" %}<br>
 +                                {% else %}
 +                                    {% trans "Persons" %}<br>
 +                                {% endif %}
 +                            </h2>
 +                        </div>
 +                    </div>
 +                </div>
 +            </div>
 +
 +            <div class="container">
 +                <div class="row">
 +                    <div class="col-md-12 col-md-push-2 tac">
 +                        <div class="row">
 +                            <div>
 +                                {% for person in event.persons.all %}
 +                                    {% with person.person as person %}
 +                                        <div class="col-md-5 col-xs-8">
 +                                            {% include "network/inc/person/person_card_square.html" %}
 +                                        </div>
 +                                    {% endwith %}
 +                                {% endfor %}
 +                            </div>
 +                        </div>
 +                    </div>
 +                </div>
 +            </div>
 +        </div>
 +    {% endif %}
 +{% endblock %}
 +
 +{% block page_sub_content %}
 +    {% with event.blocks.all as blocks %}
 +        {% include "core/inc/block.html" %}
 +    {% endwith %}
 +{% endblock %}
 +
 +{% block page_sidebar %}
 +    <div class="" data-sticky data-sticky-parent="row" data-sticky-offset="100" data-sticky-detach-at="1171">
 +        {% include "includes/share_buttons.html" %}
 +    </div>
 +{% endblock %}
 +
 +{% block page_related_content %}
++    {% with dynamic_content=event.dynamic_content_event.all|filter_content object=event %}
 +        {% include "core/inc/related_content.html" %}
 +    {% endwith %}
 +{% endblock %}
index 109567639b844e4e62a605b5a4df7889c07c9758,0000000000000000000000000000000000000000..fd8f4502da2a8e4efdc1b1edfd92e9f7c095c9d5
mode 100644,000000..100644
--- /dev/null
@@@ -1,40 -1,0 +1,63 @@@
- {% if dynamic_content.first.content_object %}
 +{% load i18n mezzanine_tags keyword_tags organization_tags pages_tags %}
-                         {% for content in dynamic_content %}
++
++{% if dynamic_content.event|length > 0 %}
++
++<div class="container">
++    <div class="row tac">
++        <div class="col-xs-16">
++            <h2 class="section-title section-title--underline section-title--uppercase section-title--main">{% trans "Linked events" %}</h2>
++        </div>
++    </div>
++    <div class="row">
++        <div class="col-md-12 col-md-push-2">
++            {% for content in dynamic_content.event %}
++                {% with event=content.content_object %}
++                    {% include 'agenda/includes/event_linecard.html' %}
++                {% endwith %}
++            {% endfor %}
++        </div>
++
++    </div>
++</div>
++
++{% endif %}
++
++{% if dynamic_content.other|length > 0 %}
 +    <div class="pb2">
 +        <div class="container">
 +            <div class="row tac">
 +                <div class="col-xs-16">
 +                    <h2 class="section-title section-title--underline section-title--uppercase section-title--main">{% if object.related_title.title %}{{ object.related_title.title }}{% else %}{% trans "Also discover" %}{% endif %}</h2>
 +                </div>
 +            </div>
 +            <div class="row">
 +                <div class="col-xxs-16">
 +                    <div data-slider-related>
 +
++                        {% for content in dynamic_content.other %}
 +                            {% if forloop.counter0 == 0 or forloop.counter|divisibleby:3 %}
 +                                <div class="container">
 +                                    <div class="row">
 +                            {% endif %}
 +                                <div class="col-xs-6 col-xs-push-2">
 +                                    {% if content.content_type.model == "article" %}
 +                                        {% include "magazine/article/includes/article_card.html" with object=content.content_object  %}
 +                                    {% elif content.content_type.model == "event" %}
 +                                        {% include "agenda/event/includes/event_card.html" with object=content.content_object %}
 +                                    {% elif content.content_type.model == "custompage" %}
 +                                        {% include "pages/page/includes/page_card.html" with object=content.content_object %}
 +                                    {% endif %}
 +                                </div>
 +                            {% if forloop.last or forloop.counter|divisibleby:2 %}
 +                                </div>
 +                                </div>
 +                            {% endif %}
 +                        {% endfor %}
 +
 +                    </div>
 +                </div>
 +
 +            </div>
 +        </div>
 +    </div>
 +{% endif %}
index 6e324e11742d601fb86f29e5894cc37b0a02ea4c,0000000000000000000000000000000000000000..cc0110fd3ea66d2a977a8b96bd553c1a9789c8a8
mode 100644,000000..100644
--- /dev/null
@@@ -1,96 -1,0 +1,102 @@@
 +{% extends "pages/page.html" %}
 +{% load i18n mezzanine_tags keyword_tags pages_tags organization_tags %}
 +
 +    {% with page.custompage as object %}
 +    {% block page_class %}
 +        custompage
 +    {% endblock %}
 +
 +    {% block body_class %}
 +        {% with page.get_ascendants|last as top_level_parent %}
 +            {% if top_level_parent.get_content_model.weaving_css_class %}
 +            pattern pattern-bg {{ top_level_parent.get_content_model.weaving_css_class }}
 +            {% endif %}
 +        {% endwith %}
 +    {% endblock %}
 +
 +    {% block page_title %}
 +        {% editable page.custompage.title %}
 +            <h1 class="section-title section-title--uppercase section-title--main">{{ page.custompage.title }}</h1>
 +        {% endeditable %}
 +    {% endblock %}
 +
 +    {% block page_content %}
 +
 +        {% with page.get_ascendants|last as top_level_parent %}
 +            {% if linked_organization_content and research_slug == top_level_parent.slug %}
 +                {% include 'pages/page/includes/linked_organization_content.html' %}
 +            {% endif %}
 +        {% endwith %}
 +
 +        {% if page.custompage.sub_title %}
 +            {% editable page.custompage.sub_title %}
 +                <div class="chapo">
 +                    {{ page.custompage.sub_title }}
 +                </div>
 +            {% endeditable %}
 +        {% endif %}
 +
 +        {% if page.custompage.content %}
 +         {% editable page.custompage.content %}
 +            {{ page.custompage.content|richtext_filters|safe }}
 +         {% endeditable %}
 +        {% endif %}
 +
 +        {% if page.get_ascendants|length == 1 %}
 +            {% children_pages page.id as childrens %}
 +            {% if childrens %}
 +                <div class="page__childrens">
 +                    {% for child in childrens %}
 +                        {% if child.in_menus.0 %}
 +                          {% with child as object %}
 +                            {% include "pages/page/includes/page_box.html" %}
 +                          {% endwith %}
 +                        {% endif %}
 +                    {% endfor %}
 +                </div>
 +            {% endif %}
 +        {% endif %}
 +
 +    {% endblock %}
 +
 +    {% block page_audio %}
 +      {% with page.custompage as object %}
 +          {{ block.super }}
 +      {% endwith %}
 +    {% endblock %}
 +
 +    {% block page_slider %}
 +        {% with page.custompage as object %}
 +            {{ block.super }}
 +        {% endwith %}
 +    {% endblock %}
 +
 +    {% block page_video %}
 +      {% with page.custompage as object %}
 +          {{ block.super }}
 +      {% endwith %}
 +    {% endblock %}
 +
 +    {% block page_person_list %}
 +        {% for page_custom_person_list_block_inline in page.custompage.page_custom_person_list_block_inlines.all  %}
 +            {% with page_custom_person_list_block_inline.person_list_block as person_list_block %}
 +                {% with "network/inc/person/list_"|add:person_list_block.style|add:"_style.html" as template %}
 +                    {% include template %}
 +                {% endwith %}
 +            {% endwith %}
 +        {% endfor %}
 +    {% endblock %}
 +
 +    {% block page_sub_content %}
 +       {% with page.custompage.blocks.all as blocks %}
 +         {% include "core/inc/block.html" %}
 +      {% endwith %}
 +    {% endblock %}
 +
++    {% block page_related_content %}
++        {% with dynamic_content=page.dynamic_content_pages.all|filter_content object=page %}
++            {% include "core/inc/related_content.html" %}
++        {% endwith %}
++    {% endblock %}
++
 +{% endwith %}
index e39b3994040627f5ebd8d7eda250481a9e9188e8,0000000000000000000000000000000000000000..4d5f352ee3c77e5ff704457f70b5b34e6ac3d3b8
mode 100644,000000..100644
--- /dev/null
@@@ -1,100 -1,0 +1,106 @@@
 +{% extends "pages/page.html" %}
 +{% load i18n mezzanine_tags keyword_tags pages_tags organization_tags %}
 +
 +    {% with page.custompage as object %}
 +    {% block page_class %}
 +        custompage
 +    {% endblock %}
 +
 +    {% block body_class %}
 +        {% with page.get_ascendants|last as top_level_parent %}
 +            {% if top_level_parent.get_content_model.weaving_css_class %}
 +            pattern pattern-bg {{ top_level_parent.get_content_model.weaving_css_class }}
 +            {% endif %}
 +        {% endwith %}
 +    {% endblock %}
 +
 +    {% block hero %}
 +        {% include "home/inc/hero-small.html" %}
 +    {% endblock %}
 +
 +    {% block page_title %}
 +        {% editable page.custompage.title %}
 +            <h1 class="hide">{{ page.custompage.title }}</h1>
 +        {% endeditable %}
 +    {% endblock %}
 +
 +    {% block page_content %}
 +
 +        {% with page.get_ascendants|last as top_level_parent %}
 +            {% if linked_organization_content and research_slug == top_level_parent.slug %}
 +                {% include 'pages/page/includes/linked_organization_content.html' %}
 +            {% endif %}
 +        {% endwith %}
 +
 +        {% if page.custompage.sub_title %}
 +            {% editable page.custompage.sub_title %}
 +                <div class="chapo">
 +                    {{ page.custompage.sub_title }}
 +                </div>
 +            {% endeditable %}
 +        {% endif %}
 +
 +        {% if page.custompage.content %}
 +         {% editable page.custompage.content %}
 +            {{ page.custompage.content|richtext_filters|safe }}
 +         {% endeditable %}
 +        {% endif %}
 +
 +        {% if page.get_ascendants|length == 1 %}
 +            {% children_pages page.id as childrens %}
 +            {% if childrens %}
 +                <div class="page__childrens">
 +                    {% for child in childrens %}
 +                        {% if child.in_menus.0 %}
 +                          {% with child as object %}
 +                            {% include "pages/page/includes/page_box.html" %}
 +                          {% endwith %}
 +                        {% endif %}
 +                    {% endfor %}
 +                </div>
 +            {% endif %}
 +        {% endif %}
 +
 +    {% endblock %}
 +
 +    {% block page_audio %}
 +      {% with page.custompage as object %}
 +          {{ block.super }}
 +      {% endwith %}
 +    {% endblock %}
 +
 +    {% block page_slider %}
 +        {% with page.custompage as object %}
 +            {{ block.super }}
 +        {% endwith %}
 +    {% endblock %}
 +
 +    {% block page_video %}
 +      {% with page.custompage as object %}
 +          {{ block.super }}
 +      {% endwith %}
 +    {% endblock %}
 +
 +    {% block page_person_list %}
 +        {% for page_custom_person_list_block_inline in page.custompage.page_custom_person_list_block_inlines.all  %}
 +            {% with page_custom_person_list_block_inline.person_list_block as person_list_block %}
 +                {% with "network/inc/person/list_"|add:person_list_block.style|add:"_style.html" as template %}
 +                    {% include template %}
 +                {% endwith %}
 +            {% endwith %}
 +        {% endfor %}
 +    {% endblock %}
 +
 +    {% block page_sub_content %}
 +       {% with page.custompage.blocks.all as blocks %}
 +         {% include "core/inc/block.html" %}
 +      {% endwith %}
 +    {% endblock %}
 +
++    {% block page_related_content %}
++        {% with dynamic_content=page.dynamic_content_pages.all|filter_content object=page %}
++            {% include "core/inc/related_content.html" %}
++        {% endwith %}
++    {% endblock %}
++
 +{% endwith %}
index 67d080ad29e7b8f607f2def7e003edb7295ed4a2,0000000000000000000000000000000000000000..3e3fd0b74fc72ec510d9e0dc70065e5aea5e69fe
mode 100644,000000..100644
--- /dev/null
@@@ -1,174 -1,0 +1,174 @@@
-             {% with dynamic_content=page.dynamic_content_pages.all object=page %}
 +{% extends "base.html" %}
 +{% load i18n mezzanine_tags keyword_tags organization_tags pages_tags %}
 +
 +{% block meta_title %}{{ page.meta_title }}{% endblock %}
 +
 +{% block meta_keywords %}{% metablock %}
 +{% keywords_for page as keywords %}
 +{% for keyword in keywords %}
 +    {% if not forloop.first %}, {% endif %}
 +    {{ keyword }}
 +{% endfor %}
 +{% endmetablock %}{% endblock %}
 +
 +{% block meta_description %}{% metablock %}
 +{{ page.description }}
 +{% endmetablock %}{% endblock %}
 +
 +{% block main %}
 +
 +    {% block hero %}
 +    {% endblock %}
 +
 +    <div class="page page--{% spaceless %}{% block page_class %}{% endblock %}{% endspaceless %}">
 +        <div class="container">
 +
 +            <div class="row">
 +
 +                <div class="col-sm-16 col-md-12 col-md-push-2 tac">
 +                    {% block page_title %}
 +                        {{ page.title }}
 +                    {% endblock %}
 +                </div>
 +
 +            </div>
 +
 +            <div class="row">
 +
 +                <div class="col-md-2 page__sidebar">
 +
 +                    <div style="position: relative;">
 +                        {% block page_sidebar %}
 +                        {% endblock %}
 +                    </div>
 +
 +                </div>
 +
 +                <div class="mb2 col-sm-16 col-md-12 page__content" data-summary-content>
 +                    {% block page_content %}
 +                        {{ page.content }}
 +                    {% endblock %}
 +                    {% block page_link %}
 +                        {% with object.links.all as links %}
 +                            {% if links %}
 +                                {% include 'core/inc/link.html' %}
 +                            {% endif %}
 +                        {% endwith %}
 +                    {% endblock %}
 +                    {% block page_file %}
 +                        {% with object.files.all as files %}
 +                            {% if files %}
 +                                {% include 'core/inc/files.html' %}
 +                            {% endif %}
 +                        {% endwith %}
 +                    {% endblock %}
 +                    {% block page_audio %}
 +                        {% for related in object.playlists.all %}
 +                            {% with related.playlist as playlist %}
 +                                {% if playlist.type == 'audio' %}
 +                                    {% include 'media/inc/playlist_audio_detail.html' %}
 +                                {% endif %}
 +                            {% endwith %}
 +                        {% endfor %}
 +                    {% endblock %}
 +                </div>
 +
 +            </div>
 +
 +        </div>
 +
 +        {% block page_slider %}
 +        {% with object.images.all|get_type:'page_slider' as slider_images %}
 +            {% if slider_images %}
 +                {% include 'core/inc/slider.html' %}
 +            {% endif %}
 +        {% endwith %}
 +        {% endblock %}
 +
 +        {% block page_video %}
 +            {% for related in object.playlists.all %}
 +                {% with related.playlist as playlist %}
 +                    {% if playlist.type == 'video' %}
 +                        {% include 'media/inc/playlist_video_slider.html' %}
 +                    {% endif %}
 +                {% endwith %}
 +            {% endfor %}
 +        {% endblock %}
 +
 +        <div class="">
 +
 +            {% block page_person_list %}
 +            {% endblock %}
 +
 +            {% block page_demo %}
 +            {% endblock %}
 +
 +            {% block page_blog %}
 +            {% endblock %}
 +
 +            {% block page_sub_content %}
 +                {% with object.blocks.all as blocks %}
 +                    {% include "core/inc/block.html" %}
 +                {% endwith %}
 +            {% endblock %}
 +
 +            {% block related_project %}
 +            {% endblock %}
 +
 +            {% block products %}
 +                {% if page.product_lists.all|length > 0 %}
 +                    {% for page_product_list in page.product_lists.all %}
 +                      {% with page_product_list.list as list %}
 +                        {% with "shop/includes/product_list_"|add:list.style|add:"_style.html" as template %}
 +                          {% include template %}
 +                        {% endwith %}
 +                      {% endwith %}
 +                    {% endfor %}
 +                {% endif %}
 +            {% endblock %}
 +
 +            {% block page_sub_content_2 %}
 +            {% endblock %}
 +
 +            {% block page_person_list_team %}
 +            {% endblock %}
 +
 +            {% block page_sub_content_3 %}
 +            {% endblock %}
 +
 +            {% block logo %}
 +                {% with page.images.all|get_type:'logo' as images %}
 +                    {% if images %}
 +                        <div class="page__block{% if block.background_color %} page__block--{{ block.background_color }}{% endif %}">
 +                            <div class="white-bg pb2">
 +                                <div class="container">
 +                                    <div class="row" data-summary-content>
 +                                        <div class="col-sm-16">
 +                                            <ul class="partners-list">
 +                                                {% include 'core/inc/logo.html' %}
 +                                            </ul>
 +                                        </div>
 +                                    </div>
 +                                </div>
 +                            </div>
 +                        </div>
 +                    {% endif %}
 +                {% endwith %}
 +            {% endblock %}
 +
 +        </div>
 +
 +    </div>
 +
 +    <div>
 +
 +        {% block page_related_content %}
++            {% with dynamic_content=page.dynamic_content_pages.all|filter_content object=page %}
 +                {% include "core/inc/related_content.html" %}
 +            {% endwith %}
 +        {% endblock %}
 +
 +    </div>
 +
 +
 +{% endblock %}
index 72674f684126b1f6e183b9036f2c99a9218dbec7,0000000000000000000000000000000000000000..e426951cfab7f20ac5f96bfe6eed2b261de7f799
mode 100644,000000..100644
--- /dev/null
@@@ -1,351 -1,0 +1,351 @@@
-     {% with dynamic_content=object.dynamic_content_object.all object=object %}
 +{% extends "pages/page.html" %}
 +{% load mezzanine_tags keyword_tags i18n organization_tags pages_tags %}
 +
 +{% block meta_title %}{{ object.meta_title }}{% endblock %}
 +
 +{% block meta_keywords %}{% metablock %}
 +{% keywords_for object as keywords %}
 +{% for keyword in keywords %}
 +    {% if not forloop.first %}, {% endif %}
 +    {{ keyword }}
 +{% endfor %}
 +{% endmetablock %}{% endblock %}
 +
 +{% block page_class %}
 +    object
 +{% endblock %}
 +
 +{% block body_class %}
 +    pattern pattern-bg {{ department.pages.all.0.weaving_css_class }}
 +{% endblock %}
 +
 +{% block breadcrumb_menu %}
 +    {{ block.super }}
 +    <li class="breadcrumb__item active">{{ object.title }}</li>
 +{% endblock %}
 +
 +{% block page_tags %}
 +
 +    {% comment %}
 +        {% if department %}
 +            <div class="tag dashed dashed--yellow">
 +              {{ department.pages.all.0.title }}
 +            </div>
 +        {% endif %}
 +        <div class="tag tag--category">
 +            {% trans 'Project' %}
 +        </div>
 +    {% endcomment %}
 +
 +{% endblock %}
 +
 +{% block page_title %}
 +
 +    {% editable object.title %}
 +        <h1 class="dotted">{{ object.title }}</h1>
 +    {% endeditable %}
 +
 +    {% with page.get_ascendants|last as top_level_parent %}
 +        {% if linked_organization_content and research_slug == top_level_parent.slug %}
 +            {% include 'pages/page/includes/linked_organization_content.html' %}
 +        {% endif %}
 +    {% endwith %}
 +
 +    {% if object.description %}
 +        {% editable object.description %}
 +            <div class="chapo">
 +                {{ object.description }}
 +            </div>
 +        {% endeditable %}
 +    {% endif %}
 +
 +{% endblock %}
 +
 +{% block page_content %}
 +    {% if object.content %}
 +        {% editable object.content %}
 +            {{ object.content|richtext_filters|safe }}
 +        {% endeditable %}
 +    {% endif %}
 +{% endblock %}
 +
 +{% block page_sidebar %}
 +    <ul class="nav-tree nav-tree--level-{{ branch_level }}" data-sticky data-sticky-parent="row" data-sticky-offset="100" data-sticky-detach-at="971">
 +        <li class="nav-tree__item">
 +            <a class="nav-tree__link" href="{{ page.get_ascendants.0.get_absolute_url }}">{% trans "Home" %}</a>
 +        </li>
 +        <li class="nav-tree__item">
 +            <a class="nav-tree__link" href="{{ page.get_absolute_url }}">{{ page.title }}</a>
 +        </li>
 +        <li class="nav-tree__item">
 +            <a class="nav-tree__link active" href="{{ page.get_absolute_url }}">{{ object.title }}</a>
 +            <ul class="nav-tree" data-summary>
 +                <li class="nav-tree__item nav-tree__item--sub hide">
 +                    <a class="nav-tree__link nav-tree__link--sub" href="#"></a>
 +                </li>
 +            </ul>
 +        </li>
 +    </ul>
 +{% endblock %}
 +
 +{% block page_link %}
 +    {% with object.links.all as links %}
 +        {% if links %}
 +            {% include 'core/inc/link.html' %}
 +        {% endif %}
 +    {% endwith %}
 +{% endblock %}
 +
 +{% block page_audio %}
 +  {% with object as object %}
 +      {{ block.super }}
 +  {% endwith %}
 +{% endblock %}
 +
 +{% block page_slider %}
 +    {% with object as object %}
 +        {{ block.super }}
 +    {% endwith %}
 +{% endblock %}
 +
 +{% block page_video %}
 +  {% with object as object %}
 +      {{ block.super }}
 +  {% endwith %}
 +{% endblock %}
 +
 +{% block page_sub_content %}
 +
 +    {% if object.type == 'external' %}
 +        <div class="white-bg pb2">
 +            <hr class="mt0 invisible" />
 +            <div class="page__block page__block--yellow">
 +                <div class="container">
 +                    <div class="row">
 +                        <div class="col-sm-12 col-lg-10 col-lg-push-1">
 +                            <div class="row">
 +                                <div class="col-sm-6">
 +                                    <div class="project-details">
 +                                        <h3 class="dotted project-details__title">{% trans "Project details" %}</h3>
 +
 +                                        <div>
 +                                            {% if object.program %}
 +                                                <div class="project-details__item">
 +                                                    <div class="project-details__item-title">
 +                                                        {% trans "Program" %}
 +                                                    </div>
 +                                                    <div class="project-details__item-desc">
 +                                                        {{ object.program }}
 +                                                    </div>
 +                                                </div>
 +                                            {% endif %}
 +
 +                                            {% if object.program_type %}
 +                                                <div class="project-details__item">
 +                                                    <div class="project-details__item-title">
 +                                                        {% trans "Program type" %}
 +                                                    </div>
 +                                                    <div class="project-details__item-desc">
 +                                                        {{ object.program_type }}
 +                                                    </div>
 +                                                </div>
 +                                            {% endif %}
 +
 +                                            <div class="project-details__item">
 +                                                <div class="project-details__item-title">
 +                                                    {% trans "Beginning" %}
 +                                                </div>
 +                                                <div class="project-details__item-desc">
 +                                                    {{ object.date_from }}
 +                                                </div>
 +                                            </div>
 +
 +                                            <div class="project-details__item">
 +                                                <div class="project-details__item-title">
 +                                                    {% trans "End" %}
 +                                                </div>
 +                                                <div class="project-details__item-desc">
 +                                                    {{ object.date_to }}
 +                                                </div>
 +                                            </div>
 +
 +                                            <div class="project-details__item">
 +                                                <div class="project-details__item-title">
 +                                                    {% trans "Status" %}
 +                                                </div>
 +                                                <div class="project-details__item-desc">
 +                                                    {{ object.object_status }}
 +                                                </div>
 +                                            </div>
 +
 +                                            {% if object.website %}
 +                                                <div class="project-details__item">
 +                                                    <div class="project-details__item-title">
 +                                                        {% trans "Website" %}
 +                                                    </div>
 +                                                    <div class="project-details__item-desc">
 +                                                        <a href="{{ object.website }}" target="_blank" title="{{ object.title }}">{{ object.website }}</a>
 +                                                    </div>
 +                                                </div>
 +                                            {% endif %}
 +
 +                                            <div class="project-details__logo">
 +                                                {% with object.images.all|get_type:'logo' as images %}
 +                                                    {% include 'core/inc/logo.html' %}
 +                                                {% endwith %}
 +                                            </div>
 +
 +                                        </div>
 +                                    </div>
 +                                </div>
 +                                <div class="col-sm-6">
 +                                    <div class="project-details">
 +                                        <h3 class="dotted project-details__title">{% trans "Participants" %}</h3>
 +
 +                                        <div>
 +
 +                                            {% if object.lead_team or object.lead_organization %}
 +                                                <div class="project-details__item">
 +                                                  {% if object.lead_team %}
 +                                                    <div class="project-details__item-title">
 +                                                        {% trans "Project lead team" %}
 +                                                    </div>
 +                                                    <div class="project-details__item-desc">
 +                                                        <a href="{% url "page" object.lead_team.pages.all.0 %}">{{ object.lead_team.short }}</a>
 +                                                    </div>
 +                                                  {% elif object.lead_organization %}
 +                                                    <div class="project-details__item-title">
 +                                                        {% trans "Project lead organization" %}
 +                                                    </div>
 +                                                    <div class="project-details__item-desc">
 +                                                        {% if object.lead_organization.url %}
 +                                                            <a href="{{ object.lead_organization.url }}" target="_blank" title="{{ object.lead_organization }}">
 +                                                        {% endif %}
 +                                                            {{ object.lead_organization }}
 +                                                        {% if object.lead_organization.url %}
 +                                                            </a>
 +                                                        {% endif %}
 +                                                    </div>
 +                                                  {% endif %}
 +                                                </div>
 +                                            {% endif %}
 +
 +                                            <div class="project-details__item">
 +                                                <div class="project-details__item-title">
 +                                                    {% trans "Partners" %}
 +                                                </div>
 +                                                <div class="project-details__item-desc">
 +                                                    {% for organization in object.organizations.all %}
 +                                                        {% if organization.url %}
 +                                                            <a href="{{ organization.url }}" target="_blank" title="{{ organization }}">
 +                                                        {% endif %}
 +                                                            {{ organization }}<br>
 +                                                        {% if organization.url %}
 +                                                            </a>
 +                                                        {% endif %}
 +                                                    {% endfor %}
 +                                                </div>
 +
 +                                                <div class="project-details__item-title">
 +                                                    {% trans "teams" %} ({{ host_organization }})
 +                                                </div>
 +                                                <div class="project-details__item-desc">
 +                                                    {% for team in object.teams.all %}
 +                                                        {% if team.pages.all %}
 +                                                            <a href="{% url "page" team.pages.all.0.slug %}">{{ team.short }}</a><br>
 +                                                        {% endif %}
 +                                                    {% endfor %}
 +                                                </div>
 +                                            </div>
 +                                        </div>
 +                                    </div>
 +                                </div>
 +                            </div>
 +                        </div>
 +                    </div>
 +                </div>
 +            </div>
 +        </div>
 +    {% endif %}
 +
 +    {% with object.blocks.all as blocks %}
 +        {% include "projects/inc/project_block.html" %}
 +    {% endwith %}
 +{% endblock %}
 +
 +{% block page_demo %}
 +{% if object.demos.all %}
 +<div class="page__block{% if block.background_color %} page__block--{{ block.background_color }}{% endif %}">
 +  <hr class="mt0">
 +    <div class="white-bg mb2">
 +        <div class="container">
 +            <div class="row" data-summary-content>
 +                <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
 +                    <ul>
 +                        <h2>{% trans "Demos" %}</h2>
 +                        {% for demo in object.demos.all %}
 +                            <li><a href="{% url 'organization-project-demo-detail' demo.slug %}">{{ demo.title }}</a></li>
 +                        {% endfor %}
 +                    </ul>
 +                </div>
 +            </div>
 +        </div>
 +    </div>
 +</div>
 +{% endif %}
 +{% endblock %}
 +
 +{% block page_blog %}
 +{% if object.blog_pages.all %}
 +<div class="page__block{% if block.background_color %} page__block--{{ block.background_color }}{% endif %}">
 +  <hr class="mt0">
 +    <div class="white-bg mb2">
 +        <div class="container">
 +            <div class="row" data-summary-content>
 +                <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
 +                    <ul>
 +                        <h2>{% trans "Blog Pages" %}</h2>
 +                        {% for blog_page in object.blog_pages.all %}
 +                            <li><a href="{% url 'organization-project-blogpage-detail' blog_page.slug %}">{{ blog_page.title }}</a></li>
 +                        {% endfor %}
 +                    </ul>
 +                </div>
 +            </div>
 +        </div>
 +    </div>
 +</div>
 +{% endif %}
 +{% endblock %}
 +
 +{% block logo %}
 +    {% if object.organizations.all|length > 0 %}
 +        <div class="page__block{% if block.background_color %} page__block--{{ block.background_color }}{% endif %}">
 +            <div class="white-bg pb2">
 +                <div class="container">
 +                    <div class="row" data-summary-content>
 +                        <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
 +                            <ul class="partners-list">
 +                                {% if object.lead_organization %}
 +                                    {% with object.lead_organization.images.all|get_type:'logo' as images %}
 +                                        {% include 'core/inc/logo.html' %}
 +                                    {% endwith %}
 +                                {% endif %}
 +                                {% for organization in object.organizations.all %}
 +                                    {% with organization.images.all|get_type:'logo' as images %}
 +                                        {% include 'core/inc/logo.html' %}
 +                                    {% endwith %}
 +                                {% endfor %}
 +                            </ul>
 +                        </div>
 +                    </div>
 +                </div>
 +            </div>
 +        </div>
 +    {% endif %}
 +{% endblock %}
 +
 +{% block page_related_content %}
++    {% with dynamic_content=object.dynamic_content_object.all|filter_content object=object %}
 +        {% include "core/inc/related_content.html" %}
 +    {% endwith %}
 +{% endblock %}
index 45f65e059507ade53bf9110094aea22bf6e671b7,0000000000000000000000000000000000000000..851f67a0241855f3a714bf051faa8f13d208cc4f
mode 100644,000000..100644
--- /dev/null
@@@ -1,28 -1,0 +1,36 @@@
-             <img class="tweets__tweet-image" src="{{ tweet.profile_image_url|cut:"http:" }}" alt="{{ tweet.full_name }}">
 +
 +{% load twitter_tags i18n %}
 +
 +{% tweets_default as tweets %}
 +
 +{% if tweets %}
 +<ul class="tweets">
 +    {% for tweet in tweets %}
 +    <li class="tweets__tweet">
 +        <div class="col-xxs-3">
-                 {{ tweet.full_name }} <a href="http://twitter.com/{{ tweet.user_name }}" title="{{ tweet.full_name }}">@{{ tweet.user_name }}</a>
-                 <span>{% blocktrans with sometime=tweet.created_at|timesince %}{{ sometime }} ago{% endblocktrans %}</span>
++            {% if tweet.retweeter_full_name %}
++                <a href="http://twitter.com/{{ tweet.retweeter_user_name }}" title="{{ tweet.retweeter_full_name }}"><img class="tweets__tweet-image" src="{{ tweet.retweeter_profile_image_url|cut:"http:" }}" alt="{{ tweet.retweeter_full_name }}"></a>
++            {% else %}
++                <a href="http://twitter.com/{{ tweet.user_name }}" title="{{ tweet.full_name }}"><img class="tweets__tweet-image" src="{{ tweet.profile_image_url|cut:"http:" }}" alt="{{ tweet.full_name }}"></a>
++            {% endif %}
 +        </div>
 +        <div class="col-xxs-13 tweets__tweet-content">
 +            <h4 class="tweets__tweet-author">
++                {% if tweet.retweeter_full_name %}
++                    <a href="http://twitter.com/{{ tweet.retweeter_user_name }}" title="{{ tweet.retweeter_full_name }}">{{ tweet.retweeter_full_name }}   @{{ tweet.retweeter_user_name }}</a>
++                {% else %}
++                    <a href="http://twitter.com/{{ tweet.user_name }}" title="{{ tweet.full_name }}">{{ tweet.full_name }}   @{{ tweet.user_name }}</a>
++                {% endif %}
++                    <span>{% blocktrans with sometime=tweet.created_at|timesince %}{{ sometime }} ago{% endblocktrans %}</span>
 +            </h4>
 +            <p class="tweets__tweet-body">
 +                {{ tweet.text|safe }}<br>
 +                {% comment %}
 +                    <a href="http://twitter.com/{{ tweet.user_name }}/status/{{ tweet.remote_id }}"></a>
 +                {% endcomment %}
 +            </p>
 +        </div>
 +    </li>
 +    {% endfor %}
 +</ul>
 +{% endif %}