mirror of
				https://github.com/ae-utbm/sith.git
				synced 2025-11-04 02:53:06 +00:00 
			
		
		
		
	Merge branch 'master' into taiste
# Conflicts: # eboutic/templates/eboutic/eboutic_main.jinja # locale/fr/LC_MESSAGES/django.po
This commit is contained in:
		@@ -90,6 +90,24 @@
 | 
			
		||||
                </div>
 | 
			
		||||
            {% 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 category, items in priority_groups.list|groupby('category') %}
 | 
			
		||||
                    {% if items|count > 0 %}
 | 
			
		||||
@@ -104,11 +122,13 @@
 | 
			
		||||
                            </div>
 | 
			
		||||
                            <div class="product-group">
 | 
			
		||||
                                {% 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 %}
 | 
			
		||||
                                            <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 %}
 | 
			
		||||
                                            <i class="fa fa-2x fa-picture-o product-image" ></i>
 | 
			
		||||
                                            <i class="fa fa-2x fa-picture-o product-image"></i>
 | 
			
		||||
                                        {% endif %}
 | 
			
		||||
                                        <div class="product-description">
 | 
			
		||||
                                            <h4>{{ p.name }}</h4>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user