From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 21 Oct 2016 11:40:27 +0000 (+0200)
Subject: Add auto external article link (fix #261)
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f306d0ff084a2d7531ed69ae06d6511bb14135b2;p=mezzo.git

Add auto external article link (fix #261)
---

diff --git a/app/templates/agenda/includes/event_date.html b/app/templates/agenda/includes/event_date.html
index 9ac2e89f..cb31a618 100644
--- a/app/templates/agenda/includes/event_date.html
+++ b/app/templates/agenda/includes/event_date.html
@@ -1,7 +1,6 @@
 {% load i18n %}
 {% load event_tags pages_tags mezzanine_tags %}
 
-
     <!-- Start date only  -->
     {% if event.start and not event.end %}
         {{ event.start|date:event.date_format }}
diff --git a/app/templates/agenda/includes/event_linecard.html b/app/templates/agenda/includes/event_linecard.html
index 44216aef..2d729f22 100644
--- a/app/templates/agenda/includes/event_linecard.html
+++ b/app/templates/agenda/includes/event_linecard.html
@@ -1,21 +1,13 @@
 {% load i18n future mezzanine_tags event_tags keyword_tags disqus_tags organization_tags %}
 
 <div class="row event-line-box">
-
     {% ifchanged event.start.month %}
-
         <div class="col-sm-12 col-md-12 col-lg-12 event-line-box__month">
-
             <h2>{{ event.start|date:'F' }}</h2>
-
         </div>
-
     {% endifchanged %}
-
     <div class="col-sm-12 col-md-12 col-lg-12 event-line-box__content">
-
         <div class="row">
-
             <div class="col-xs-3">
                 {% with True as unit_booking %}
                     {% include 'agenda/includes/event_metainfo_line.html' %}
@@ -59,9 +51,6 @@
                     {% if event.description %}{{ event.description|slice:":100" }}{% else %}{{ event.parent.description|slice:":100" }}{% endif %}
                 </div>
             </div>
-
         </div>
-
     </div>
-
 </div>
diff --git a/app/templates/base.html b/app/templates/base.html
index 66f40dc8..7eeabbbb 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -164,15 +164,18 @@
                             Châtelet, Les Halles
                         </div>
                     </div>
+
                     <div class="row">
                         <div class="col-sm-10 col-sm-push-1">
                             <div class="footer__separator"></div>
                         </div>
                     </div>
+
                     <div class="row">
                         <div class="col-xs-4 col-sm-3 col-sm-push-1 tal">
                             {% page_menu "pages/menus/footer_vertical.html" %}
                         </div>
+
                         <div class="col-xs-4 col-sm-5 col-sm-push-1 tal">
                             <strong>Institut de Recherche et Coordination Acoustique/Musique</strong> {% trans 'under the tutelage of' %} :<br />
                             <br />
@@ -181,6 +184,7 @@
                             <a href="http://www.upmc.fr/" target="_blank" title="Université Pierre et Marie Curie"><img class="footer__partner" width="120" height="66" src="{% static "img/partners/logo-upmc.png" %}" /></a>
                             <a href="http://www.inria.fr/" target="_blank" title="Inria"><img class="footer__partner" width="120" height="66" src="{% static "img/partners/logo-inria.png" %}" /></a>
                         </div>
+
                         <div class="col-xs-4 col-sm-2 col-sm-push-1 tal">
                             {% trans 'go to' %} :
                             <ul class="unstyled-list">
@@ -193,16 +197,19 @@
                             </ul>
                         </div>
                     </div>
+
                     <div class="row">
                         <div class="col-sm-10 col-sm-push-1">
                             <div class="footer__separator footer__seprator--small"></div>
                         </div>
                     </div>
+
                     <div class="row">
                         <div class="col-sm-10 col-sm-push-1">
                             {% page_menu "pages/menus/footer_horizontal.html" %}
                         </div>
                     </div>
+
                 </div>
             </div>
         </footer>
diff --git a/app/templates/core/inc/generic_card.html b/app/templates/core/inc/generic_card.html
index 94cf2ecc..538d5d6c 100644
--- a/app/templates/core/inc/generic_card.html
+++ b/app/templates/core/inc/generic_card.html
@@ -1,6 +1,6 @@
 {% load i18n pages_tags mezzanine_tags media_tags organization_tags %}
 
-<a class="article-box" href="{% block url %}{% endblock %}" title="{% block metatitle %}{% endblock %}">
+<a class="article-box" href="{% block url %}{% endblock %}" {% block target %}{% endblock %} title="{% block metatitle %}{% endblock %}">
     <div class="article-box__header">
 
         {% block image %}
diff --git a/app/templates/magazine/article/includes/article_card.html b/app/templates/magazine/article/includes/article_card.html
index c2f261ac..1ceb2afd 100644
--- a/app/templates/magazine/article/includes/article_card.html
+++ b/app/templates/magazine/article/includes/article_card.html
@@ -10,7 +10,15 @@
 {% endblock %}
 
 {% block url %}
+  {% if article.content|removetags:"p"|slice:':4' == 'http' %}
+    {{ article.content|removetags:"p" }}
+  {% else %}
     {% url 'magazine-article-detail' article.slug %}
+  {% endif %}
+{% endblock %}
+
+{% block target %}
+  {% if article.content|removetags:"p"|slice:':4' == 'http' %}target="_blank"{% endif %}
 {% endblock %}
 
 {% block image %}
diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda
index d975b0c2..429ec9ae 160000
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit d975b0c2dde27b3cedc93016f5aaafd345d35d60
+Subproject commit 429ec9aec1be348537d2c5aec2326f7df1b0ba72