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

updating to bootstrap 3.2.0

Browse Source
This commit is contained in:
Daniel Ryan 2014-09-14 15:46:10 -04:00
parent cefeb23b25
commit 7b25cb5388
7 changed files with 55 additions and 913 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/static/rest_framework/css/bootstrap-tweaks.css vendored
View File

@ -12,10 +12,10 @@ a single block in the template.
padding-top: 0; padding-top: 0;
} }
.navbar-inverse .brand a { .navbar-inverse .navbar-brand a {
color: #999999; color: #999999;
} }
.navbar-inverse .brand:hover a { .navbar-inverse .navbar-brand:hover a {
color: white; color: white;
text-decoration: none; text-decoration: none;
} }
@ -37,7 +37,7 @@ a single block in the template.
border-radius: 0px; border-radius: 0px;
} }
.navbar .navbar-inner .nav li, .navbar .navbar-inner .nav li a, .navbar .navbar-inner .brand:hover { .navbar .navbar-inner .nav li, .navbar .navbar-inner .nav li a, .navbar .navbar-inner .navbar-brand:hover {
color: white; color: white;
} }

844
rest_framework/static/rest_framework/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
rest_framework/static/rest_framework/css/default.css
View File

@ -32,10 +32,6 @@ h2, h3 {
margin-right: 1em; margin-right: 1em;
} }
ul.breadcrumb {
margin: 80px 0 0 0;
}
form select, form input, form textarea { form select, form input, form textarea {
width: 90%; width: 90%;
} }

61
rest_framework/templates/rest_framework/base.html
View File

@ -5,23 +5,22 @@
<html> <html>
<head> <head>
{% block head %} {% block head %}
{% block meta %} {% block meta %}
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="robots" content="NONE,NOARCHIVE" /> <meta name="robots" content="NONE,NOARCHIVE" />
{% endblock %} {% endblock %}
<title>{% block title %}Django REST framework{% endblock %}</title> <title>{% block title %}Django REST framework{% endblock %}</title>
{% block style %} {% block style %}
{% block bootstrap_theme %} {% block bootstrap_theme %}
<link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap.min.css" %}"/> <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap-tweaks.css" %}"/>
{% endblock %} {% endblock %}
<link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/prettify.css" %}"/> <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/prettify.css" %}"/>
<link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/default.css" %}"/> <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/default.css" %}"/>
{% endblock %} {% endblock %}
{% endblock %} {% endblock %}
</head> </head>
@ -32,25 +31,31 @@
{% block navbar %} {% block navbar %}
<div class="navbar {% block bootstrap_navbar_variant %}navbar-inverse{% endblock %}"> <div class="navbar {% block bootstrap_navbar_variant %}navbar-inverse{% endblock %}">
<div class="navbar-inner"> <div class="container-fluid">
<div class="container-fluid"> <span>
<span> {% block branding %}
{% block branding %} <a class='navbar-brand' rel="nofollow" href='http://www.django-rest-framework.org'>
<a class='brand' rel="nofollow" href='http://www.django-rest-framework.org'> Django REST framework <span class="version">{{ version }}</span>
Django REST framework <span class="version">{{ version }}</span> </a>
{% endblock %}
</span>
<ul class="navbar-nav nav pull-right">
{% block userlinks %}
{% if user.is_authenticated %}
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
{{ user }}
<b class="caret"></b>
</a> </a>
{% endblock %} <ul class="dropdown-menu">
</span> <li>{% optional_logout request %}</li>
<ul class="nav pull-right"> </ul>
{% block userlinks %} </li>
{% if user.is_authenticated %} {% else %}
{% optional_logout request user %} <li>{% optional_login request %}</li>
{% else %} {% endif %}
{% optional_login request %} {% endblock %}
{% endif %} </ul>
{% endblock %}
</ul>
</div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
@ -77,7 +82,7 @@
<div class="btn-group format-selection"> <div class="btn-group format-selection">
<a class="btn btn-primary js-tooltip" href='{{ request.get_full_path }}' <a class="btn btn-primary js-tooltip" href='{{ request.get_full_path }}'
rel="nofollow" title="Make a GET request on the {{ name }} resource">GET</a> rel="nofollow" title="Make a GET request on the {{ name }} resource">GET</a>
<button class="btn btn-primary dropdown-toggle js-tooltip" data-toggle="dropdown" <button class="btn btn-primary dropdown-toggle js-tooltip" data-toggle="dropdown"
title="Specify a format for the GET request"> title="Specify a format for the GET request">
<span class="caret"></span> <span class="caret"></span>
@ -136,7 +141,7 @@
</div> </div>
{% if display_edit_forms %} {% if display_edit_forms %}
{% if post_form or raw_data_post_form %} {% if post_form or raw_data_post_form %}
<div {% if post_form %}class="tabbable"{% endif %}> <div {% if post_form %}class="tabbable"{% endif %}>
{% if post_form %} {% if post_form %}
@ -182,7 +187,7 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% if put_form or raw_data_put_form or raw_data_patch_form %} {% if put_form or raw_data_put_form or raw_data_patch_form %}
<div {% if put_form %}class="tabbable"{% endif %}> <div {% if put_form %}class="tabbable"{% endif %}>
{% if put_form %} {% if put_form %}
@ -238,7 +243,7 @@
{% endif %} {% endif %}
</div> </div>
<!-- END Content --> <!-- END Content -->
<footer> <footer>
{% block footer %} {% block footer %}
<p>Sponsored by <a href="http://dabapps.com/">DabApps</a>.</p> <p>Sponsored by <a href="http://dabapps.com/">DabApps</a>.</p>

