staxriver
/
padel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update htmls

Browse Source
prod
Razmig Sarkissian 2 years ago
parent 504ed753a9
commit 3b2bd877a6
5 changed files with 39 additions and 19 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      scores/templates/scores/club.html
  2. 12
      scores/templates/scores/teams.html
  3. 24
      scores/templates/scores/tournament.html
  4. 4
      scores/urls.py
  5. 12
      scores/views.py

6
scores/templates/scores/club.html
Unescape View File

@ -22,7 +22,11 @@
<div class="sbig"> <div class="sbig">
<ul> <ul>
<li><a href="/club/{{ tournament.club.name }}/tournoi/{{ tournament.id }}/">{{ tournament.name }}</a> | <a href="/club/{{ tournament.club.name }}/tournoi/{{ tournament.id }}/equipes">Équipes</a></li> {% if tv %}
<li><a href="/tv/club/{{ tournament.club.name }}/tournoi/{{ tournament.id }}/">{{ tournament.name }}</a> | <a href="/tv/club/{{ tournament.club.name }}/tournoi/{{ tournament.id }}/equipes">Équipes</a></li>
{% else %}
<li><a href="/club/{{ tournament.club.name }}/tournoi/{{ tournament.id }}/">{{ tournament.name }}</a> | <a href="/club/{{ tournament.club.name }}/tournoi/{{ tournament.id }}/equipes">Équipes</a></li>
{% endif %}
</ul> </ul>
</div> </div>
{% endfor %} {% endfor %}

12
scores/templates/scores/teams.html
Unescape View File

@ -54,13 +54,21 @@
{% endif %} {% endif %}
{% if tournament.club.header %} {% if tournament.club.header %}
<header class="scenter"><a href="/club/{{ tournament.club.name }}/">{{ tournament.club.header }}</a></header> {% if tv %}
<header class="scenter"><a href="/tv/club/{{ tournament.club.name }}/">{{ tournament.club.header }}</a></header>
{% else %}
<header class="scenter"><a href="/club/{{ tournament.club.name }}/">{{ tournament.club.header }}</a></header>
{% endif %}
{% endif %} {% endif %}
<main class="page-body"> <main class="page-body">
{% autoescape off %} {% autoescape off %}
<div class="scenter"> <div class="scenter">
<h3><a href="/club/{{ tournament.club.name }}/tournoi/{{ tournament.id }}">{{ tournament.name }}</a> {% if tv %}
<h3><a href="tv/club/{{ tournament.club.name }}/tournoi/{{ tournament.id }}">{{ tournament.name }}</a>
{% else %}
<h3><a href="/club/{{ tournament.club.name }}/tournoi/{{ tournament.id }}">{{ tournament.name }}</a>
{% endif %}
</div> </div>
<div class="scontainer"> <div class="scontainer">

24
scores/templates/scores/tournament.html
Unescape View File

@ -60,14 +60,18 @@
<div class="center"> <div class="center">
<h1>{{ tournament.name }}</h1> <h1>{{ tournament.name }}</h1>
<div> <div>
<h3><a href="/club/{{ tournament.club.name }}/">{{ tournament.club.name }}</a> | <a href="/club/{{ tournament.club.name }}/tournoi/{{ tournament.id }}/equipes/">Équipes</a><h3> {% if tv %}
</div> <h3><a href="/tv/club/{{ tournament.club.name }}/">{{ tournament.club.name }}</a> | <a href="/tv/club/{{ tournament.club.name }}/tournoi/{{ tournament.id }}/equipes/">Équipes</a><h3>
{% else %}
<h3><a href="/club/{{ tournament.club.name }}/">{{ tournament.club.name }}</a> | <a href="/club/{{ tournament.club.name }}/tournoi/{{ tournament.id }}/equipes/">Équipes</a><h3>
{% endif %}
</div>
</div> </div>
{% for match in live_matches %} {% for match in live_matches %}
<div class="match"> <div class="match">
<div style="width: 100%;"> <div style="width: 100%;">
<div style="float: left;"> <div style="float: left;">
<h3>{{ match.title }}</h3> <h3>{{ match.title|default:"Match" }}</h3>
</div> </div>
{% if match.isMatch or match.isBracket %} {% if match.isMatch or match.isBracket %}
{% if match.isMatch %} {% if match.isMatch %}
@ -84,10 +88,6 @@
<div style="float: right;"> <div style="float: right;">
<h3><a href="/match/{{ match.id }}/">STATISTIQUES</a><h3> <h3><a href="/match/{{ match.id }}/">STATISTIQUES</a><h3>
</div> </div>
{% else %}
<div style="float: right;">
<h3><a href="/match/{{ match.id }}/">#{{ match.court }}</a><h3>
</div>
{% endif %} {% endif %}
{% endif %} {% endif %}
@ -145,7 +145,7 @@
{% endif %} {% endif %}
<!-- <p id="demo"></p> --> <!-- <p id="demo"></p> -->
{% if match.isMatch or match.isBracket %} {% if not match.isStatistic %}
<p class="duration"> <p class="duration">
<div class="small"> {{ match.durationPrefix }}</div> <div class="small"> {{ match.durationPrefix }}</div>
<div class="big">{{ match.duration }}</div> <div class="big">{{ match.duration }}</div>
@ -160,7 +160,7 @@
<div style="width: 100%;"> <div style="width: 100%;">
<div style="float: left;"> <div style="float: left;">
<h3>{{ match.title }}</h3> <h3>{{ match.title|default:"Match" }}</h3>
</div> </div>
{% if match.isMatch or match.isBracket %} {% if match.isMatch or match.isBracket %}
{% if match.isMatch %} {% if match.isMatch %}
@ -177,10 +177,6 @@
<div style="float: right;"> <div style="float: right;">
<h3><a href="/match/{{ match.id }}/">STATISTIQUES</a><h3> <h3><a href="/match/{{ match.id }}/">STATISTIQUES</a><h3>
</div> </div>
{% else %}
<div style="float: right;">
<h3><a href="/match/{{ match.id }}/">#{{ match.court }}</a><h3>
</div>
{% endif %} {% endif %}
{% endif %} {% endif %}
@ -238,7 +234,7 @@
{% endif %} {% endif %}
{% if match.isMatch or match.isBracket %} {% if not match.isStatistic %}
<p class="duration"> <p class="duration">
<div class="small"> {{ match.durationPrefix }}</div> <div class="small"> {{ match.durationPrefix }}</div>
<div class="big">{{ match.duration }}</div> <div class="big">{{ match.duration }}</div>

