Browse Source

Boton de publicar

politica
Celestino Rey 1 year ago
parent
commit
a6d8417bb9
5 changed files with 16 additions and 10 deletions
  1. +1
    -1
      JugarAlPadel/K8S/Makefile
  2. +1
    -1
      JugarAlPadel/K8S/Makefile.local
  3. +5
    -5
      JugarAlPadel/gestion_reservas/templates/base.html
  4. +1
    -1
      JugarAlPadel/gestion_reservas/templates/eventos/detalle_evento.html
  5. +8
    -2
      JugarAlPadel/gestion_reservas/templates/eventos/lista_eventos.html

+ 1
- 1
JugarAlPadel/K8S/Makefile View File

@ -2,7 +2,7 @@ export ARQUITECTURA := $(shell lscpu |grep itectur | tr -d ' '| cut -f2 -d':')
#export REGISTRY=localhost:5000 #export REGISTRY=localhost:5000
export REGISTRY=registry.reymota.es export REGISTRY=registry.reymota.es
export IMG_VERSION = 0.26
export IMG_VERSION = 0.27
export IMG_NGINX_VERSION = 2.3 export IMG_NGINX_VERSION = 2.3
# limpia todo # limpia todo


+ 1
- 1
JugarAlPadel/K8S/Makefile.local View File

@ -2,7 +2,7 @@ export ARQUITECTURA := $(shell lscpu |grep itectur | tr -d ' '| cut -f2 -d':')
export REGISTRY=localhost:30500 export REGISTRY=localhost:30500
#export REGISTRY=registry.reymota.es #export REGISTRY=registry.reymota.es
export IMG_VERSION = 0.84
export IMG_VERSION = 0.89
export IMG_NGINX_VERSION = 2.4 export IMG_NGINX_VERSION = 2.4
# limpia todo # limpia todo


+ 5
- 5
JugarAlPadel/gestion_reservas/templates/base.html View File

@ -91,7 +91,7 @@
<ul class="app-menu list-unstyled accordion" id="menu-accordion"> <ul class="app-menu list-unstyled accordion" id="menu-accordion">
<li class="nav-item"> <li class="nav-item">
<!--//Bootstrap Icons: https://icons.getbootstrap.com/ --> <!--//Bootstrap Icons: https://icons.getbootstrap.com/ -->
<a class="nav-link active" href="{% url 'principal' %}">
<a class="nav-link active" href="{% url 'eventos:lista_eventos' %}">
<span class="nav-icon"> <span class="nav-icon">
<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-house-door" fill="currentColor" xmlns="http://www.w3.org/2000/svg"> <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-house-door" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" d="M7.646 1.146a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 .146.354v7a.5.5 0 0 1-.5.5H9.5a.5.5 0 0 1-.5-.5v-4H7v4a.5.5 0 0 1-.5.5H2a.5.5 0 0 1-.5-.5v-7a.5.5 0 0 1 .146-.354l6-6zM2.5 7.707V14H6v-4a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 .5.5v4h3.5V7.707L8 2.207l-5.5 5.5z"/> <path fill-rule="evenodd" d="M7.646 1.146a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 .146.354v7a.5.5 0 0 1-.5.5H9.5a.5.5 0 0 1-.5-.5v-4H7v4a.5.5 0 0 1-.5.5H2a.5.5 0 0 1-.5-.5v-7a.5.5 0 0 1 .146-.354l6-6zM2.5 7.707V14H6v-4a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 .5.5v4h3.5V7.707L8 2.207l-5.5 5.5z"/>
@ -172,13 +172,13 @@
<script src="{% static 'plugins/popper.min.js' %}"></script> <script src="{% static 'plugins/popper.min.js' %}"></script>
<script src="{% static 'plugins/bootstrap/js/bootstrap.min.js' %}"></script> <script src="{% static 'plugins/bootstrap/js/bootstrap.min.js' %}"></script>
<!-- Charts JS -->
<!-- Charts JS
<script src="{% static 'plugins/chart.js/chart.min.js' %}"></script> <script src="{% static 'plugins/chart.js/chart.min.js' %}"></script>
<script src="{% static 'js/index-charts.js' %}"></script> <script src="{% static 'js/index-charts.js' %}"></script>
<!-- La línea siguiente es para la demo de los charts en charts.html -->
-->
<!-- La línea siguiente es para la demo de los charts en charts.html
<script src="{% static 'js/charts-demo.js' %}"></script> <script src="{% static 'js/charts-demo.js' %}"></script>
-->
<!-- Page Specific JS --> <!-- Page Specific JS -->
<script src="{% static 'js/app.js' %}"></script> <script src="{% static 'js/app.js' %}"></script>


+ 1
- 1
JugarAlPadel/gestion_reservas/templates/eventos/detalle_evento.html View File

@ -52,7 +52,7 @@
{% endif %} {% endif %}
{% if user.is_staff and not evento.evento.publicado %} {% if user.is_staff and not evento.evento.publicado %}
<a class="btn btn-primary" href="{% url 'eventos:publicar_evento' evento.id %}">Publicar</a>
<a class="btn btn-danger" href="{% url 'eventos:publicar_evento' evento.id %}">Publicar</a>
{% endif %} {% endif %}
</div> </div>


+ 8
- 2
JugarAlPadel/gestion_reservas/templates/eventos/lista_eventos.html View File

@ -57,12 +57,13 @@
</ul> </ul>
</div> </div>
<div class="d-grid gap-2 d-md-block">
{% if not evento.inscrito %} {% if not evento.inscrito %}
{% if evento.plazas_restantes > 0 %} {% if evento.plazas_restantes > 0 %}
<a class="btn btn-primary" href="{% url 'eventos:reservar_evento' evento.id %}">Reservar</a>
<button class="btn btn-primary" href="{% url 'eventos:reservar_evento' evento.id %}">Reservar</button>
{% else %} {% else %}
{% if not evento.en_espera %} {% if not evento.en_espera %}
<a class="btn btn-warning" href="{% url 'eventos:apuntar_lista_espera' evento.evento.id %}">Lista de espera</a>
<button class="btn btn-warning" href="{% url 'eventos:apuntar_lista_espera' evento.evento.id %}">Lista de espera</button>
{% else %} {% else %}
<a class="fs-4"><p>Ya estás en la lista de espera.</p></a> <a class="fs-4"><p>Ya estás en la lista de espera.</p></a>
{% endif %} {% endif %}
@ -70,6 +71,11 @@
{% else %} {% else %}
<a class="fs-4"><p>Estás dentro.</p></a> <a class="fs-4"><p>Estás dentro.</p></a>
{% endif %} {% endif %}
{% if user.is_staff and not evento.evento.publicado %}
<button class="btn btn-danger" href="{% url 'eventos:publicar_evento' evento.id %}">Publicar</button>
{% endif %}
</div>
</div> </div>
</div> </div>
</div> </div>


Loading…
Cancel
Save