From 11d7574d187f0ec1677dab0d77ada7358a13bafa Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 22 Apr 2016 12:06:09 +0200
Subject: [PATCH] use featured for breaking news

---
 app/festival/templatetags/festival_tags.py |   5 +++++
 app/local_settings.py                      |   1 +
 app/locale/fr/LC_MESSAGES/django.mo        | Bin 3387 -> 3474 bytes
 app/locale/fr/LC_MESSAGES/django.po        |  15 ++++++++++++---
 app/templates/base.html                    |   8 +++-----
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/festival/templatetags/festival_tags.py b/app/festival/templatetags/festival_tags.py
index 8b2d94ec..25e4ca56 100644
--- a/app/festival/templatetags/festival_tags.py
+++ b/app/festival/templatetags/festival_tags.py
@@ -28,3 +28,8 @@ def featured_events(*args):
 @register.as_tag
 def featured(*args):
     return Featured.objects.get(id=settings.HOME_FEATURED_ID)
+
+
+@register.as_tag
+def featured_breaking_news_content(*args):
+    return Featured.objects.get(id=settings.BREAKING_NEWS_FEATURED_ID).pages.all()[0].richtextpage.content
diff --git a/app/local_settings.py b/app/local_settings.py
index a9b40403..5f6713e2 100644
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -109,3 +109,4 @@ TINYMCE_SETUP_JS = "/static/js/tinymce_setup.js"
 SLUGIFY = 'django.template.defaultfilters.slugify'
 
 HOME_FEATURED_ID = 1
