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

fowl/game/templates/base.html

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

fowl/templates/registration/login.html

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