Merge pull request #824 from jsummerfield/patch-1

Remove trailing unmatched </div> in login_base.html template. Reformat i...
This commit is contained in:
Tom Christie 2013-05-14 10:36:31 -07:00
commit dd3c434f6c

View File

@ -12,44 +12,40 @@
<body class="container"> <body class="container">
<div class="container-fluid" style="margin-top: 30px"> <div class="container-fluid" style="margin-top: 30px">
<div class="row-fluid">
<div class="well" style="width: 320px; margin-left: auto; margin-right: auto">
<div class="row-fluid"> <div class="row-fluid">
<div> <div class="well" style="width: 320px; margin-left: auto; margin-right: auto">
{% block branding %}<h3 style="margin: 0 0 20px;">Django REST framework</h3>{% endblock %} <div class="row-fluid">
</div> <div>
</div><!-- /row fluid --> {% block branding %}<h3 style="margin: 0 0 20px;">Django REST framework</h3>{% endblock %}
<div class="row-fluid">
<div>
<form action="{% url 'rest_framework:login' %}" class=" form-inline" method="post">
{% csrf_token %}
<div id="div_id_username" class="clearfix control-group">
<div class="controls">
<Label class="span4">Username:</label>
<input style="height: 25px" type="text" name="username" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_username">
</div>
</div> </div>
<div id="div_id_password" class="clearfix control-group"> </div><!-- /row fluid -->
<div class="controls">
<Label class="span4">Password:</label> <div class="row-fluid">
<input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_password"> <div>
</div> <form action="{% url 'rest_framework:login' %}" class=" form-inline" method="post">
{% csrf_token %}
<div id="div_id_username" class="clearfix control-group">
<div class="controls">
<Label class="span4">Username:</label>
<input style="height: 25px" type="text" name="username" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_username">
</div>
</div>
<div id="div_id_password" class="clearfix control-group">
<div class="controls">
<Label class="span4">Password:</label>
<input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_password">
</div>
</div>
<input type="hidden" name="next" value="{{ next }}" />
<div class="form-actions-no-box">
<input type="submit" name="submit" value="Log in" class="btn btn-primary" id="submit-id-submit">
</div>
</form>
</div> </div>
<input type="hidden" name="next" value="{{ next }}" /> </div><!-- /.row-fluid -->
<div class="form-actions-no-box"> </div><!--/.well-->
<input type="submit" name="submit" value="Log in" class="btn btn-primary" id="submit-id-submit"> </div><!-- /.row-fluid -->
</div> </div><!-- /.container-fluid -->
</form>
</div>
</div><!-- /row fluid -->
</div><!--/span-->
</div><!-- /.row-fluid -->
</div>
</div>
</body> </body>
</html> </html>