From a9bae46f4573271ba6d7bcf4b7fe4b3b263fc16b Mon Sep 17 00:00:00 2001 From: Soldat Date: Tue, 11 Dec 2018 20:08:24 +0100 Subject: [PATCH] changed design --- core/static/core/style.scss | 12 ++ forum/templates/forum/forum.jinja | 2 +- forum/templates/forum/macros.jinja | 6 +- forum/templates/forum/main.jinja | 2 +- locale/fr/LC_MESSAGES/django.po | 190 +++++++++++++++-------------- 5 files changed, 119 insertions(+), 93 deletions(-) diff --git a/core/static/core/style.scss b/core/static/core/style.scss index dc6ef753..7ac05a0c 100644 --- a/core/static/core/style.scss +++ b/core/static/core/style.scss @@ -1403,6 +1403,18 @@ textarea { } } + .search_bar { + margin: 10px 0px; + display: flex; + height: 20p; + align-items: center; + } + .search_check { + margin-left: 10px; + } + .search_bouton { + margin-left: 10px; + } .category { margin-top: 5px; background: $secondary-color; diff --git a/forum/templates/forum/forum.jinja b/forum/templates/forum/forum.jinja index ca53fb7b..d3fe8b90 100644 --- a/forum/templates/forum/forum.jinja +++ b/forum/templates/forum/forum.jinja @@ -12,7 +12,6 @@ > {{ f }} {% endfor %} > {{ forum }} - {{ display_search_bar() }}

{{ forum.name }}

@@ -23,6 +22,7 @@ {% if not forum.is_category %} {% trans %}New topic{% endtrans %} {% endif %} + {{ display_search_bar() }}

{% if forum.children.exists() %}
diff --git a/forum/templates/forum/macros.jinja b/forum/templates/forum/macros.jinja index 5e2cc7d5..a70881b0 100644 --- a/forum/templates/forum/macros.jinja +++ b/forum/templates/forum/macros.jinja @@ -156,8 +156,10 @@ {% endmacro %} {% macro display_search_bar() %} -
+ - + {% trans %}Order by date{% endtrans %}
+ +
{% endmacro %} diff --git a/forum/templates/forum/main.jinja b/forum/templates/forum/main.jinja index c6199c16..7beb5543 100644 --- a/forum/templates/forum/main.jinja +++ b/forum/templates/forum/main.jinja @@ -12,10 +12,10 @@

{% trans %}Forum{% endtrans %}

- {{ display_search_bar() }}

{% trans %}View last unread messages{% endtrans %} {% trans %}Favorite topics{% endtrans %} + {{ display_search_bar() }}

{% if user.is_in_group(settings.SITH_GROUP_FORUM_ADMIN_ID) or user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) %}

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index b64e86a1..b2842057 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-08 00:26+0100\n" +"POT-Creation-Date: 2018-12-11 20:07+0100\n" "PO-Revision-Date: 2016-07-18\n" "Last-Translator: Skia \n" "Language-Team: AE info \n" @@ -219,7 +219,7 @@ msgstr "Compte" msgid "Company" msgstr "Entreprise" -#: accounting/models.py:317 sith/settings.py:377 +#: accounting/models.py:317 sith/settings.py:378 #: stock/templates/stock/shopping_list_items.jinja:37 msgid "Other" msgstr "Autre" @@ -776,7 +776,7 @@ msgstr "Opération liée : " #: core/templates/core/user_preferences.jinja:12 #: core/templates/core/user_preferences.jinja:19 #: counter/templates/counter/cash_register_summary.jinja:22 -#: forum/templates/forum/reply.jinja:33 +#: forum/templates/forum/reply.jinja:34 #: subscription/templates/subscription/subscription.jinja:25 #: trombi/templates/trombi/comment.jinja:26 #: trombi/templates/trombi/edit_profile.jinja:13 @@ -1492,9 +1492,9 @@ msgstr "Type" #: com/templates/com/news_admin_list.jinja:249 #: com/templates/com/news_admin_list.jinja:286 #: com/templates/com/weekmail.jinja:19 com/templates/com/weekmail.jinja:48 -#: core/templates/core/base.jinja:341 forum/templates/forum/forum.jinja:29 -#: forum/templates/forum/forum.jinja:48 forum/templates/forum/main.jinja:26 -#: forum/views.py:192 +#: core/templates/core/base.jinja:341 forum/templates/forum/forum.jinja:30 +#: forum/templates/forum/forum.jinja:49 forum/templates/forum/main.jinja:27 +#: forum/views.py:213 msgid "Title" msgstr "Titre" @@ -1518,7 +1518,7 @@ msgstr "Résumé" #: com/templates/com/news_admin_list.jinja:252 #: com/templates/com/news_admin_list.jinja:289 #: com/templates/com/weekmail.jinja:17 com/templates/com/weekmail.jinja:46 -#: forum/templates/forum/forum.jinja:52 +#: forum/templates/forum/forum.jinja:53 msgid "Author" msgstr "Auteur" @@ -1628,7 +1628,7 @@ msgstr "" #: com/templates/com/news_edit.jinja:56 com/templates/com/weekmail.jinja:10 #: core/templates/core/macros_pages.jinja:49 -#: forum/templates/forum/reply.jinja:32 +#: forum/templates/forum/reply.jinja:33 msgid "Preview" msgstr "Prévisualiser" @@ -2113,7 +2113,7 @@ msgstr "Un utilisateur de ce nom d'utilisateur existe déjà" #: core/templates/core/user_edit.jinja:17 #: election/templates/election/election_detail.jinja:340 #: forum/templates/forum/macros.jinja:93 forum/templates/forum/macros.jinja:95 -#: forum/templates/forum/reply.jinja:38 forum/templates/forum/reply.jinja:40 +#: forum/templates/forum/reply.jinja:39 forum/templates/forum/reply.jinja:41 #: trombi/templates/trombi/user_tools.jinja:41 msgid "Profile" msgstr "Profil" @@ -2310,6 +2310,8 @@ msgid "Register" msgstr "S'enregister" #: core/templates/core/base.jinja:75 core/templates/core/base.jinja:76 +#: forum/templates/forum/macros.jinja:160 +#: forum/templates/forum/macros.jinja:162 #: matmat/templates/matmat/search_form.jinja:37 #: matmat/templates/matmat/search_form.jinja:47 #: matmat/templates/matmat/search_form.jinja:58 @@ -2370,8 +2372,8 @@ msgstr "GA" #: forum/templates/forum/forum.jinja:10 #: forum/templates/forum/last_unread.jinja:14 #: forum/templates/forum/main.jinja:6 forum/templates/forum/main.jinja:11 -#: forum/templates/forum/main.jinja:14 forum/templates/forum/reply.jinja:15 -#: forum/templates/forum/topic.jinja:30 +#: forum/templates/forum/main.jinja:14 forum/templates/forum/reply.jinja:16 +#: forum/templates/forum/topic.jinja:31 msgid "Forum" msgstr "Forum" @@ -2385,7 +2387,7 @@ msgstr "Photos" #: eboutic/templates/eboutic/eboutic_main.jinja:24 #: eboutic/templates/eboutic/eboutic_makecommand.jinja:8 #: eboutic/templates/eboutic/eboutic_payment_result.jinja:4 -#: sith/settings.py:376 sith/settings.py:384 +#: sith/settings.py:377 sith/settings.py:385 msgid "Eboutic" msgstr "Eboutic" @@ -3589,8 +3591,8 @@ msgstr "quantité" msgid "Sith account" msgstr "Compte utilisateur" -#: counter/models.py:448 sith/settings.py:369 sith/settings.py:374 -#: sith/settings.py:392 +#: counter/models.py:448 sith/settings.py:370 sith/settings.py:375 +#: sith/settings.py:393 msgid "Credit card" msgstr "Carte bancaire" @@ -4352,25 +4354,25 @@ msgstr "dernière date de lecture" msgid "Favorite topics" msgstr "Topics favoris" -#: forum/templates/forum/forum.jinja:20 forum/templates/forum/main.jinja:21 +#: forum/templates/forum/forum.jinja:20 forum/templates/forum/main.jinja:22 msgid "New forum" msgstr "Nouveau forum" #: forum/templates/forum/forum.jinja:23 forum/templates/forum/reply.jinja:8 -#: forum/templates/forum/reply.jinja:27 +#: forum/templates/forum/reply.jinja:28 msgid "New topic" msgstr "Nouveau sujet" -#: forum/templates/forum/forum.jinja:33 forum/templates/forum/main.jinja:30 +#: forum/templates/forum/forum.jinja:34 forum/templates/forum/main.jinja:31 msgid "Topics" msgstr "Sujets" -#: forum/templates/forum/forum.jinja:36 forum/templates/forum/forum.jinja:58 -#: forum/templates/forum/main.jinja:33 +#: forum/templates/forum/forum.jinja:37 forum/templates/forum/forum.jinja:59 +#: forum/templates/forum/main.jinja:34 msgid "Last message" msgstr "Dernier message" -#: forum/templates/forum/forum.jinja:55 +#: forum/templates/forum/forum.jinja:56 msgid "Messages" msgstr "Messages" @@ -4400,28 +4402,38 @@ msgstr " le " msgid "Deleted or unreadable message." msgstr "Message supprimé ou non-visible." +#: forum/templates/forum/macros.jinja:161 +msgid "Order by date" +msgstr "Trier par date" + #: forum/templates/forum/main.jinja:16 msgid "View last unread messages" msgstr "Voir les derniers messages non lus" -#: forum/templates/forum/reply.jinja:6 forum/templates/forum/reply.jinja:24 -#: forum/templates/forum/topic.jinja:41 forum/templates/forum/topic.jinja:66 +#: forum/templates/forum/reply.jinja:6 forum/templates/forum/reply.jinja:25 +#: forum/templates/forum/topic.jinja:42 forum/templates/forum/topic.jinja:67 msgid "Reply" msgstr "Répondre" -#: forum/templates/forum/topic.jinja:43 +#: forum/templates/forum/search.jinja:16 +#, fuzzy +#| msgid "Not found" +msgid "No result found" +msgstr "Non trouvé" + +#: forum/templates/forum/topic.jinja:44 msgid "Unmark as favorite" msgstr "Enlever des favoris" -#: forum/templates/forum/topic.jinja:45 +#: forum/templates/forum/topic.jinja:46 msgid "Mark as favorite" msgstr "Ajouter aux favoris" -#: forum/views.py:138 +#: forum/views.py:159 msgid "Apply rights and club owner recursively" msgstr "Appliquer les droits et le club propriétaire récursivement" -#: forum/views.py:356 +#: forum/views.py:377 #, python-format msgid "%(author)s said" msgstr "Citation de %(author)s" @@ -4475,12 +4487,12 @@ msgid "Washing and drying" msgstr "Lavage et séchage" #: launderette/templates/launderette/launderette_book.jinja:27 -#: sith/settings.py:520 +#: sith/settings.py:521 msgid "Washing" msgstr "Lavage" #: launderette/templates/launderette/launderette_book.jinja:31 -#: sith/settings.py:520 +#: sith/settings.py:521 msgid "Drying" msgstr "Séchage" @@ -4660,251 +4672,251 @@ msgstr "Erreur de création de l'album %(album)s : %(msg)s" msgid "Add user" msgstr "Ajouter une personne" -#: sith/settings.py:215 +#: sith/settings.py:216 msgid "English" msgstr "Anglais" -#: sith/settings.py:215 +#: sith/settings.py:216 msgid "French" msgstr "Français" -#: sith/settings.py:350 +#: sith/settings.py:351 msgid "TC" msgstr "TC" -#: sith/settings.py:351 +#: sith/settings.py:352 msgid "IMSI" msgstr "IMSI" -#: sith/settings.py:352 +#: sith/settings.py:353 msgid "IMAP" msgstr "IMAP" -#: sith/settings.py:353 +#: sith/settings.py:354 msgid "INFO" msgstr "INFO" -#: sith/settings.py:354 +#: sith/settings.py:355 msgid "GI" msgstr "GI" -#: sith/settings.py:355 +#: sith/settings.py:356 msgid "E" msgstr "E" -#: sith/settings.py:356 +#: sith/settings.py:357 msgid "EE" msgstr "EE" -#: sith/settings.py:357 +#: sith/settings.py:358 msgid "GESC" msgstr "GESC" -#: sith/settings.py:358 +#: sith/settings.py:359 msgid "GMC" msgstr "GMC" -#: sith/settings.py:359 +#: sith/settings.py:360 msgid "MC" msgstr "MC" -#: sith/settings.py:360 +#: sith/settings.py:361 msgid "EDIM" msgstr "EDIM" -#: sith/settings.py:361 +#: sith/settings.py:362 msgid "Humanities" msgstr "Humanités" -#: sith/settings.py:362 +#: sith/settings.py:363 msgid "N/A" msgstr "N/A" -#: sith/settings.py:366 sith/settings.py:373 sith/settings.py:390 +#: sith/settings.py:367 sith/settings.py:374 sith/settings.py:391 msgid "Check" msgstr "Chèque" -#: sith/settings.py:367 sith/settings.py:375 sith/settings.py:391 +#: sith/settings.py:368 sith/settings.py:376 sith/settings.py:392 msgid "Cash" msgstr "Espèces" -#: sith/settings.py:368 +#: sith/settings.py:369 msgid "Transfert" msgstr "Virement" -#: sith/settings.py:381 +#: sith/settings.py:382 msgid "Belfort" msgstr "Belfort" -#: sith/settings.py:382 +#: sith/settings.py:383 msgid "Sevenans" msgstr "Sevenans" -#: sith/settings.py:383 +#: sith/settings.py:384 msgid "Montbéliard" msgstr "Montbéliard" -#: sith/settings.py:434 +#: sith/settings.py:435 msgid "One semester" msgstr "Un semestre, 15 €" -#: sith/settings.py:435 +#: sith/settings.py:436 msgid "Two semesters" msgstr "Deux semestres, 28 €" -#: sith/settings.py:437 +#: sith/settings.py:438 msgid "Common core cursus" msgstr "Cursus tronc commun, 45 €" -#: sith/settings.py:441 +#: sith/settings.py:442 msgid "Branch cursus" msgstr "Cursus branche, 45 €" -#: sith/settings.py:442 +#: sith/settings.py:443 msgid "Alternating cursus" msgstr "Cursus alternant, 30 €" -#: sith/settings.py:443 +#: sith/settings.py:444 msgid "Honorary member" msgstr "Membre honoraire, 0 €" -#: sith/settings.py:444 +#: sith/settings.py:445 msgid "Assidu member" msgstr "Membre d'Assidu, 0 €" -#: sith/settings.py:445 +#: sith/settings.py:446 msgid "Amicale/DOCEO member" msgstr "Membre de l'Amicale/DOCEO, 0 €" -#: sith/settings.py:446 +#: sith/settings.py:447 msgid "UT network member" msgstr "Cotisant du réseau UT, 0 €" -#: sith/settings.py:447 +#: sith/settings.py:448 msgid "CROUS member" msgstr "Membres du CROUS, 0 €" -#: sith/settings.py:448 +#: sith/settings.py:449 msgid "Sbarro/ESTA member" msgstr "Membre de Sbarro ou de l'ESTA, 15 €" -#: sith/settings.py:450 +#: sith/settings.py:451 msgid "One semester Welcome Week" msgstr "Un semestre Welcome Week" -#: sith/settings.py:454 +#: sith/settings.py:455 msgid "Two months for free" msgstr "Deux mois gratuits" -#: sith/settings.py:455 +#: sith/settings.py:456 msgid "Eurok's volunteer" msgstr "Bénévole Eurockéennes" -#: sith/settings.py:457 +#: sith/settings.py:458 msgid "Six weeks for free" msgstr "6 semaines gratuites" -#: sith/settings.py:461 +#: sith/settings.py:462 msgid "One day" msgstr "Un jour" -#: sith/settings.py:480 +#: sith/settings.py:481 msgid "President" msgstr "Président" -#: sith/settings.py:481 +#: sith/settings.py:482 msgid "Vice-President" msgstr "Vice-Président" -#: sith/settings.py:482 +#: sith/settings.py:483 msgid "Treasurer" msgstr "Trésorier" -#: sith/settings.py:483 +#: sith/settings.py:484 msgid "Communication supervisor" msgstr "Responsable communication" -#: sith/settings.py:484 +#: sith/settings.py:485 msgid "Secretary" msgstr "Secrétaire" -#: sith/settings.py:485 +#: sith/settings.py:486 msgid "IT supervisor" msgstr "Responsable info" -#: sith/settings.py:486 +#: sith/settings.py:487 msgid "Board member" msgstr "Membre du bureau" -#: sith/settings.py:487 +#: sith/settings.py:488 msgid "Active member" msgstr "Membre actif" -#: sith/settings.py:488 +#: sith/settings.py:489 msgid "Curious" msgstr "Curieux" -#: sith/settings.py:524 +#: sith/settings.py:525 msgid "A new poster needs to be moderated" msgstr "Une nouvelle affiche a besoin d'être modérée" -#: sith/settings.py:525 +#: sith/settings.py:526 msgid "A new mailing list needs to be moderated" msgstr "Une nouvelle mailing list a besoin d'être modérée" -#: sith/settings.py:526 +#: sith/settings.py:527 #, python-format msgid "There are %s fresh news to be moderated" msgstr "Il y a %s nouvelles toutes fraîches à modérer" -#: sith/settings.py:527 +#: sith/settings.py:528 msgid "New files to be moderated" msgstr "Nouveaux fichiers à modérer" -#: sith/settings.py:528 +#: sith/settings.py:529 #, python-format msgid "There are %s pictures to be moderated in the SAS" msgstr "Il y a %s photos à modérer dans le SAS" -#: sith/settings.py:529 +#: sith/settings.py:530 msgid "You've been identified on some pictures" msgstr "Vous avez été identifié sur des photos" -#: sith/settings.py:530 +#: sith/settings.py:531 #, python-format msgid "You just refilled of %s €" msgstr "Vous avez rechargé votre compte de %s€" -#: sith/settings.py:531 +#: sith/settings.py:532 #, python-format msgid "You just bought %s" msgstr "Vous avez acheté %s" -#: sith/settings.py:532 +#: sith/settings.py:533 msgid "You have a notification" msgstr "Vous avez une notification" -#: sith/settings.py:544 +#: sith/settings.py:545 msgid "Success!" msgstr "Succès !" -#: sith/settings.py:545 +#: sith/settings.py:546 msgid "Fail!" msgstr "Échec !" -#: sith/settings.py:546 +#: sith/settings.py:547 msgid "You successfully posted an article in the Weekmail" msgstr "Article posté avec succès dans le Weekmail" -#: sith/settings.py:547 +#: sith/settings.py:548 msgid "You successfully edited an article in the Weekmail" msgstr "Article édité avec succès dans le Weekmail" -#: sith/settings.py:548 +#: sith/settings.py:549 msgid "You successfully sent the Weekmail" msgstr "Weekmail envoyé avec succès" -#: sith/settings.py:556 +#: sith/settings.py:557 msgid "AE tee-shirt" msgstr "Tee-shirt AE"