From 1015a14b5dde6e2151515e79ce332db61b6a54b9 Mon Sep 17 00:00:00 2001
From: Erin Braswell <erin.braswell@gmail.com>
Date: Mon, 28 May 2012 13:36:32 -0400
Subject: [PATCH 1/2] fixed the margin for the other tag
---
fowl/game/templates/base.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/fowl/game/templates/base.html b/fowl/game/templates/base.html
index 01c2d34..f5b0ad3 100644
--- a/fowl/game/templates/base.html
+++ b/fowl/game/templates/base.html
@@ -19,6 +19,7 @@
.raw { float: right; margin-right:12em; background-color: #900000;}
.divas { float: right; margin-right:11em; background-color: #900099;}
.smackdown { float: right; margin-right:8em; background-color: #003090;}
+ .other { float: right; margin-right:11em; }
.score-container { float: right; margin-right:20em;}
.nav { font-size: 120%; padding: 4px 0px;}
</style>
From 3c180df80e152b6222887f75027c1ed9983ce22a Mon Sep 17 00:00:00 2001
From: Erin Braswell <erin.braswell@gmail.com>
Date: Mon, 28 May 2012 13:53:43 -0400
Subject: [PATCH 2/2] updated the menu bar to include roster
---
fowl/game/templates/base.html | 1 +
fowl/game/templates/roster.html | 2 +-
fowl/game/views.py | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/fowl/game/templates/base.html b/fowl/game/templates/base.html
index f5b0ad3..e0a38e0 100644
--- a/fowl/game/templates/base.html
+++ b/fowl/game/templates/base.html
@@ -46,6 +46,7 @@
<ul class="nav">
<li {% if view == "league" %}class="active"{%endif%}><a href="{% url league 1 %}">League</a></li>
<li {% if view == "events" %}class="active"{%endif%}><a href="{% url events 1 %}">Events</a></li>
+ <li {% if view == "roster" %}class="active"{%endif%}><a href="{% url roster %}">Roster</a></li>
</ul>
</div><!--/.nav-collapse -->
</div>
diff --git a/fowl/game/templates/roster.html b/fowl/game/templates/roster.html
index e0902cb..9d57c73 100644
--- a/fowl/game/templates/roster.html
+++ b/fowl/game/templates/roster.html
@@ -7,7 +7,7 @@
<h1>Roster</h1>
<p class="lead">The WWE Roster</p>
</header>
-<br><br><br>
+<br>
<table class="table">
<thead>
<tr>
diff --git a/fowl/game/views.py b/fowl/game/views.py
index b4d22e2..fec29e9 100644
--- a/fowl/game/views.py
+++ b/fowl/game/views.py
@@ -45,6 +45,7 @@ def league(request, league_id):
def roster(request):
context = {
- 'stars': Star.objects.all()
+ 'stars': Star.objects.all(),
+ 'view': 'roster'
}
return render(request, "roster.html", context)