encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-27 08:50:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tomchristie/django-rest-framework

Browse Source
This commit is contained in:
Tom Christie 2013-05-14 21:41:39 +01:00
commit 2f54decd3e
2 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/topics/credits.md
View File

@ -122,6 +122,7 @@ The following people have helped make REST framework great.
* Daniel Hepper - [dhepper] * Daniel Hepper - [dhepper]
* Hamish Campbell - [hamishcampbell] * Hamish Campbell - [hamishcampbell]
* Marlon Bailey - [avinash240] * Marlon Bailey - [avinash240]
* James Summerfield - [jsummerfield]
Many thanks to everyone who's contributed to the project. Many thanks to everyone who's contributed to the project.
@ -280,3 +281,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
[dhepper]: https://github.com/dhepper [dhepper]: https://github.com/dhepper
[hamishcampbell]: https://github.com/hamishcampbell [hamishcampbell]: https://github.com/hamishcampbell
[avinash240]: https://github.com/avinash240 [avinash240]: https://github.com/avinash240
[jsummerfield]: https://github.com/jsummerfield

68
rest_framework/templates/rest_framework/login_base.html
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>
<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><!-- /row fluid -->
</div><!--/span-->
</div><!-- /.row-fluid --> <div class="row-fluid">
</div> <div>
<form action="{% url 'rest_framework:login' %}" class=" form-inline" method="post">
</div> {% 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><!-- /.row-fluid -->
</div><!--/.well-->
</div><!-- /.row-fluid -->
</div><!-- /.container-fluid -->
</body> </body>
</html> </html>