jpt-archive/fowl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jamesturk/fowl

Browse Source
This commit is contained in:
James Turk 2012-05-28 14:06:57 -04:00
commit f771d608f8
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fowl/game/templates/base.html
View File

@ -19,6 +19,7 @@
.raw { float: right; margin-right:12em; background-color: #900000;} .raw { float: right; margin-right:12em; background-color: #900000;}
.divas { float: right; margin-right:11em; background-color: #900099;} .divas { float: right; margin-right:11em; background-color: #900099;}
.smackdown { float: right; margin-right:8em; background-color: #003090;} .smackdown { float: right; margin-right:8em; background-color: #003090;}
.other { float: right; margin-right:11em; }
.score-container { float: right; margin-right:20em;} .score-container { float: right; margin-right:20em;}
.nav { font-size: 120%; padding: 4px 0px;} .nav { font-size: 120%; padding: 4px 0px;}
</style> </style>
@ -45,6 +46,7 @@
<ul class="nav"> <ul class="nav">
<li {% if view == "league" %}class="active"{%endif%}><a href="{% url league 1 %}">League</a></li> <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 == "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> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>

2
fowl/game/templates/roster.html
View File

@ -7,7 +7,7 @@
<h1>Roster</h1> <h1>Roster</h1>
<p class="lead">The WWE Roster</p> <p class="lead">The WWE Roster</p>
</header> </header>
<br><br><br> <br>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>

3
fowl/game/views.py
View File

@ -45,6 +45,7 @@ def league(request, league_id):
def roster(request): def roster(request):
context = { context = {
'stars': Star.objects.all() 'stars': Star.objects.all(),
'view': 'roster'
} }
return render(request, "roster.html", context) return render(request, "roster.html", context)