2
rest_framework/templates/rest_framework/form.html
View File

@ -3,7 +3,7 @@
{{ form.non_field_errors }} {{ form.non_field_errors }}
{% for field in form.fields.values %} {% for field in form.fields.values %}
{% if not field.read_only %} {% if not field.read_only %}
<div class="control-group {% if field.errors %}error{% endif %}"> <div class="form-group {% if field.errors %}has-error{% endif %}">
{{ field.label_tag|add_class:"control-label" }} {{ field.label_tag|add_class:"control-label" }}
<div class="controls"> <div class="controls">
{{ field.widget_html }} {{ field.widget_html }}

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

@ -7,62 +7,39 @@
<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="row">
<div class="well" style="width: 320px; margin-left: auto; margin-right: auto"> <div class="well" style="width: 320px; margin-left: auto; margin-right: auto">
<div class="row-fluid"> <div class="row">
<div> <div>
{% block branding %}<h3 style="margin: 0 0 20px;">Django REST framework</h3>{% endblock %} {% block branding %}<h3 style="margin: 0 0 20px;">Django REST framework</h3>{% endblock %}
</div> </div>
</div><!-- /row fluid --> </div><!-- /row fluid -->
<div class="row-fluid"> <div class="row">
<div> <div>
<form action="{% url 'rest_framework:login' %}" role="form" method="post"> <form action="{% url 'rest_framework:login' %}" class=" form-inline" method="post">
{% csrf_token %} {% csrf_token %}
<div id="div_id_username" <div id="div_id_username" class="clearfix form-group">
class="clearfix control-group {% if form.username.errors %}error{% endif %}">
<div class="controls"> <div class="controls">
<Label class="span4">Username:</label> <Label class="col-md-4">Username:</label>
<input style="height: 25px" type="text" name="username" maxlength="100" <input style="height: 25px" type="text" name="username" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_username">
autocapitalize="off"
autocorrect="off" class="span12 textinput textInput"
id="id_username" required
{% if form.username.value %}value="{{ form.username.value }}"{% endif %}>
{% if form.username.errors %}
<p class="text-error">
{{ form.username.errors|striptags }}
</p>
{% endif %}
</div> </div>
</div> </div>
<div id="div_id_password" <div id="div_id_password" class="clearfix form-group">
class="clearfix control-group {% if form.password.errors %}error{% endif %}"> <div class="controls">
<div class="controls"> <Label class="col-md-4">Password:</label>
<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">
<input style="height: 25px" type="password" name="password" maxlength="100"
autocapitalize="off" autocorrect="off" class="span12 textinput textInput"
id="id_password" required>
{% if form.password.errors %}
<p class="text-error">
{{ form.password.errors|striptags }}
</p>
{% endif %}
</div> </div>
</div> </div>
<input type="hidden" name="next" value="{{ next }}" /> <input type="hidden" name="next" value="{{ next }}" />
{% if form.non_field_errors %}
{% for error in form.non_field_errors %}
<div class="well well-small text-error" style="border: none">{{ error }}</div>
{% endfor %}
{% endif %}
<div class="form-actions-no-box"> <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" id="submit-id-submit">
</div> </div>
</form> </form>
</div> </div>
</div><!-- /.row-fluid --> </div><!-- /.row -->
</div><!--/.well--> </div><!--/.well-->
</div><!-- /.row-fluid --> </div><!-- /.row -->
</div><!-- /.container-fluid --> </div><!-- /.container-fluid -->
</body> </body>
{% endblock %} {% endblock %}

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

@ -2,7 +2,7 @@
{% 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:"control-label" }}
<div class="controls"> <div class="controls">
{{ field }} {{ field }}