Skip to content

Commit 7b400ad

Browse files
mattmakaimattmakai
committed
fixing up learning lists and moving choices text to templates
1 parent 01315dd commit 7b400ad

18 files changed

+147
-124
lines changed

‎all.html‎

Lines changed: 55 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1866,21 +1866,29 @@ <h2>Open source Flask example projects</h2>
18661866
</li>
18671867
</ul>
18681868
<h2>Flask framework learning checklist</h2>
1869-
<p><i class="fa fa-check-square-o"></i>
1870-
<a href="http://flask.pocoo.org/docs/installation/">Install Flask</a> on
1871-
your local development machine.</p>
1872-
<p><i class="fa fa-check-square-o"></i>
1873-
Work through the 18-part Flask tutorial listed first under "Flask resources"
1874-
below.</p>
1875-
<p><i class="fa fa-check-square-o"></i>
1876-
Read through <a href="http://flask.pocoo.org/extensions/">Flask Extensions Registry</a>
1877-
to find out what extensions you'll need to build your project.</p>
1878-
<p><i class="fa fa-check-square-o"></i>
1879-
Start coding your Flask app based on what you learned from the 18 part
1880-
Flask tutorial plus open source example applications found below. </p>
1881-
<p><i class="fa fa-check-square-o"></i>
1882-
Move on to the <a href="/deployment.html">deployment section</a> to get your initial
1883-
Flask project on the web.</p>
1869+
<ol>
1870+
<li>
1871+
<p><a href="http://flask.pocoo.org/docs/installation/">Install Flask</a> on
1872+
your local development machine.</p>
1873+
</li>
1874+
<li>
1875+
<p>Work through the 18-part Flask tutorial listed first under "Flask
1876+
resources" above.</p>
1877+
</li>
1878+
<li>
1879+
<p>Read through
1880+
<a href="http://flask.pocoo.org/extensions/">Flask Extensions Registry</a> to find
1881+
out what extensions you'll need to build your project.</p>
1882+
</li>
1883+
<li>
1884+
<p>Start coding your Flask app based on what you learned from the 18 part
1885+
Flask tutorial plus open source example applications found below. </p>
1886+
</li>
1887+
<li>
1888+
<p>Move on to the <a href="/deployment.html">deployment section</a> to get your initial
1889+
Flask project on the web.</p>
1890+
</li>
1891+
</ol>
18841892
<h1>Bottle</h1>
18851893
<p><a href="http://bottlepy.org/docs/dev/index.html">Bottle</a> is a WSGI-compliant
18861894
<a href="https://github.com/defnull/bottle/blob/master/bottle.py">single source file</a>
@@ -1930,19 +1938,25 @@ <h2>Open source Bottle example projects</h2>
19301938
</li>
19311939
</ul>
19321940
<h2>Bottle framework learning checklist</h2>
1933-
<p><i class="fa fa-check-square-o"></i>
1934-
<a href="https://github.com/defnull/bottle/raw/master/bottle.py">Download Bottle</a> or
1935-
install via pip with <code>pip install bottle</code> on your local development machine.</p>
1936-
<p><i class="fa fa-check-square-o"></i>
1937-
Work through the official
1938-
<a href="http://bottlepy.org/docs/dev/tutorial.html">Bottle tutorial</a>.</p>
1939-
<p><i class="fa fa-check-square-o"></i>
1940-
Start coding your Bottle app based on what you learned in the official
1941-
tutorial plus reading open source example applications found below. </p>
1942-
<p><i class="fa fa-check-square-o"></i>
1943-
Move on to the <a href="/deployment.html">deployment section</a> to get your initial
1944-
Bottle application on the web.</p>
1945-
<h3>What do you need to learn next?</h3>
1941+
<ol>
1942+
<li>
1943+
<p><a href="https://github.com/defnull/bottle/raw/master/bottle.py">Download Bottle</a>
1944+
or install via pip with <code>pip install bottle</code> on your local development
1945+
machine.</p>
1946+
</li>
1947+
<li>
1948+
<p>Work through the official
1949+
<a href="http://bottlepy.org/docs/dev/tutorial.html">Bottle tutorial</a>.</p>
1950+
</li>
1951+
<li>
1952+
<p>Start coding your Bottle app based on what you learned in the official
1953+
tutorial plus reading open source example applications found below. </p>
1954+
</li>
1955+
<li>
1956+
<p>Move on to the <a href="/deployment.html">deployment section</a> to get your initial
1957+
Bottle application on the web.</p>
1958+
</li>
1959+
</ol>
19461960
<h1>Pyramid</h1>
19471961
<p><a href="http://www.pylonsproject.org/projects/pyramid/about">Pyramid</a> is an open
19481962
source <a href="/wsgi-servers.html">WSGI</a> web framework based on the
@@ -1979,7 +1993,6 @@ <h2>Pyramid resources</h2>
19791993
modern frameworks.</p>
19801994
</li>
19811995
</ul>
1982-
<h3>Learn more about frameworks or continue building your Pyramid app?</h3>
19831996
<h2>Morepath</h2>
19841997
<p><a href="http://morepath.readthedocs.org/en/latest/">Morepath</a> is a micro web
19851998
framework with a model-driven approach to creating web applications and web
@@ -2011,7 +2024,6 @@ <h3>Morepath resources</h3>
20112024
at EuroPython 2014.</p>
20122025
</li>
20132026
</ul>
2014-
<h3>Do you want to learn more about frameworks or web APIs?</h3>
20152027
<h1>Other Web Frameworks</h1>
20162028
<p>Python has a significant number of web frameworks outside the usual Django,
20172029
Flask, Pyramid and Bottle suspects.</p>
@@ -2070,16 +2082,19 @@ <h2>Other web framework resources</h2>
20702082
</li>
20712083
</ul>
20722084
<h2>Other frameworks learning checklist</h2>
2073-
<p><i class="fa fa-check-square-o"></i>
2074-
Read through the web frameworks listed above and check out their project
2075-
websites. </p>
2076-
<p><i class="fa fa-check-square-o"></i>
2077-
It's useful to know what other web frameworks exist besides Django and Flask.
2078-
However, when you're just starting to learn to program there are significantly
2079-
more tutorials and resources for <a href="/django.html">Django</a> and
2080-
<a href="/flask.html">Flask</a> on the web. My recommendation is to start with one of
2081-
those two frameworks then expand your knowledge from there.</p>
2082-
<h3>What do you need to learn next?</h3>
2085+
<ol>
2086+
<li>
2087+
<p>Read through the web frameworks listed above and check out their project
2088+
websites. </p>
2089+
</li>
2090+
<li>
2091+
<p>It's useful to know what other web frameworks exist besides Django and
2092+
Flask. However, when you're just starting to learn to program there are
2093+
significantly more tutorials and resources for <a href="/django.html">Django</a> and
2094+
<a href="/flask.html">Flask</a> on the web. My recommendation is to start with one of
2095+
those two frameworks then expand your knowledge from there.</p>
2096+
</li>
2097+
</ol>
20832098
<h1>Web Design</h1>
20842099
<p>Web design is the creation of a web application's style and user interaction
20852100
using CSS and JavaScript.</p>

