working on stubbing out more template engine implementation pages

mattmakai · mattmakai · commit 0f22c27db77f · 2017-01-22T18:47:22.000-08:00
diff --git a/all.html b/all.html
@@ -3027,7 +3027,7 @@ <h1>Django</h1>
 <p>For example, 
 <a href="https://docs.djangoproject.com/en/dev/topics/auth/">authentication</a>,
 <a href="https://docs.djangoproject.com/en/dev/topics/http/urls/">URL routing</a>, a 
-<a href="https://docs.djangoproject.com/en/dev/topics/templates/">templating system</a>,
+<a href="/django-templates.html">template engine</a>,
 an <a href="/object-relational-mappers-orms.html">object-relational mapper</a> (ORM),
 and <a href="https://docs.djangoproject.com/en/dev/topics/migrations/">database schema migrations</a>
 (as of version 1.7) are all included with the <a href="https://pypi.python.org/pypi/Django/">Django framework</a>. 
@@ -3063,7 +3063,7 @@ <h2>Django books and tutorials</h2>
 Django was released over 10 years ago and has had a huge number of updates
 since then, when you're looking for an up-to-date Django book check out the
 list below or read this post showing <a href="http://twoscoopspress.org/pages/current-django-books">current Django books</a>
-as of Django 1.8, 1.9.</p>
+as of Django 1.9.</p>
 <ul>
 <li>
 <p><a href="http://www.obeythetestinggoat.com/">Test-Driven Development with Python</a> 
@@ -3343,6 +3343,10 @@ <h2>Open source Django example projects</h2>
 </li>
 </ul>
 <h2>Django project templates</h2>
+<p>Project templates, not to be confused with a 
+<a href="/template-engines.html">template engine</a>, generate boilerplate code for
+a base Django project plus optional libraries that are often used when 
+developing web applications.</p>
 <ul>
 <li>
 <p><a href="https://github.com/caktus/django-project-template">Caktus Group's Django project template</a> 
@@ -4193,8 +4197,46 @@ <h3>Jinja2 resources</h3>
           <h1>Mako</h1>
 <p>Mako is a <a href="/template-engines.html">template engine built in Python</a> that is
 used to generate output HTML, XML and similar formats.</p>
+<p><a href="http://www.makotemplates.org/" style="border: none;"><img src="/source/static/img/logos/mako.jpg" width="100%" alt="Mako template engine logo." style="border-radius: 5px;" width="100%" class="technical-diagram"></a></p>
 <div class="well see-also">Mako is an implementation of the <a href="/template-engines.html">template engines</a> concept. Learn more in the <a href="/web-development.html">web development</a> chapter or view the <a href="/table-of-contents.html">table of contents</a> for all topics.</div>
+
+<h2>Mako resources</h2>
+<ul>
+<li>
+<p><a href="https://beachcoder.wordpress.com/2007/05/11/exploring-mako/">Exploring Mako</a>
+  explains a bit about the template engines Myghty and Mason, which influenced
+  Mako's design. The post then shows a few basic examples for how to use Mako.</p>
+</li>
+<li>
+<p><a href="https://codingnetworker.com/2016/01/configuration-templates-python-mako/">Configuration Templates with Python and Mako</a>
+  shows some basic situations for how to use Mako in an example project.</p>
+</li>
+<li>
+<p>The 
+  <a href="http://pylonsbook.com/en/1.1/using-view-templates.html">Pylons' project documentation on templates</a>
+  provides many examples for using Mako, which is the default template 
+  language for the Pylons <a href="web-frameworks.html">web framework</a>.</p>
+</li>
+<li>
+<p><a href="https://pythonhosted.org/Flask-Mako/">Flask-Mako</a> is a <a href="/flask.html">Flask</a> 
+  extension that makes it easier to use Mako as the template engine in your
+  Flask web app projects.</p>
+</li>
+</ul>
           <h1>Django Templates</h1>