4
scores/urls.py
Unescape View File

@ -22,13 +22,13 @@ urlpatterns = [
path('match/<int:match_id>/', views.match, name='match'), path('match/<int:match_id>/', views.match, name='match'),
path('tv/match/<int:match_id>/', views.match_tv, name='match'), path('tv/match/<int:match_id>/', views.match_tv, name='match'),
path('tv/club/<str:club_name>/<int:tournament_id>/equipes/', views.tv_teams_club_name_tournament, name='teams'), path('tv/club/<str:club_name>/tournoi/<int:tournament_id>/equipes/', views.tv_teams_club_name_tournament, name='teams'),
path('tv/tournoi/<str:tournament_shortname>/equipes/', views.tv_teams_tournament_name, name='teams'), path('tv/tournoi/<str:tournament_shortname>/equipes/', views.tv_teams_tournament_name, name='teams'),
path('tv/club/<str:club_name>/<str:tournament_shortname>/equipes/', views.tv_teams_club_name_tournament_name, name='teams'), path('tv/club/<str:club_name>/<str:tournament_shortname>/equipes/', views.tv_teams_club_name_tournament_name, name='teams'),
path('tv/', views.index, name='index'), path('tv/', views.index, name='index'),
path('tv/tournoi/<str:tournament_shortname>/', views.tv_tournament_name, name='tournament'), path('tv/tournoi/<str:tournament_shortname>/', views.tv_tournament_name, name='tournament'),
path('tv/club/<str:club_name>/', views.club_name, name='club'), path('tv/club/<str:club_name>/', views.tv_club_name, name='club'),
path('tv/club/<str:club_name>/tournoi/<int:tournament_id>/', views.tv_club_name_tournament, name='tournament'), path('tv/club/<str:club_name>/tournoi/<int:tournament_id>/', views.tv_club_name_tournament, name='tournament'),
path('tv/club/<str:club_name>/<str:tournament_shortname>/', views.tv_club_name_tournament_name, name='tournament'), path('tv/club/<str:club_name>/<str:tournament_shortname>/', views.tv_club_name_tournament_name, name='tournament'),

12
scores/views.py
Unescape View File

@ -41,6 +41,18 @@ def club_name(request, club_name):
} }
return HttpResponse(template.render(context, request)) return HttpResponse(template.render(context, request))
def tv_club_name(request, club_name):
club = get_object_or_404(Club, name__iexact=club_name.lower())
tournaments = Tournament.objects.filter(club=club.id)
template = loader.get_template('scores/club.html')
context = {
'club': club,
'tournaments': tournaments,
'tv': True,
}
return HttpResponse(template.render(context, request))
def tournament_name(request, tournament_shortname): def tournament_name(request, tournament_shortname):
tournamentFound = Tournament.objects.filter(shortname__iexact=tournament_shortname.lower()).first() tournamentFound = Tournament.objects.filter(shortname__iexact=tournament_shortname.lower()).first()
return tournament(request, tournamentFound.id) return tournament(request, tournamentFound.id)

Write Preview
Loading…
Cancel
Save