‎bottle.html‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,26 @@ <h2>Open source Bottle example projects</h2>
8383
</li>
8484
</ul>
8585
<h2>Bottle framework learning checklist</h2>
86-
<p><i class="fa fa-check-square-o"></i>
87-
<a href="https://github.com/defnull/bottle/raw/master/bottle.py">Download Bottle</a> or
88-
install via pip with <code>pip install bottle</code> on your local development machine.</p>
89-
<p><i class="fa fa-check-square-o"></i>
90-
Work through the official
91-
<a href="http://bottlepy.org/docs/dev/tutorial.html">Bottle tutorial</a>.</p>
92-
<p><i class="fa fa-check-square-o"></i>
93-
Start coding your Bottle app based on what you learned in the official
94-
tutorial plus reading open source example applications found below. </p>
95-
<p><i class="fa fa-check-square-o"></i>
96-
Move on to the <a href="/deployment.html">deployment section</a> to get your initial
97-
Bottle application on the web.</p>
98-
<h3>What do you need to learn next?</h3>
86+
<ol>
87+
<li>
88+
<p><a href="https://github.com/defnull/bottle/raw/master/bottle.py">Download Bottle</a>
89+
or install via pip with <code>pip install bottle</code> on your local development
90+
machine.</p>
91+
</li>
92+
<li>
93+
<p>Work through the official
94+
<a href="http://bottlepy.org/docs/dev/tutorial.html">Bottle tutorial</a>.</p>
95+
</li>
96+
<li>
97+
<p>Start coding your Bottle app based on what you learned in the official
98+
tutorial plus reading open source example applications found below. </p>
99+
</li>
100+
<li>
101+
<p>Move on to the <a href="/deployment.html">deployment section</a> to get your initial
102+
Bottle application on the web.</p>
103+
</li>
104+
</ol>
105+
<h3>What do you want to learn next?</h3>
99106
<div class="row">
100107
<div class="col-md-4">
101108
<div class="well select-next">

‎feeds/all.atom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?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>2015-05-28T10:24:49Z</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>2015-05-29T10:51:28Z</updated></feed>

‎flask.html‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -277,21 +277,29 @@ <h2>Open source Flask example projects</h2>
277277
</li>
278278
</ul>
279279
<h2>Flask framework learning checklist</h2>
280-
<p><i class="fa fa-check-square-o"></i>
281-
<a href="http://flask.pocoo.org/docs/installation/">Install Flask</a> on
282-
your local development machine.</p>
283-
<p><i class="fa fa-check-square-o"></i>
284-
Work through the 18-part Flask tutorial listed first under "Flask resources"
285-
below.</p>
286-
<p><i class="fa fa-check-square-o"></i>
287-
Read through <a href="http://flask.pocoo.org/extensions/">Flask Extensions Registry</a>
288-
to find out what extensions you'll need to build your project.</p>
289-
<p><i class="fa fa-check-square-o"></i>
290-
Start coding your Flask app based on what you learned from the 18 part
291-
Flask tutorial plus open source example applications found below. </p>
292-
<p><i class="fa fa-check-square-o"></i>
293-
Move on to the <a href="/deployment.html">deployment section</a> to get your initial
294-
Flask project on the web.</p>
280+
<ol>
281+
<li>
282+
<p><a href="http://flask.pocoo.org/docs/installation/">Install Flask</a> on
283+
your local development machine.</p>
284+
</li>
285+
<li>
286+
<p>Work through the 18-part Flask tutorial listed first under "Flask
287+
resources" above.</p>
288+
</li>
289+
<li>
290+
<p>Read through
291+
<a href="http://flask.pocoo.org/extensions/">Flask Extensions Registry</a> to find
292+
out what extensions you'll need to build your project.</p>
293+
</li>
294+
<li>
295+
<p>Start coding your Flask app based on what you learned from the 18 part
296+
Flask tutorial plus open source example applications found below. </p>
297+
</li>
298+
<li>
299+
<p>Move on to the <a href="/deployment.html">deployment section</a> to get your initial
300+
Flask project on the web.</p>
301+
</li>
302+
</ol>
295303
<h3>What web development topic do you want to learn next?</h3>
296304
<div class="row">
297305
<div class="col-md-4">

‎morepath.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ <h3>Morepath resources</h3>
6565
at EuroPython 2014.</p>
6666
</li>
6767
</ul>
68-
<h3>Do you want to learn more about frameworks or web APIs?</h3>
68+
<h3>Do you want to learn more about frameworks or move on to deployment?</h3>
6969
<div class="row">
7070
<div class="col-md-4">
7171
<div class="well select-next">

‎other-web-frameworks.html‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,19 @@ <h2>Other web framework resources</h2>
9292
</li>
9393
</ul>
9494
<h2>Other frameworks learning checklist</h2>
95-
<p><i class="fa fa-check-square-o"></i>
96-
Read through the web frameworks listed above and check out their project
97-
websites. </p>
98-
<p><i class="fa fa-check-square-o"></i>
99-
It's useful to know what other web frameworks exist besides Django and Flask.
100-
However, when you're just starting to learn to program there are significantly
101-
more tutorials and resources for <a href="/django.html">Django</a> and
102-
<a href="/flask.html">Flask</a> on the web. My recommendation is to start with one of
103-
those two frameworks then expand your knowledge from there.</p>
95+
<ol>
96+
<li>
97+
<p>Read through the web frameworks listed above and check out their project
98+
websites. </p>
99+
</li>
100+
<li>
101+
<p>It's useful to know what other web frameworks exist besides Django and
102+
Flask. However, when you're just starting to learn to program there are
103+
significantly more tutorials and resources for <a href="/django.html">Django</a> and
104+
<a href="/flask.html">Flask</a> on the web. My recommendation is to start with one of
105+
those two frameworks then expand your knowledge from there.</p>
106+
</li>
107+
</ol>
104108
<h3>What do you need to learn next?</h3>
105109
<div class="row">
106110
<div class="col-md-4">

