From 370b5077fd990d210237a0adf09ce3b0bd8d053f Mon Sep 17 00:00:00 2001
From: Emilie <zawadzki@ircam.fr>
Date: Fri, 19 Aug 2016 20:01:32 +0200
Subject: [PATCH] Home : Body content (brief + others content) + deleting
 featured_tag

---
 app/templates/agenda/event_booking.html       |  2 +-
 app/templates/agenda/event_detail.html        |  2 +-
 app/templates/agenda/event_iframe.html        |  2 +-
 .../agenda/includes/event_metainfo.html       |  2 +-
 .../includes/event_metainfo_slider.html       |  2 +-
 app/templates/base.html                       |  2 +-
 app/templates/blog/blog_post_detail.html      |  2 +-
 app/templates/festival/artist_detail.html     |  2 +-
 app/templates/festival/video_list.html        |  2 +-
 app/templates/home/inc/body.html              | 13 +++++++++
 app/templates/home/inc/brief_card.html        | 10 +++++++
 app/templates/home/inc/generic_card.html      |  7 +++++
 app/templates/home/inc/slider.html            | 14 ++++++----
 app/templates/includes/slider.html            |  2 +-
 app/templates/index.html                      | 28 ++-----------------
 .../magazine/article/article_detail.html      |  2 +-
 app/templates/pages/basicpage.html            |  2 +-
 app/templates/pages/department.html           |  2 +-
 app/templates/pages/page.html                 |  2 +-
 app/templates/pages/team.html                 |  2 +-
 app/templates/styles.html                     |  2 +-
 app/templates/team/team_list.html             |  2 +-
 22 files changed, 58 insertions(+), 48 deletions(-)
 create mode 100644 app/templates/home/inc/body.html
 create mode 100644 app/templates/home/inc/brief_card.html
 create mode 100644 app/templates/home/inc/generic_card.html

diff --git a/app/templates/agenda/event_booking.html b/app/templates/agenda/event_booking.html
index 880ded65..345de954 100644
--- a/app/templates/agenda/event_booking.html
+++ b/app/templates/agenda/event_booking.html
@@ -1,5 +1,5 @@
 {% extends "agenda/event_detail.html" %}
-{% load mezzanine_tags comment_tags keyword_tags rating_tags i18n future disqus_tags event_tags featured_tags %}
+{% load mezzanine_tags comment_tags keyword_tags rating_tags i18n future disqus_tags event_tags  %}
 
 {% block event_detail_postedby %}
 {% endblock %}
diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html
index e6df9efe..41b66228 100644
--- a/app/templates/agenda/event_detail.html
+++ b/app/templates/agenda/event_detail.html
@@ -1,5 +1,5 @@
 {% extends "agenda/event_list.html" %}
-{% load mezzanine_tags comment_tags keyword_tags rating_tags i18n future disqus_tags event_tags featured_tags %}
+{% load mezzanine_tags comment_tags keyword_tags rating_tags i18n future disqus_tags event_tags  %}
 
 {% block meta_title %}{{ event.meta_title }}{% endblock %}
 
diff --git a/app/templates/agenda/event_iframe.html b/app/templates/agenda/event_iframe.html
index 61f0befd..6f0f2fb6 100644
--- a/app/templates/agenda/event_iframe.html
+++ b/app/templates/agenda/event_iframe.html
@@ -1,5 +1,5 @@
 {% extends "agenda/event_detail.html" %}
-{% load mezzanine_tags comment_tags keyword_tags rating_tags i18n future disqus_tags event_tags featured_tags %}
+{% load mezzanine_tags comment_tags keyword_tags rating_tags i18n future disqus_tags event_tags  %}
 
 {% block title %}
     {{ title }}
diff --git a/app/templates/agenda/includes/event_metainfo.html b/app/templates/agenda/includes/event_metainfo.html
index c836e03d..43e4489a 100644
--- a/app/templates/agenda/includes/event_metainfo.html
+++ b/app/templates/agenda/includes/event_metainfo.html
@@ -1,4 +1,4 @@
-{% load i18n mezzanine_tags event_tags featured_tags %}
+{% load i18n mezzanine_tags event_tags  %}
 <div class="event__meta">
     <div class="event__meta__inner">
         {{ event.start }}
