work on mobi transformation

mattmakai · mattmakai · commit 8729f80b10ba · 2018-04-11T17:28:23.000-04:00
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ epub: bookbuild
 	sed -i '' 's/\(^.*~~.*$$\)/<\/pre><pre class="highlight-line">\1<\/pre><pre>/g' generated/book/epub-book.html
 	sed -i '' 's/"\/img\//"img\//g' generated/book/epub-book.html
 	sed -i '' 's/~~//g' generated/book/epub-book.html
-	cd generated/book; pandoc -f html epub-book.html -t epub3 --epub-metadata=epub-metadata.xml --epub-cover-image=img/book/cover-a4.jpg --toc-depth=2 --epub-stylesheet=theme/css/epub.css -o full_stack_python.epub
+	cd generated/book; pandoc -f html epub-book.html -t epub3 --epub-metadata=epub-metadata.xml --epub-cover-image=img/book/cover-a4.jpg --toc-depth=3 --epub-stylesheet=theme/css/epub.css -o full_stack_python.epub
 
 
 mobi: epub
diff --git a/content/pages/02-development-environments/20-source-control.markdown b/content/pages/02-development-environments/20-source-control.markdown
@@ -121,15 +121,15 @@ reviews the basics of distributed version control systems.
   monorepos.
 
 
-### Git
+### Git distributed source control system
 [Git](/git.html) is the most widely-used source control system currently
 in use. Its distributed design eliminates the need to check files in
 and out of a centralized repository, which is a problem when using
 [Subversion](/apache-subversion.html) without a network connection. There is
 [a full page on Git](/git.html) with further details and resources.
 
 
-## Source control learning checklist
+### Source control learning checklist
 1. Pick a version control system. Git is recommended because on the web there
    are a significant number of tutorials to help both new and advanced users.
 
