Update tabbing and cleanup theme templates

author: José Padilla 2014-10-31 11:38:27 -0400
committer: Dougal Matthews 2014-11-25 12:44:11 +0000
commit: 3bfc82068b068defee470910a850757e4c12df3b (patch)
tree: 78709e3dc2bc2df78c61988f2c888c10df6dd6bf
parent: 361827350a8bd4efb4d6a09bcb29c0185a5454ed (diff)
download: django-rest-framework-3bfc82068b068defee470910a850757e4c12df3b.tar.bz2
3 files changed, 274 insertions, 247 deletions
diff --git a/docs_theme/404.html b/docs_theme/404.html
index 864247e7..44993e37 100644
--- a/docs_theme/404.html
+++ b/docs_theme/404.html
@@ -1,50 +1,54 @@
 <!DOCTYPE html>
 <html lang="en">
-<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta charset="utf-8">
-    <title>Django REST framework - 404 - Page not found</title>
-    <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon">
-    <link rel="canonical" href="http://www.django-rest-framework.org/404"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="Django, API, REST, 404 - Page not found">
-    <meta name="author" content="Tom Christie">
-
-    <!-- Le styles -->
-    <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet">
-    <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet">
-    <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet">
-    <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-18852272-2']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
-    </script>
-  </head>
-  <body onload="prettyPrint()" class="404-page">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta charset="utf-8">
+  <title>Django REST framework - 404 - Page not found</title>
+  <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon">
+  <link rel="canonical" href="http://www.django-rest-framework.org/404" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="description" content="Django, API, REST, 404 - Page not found">
+  <meta name="author" content="Tom Christie">
+
+  <!-- Le styles -->
+  <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet">
+  <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet">
+  <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet">
+  <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">
+
+  <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+  <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+  <![endif]-->
+
+  <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-18852272-2']);
+    _gaq.push(['_trackPageview']);
+
+    (function() {
+      var ga = document.createElement('script');
+      ga.type = 'text/javascript';
+      ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0];
+      s.parentNode.insertBefore(ga, s);
+    })();
+  </script>
+</head>
+
+<body onload="prettyPrint()" class="404-page">
 
   <div class="wrapper">
 
     <div class="navbar navbar-inverse navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container-fluid">
-            <a class="repo-link btn btn-primary btn-small" href="https://github.com/tomchristie/django-rest-framework/tree/master">GitHub</a>
-            <a class="repo-link btn btn-inverse btn-small disabled" href="#">Next <i class="icon-arrow-right icon-white"></i></a>
-            <a class="repo-link btn btn-inverse btn-small disabled" href="#"><i class="icon-arrow-left icon-white"></i> Previous</a>
-            <a class="repo-link btn btn-inverse btn-small" href="#searchModal" data-toggle="modal"><i class="icon-search icon-white"></i> Search</a>
+          <a class="repo-link btn btn-primary btn-small" href="https://github.com/tomchristie/django-rest-framework/tree/master">GitHub</a>
+          <a class="repo-link btn btn-inverse btn-small disabled" href="#">Next <i class="icon-arrow-right icon-white"></i></a>
+          <a class="repo-link btn btn-inverse btn-small disabled" href="#"><i class="icon-arrow-left icon-white"></i> Previous</a>
+          <a class="repo-link btn btn-inverse btn-small" href="#searchModal" data-toggle="modal"><i class="icon-search icon-white"></i> Search</a>
           <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -121,81 +125,92 @@
               </li>
             -->
             </ul>
-          </div><!--/.nav-collapse -->
+          </div>
+          <!--/.nav-collapse -->
         </div>
       </div>
     </div>
 
     <div class="body-content">
       <div class="container-fluid">
