adding flask logo on site

mattmakai · mattmakai · commit b3dff35290f3 · 2014-06-17T09:06:25.000-04:00
diff --git a/django.html b/django.html
@@ -44,7 +44,7 @@ <h1>Django</h1>
 behind batteries-included is that the common functionality for building
 web applications should come with the framework instead of as separate
 libraries. </p>
-<p><img src="theme/img/django-logo-positive.png" width="100%" alt="Official Django logo. Trademark Django Software Foundation." class="technical-diagram" /></p>
+<p><a href="http://www.djangoproject.com/" style="border: none;"><img src="theme/img/django-logo-positive.png" width="100%" alt="Official Django logo. Trademark Django Software Foundation." class="technical-diagram" /></a></p>
 <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 
diff --git a/feeds/all.atom.xml b/feeds/all.atom.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-06-17T08:56:20Z</updated></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-06-17T09:06:11Z</updated></feed>
diff --git a/flask.html b/flask.html
@@ -40,11 +40,12 @@
     <div class="col-md-8">
       <h1>Flask</h1>
 <p><a href="http://flask.pocoo.org/">Flask</a> is a Python web framework built with a 
-<a href="http://flask.pocoo.org/docs/design/">small core and easy-to-extend philosophy</a>. </p>
+<a href="http://flask.pocoo.org/docs/design/">small core and easy-to-extend philosophy</a>. 
+<a href="http://flask.pocoo.org/" style="border: none;"><img src="theme/img/flask.png" width="100%" alt="Official Flask logo. Flask Artwork License." class="technical-diagram" /></a></p>
 <h2>Why is Flask a good web framework choice?</h2>
-<p>Flask is generally considered more 
+<p>Flask is considered more 
 <a href="http://stackoverflow.com/questions/58968/what-defines-pythonian-or-pythonic">Pythonic</a> 
-than Django because Flask web application code is by and large more explicit. 
+than Django because Flask web application code is in most cases more explicit. 
 Flask is easy to get started with as a beginner because there is little 
 boilerplate code for getting a simple app up and running. </p>
 <p>For example, here's a valid "hello world" web application with Flask (the
diff --git a/future-directions.html b/future-directions.html
@@ -55,7 +55,6 @@ <h1>Future Directions</h1>
 <li>
 <p>Update these sections with better explanations and resources: </p>
 <ol>
-<li><a href="/source-control.html">Source control</a></li>
 <li><a href="/configuration-management.html">Configuration management</a></li>
 <li><a href="/javascript.html">JavaScript</a></li>
 <li><a href="/api-integration.html">API integration</a></li>
diff --git a/source-control.html b/source-control.html
@@ -77,7 +77,12 @@ <h2>Source control projects</h2>
   and open source distributed version control system.</p>
 </li>
 </ul>
-<h2>Source control hosted services</h2>
+<h2>Hosted source control services</h2>
+<p>Git and Mercurial can be downloaded and run on your own server. However,
+it's easy and cheap to get started with a hosted version control service.
+You can transition away from the service at a later time by moving your 
+repositories if your needs change. A couple of recommended hosted version
+control services are:</p>
 <ul>
 <li>
 <p><a href="https://github.com/">GitHub</a> is currently the most commonly used source
diff --git a/source/content/pages/02-web-frameworks/0203-django.markdown b/source/content/pages/02-web-frameworks/0203-django.markdown
@@ -24,7 +24,7 @@ web applications should come with the framework instead of as separate
 libraries. 
 
 
-<img src="theme/img/django-logo-positive.png" width="100%" alt="Official Django logo. Trademark Django Software Foundation." class="technical-diagram" />
+<a href="http://www.djangoproject.com/" style="border: none;"><img src="theme/img/django-logo-positive.png" width="100%" alt="Official Django logo. Trademark Django Software Foundation." class="technical-diagram" /></a>
 
 
 For example, 
diff --git a/source/content/pages/02-web-frameworks/0205-flask.markdown b/source/content/pages/02-web-frameworks/0205-flask.markdown
@@ -19,11 +19,13 @@ choice4text: How can I version and store my source code so I don't lose it?
 # Flask
 [Flask](http://flask.pocoo.org/) is a Python web framework built with a 
 [small core and easy-to-extend philosophy](http://flask.pocoo.org/docs/design/). 
+<a href="http://flask.pocoo.org/" style="border: none;"><img src="theme/img/flask.png" width="100%" alt="Official Flask logo. Flask Artwork License." class="technical-diagram" /></a>
+
 
 ## Why is Flask a good web framework choice?
-Flask is generally considered more 
+Flask is considered more 
 [Pythonic](http://stackoverflow.com/questions/58968/what-defines-pythonian-or-pythonic) 
-than Django because Flask web application code is by and large more explicit. 
+than Django because Flask web application code is in most cases more explicit. 
 Flask is easy to get started with as a beginner because there is little 
 boilerplate code for getting a simple app up and running. 
 
diff --git a/source/content/pages/03-deployment/0313-source-control.markdown b/source/content/pages/03-deployment/0313-source-control.markdown
@@ -60,7 +60,13 @@ today's Python development world. The two primary choices are:
   and open source distributed version control system.
 
 
-## Source control hosted services
+## Hosted source control services
+Git and Mercurial can be downloaded and run on your own server. However,
+it's easy and cheap to get started with a hosted version control service.
+You can transition away from the service at a later time by moving your 
+repositories if your needs change. A couple of recommended hosted version
+control services are:
+
 * [GitHub](https://github.com/) is currently the most commonly used source
   control platform for using Git.
 
diff --git a/source/content/pages/10-misc/1007-future-directions.markdown b/source/content/pages/10-misc/1007-future-directions.markdown
@@ -35,7 +35,6 @@ Here are some things I'm actively working on:
 
 * Update these sections with better explanations and resources: 
 
-    1. [Source control](/source-control.html)
     1. [Configuration management](/configuration-management.html)
     1. [JavaScript](/javascript.html)
     1. [API integration](/api-integration.html)
diff --git a/source/theme/static/img/flask.png b/source/theme/static/img/flask.png
diff --git a/theme/img/flask.png b/theme/img/flask.png

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`		`-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-06-17T08:56:20Z</updated></feed>`
	`2`	`+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-06-17T09:06:11Z</updated></feed>`