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

3 files changed, 319 insertions, 284 deletions

diff --git a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css
index 6bfb778c..6fa1e6cb 100644
--- a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css
+++ b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css
@@ -6,30 +6,30 @@ a single block in the template.
 
 */
 
-
 .form-actions {
-    background: transparent;
-    border-top-color: transparent;
-    padding-top: 0;
+  background: transparent;
+  border-top-color: transparent;
+  padding-top: 0;
 }
 
 .navbar-inverse .brand a {
-    color: #999;
+  color: #999999;
 }
 .navbar-inverse .brand:hover a {
-    color: white;
-    text-decoration: none;
+  color: white;
+  text-decoration: none;
 }
 
 /* custom navigation styles */
-.wrapper .navbar{
+.navbar {
   width: 100%;
-  position: absolute;
+  position: fixed;
   left: 0;
   top: 0;
+  z-index: 3;
 }
 
-.navbar .navbar-inner{
+.navbar .navbar-inner {
   background: #2C2C2C;
   color: white;
   border: none;
@@ -37,25 +37,26 @@ a single block in the template.
   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 .brand:hover {
   color: white;
 }
 
 .nav-list > .active > a, .nav-list > .active > a:hover {
-  background: #2c2c2c;
+  background: #2C2C2C;
 }
 
-.navbar .navbar-inner .dropdown-menu li a, .navbar .navbar-inner .dropdown-menu li{
- color: #A30000;
+.navbar .navbar-inner .dropdown-menu li a, .navbar .navbar-inner .dropdown-menu li {
+  color: #A30000;
 }
-.navbar .navbar-inner .dropdown-menu li a:hover{
-  background: #eeeeee;
-  color: #c20000;
+
+.navbar .navbar-inner .dropdown-menu li a:hover {
+  background: #EEEEEE;
+  color: #C20000;
 }
 
 /*=== dabapps bootstrap styles ====*/
 
-html{
+html {
   width:100%;
   background: none;
 }
@@ -65,121 +66,127 @@ body, .navbar .navbar-inner .container-fluid {
   margin: 0 auto;
 }
 
-body{
+body {
   background: url("../img/grid.png") repeat-x;
   background-attachment: fixed;
 }
 
-#content{
-    margin: 0;
+#content {
+  margin: 0;
+  padding-bottom: 60px;
 }
 
 /* sticky footer and footer */
 html, body {
   height: 100%;
 }
+
 .wrapper {
+  position: relative;
+  top: 0;
+  left: 0;
+  padding-top: 60px;
+  margin: -60px 0;
   min-height: 100%;
-  height: auto !important;
-  height: 100%;
-  margin: 0 auto -60px;
 }
 
 .form-switcher {
-    margin-bottom: 0;
+  margin-bottom: 0;
 }
 
 .well {
-    -webkit-box-shadow: none;
-       -moz-box-shadow: none;
-            box-shadow: none;
+  -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
 }
 
 .well .form-actions {
-    padding-bottom: 0;
-    margin-bottom: 0;
+  padding-bottom: 0;
+  margin-bottom: 0;
 }
 
 .well form {
-    margin-bottom: 0;
+  margin-bottom: 0;
 }
 
 .well form .help-block {
-    color: #999;
+  color: #999999;
 }
 
 .nav-tabs {
-    border: 0;
+  border: 0;
 }
 
 .nav-tabs > li {
-    float: right;
+  float: right;
 }
 
 .nav-tabs li a {
-    margin-right: 0;
+  margin-right: 0;
 }
 
 .nav-tabs > .active > a {
-    background: #f5f5f5;
+  background: #F5F5F5;
 }
 
 .nav-tabs > .active > a:hover {
-    background: #f5f5f5;
-}
-
-.tabbable.first-tab-active .tab-content
-{
-    border-top-right-radius: 0;
+  background: #F5F5F5;
 }
 
-#footer, #push {
-  height: 60px; /* .push must be the same height as .footer */
+.tabbable.first-tab-active .tab-content {
+  border-top-right-radius: 0;
 }
 
-#footer{
-    text-align: right;
+footer {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  clear: both;
+  z-index: 10;
+  height: 60px;
+  width: 95%;
+  margin: 0 2.5%;
 }
 
-#footer p {
+footer p {
   text-align: center;
   color: gray;
-  border-top: 1px solid #DDD;
+  border-top: 1px solid #DDDDDD;
   padding-top: 10px;
 }
 
-#footer a {
-  color: gray;
+footer a {
+  color: gray !important;
   font-weight: bold;
 }
 
-#footer a:hover {
+footer a:hover {
   color: gray;
 }
 
 .page-header {
-    border-bottom: none;
-    padding-bottom: 0px;
-    margin-bottom: 20px;
+  border-bottom: none;
+  padding-bottom: 0px;
+  margin-bottom: 20px;
 }
 
 /* custom general page styles */
-.hero-unit h2, .hero-unit h1{
+.hero-unit h1, .hero-unit h2 {
   color: #A30000;
 }
 
-body a, body a{
+body a {
   color: #A30000;
 }
 
-body a:hover{
+body a:hover {
   color: #c20000;
 }
 
-#content a span{
-    text-decoration: underline;
+#content a span {
+  text-decoration: underline;
  }
 
 .request-info {
-    clear:both;
+  clear:both;
 }
diff --git a/rest_framework/static/rest_framework/css/default.css b/rest_framework/static/rest_framework/css/default.css
index 0261a303..461cdfe5 100644
--- a/rest_framework/static/rest_framework/css/default.css
+++ b/rest_framework/static/rest_framework/css/default.css
@@ -3,20 +3,20 @@
 content running up underneath it. */
 
 h1 {
-    font-weight: 500;
+  font-weight: 500;
 }
 
 h2, h3 {
-    font-weight: 300;
+  font-weight: 300;
 }
 
 .resource-description, .response-info {
-    margin-bottom: 2em;
+  margin-bottom: 2em;
 }
 .version:before {
-    content: "v";
-    opacity: 0.6;
-    padding-right: 0.25em;
+  content: "v";
+  opacity: 0.6;
+  padding-right: 0.25em;
 }
 
 .version {
@@ -24,16 +24,16 @@ h2, h3 {
 }
 
 .format-option {
-    font-family: Menlo, Consolas, "Andale Mono", "Lucida Console", monospace;
+  font-family: Menlo, Consolas, "Andale Mono", "Lucida Console", monospace;
 }
 
 .button-form {
-    float: right;
-    margin-right: 1em;
+  float: right;
+  margin-right: 1em;
 }
 
 ul.breadcrumb {
-  margin: 58px 0 0 0;
+  margin: 80px 0 0 0;
 }
 
 form select, form input, form textarea {
@@ -43,17 +43,18 @@ form select, form input, form textarea {
 form select[multiple] {
   height: 150px;
 }
+
 /* To allow tooltips to work on disabled elements */
 .disabled-tooltip-shield {
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
 }
 
 .errorlist {
-    margin-top: 0.5em;
+  margin-top: 0.5em;
 }
 
 pre {
@@ -64,8 +65,7 @@ pre {
 }
 
 .page-header {
-    border-bottom: none;
-    padding-bottom: 0px;
-    margin-bottom: 20px;
+  border-bottom: none;
+  padding-bottom: 0px;
+  margin-bottom: 20px;
 }
-
diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html
index b6e9ca5c..cee9724d 100644
--- a/rest_framework/templates/rest_framework/base.html
+++ b/rest_framework/templates/rest_framework/base.html
@@ -4,233 +4,261 @@
 <!DOCTYPE html>
 <html>
     <head>
-    {% block head %}
-
-        {% block meta %}
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta name="robots" content="NONE,NOARCHIVE" />
+        {% block head %}
+    
+            {% block meta %}
+                <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+                <meta name="robots" content="NONE,NOARCHIVE" />
+            {% endblock %}
+    
+            <title>{% block title %}Django REST framework{% endblock %}</title>
+    
+            {% block style %}
+                {% block bootstrap_theme %}
+                    <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap.min.css" %}"/>
+                    <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap-tweaks.css" %}"/>
+                {% 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/default.css" %}"/>
+            {% endblock %}
+            
         {% endblock %}
+    </head>
 
-        <title>{% block title %}Django REST framework{% endblock %}</title>
+    <body class="{% block bodyclass %}{% endblock %} container">
 
-        {% block style %}
-        {% block bootstrap_theme %}
-            <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap.min.css" %}"/>
-            <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap-tweaks.css" %}"/>
-        {% 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/default.css" %}"/>
-        {% endblock %}
+        <div class="wrapper">
 
-    {% endblock %}
-    </head>
+            {% block navbar %}
+                <div class="navbar {% block bootstrap_navbar_variant %}navbar-inverse{% endblock %}">
+                    <div class="navbar-inner">
+                        <div class="container-fluid">
+                            <span>
+                                {% block branding %}
+                                    <a class='brand' rel="nofollow" href='http://www.django-rest-framework.org'>
+                                        Django REST framework <span class="version">{{ version }}</span>
+                                    </a>
+                                {% endblock %}
+                            </span>
+                            <ul class="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>
+                                        <ul class="dropdown-menu">
+                                            <li>{% optional_logout request %}</li>
+                                        </ul>
+                                    </li>
+                                    {% else %}
+                                        <li>{% optional_login request %}</li>
+                                    {% endif %}
+                                {% endblock %}
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            {% endblock %}
 
-  {% block body %}
-  <body class="{% block bodyclass %}{% endblock %} container">
+            {% block breadcrumbs %}
+                <ul class="breadcrumb">
+                    {% for breadcrumb_name, breadcrumb_url in breadcrumblist %}
+                        <li>
+                            <a href="{{ breadcrumb_url }}" {% if forloop.last %}class="active"{% endif %}>
+                                {{ breadcrumb_name }}
+                            </a>
+                            {% if not forloop.last %}<span class="divider">&rsaquo;</span>{% endif %}
+                        </li>
+                    {% endfor %}
+                </ul>
+            {% endblock %}
 
-    <div class="wrapper">
+            <!-- Content -->
+            <div id="content">
 
-    {% block navbar %}
-    <div class="navbar {% block bootstrap_navbar_variant %}navbar-inverse{% endblock %}">
-        <div class="navbar-inner">
-            <div class="container-fluid">
-                <span href="/">
-                    {% block branding %}<a class='brand' rel="nofollow" href='http://www.django-rest-framework.org'>Django REST framework <span class="version">{{ version }}</span></a>{% endblock %}
-                </span>
-                <ul class="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>
+                {% if 'GET' in allowed_methods %}
+                    <form id="get-form" class="pull-right">
+                        <fieldset>
+                            <div class="btn-group format-selection">
+                                <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>
+        
+                                <button class="btn btn-primary dropdown-toggle js-tooltip" data-toggle="dropdown"
+                                        title="Specify a format for the GET request">
+                                    <span class="caret"></span>
+                                </button>
                                 <ul class="dropdown-menu">
-                                    <li>{% optional_logout request %}</li>
+                                    {% for format in available_formats %}
+                                        <li>
+                                            <a class="js-tooltip format-option"
+                                                href='{% add_query_param request api_settings.URL_FORMAT_OVERRIDE format %}'
+                                                 rel="nofollow"
+                                               title="Make a GET request on the {{ name }} resource with the format set to `{{ format }}`">
+                                                {{ format }}
+                                            </a>
+                                        </li>
+                                    {% endfor %}
                                 </ul>
-                            </li>
-                        {% else %}
-                            <li>{% optional_login request %}</li>
-                        {% endif %}
-                    {% endblock %}
-                </ul>
-            </div>
-        </div>
-    </div>
-    {% endblock %}
-
-    {% block breadcrumbs %}
-    <ul class="breadcrumb">
-        {% for breadcrumb_name, breadcrumb_url in breadcrumblist %}
-            <li>
-                <a href="{{ breadcrumb_url }}" {% if forloop.last %}class="active"{% endif %}>{{ breadcrumb_name }}</a> {% if not forloop.last %}<span class="divider">&rsaquo;</span>{% endif %}
-            </li>
-        {% endfor %}
-    </ul>
-    {% endblock %}
+                            </div>
+                        </fieldset>
+                    </form>
+                {% endif %}
 
-    <!-- Content -->
-    <div id="content">
+                {% if options_form %}
+                    <form class="button-form" action="{{ request.get_full_path }}" method="POST">
+                        {% csrf_token %}
+                        <input type="hidden" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="OPTIONS" />
+                        <button class="btn btn-primary js-tooltip"
+                                title="Make an OPTIONS request on the {{ name }} resource">OPTIONS</button>
+                    </form>
+                {% endif %}
 
-        {% if 'GET' in allowed_methods %}
-            <form id="get-form" class="pull-right">
-                <fieldset>
-                    <div class="btn-group format-selection">
-                        <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>
+                {% if delete_form %}
+                    <form class="button-form" action="{{ request.get_full_path }}" method="POST">
+                        {% csrf_token %}
+                        <input type="hidden" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="DELETE" />
+                        <button class="btn btn-danger js-tooltip"
+                                title="Make a DELETE request on the {{ name }} resource">DELETE</button>
+                    </form>
+                {% endif %}
 
-                        <button class="btn btn-primary dropdown-toggle js-tooltip" data-toggle="dropdown" title="Specify a format for the GET request">
-                            <span class="caret"></span>
-                        </button>
-                        <ul class="dropdown-menu">
-                            {% for format in available_formats %}
-                                <li>
-                                    <a class="js-tooltip format-option" href='{% add_query_param request api_settings.URL_FORMAT_OVERRIDE format %}' rel="nofollow" title="Make a GET request on the {{ name }} resource with the format set to `{{ format }}`">{{ format }}</a>
-                                </li>
-                            {% endfor %}
-                        </ul>
+                <div class="content-main">
+                    <div class="page-header">
+                        <h1>{{ name }}</h1>
                     </div>
-
-                </fieldset>
-            </form>
-        {% endif %}
-
-        {% if options_form %}
-            <form class="button-form" action="{{ request.get_full_path }}" method="POST">
-                {% csrf_token %}
-                <input type="hidden" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="OPTIONS" />
-                <button class="btn btn-primary js-tooltip" title="Make an OPTIONS request on the {{ name }} resource">OPTIONS</button>
-            </form>
-        {% endif %}
-
-        {% if delete_form %}
-            <form class="button-form" action="{{ request.get_full_path }}" method="POST">
-                {% csrf_token %}
-                <input type="hidden" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="DELETE" />
-                <button class="btn btn-danger js-tooltip" title="Make a DELETE request on the {{ name }} resource">DELETE</button>
-            </form>
-        {% endif %}
-
-        <div class="content-main">
-            <div class="page-header"><h1>{{ name }}</h1></div>
-            {% block description %}
-            {{ description }}
-            {% endblock %}
-            <div class="request-info" style="clear: both" >
-                <pre class="prettyprint"><b>{{ request.method }}</b> {{ request.get_full_path }}</pre>
-            </div>
-            <div class="response-info">
-                <pre class="prettyprint"><div class="meta nocode"><b>HTTP {{ response.status_code }} {{ response.status_text }}</b>{% autoescape off %}
+                    {% block description %}
+                        {{ description }}
+                    {% endblock %}
+                    <div class="request-info" style="clear: both" >
+                        <pre class="prettyprint"><b>{{ request.method }}</b> {{ request.get_full_path }}</pre>
+                    </div>
+                    <div class="response-info">
+                        <pre class="prettyprint"><span class="meta nocode"><b>HTTP {{ response.status_code }} {{ response.status_text }}</b>{% autoescape off %}
 {% for key, val in response_headers.items %}<b>{{ key }}:</b> <span class="lit">{{ val|break_long_headers|urlize_quoted_links }}</span>
 {% endfor %}
-</div>{{ content|urlize_quoted_links }}</pre>{% endautoescape %}
-            </div>
-        </div>
-
-            {% if display_edit_forms %}
-
-                {% if post_form or raw_data_post_form %}
-                <div {% if post_form %}class="tabbable"{% endif %}>
-                    {% if post_form %}
-                    <ul class="nav nav-tabs form-switcher">
-                        <li><a name='html-tab' href="#object-form" data-toggle="tab">HTML form</a></li>
-                        <li><a name='raw-tab' href="#generic-content-form" data-toggle="tab">Raw data</a></li>
-                    </ul>
-                    {% endif %}
-                    <div class="well tab-content">
-                        {% if post_form %}
-                        <div class="tab-pane" id="object-form">
-                            {% with form=post_form %}
-                            <form action="{{ request.get_full_path }}" method="POST" enctype="multipart/form-data" class="form-horizontal">
-                                <fieldset>
-                                    {{ post_form }}
-                                    <div class="form-actions">
-                                        <button class="btn btn-primary" title="Make a POST request on the {{ name }} resource">POST</button>
-                                    </div>
-                                </fieldset>
-                            </form>
-                            {% endwith %}
-                        </div>
-                        {% endif %}
-                        <div {% if post_form %}class="tab-pane"{% endif %} id="generic-content-form">
-                            {% with form=raw_data_post_form %}
-                            <form action="{{ request.get_full_path }}" method="POST" class="form-horizontal">
-                                <fieldset>
-                                    {% include "rest_framework/raw_data_form.html" %}
-                                    <div class="form-actions">
-                                        <button class="btn btn-primary" title="Make a POST request on the {{ name }} resource">POST</button>
-                                    </div>
-                                </fieldset>
-                            </form>
-                            {% endwith %}
-                        </div>
+</span>{{ content|urlize_quoted_links }}</pre>{% endautoescape %}
                     </div>
                 </div>
-                {% endif %}
 
-                {% if put_form or raw_data_put_form or raw_data_patch_form %}
-                <div {% if put_form %}class="tabbable"{% endif %}>
-                    {% if put_form %}
-                    <ul class="nav nav-tabs form-switcher">
-                        <li><a name='html-tab' href="#object-form" data-toggle="tab">HTML form</a></li>
-                        <li><a  name='raw-tab' href="#generic-content-form" data-toggle="tab">Raw data</a></li>
-                    </ul>
-                    {% endif %}
-                    <div class="well tab-content">
-                        {% if put_form %}
-                        <div class="tab-pane" id="object-form">
-                            <form action="{{ request.get_full_path }}" method="POST" enctype="multipart/form-data" class="form-horizontal">
-                                <fieldset>
-                                    {{ put_form }}
-                                    <div class="form-actions">
-                                        <button class="btn btn-primary js-tooltip" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="PUT" title="Make a PUT request on the {{ name }} resource">PUT</button>
+                {% if display_edit_forms %}
+    
+                    {% if post_form or raw_data_post_form %}
+                        <div {% if post_form %}class="tabbable"{% endif %}>
+                            {% if post_form %}
+                                <ul class="nav nav-tabs form-switcher">
+                                    <li>
+                                        <a name='html-tab' href="#object-form" data-toggle="tab">HTML form</a>
+                                    </li>
+                                    <li>
+                                        <a name='raw-tab' href="#generic-content-form" data-toggle="tab">Raw data</a>
+                                    </li>
+                                </ul>
+                            {% endif %}
+                            <div class="well tab-content">
+                                {% if post_form %}
+                                    <div class="tab-pane" id="object-form">
+                                        {% with form=post_form %}
+                                            <form action="{{ request.get_full_path }}"
+                                                  method="POST" enctype="multipart/form-data" class="form-horizontal">
+                                                <fieldset>
+                                                    {{ post_form }}
+                                                    <div class="form-actions">
+                                                        <button class="btn btn-primary"
+                                                                title="Make a POST request on the {{ name }} resource">POST</button>
+                                                    </div>
+                                                </fieldset>
+                                            </form>
+                                        {% endwith %}
                                     </div>
-                                </fieldset>
-                            </form>
+                                {% endif %}
+                                <div {% if post_form %}class="tab-pane"{% endif %} id="generic-content-form">
+                                    {% with form=raw_data_post_form %}
+                                        <form action="{{ request.get_full_path }}" method="POST" class="form-horizontal">
+                                            <fieldset>
+                                                {% include "rest_framework/raw_data_form.html" %}
+                                                <div class="form-actions">
+                                                    <button class="btn btn-primary"
+                                                            title="Make a POST request on the {{ name }} resource">POST</button>
+                                                </div>
+                                            </fieldset>
+                                        </form>
+                                    {% endwith %}
+                                </div>
+                            </div>
                         </div>
-                        {% endif %}
-                        <div {% if put_form %}class="tab-pane"{% endif %} id="generic-content-form">
-                            {% with form=raw_data_put_or_patch_form %}
-                            <form action="{{ request.get_full_path }}" method="POST" class="form-horizontal">
-                                <fieldset>
-                                    {% include "rest_framework/raw_data_form.html" %}
-                                    <div class="form-actions">
-                                        {% if raw_data_put_form %}
-                                        <button class="btn btn-primary js-tooltip" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="PUT" title="Make a PUT request on the {{ name }} resource">PUT</button>
-                                        {% endif %}
-                                        {% if raw_data_patch_form %}
-                                        <button class="btn btn-primary js-tooltip" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="PATCH" title="Make a PATCH request on the {{ name }} resource">PATCH</button>
-                                        {% endif %}
+                    {% endif %}
+    
+                    {% if put_form or raw_data_put_form or raw_data_patch_form %}
+                        <div {% if put_form %}class="tabbable"{% endif %}>
+                            {% if put_form %}
+                                <ul class="nav nav-tabs form-switcher">
+                                    <li>
+                                        <a name='html-tab' href="#object-form" data-toggle="tab">HTML form</a>
+                                    </li>
+                                    <li>
+                                        <a  name='raw-tab' href="#generic-content-form" data-toggle="tab">Raw data</a>
+                                    </li>
+                                </ul>
+                            {% endif %}
+                            <div class="well tab-content">
+                                {% if put_form %}
+                                    <div class="tab-pane" id="object-form">
+                                        <form action="{{ request.get_full_path }}"
+                                              method="POST" enctype="multipart/form-data" class="form-horizontal">
+                                            <fieldset>
+                                                {{ put_form }}
+                                                <div class="form-actions">
+                                                    <button class="btn btn-primary js-tooltip"
+                                                             name="{{ api_settings.FORM_METHOD_OVERRIDE }}"
+                                                            value="PUT" title="Make a PUT request on the {{ name }} resource">PUT</button>
+                                                </div>
+                                            </fieldset>
+                                        </form>
                                     </div>
-                                </fieldset>
-                            </form>
-                            {% endwith %}
+                                {% endif %}
+                                <div {% if put_form %}class="tab-pane"{% endif %} id="generic-content-form">
+                                    {% with form=raw_data_put_or_patch_form %}
+                                        <form action="{{ request.get_full_path }}" method="POST" class="form-horizontal">
+                                            <fieldset>
+                                                {% include "rest_framework/raw_data_form.html" %}
+                                                <div class="form-actions">
+                                                    {% if raw_data_put_form %}
+                                                        <button class="btn btn-primary js-tooltip"
+                                                                 name="{{ api_settings.FORM_METHOD_OVERRIDE }}"
+                                                                value="PUT" title="Make a PUT request on the {{ name }} resource">PUT</button>
+                                                    {% endif %}
+                                                    {% if raw_data_patch_form %}
+                                                        <button class="btn btn-primary js-tooltip"
+                                                                 name="{{ api_settings.FORM_METHOD_OVERRIDE }}"
+                                                                value="PATCH" title="Make a PATCH request on the {{ name }} resource">PATCH</button>
+                                                    {% endif %}
+                                                </div>
+                                            </fieldset>
+                                        </form>
+                                    {% endwith %}
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                </div>
+                    {% endif %}
                 {% endif %}
-            {% endif %}
-
-        </div>
-        <!-- END content-main -->
-
-    </div>
-    <!-- END Content -->
-
-        <div id="push"></div>
-
-    </div>
-
-    </div><!-- ./wrapper -->
+            </div>
+            <!-- END Content -->
+            
+            <footer>
+                {% block footer %}
+                    <p>Sponsored by <a href="http://dabapps.com/">DabApps</a>.</p>
+                {% endblock %}
+            </footer>
 
-    {% block footer %}
-    {% endblock %}
+        </div><!-- ./wrapper -->
 
-    {% block script %}
-    <script src="{% static "rest_framework/js/jquery-1.8.1-min.js" %}"></script>
-    <script src="{% static "rest_framework/js/bootstrap.min.js" %}"></script>
-    <script src="{% static "rest_framework/js/prettify-min.js" %}"></script>
-    <script src="{% static "rest_framework/js/default.js" %}"></script>
-    {% endblock %}
-  </body>
-  {% endblock %}
+        {% block script %}
+            <script src="{% static "rest_framework/js/jquery-1.8.1-min.js" %}"></script>
+            <script src="{% static "rest_framework/js/bootstrap.min.js" %}"></script>
+            <script src="{% static "rest_framework/js/prettify-min.js" %}"></script>
+            <script src="{% static "rest_framework/js/default.js" %}"></script>
+        {% endblock %}
+    </body>
 </html>