-
-<!-- Search Modal -->
-<div id="searchModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-    <h3 id="myModalLabel">Documentation search</h3>
-  </div>
-  <div class="modal-body">
-    <!-- Custom google search -->
-    <script>
-      (function() {
-        var cx = '015016005043623903336:rxraeohqk6w';
-        var gcse = document.createElement('script');
-        gcse.type = 'text/javascript';
-        gcse.async = true;
-        gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
-            '//www.google.com/cse/cse.js?cx=' + cx;
-        var s = document.getElementsByTagName('script')[0];
-        s.parentNode.insertBefore(gcse, s);
-      })();
-    </script>
-    <gcse:search></gcse:search>
-  </div>
-  <div class="modal-footer">
-    <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-  </div>
-</div>
+        <!-- Search Modal -->
+        <div id="searchModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            <h3 id="myModalLabel">Documentation search</h3>
+          </div>
+          <div class="modal-body">
+            <!-- Custom google search -->
+            <script>
+              (function() {
+                var cx = '015016005043623903336:rxraeohqk6w';
+                var gcse = document.createElement('script');
+                gcse.type = 'text/javascript';
+                gcse.async = true;
+                gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+                  '//www.google.com/cse/cse.js?cx=' + cx;
+                var s = document.getElementsByTagName('script')[0];
+                s.parentNode.insertBefore(gcse, s);
+              })();
+            </script>
+            <gcse:search></gcse:search>
+          </div>
+          <div class="modal-footer">
+            <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+          </div>
+        </div>
 
         <div class="row-fluid">
           <div id="main-content" class="span12">
             <h1 id="404-page-not-found" style="text-align: center">404</h1>
-            <p style="text-align: center"><strong>Page not found</strong></p>
+            <p style="text-align: center"><strong>Page not found</strong>
+            </p>
             <p style="text-align: center">Try the <a href="http://www.django-rest-framework.org/">homepage</a>, or <a href="#searchModal" data-toggle="modal">search the documentation</a>.</p>
-          </div><!--/span-->
-        </div><!--/row-->
-      </div><!--/.fluid-container-->
-    </div><!--/.body content-->
+          </div>
+          <!--/span-->
+        </div>
+        <!--/row-->
+      </div>
+      <!--/.fluid-container-->
+    </div>
+    <!--/.body content-->
 
-      <div id="push"></div>
-  </div><!--/.wrapper -->
+    <div id="push"></div>
+  </div>
+  <!--/.wrapper -->
 
   <footer class="span12">
-    <p>Sponsored by <a href="http://dabapps.com/">DabApps</a>.</a></p>
+    <p>Sponsored by <a href="http://dabapps.com/">DabApps</a>.</a>
+    </p>
   </footer>
 
-    <!-- Le javascript
+  <!-- Le javascript
     ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script>
