Merge branch 'master' of git.parisson.com:git/teleforma

Conflicts:
	teleforma/templates/teleforma/inc/newsitems_portlet.html

diff --cc teleforma/templates/teleforma/inc/newsitems_portlet.html
index 5b3a247c836fe1cc926051903ba175ce157ece76,6f333647ca02712ada299d166d3571ad19bc21d0..4ac62f03ff51271eac0a2e4a643d539f0a9ab22f
--- 1/teleforma/templates/teleforma/inc/newsitems_portlet.html
--- 2/teleforma/templates/teleforma/inc/newsitems_portlet.html
+++ b/teleforma/templates/teleforma/inc/newsitems_portlet.html
@@@ -27,10 -27,10 +27,10 @@@
          <section>
              {% for newsitem in all_newsitems %} {% include "teleforma/inc/newsitem.html" %} {% endfor %}
          </section>
-         {% if all_newsitems|length >= 5 %}
-         <footer>
-             <a href="{% url newsitem-list period_id=period_id %}">Voir plus</a>
-         </footer>
-         {% endif %}
+ {#        {% if all_newsitems|length >= 5 %}#}
+ {#        <footer>#}
+ {#            <a href="{% url newsitem-list period_id=period_id %}">Voir plus</a>#}
+ {#        </footer>#}
+ {#        {% endif %}#}
      </div>
 -</div>
 +</div>