Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
AE UTBM
Sith
Commits
4edb9a78
Commit
4edb9a78
authored
Sep 01, 2017
by
Skia
🤘
Browse files
com: add agenda on news page
Signed-off-by:
Skia
<
skia@libskia.so
>
parent
0532f733
Changes
3
Hide whitespace changes
Inline
Side-by-side
com/templates/com/news_list.jinja
View file @
4edb9a78
...
...
@@ -17,6 +17,23 @@ section.news_call, section.news_notice {
section
.news_event
:nth-of-type
(
even
)
{
background
:
lightblue
;
}
div
#agenda
{
display
:
block
;
width
:
20%
;
float
:
right
;
background
:
white
;
font-size
:
70%
;
border
:
solid
1px
darkgrey
;
padding
:
0.5em
;
}
div
#agenda_content
{
overflow
:
auto
;
width
:
100%
;
height
:
20em
;
}
.news_weekly
p
{
margin
:
0.2em
;
}
.date
{
font-size
:
small
;
color
:
grey
;
...
...
@@ -29,6 +46,28 @@ section.news_event:nth-of-type(even) {
{%
if
user.is_in_group
(
settings.SITH_GROUP_COM_ADMIN_ID
)
%}
<a
href=
"
{{
url
(
'com:news_admin_list'
)
}}
"
>
{%
trans
%}
Administrate news
{%
endtrans
%}
</a>
{%
endif
%}
<div
id=
"agenda"
>
<h4>
{%
trans
%}
Agenda
{%
endtrans
%}
</h4>
<hr>
<div
id=
"agenda_content"
>
{%
for
d
in
NewsDate.objects.
filter
(
end_date__gte
=
timezone.now
(),
news__is_moderated
=
True
,
news__type__in
=
[
"WEEKLY"
,
"EVENT"
])
.
order_by
(
'start_date'
,
'end_date'
)
%}
<section
class=
"news_weekly"
>
<p><strong>
{{
d.start_date
|
localtime
|
date
(
'D d M Y'
)
}}
</strong></p>
<p
class=
"date"
>
<span>
{{
d.start_date
|
localtime
|
time
(
DATETIME_FORMAT
)
}}
</span>
-
<span>
{{
d.end_date
|
localtime
|
time
(
DATETIME_FORMAT
)
}}
</span>
</p>
<p><strong><a
href=
"
{{
url
(
'com:news_detail'
,
news_id
=
d.news.id
)
}}
"
>
{{
d.news.title
}}
</a></strong>
<a
href=
"
{{
d.news.club.get_absolute_url
()
}}
"
>
{{
d.news.club
}}
</a></p>
<p>
{{
d.news.summary
|
markdown
}}
</p>
</section>
{%
endfor
%}
</div>
</div>
{%
for
news
in
object_list.
filter
(
type
=
"NOTICE"
)
%}
<section
class=
"news_notice"
>
<h4>
<a
href=
"
{{
url
(
'com:news_detail'
,
news_id
=
news.id
)
}}
"
>
{{
news.title
}}
</a></h4>
...
...
@@ -67,9 +106,9 @@ section.news_event:nth-of-type(even) {
</section>
{%
endfor
%}
<hr>
<h4>
{%
trans
%}
Coming soon... don't miss!
{%
endtrans
%}
</h4>
{%
endfor
%}
{%
for
news
in
object_list.
filter
(
dates__start_date__gte
=
timezone.now
()
+
timedelta
(
days
=
5
),
type
=
"EVENT"
)
%}
<h4>
{%
trans
%}
Coming soon... don't miss!
{%
endtrans
%}
</h4>
{%
for
news
in
object_list.
filter
(
dates__start_date__gte
=
timezone.now
()
+
timedelta
(
days
=
5
),
type
=
"EVENT"
,
is_moderated
=
True
)
%}
<section>
<h4>
<a
href=
"
{{
url
(
'com:news_detail'
,
news_id
=
news.id
)
}}
"
>
{{
news.title
}}
</a>
<span
class=
"date"
>
{{
news.dates.first
()
.
start_date
|
localtime
|
date
(
DATETIME_FORMAT
)
}}
...
...
@@ -79,26 +118,6 @@ section.news_event:nth-of-type(even) {
</h4>
</section>
{%
endfor
%}
<!--
<hr>
<h4>
{%
trans
%}
Weekly
{%
endtrans
%}
</h4>
{%
for
news
in
object_list.
filter
(
dates__end_date__gte
=
timezone.now
(),
type
=
"WEEKLY"
)
.
distinct
()
%}
buggy when more than one news, anyway, we won't use it this way
{%
for
d
in
news.dates.all
()
%}
<section class="news_weekly">
<h4> <a href="
{{
url
(
'com:news_detail'
,
news_id
=
news.id
)
}}
">
{{
news.title
}}
</a></h4>
<p class="date">
<span>
{{
d.start_date
|
localtime
|
date
(
DATETIME_FORMAT
)
}}
{{
d.start_date
|
localtime
|
time
(
DATETIME_FORMAT
)
}}
</span> -
<span>
{{
d.end_date
|
localtime
|
date
(
DATETIME_FORMAT
)
}}
{{
d.end_date
|
localtime
|
time
(
DATETIME_FORMAT
)
}}
</span>
</p>
<p><a href="
{{
news.club.get_absolute_url
()
}}
">
{{
news.club
}}
</a></p>
<p>
{{
news.summary
|
markdown
}}
</p>
</section>
{%
endfor
%}
{%
endfor
%}
-->
{%
endblock
%}
...
...
core/management/commands/populate.py
View file @
4edb9a78
...
...
@@ -23,7 +23,7 @@
#
import
os
from
datetime
import
date
,
datetime
from
datetime
import
date
,
datetime
,
timedelta
from
io
import
StringIO
,
BytesIO
from
django.core.management.base
import
BaseCommand
...
...
@@ -31,6 +31,7 @@ from django.core.management import call_command
from
django.conf
import
settings
from
django.db
import
connection
from
django.contrib.sites.models
import
Site
from
django.utils
import
timezone
from
PIL
import
Image
...
...
@@ -40,7 +41,7 @@ from core.utils import resize_image
from
club.models
import
Club
,
Membership
from
subscription.models
import
Subscription
from
counter.models
import
Customer
,
ProductType
,
Product
,
Counter
,
Selling
from
com.models
import
Sith
,
Weekmail
from
com.models
import
Sith
,
Weekmail
,
News
,
NewsDate
from
election.models
import
Election
,
Role
,
Candidature
,
ElectionList
from
forum.models
import
Forum
,
ForumTopic
...
...
@@ -534,3 +535,33 @@ Welcome to the wiki page!
various
.
save
()
Forum
(
name
=
"Promos"
,
description
=
"Réservé aux Promos"
,
parent
=
various
).
save
()
ForumTopic
(
forum
=
hall
)
# News
friday
=
timezone
.
now
()
while
friday
.
weekday
()
!=
4
:
friday
+=
timedelta
(
hours
=
6
)
friday
.
replace
(
hour
=
20
,
minute
=
0
,
second
=
0
)
# Event
n
=
News
(
title
=
"Repas barman"
,
summary
=
"Enjoy la fin du semestre!"
,
content
=
"Viens donc t'enjailler avec les autres barmans aux "
"frais du BdF! \o/"
,
type
=
"EVENT"
,
club
=
bar_club
,
author
=
subscriber
,
is_moderated
=
True
,
moderator
=
skia
)
n
.
save
()
NewsDate
(
news
=
n
,
start_date
=
timezone
.
now
()
+
timedelta
(
hours
=
72
),
end_date
=
timezone
.
now
()
+
timedelta
(
hours
=
84
)).
save
()
n
=
News
(
title
=
"SdF"
,
summary
=
"Enjoy la fin des finaux!"
,
content
=
"Viens faire la fête avec tout plein de gens!"
,
type
=
"EVENT"
,
club
=
bar_club
,
author
=
subscriber
,
is_moderated
=
True
,
moderator
=
skia
)
n
.
save
()
NewsDate
(
news
=
n
,
start_date
=
friday
+
timedelta
(
hours
=
24
*
7
+
1
),
end_date
=
timezone
.
now
()
+
timedelta
(
hours
=
24
*
7
+
9
)).
save
()
# Weekly
n
=
News
(
title
=
"Jeux sans faim"
,
summary
=
"Viens jouer!"
,
content
=
"Rejoins la fine équipe du Troll Penché et viens "
"d'amuser le Vendredi soir!"
,
type
=
"WEEKLY"
,
club
=
troll
,
author
=
subscriber
,
is_moderated
=
True
,
moderator
=
skia
)
n
.
save
()
for
i
in
range
(
10
):
NewsDate
(
news
=
n
,
start_date
=
friday
+
timedelta
(
hours
=
24
*
7
*
i
),
end_date
=
friday
+
timedelta
(
hours
=
24
*
7
*
i
+
8
)).
save
()
locale/fr/LC_MESSAGES/django.po
View file @
4edb9a78
...
...
@@ -6,7 +6,7 @@
msgid
""
msgstr
""
"Report-Msgid-Bugs-To:
\n
"
"POT-Creation-Date: 2017-0
8-31 15:27
+0200
\n
"
"POT-Creation-Date: 2017-0
9-01 12:11
+0200
\n
"
"PO-Revision-Date: 2016-07-18
\n
"
"Last-Translator: Skia <skia@libskia.so>
\n
"
"Language-Team: AE info <ae.info@utbm.fr>
\n
"
...
...
@@ -216,7 +216,7 @@ msgstr "Compte"
msgid
"Company"
msgstr
"Entreprise"
#: accounting/models.py:271 sith/settings.py:36
7
#: accounting/models.py:271 sith/settings.py:36
8
#: stock/templates/stock/shopping_list_items.jinja:37
msgid
"Other"
msgstr
"Autre"
...
...
@@ -1240,7 +1240,7 @@ msgstr "Information"
msgid
"Event"
msgstr
"Événement"
#: com/models.py:54
com/templates/com/news_list.jinja:84
#: com/models.py:54
msgid
"Weekly"
msgstr
"Hebdomadaire"
...
...
@@ -1356,7 +1356,7 @@ msgstr "Administration des nouvelles"
#: com/templates/com/news_admin_list.jinja:9
#: com/templates/com/news_detail.jinja:5 com/templates/com/news_detail.jinja:11
#: com/templates/com/news_list.jinja:4 com/templates/com/news_list.jinja:2
8
#: com/templates/com/news_list.jinja:4 com/templates/com/news_list.jinja:
4
2
msgid
"News"
msgstr
"Nouvelles"
...
...
@@ -1534,15 +1534,19 @@ msgstr ""
msgid
"Preview"
msgstr
"Prévisualiser"
#: com/templates/com/news_list.jinja:
30
#: com/templates/com/news_list.jinja:
44
msgid
"Administrate news"
msgstr
"Administrer les news"
#: com/templates/com/news_list.jinja:51
#: com/templates/com/news_list.jinja:48
msgid
"Agenda"
msgstr
"Agenda"
#: com/templates/com/news_list.jinja:85
msgid
"Events today and the next few days"
msgstr
"Événement aujourd'hui et dans les prochains jours"
#: com/templates/com/news_list.jinja:
70
#: com/templates/com/news_list.jinja:
105
msgid
"Coming soon... don't miss!"
msgstr
"Prochainement... à ne pas rater!"
...
...
@@ -3176,7 +3180,7 @@ msgstr "Bureau"
#: 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:36
6
sith/settings.py:37
4
#: sith/settings.py:36
7
sith/settings.py:37
5
msgid
"Eboutic"
msgstr
"Eboutic"
...
...
@@ -3217,8 +3221,8 @@ msgstr "quantité"
msgid
"Sith account"
msgstr
"Compte utilisateur"
#: counter/models.py:351 sith/settings.py:3
59
sith/settings.py:36
4
#: sith/settings.py:38
6
#: counter/models.py:351 sith/settings.py:3
60
sith/settings.py:36
5
#: sith/settings.py:38
7
msgid
"Credit card"
msgstr
"Carte bancaire"
...
...
@@ -4077,12 +4081,12 @@ msgid "Washing and drying"
msgstr
"Lavage et séchage"
#: launderette/templates/launderette/launderette_book.jinja:27
#: sith/settings.py:54
1
#: sith/settings.py:54
7
msgid
"Washing"
msgstr
"Lavage"
#: launderette/templates/launderette/launderette_book.jinja:31
#: sith/settings.py:54
1
#: sith/settings.py:54
7
msgid
"Drying"
msgstr
"Séchage"
...
...
@@ -4257,230 +4261,229 @@ msgstr "Erreur de création de l'album %(album)s : %(msg)s"
msgid
"Add user"
msgstr
"Ajouter une personne"
#: sith/settings.py:21
1
#: sith/settings.py:21
2
msgid
"English"
msgstr
"Anglais"
#: sith/settings.py:21
2
#: sith/settings.py:21
3
msgid
"French"
msgstr
"Français"
#: sith/settings.py:34
0
#: sith/settings.py:34
1
msgid
"TC"
msgstr
"TC"
#: sith/settings.py:34
1
#: sith/settings.py:34
2
msgid
"IMSI"
msgstr
"IMSI"
#: sith/settings.py:34
2
#: sith/settings.py:34
3
msgid
"IMAP"
msgstr
"IMAP"
#: sith/settings.py:34
3
#: sith/settings.py:34
4
msgid
"INFO"
msgstr
"INFO"
#: sith/settings.py:34
4
#: sith/settings.py:34
5
msgid
"GI"
msgstr
"GI"
#: sith/settings.py:34
5
#: sith/settings.py:34
6
msgid
"E"
msgstr
"E"
#: sith/settings.py:34
6
#: sith/settings.py:34
7
msgid
"EE"
msgstr
"EE"
#: sith/settings.py:34
7
#: sith/settings.py:34
8
msgid
"GESC"
msgstr
"GESC"
#: sith/settings.py:34
8
#: sith/settings.py:34
9
msgid
"GMC"
msgstr
"GMC"
#: sith/settings.py:3
49
#: sith/settings.py:3
50
msgid
"MC"
msgstr
"MC"
#: sith/settings.py:35
0
#: sith/settings.py:35
1
msgid
"EDIM"
msgstr
"EDIM"
#: sith/settings.py:35
1
#: sith/settings.py:35
2
msgid
"Humanities"
msgstr
"Humanités"
#: sith/settings.py:35
2
#: sith/settings.py:35
3
msgid
"N/A"
msgstr
"N/A"
#: sith/settings.py:35
6
sith/settings.py:36
3
sith/settings.py:38
4
#: sith/settings.py:35
7
sith/settings.py:36
4
sith/settings.py:38
5
msgid
"Check"
msgstr
"Chèque"
#: sith/settings.py:35
7
sith/settings.py:36
5
sith/settings.py:38
5
#: sith/settings.py:35
8
sith/settings.py:36
6
sith/settings.py:38
6
msgid
"Cash"
msgstr
"Espèces"
#: sith/settings.py:35
8
#: sith/settings.py:35
9
msgid
"Transfert"
msgstr
"Virement"
#: sith/settings.py:37
1
#: sith/settings.py:37
2
msgid
"Belfort"
msgstr
"Belfort"
#: sith/settings.py:37
2
#: sith/settings.py:37
3
msgid
"Sevenans"
msgstr
"Sevenans"
#: sith/settings.py:37
3
#: sith/settings.py:37
4
msgid
"Montbéliard"
msgstr
"Montbéliard"
#: sith/settings.py:42
8
#: sith/settings.py:42
9
msgid
"One semester"
msgstr
"Un semestre, 15 €"
#: sith/settings.py:43
3
#: sith/settings.py:43
4
msgid
"Two semesters"
msgstr
"Deux semestres, 28 €"
#: sith/settings.py:43
8
#: sith/settings.py:43
9
msgid
"Common core cursus"
msgstr
"Cursus tronc commun, 45 €"
#: sith/settings.py:44
3
#: sith/settings.py:44
4
msgid
"Branch cursus"
msgstr
"Cursus branche, 45 €"
#: sith/settings.py:44
8
#: sith/settings.py:44
9
msgid
"Alternating cursus"
msgstr
"Cursus alternant, 30 €"
#: sith/settings.py:45
3
#: sith/settings.py:45
4
msgid
"Honorary member"
msgstr
"Membre honoraire, 0 €"
#: sith/settings.py:45
8
#: sith/settings.py:45
9
msgid
"Assidu member"
msgstr
"Membre d'Assidu, 0 €"
#: sith/settings.py:46
3
#: sith/settings.py:46
4
msgid
"Amicale/DOCEO member"
msgstr
"Membre de l'Amicale/DOCEO, 0 €"
#: sith/settings.py:46
8
#: sith/settings.py:46
9
msgid
"UT network member"
msgstr
"Cotisant du réseau UT, 0 €"
#: sith/settings.py:47
3
#: sith/settings.py:47
4
msgid
"CROUS member"
msgstr
"Membres du CROUS, 0 €"
#: sith/settings.py:47
8
#: sith/settings.py:47
9
msgid
"Sbarro/ESTA member"
msgstr
"Membre de Sbarro ou de l'ESTA, 15 €"
#: sith/settings.py:48
3
#: sith/settings.py:48
4
msgid
"One semester Welcome Week"
msgstr
"Un semestre Welcome Week"
#: sith/settings.py:
513
#: sith/settings.py:
489
msgid
"Two month for free"
msgstr
"Deux mois gratuits"
#: sith/settings.py:51
0
#: sith/settings.py:51
1
msgid
"President"
msgstr
"Président"
#: sith/settings.py:51
1
#: sith/settings.py:51
2
msgid
"Vice-President"
msgstr
"Vice-Président"
#: sith/settings.py:51
2
#: sith/settings.py:51
3
msgid
"Treasurer"
msgstr
"Trésorier"
#: sith/settings.py:51
3
#: sith/settings.py:51
4
msgid
"Communication supervisor"
msgstr
"Responsable communication"
#: sith/settings.py:51
4
#: sith/settings.py:51
5
msgid
"Secretary"
msgstr
"Secrétaire"
#: sith/settings.py:51
5
#: sith/settings.py:51
6
msgid
"IT supervisor"
msgstr
"Responsable info"
#: sith/settings.py:51
6
#: sith/settings.py:51
7
msgid
"Board member"
msgstr
"Membre du bureau"
#: sith/settings.py:51
7
#: sith/settings.py:51
8
msgid
"Active member"
msgstr
"Membre actif"
#: sith/settings.py:51
7
#: sith/settings.py:51
9
msgid
"Curious"
msgstr
"Curieux"
#: sith/settings.py:54
8
#: sith/settings.py:5
5
4
msgid
"A new mailing list needs to be moderated"
msgstr
"Une nouvelle mailing list a besoin d'être modérée"
#: sith/settings.py:5
49
#: sith/settings.py:5
55
msgid
"A fresh new to be moderated"
msgstr
"Une nouvelle toute neuve à modérer"
#: sith/settings.py:55
0
#: sith/settings.py:55
6
msgid
"New files to be moderated"
msgstr
"Nouveaux fichiers à modérer"
#: sith/settings.py:55
1
#: sith/settings.py:55
7
msgid
"New pictures/album to be moderated in the SAS"
msgstr
"Nouvelles photos/albums à modérer dans le SAS"
#: sith/settings.py:55
2
#: sith/settings.py:55
8
msgid
"You've been identified on some pictures"
msgstr
"Vous avez été identifié sur des photos"
#: sith/settings.py:55
8
#: sith/settings.py:55
9
#, python-format
msgid
"You just refilled of %s €"
msgstr
"Vous avez rechargé votre compte de %s €"
#: sith/settings.py:5
54
#: sith/settings.py:5
60
#, python-format
msgid
"You just bought %s"
msgstr
"Vous avez acheté %s"
#: sith/settings.py:563
#: sith/settings.py:560
#: sith/settings.py:561
msgid
"You have a notification"
msgstr
"Vous avez une notification"
#: sith/settings.py:56
4
#: sith/settings.py:56
5
msgid
"Success!"
msgstr
"Succès !"
#: sith/settings.py:56
5
#: sith/settings.py:56
6
msgid
"Fail!"
msgstr
"Échec !"
#: sith/settings.py:56
6
#: sith/settings.py:56
7
msgid
"You successfully posted an article in the Weekmail"
msgstr
"Article posté avec succès dans le Weekmail"
#: sith/settings.py:56
7
#: sith/settings.py:56
8
msgid
"You successfully edited an article in the Weekmail"
msgstr
"Article édité avec succès dans le Weekmail"
#: sith/settings.py:56
8
#: sith/settings.py:56
9
msgid
"You successfully sent the Weekmail"
msgstr
"Weekmail envoyé avec succès"
...
...
Write
Preview
Supports
Markdown
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