]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 98a61ef)
Home : Body content (brief + others content) + deleting featured_tag
authorEmilie <zawadzki@ircam.fr>
Fri, 19 Aug 2016 18:01:32 +0000 (20:01 +0200)
committerEmilie <zawadzki@ircam.fr>
Fri, 19 Aug 2016 18:01:32 +0000 (20:01 +0200)
22 files changed:
app/templates/agenda/event_booking.html patch | blob | history
app/templates/agenda/event_detail.html patch | blob | history
app/templates/agenda/event_iframe.html patch | blob | history
app/templates/agenda/includes/event_metainfo.html patch | blob | history
app/templates/agenda/includes/event_metainfo_slider.html patch | blob | history
app/templates/base.html patch | blob | history
app/templates/blog/blog_post_detail.html patch | blob | history
app/templates/festival/artist_detail.html patch | blob | history
app/templates/festival/video_list.html patch | blob | history
app/templates/home/inc/body.html [new file with mode: 0644] patch | blob
app/templates/home/inc/brief_card.html [new file with mode: 0644] patch | blob
app/templates/home/inc/generic_card.html [new file with mode: 0644] patch | blob
app/templates/home/inc/slider.html patch | blob | history
app/templates/includes/slider.html patch | blob | history
app/templates/index.html patch | blob | history
app/templates/magazine/article/article_detail.html patch | blob | history
app/templates/pages/basicpage.html patch | blob | history
app/templates/pages/department.html patch | blob | history
app/templates/pages/page.html patch | blob | history
app/templates/pages/team.html patch | blob | history
app/templates/styles.html patch | blob | history
app/templates/team/team_list.html patch | blob | history

diff --git a/app/templates/agenda/event_booking.html b/app/templates/agenda/event_booking.html
index 880ded65e4f204d6fb544f7303d06b249f7c337d..345de9542245c35e97ae28beb318bc4b98c4ee56 100644 (file)
--- 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 e6df9efe32904a2a62844d1307c7a1b10b227d1c..41b66228f6ec059dc4f69d5d124cdeb72a2877a2 100644 (file)
--- 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 61f0befd6adae544c78689765f6939639f613a1d..6f0f2fb6ab527d890c496508d924b0790e4cf7ac 100644 (file)
--- 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 c836e03d862b6ec4276fbf3315925f7812266cc6..43e4489a69f187f8b1631839dcb3b3646fea4bc0 100644 (file)
--- 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 a748baff10cb1000e407948f349ebf4281f3006c..fe8f1dd1fb3c0fe3b1cb66fac8b653409d7c6173 100644 (file)
--- 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 b81fac9232ddbcf3b7fabb64309c1d31b505a182..f1d0112263e1dbb2a57f2b0f406705483d6e4018 100644 (file)
--- 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 9cb3f5368f4f82dd70427990a860de7e565e7ef2..b880ff2cb8c874d7508c889db53faac095bf182c 100644 (file)
--- 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 95ca5cd91def2f6a115c4761bdb96edbb1715e77..f94297b83f4272bca969d488eab8a577adbb1ebc 100644 (file)
--- 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 f951aa2a69886f29134d4d76e012cf1e86023d21..550269d172175c425d575823b80912e78ca2a803 100644 (file)
--- 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 (file)
index 0000000..92b4111
--- /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 (file)
index 0000000..9303afb
--- /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 (file)
index 0000000..311cd1b
--- /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 786e7f94dc06fa1920faee5c67065afbdb5080d6..8ab5863db3782520afc5cac52fac686384054a68 100644 (file)
--- 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 c10cfbf904a0b1e0ad8970028b1a7e50ad29c8e5..bc44638bb71970ad50d533b10e18a572fdfdd935 100644 (file)
--- 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 4ad37c1cdc8d4530782499e02a40ed805282ee76..9ce2582899fdcfb771d39b13b18de528e553d4f4 100644 (file)
--- 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 ec2e817fc97c9b14144cf12e300969e414c1f219..5b7a524c67a0bbc3a3111facd12ee103790843fa 100644 (file)
--- 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 674de2cd64f3b7e23170c1d753c69e51f473dd79..7eefe816835a6d629cf2001d10f23c448f1e7af3 100644 (file)
--- 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 66ddbe616739b52ae7c9db13b2a1b35091716aca..3a8b6733ae34d4f16ef7ba59c1dd42fe1db5c2e4 100644 (file)
--- 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 7391fe4718defc5cd64491a1e0bda77fdbdd93df..775c4fad97b995e1bbcf32aa5064988d637eb611 100644 (file)
--- 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 e848fb2efa1edbb4b900e49541ac8fee00776bf8..f8cbe12e36e71ecf400af045d2ec18084ea9c53a 100644 (file)
--- 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 fb136afbb377d272d3b315072312c81f3ea6f8e6..3f22f941b0a92031aadf2cd8e565a5bb96ca0f18 100644 (file)
--- 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 6caa35a53a977066f4c32eda054ca53ac3c968f5..fababb02563b07443c80b59703134d0c4533d1e2 100644 (file)
--- 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" %}
Unnamed repository; edit this file 'description' to name the repository.