Update tabbing and cleanup theme templates

This commit is contained in:
José Padilla 2014-10-31 11:38:27 -04:00 committed by Dougal Matthews
parent 361827350a
commit 3bfc82068b
3 changed files with 258 additions and 231 deletions

View File

@ -1,6 +1,8 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta charset="utf-8"> <meta charset="utf-8">
<title>Django REST framework - 404 - Page not found</title> <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 href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon">
@ -21,19 +23,21 @@
<![endif]--> <![endif]-->
<script type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-18852272-2']); _gaq.push(['_setAccount', 'UA-18852272-2']);
_gaq.push(['_trackPageview']); _gaq.push(['_trackPageview']);
(function() { (function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; 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'; 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); var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
</head> </head>
<body onload="prettyPrint()" class="404-page"> <body onload="prettyPrint()" class="404-page">
<div class="wrapper"> <div class="wrapper">
@ -121,14 +125,14 @@
</li> </li>
--> -->
</ul> </ul>
</div><!--/.nav-collapse --> </div>
<!--/.nav-collapse -->
</div> </div>
</div> </div>
</div> </div>
<div class="body-content"> <div class="body-content">
<div class="container-fluid"> <div class="container-fluid">
<!-- Search Modal --> <!-- Search Modal -->
<div id="searchModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div id="searchModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-header"> <div class="modal-header">
@ -159,18 +163,25 @@
<div class="row-fluid"> <div class="row-fluid">
<div id="main-content" class="span12"> <div id="main-content" class="span12">
<h1 id="404-page-not-found" style="text-align: center">404</h1> <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> <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>
</div><!--/row--> <!--/span-->
</div><!--/.fluid-container--> </div>
</div><!--/.body content--> <!--/row-->
</div>
<!--/.fluid-container-->
</div>
<!--/.body content-->
<div id="push"></div> <div id="push"></div>
</div><!--/.wrapper --> </div>
<!--/.wrapper -->
<footer class="span12"> <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> </footer>
<!-- Le javascript <!-- Le javascript
@ -181,7 +192,9 @@
<script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script> <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>
<script> <script>
//$('.side-nav').scrollspy() //$('.side-nav').scrollspy()
var shiftWindow = function() { scrollBy(0, -50) }; var shiftWindow = function() {
scrollBy(0, -50)
};
if (location.hash) shiftWindow(); if (location.hash) shiftWindow();
window.addEventListener("hashchange", shiftWindow); window.addEventListener("hashchange", shiftWindow);
@ -198,4 +211,6 @@
}); });
}); });
</script> </script>
</body></html> </body>
</html>

View File

@ -1,6 +1,8 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta charset="utf-8"> <meta charset="utf-8">
<title>{{ page_title }}</title> <title>{{ page_title }}</title>
<link href="{{ base_url }}/img/favicon.ico" rel="icon" type="image/x-icon"> <link href="{{ base_url }}/img/favicon.ico" rel="icon" type="image/x-icon">
@ -21,35 +23,39 @@
<![endif]--> <![endif]-->
<script type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-18852272-2']); _gaq.push(['_setAccount', 'UA-18852272-2']);
_gaq.push(['_trackPageview']); _gaq.push(['_trackPageview']);
(function() { (function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; 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'; 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); var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
<style> <style>
span.fusion-wrap a { span.fusion-wrap a {
display: block; display: block;
margin-top: 10px; margin-top: 10px;
color: black; color: black;
} }
a.fusion-poweredby { a.fusion-poweredby {
display: block; display: block;
margin-top: 10px; margin-top: 10px;
} }
@media (max-width: 767px) { @media (max-width: 767px) {
div.promo {display: none;} div.promo {
display: none;
}
} }
</style> </style>
</head> </head>
{# TODO: This is a bit of a hack. We don't want to refer to the file specifically. #} {# 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"> <body onload="prettyPrint()" class="{% if current_page.input_path == 'index.md' %}index{% endif %}-page">
<div class="wrapper"> <div class="wrapper">
@ -65,6 +71,7 @@ a.fusion-poweredby {
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3 id="myModalLabel">Documentation search</h3> <h3 id="myModalLabel">Documentation search</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<!-- Custom google search --> <!-- Custom google search -->
<script> <script>
@ -81,6 +88,7 @@ a.fusion-poweredby {
</script> </script>
<gcse:search></gcse:search> <gcse:search></gcse:search>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button> <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
</div> </div>
@ -98,14 +106,12 @@ a.fusion-poweredby {
<div id="table-of-contents"> <div id="table-of-contents">
<ul class="nav nav-list side-nav well sidebar-nav-fixed"> <ul class="nav nav-list side-nav well sidebar-nav-fixed">
{% for toc_item in toc %} {% 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> <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 %} {% for toc_item in toc_item.children %}
<li><a href="{{ toc_item.url }}">{{ toc_item.title }}</a></li> <li><a href="{{ toc_item.url }}">{{ toc_item.title }}</a>
{% endfor %} </li>
{% endfor %} {% 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' %}
{# 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"> <div class="promo">
<hr/> <hr/>
<script type="text/javascript" src="//cdn.fusionads.net/fusion.js?zoneid=1332&serve=C6SDP2Y&placement=djangorestframework" id="_fusionads_js"></script> <script type="text/javascript" src="//cdn.fusionads.net/fusion.js?zoneid=1332&serve=C6SDP2Y&placement=djangorestframework" id="_fusionads_js"></script>
@ -127,16 +133,21 @@ a.fusion-poweredby {
{% endif %} {% endif %}
{{ content }} {{ content }}
</div><!--/span--> </div>
</div><!--/row--> <!--/span-->
</div><!--/.fluid-container--> </div>
</div><!--/.body content--> <!--/row-->
</div>
<!--/.fluid-container-->
</div>
<!--/.body content-->
<div id="push"></div> <div id="push"></div>
</div><!--/.wrapper --> </div>
<!--/.wrapper -->
<footer class="span12"> <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> </footer>
<!-- Le javascript <!-- Le javascript
@ -148,7 +159,9 @@ a.fusion-poweredby {
<script> <script>
//$('.side-nav').scrollspy() //$('.side-nav').scrollspy()
var shiftWindow = function() { scrollBy(0, -50) }; var shiftWindow = function() {
scrollBy(0, -50)
};
if (location.hash) shiftWindow(); if (location.hash) shiftWindow();
window.addEventListener("hashchange", shiftWindow); window.addEventListener("hashchange", shiftWindow);
@ -165,4 +178,6 @@ a.fusion-poweredby {
}); });
}); });
</script> </script>
</body></html> </body>
</html>

View File

@ -1,4 +1,3 @@
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container-fluid"> <div class="container-fluid">
@ -16,8 +15,7 @@
{% if include_nav %} {% if include_nav %}
<!-- Main navigation --> <!-- Main navigation -->
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
{% for nav_item in nav %} {% for nav_item in nav %} {% if nav_item.children %}
{% if nav_item.children %}
<li class="dropdown{% if nav_item.active %} active{% endif %}"> <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> <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ nav_item.title }} <b class="caret"></b></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
@ -32,13 +30,12 @@
<li {% if nav_item.active %}class="active" {% endif %}> <li {% if nav_item.active %}class="active" {% endif %}>
<a href="{{ nav_item.url }}">{{ nav_item.title }}</a> <a href="{{ nav_item.url }}">{{ nav_item.title }}</a>
</li> </li>
{% endif %} {% endif %} {% endfor %}
{% endfor %}
</ul> </ul>
{% endif %} {% endif %}
</div><!--/.nav-collapse --> </div>
<!--/.nav-collapse -->
</div> </div>
</div> </div>