-    <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script>
-    <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>
-    <script>
-      //$('.side-nav').scrollspy()
-      var shiftWindow = function() { scrollBy(0, -50) };
-      if (location.hash) shiftWindow();
-      window.addEventListener("hashchange", shiftWindow);
-
-      $('.dropdown-menu').on('click touchstart', function(event) {
-        event.stopPropagation();
+  <!-- Placed at the end of the document so the pages load faster -->
+  <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script>
+  <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script>
+  <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>
+  <script>
+    //$('.side-nav').scrollspy()
+    var shiftWindow = function() {
+      scrollBy(0, -50)
+    };
+    if (location.hash) shiftWindow();
+    window.addEventListener("hashchange", shiftWindow);
+
+    $('.dropdown-menu').on('click touchstart', function(event) {
+      event.stopPropagation();
+    });
+
+    // Dynamically force sidenav to no higher than browser window
+    $('.side-nav').css('max-height', window.innerHeight - 130);
+
+    $(function() {
+      $(window).resize(function() {
+        $('.side-nav').css('max-height', window.innerHeight - 130);
       });
+    });
+  </script>
+</body>
 
-      // Dynamically force sidenav to no higher than browser window
-      $('.side-nav').css('max-height', window.innerHeight - 130);
-
-      $(function(){
-        $(window).resize(function(){
-          $('.side-nav').css('max-height', window.innerHeight - 130);
-        });
-      });
-    </script>
-</body></html>
+</html>
diff --git a/docs_theme/base.html b/docs_theme/base.html
index 67290df6..544e2188 100644
--- a/docs_theme/base.html
+++ b/docs_theme/base.html
@@ -1,56 +1,62 @@
 <!DOCTYPE html>
 <html lang="en">
-<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta charset="utf-8">
-    <title>{{ page_title }}</title>
-    <link href="{{ base_url }}/img/favicon.ico" rel="icon" type="image/x-icon">
-    <link rel="canonical" href="{{ canonical_url }}"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="Django, API, REST, {{ current_page.title }}">
-    <meta name="author" content="Tom Christie">
-
-    <!-- Le styles -->
-    <link href="{{ base_url }}/css/prettify.css" rel="stylesheet">
-    <link href="{{ base_url }}/css/bootstrap.css" rel="stylesheet">
-    <link href="{{ base_url }}/css/bootstrap-responsive.css" rel="stylesheet">
-    <link href="{{ base_url }}/css/default.css" rel="stylesheet">
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-18852272-2']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
-    </script>
-    <style>
-span.fusion-wrap a {
-  display: block;
-  margin-top: 10px;
-  color: black;
-}
-
-a.fusion-poweredby {
-  display: block;
-  margin-top: 10px;
-}
-@media (max-width: 767px) {
-  div.promo {display: none;}
-}
-</style>
-  </head>
-  {# TODO: This is a bit of a hack. We don't want to refer to the file specifically. #}
-  <body onload="prettyPrint()" class="{% if current_page.input_path  == 'index.md' %}index{% endif %}-page">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta charset="utf-8">
+  <title>{{ page_title }}</title>
+  <link href="{{ base_url }}/img/favicon.ico" rel="icon" type="image/x-icon">
+  <link rel="canonical" href="{{ canonical_url }}" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="description" content="Django, API, REST, {{ current_page.title }}">
+  <meta name="author" content="Tom Christie">
+
+  <!-- Le styles -->
+  <link href="{{ base_url }}/css/prettify.css" rel="stylesheet">
+  <link href="{{ base_url }}/css/bootstrap.css" rel="stylesheet">
+  <link href="{{ base_url }}/css/bootstrap-responsive.css" rel="stylesheet">
+  <link href="{{ base_url }}/css/default.css" rel="stylesheet">
+
+  <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+  <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+  <![endif]-->
+
+  <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-18852272-2']);
+    _gaq.push(['_trackPageview']);
+
+    (function() {
+      var ga = document.createElement('script');
+      ga.type = 'text/javascript';
+      ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0];
+      s.parentNode.insertBefore(ga, s);
+    })();
+  </script>
+
+  <style>
+    span.fusion-wrap a {
+      display: block;
+      margin-top: 10px;
+      color: black;
+    }
+    a.fusion-poweredby {
+      display: block;
+      margin-top: 10px;
+    }
+    @media (max-width: 767px) {
+      div.promo {
+        display: none;
+      }
+    }
+  </style>
+</head>
+{# TODO: This is a bit of a hack. We don't want to refer to the file specifically. #}
+
+<body onload="prettyPrint()" class="{% if current_page.input_path == 'index.md' %}index{% endif %}-page">
 
   <div class="wrapper">
 
@@ -59,32 +65,34 @@ a.fusion-poweredby {
     <div class="body-content">
       <div class="container-fluid">
 
-<!-- Search Modal -->
-<div id="searchModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-    <h3 id="myModalLabel">Documentation search</h3>
-  </div>
-  <div class="modal-body">
-    <!-- Custom google search -->
-    <script>
-      (function() {
-        var cx = '015016005043623903336:rxraeohqk6w';
-        var gcse = document.createElement('script');
-        gcse.type = 'text/javascript';
-        gcse.async = true;
-        gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
-            '//www.google.com/cse/cse.js?cx=' + cx;
-        var s = document.getElementsByTagName('script')[0];
-        s.parentNode.insertBefore(gcse, s);
-      })();
-    </script>
-    <gcse:search></gcse:search>
-  </div>
-  <div class="modal-footer">
-    <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-  </div>
-</div>
+        <!-- Search Modal -->
+        <div id="searchModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            <h3 id="myModalLabel">Documentation search</h3>
+          </div>
+
+          <div class="modal-body">
+            <!-- Custom google search -->
+            <script>
+              (function() {
+                var cx = '015016005043623903336:rxraeohqk6w';
+                var gcse = document.createElement('script');
+                gcse.type = 'text/javascript';
+                gcse.async = true;
+                gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+                  '//www.google.com/cse/cse.js?cx=' + cx;
+                var s = document.getElementsByTagName('script')[0];
+                s.parentNode.insertBefore(gcse, s);
+              })();
+            </script>
+            <gcse:search></gcse:search>
+          </div>
+
+          <div class="modal-footer">
+            <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+          </div>
+        </div>
 
         <div class="row-fluid">
 
@@ -98,18 +106,16 @@ a.fusion-poweredby {
             <div id="table-of-contents">
               <ul class="nav nav-list side-nav well sidebar-nav-fixed">
                 {% for toc_item in toc %}
-                  <li class="{% if loop.first %}main{% endif %} {% if toc_item.active %}main{% endif %}"><a href="{{ toc_item.url }}">{{ toc_item.title }}</a></li>
-                  {% for toc_item in toc_item.children %}
-                    <li><a href="{{ toc_item.url }}">{{ toc_item.title }}</a></li>
-                  {% endfor %}
-                {% endfor %}
-
-                {# TODO: This is a bit of a hack. We don't want to refer to the file specifically. #}
-                {% if current_page.input_path  == 'index.md' %}
-                  <div class="promo">
-                    <hr/>
-                    <script type="text/javascript" src="//cdn.fusionads.net/fusion.js?zoneid=1332&serve=C6SDP2Y&placement=djangorestframework" id="_fusionads_js"></script>
-                  </div>
+                <li class="{% if loop.first %}main{% endif %} {% if toc_item.active %}main{% endif %}"><a href="{{ toc_item.url }}">{{ toc_item.title }}</a>
+                </li>
+                {% for toc_item in toc_item.children %}
+                <li><a href="{{ toc_item.url }}">{{ toc_item.title }}</a>
+                </li>
+                {% endfor %} {% endfor %} {# TODO: This is a bit of a hack. We don't want to refer to the file specifically. #} {% if current_page.input_path == 'index.md' %}
+                <div class="promo">
+                  <hr/>
+                  <script type="text/javascript" src="//cdn.fusionads.net/fusion.js?zoneid=1332&serve=C6SDP2Y&placement=djangorestframework" id="_fusionads_js"></script>
+                </div>
                 {% endif %}
 
               </ul>
@@ -127,42 +133,51 @@ a.fusion-poweredby {
             {% endif %}
 
             {{ content }}
-          </div><!--/span-->
-        </div><!--/row-->
-      </div><!--/.fluid-container-->
-    </div><!--/.body content-->
-
-      <div id="push"></div>
-  </div><!--/.wrapper -->
+          </div>
+          <!--/span-->
+        </div>
+        <!--/row-->
+      </div>
+      <!--/.fluid-container-->
+    </div>
+    <!--/.body content-->
+    <div id="push"></div>
+  </div>
+  <!--/.wrapper -->
 
   <footer class="span12">
-    <p>Sponsored by <a href="http://dabapps.com/">DabApps</a>.</a></p>
+    <p>Sponsored by <a href="http://dabapps.com/">DabApps</a>.</a>
+    </p>
   </footer>
 
-    <!-- Le javascript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="{{ base_url }}/js/jquery-1.8.1-min.js"></script>
-    <script src="{{ base_url }}/js/prettify-1.0.js"></script>
-    <script src="{{ base_url }}/js/bootstrap-2.1.1-min.js"></script>
-
-    <script>
-      //$('.side-nav').scrollspy()
-      var shiftWindow = function() { scrollBy(0, -50) };
-      if (location.hash) shiftWindow();
-      window.addEventListener("hashchange", shiftWindow);
-
-      $('.dropdown-menu').on('click touchstart', function(event) {
-        event.stopPropagation();
+  <!-- Le javascript
+  ================================================== -->
+  <!-- Placed at the end of the document so the pages load faster -->
+  <script src="{{ base_url }}/js/jquery-1.8.1-min.js"></script>
+  <script src="{{ base_url }}/js/prettify-1.0.js"></script>
+  <script src="{{ base_url }}/js/bootstrap-2.1.1-min.js"></script>
+
+  <script>
+    //$('.side-nav').scrollspy()
+    var shiftWindow = function() {
+      scrollBy(0, -50)
+    };
+    if (location.hash) shiftWindow();
+    window.addEventListener("hashchange", shiftWindow);
+
+    $('.dropdown-menu').on('click touchstart', function(event) {
+      event.stopPropagation();
+    });
+
+    // Dynamically force sidenav to no higher than browser window
+    $('.side-nav').css('max-height', window.innerHeight - 130);
+
+    $(function() {
+      $(window).resize(function() {
+        $('.side-nav').css('max-height', window.innerHeight - 130);
       });
+    });
+  </script>
+</body>
 
-      // Dynamically force sidenav to no higher than browser window
-      $('.side-nav').css('max-height', window.innerHeight - 130);
-
-      $(function(){
-        $(window).resize(function(){
-          $('.side-nav').css('max-height', window.innerHeight - 130);
-        });
-      });
-    </script>
-</body></html>
+</html>
diff --git a/docs_theme/nav.html b/docs_theme/nav.html
index a7a72d68..87e197b3 100644
--- a/docs_theme/nav.html
+++ b/docs_theme/nav.html
@@ -1,11 +1,10 @@
-
     <div class="navbar navbar-inverse navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container-fluid">
-            <a class="repo-link btn btn-primary btn-small" href="https://github.com/tomchristie/django-rest-framework/tree/master">GitHub</a>
-            <a class="repo-link btn btn-inverse btn-small " href="tutorial/quickstart">Next <i class="icon-arrow-right icon-white"></i></a>
-            <a class="repo-link btn btn-inverse btn-small disabled" href="#"><i class="icon-arrow-left icon-white"></i> Previous</a>
-            <a class="repo-link btn btn-inverse btn-small" href="#searchModal" data-toggle="modal"><i class="icon-search icon-white"></i> Search</a>
+          <a class="repo-link btn btn-primary btn-small" href="https://github.com/tomchristie/django-rest-framework/tree/master">GitHub</a>
+          <a class="repo-link btn btn-inverse btn-small " href="tutorial/quickstart">Next <i class="icon-arrow-right icon-white"></i></a>
+          <a class="repo-link btn btn-inverse btn-small disabled" href="#"><i class="icon-arrow-left icon-white"></i> Previous</a>
+          <a class="repo-link btn btn-inverse btn-small" href="#searchModal" data-toggle="modal"><i class="icon-search icon-white"></i> Search</a>
           <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -14,31 +13,29 @@
           <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>
           <div class="nav-collapse collapse">
             {% if include_nav %}
-              <!-- Main navigation -->
-              <ul class="nav navbar-nav">
-                {% for nav_item in nav %}
-                  {% if nav_item.children %}
-                    <li class="dropdown{% if nav_item.active %} active{% endif %}">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ nav_item.title }} <b class="caret"></b></a>
-                    <ul class="dropdown-menu">
-                    {% for nav_item in nav_item.children %}
-                      <li {% if nav_item.active %}class="active"{% endif %}>
-                      <a href="{{ nav_item.url }}">{{ nav_item.title }}</a>
-                      </li>
-                    {% endfor %}
-                    </ul>
-                    </li>
-                  {% else %}
-                    <li {% if nav_item.active %}class="active"{% endif %}>
+            <!-- Main navigation -->
+            <ul class="nav navbar-nav">
+              {% for nav_item in nav %} {% if nav_item.children %}
+              <li class="dropdown{% if nav_item.active %} active{% endif %}">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ nav_item.title }} <b class="caret"></b></a>
+                <ul class="dropdown-menu">
+                  {% for nav_item in nav_item.children %}
+                  <li {% if nav_item.active %}class="active" {% endif %}>
                     <a href="{{ nav_item.url }}">{{ nav_item.title }}</a>
-                    </li>
-                  {% endif %}
-
-                {% endfor %}
+                  </li>
+                  {% endfor %}
+                </ul>
+              </li>
+              {% else %}
+              <li {% if nav_item.active %}class="active" {% endif %}>
+                <a href="{{ nav_item.url }}">{{ nav_item.title }}</a>
+              </li>
+              {% endif %} {% endfor %}
 
-              </ul>
+            </ul>
             {% endif %}
-          </div><!--/.nav-collapse -->
+          </div>
+          <!--/.nav-collapse -->
 
         </div>
       </div>
author	José Padilla	2014-10-31 11:38:27 -0400
committer	Dougal Matthews	2014-11-25 12:44:11 +0000
commit	3bfc82068b068defee470910a850757e4c12df3b (patch)
tree	78709e3dc2bc2df78c61988f2c888c10df6dd6bf
parent	361827350a8bd4efb4d6a09bcb29c0185a5454ed (diff)
download	django-rest-framework-3bfc82068b068defee470910a850757e4c12df3b.tar.bz2