diff --git a/app/templates/agenda/includes/event_metainfo_slider.html b/app/templates/agenda/includes/event_metainfo_slider.html
index a748baff..fe8f1dd1 100644
--- a/app/templates/agenda/includes/event_metainfo_slider.html
+++ b/app/templates/agenda/includes/event_metainfo_slider.html
@@ -1,4 +1,4 @@
-{% load i18n mezzanine_tags event_tags featured_tags %}
+{% load i18n mezzanine_tags event_tags  %}
 <div class="event__meta--alt">
     <div class="event__meta__inner">
         <div class="split-container">
diff --git a/app/templates/base.html b/app/templates/base.html
index b81fac92..f1d01122 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -1,7 +1,7 @@
 
 <!doctype html>
 <html lang="{{ LANGUAGE_CODE }}"{% if LANGUAGE_BIDI %} dir="rtl"{% endif %}>
-{% load i18n pages_tags mezzanine_tags staticfiles keyword_tags event_tags featured_tags %}
+{% load i18n pages_tags mezzanine_tags staticfiles keyword_tags event_tags  %}
 {% get_language_info_list for LANGUAGES as languages %}
 <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8">
diff --git a/app/templates/blog/blog_post_detail.html b/app/templates/blog/blog_post_detail.html
index 9cb3f536..b880ff2c 100644
--- a/app/templates/blog/blog_post_detail.html
+++ b/app/templates/blog/blog_post_detail.html
@@ -1,5 +1,5 @@
 {% extends "blog/blog_post_list.html" %}
-{% load mezzanine_tags comment_tags keyword_tags rating_tags i18n disqus_tags featured_tags %}
+{% load mezzanine_tags comment_tags keyword_tags rating_tags i18n disqus_tags  %}
 
 {% block meta_title %}{{ blog_post.meta_title }}{% endblock %}
 
diff --git a/app/templates/festival/artist_detail.html b/app/templates/festival/artist_detail.html
index 95ca5cd9..f94297b8 100644
--- a/app/templates/festival/artist_detail.html
+++ b/app/templates/festival/artist_detail.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load mezzanine_tags keyword_tags featured_tags %}
+{% load mezzanine_tags keyword_tags  %}
 
 {% block title %}
 {{ artist.name }}
diff --git a/app/templates/festival/video_list.html b/app/templates/festival/video_list.html
index f951aa2a..550269d1 100644
--- a/app/templates/festival/video_list.html
+++ b/app/templates/festival/video_list.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load mezzanine_tags keyword_tags featured_tags %}
+{% load mezzanine_tags keyword_tags  %}
 
 {% block title %}
  {% trans "Videos" %}
diff --git a/app/templates/home/inc/body.html b/app/templates/home/inc/body.html
new file mode 100644
index 00000000..92b41113
--- /dev/null
+++ b/app/templates/home/inc/body.html
@@ -0,0 +1,13 @@
+<hr/>
+<h1>Body</h1>
+<br/>
+{% for body in home.dynamiccontenthomebody_set.all %}
+  {% if body.content_type.model == "brief" %}
+    {% include "home/inc/brief_card.html" %}
+  {% else %}
+    {% include "home/inc/generic_card.html" %}
+  {% endif %}
+{% endfor %}
+
+<br/>
+<hr/>
diff --git a/app/templates/home/inc/brief_card.html b/app/templates/home/inc/brief_card.html
new file mode 100644
index 00000000..9303afb5
--- /dev/null
+++ b/app/templates/home/inc/brief_card.html
@@ -0,0 +1,10 @@
+<h2>{{ body.content_object.title }}<h2><br/>
+<p>{{ body.content_object.description|slice:":500" }}</p>
+{% if body.content_object.external_content %}
+<a href="{{ body.content_object.external_content }}" title="{{ body.content_object.text_button }}">{{ body.content_object.text_button }}</a><br/>
+{% elif body.content_object.content_object %}
+<a href="{{ body.content_object.content_object.get_absolute_url }}" title="{{ body.content_object.text_button }}">{{ body.content_object.text_button }}</a><br/>
+{% endif %}
+<a href="{{ body.content_object.get_absolute_url }}" title="{{ body.content_object.title }}">{{ body.content_object.title }}</a><br/>
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------<br/>
diff --git a/app/templates/home/inc/generic_card.html b/app/templates/home/inc/generic_card.html
new file mode 100644
index 00000000..311cd1b2
--- /dev/null
+++ b/app/templates/home/inc/generic_card.html
@@ -0,0 +1,7 @@
+<h2>{{ body.content_object.title }}<h2><br/>
+<p>{{ body.content_object.description|slice:":500" }}</p>
+{% if  body.content_object.featured_image %}
+<img src="{{ MEDIA_URL }}{{ body.content_object.featured_image }}" title="" /><br/>
+{% endif %}
+<a href="{{ body.content_object.get_absolute_url }}" title="{{ body.content_object.title }}">{{ body.content_object.title }}</a><br/>
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------<br/>
diff --git a/app/templates/home/inc/slider.html b/app/templates/home/inc/slider.html
index 786e7f94..8ab5863d 100644
--- a/app/templates/home/inc/slider.html
+++ b/app/templates/home/inc/slider.html
@@ -1,12 +1,14 @@
 <hr/>
 <h1>Slider</h1>
-<be/>
+<br/>
 {% for slider in home.dynamiccontenthomeslider_set.all %}
-<h2>{{ slider.content_object.title }}<h2><br/>
-<img src="{{ MEDIA_URL }}{{ slider.content_object.photo_slider }}" title="{{ slider.content_object.photo_slider_credits }}" /><br/>
-{{ slider.content_object.photo_slider_credits }}<br/>
-<a href="{{ slider.content_object.get_absolute_url }}" title="{{ slider.content_object.title }}">{{ slider.content_object.title }}</a><br/>
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------<br/>
+  {% if slider.content_object.photo_slider %}
+  <h2>{{ slider.content_object.title }}<h2><br/>
+  <img src="{{ MEDIA_URL }}{{ slider.content_object.photo_slider }}" title="{{ slider.content_object.photo_slider_credits }}" /><br/>
+  {{ slider.content_object.photo_slider_credits }}<br/>
+  <a href="{{ slider.content_object.get_absolute_url }}" title="{{ slider.content_object.title }}">{{ slider.content_object.title }}</a><br/>
+  ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------<br/>
+  {% endif %}
 {% endfor %}
 <br/>
 <hr/>
diff --git a/app/templates/includes/slider.html b/app/templates/includes/slider.html
index c10cfbf9..bc44638b 100644
--- a/app/templates/includes/slider.html
+++ b/app/templates/includes/slider.html
@@ -1,4 +1,4 @@
-{% load i18n event_tags featured_tags mezzanine_tags %}
+{% load i18n event_tags  mezzanine_tags %}
 {% comment %}
 <div class="hero__slider">
     <ul id="lightSlider">
diff --git a/app/templates/index.html b/app/templates/index.html
index 4ad37c1c..9ce25828 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n featured_tags pages_tags mezzanine_tags %}
+{% load i18n  pages_tags mezzanine_tags %}
 
 {% block meta_title %}{% trans "Home" %}{% endblock %}
 
@@ -21,29 +21,7 @@
   <li><a href="#" title="{% trans "Media" %}">{% trans "Media" %}</a></li>
 </ul>
 