diff --git a/content/pages/03-data/01-databases.markdown b/content/pages/03-data/01-databases.markdown
@@ -78,7 +78,7 @@ by a single connection at a time. Therefore is highly recommended to not
 [run a production web application with SQLite](https://docs.djangoproject.com/en/dev/ref/databases/#database-is-locked-errors).
 
 
-## PostgreSQL
+## PostgreSQL database
 PostgreSQL is the recommended relational database for working with Python
 web applications. PostgreSQL's feature set, active development and stability
 contribute to its usage as the backend for millions of applications live
@@ -88,7 +88,7 @@ Learn more about using PostgreSQL with Python on the
 [PostgreSQL page](/postgresql.html).
 
 
-## MySQL
+## MySQL database
 MySQL is another viable open source database implementation for Python 
 applications. MySQL has a slightly easier initial learning curve than 
 PostgreSQL but is not as feature rich.
diff --git a/content/pages/03-data/05-object-relational-mappers.markdown b/content/pages/03-data/05-object-relational-mappers.markdown
@@ -268,9 +268,9 @@ A comprehensive list of [SQLAlchemy](/sqlalchemy.html) and
 pages.
 
 
-### Django ORM resources
+### Django ORM links
 A curated list of resources can be found on the dedicated 
-[Django ORM resources](/django-orm.html) page.
+[Django ORM resources page](/django-orm.html).
 
 
 ### Pony ORM resources
diff --git a/content/pages/03-data/09-sqlobject.markdown b/content/pages/03-data/09-sqlobject.markdown
@@ -21,7 +21,7 @@ active open source development for over 14 years, since
 <div class="well see-also">SQLObject is an implementation of the <a href="/object-relational-mappers-orms.html">object-relational mapping (ORM)</a> concept. Learn more in the <a href="/data.html">data</a> chapter or view <a href="/table-of-contents.html">all topics</a>.</div>
 
 
-### SQLObject resources
+### SQLObject tutorials
 SQLObject has been around for a long time as an open source project but
 unfortunately there are not that many tutorials for it. The following
 talks and posts will get you started. If you take an interest in the project
diff --git a/content/pages/04-web-development/02-django.markdown b/content/pages/04-web-development/02-django.markdown
@@ -235,7 +235,7 @@ based on [WebSockets](/websockets.html).
   the front end.
 
 
-## Django ORM resources
+## Django ORM tutorials
 Django comes with its own custom object-relational mapper (ORM) typically
 referred to as "the Django ORM". Learn more about the Django ORM on the
 [Python object-relational mappers page](/object-relational-mappers-orms.html) 
diff --git a/content/pages/04-web-development/10-template-engines.markdown b/content/pages/04-web-development/10-template-engines.markdown
@@ -100,7 +100,7 @@ in addition to supporting (as of Django 1.9) drop-in replacement with other
 template engines such as Jinja.
 
 
-### Mako
+### Mako template engine
 [Mako](/mako.html) was the default templating engine for the 
 Pylons web framework and is one of many template engines supported by 
 [Pyramid](/pyramid.html). Mako has wide support as a replacement
diff --git a/content/pages/04-web-development/14-web-design.markdown b/content/pages/04-web-development/14-web-design.markdown
@@ -22,7 +22,7 @@ Creating web pages with their own style and interactivity so users can easily
 accomplish their tasks is a major part of building modern web applications.
 
 
-## Responsive design
+## Designing for various screen sizes
 Separating the content from the rules for how to display the content allows 
 devices to render the output differently based on factors such as screen size
 and device type. Displaying content differently based on varying screen 
diff --git a/content/pages/04-web-development/16-css.markdown b/content/pages/04-web-development/16-css.markdown
@@ -72,7 +72,7 @@ front end code.
   team environment to what apps you can use to aid your workflow.
 
 
-## CSS frameworks
+## CSS libraries and frameworks
 CSS frameworks provide structure and a boilerplate base for building a
 web application's design.
 
diff --git a/content/pages/04-web-development/59-api-integration.markdown b/content/pages/04-web-development/59-api-integration.markdown
@@ -21,12 +21,12 @@ continuously grows in importance because APIs provide critical functionality
 across many implementation areas.
 
 
-## Hosted API testing services
+## API testing services
 * [Runscope](https://www.runscope.com/) is a service specifically designed
   for APIs that assists developers with automated testing and traffic
   inspection.
 
-* [Apiary](http://apiary.io/) provides a blueprint for creating APIs so
+* [Apiary](https://apiary.io/) provides a blueprint for creating APIs so
   they are easier to test and generate clean documentation.
 
 
diff --git a/content/pages/05-deployment/00-deployment.markdown b/content/pages/05-deployment/00-deployment.markdown
@@ -24,7 +24,7 @@ be individually configured. Here is a map that visually depicts how each
 deployment topic relates to each other. Click the image to pull up a PDF 
 version.
 
-<a href="/full-stack-python-map.pdf" target="_blank" style="border: none;"><img src="/img/visuals/full-stack-python-map.png" width="100%" alt="Full Stack Python site map." class="technical-diagram" /></a>
+<a href="/full-stack-python-map.pdf" style="border:none"><img src="/img/visuals/full-stack-python-map.png" width="100%" alt="Full Stack Python deployments map." class="shot"></a>
 
 
 ## Deployment hosting options
diff --git a/content/pages/05-deployment/13-operating-systems.markdown b/content/pages/05-deployment/13-operating-systems.markdown
@@ -44,7 +44,7 @@ Mac OS X is fine for development activities. Windows and Mac
 OS X are not appropriate for production deployments unless there is a 
 major reason why you must use them in lieu of Linux.
 
-### Ubuntu
+### Canonical's Ubuntu Linux
 Ubuntu is a Linux distribution packaged by the 
 [Canonical Ltd](http://www.canonical.com/) company. Ubuntu uses the
 Debian distribution as a base for packages, including the 
diff --git a/content/pages/05-deployment/32-configuration-management.markdown b/content/pages/05-deployment/32-configuration-management.markdown
@@ -44,7 +44,7 @@ operations, such as querying the database from the Django manage.py shell.
   shows the differences between these two Python-powered tools.
 
 
-## Ansible
+## Ansible configuration management
 [Ansible](http://www.ansible.com/) is an open source configuration
 management and application deployment tool built in Python.
 
diff --git a/static-html/epub-metadata.xml b/static-html/epub-metadata.xml
@@ -1,6 +1,6 @@
 <dc:title>Full Stack Python</dc:title> 
 <dc:language>en-US</dc:language> 
-<dc:creator opf:file-as="Makai, Matt" opf:role="aut">Matt Makai</dc:creator> 
+<dc:creator opf:file-as="Makai, Matthew" opf:role="aut">Matthew Makai</dc:creator> 
 <dc:publisher>Full Stack Guides, Inc.</dc:publisher>
 <dc:date opf:event="publication">2018-04-20</dc:date>
-<dc:rights>Copyright 2012-2018 by Matt Makai</dc:rights>
+<dc:rights>Copyright 2012-2018 by Matthew Makai</dc:rights>
diff --git a/theme/templates/book-toc.html b/theme/templates/book-toc.html
@@ -62,7 +62,7 @@
 
  <li>3. <a href="#data">Data</a></li>
  <ul class="toc2">
-  <li>3.1 <a href="#databases">Relational databases</a></li>
+  <li>3.1 <a href="#relational-databases">Relational databases</a></li>
   <ul class="toc3">
    <li><a href="#postgresql">PostgreSQL</a></li>
    <li><a href="#mysql">MySQL</a></li>
diff --git a/theme/templates/epub-book.html b/theme/templates/epub-book.html
@@ -6,53 +6,41 @@
  <link href="theme/css/epub.css" rel="stylesheet">
 </head>
 <body>
-  <img src="img/book/cover-a4.jpg" width="100%">
-  <br/>
-  {% for page in pages|sort(attribute='sortorder') %}
-    {% if page.sortorder[0:2] == "00" %}
-      {{ page.content }}
-    {% endif %}
-  {% endfor %}
-  <p style="page-break-after:always;"></p>
-
-  <h1>Table of Contents</h1>
-  {% include "book-toc.html" %}
-
-  {% for page in pages|sort(attribute='sortorder') %}
-    {% if not page.sortorder[0:2] == "00" %}
-      {% if page.sortorder == "0100" %}
-       <div class="chapter">
-        <img src="img/book/01-introduction/01-cover.png" class="chapter-cover">
-       </div>
-      {% elif page.sortorder == "0200" %}
-       <div class="chapter">
-        <img src="img/book/02-dev-environments/02-cover.png" class="chapter-cover">
-       </div>
-      {% elif page.sortorder == "0300" %}
-       <div class="chapter">
-        <img src="img/book/03-data/03-cover.png" class="chapter-cover">
-       </div>
-      {% elif page.sortorder == "0400" %}
-       <div class="chapter">
-        <img src="img/book/04-web-development/04-cover.png" class="chapter-cover">
-       </div>
-      {% elif page.sortorder == "0500" %}
-       <div class="chapter">
-        <img src="img/book/05-deployments/05-cover.png" class="chapter-cover">
-       </div>
-      {% elif page.sortorder == "0600" %}
-       <div class="chapter">
-        <img src="img/book/06-devops/06-cover.png" class="chapter-cover">
-       </div>
-      {% elif page.sortorder == "0700" %}
-       <div class="chapter">
-        <img src="img/book/07-meta/07-cover.png" class="chapter-cover">
-       </div>
-      {% endif %}
-      {% if page.slug != "change-log" and page.slug != "page-statuses" and page.slug != "future-directions" %}
-      {{ page.content }}
-      {% endif %}
-    {% endif %}
-  {% endfor %}
+ <h1>Table of Contents</h1>
+ {% include "book-toc.html" %}
+ {% for page in pages|sort(attribute='sortorder') %}
+  {% if page.sortorder == "0100" %}
+   <div class="chapter">
+    <img src="img/book/01-introduction/01-cover.png" class="chapter-cover">
+   </div>
+  {% elif page.sortorder == "0200" %}
+   <div class="chapter">
+    <img src="img/book/02-dev-environments/02-cover.png" class="chapter-cover">
+   </div>
+  {% elif page.sortorder == "0300" %}
+   <div class="chapter">
+    <img src="img/book/03-data/03-cover.png" class="chapter-cover">
+   </div>
+  {% elif page.sortorder == "0400" %}
+   <div class="chapter">
+    <img src="img/book/04-web-development/04-cover.png" class="chapter-cover">
+   </div>
+  {% elif page.sortorder == "0500" %}
+   <div class="chapter">
+    <img src="img/book/05-deployments/05-cover.png" class="chapter-cover">
+   </div>
+  {% elif page.sortorder == "0600" %}
+   <div class="chapter">
+    <img src="img/book/06-devops/06-cover.png" class="chapter-cover">
+   </div>
+  {% elif page.sortorder == "0700" %}
+   <div class="chapter">
+    <img src="img/book/07-meta/07-cover.png" class="chapter-cover">
+   </div>
+  {% endif %}
+  {% if page.slug != "change-log" and page.slug != "page-statuses" and page.slug != "future-directions" %}
+   {{ page.content }}
+  {% endif %}
+ {% endfor %}
 </body>
 </html>
diff --git a/transform_book.py b/transform_book.py
@@ -392,21 +392,13 @@
 
          "(/email.html)":
          "(" + BASE_FSP + "email.html)",
-         "<a href=\"/full-stack-python-map.pdf\" target=\"_blank\" style=\"border: none;\"><img src=\"/img/full-stack-python-map.png\" width=\"100%\" alt=\"Full Stack Python site map.\" class=\"technical-diagram\" /></a>":
-         "<img src=\"/img/full-stack-python-map.png\" alt=\"Full Stack Python deployment map.\" />",
+         "<a href=\"/full-stack-python-map.pdf\" style=\"border:none\"><img src=\"/img/visuals/full-stack-python-map.png\" width=\"100%\" alt=\"Full Stack Python deployments map.\" class=\"shot\"></a>":
+         "<img src=\"img/visuals/full-stack-python-map.png\" alt=\"Full Stack Python deployments map.\">",
 
          "(/blog.html)":
          "(" + BASE_FSP + "blog.html",
-         "(/blog/python-3-bottle-gunicorn-ubuntu-1604-xenial-xerus.html)":
-         "(" + BASE_FSP + "blog/python-3-bottle-gunicorn-ubuntu-1604-xenial-xerus.html",
-         "(/blog/install-redis-use-python-3-ubuntu-1604.html)":
-         "(" + BASE_FSP + "blog/install-redis-use-python-3-ubuntu-1604.html",
-         "(/blog/postgresql-python-3-psycopg2-ubuntu-1604.html)":
-         "(" + BASE_FSP + "blog/postgresql-python-3-psycopg2-ubuntu-1604.html",
-         "(/blog/python-3-flask-green-unicorn-ubuntu-1604-xenial-xerus.html)":
-         "(" + BASE_FSP + "blog/python-3-flask-green-unicorn-ubuntu-1604-xenial-xerus.html",
-         "(/blog/python-3-django-gunicorn-ubuntu-1604-xenial-xerus.html)":
-         "(" + BASE_FSP + "blog/python-3-django-gunicorn-ubuntu-1604-xenial-xerus.html",
+         "(/blog/":
+         "(" + BASE_FSP + "blog/",
          }
 
 
