Skip to content

D
django-rest-framework
Commit 5392be4d by José Padilla Committed by Tom Christie
Options

Spring cleaning template styles (#4124)

parent 1328982d
Showing with 30 additions and 31 deletions
rest_framework/templates/rest_framework/admin.html
{% load staticfiles %} {% load staticfiles %}
{% load i18n %} {% load i18n %}
{% load rest_framework %} {% load rest_framework %}
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
...@@ -27,9 +28,7 @@ ...@@ -27,9 +28,7 @@
{% block body %} {% block body %}
<body class="{% block bodyclass %}{% endblock %}"> <body class="{% block bodyclass %}{% endblock %}">
<div class="wrapper"> <div class="wrapper">
{% block navbar %} {% block navbar %}
<div class="navbar navbar-static-top {% block bootstrap_navbar_variant %}navbar-inverse{% endblock %}"> <div class="navbar navbar-static-top {% block bootstrap_navbar_variant %}navbar-inverse{% endblock %}">
<div class="container"> <div class="container">
...@@ -68,7 +67,6 @@ ...@@ -68,7 +67,6 @@
<!-- Content --> <!-- Content -->
<div id="content"> <div id="content">
{% if 'GET' in allowed_methods %} {% if 'GET' in allowed_methods %}
<form id="get-form" class="pull-right"> <form id="get-form" class="pull-right">
<fieldset> <fieldset>
...@@ -123,6 +121,7 @@ ...@@ -123,6 +121,7 @@
<div class="page-header"> <div class="page-header">
<h1>{{ name }}</h1> <h1>{{ name }}</h1>
</div> </div>
<div style="float:left"> <div style="float:left">
{% block description %} {% block description %}
{{ description }} {{ description }}
...@@ -149,14 +148,13 @@ ...@@ -149,14 +148,13 @@
</nav> </nav>
{% endif %} {% endif %}
</div> </div>
</div> </div>
<!-- END Content --> <!-- END Content -->
</div><!-- /.container --> </div><!-- /.container -->
</div><!-- ./wrapper --> </div><!-- ./wrapper -->
<!-- Create Modal --> <!-- Create Modal -->
<div class="modal fade" id="createModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="createModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
...@@ -177,10 +175,10 @@ ...@@ -177,10 +175,10 @@
</form> </form>
</div> </div>
</div> </div>
</div> </div>
<!-- Edit Modal --> <!-- Edit Modal -->
<div class="modal fade" id="editModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="editModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
...@@ -200,11 +198,11 @@ ...@@ -200,11 +198,11 @@
</form> </form>
</div> </div>
</div> </div>
</div> </div>
{% if error_form %} {% if error_form %}
<!-- Errors Modal --> <!-- Errors Modal -->
<div class="modal" id="errorModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal" id="errorModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
...@@ -224,10 +222,12 @@ ...@@ -224,10 +222,12 @@
</form> </form>
</div> </div>
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% if filter_form %}{{ filter_form }}{% endif %} {% if filter_form %}
{{ filter_form }}
{% endif %}
{% block script %} {% block script %}
<script> <script>
......
rest_framework/templates/rest_framework/base.html
{% load staticfiles %} {% load staticfiles %}
{% load rest_framework %}
{% load i18n %} {% load i18n %}
{% load rest_framework %}
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
{% block head %} {% block head %}
{% block meta %} {% block meta %}
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
{% endblock %} {% endblock %}
{% endblock %} {% endblock %}
</head> </head>
{% block body %} {% block body %}
<body class="{% block bodyclass %}{% endblock %}"> <body class="{% block bodyclass %}{% endblock %}">
<div class="wrapper"> <div class="wrapper">
{% block navbar %} {% block navbar %}
...@@ -151,14 +151,13 @@ ...@@ -151,14 +151,13 @@
<div class="response-info"> <div class="response-info">
<pre class="prettyprint"><span class="meta nocode"><b>HTTP {{ response.status_code }} {{ response.status_text }}</b>{% autoescape off %} <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> {% for key, val in response_headers.items %}<b>{{ key }}:</b> <span class="lit">{{ val|break_long_headers|urlize_quoted_links }}</span>
{% endfor %} {% endfor %}
</span>{{ content|urlize_quoted_links }}</pre>{% endautoescape %} </span>{{ content|urlize_quoted_links }}</pre>{% endautoescape %}
</div> </div>
</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 %}
...@@ -257,6 +256,10 @@ ...@@ -257,6 +256,10 @@
</div><!-- /.container --> </div><!-- /.container -->
</div><!-- ./wrapper --> </div><!-- ./wrapper -->
{% if filter_form %}
{{ filter_form }}
{% endif %}
{% block script %} {% block script %}
<script> <script>
window.drf = { window.drf = {
...@@ -276,10 +279,6 @@ ...@@ -276,10 +279,6 @@
</script> </script>
{% endblock %} {% endblock %}
{% if filter_form %} </body>
{{ filter_form }} {% endblock %}
{% endif %}
</body>
{% endblock %}
</html> </html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment