From 708b1c943c636eefaeb491e30f5a8339905471c1 Mon Sep 17 00:00:00 2001 From: Yuval Adam Date: Thu, 10 Mar 2011 13:09:17 +0200 Subject: borders and shit --- main/views.py | 4 ++-- media/css/base.css | 7 +++++++ settings.py | 8 ++++---- templates/main.html | 8 ++++---- test.db | Bin 83968 -> 83968 bytes 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/main/views.py b/main/views.py index 6400d59..56c1394 100644 --- a/main/views.py +++ b/main/views.py @@ -9,7 +9,7 @@ from random import randint import json def index(request): - matches = Match.objects.all().order_by('-date')[0:5] + matches = Match.objects.all().order_by('-date')[0:7] players = Player.objects.all().order_by('name') return render_to_response('main.html', {'matches' : matches, 'players' : players}, context_instance=RequestContext(request)) @@ -41,4 +41,4 @@ def match(request): def test(request): matches = Match.objects.all().order_by('date') - return HttpResponse(json.dumps(matches)) \ No newline at end of file + return HttpResponse(json.dumps(matches)) diff --git a/media/css/base.css b/media/css/base.css index 1d22596..3532fad 100644 --- a/media/css/base.css +++ b/media/css/base.css @@ -15,6 +15,13 @@ height: 120px; } +.pic { + padding: 1px; + border: 1px solid #AAA; + width: 75px; + height: 75px; +} + #title { display: inline; } diff --git a/settings.py b/settings.py index 4302900..e30b511 100644 --- a/settings.py +++ b/settings.py @@ -13,10 +13,10 @@ ADMINS = ( MANAGERS = ADMINS -DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. -DATABASE_NAME = 'test.db' # Or path to database file if using sqlite3. -DATABASE_USER = '' # Not used with sqlite3. -DATABASE_PASSWORD = '' # Not used with sqlite3. +DATABASE_ENGINE = 'mysql' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. +DATABASE_NAME = 'top7fooz' # Or path to database file if using sqlite3. +DATABASE_USER = 'fooz' # Not used with sqlite3. +DATABASE_PASSWORD = 'fooz' # Not used with sqlite3. DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. diff --git a/templates/main.html b/templates/main.html index ff1f912..2527fcd 100644 --- a/templates/main.html +++ b/templates/main.html @@ -40,11 +40,11 @@
- {% if m.player3 %}{% else %}bla{% endif %} + {% if m.player3 %}
{% else %}bla{% endif %}
- +
@@ -66,11 +66,11 @@
- +
- {% if m.player4 %}{% else %}bla{% endif %} + {% if m.player4 %}
{% else %}bla{% endif %}
diff --git a/test.db b/test.db index 0765b1d..7f29ac7 100644 Binary files a/test.db and b/test.db differ -- cgit v1.3.1