diff options
| author | Yuval Adam <yuv.adm@gmail.com> | 2011-01-20 22:54:18 +0200 |
|---|---|---|
| committer | Yuval Adam <yuv.adm@gmail.com> | 2011-01-20 22:54:18 +0200 |
| commit | dbfbfa95c205f556d102eb1cc5bf3b67a48d456a (patch) | |
| tree | 86a4adb848dd11a9729e0c5114213f5140a5f05a | |
| parent | 69d732e1c075b7646d3cb3bbf79acde42252dd90 (diff) | |
rc1
| -rw-r--r-- | main/views.py | 9 | ||||
| -rw-r--r-- | media/css/base.css | 45 | ||||
| -rw-r--r-- | media/img/foos.jpg | bin | 0 -> 5804 bytes | |||
| -rw-r--r-- | templates/main.html | 128 | ||||
| -rw-r--r-- | test.db | bin | 83968 -> 83968 bytes |
5 files changed, 135 insertions, 47 deletions
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 Binary files differnew file mode 100644 index 0000000..b56de44 --- /dev/null +++ b/media/img/foos.jpg 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 @@ <link rel="stylesheet" href="{{ MEDIA_URL }}css/bp/screen.css" type="text/css" media="screen, projection"/> <link rel="stylesheet" href="{{ MEDIA_URL }}css/bp/print.css" type="text/css" media="print"/> <!--[if IE]><link rel="stylesheet" href="{{ MEDIA_URL }}css/ie.css" type="text/css" media="screen, projection"/><![endif]--> - <link rel="stylesheet" href="{{ MEDIA_URL }}css/base.css" type="text/css" media="print"/> + <link rel="stylesheet" href="{{ MEDIA_URL }}css/base.css" type="text/css" media="screen"/> {% block extraCSS %}{% endblock %} <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script> <script type="text/javascript" src="{{ MEDIA_URL }}js/base.js"></script> {% block extraJS %}{% endblock %} - <title>{% block baseTitle %}Top7 Foozball League{% endblock %}{% block extraTitle %}{% endblock %}</title> + <title>{% block baseTitle %}Top7 Foosball League{% endblock %}{% block extraTitle %}{% endblock %}</title> </head> <body class="fullDoc"> <div id="fullWidthContainer" class="container"> {% block header %} - <h1>Top7 Foosball League</h1> + <div id="header" class="span-24 last"> + <div id="title" class="span-18"> + <img src="http://top7.com/css/layout/ui-assets/homepage/logoOnly.png"/> + <h1 id="title">Foosball League</h1> + </div> + <div id="headpic" class="span-6 last"> + <img src="{{ MEDIA_URL }}img/foos.jpg"/> + </div> + </div> {% endblock %} - <div id="matches" class="span-12 last"> - <h2>Games</h2> + <div id="matches" class="span-15"> + <h2>Latest Games</h2> + <hr/> {% block contentArea %} - <table> {% for m in matches%} - <tr> - <td>{{ m.player1 }}</td> - <td>{{ m.player2 }}</td> - <td>{{ m.player3 }}</td> - <td>{{ m.player4 }}</td> - <td>{{ m.score1 }}</td> - <td>{{ m.score2 }}</td> - <td>{{ m.date }}</td> - </tr> + <div class="match"> + <div class="scores span-10 last"> + <div class="side_a span-3"> + <span class="player">{{ m.player1 }}</span><br/> + <span class="player">{{ m.player3|default:'' }}</span> + </div> + + <div class="score_a span-2"> + <span class="score">{{ m.score1 }}</span> + </div> + <div class="score_b span-2"> + <span class="score">{{ m.score2 }}</span> + </div> + + <div class="side_b span-3 last"> + <span class="player">{{ m.player2 }}</span><br/> + <span class="player">{{ m.player4|default:'' }}</span> + </div> + </div> + <div class="metadata span-10 last"> + <span class="date">{{ m.date|date:'H:m, d M Y' }}</span> + <span class="comment">{{ m.comment }}</span> + </div> + </div> {% endfor %} - </table> {% endblock %} </div> - <div id="newmatch" class="span-12 last"> + <div id="newmatch" class="span-8 last"> <h2>New Match</h2> + <hr/> <form method="post" action="/match/"> - <select name="p1"> - <option value=" "> </option> - {% for p in players %} - <option value="{{ p.id }}">{{ p }}</option> - {% endfor %} - </select> - <select name="p2"> - <option value=" "> </option> - {% for p in players %} - <option value="{{ p.id }}">{{ p }}</option> - {% endfor %} - </select> - <select name="p3"> - <option value=" "> </option> - {% for p in players %} - <option value="{{ p.id }}">{{ p }}</option> - {% endfor %} - </select> - <select name="p4"> - <option value=" "> </option> - {% for p in players %} - <option value="{{ p.id }}">{{ p }}</option> - {% endfor %} - </select> - <input type="text" name="s1" width="5"/> - <input type="text" name="s2" width="5"/> - <input type="submit"> + <div class="span-4"> + <label>Player(s):</label><br/> + <select name="p1"> + <option value=" "> </option> + {% for p in players %} + <option value="{{ p.id }}">{{ p }}</option> + {% endfor %} + </select> + <select name="p3"> + <option value=" "> </option> + {% for p in players %} + <option value="{{ p.id }}">{{ p }}</option> + {% endfor %} + </select> + <label>Score:</label><br/> + <input type="text" name="s1" width="5"/> + </div> + <div class="span-4 last"> + <label>Player(s):</label><br/> + <select name="p2"> + <option value=" "> </option> + {% for p in players %} + <option value="{{ p.id }}">{{ p }}</option> + {% endfor %} + </select> + <select name="p4"> + <option value=" "> </option> + {% for p in players %} + <option value="{{ p.id }}">{{ p }}</option> + {% endfor %} + </select> + <label>Score:</label><br/> + <input type="text" name="s2" width="5"/> + </div> + + + <input type="submit" value="Submit"> </form> </div> - + <div id="standigs" class="span-8 last"> + <h2>Standings</h2> + <hr/> + <p>Coming soon!</p> + </div> + <hr> <div id="footer" class="span-24 last"> {% block footer %} {% endblock %} Binary files differ |