-<div class="last__media">
-    <div class="msry__container">
-        <div class="msry__sizer"></div>
-        {% featured as featured_list %}
-        {% for item in featured_list %}
-        <div class="last__media__entry  msry__item">
-            {% if item|get_class == 'Brief' %}
-                {% with item as brief %}
-                    {% include 'magazine/brief/brief_detail.html' %}
-                {% endwith %}
-            {% elif item|get_class == 'Article' %}
-                {% with item as article %}
-                    {% include "magazine/article/includes/article_card.html" %}
-                {% endwith %}
-            {% elif item|get_class == 'Video' %}
-                {% with item as video %}
-                    {% include 'festival/inc/video_card.html' %}
-                    <a href="{% url 'festival-video-list' %}" class="btn btn-full">{% trans "More" %} {% trans "videos" %}</a>
-                {% endwith %}
-            {% endif %}
-        </div>
-        {% endfor %}
-    </div>
-</div>
+{% include "home/inc/body.html" %}
+
 
 {% endblock %}
diff --git a/app/templates/magazine/article/article_detail.html b/app/templates/magazine/article/article_detail.html
index ec2e817f..5b7a524c 100644
--- a/app/templates/magazine/article/article_detail.html
+++ b/app/templates/magazine/article/article_detail.html
@@ -1,5 +1,5 @@
 {% extends "pages/page.html" %}
-{% load mezzanine_tags keyword_tags i18n featured_tags %}
+{% load mezzanine_tags keyword_tags i18n  %}
 
 {% block meta_title %}{{ article.meta_title }}{% endblock %}
 
diff --git a/app/templates/pages/basicpage.html b/app/templates/pages/basicpage.html
index 674de2cd..7eefe816 100644
--- a/app/templates/pages/basicpage.html
+++ b/app/templates/pages/basicpage.html
@@ -1,5 +1,5 @@
 {% extends "pages/page.html" %}
-{% load i18n mezzanine_tags keyword_tags featured_tags pages_tags organization_tags %}
+{% load i18n mezzanine_tags keyword_tags  pages_tags organization_tags %}
 
 {% block meta_title %}{{ page.meta_title }}{% endblock %}
 
diff --git a/app/templates/pages/department.html b/app/templates/pages/department.html
index 66ddbe61..3a8b6733 100644
--- a/app/templates/pages/department.html
+++ b/app/templates/pages/department.html
@@ -1,5 +1,5 @@
 {% extends "pages/basicpage.html" %}
-{% load i18n mezzanine_tags keyword_tags featured_tags pages_tags organization_tags %}
+{% load i18n mezzanine_tags keyword_tags  pages_tags organization_tags %}
 
 {% block meta_title %}{{ page.meta_title }}{% endblock %}
 
diff --git a/app/templates/pages/page.html b/app/templates/pages/page.html
index 7391fe47..775c4fad 100644
--- a/app/templates/pages/page.html
+++ b/app/templates/pages/page.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n mezzanine_tags keyword_tags featured_tags pages_tags %}
+{% load i18n mezzanine_tags keyword_tags  pages_tags %}
 
 {% block meta_title %}{{ page.meta_title }}{% endblock %}
 
diff --git a/app/templates/pages/team.html b/app/templates/pages/team.html
index e848fb2e..f8cbe12e 100644
--- a/app/templates/pages/team.html
+++ b/app/templates/pages/team.html
@@ -1,5 +1,5 @@
 {% extends "pages/basicpage.html" %}
-{% load i18n mezzanine_tags keyword_tags featured_tags pages_tags organization_tags %}
+{% load i18n mezzanine_tags keyword_tags  pages_tags organization_tags %}
 
 {% block meta_title %}{{ page.meta_title }}{% endblock %}
 
diff --git a/app/templates/styles.html b/app/templates/styles.html
index fb136afb..3f22f941 100644
--- a/app/templates/styles.html
+++ b/app/templates/styles.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n featured_tags %}
+{% load i18n  %}
 
 {% block meta_title %}{% trans "Styles" %}{% endblock %}
 
diff --git a/app/templates/team/team_list.html b/app/templates/team/team_list.html
index 6caa35a5..fababb02 100644
--- a/app/templates/team/team_list.html
+++ b/app/templates/team/team_list.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n mezzanine_tags keyword_tags featured_tags pages_tags %}
+{% load i18n mezzanine_tags keyword_tags  pages_tags %}
 
 {% block title %}
     {% trans "Team list" %}
-- 
2.39.5