jpt-archive/fowl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
James Turk 2012-05-28 19:35:59 -04:00
commit 46ec093e0d
3 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fowl/game/templates/base.html
View file

@ -44,9 +44,17 @@
<a class="brand" href="#"><img src="{% static "images/duck.png" %}" width="30" height="30"> </a> <a class="brand" href="#"><img src="{% static "images/duck.png" %}" width="30" height="30"> </a>
<div class="nav-collapse"> <div class="nav-collapse">
<ul class="nav"> <ul class="nav">
<li {% if view == "league" %}class="active"{%endif%}><a href="{% url league 1 %}">League</a></li> <li class="dropdown">
<li {% if view == "events" %}class="active"{%endif%}><a href="{% url events 1 %}">Events</a></li> <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{league}}<b class="caret"></b></a>
<li {% if view == "roster" %}class="active"{%endif%}><a href="{% url roster %}">Roster</a></li> <ul class="dropdown-menu">
{% for league in leagues %}
<li><a href="{% url league league.id %}">{{league}}</a></li>
{% endfor %}
</ul>
</li>
<li {% if view == "league" %}class="active"{%endif%}><a href="{% url league league.id %}">League</a></li>
<li {% if view == "events" %}class="active"{%endif%}><a href="{% url events league.id %}">Events</a></li>
<li {% if view == "roster" %}class="active"{%endif%}><a href="{% url roster league.id %}">Roster</a></li>
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
@ -66,6 +74,7 @@
<script src="{% static "js/jquery.js" %}"></script> <script src="{% static "js/jquery.js" %}"></script>
<script src="{% static "js/bootstrap-collapse.js" %}"></script> <script src="{% static "js/bootstrap-collapse.js" %}"></script>
<script src="{% static "js/bootstrap-dropdown.js" %}"></script>
<!-- <!--
<script src="assets/js/bootstrap-transition.js"></script> <script src="assets/js/bootstrap-transition.js"></script>
<script src="assets/js/bootstrap-alert.js"></script> <script src="assets/js/bootstrap-alert.js"></script>

3
fowl/game/urls.py
View file

@ -7,5 +7,6 @@ urlpatterns = patterns('',
name='league'), name='league'),
url(r'^edit_event/(?P<event>\d+|new)/$', 'fowl.game.views.edit_event', url(r'^edit_event/(?P<event>\d+|new)/$', 'fowl.game.views.edit_event',
name='edit_event'), name='edit_event'),
url(r'^roster/$', 'fowl.game.views.roster', name='roster'), url(r'^roster/(?P<league_id>\d+)/$', 'fowl.game.views.roster',
name='roster'),
) )

20
fowl/game/views.py
View file

@ -1,10 +1,12 @@
from itertools import izip_longest from itertools import izip_longest
from collections import defaultdict from collections import defaultdict
from django.shortcuts import render, get_object_or_404 from django.shortcuts import render, get_object_or_404
from fowl.game.models import Team, TeamPoints, Star, Event, OUTCOMES, TITLES from fowl.game.models import (Team, TeamPoints, Star, Event, League,
OUTCOMES, TITLES)
def events(request, league_id): def events(request, league_id):
league = get_object_or_404(League, pk = league_id)
events = {} events = {}
points = TeamPoints.objects.filter(team__league_id=league_id).order_by( points = TeamPoints.objects.filter(team__league_id=league_id).order_by(
'match', 'team').select_related() 'match', 'team').select_related()
@ -19,7 +21,7 @@ def events(request, league_id):
events[event_id].scores.setdefault(tp.team, 0) events[event_id].scores.setdefault(tp.team, 0)
events[event_id].scores[tp.team] += tp.points events[event_id].scores[tp.team] += tp.points
events = sorted(events.values(), key=lambda x: x.date, reverse=True) events = sorted(events.values(), key=lambda x: x.date, reverse=True)
return render(request, "events.html", {'events': events, 'view': 'events'}) return render(request, "events.html", {'events': events, 'view': 'events', 'league': league})
def edit_event(request, event): def edit_event(request, event):
@ -61,9 +63,13 @@ def edit_event(request, event):
) )
def league(request, league_id): def league(request, league_id):
league = get_object_or_404(League, pk = league_id)
leagues = League.objects.all()
context = { context = {
'view': 'league', 'view': 'league',
'belts': ['ic', 'us', 'heavyweight', 'wwe'] 'belts': ['ic', 'us', 'heavyweight', 'wwe'],
'league': league,
'leagues': leagues
} }
teams = list(Team.objects.filter(league__id=league_id) teams = list(Team.objects.filter(league__id=league_id)
.prefetch_related('stars')) .prefetch_related('stars'))
@ -73,9 +79,13 @@ def league(request, league_id):
return render(request, "stables.html", context) return render(request, "stables.html", context)
def roster(request): def roster(request, league_id):
league = get_object_or_404(League, pk = league_id)
leagues = League.objects.all()
context = { context = {
'stars': Star.objects.all(), 'stars': Star.objects.all(),
'view': 'roster' 'view': 'roster',
'league': league,
'leagues': leagues
} }
return render(request, "roster.html", context) return render(request, "roster.html", context)