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-29 01:08:38 -04:00
commit 29543f8b1c
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@
.other { float: right; margin-right:11em; } .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;}
.nav.pull-right { font-size: 120%; padding: 4px 0px;}
.matchform { border: 1px solid black; } .matchform { border: 1px solid black; }
</style> </style>
<link href="{% static "assets/css/bootstrap-responsive.css" %}" rel="stylesheet"> <link href="{% static "assets/css/bootstrap-responsive.css" %}" rel="stylesheet">
@ -54,12 +55,14 @@
{% endfor %} {% endfor %}
</ul> </ul>
</li> </li>
<li {% if view == "league" %}class="active"{%endif%}><a href="{% url league league.id %}">League</a></li> <li {% if view == "league" %}class="active"{%endif%}><a href="{% url league league.id %}">League</a></li>
<li {% if view == "events" %}class="active"{%endif%}><a href="{% url events league.id %}">Events</a></li> <li {% if view == "events" %}class="active"{%endif%}><a href="{% url events league.id %}">Events</a></li>
<li {% if view == "roster" %}class="active"{%endif%}><a href="{% url roster league.id %}">Roster</a></li> <li {% if view == "roster" %}class="active"{%endif%}><a href="{% url roster league.id %}">Roster</a></li>
{% endif %} {% endif %}
</ul> </ul>
<ul class='nav pull-right'>
<li><a href="#"> {{ user }} </a></li>
</ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
</div> </div>

17
fowl/templates/registration/login.html
View File

@ -6,18 +6,13 @@
<p>Your username and password didn't match. Please try again.</p> <p>Your username and password didn't match. Please try again.</p>
{% endif %} {% endif %}
<form method="post" action="."> <form class='well' method="post" action=".">
{% csrf_token %} {% csrf_token %}
<table>
<tr> <label>{{ form.username.label_tag }}</label>
<td>{{ form.username.label_tag }}</td> {{ form.username }}
<td>{{ form.username }}</td> <label>{{ form.password.label_tag }}</label>
</tr> {{ form.password }}
<tr>
<td>{{ form.password.label_tag }}</td>
<td>{{ form.password }}</td>
</tr>
</table>
<input type="submit" value="login" /> <input type="submit" value="login" />
<input type="hidden" name="next" value="{{ next }}" /> <input type="hidden" name="next" value="{{ next }}" />