Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Sith
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
59
Issues
59
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
AE
Sith
Commits
a9bae46f
Commit
a9bae46f
authored
Dec 11, 2018
by
Soldat
🤦🏻
Committed by
Skia
Dec 13, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changed design
parent
57454bff
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
119 additions
and
93 deletions
+119
-93
core/static/core/style.scss
core/static/core/style.scss
+12
-0
forum/templates/forum/forum.jinja
forum/templates/forum/forum.jinja
+1
-1
forum/templates/forum/macros.jinja
forum/templates/forum/macros.jinja
+4
-2
forum/templates/forum/main.jinja
forum/templates/forum/main.jinja
+1
-1
locale/fr/LC_MESSAGES/django.po
locale/fr/LC_MESSAGES/django.po
+101
-89
No files found.
core/static/core/style.scss
View file @
a9bae46f
...
...
@@ -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
;
...
...
forum/templates/forum/forum.jinja
View file @
a9bae46f
...
...
@@ -12,7 +12,6 @@
>
<a
href=
"
{{
f.get_absolute_url
()
}}
"
>
{{
f
}}
</a>
{%
endfor
%}
>
<a
href=
"
{{
forum.get_absolute_url
()
}}
"
>
{{
forum
}}
</a>
{{
display_search_bar
()
}}
</div>
<div
id=
"forum"
>
<h3>
{{
forum.name
}}
</h3>
...
...
@@ -23,6 +22,7 @@
{%
if
not
forum.is_category
%}
<a
class=
"ib button"
href=
"
{{
url
(
'forum:new_topic'
,
forum_id
=
forum.id
)
}}
"
>
{%
trans
%}
New topic
{%
endtrans
%}
</a>
{%
endif
%}
{{
display_search_bar
()
}}
</p>
{%
if
forum.children.exists
()
%}
<div>
...
...
forum/templates/forum/macros.jinja
View file @
a9bae46f
...
...
@@ -156,8 +156,10 @@
{%
endmacro
%}
{%
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=
"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>
{%
endmacro
%}
forum/templates/forum/main.jinja
View file @
a9bae46f
...
...
@@ -12,10 +12,10 @@
</p>
<div
id=
"forum"
>
<h3>
{%
trans
%}
Forum
{%
endtrans
%}
</h3>
{{
display_search_bar
()
}}
<p>
<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>
{{
display_search_bar
()
}}
</p>
{%
if
user.is_in_group
(
settings.SITH_GROUP_FORUM_ADMIN_ID
)
or
user.is_in_group
(
settings.SITH_GROUP_COM_ADMIN_ID
)
%}
<p>
...
...
locale/fr/LC_MESSAGES/django.po
View file @
a9bae46f
...
...
@@ -6,7 +6,7 @@
msgid
""
msgstr
""
"Report-Msgid-Bugs-To:
\n
"
"POT-Creation-Date: 2018-1
1-08 00:26
+0100
\n
"
"POT-Creation-Date: 2018-1
2-11 20:07
+0100
\n
"
"PO-Revision-Date: 2016-07-18
\n
"
"Last-Translator: Skia <skia@libskia.so>
\n
"
"Language-Team: AE info <ae.info@utbm.fr>
\n
"
...
...
@@ -219,7 +219,7 @@ msgstr "Compte"
msgid
"Company"
msgstr
"Entreprise"
#: accounting/models.py:317 sith/settings.py:37
7
#: accounting/models.py:317 sith/settings.py:37
8
#: 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:3
3
#: forum/templates/forum/reply.jinja:3
4
#: 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:4
8 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:4
9 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:5
2
#: forum/templates/forum/forum.jinja:5
3
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:3
2
#: forum/templates/forum/reply.jinja:3
3
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:3
8 forum/templates/forum/reply.jinja:40
#: forum/templates/forum/reply.jinja:3
9 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:1
5
#: forum/templates/forum/topic.jinja:3
0
#: forum/templates/forum/main.jinja:14 forum/templates/forum/reply.jinja:1
6
#: forum/templates/forum/topic.jinja:3
1
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:37
6 sith/settings.py:384
#: sith/settings.py:37
7 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:3
69 sith/settings.py:374
#: sith/settings.py:39
2
#: counter/models.py:448 sith/settings.py:3
70 sith/settings.py:375
#: sith/settings.py:39
3
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:2
1
#: forum/templates/forum/forum.jinja:20 forum/templates/forum/main.jinja:2
2
msgid
"New forum"
msgstr
"Nouveau forum"
#: forum/templates/forum/forum.jinja:23 forum/templates/forum/reply.jinja:8
#: forum/templates/forum/reply.jinja:2
7
#: forum/templates/forum/reply.jinja:2
8
msgid
"New topic"
msgstr
"Nouveau sujet"
#: forum/templates/forum/forum.jinja:3
3 forum/templates/forum/main.jinja:30
#: forum/templates/forum/forum.jinja:3
4 forum/templates/forum/main.jinja:31
msgid
"Topics"
msgstr
"Sujets"
#: forum/templates/forum/forum.jinja:3
6 forum/templates/forum/forum.jinja:58
#: forum/templates/forum/main.jinja:3
3
#: forum/templates/forum/forum.jinja:3
7 forum/templates/forum/forum.jinja:59
#: forum/templates/forum/main.jinja:3
4
msgid
"Last message"
msgstr
"Dernier message"
#: forum/templates/forum/forum.jinja:5
5
#: forum/templates/forum/forum.jinja:5
6
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:2
4
#: forum/templates/forum/topic.jinja:4
1 forum/templates/forum/topic.jinja:66
#: forum/templates/forum/reply.jinja:6 forum/templates/forum/reply.jinja:2
5
#: forum/templates/forum/topic.jinja:4
2 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:4
5
#: forum/templates/forum/topic.jinja:4
6
msgid
"Mark as favorite"
msgstr
"Ajouter aux favoris"
#: forum/views.py:1
38
#: forum/views.py:1
59
msgid
"Apply rights and club owner recursively"
msgstr
"Appliquer les droits et le club propriétaire récursivement"
#: forum/views.py:3
56
#: forum/views.py:3
77
#, 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:52
0
#: sith/settings.py:52
1
msgid
"Washing"
msgstr
"Lavage"
#: launderette/templates/launderette/launderette_book.jinja:31
#: sith/settings.py:52
0
#: sith/settings.py:52
1
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:21
5
#: sith/settings.py:21
6
msgid
"English"
msgstr
"Anglais"
#: sith/settings.py:21
5
#: sith/settings.py:21
6
msgid
"French"
msgstr
"Français"
#: sith/settings.py:35
0
#: sith/settings.py:35
1
msgid
"TC"
msgstr
"TC"
#: sith/settings.py:35
1
#: sith/settings.py:35
2
msgid
"IMSI"
msgstr
"IMSI"
#: sith/settings.py:35
2
#: sith/settings.py:35
3
msgid
"IMAP"
msgstr
"IMAP"
#: sith/settings.py:35
3
#: sith/settings.py:35
4
msgid
"INFO"
msgstr
"INFO"
#: sith/settings.py:35
4
#: sith/settings.py:35
5
msgid
"GI"
msgstr
"GI"
#: sith/settings.py:35
5
#: sith/settings.py:35
6
msgid
"E"
msgstr
"E"
#: sith/settings.py:35
6
#: sith/settings.py:35
7
msgid
"EE"
msgstr
"EE"
#: sith/settings.py:35
7
#: sith/settings.py:35
8
msgid
"GESC"
msgstr
"GESC"
#: sith/settings.py:35
8
#: sith/settings.py:35
9
msgid
"GMC"
msgstr
"GMC"
#: sith/settings.py:3
59
#: sith/settings.py:3
60
msgid
"MC"
msgstr
"MC"
#: sith/settings.py:36
0
#: sith/settings.py:36
1
msgid
"EDIM"
msgstr
"EDIM"
#: sith/settings.py:36
1
#: sith/settings.py:36
2
msgid
"Humanities"
msgstr
"Humanités"
#: sith/settings.py:36
2
#: sith/settings.py:36
3
msgid
"N/A"
msgstr
"N/A"
#: sith/settings.py:36
6 sith/settings.py:373 sith/settings.py:390
#: sith/settings.py:36
7 sith/settings.py:374 sith/settings.py:391
msgid
"Check"
msgstr
"Chèque"
#: sith/settings.py:36
7 sith/settings.py:375 sith/settings.py:391
#: sith/settings.py:36
8 sith/settings.py:376 sith/settings.py:392
msgid
"Cash"
msgstr
"Espèces"
#: sith/settings.py:36
8
#: sith/settings.py:36
9
msgid
"Transfert"
msgstr
"Virement"
#: sith/settings.py:38
1
#: sith/settings.py:38
2
msgid
"Belfort"
msgstr
"Belfort"
#: sith/settings.py:38
2
#: sith/settings.py:38
3
msgid
"Sevenans"
msgstr
"Sevenans"
#: sith/settings.py:38
3
#: sith/settings.py:38
4
msgid
"Montbéliard"
msgstr
"Montbéliard"
#: sith/settings.py:43
4
#: sith/settings.py:43
5
msgid
"One semester"
msgstr
"Un semestre, 15 €"
#: sith/settings.py:43
5
#: sith/settings.py:43
6
msgid
"Two semesters"
msgstr
"Deux semestres, 28 €"
#: sith/settings.py:43
7
#: sith/settings.py:43
8
msgid
"Common core cursus"
msgstr
"Cursus tronc commun, 45 €"
#: sith/settings.py:44
1
#: sith/settings.py:44
2
msgid
"Branch cursus"
msgstr
"Cursus branche, 45 €"
#: sith/settings.py:44
2
#: sith/settings.py:44
3
msgid
"Alternating cursus"
msgstr
"Cursus alternant, 30 €"
#: sith/settings.py:44
3
#: sith/settings.py:44
4
msgid
"Honorary member"
msgstr
"Membre honoraire, 0 €"
#: sith/settings.py:44
4
#: sith/settings.py:44
5
msgid
"Assidu member"
msgstr
"Membre d'Assidu, 0 €"
#: sith/settings.py:44
5
#: sith/settings.py:44
6
msgid
"Amicale/DOCEO member"
msgstr
"Membre de l'Amicale/DOCEO, 0 €"
#: sith/settings.py:44
6
#: sith/settings.py:44
7
msgid
"UT network member"
msgstr
"Cotisant du réseau UT, 0 €"
#: sith/settings.py:44
7
#: sith/settings.py:44
8
msgid
"CROUS member"
msgstr
"Membres du CROUS, 0 €"
#: sith/settings.py:44
8
#: sith/settings.py:44
9
msgid
"Sbarro/ESTA member"
msgstr
"Membre de Sbarro ou de l'ESTA, 15 €"
#: sith/settings.py:45
0
#: sith/settings.py:45
1
msgid
"One semester Welcome Week"
msgstr
"Un semestre Welcome Week"
#: sith/settings.py:45
4
#: sith/settings.py:45
5
msgid
"Two months for free"
msgstr
"Deux mois gratuits"
#: sith/settings.py:45
5
#: sith/settings.py:45
6
msgid
"Eurok's volunteer"
msgstr
"Bénévole Eurockéennes"
#: sith/settings.py:45
7
#: sith/settings.py:45
8
msgid
"Six weeks for free"
msgstr
"6 semaines gratuites"
#: sith/settings.py:46
1
#: sith/settings.py:46
2
msgid
"One day"
msgstr
"Un jour"
#: sith/settings.py:48
0
#: sith/settings.py:48
1
msgid
"President"
msgstr
"Président"
#: sith/settings.py:48
1
#: sith/settings.py:48
2
msgid
"Vice-President"
msgstr
"Vice-Président"
#: sith/settings.py:48
2
#: sith/settings.py:48
3
msgid
"Treasurer"
msgstr
"Trésorier"
#: sith/settings.py:48
3
#: sith/settings.py:48
4
msgid
"Communication supervisor"
msgstr
"Responsable communication"
#: sith/settings.py:48
4
#: sith/settings.py:48
5
msgid
"Secretary"
msgstr
"Secrétaire"
#: sith/settings.py:48
5
#: sith/settings.py:48
6
msgid
"IT supervisor"
msgstr
"Responsable info"
#: sith/settings.py:48
6
#: sith/settings.py:48
7
msgid
"Board member"
msgstr
"Membre du bureau"
#: sith/settings.py:48
7
#: sith/settings.py:48
8
msgid
"Active member"
msgstr
"Membre actif"
#: sith/settings.py:48
8
#: sith/settings.py:48
9
msgid
"Curious"
msgstr
"Curieux"
#: sith/settings.py:52
4
#: sith/settings.py:52
5
msgid
"A new poster needs to be moderated"
msgstr
"Une nouvelle affiche a besoin d'être modérée"
#: sith/settings.py:52
5
#: sith/settings.py:52
6
msgid
"A new mailing list needs to be moderated"
msgstr
"Une nouvelle mailing list a besoin d'être modérée"
#: sith/settings.py:52
6
#: sith/settings.py:52
7
#, 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:52
7
#: sith/settings.py:52
8
msgid
"New files to be moderated"
msgstr
"Nouveaux fichiers à modérer"
#: sith/settings.py:52
8
#: sith/settings.py:52
9
#, 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:5
29
#: sith/settings.py:5
30
msgid
"You've been identified on some pictures"
msgstr
"Vous avez été identifié sur des photos"
#: sith/settings.py:53
0
#: sith/settings.py:53
1
#, python-format
msgid
"You just refilled of %s €"
msgstr
"Vous avez rechargé votre compte de %s€"
#: sith/settings.py:53
1
#: sith/settings.py:53
2
#, python-format
msgid
"You just bought %s"
msgstr
"Vous avez acheté %s"
#: sith/settings.py:53
2
#: sith/settings.py:53
3
msgid
"You have a notification"
msgstr
"Vous avez une notification"
#: sith/settings.py:54
4
#: sith/settings.py:54
5
msgid
"Success!"
msgstr
"Succès !"
#: sith/settings.py:54
5
#: sith/settings.py:54
6
msgid
"Fail!"
msgstr
"Échec !"
#: sith/settings.py:54
6
#: sith/settings.py:54
7
msgid
"You successfully posted an article in the Weekmail"
msgstr
"Article posté avec succès dans le Weekmail"
#: sith/settings.py:54
7
#: sith/settings.py:54
8
msgid
"You successfully edited an article in the Weekmail"
msgstr
"Article édité avec succès dans le Weekmail"
#: sith/settings.py:54
8
#: sith/settings.py:54
9
msgid
"You successfully sent the Weekmail"
msgstr
"Weekmail envoyé avec succès"
#: sith/settings.py:55
6
#: sith/settings.py:55
7
msgid
"AE tee-shirt"
msgstr
"Tee-shirt AE"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment