Merge pull request #28 from ekonstantinidis/templates-override

ekonstantinidis · ekonstantinidis · commit 86dd021f9144 · 2015-12-20T23:21:18.000Z
Fix overriding templates
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,9 +1,12 @@
 include README.md
 include LICENSE
+include MANIFEST.in
 
-recursive-include rest_framework_docs/static *
-recursive-include rest_framework_docs/templates *.html
+global-exclude __pycache__
+global-exclude *.py[co]
+global-exclude package.json
 
-recursive-exclude rest_framework_docs/static/node_modules *.*
-recursive-exclude * __pycache__
-recursive-exclude * *.py[co]
+prune rest_framework_docs/static/node_modules
+
+graft rest_framework_docs/static/rest_framework_docs
+graft rest_framework_docs/templates/rest_framework_docs
diff --git a/rest_framework_docs/__init__.py b/rest_framework_docs/__init__.py
@@ -1 +1 @@
-__version__ = '0.0.3'
+__version__ = '0.0.4'
diff --git a/rest_framework_docs/templates/rest_framework_docs/base.html b/rest_framework_docs/templates/rest_framework_docs/base.html
@@ -9,18 +9,21 @@
 
     <title>{% block title %}DRF Docs{% endblock %}</title>
 
-    <!-- Custom Style -->
+    {% block style %}
     <link rel="stylesheet" href="{% static "rest_framework_docs/css/style.css" %}">
+    {% endblock %}
   </head>
 
   <body>
+    {% block github_badge %}
     <a href="https://github.com/ekonstantinidis/drf-docs/" class="github-corner" target="_blank">
       <svg width="80" height="80" viewBox="0 0 250 250" style="fill:#18bc9c; color:#fff; position: absolute; top: 0; border: 0; right: 0;">
         <path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path>
         <path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path>
         <path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path>
       </svg>
     </a>
+    {% endblock %}
 
     <div class="container">
 
@@ -51,10 +54,12 @@
         </div><!-- /.container-fluid -->
       </nav>
 
+      {% block jumbotron %}
       <div class="jumbotron">
         <h1>DRF Docs</h1>
         <h3>Document Web APIs made with <a href="http://www.django-rest-framework.org/" target="_blank">Django Rest Framework</a>.</h3>
       </div>
+      {% endblock %}
 
       {% block content %}{% endblock %}
 
diff --git a/rest_framework_docs/templates/rest_framework_docs/docs.html b/rest_framework_docs/templates/rest_framework_docs/docs.html
@@ -0,0 +1,3 @@
+{% extends "rest_framework_docs/base.html" %}
+
+{# Override this template in your own templates directory to customize #}
diff --git a/rest_framework_docs/templates/rest_framework_docs/home.html b/rest_framework_docs/templates/rest_framework_docs/home.html
@@ -1,4 +1,4 @@
-{% extends "rest_framework_docs/base.html" %}
+{% extends "rest_framework_docs/docs.html" %}
 
 {% block apps_menu %}
 {% regroup endpoints by name_parent as endpoints_grouped %}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = '0.0.3'`
	`1`	`+__version__ = '0.0.4'`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{% extends "rest_framework_docs/base.html" %}`
	`2`	`+`
	`3`	`+{# Override this template in your own templates directory to customize #}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% extends "rest_framework_docs/base.html" %}`
	`1`	`+{% extends "rest_framework_docs/docs.html" %}`
`2`	`2`
`3`	`3`	`{% block apps_menu %}`
`4`	`4`	`{% regroup endpoints by name_parent as endpoints_grouped %}`