diff --git a/com/static/com/css/news-list.scss b/com/static/com/css/news-list.scss index 0df403b4..5b8cc8d5 100644 --- a/com/static/com/css/news-list.scss +++ b/com/static/com/css/news-list.scss @@ -51,6 +51,13 @@ } } + /* UPCOMING EVENTS */ + + #upcoming-events { + max-height: 600px; + overflow-y: scroll; + } + /* LINKS/BIRTHDAYS */ #links, #birthdays { diff --git a/com/templates/com/news_list.jinja b/com/templates/com/news_list.jinja index ebb4f6e1..beaae030 100644 --- a/com/templates/com/news_list.jinja +++ b/com/templates/com/news_list.jinja @@ -37,69 +37,71 @@
{% endif %} - {% for day, dates_group in news_dates %} -
-
-
-
{{ day|date('D') }}
-
{{ day|date('d') }}
-
{{ day|date('b') }}
+
+ {% for day, dates_group in news_dates %} +
+
+
+
{{ day|date('D') }}
+
{{ day|date('d') }}
+
{{ day|date('b') }}
+
-
-
- {% for date in dates_group %} -
- {% if not date.news.is_moderated %} - {# if a non moderated news is in the object list, - the logged user is either an admin or the news author #} - {{ news_moderation_alert(date.news, user, "newsState") }} - {% endif %} -
+ {% for date in dates_group %} +
-
- {% if date.news.club.logo %} - {{ date.news.club }} - {% else %} - {{ date.news.club }} - {% endif %} -
-

- - {{ date.news.title }} - -

- {{ date.news.club }} -
- - - + {% if not date.news.is_moderated %} + {# if a non moderated news is in the object list, + the logged user is either an admin or the news author #} + {{ news_moderation_alert(date.news, user, "newsState") }} + {% endif %} +
+
+ {% if date.news.club.logo %} + {{ date.news.club }} + {% else %} + {{ date.news.club }} + {% endif %} +
+

+ + {{ date.news.title }} + +

+ {{ date.news.club }} +
+ - + +
+
+
+ {{ date.news.summary|markdown }}
-
-
- {{ date.news.summary|markdown }}
-
-
- {% endfor %} + + {% endfor %} +
-
- {% else %} -
- {% trans %}Nothing to come...{% endtrans %} -
- {% endfor %} + {% else %} +
+ {% trans %}Nothing to come...{% endtrans %} +
+ {% endfor %} +

{% trans %}All coming events{% endtrans %}