[FEATURE] Better collective sheet, with html and resized logo. Accept

images

Author: jnguiot

collectives/routes/event.py

@@ -9,7 +9,7 @@
 import builtins
 from flask import flash, render_template, redirect, url_for, request, send_file
 from flask import Blueprint, abort
-from markupsafe import Markup, escape
+from markupsafe import Markup
 from flask_login import current_user
 from werkzeug.datastructures import CombinedMultiDict
 from sqlalchemy.orm import joinedload, selectinload
@@ -331,11 +331,10 @@ def print_event(event_id):
         return redirect(url_for("event.index"))
 
     activity_names = [at.name for at in event.activity_types]
-    description = escape(event.description)
     return render_template(
         "event/print_event.html",
         event=event,
-        description=description,
+        description=event.rendered_description,
         activity_names=activity_names,
     )
 

collectives/static/css/print-event.css

@@ -47,11 +47,11 @@ div#description pre {
     overflow-y: hidden;
     white-space: pre-wrap;
     word-wrap: break-word;
-    height:20em;
     padding:1em;
     border:1px solid black;
     font-family: Arial, Helvetica, sans-serif;
     font-size:80%;
+    zoom: 0.8;
 }
 
 div#info

collectives/templates/event/print_event.html

@@ -14,7 +14,9 @@
             </ul>
         </div>
 
-        <div id="logo"><img src="{{ url_for('static', filename=Configuration.CLUB_LOGO) }}"></div>
+        <div id="logo"><img 
+            style = "max-width: 200px; max-height: 50px" 
+            src="{{ url_for('static', filename=Configuration.CLUB_LOGO) }}"></div>
 
         <div id="title">
             <h2 class="heading-2">
@@ -29,7 +31,7 @@ <h1 class="heading-1">{{event.title}}</h1>
 
         <div id="description">
             <pre>
-            {{description}}
+            {{description | safe}}
             </pre>
         </div>
 

tests/events/test_event.py

@@ -6,7 +6,6 @@
 
 from bs4 import BeautifulSoup
 from openpyxl import load_workbook
-from markupsafe import escape
 
 from collectives.models import db, EventStatus, ActivityType, Event, EventVisibility
 from collectives.models import RoleIds, Question, QuestionType
@@ -331,4 +330,4 @@ def test_event_print(leader_client, event1_with_reg, user2):
     assert user2.full_name() in response.text
     assert user2.license in response.text
     assert event1_with_reg.leaders[0].full_name() in response.text
-    assert escape(event1_with_reg.description) in response.text
+    assert event1_with_reg.rendered_description in response.text