‎pyramid.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ <h2>Pyramid resources</h2>
7070
modern frameworks.</p>
7171
</li>
7272
</ul>
73-
<h3>Learn more about frameworks or continue building your Pyramid app?</h3>
73+
<h3>Do you want to learn more about frameworks or a different subject?</h3>
7474
<div class="row">
7575
<div class="col-md-4">
7676
<div class="well select-next">

‎source/content/pages/04-web-development/03-flask.markdown‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -218,23 +218,19 @@ how to <a href="/deployment.html">deploy web applications</a>.
218218

219219

220220
## Flask framework learning checklist
221-
<i class="fa fa-check-square-o"></i>
222-
[Install Flask](http://flask.pocoo.org/docs/installation/) on
223-
your local development machine.
221+
1. [Install Flask](http://flask.pocoo.org/docs/installation/) on
222+
your local development machine.
224223

225-
<i class="fa fa-check-square-o"></i>
226-
Work through the 18-part Flask tutorial listed first under "Flask resources"
227-
below.
224+
1. Work through the 18-part Flask tutorial listed first under "Flask
225+
resources" above.
228226

229-
<i class="fa fa-check-square-o"></i>
230-
Read through [Flask Extensions Registry](http://flask.pocoo.org/extensions/)
231-
to find out what extensions you'll need to build your project.
227+
1. Read through
228+
[Flask Extensions Registry](http://flask.pocoo.org/extensions/) to find
229+
out what extensions you'll need to build your project.
232230

233-
<i class="fa fa-check-square-o"></i>
234-
Start coding your Flask app based on what you learned from the 18 part
235-
Flask tutorial plus open source example applications found below.
231+
1. Start coding your Flask app based on what you learned from the 18 part
232+
Flask tutorial plus open source example applications found below.
236233

237-
<i class="fa fa-check-square-o"></i>
238-
Move on to the [deployment section](/deployment.html) to get your initial
239-
Flask project on the web.
234+
1. Move on to the [deployment section](/deployment.html) to get your initial
235+
Flask project on the web.
240236

‎source/content/pages/04-web-development/04-bottle.markdown‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,16 @@ included with Python.
4646

4747

4848
## Bottle framework learning checklist
49-
<i class="fa fa-check-square-o"></i>
50-
[Download Bottle](https://github.com/defnull/bottle/raw/master/bottle.py) or
51-
install via pip with ``pip install bottle`` on your local development machine.
49+
1. [Download Bottle](https://github.com/defnull/bottle/raw/master/bottle.py)
50+
or install via pip with ``pip install bottle`` on your local development
51+
machine.
5252

53-
<i class="fa fa-check-square-o"></i>
54-
Work through the official
55-
[Bottle tutorial](http://bottlepy.org/docs/dev/tutorial.html).
53+
1. Work through the official
54+
[Bottle tutorial](http://bottlepy.org/docs/dev/tutorial.html).
5655

57-
<i class="fa fa-check-square-o"></i>
58-
Start coding your Bottle app based on what you learned in the official
59-
tutorial plus reading open source example applications found below.
56+
1. Start coding your Bottle app based on what you learned in the official
57+
tutorial plus reading open source example applications found below.
6058

61-
<i class="fa fa-check-square-o"></i>
62-
Move on to the [deployment section](/deployment.html) to get your initial
63-
Bottle application on the web.
59+
1. Move on to the [deployment section](/deployment.html) to get your initial
60+
Bottle application on the web.
6461

65-
66-
### What do you need to learn next?

‎source/content/pages/04-web-development/05-pyramid.markdown‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,3 @@ Model-View-Controller (MVC) architectural pattern.
3636
explains how Pyramid sprang from Pylons and how Pyramid compares to other
3737
modern frameworks.
3838

39-
40-
### Learn more about frameworks or continue building your Pyramid app?

0 commit comments

Comments
 (0)