From dbfbfa95c205f556d102eb1cc5bf3b67a48d456a Mon Sep 17 00:00:00 2001 From: Yuval Adam Date: Thu, 20 Jan 2011 22:54:18 +0200 Subject: rc1 --- main/views.py | 9 +++- media/css/base.css | 45 ++++++++++++++++++ media/img/foos.jpg | Bin 0 -> 5804 bytes templates/main.html | 128 ++++++++++++++++++++++++++++++++++------------------ test.db | Bin 83968 -> 83968 bytes 5 files changed, 135 insertions(+), 47 deletions(-) create mode 100644 media/img/foos.jpg diff --git a/main/views.py b/main/views.py index 3dc9fd4..6400d59 100644 --- a/main/views.py +++ b/main/views.py @@ -4,12 +4,13 @@ from django.template import RequestContext from fooz.main.models import Player, Match from datetime import datetime +from random import randint import json def index(request): - matches = Match.objects.all().order_by('date') - players = Player.objects.all() + matches = Match.objects.all().order_by('-date')[0:5] + players = Player.objects.all().order_by('name') return render_to_response('main.html', {'matches' : matches, 'players' : players}, context_instance=RequestContext(request)) def match(request): @@ -28,6 +29,10 @@ def match(request): s2 = int(request.POST.get('s2')) if None not in (p1, p2, s1, s2): + if randint(0,1): + p1, p2 = p2, p1 + p3, p4 = p4, p3 + s1, s2 = s2, s1 date = datetime.now() match = Match(player1=p1, player2=p2, player3=p3, player4=p4, score1=s1, score2=s2, date=date) match.save() diff --git a/media/css/base.css b/media/css/base.css index e69de29..1d22596 100644 --- a/media/css/base.css +++ b/media/css/base.css @@ -0,0 +1,45 @@ +#headpic { + text-align: right; +} + +#newmatch { + background-color: #B5CFFF; + padding: 10px; +} + +#matches { + padding: 10px; +} + +.match { + height: 120px; +} + +#title { + display: inline; +} + +.side_a { + text-align: right; +} + +.score_a { + text-align: center; +} + +.score_b { + text-align: center; +} + +.player { + font-size: 1.4em; +} + +.score { + font-size: 2em; + vertical-align: top; +} + +.metadata { + text-align: center; +} diff --git a/media/img/foos.jpg b/media/img/foos.jpg new file mode 100644 index 0000000..b56de44 Binary files /dev/null and b/media/img/foos.jpg differ diff --git a/templates/main.html b/templates/main.html index 4a2a3c1..06124aa 100644 --- a/templates/main.html +++ b/templates/main.html @@ -7,74 +7,112 @@ - + {% block extraCSS %}{% endblock %} {% block extraJS %}{% endblock %} - {% block baseTitle %}Top7 Foozball League{% endblock %}{% block extraTitle %}{% endblock %} + {% block baseTitle %}Top7 Foosball League{% endblock %}{% block extraTitle %}{% endblock %}
{% block header %} -

Top7 Foosball League

+ {% endblock %} -
-

Games

+
+

Latest Games

+
{% block contentArea %} - {% for m in matches%} - - - - - - - - - +
+
+
+ {{ m.player1 }}
+ {{ m.player3|default:'' }} +
+ +
+ {{ m.score1 }} +
+
+ {{ m.score2 }} +
+ +
+ {{ m.player2 }}
+ {{ m.player4|default:'' }} +
+
+
+ {{ m.date|date:'H:m, d M Y' }} + {{ m.comment }} +
+
{% endfor %} -
{{ m.player1 }}{{ m.player2 }}{{ m.player3 }}{{ m.player4 }}{{ m.score1 }}{{ m.score2 }}{{ m.date }}
{% endblock %}
-
+

New Match

+
- - - - - - - +
+
+ + +
+ +
+
+
+ + +
+ +
+ + +
- +
+

Standings

+
+

Coming soon!

+
+