+<p>The <a href="/django.html">Django web framework</a> contains its own 
+<a href="/template-engines.html">template engine</a> for generating HTML, XML and other
+output formats.</p>
+<p><a href="https://docs.djangoproject.com/en/dev/topics/templates/" style="border: none;"><img src="/source/static/img/logos/django.png" width="100%" alt="Django web framework logo. Trademark Django Software Foundation." style="border-radius: 5px;" width="100%" class="technical-diagram"></a></p>
+<h2>What's the difference between a "project template" and Django templates?</h2>
+<p>A project template contains the files and code to start a new web application.
+For example, when you run <code>django-admin.py startproject abc</code>, the Django
+admin script creates a new <code>abc</code> directory along with several Python 
+configuration so the web app can be run by a <a href="/wsgi-servers.html">WSGI server</a>.</p>
+<p>Django templates are different from a project template because they live 
+within a project and are written by the developer to generate output, most
+commonly HTML.</p>
+<div class="well see-also">Django templates are an implementation of the <a href="/template-engines.html">template engines</a> concept. Learn more in the <a href="/web-development.html">web development</a> chapter or view the <a href="/table-of-contents.html">table of contents</a> for all topics.</div>
           <h1>Web Design</h1>
 <p>Web design is the creation of a web application's style and user interaction
 using CSS and JavaScript.</p>
diff --git a/django-templates.html b/django-templates.html
@@ -6,7 +6,7 @@
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <meta name="author" content="Matt Makai">
-  <meta name="description" content="Django has its own template engine similar to Jinja but with minor differences and is referred to as Django templates.">
+  <meta name="description" content="Django has its own template engine referred to as Django templates and is similar to Jinja with some minor differences.">
  <title>Django Templates - Full Stack Python</title>
  <link href="/f.css" rel="stylesheet">
  <link rel="shortcut icon" href="/img/fsp-fav.png">
@@ -37,6 +37,19 @@
 </div><div class="row">
     <div class="col-md-8">
           <h1>Django Templates</h1>
+<p>The <a href="/django.html">Django web framework</a> contains its own 
+<a href="/template-engines.html">template engine</a> for generating HTML, XML and other
+output formats.</p>
+<p><a href="https://docs.djangoproject.com/en/dev/topics/templates/" style="border: none;"><img src="/source/static/img/logos/django.png" width="100%" alt="Django web framework logo. Trademark Django Software Foundation." style="border-radius: 5px;" width="100%" class="technical-diagram"></a></p>
+<h2>What's the difference between a "project template" and Django templates?</h2>
+<p>A project template contains the files and code to start a new web application.
+For example, when you run <code>django-admin.py startproject abc</code>, the Django
+admin script creates a new <code>abc</code> directory along with several Python 
+configuration so the web app can be run by a <a href="/wsgi-servers.html">WSGI server</a>.</p>
+<p>Django templates are different from a project template because they live 
+within a project and are written by the developer to generate output, most
+commonly HTML.</p>
+<div class="well see-also">Django templates are an implementation of the <a href="/template-engines.html">template engines</a> concept. Learn more in the <a href="/web-development.html">web development</a> chapter or view the <a href="/table-of-contents.html">table of contents</a> for all topics.</div>
 <h3>Learn more about template engines or another topic?</h3>
 <div class="row">
     <div class="col-md-4">
diff --git a/django.html b/django.html
@@ -46,7 +46,7 @@ <h1>Django</h1>
 <p>For example, 
 <a href="https://docs.djangoproject.com/en/dev/topics/auth/">authentication</a>,
 <a href="https://docs.djangoproject.com/en/dev/topics/http/urls/">URL routing</a>, a 
-<a href="https://docs.djangoproject.com/en/dev/topics/templates/">templating system</a>,
+<a href="/django-templates.html">template engine</a>,
 an <a href="/object-relational-mappers-orms.html">object-relational mapper</a> (ORM),
 and <a href="https://docs.djangoproject.com/en/dev/topics/migrations/">database schema migrations</a>
 (as of version 1.7) are all included with the <a href="https://pypi.python.org/pypi/Django/">Django framework</a>. 
@@ -82,7 +82,7 @@ <h2>Django books and tutorials</h2>
 Django was released over 10 years ago and has had a huge number of updates
 since then, when you're looking for an up-to-date Django book check out the
 list below or read this post showing <a href="http://twoscoopspress.org/pages/current-django-books">current Django books</a>
-as of Django 1.8, 1.9.</p>
+as of Django 1.9.</p>
 <ul>
 <li>
 <p><a href="http://www.obeythetestinggoat.com/">Test-Driven Development with Python</a> 
@@ -362,6 +362,10 @@ <h2>Open source Django example projects</h2>
 </li>
 </ul>
 <h2>Django project templates</h2>
+<p>Project templates, not to be confused with a 
+<a href="/template-engines.html">template engine</a>, generate boilerplate code for
+a base Django project plus optional libraries that are often used when 
+developing web applications.</p>
 <ul>
 <li>
 <p><a href="https://github.com/caktus/django-project-template">Caktus Group's Django project template</a> 
diff --git a/mako.html b/mako.html
@@ -39,7 +39,32 @@
           <h1>Mako</h1>
 <p>Mako is a <a href="/template-engines.html">template engine built in Python</a> that is
 used to generate output HTML, XML and similar formats.</p>
+<p><a href="http://www.makotemplates.org/" style="border: none;"><img src="/source/static/img/logos/mako.jpg" width="100%" alt="Mako template engine logo." style="border-radius: 5px;" width="100%" class="technical-diagram"></a></p>
 <div class="well see-also">Mako is an implementation of the <a href="/template-engines.html">template engines</a> concept. Learn more in the <a href="/web-development.html">web development</a> chapter or view the <a href="/table-of-contents.html">table of contents</a> for all topics.</div>
+
+<h2>Mako resources</h2>
+<ul>
+<li>
+<p><a href="https://beachcoder.wordpress.com/2007/05/11/exploring-mako/">Exploring Mako</a>
+  explains a bit about the template engines Myghty and Mason, which influenced
+  Mako's design. The post then shows a few basic examples for how to use Mako.</p>
+</li>
+<li>
+<p><a href="https://codingnetworker.com/2016/01/configuration-templates-python-mako/">Configuration Templates with Python and Mako</a>
+  shows some basic situations for how to use Mako in an example project.</p>
+</li>
+<li>
+<p>The 
+  <a href="http://pylonsbook.com/en/1.1/using-view-templates.html">Pylons' project documentation on templates</a>
+  provides many examples for using Mako, which is the default template 
+  language for the Pylons <a href="web-frameworks.html">web framework</a>.</p>
+</li>
+<li>
+<p><a href="https://pythonhosted.org/Flask-Mako/">Flask-Mako</a> is a <a href="/flask.html">Flask</a> 
+  extension that makes it easier to use Mako as the template engine in your
+  Flask web app projects.</p>
+</li>
+</ul>
 <h3>Learn more about template engines or another topic?</h3>
 <div class="row">
     <div class="col-md-4">
