Switch to unified view

a/Allura/allura/templates/login.html b/Allura/allura/templates/login.html
...
...
4
{% block title %}Login Form{% endblock %}
4
{% block title %}Login Form{% endblock %}
5
5
6
{% block header %}Login{% endblock %}
6
{% block header %}Login{% endblock %}
7
7
8
{% block content %}
8
{% block content %}
9
        <div id="loginform">
9
<div id="loginform">
10
          <form action="/auth/do_login" method="post" class="loginfields">
11
            <input type="hidden" name="return_to" value="{{return_to}}"/>
12
            <h2><span>Password Login</span></h2>
10
  <h2><span>Password Login</span></h2>
13
            <label for="username" class="grid-4">Username:</label>
11
  {{ c.form.display(action='./do_login', value=dict(return_to=return_to)) }}
14
            <div class="grid-18"><input type="text" id="username" name="username"/></div>
12
</div>
15
            <label for="password" class="grid-4">Password:</label>
16
            <div class="grid-18"><input type="password" id="password" name="password"/></div>
17
            <label class="grid-4">&nbsp;</label>
18
            <div class="grid-18"><input type="submit" id="submit" value="Login"/></div>
19
          </form>
20
        </div>
21
13
22
        <div class="clear">&nbsp;</div>
14
        <div class="clear">&nbsp;</div>
23
        
15
        
24
        <div id="loginform_oid">
16
        <div id="loginform_oid">
25
          <form action="/auth/login_verify_oid" method="post" class="loginfields">
17
          <form action="/auth/login_verify_oid" method="post" class="loginfields">