From: Yoan Le Clanche <yoan@ellington.pilotsystems.net>
Date: Mon, 8 Oct 2018 15:00:00 +0000 (+0200)
Subject: newsitems portlet is now not limited to 5 newsitems
X-Git-Tag: 1.4.0~31^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b806880c8697da4abc7d7d539b207a57f5cca6c2;p=teleforma.git

newsitems portlet is now not limited to 5 newsitems
---

diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css
index facc4cef..2e298189 100644
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@ -1502,7 +1502,7 @@ input,textarea{
 
 #module-set .ui-tabs.ui-widget-content ul.ui-tabs-nav li a{
 	font-size:1.1em;
-	color: #FFF;
+	color: #333;
 	padding: 1em 0;
 	display: block;
 	box-sizing: border-box;
@@ -1521,6 +1521,7 @@ input,textarea{
 #module-set .ui-tabs.ui-widget-content ul.ui-tabs-nav li.ui-tabs-active a{
 	background-color: rgba(255, 255, 255, 0);
 	opacity: 1;
+	color: #fff;
 }
 
 #module-set .ui-tabs.ui-widget-content ul.ui-tabs-nav li.ui-tabs-active a+a:hover{
@@ -1596,6 +1597,12 @@ input,textarea{
 #module-set .ui-tabs.ui-widget-content .ui-widget-content .newsitem section{
 	font-size: 1.1em;
 	font-size: 0.9em;
+	word-wrap: break-word;
+	-webkit-hyphens: auto;
+  -moz-hyphens: auto;
+  -ms-hyphens: auto;
+  -o-hyphens: auto;
+  hyphens: auto;
 }
 
 #module-set .ui-tabs.ui-widget-content footer{
diff --git a/teleforma/templates/teleforma/inc/newsitems_portlet.html b/teleforma/templates/teleforma/inc/newsitems_portlet.html
index a0a072b5..6f333647 100644
--- a/teleforma/templates/teleforma/inc/newsitems_portlet.html
+++ b/teleforma/templates/teleforma/inc/newsitems_portlet.html
@@ -17,20 +17,20 @@
         <section>
             {% for newsitem in course_newsitems %} {% include "teleforma/inc/newsitem.html" %} {% endfor %}
         </section>
-        {% if course_newsitems|length >= 5 %}
-        <footer>
-            <a href="{% url newsitem-list %}?course_id={{ course.id }}">Voir plus</a>
-        </footer>
-        {% endif %}
+{#        {% if course_newsitems|length >= 5 %}#}
+{#        <footer>#}
+{#            <a href="{% url newsitem-list %}?course_id={{ course.id }}">Voir plus</a>#}
+{#        </footer>#}
+{#        {% endif %}#}
     </div>
     <div id="news_global">
         <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>
\ No newline at end of file
diff --git a/teleforma/templatetags/teleforma_tags.py b/teleforma/templatetags/teleforma_tags.py
index 96a4dadb..304feb45 100644
--- a/teleforma/templatetags/teleforma_tags.py
+++ b/teleforma/templatetags/teleforma_tags.py
@@ -267,8 +267,8 @@ def newsitems_portlet(context, course_id, period_id):
         }
     
     course = get_object_or_404(Course, id=course_id) 
-    course_newsitems = [get_data(news) for news in NewsItem.objects.filter(deleted=False, course__id=course_id, period_id=period_id).order_by('-created')[:5]]
-    all_newsitems = [get_data(news) for news in NewsItem.objects.filter(deleted=False, period_id=period_id).order_by('-created')[:5]]
+    course_newsitems = [get_data(news) for news in NewsItem.objects.filter(deleted=False, course__id=course_id, period_id=period_id).order_by('-created')]
+    all_newsitems = [get_data(news) for news in NewsItem.objects.filter(deleted=False, period_id=period_id).order_by('-created')]
     can_add = False 
     if user.is_staff or user.professor.count():
         can_add = True