Merge branch 'master' of github.com:jamesturk/fowl
This commit is contained in:
commit
f771d608f8
@ -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>
|
||||
@ -45,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>
|
||||
|
@ -7,7 +7,7 @@
|
||||
<h1>Roster</h1>
|
||||
<p class="lead">The WWE Roster</p>
|
||||
</header>
|
||||
<br><br><br>
|
||||
<br>
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user