DGNum/ernestophone.ens.fr
6
0
Fork 0
Code Issues 7 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into ajout_commentaires

Browse source
This commit is contained in:
Maurice Debray 2021-12-26 16:17:24 +01:00
commit a0fea58dab
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gestion/templates/gestion/base.html
View file

@ -16,7 +16,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
{% block extrahead %}{% endblock %}
<link rel="stylesheet" href="{% static 'css/bootstrap.css' %}">
<link rel="stylesheet" href="{% static 'css/main.css' %}" />
<link rel="stylesheet" href="{% static 'css/main.css' %}?version=1" />
<link rel="stylesheet" href="{% static 'css/add2calendar.css' %}">
</head>
@ -64,7 +64,7 @@
<div class="dropdown-menu">
<a class="dropdown-item" href="{% url 'trombonoscope:view' %}">{% trans "Trombonoscope" %}</a>
<a class="dropdown-item" href="https://photos.cof.ens.fr/index.php/Clubs-du-COF/L'Ernestophone" target="_blank">{% trans "Galerie Photo" %}</a>
<a class="dropdown-item" href="{% url 'yearbook2021' %}" target="_blank">{% trans "Year Book 2021" %}</a>
<a class="dropdown-item" href="https://heyzine.com/flip-book/b2cf4809b7.html" target="_blank">{% trans "Year Book 2021" %}</a>
</div>
</li>
{% if user.is_superuser or user.profile.is_chef or user.profile.is_chef_event or user.profile.is_chef_com %}

1
gestion/templates/gestion/index.html
View file

@ -196,6 +196,7 @@
Nous répétons tous les mardis et jeudi soirs de 20h à 22h dans les sous sols du NIR à l'ENS. <br>Fanfaron débutant ou musicien aguerri, n'hésite pas à venir nous rejoindre !
Nous serons heureux de te compter dans nos rangs !<br>
Nous prêtons des instruments à tout membre du COF souhaitant découvrir les joies de la fanfaronnerie !{% endblocktrans %}</p>
<p align="center">{% blocktrans %}Pour un petit aperçu du fun qu'on peux avoir n'hésites pas à consulter notre {% endblocktrans %}<a class="text" href="https://heyzine.com/flip-book/b2cf4809b7.html" target="_blank">year book</a></p>
</div>
<div class="5u 12u$(small)"><div>
<span class="image fit">

4
gestion/templates/gestion/yearbook2021.html
View file

@ -8,9 +8,7 @@
<section class="wrapper style1">
<div class="inner">
<iframe allowfullscreen="allowfullscreen" scrolling="no" class="fp-iframe" src="https://heyzine.com/flip-book/344e8df024.html" style="border: 1px solid lightgray; width: 100%; height: 400px;"></iframe>
<iframe allowfullscreen="allowfullscreen" scrolling="no" class="fp-iframe" src="https://heyzine.com/flip-book/b2cf4809b7.html" style="border: 1px solid lightgray; width: 100%; height: 600px;"></iframe>
</div></section></div>

2
gestion/views.py
View file

@ -79,7 +79,7 @@ class Profil(LoginRequiredMixin, TemplateView):
class Chef(AllChefRequiredMixin, TemplateView):
template_name = "gestion/chef.html"
class YearBook2021(AllChefRequiredMixin, TemplateView):
class YearBook2021(TemplateView):
template_name = "gestion/yearbook2021.html"