encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-04-28 21:13:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2187 from loic/cosmetic_fixes

Browse Source 
Cosmetic fixes in the API browser HTML.
This commit is contained in:
Tom Christie 2014-12-08 09:07:57 +00:00
commit b440bd74be
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest_framework/static/rest_framework/js/default.js
View File

@ -24,7 +24,8 @@ prettyPrint();
// Bootstrap tooltips. // Bootstrap tooltips.
$('.js-tooltip').tooltip({ $('.js-tooltip').tooltip({
delay: 1000 delay: 1000,
container: 'body'
}); });
// Deal with rounded tab styling after tab clicks. // Deal with rounded tab styling after tab clicks.

23
rest_framework/templates/rest_framework/login_base.html
View File

@ -21,11 +21,11 @@
{% csrf_token %} {% csrf_token %}
<div id="div_id_username" <div id="div_id_username"
class="clearfix control-group {% if form.username.errors %}error{% endif %}"> class="clearfix control-group {% if form.username.errors %}error{% endif %}">
<div class="controls"> <div class="form-group">
<label class="span4">Username:</label> <label for="id_username">Username:</label>
<input style="height: 25px" type="text" name="username" maxlength="100" <input type="text" name="username" maxlength="100"
autocapitalize="off" autocapitalize="off"
autocorrect="off" class="span12 textinput textInput" autocorrect="off" class="form-control textinput textInput"
id="id_username" required id="id_username" required
{% if form.username.value %}value="{{ form.username.value }}"{% endif %}> {% if form.username.value %}value="{{ form.username.value }}"{% endif %}>
{% if form.username.errors %} {% if form.username.errors %}
@ -36,12 +36,11 @@
</div> </div>
</div> </div>
<div id="div_id_password" <div id="div_id_password"
class="clearfix control-group {% if form.password.errors %}error{% endif %}" class="clearfix control-group {% if form.password.errors %}error{% endif %}">
style="margin-top: 10px"> <div class="form-group">
<div class="controls"> <label for="id_password">Password:</label>
<label class="span4">Password:</label> <input type="password" name="password" maxlength="100"
<input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="form-control textinput textInput"
autocapitalize="off" autocorrect="off" class="span12 textinput textInput"
id="id_password" required> id="id_password" required>
{% if form.password.errors %} {% if form.password.errors %}
<p class="text-error"> <p class="text-error">
@ -56,8 +55,8 @@
<div class="well well-small text-error" style="border: none">{{ error }}</div> <div class="well well-small text-error" style="border: none">{{ error }}</div>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
<div class="form-actions-no-box" style="margin-top: 20px"> <div class="form-actions-no-box">
<input type="submit" name="submit" value="Log in" class="btn btn-primary" id="submit-id-submit"> <input type="submit" name="submit" value="Log in" class="btn btn-primary form-control" id="submit-id-submit">
</div> </div>
</form> </form>
</div> </div>

8
rest_framework/templates/rest_framework/raw_data_form.html
View File

@ -2,10 +2,10 @@
{% csrf_token %} {% csrf_token %}
{{ form.non_field_errors }} {{ form.non_field_errors }}
{% for field in form %} {% for field in form %}
<div class="control-group"> <div class="form-group">
{{ field.label_tag|add_class:"control-label" }} {{ field.label_tag|add_class:"col-sm-2 control-label" }}
<div class="controls"> <div class="col-sm-10">
{{ field }} {{ field|add_class:"form-control" }}
<span class="help-block">{{ field.help_text }}</span> <span class="help-block">{{ field.help_text }}</span>
</div> </div>
</div> </div>

2
tests/test_authentication.py
View File

@ -142,7 +142,7 @@ class SessionAuthTests(TestCase):
cf. [#1810](https://github.com/tomchristie/django-rest-framework/pull/1810) cf. [#1810](https://github.com/tomchristie/django-rest-framework/pull/1810)
""" """
response = self.csrf_client.get('/auth/login/') response = self.csrf_client.get('/auth/login/')
self.assertContains(response, '<label class="span4">Username:</label>') self.assertContains(response, '<label for="id_username">Username:</label>')
def test_post_form_session_auth_failing_csrf(self): def test_post_form_session_auth_failing_csrf(self):
""" """