diff --git a/source/content/pages/07-web-development/03-django.markdown b/source/content/pages/07-web-development/03-django.markdown
@@ -21,7 +21,7 @@ libraries.
 For example, 
 [authentication](https://docs.djangoproject.com/en/dev/topics/auth/),
 [URL routing](https://docs.djangoproject.com/en/dev/topics/http/urls/), a 
-[templating system](https://docs.djangoproject.com/en/dev/topics/templates/),
+[template engine](/django-templates.html),
 an [object-relational mapper](/object-relational-mappers-orms.html) (ORM),
 and [database schema migrations](https://docs.djangoproject.com/en/dev/topics/migrations/)
 (as of version 1.7) are all included with the [Django framework](https://pypi.python.org/pypi/Django/). 
@@ -64,7 +64,7 @@ There are a slew of free or low cost resources out there for Django. Since
 Django was released over 10 years ago and has had a huge number of updates
 since then, when you're looking for an up-to-date Django book check out the
 list below or read this post showing [current Django books](http://twoscoopspress.org/pages/current-django-books)
-as of Django 1.8, 1.9.
+as of Django 1.9.
 
 * [Test-Driven Development with Python](http://www.obeythetestinggoat.com/) 
   focuses on web development using Django and JavaScript. This book uses 
@@ -300,6 +300,11 @@ to handle these files properly.
 
 
 ## Django project templates
+Project templates, not to be confused with a 
+[template engine](/template-engines.html), generate boilerplate code for
+a base Django project plus optional libraries that are often used when 
+developing web applications.
+
 * [Caktus Group's Django project template](https://github.com/caktus/django-project-template) 
   is Django 1.6+ ready.
 
diff --git a/source/content/pages/07-web-development/11-mako.markdown b/source/content/pages/07-web-development/11-mako.markdown
@@ -11,6 +11,26 @@ meta: Mako is a Python template engine used to generate HTML, XML or other outpu
 Mako is a [template engine built in Python](/template-engines.html) that is
 used to generate output HTML, XML and similar formats.
 
+<a href="http://www.makotemplates.org/" style="border: none;"><img src="/source/static/img/logos/mako.jpg" width="100%" alt="Mako template engine logo." style="border-radius: 5px;" width="100%" class="technical-diagram"></a>
+
 <div class="well see-also">Mako is an implementation of the <a href="/template-engines.html">template engines</a> concept. Learn more in the <a href="/web-development.html">web development</a> chapter or view the <a href="/table-of-contents.html">table of contents</a> for all topics.</div>
 
 
+## Mako resources
+* [Exploring Mako](https://beachcoder.wordpress.com/2007/05/11/exploring-mako/)
+  explains a bit about the template engines Myghty and Mason, which influenced
+  Mako's design. The post then shows a few basic examples for how to use Mako.
+
+* [Configuration Templates with Python and Mako](https://codingnetworker.com/2016/01/configuration-templates-python-mako/)
+  shows some basic situations for how to use Mako in an example project.
+
+* The 
+  [Pylons' project documentation on templates](http://pylonsbook.com/en/1.1/using-view-templates.html)
+  provides many examples for using Mako, which is the default template 
+  language for the Pylons [web framework](web-frameworks.html).
+
+* [Flask-Mako](https://pythonhosted.org/Flask-Mako/) is a [Flask](/flask.html) 
+  extension that makes it easier to use Mako as the template engine in your
+  Flask web app projects.
+
+
diff --git a/source/content/pages/07-web-development/12-django-templates.markdown b/source/content/pages/07-web-development/12-django-templates.markdown
@@ -4,7 +4,28 @@ slug: django-templates
 sortorder: 0712
 toc: False
 sidebartitle: Django Templates
-meta: Django has its own template engine similar to Jinja but with minor differences and is referred to as Django templates.
+meta: Django has its own template engine referred to as Django templates and is similar to Jinja with some minor differences.
 
 
 # Django Templates
+The [Django web framework](/django.html) contains its own 
+[template engine](/template-engines.html) for generating HTML, XML and other
+output formats.
+
+<a href="https://docs.djangoproject.com/en/dev/topics/templates/" style="border: none;"><img src="/source/static/img/logos/django.png" width="100%" alt="Django web framework logo. Trademark Django Software Foundation." style="border-radius: 5px;" width="100%" class="technical-diagram"></a>
+
+
+## What's the difference between a "project template" and Django templates?
+A project template contains the files and code to start a new web application.
+For example, when you run `django-admin.py startproject abc`, the Django
+admin script creates a new `abc` directory along with several Python 
+configuration so the web app can be run by a [WSGI server](/wsgi-servers.html).
+
+Django templates are different from a project template because they live 
+within a project and are written by the developer to generate output, most
+commonly HTML.
+
+<div class="well see-also">Django templates are an implementation of the <a href="/template-engines.html">template engines</a> concept. Learn more in the <a href="/web-development.html">web development</a> chapter or view the <a href="/table-of-contents.html">table of contents</a> for all topics.</div>
+
+
+
diff --git a/source/static/img/logos/django.png b/source/static/img/logos/django.png
diff --git a/source/static/img/logos/mako.jpg b/source/static/img/logos/mako.jpg
diff --git a/source/static/img/logos/mako.png b/source/static/img/logos/mako.png
