Commit a9bae46f authored by Soldat's avatar Soldat 🤦🏻 Committed by Skia

changed design

parent 57454bff
...@@ -1403,6 +1403,18 @@ textarea { ...@@ -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 { .category {
margin-top: 5px; margin-top: 5px;
background: $secondary-color; background: $secondary-color;
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
> <a href="{{ f.get_absolute_url() }}">{{ f }}</a> > <a href="{{ f.get_absolute_url() }}">{{ f }}</a>
{% endfor %} {% endfor %}
> <a href="{{ forum.get_absolute_url() }}">{{ forum }}</a> > <a href="{{ forum.get_absolute_url() }}">{{ forum }}</a>
{{ display_search_bar() }}
</div> </div>
<div id="forum"> <div id="forum">
<h3>{{ forum.name }}</h3> <h3>{{ forum.name }}</h3>
...@@ -23,6 +22,7 @@ ...@@ -23,6 +22,7 @@
{% if not forum.is_category %} {% if not forum.is_category %}
<a class="ib button" href="{{ url('forum:new_topic', forum_id=forum.id) }}">{% trans %}New topic{% endtrans %}</a> <a class="ib button" href="{{ url('forum:new_topic', forum_id=forum.id) }}">{% trans %}New topic{% endtrans %}</a>
{% endif %} {% endif %}
{{ display_search_bar() }}
</p> </p>
{% if forum.children.exists() %} {% if forum.children.exists() %}
<div> <div>
......
...@@ -156,8 +156,10 @@ ...@@ -156,8 +156,10 @@
{% endmacro %} {% endmacro %}
{% macro display_search_bar() %} {% macro display_search_bar() %}
<form action="{{ url('forum:search') }}" method="GET" style="text-align: right;"> <form class="search_bar" action="{{ url('forum:search') }}" method="GET">
<input type="text" placeholder="{% trans %}Search{% endtrans %}" name="query"/> <input type="text" placeholder="{% trans %}Search{% endtrans %}" name="query"/>
<input type="submit" value="{% trans %}Search{% endtrans %}"/> <input type="checkbox" class="sreach_check" name="order" value="date" checked> {% trans %}Order by date{% endtrans %}<br>
<input type="submit" class="search_bouton" value="{% trans %}Search{% endtrans %}"/>
</form> </form>
{% endmacro %} {% endmacro %}
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
</p> </p>
<div id="forum"> <div id="forum">
<h3>{% trans %}Forum{% endtrans %}</h3> <h3>{% trans %}Forum{% endtrans %}</h3>
{{ display_search_bar() }}
<p> <p>
<a class="ib button" href="{{ url('forum:last_unread') }}">{% trans %}View last unread messages{% endtrans %}</a> <a class="ib button" href="{{ url('forum:last_unread') }}">{% trans %}View last unread messages{% endtrans %}</a>
<a class="ib button" href="{{ url('forum:favorite_topics') }}">{% trans %}Favorite topics{% endtrans %}</a> <a class="ib button" href="{{ url('forum:favorite_topics') }}">{% trans %}Favorite topics{% endtrans %}</a>
{{ display_search_bar() }}
</p> </p>
{% if user.is_in_group(settings.SITH_GROUP_FORUM_ADMIN_ID) or user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) %} {% if user.is_in_group(settings.SITH_GROUP_FORUM_ADMIN_ID) or user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) %}
<p> <p>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Report-Msgid-Bugs-To: \n" "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" "PO-Revision-Date: 2016-07-18\n"
"Last-Translator: Skia <skia@libskia.so>\n" "Last-Translator: Skia <skia@libskia.so>\n"
"Language-Team: AE info <ae.info@utbm.fr>\n" "Language-Team: AE info <ae.info@utbm.fr>\n"
...@@ -219,7 +219,7 @@ msgstr "Compte" ...@@ -219,7 +219,7 @@ msgstr "Compte"
msgid "Company" msgid "Company"
msgstr "Entreprise" 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 #: stock/templates/stock/shopping_list_items.jinja:37
msgid "Other" msgid "Other"
msgstr "Autre" msgstr "Autre"
...@@ -776,7 +776,7 @@ msgstr "Opération liée : " ...@@ -776,7 +776,7 @@ msgstr "Opération liée : "
#: core/templates/core/user_preferences.jinja:12 #: core/templates/core/user_preferences.jinja:12
#: core/templates/core/user_preferences.jinja:19 #: core/templates/core/user_preferences.jinja:19
#: counter/templates/counter/cash_register_summary.jinja:22 #: 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 #: subscription/templates/subscription/subscription.jinja:25
#: trombi/templates/trombi/comment.jinja:26 #: trombi/templates/trombi/comment.jinja:26
#: trombi/templates/trombi/edit_profile.jinja:13 #: trombi/templates/trombi/edit_profile.jinja:13
...@@ -1492,9 +1492,9 @@ msgstr "Type" ...@@ -1492,9 +1492,9 @@ msgstr "Type"
#: com/templates/com/news_admin_list.jinja:249 #: com/templates/com/news_admin_list.jinja:249
#: com/templates/com/news_admin_list.jinja:286 #: com/templates/com/news_admin_list.jinja:286
#: com/templates/com/weekmail.jinja:19 com/templates/com/weekmail.jinja:48 #: com/templates/com/weekmail.jinja:19 com/templates/com/weekmail.jinja:48
#: core/templates/core/base.jinja:341 forum/templates/forum/forum.jinja:29 #: core/templates/core/base.jinja:341 forum/templates/forum/forum.jinja:30
#: forum/templates/forum/forum.jinja:48 forum/templates/forum/main.jinja:26 #: forum/templates/forum/forum.jinja:49 forum/templates/forum/main.jinja:27
#: forum/views.py:192 #: forum/views.py:213
msgid "Title" msgid "Title"
msgstr "Titre" msgstr "Titre"
...@@ -1518,7 +1518,7 @@ msgstr "Résumé" ...@@ -1518,7 +1518,7 @@ msgstr "Résumé"
#: com/templates/com/news_admin_list.jinja:252 #: com/templates/com/news_admin_list.jinja:252
#: com/templates/com/news_admin_list.jinja:289 #: com/templates/com/news_admin_list.jinja:289
#: com/templates/com/weekmail.jinja:17 com/templates/com/weekmail.jinja:46 #: 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" msgid "Author"
msgstr "Auteur" msgstr "Auteur"
...@@ -1628,7 +1628,7 @@ msgstr "" ...@@ -1628,7 +1628,7 @@ msgstr ""
#: com/templates/com/news_edit.jinja:56 com/templates/com/weekmail.jinja:10 #: com/templates/com/news_edit.jinja:56 com/templates/com/weekmail.jinja:10
#: core/templates/core/macros_pages.jinja:49 #: core/templates/core/macros_pages.jinja:49
#: forum/templates/forum/reply.jinja:32 #: forum/templates/forum/reply.jinja:33
msgid "Preview" msgid "Preview"
msgstr "Prévisualiser" msgstr "Prévisualiser"
...@@ -2113,7 +2113,7 @@ msgstr "Un utilisateur de ce nom d'utilisateur existe déjà" ...@@ -2113,7 +2113,7 @@ msgstr "Un utilisateur de ce nom d'utilisateur existe déjà"
#: core/templates/core/user_edit.jinja:17 #: core/templates/core/user_edit.jinja:17
#: election/templates/election/election_detail.jinja:340 #: election/templates/election/election_detail.jinja:340
#: forum/templates/forum/macros.jinja:93 forum/templates/forum/macros.jinja:95 #: 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 #: trombi/templates/trombi/user_tools.jinja:41
msgid "Profile" msgid "Profile"
msgstr "Profil" msgstr "Profil"
...@@ -2310,6 +2310,8 @@ msgid "Register" ...@@ -2310,6 +2310,8 @@ msgid "Register"
msgstr "S'enregister" msgstr "S'enregister"
#: core/templates/core/base.jinja:75 core/templates/core/base.jinja:76 #: 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:37
#: matmat/templates/matmat/search_form.jinja:47 #: matmat/templates/matmat/search_form.jinja:47
#: matmat/templates/matmat/search_form.jinja:58 #: matmat/templates/matmat/search_form.jinja:58
...@@ -2370,8 +2372,8 @@ msgstr "GA" ...@@ -2370,8 +2372,8 @@ msgstr "GA"
#: forum/templates/forum/forum.jinja:10 #: forum/templates/forum/forum.jinja:10
#: forum/templates/forum/last_unread.jinja:14 #: forum/templates/forum/last_unread.jinja:14
#: forum/templates/forum/main.jinja:6 forum/templates/forum/main.jinja:11 #: 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/main.jinja:14 forum/templates/forum/reply.jinja:16
#: forum/templates/forum/topic.jinja:30 #: forum/templates/forum/topic.jinja:31
msgid "Forum" msgid "Forum"
msgstr "Forum" msgstr "Forum"
...@@ -2385,7 +2387,7 @@ msgstr "Photos" ...@@ -2385,7 +2387,7 @@ msgstr "Photos"
#: eboutic/templates/eboutic/eboutic_main.jinja:24 #: eboutic/templates/eboutic/eboutic_main.jinja:24
#: eboutic/templates/eboutic/eboutic_makecommand.jinja:8 #: eboutic/templates/eboutic/eboutic_makecommand.jinja:8
#: eboutic/templates/eboutic/eboutic_payment_result.jinja:4 #: 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" msgid "Eboutic"
msgstr "Eboutic" msgstr "Eboutic"
...@@ -3589,8 +3591,8 @@ msgstr "quantité" ...@@ -3589,8 +3591,8 @@ msgstr "quantité"
msgid "Sith account" msgid "Sith account"
msgstr "Compte utilisateur" msgstr "Compte utilisateur"
#: counter/models.py:448 sith/settings.py:369 sith/settings.py:374 #: counter/models.py:448 sith/settings.py:370 sith/settings.py:375
#: sith/settings.py:392 #: sith/settings.py:393
msgid "Credit card" msgid "Credit card"
msgstr "Carte bancaire" msgstr "Carte bancaire"
...@@ -4352,25 +4354,25 @@ msgstr "dernière date de lecture" ...@@ -4352,25 +4354,25 @@ msgstr "dernière date de lecture"
msgid "Favorite topics" msgid "Favorite topics"
msgstr "Topics favoris" 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" msgid "New forum"
msgstr "Nouveau forum" msgstr "Nouveau forum"
#: forum/templates/forum/forum.jinja:23 forum/templates/forum/reply.jinja:8 #: 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" msgid "New topic"
msgstr "Nouveau sujet" 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" msgid "Topics"
msgstr "Sujets" msgstr "Sujets"
#: forum/templates/forum/forum.jinja:36 forum/templates/forum/forum.jinja:58 #: forum/templates/forum/forum.jinja:37 forum/templates/forum/forum.jinja:59
#: forum/templates/forum/main.jinja:33 #: forum/templates/forum/main.jinja:34
msgid "Last message" msgid "Last message"
msgstr "Dernier message" msgstr "Dernier message"
#: forum/templates/forum/forum.jinja:55 #: forum/templates/forum/forum.jinja:56
msgid "Messages" msgid "Messages"
msgstr "Messages" msgstr "Messages"
...@@ -4400,28 +4402,38 @@ msgstr " le " ...@@ -4400,28 +4402,38 @@ msgstr " le "
msgid "Deleted or unreadable message." msgid "Deleted or unreadable message."
msgstr "Message supprimé ou non-visible." 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 #: forum/templates/forum/main.jinja:16
msgid "View last unread messages" msgid "View last unread messages"
msgstr "Voir les derniers messages non lus" msgstr "Voir les derniers messages non lus"
#: forum/templates/forum/reply.jinja:6 forum/templates/forum/reply.jinja:24 #: forum/templates/forum/reply.jinja:6 forum/templates/forum/reply.jinja:25
#: forum/templates/forum/topic.jinja:41 forum/templates/forum/topic.jinja:66 #: forum/templates/forum/topic.jinja:42 forum/templates/forum/topic.jinja:67
msgid "Reply" msgid "Reply"
msgstr "Répondre" 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" msgid "Unmark as favorite"
msgstr "Enlever des favoris" msgstr "Enlever des favoris"
#: forum/templates/forum/topic.jinja:45 #: forum/templates/forum/topic.jinja:46
msgid "Mark as favorite" msgid "Mark as favorite"
msgstr "Ajouter aux favoris" msgstr "Ajouter aux favoris"
#: forum/views.py:138 #: forum/views.py:159
msgid "Apply rights and club owner recursively" msgid "Apply rights and club owner recursively"
msgstr "Appliquer les droits et le club propriétaire récursivement" msgstr "Appliquer les droits et le club propriétaire récursivement"
#: forum/views.py:356 #: forum/views.py:377
#, python-format #, python-format
msgid "%(author)s said" msgid "%(author)s said"
msgstr "Citation de %(author)s" msgstr "Citation de %(author)s"
...@@ -4475,12 +4487,12 @@ msgid "Washing and drying" ...@@ -4475,12 +4487,12 @@ msgid "Washing and drying"
msgstr "Lavage et séchage" msgstr "Lavage et séchage"
#: launderette/templates/launderette/launderette_book.jinja:27 #: launderette/templates/launderette/launderette_book.jinja:27
#: sith/settings.py:520 #: sith/settings.py:521
msgid "Washing" msgid "Washing"
msgstr "Lavage" msgstr "Lavage"
#: launderette/templates/launderette/launderette_book.jinja:31 #: launderette/templates/launderette/launderette_book.jinja:31
#: sith/settings.py:520 #: sith/settings.py:521
msgid "Drying" msgid "Drying"
msgstr "Séchage" msgstr "Séchage"
...@@ -4660,251 +4672,251 @@ msgstr "Erreur de création de l'album %(album)s : %(msg)s" ...@@ -4660,251 +4672,251 @@ msgstr "Erreur de création de l'album %(album)s : %(msg)s"
msgid "Add user" msgid "Add user"
msgstr "Ajouter une personne" msgstr "Ajouter une personne"
#: sith/settings.py:215 #: sith/settings.py:216
msgid "English" msgid "English"
msgstr "Anglais" msgstr "Anglais"
#: sith/settings.py:215 #: sith/settings.py:216
msgid "French" msgid "French"
msgstr "Français" msgstr "Français"
#: sith/settings.py:350 #: sith/settings.py:351
msgid "TC" msgid "TC"
msgstr "TC" msgstr "TC"
#: sith/settings.py:351 #: sith/settings.py:352
msgid "IMSI" msgid "IMSI"
msgstr "IMSI" msgstr "IMSI"
#: sith/settings.py:352 #: sith/settings.py:353
msgid "IMAP" msgid "IMAP"
msgstr "IMAP" msgstr "IMAP"
#: sith/settings.py:353 #: sith/settings.py:354
msgid "INFO" msgid "INFO"
msgstr "INFO" msgstr "INFO"
#: sith/settings.py:354 #: sith/settings.py:355
msgid "GI" msgid "GI"
msgstr "GI" msgstr "GI"
#: sith/settings.py:355 #: sith/settings.py:356
msgid "E" msgid "E"
msgstr "E" msgstr "E"
#: sith/settings.py:356 #: sith/settings.py:357
msgid "EE" msgid "EE"
msgstr "EE" msgstr "EE"
#: sith/settings.py:357 #: sith/settings.py:358
msgid "GESC" msgid "GESC"
msgstr "GESC" msgstr "GESC"
#: sith/settings.py:358 #: sith/settings.py:359
msgid "GMC" msgid "GMC"
msgstr "GMC" msgstr "GMC"
#: sith/settings.py:359 #: sith/settings.py:360
msgid "MC" msgid "MC"
msgstr "MC" msgstr "MC"
#: sith/settings.py:360 #: sith/settings.py:361
msgid "EDIM" msgid "EDIM"
msgstr "EDIM" msgstr "EDIM"
#: sith/settings.py:361 #: sith/settings.py:362
msgid "Humanities" msgid "Humanities"
msgstr "Humanités" msgstr "Humanités"
#: sith/settings.py:362 #: sith/settings.py:363
msgid "N/A" msgid "N/A"
msgstr "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" msgid "Check"
msgstr "Chèque" 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" msgid "Cash"
msgstr "Espèces" msgstr "Espèces"
#: sith/settings.py:368 #: sith/settings.py:369
msgid "Transfert" msgid "Transfert"
msgstr "Virement" msgstr "Virement"
#: sith/settings.py:381 #: sith/settings.py:382
msgid "Belfort" msgid "Belfort"
msgstr "Belfort" msgstr "Belfort"
#: sith/settings.py:382 #: sith/settings.py:383
msgid "Sevenans" msgid "Sevenans"
msgstr "Sevenans" msgstr "Sevenans"
#: sith/settings.py:383 #: sith/settings.py:384
msgid "Montbéliard" msgid "Montbéliard"
msgstr "Montbéliard" msgstr "Montbéliard"
#: sith/settings.py:434 #: sith/settings.py:435
msgid "One semester" msgid "One semester"
msgstr "Un semestre, 15 €" msgstr "Un semestre, 15 €"
#: sith/settings.py:435 #: sith/settings.py:436
msgid "Two semesters" msgid "Two semesters"
msgstr "Deux semestres, 28 €" msgstr "Deux semestres, 28 €"
#: sith/settings.py:437 #: sith/settings.py:438
msgid "Common core cursus" msgid "Common core cursus"
msgstr "Cursus tronc commun, 45 €" msgstr "Cursus tronc commun, 45 €"
#: sith/settings.py:441 #: sith/settings.py:442
msgid "Branch cursus" msgid "Branch cursus"
msgstr "Cursus branche, 45 €" msgstr "Cursus branche, 45 €"
#: sith/settings.py:442 #: sith/settings.py:443
msgid "Alternating cursus" msgid "Alternating cursus"
msgstr "Cursus alternant, 30 €" msgstr "Cursus alternant, 30 €"
#: sith/settings.py:443 #: sith/settings.py:444
msgid "Honorary member" msgid "Honorary member"
msgstr "Membre honoraire, 0 €" msgstr "Membre honoraire, 0 €"
#: sith/settings.py:444 #: sith/settings.py:445
msgid "Assidu member" msgid "Assidu member"
msgstr "Membre d'Assidu, 0 €" msgstr "Membre d'Assidu, 0 €"
#: sith/settings.py:445 #: sith/settings.py:446
msgid "Amicale/DOCEO member" msgid "Amicale/DOCEO member"
msgstr "Membre de l'Amicale/DOCEO, 0 €" msgstr "Membre de l'Amicale/DOCEO, 0 €"
#: sith/settings.py:446 #: sith/settings.py:447
msgid "UT network member" msgid "UT network member"
msgstr "Cotisant du réseau UT, 0 €" msgstr "Cotisant du réseau UT, 0 €"
#: sith/settings.py:447 #: sith/settings.py:448
msgid "CROUS member" msgid "CROUS member"
msgstr "Membres du CROUS, 0 €" msgstr "Membres du CROUS, 0 €"
#: sith/settings.py:448 #: sith/settings.py:449
msgid "Sbarro/ESTA member" msgid "Sbarro/ESTA member"
msgstr "Membre de Sbarro ou de l'ESTA, 15 €" msgstr "Membre de Sbarro ou de l'ESTA, 15 €"
#: sith/settings.py:450 #: sith/settings.py:451
msgid "One semester Welcome Week" msgid "One semester Welcome Week"
msgstr "Un semestre Welcome Week" msgstr "Un semestre Welcome Week"
#: sith/settings.py:454 #: sith/settings.py:455
msgid "Two months for free" msgid "Two months for free"
msgstr "Deux mois gratuits" msgstr "Deux mois gratuits"
#: sith/settings.py:455 #: sith/settings.py:456
msgid "Eurok's volunteer" msgid "Eurok's volunteer"
msgstr "Bénévole Eurockéennes" msgstr "Bénévole Eurockéennes"
#: sith/settings.py:457 #: sith/settings.py:458
msgid "Six weeks for free" msgid "Six weeks for free"
msgstr "6 semaines gratuites" msgstr "6 semaines gratuites"
#: sith/settings.py:461 #: sith/settings.py:462
msgid "One day" msgid "One day"
msgstr "Un jour" msgstr "Un jour"
#: sith/settings.py:480 #: sith/settings.py:481
msgid "President" msgid "President"
msgstr "Président" msgstr "Président"
#: sith/settings.py:481 #: sith/settings.py:482
msgid "Vice-President" msgid "Vice-President"
msgstr "Vice-Président" msgstr "Vice-Président"