klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith3.git synced 2024-09-19 17:38:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into taiste

Browse Source 
# Conflicts:
#	eboutic/templates/eboutic/eboutic_main.jinja
#	locale/fr/LC_MESSAGES/django.po
This commit is contained in:
thomas girod 2024-07-08 10:01:37 +02:00
commit eb2454eded
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
eboutic/templates/eboutic/eboutic_main.jinja
View File

@ -90,6 +90,24 @@
</div> </div>
{% endif %} {% endif %}
<section>
<div class="category-header">
<h3>Partenariat Eurockéennes 2024</h3>
<br>
{% if user.is_subscribed %}
<a title="Logiciel billetterie en ligne"
href="https://widget.weezevent.com/ticket/029d0986-83bf-47bf-9529-a3f0a45be04d?id_evenement=1061288&locale=fr-FR&code=3142"
class="weezevent-widget-integration" target="_blank"
data-src="https://widget.weezevent.com/ticket/029d0986-83bf-47bf-9529-a3f0a45be04d?id_evenement=1061288&locale=fr-FR&code=3142"
data-width="650" data-height="600" data-resize="1" data-nopb="0" data-type="neo"
data-width_auto="1" data-noscroll="0" data-id="1061288">Billetterie Weezevent</a>
<script type="text/javascript" src="https://widget.weezevent.com/weez.js" async defer></script>
{% else %}
<div>Vous devez être cotisant pour accéder à la billeterie des Eurockéennes</div>
{% endif %}
</div>
</section>
{% for priority_groups in products|groupby('priority')|reverse %} {% for priority_groups in products|groupby('priority')|reverse %}
{% for category, items in priority_groups.list|groupby('category') %} {% for category, items in priority_groups.list|groupby('category') %}
{% if items|count > 0 %} {% if items|count > 0 %}
@ -104,11 +122,13 @@
</div> </div>
<div class="product-group"> <div class="product-group">
{% for p in items %} {% for p in items %}
<button id="{{ p.id }}" class="product-button" @click='add_from_catalog({{ p.id }}, {{ p.name|tojson }}, {{ p.selling_price }})'> <button id="{{ p.id }}" class="product-button"
@click='add_from_catalog({{ p.id }}, {{ p.name|tojson }}, {{ p.selling_price }})'>
{% if p.icon %} {% if p.icon %}
<img class="product-image" src="{{ p.icon.url }}" alt="image de {{ p.name }}"> <img class="product-image" src="{{ p.icon.url }}"
alt="image de {{ p.name }}">
{% else %} {% else %}
<i class="fa fa-2x fa-picture-o product-image" ></i> <i class="fa fa-2x fa-picture-o product-image"></i>
{% endif %} {% endif %}
<div class="product-description"> <div class="product-description">
<h4>{{ p.name }}</h4> <h4>{{ p.name }}</h4>

2
locale/fr/LC_MESSAGES/django.po
View File

@ -2454,7 +2454,7 @@ msgstr "Les clubs de L'AE"
msgid "Others UTBM's Associations" msgid "Others UTBM's Associations"
msgstr "Les autres associations de l'UTBM" msgstr "Les autres associations de l'UTBM"
#: core/templates/core/base.jinja:212 core/templates/core/user_tools.jinja:180 #: core/templates/core/base.jinja:187 core/templates/core/user_tools.jinja:118
msgid "Elections" msgid "Elections"
msgstr "Élections" msgstr "Élections"