+BREAKING_NEWS_FEATURED_ID = 4
diff --git a/app/locale/fr/LC_MESSAGES/django.mo b/app/locale/fr/LC_MESSAGES/django.mo
index cc0c7bb7e5752df2be2a7848590b1378d553babf..4551d13e1e33c23562431e223003c16090a6cace 100644
GIT binary patch
delta 1474
zcmZA1OGs2v9LMp$<EZ1P`N-6Kmu8yzOnYeKSm;i083qLs!!$h{ADOF~MNbMUk{|@5
zc7eDE35p1UHbreJ5E2Y)VT&HP$z}HaT~94K-2eTYbLQOhymy`z-!4gf%JbhbQkW<u
z@_l9lnCa(68cs3G!VwH$0@LuS^Oo~22C2V~={SRx_}G=_F_rQXs-LfzOLw+Hriuz5
zziP}HR0s9Wc2^%p4bX!dupiaYQCE&)Hs!OZ30`*fH&6?hcFwr^r(QW>_KFOb&AT5K
zk(t?d%)#HtW!dzq0SZv%8Z5*HRQq16z(cqZCvX#9$8vmtdH4dgzz-N;d|M==4wsS3
zesEKRU#JzYA)91DmaBF-sGTZw<x*F!Lba<!O|%iU@-EE8K2*O0sCLIt$7wM#+R`{`
zfb)1F$?OtpB`Z8d*8I#yW}zlpfa<UuGqBd#hBcJCQSGCs2@Ip!pTh#Y66E}Mk-0~O
zI((0s(1LTx)i0yA?k8$xNsOkBb5R`?qbAyd8lV@o@_y7296>!dhH8HS)!$SG`%j-X
z>nfh09(aTK_!-sVs;k#Byp^NAmU7fP(ur!{hZ<-Q%W%Yb6H6%1qMm<^TEM%6t5|Rq
zUr-bJ=E|$c*tUjTmcg=gL`A4~pu$;=+PON^gql!C+KuY3AGz!>H$8tG)jkm?qnVGR
zW_ArZdhb|NR?<qfy`97!LP_V_Oz7Digi?smpt}i8S_A0|X(BW!rDCFk(3e6=c&k!Q
zv#eK!w0|A%zL&fHAC$Hb`qZ`(%+p$kIzp+M=<;&wTir%Jnb0|Fr^19%BcUVG_G^6G
z2JJ*Ep|jsk6cI|5#AapwOZ-XxOM0R7eb*A&(tSh&p|o=y@2>aZZ_+zu2TqN}CqpTN
z={=Frq1elZqmjAkl#nm=bZlt+Ol0z7+H-$vM|1n!RN!J#;NWOv@MLT#I#(8a<V%iB
Kj7`4HjQ;_u?{B{V

delta 1380
zcmYk+OGs2v9LMp$^J>z}M_D%7sM*-V9-1>{rnC_%a1pc#T+}Ku5P}xcqHc=_SG~p-
zVYHeEiY%B_Xw*W&Mbjb@qD2PTVz8Y=5eR*M*MHDq{`YgvopaCmpK~8~o2FC2m-^T}
zqYMzuL@Z)<3V%d7P<rEL)p!__cnsIzN%ypS7ArY_9@pX}Y{e^>z=x>oA7LF%VY^vi
zZ>YpLv52~`>@NHH71Y2HMp=*5sDYZjoxvK~SyW<!etrm*_^><T=f}K#0~5?|6aL2}
zDzhh8i!)&dvl428kKSIy&9s+L{iDp<f(^I<bJ&0<FpX!h9<QPncn7tBNlY-m6{zsD
zrySIwh+6S0WbrnK%w_LUJ2mfq_Wu`934TYd_$RKzD6?q1TGTixw-vRM9T;ff9F+?d
zX8ouYJmxB@Hto(LV_FIM**u3TTyU4LgZ3}f#A&jpYMr<VbJ&AJsBx~L5*n{$|5dr^
ze@vjZ>H%s+&rylIMh!HFN^k)+!7^&aE2u56A}d|jhU(vq8t*vL#fH6o4%Pp175l%D
z$}LW4z=HoVh01gm^;Wz?JriYA|39dSYFO@8Y;gy$iS{t+`Z3f30&kCd`!*_}`}#v2
z3dorD4Efnh4!SjOQTM!r+NlqyL_VSJVHq{hZ`4jiIq14NRR2a)!f8}OJ;<F7>w7WS
z!r}j-WcvJs64GRC-tI-MRudc`a)h?`U(v1E;SEjdpOA0?%xjH=lG0nD!Z#<dZB#OZ
z9uU1wx-Tl*R|!8NdfoOB+FCvuwu{g!r(4!fsC2Co?p`PLgWeX02<=k%)Fa<G+ew%m
z<;w=Ui6cao(1VjARQ9i8dt9OCL8Y6h$&bcIieKaXk$ih{Cf3!L%@)5UuU8Z=R=$Yj
IGu5Mi0SGZ>uK)l5

diff --git a/app/locale/fr/LC_MESSAGES/django.po b/app/locale/fr/LC_MESSAGES/django.po
index 2fb0f1b0..95fbee21 100644
--- a/app/locale/fr/LC_MESSAGES/django.po
+++ b/app/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-22 10:44+0200\n"
+"POT-Creation-Date: 2016-04-22 12:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -377,7 +377,15 @@ msgstr "Événements récents"
 msgid "Archive"
 msgstr ""
 
-#: templates/base.html:167
+#: templates/base.html:136
+msgid "Dernière"
+msgstr "Breaking"
+
+#: templates/base.html:136
+msgid "minute"
+msgstr "news"
+
+#: templates/base.html:165
 msgid "Playlist"
 msgstr "Playlist"
 
@@ -386,6 +394,7 @@ msgid "published on"
 msgstr "publié le"
 
 #: templates/blog/blog_post_detail.html:119
+#: templates/pages/richtextpage.html:27
 msgid "Related posts"
 msgstr "Articles associés"
 
@@ -690,7 +699,7 @@ msgstr "Soumettre"
 msgid "Add"
 msgstr ""
 
-#: templates/pages/richtextpage.html:14
+#: templates/pages/richtextpage.html:17
 msgid "Related events"
 msgstr "Événements associés"
 
diff --git a/app/templates/base.html b/app/templates/base.html
index d407d520..8b5b13f3 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -132,14 +132,12 @@
                         <div class="media bk__news__inner">
                             <div class="media-img">
                                 <span class="bk__news__title">
-                                    Dernière <br> minute !
+                                    {% trans "Dernière" %} <br> {% trans "minute" %} !
                                 </span>
                             </div>
                             <div class="media-content bk__news__content">
-                                <p>
-                                    <strong>Partagez, twittez, commentez, publiez vos photos…</strong> <br>
-                                    et réservez dès maintenant vos places ou abonnements pour bénéficier de tarifs privilégiés.
-                                </p>
+                                    {% featured_breaking_news_content as content %}
+                                    {{ content|safe }}
                             </div>
 
                         </div>
-- 
2.39.5