Merge branch 'feature/demo' into develop

Fantomas42 · Jul 25, 2014 · 5364a71 · 5364a71
2 parents ffe45c2 + 3224121
commit 5364a71
Show file tree

Hide file tree

Showing 10 changed files with 124 additions and 1 deletion.
diff --git a/app_namespace/demo/__init__.py b/app_namespace/demo/__init__.py
@@ -0,0 +1 @@
+"""Demo of the app_namespace app"""
diff --git a/app_namespace/demo/application/__init__.py b/app_namespace/demo/application/__init__.py
@@ -0,0 +1,3 @@
+"""
+demo.application
+"""
diff --git a/app_namespace/demo/application/templates/application/template.html b/app_namespace/demo/application/templates/application/template.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="author" content="Fantomas42">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>{% block title %}Django-app-namespace-template-loader{% endblock title %}</title>
+    {% block style %}
+    {% endblock style %}
+  </head>
+  <body>
+    <div class="container">
+      <div class="row">
+        <div class="col-md-12 col-md-offset-0">
+          <h1>{% block header %}Header{% endblock header %}</h1>
+          <p>{% block content %}Content{% endblock content %}</p>
+          <ul>
+            {% block list %}
+            <li>
+              <code>application:application/template.html</code>
+            </li>
+            {% endblock%}
+          </ul>
+          <footer>
+            <p class="text-right">
+              {% block footer %}Footer{% endblock footer %}
+            </p>
+          </footer>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/app_namespace/demo/application_extension/__init__.py b/app_namespace/demo/application_extension/__init__.py
@@ -0,0 +1,3 @@
+"""
+demo.application_extension
+"""
diff --git a/app_namespace/demo/application_extension/templates/application/template.html b/app_namespace/demo/application_extension/templates/application/template.html
@@ -0,0 +1,14 @@
+{% extends ":application/template.html" %}
+
+{% block title %}Django-app-namespace-template-loader{% endblock title %}
+
+{% block header %}Django-app-namespace-loader{% endblock header %}
+
+{% block content %}This page has been generated by a combination of extend and override of these templates:{% endblock content %}
+
+{% block list %}
+<li>
+  <code>application_extension:application/template.html</code>
+</li>
+{{ block.super }}
+{% endblock%}
diff --git a/app_namespace/demo/settings.py b/app_namespace/demo/settings.py
@@ -0,0 +1,28 @@
+"""Settings for the app_namespace demo"""
+import os
+
+PROJECT_ROOT = os.path.abspath(os.path.dirname(__file__))
+
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+STATIC_URL = '/static/'
+
+SECRET_KEY = 'secret-key'
+
+ROOT_URLCONF = 'app_namespace.demo.urls'
+
+TEMPLATE_LOADERS = (
+    'app_namespace.Loader',
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader',
+)
+
+TEMPLATE_DIRS = (
+    os.path.join(PROJECT_ROOT, 'templates')
+)
+
+INSTALLED_APPS = (
+    'app_namespace.demo.application_extension',
+    'app_namespace.demo.application'
+)
diff --git a/app_namespace/demo/templates/application/template.html b/app_namespace/demo/templates/application/template.html
@@ -0,0 +1,22 @@
+{% extends ":application/template.html" %}
+
+{% block title %}Demo - {{ block.super }}{% endblock title %}
+
+{% block style %}
+ <link href="//netdna.bootstrapcdn.com/bootstrap/3.0.1/css/bootstrap.min.css" rel="stylesheet">
+ <style type="text/css">
+   body { background-color: #eee; }
+   .container .row div { background-color: white; }
+ </style>
+{% endblock style %}
+
+{% block list %}
+<li>
+  <code>application/template.html</code>
+</li>
+{{ block.super }}
+{% endblock list %}
+
+{% block footer %}
+Demo made by <a href="https://github.com/Fantomas42">Fantomas42</a>.
+{% endblock footer %}
diff --git a/app_namespace/demo/urls.py b/app_namespace/demo/urls.py
@@ -0,0 +1,11 @@
+"""Urls for the app_namespace demo"""
+from django.conf.urls import url
+from django.conf.urls import patterns
+from django.views.generic import TemplateView
+
+
+urlpatterns = patterns(
+    '',
+    url(r'^$', TemplateView.as_view(
+        template_name='application/template.html')),
+    )
diff --git a/buildout.cfg b/buildout.cfg
@@ -1,6 +1,7 @@
 [buildout]
 extends                 = versions.cfg
-parts                   = test
+parts                   = demo
+                          test
                           test-and-cover
                           flake8
                           coveralls
@@ -11,6 +12,12 @@ eggs                    = six
                           django-app-namespace-template-loader
 show-picked-versions    = true
 
+[demo]
+recipe                  = djangorecipe
+projectegg              = app_namespace.demo
+settings                = settings
+eggs                    = ${buildout:eggs}
+
 [test]
 recipe                  = pbp.recipe.noserunner
 eggs                    = nose

diff --git a/versions.cfg b/versions.cfg
@@ -2,6 +2,7 @@
 Django                          = 1.6.5
 blessings                       = 1.5.1
 buildout-versions-checker       = 1.5.1
+djangorecipe                    = 1.10
 flake8                          = 2.2.2
 futures                         = 2.1.6
 mccabe                          = 0.2.1