From 74815fa06da085500c5b9e18090cca2cc7e92b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sun, 20 Aug 2023 22:06:45 +0000
Subject: [PATCH] Grouped Order descriptions keeps carriage returns

- Added a few useful info in the docs on how to install sass
---
 README.md                                                  | 7 ++++++-
 .../order/templates/order/grouped_order_detail.html        | 2 +-
 la_chariotte/static/css/app.css                            | 7 ++++++-
 la_chariotte/static/sass/base/_content.sass                | 5 ++++-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index b32fc35..ef234bd 100644
--- a/README.md
+++ b/README.md
@@ -121,7 +121,7 @@ python manage.py runserver --settings=local_settings
 
 Pour créer un superutilisateur, qui aura accès à l'interface admin (/admin) :
 ```shell
-python manage.py createsuperuser
+python manage.py createsuperuser --settings=local_settings
 ```
 
 ### Travailler sur le frontend
@@ -132,6 +132,11 @@ Nous utilisons bulma comme framework CSS. Vous pouvez l'installer en utilisant l
 npm install bulma
 ```
 
+Vous aurez aussi besoin de sass :
+```bash
+npm install -g sass
+```
+
 Vérifiez que vous utilisez la bonne version de sass :
 
 ```bash
diff --git a/la_chariotte/order/templates/order/grouped_order_detail.html b/la_chariotte/order/templates/order/grouped_order_detail.html
index e540021..9516781 100644
--- a/la_chariotte/order/templates/order/grouped_order_detail.html
+++ b/la_chariotte/order/templates/order/grouped_order_detail.html
@@ -17,7 +17,7 @@
     <div class="columns">
       <div class="column is-8">
         <p class="title">{{ grouped_order }}</p>
-        {% if grouped_order.description %}<p>{{ grouped_order.description }}</p>{% endif %}
+        {% if grouped_order.description %}<p class="formatted-text">{{ grouped_order.description }}</p>{% endif %}
         {% if not user.is_authenticated %}
           <p><span class="has-text-dark is-italic">Vous êtes l'organisateur·ice ?</span>
             <a href="{% url 'order:grouped_order_overview' grouped_order.code %}">
diff --git a/la_chariotte/static/css/app.css b/la_chariotte/static/css/app.css
index b190fe9..66a2461 100644
--- a/la_chariotte/static/css/app.css
+++ b/la_chariotte/static/css/app.css
@@ -214,7 +214,8 @@ fieldset[disabled] .file-name, fieldset[disabled] .select select, .select fields
   padding: 0;
 }
 
-/* Bulma Base */ /*! minireset.css v0.0.6 | MIT License | github.com/jgthms/minireset.css */
+/* Bulma Base */
+/*! minireset.css v0.0.6 | MIT License | github.com/jgthms/minireset.css */
 html,
 body,
 p,
@@ -10386,6 +10387,10 @@ a.navbar-item:hover {
     padding-top: 3.25rem;
   }
 }
+.formatted-text {
+  white-space: pre-wrap;
+}
+
 .button {
   white-space: normal;
   height: auto;
diff --git a/la_chariotte/static/sass/base/_content.sass b/la_chariotte/static/sass/base/_content.sass
index 9f31506..ae1934b 100644
--- a/la_chariotte/static/sass/base/_content.sass
+++ b/la_chariotte/static/sass/base/_content.sass
@@ -6,4 +6,7 @@
 @media screen and (max-width: $max-tablet)
 	.content
 		margin: $small
-		padding-top: $navbar-height
\ No newline at end of file
+		padding-top: $navbar-height
+
+.formatted-text
+	white-space: pre-wrap
\ No newline at end of file