Skip to content

Commit e39e7b4

Browse files
mattmakaimattmakai
committed
big updates to django page
1 parent 4f3a19d commit e39e7b4

File tree

6 files changed

+51
-83
lines changed

6 files changed

+51
-83
lines changed

‎django.html‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -145,40 +145,33 @@ <h3>Django videos</h3>
145145
</li>
146146
</ul>
147147
<h3>What do you need to learn next for your Django app?</h3>
148-
<div class="row">
149-
<div class="col-md-3">
148+
<div class="row">
149+
<div class="col-md-4">
150150
<div class="well select-next">
151-
<a href="/application-dependencies.html" class="btn btn-success btn-full"><i class="fa fa-archive fa-inverse fa-2x"></i></a>
152-
<p class="under-btn">
153-
How do I install libraries like Django my app depends on?
154-
</p>
155-
</div>
156-
</div>
157-
<div class="col-md-3">
158-
<div class="well select-next">
159-
<a href="/deployment.html" class="btn btn-success btn-full"><i class="fa fa-share fa-inverse fa-2x"></i></a>
151+
<a href="/cascading-style-sheets.html" class="btn btn-success btn-full"><i class="fa fa-css3 fa-inverse fa-2x"></i></a>
160152
<p class="under-btn">
161-
How do I deploy a Django app once I'm done coding?
153+
My user interface looks terrible. How do I style a web application?
162154
</p>
163155
</div>
164156
</div>
165-
<div class="col-md-3">
157+
<div class="col-md-4">
166158
<div class="well select-next">
167159
<a href="/api-integration.html" class="btn btn-success btn-full"><i class="fa fa-link fa-inverse fa-2x"></i></a>
160+
</a>
168161
<p class="under-btn">
169-
I want to integrate APIs into my Django project.
162+
I want to integrate external APIs into my Django project.
170163
</p>
171164
</div>
172165
</div>
173-
<div class="col-md-3">
166+
<div class="col-md-4">
174167
<div class="well select-next">
175-
<a href="/cascading-style-sheets.html" class="btn btn-success btn-full"><i class="fa fa-css3 fa-inverse fa-2x"></i></a>
168+
<a href="/deployment.html" class="btn btn-success btn-full"><i class="fa fa-share fa-inverse fa-2x"></i></a>
176169
<p class="under-btn">
177-
My user interface looks terrible. How do I style a web app?
170+
How do I deploy a Django web app once I've put something together?
178171
</p>
179172
</div>
180173
</div>
181-
</div> <style type="text/css">
174+
</div> <style type="text/css">
182175
#mc_embed_signup{background:#fff; clear:left; font:12px "Helvetica Neue",Arial,sans-serif; }
183176
/* Add your own MailChimp form style overrides in your site stylesheet or in this style block.
184177
We recommend moving this block and the preceding CSS link to the HEAD of your HTML file. */

‎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>2014-04-27T13:11:10Z</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-04-27T13:19:57Z</updated></feed>

‎source/content/pages/02-web-frameworks/0201-web-frameworks.markdown‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,24 @@ years while building dynamic web applications. Frameworks make it easier
2727
to reuse code for common HTTP operations and to structure your code so that
2828
it is maintainable.
2929

30-
## Web frameworks learning checklist
31-
[ ] Choose a major web framework ([Django](/django.html) or
32-
[Flask](/flask.html) recommended) and stick with it
33-
34-
[ ] Work through a detailed tutorial found within the resources links on the
35-
framework's page
3630

37-
[ ] Study open source examples built with your framework of choice so you can
38-
take parts of those projects and use the code in your application
39-
40-
[ ] Build the first simple iteration of your web application then go to
41-
the [deployment](/deployment.html) section to make it accessible on the
42-
web
31+
## Web frameworks learning checklist
32+
<i class="fa fa-check-square-o"></i>
33+
Choose a major web framework ([Django](/django.html) or
34+
[Flask](/flask.html) are recommended) and stick with it.
35+
36+
<i class="fa fa-check-square-o"></i>
37+
Work through a detailed tutorial found within the resources links on the
38+
framework's page.
39+
40+
<i class="fa fa-check-square-o"></i>
41+
Study open source examples built with your framework of choice so you can
42+
take parts of those projects and reuse the code in your application.
43+
44+
<i class="fa fa-check-square-o"></i>
45+
Build the first simple iteration of your web application then go to
46+
the [deployment](/deployment.html) section to make it accessible on the
47+
web.
4348

4449

4550
## Common web framework functionality

‎source/content/pages/02-web-frameworks/0203-django.markdown‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ title: Django
22
category: page
33
slug: django
44
sort-order: 022
5-
choice1url:
6-
choice1icon:
7-
choice1text:
8-
choice2url:
9-
choice2icon:
10-
choice2text:
11-
choice3url:
12-
choice3icon:
13-
choice3text:
5+
choice1url: /cascading-style-sheets.html
6+
choice1icon: fa-css3 fa-inverse
7+
choice1text: My user interface looks terrible. How do I style a web application?
8+
choice2url: /api-integration.html
9+
choice2icon: fa-link fa-inverse
10+
choice2text: I want to integrate external APIs into my Django project.
11+
choice3url: /deployment.html
12+
choice3icon: fa-share fa-inverse
13+
choice3text: How do I deploy a Django web app once I've put something together?
1414
choice4url:
1515
choice4icon:
1616
choice4text:

‎source/theme/templates/chapters/django.html‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +0,0 @@
1-
<div class="row">
2-
<div class="col-md-3">
3-
<div class="well select-next">
4-
<a href="/application-dependencies.html" class="btn btn-success btn-full"><i class="fa fa-archive fa-inverse fa-2x"></i></a>
5-
<p class="under-btn">
6-
How do I install libraries like Django my app depends on?
7-
</p>
8-
</div>
9-
</div>
10-
<div class="col-md-3">
11-
<div class="well select-next">
12-
<a href="/deployment.html" class="btn btn-success btn-full"><i class="fa fa-share fa-inverse fa-2x"></i></a>
13-
<p class="under-btn">
14-
How do I deploy a Django app once I'm done coding?
15-
</p>
16-
</div>
17-
</div>
18-
<div class="col-md-3">
19-
<div class="well select-next">
20-
<a href="/api-integration.html" class="btn btn-success btn-full"><i class="fa fa-link fa-inverse fa-2x"></i></a>
21-
<p class="under-btn">
22-
I want to integrate APIs into my Django project.
23-
</p>
24-
</div>
25-
</div>
26-
<div class="col-md-3">
27-
<div class="well select-next">
28-
<a href="/cascading-style-sheets.html" class="btn btn-success btn-full"><i class="fa fa-css3 fa-inverse fa-2x"></i></a>
29-
<p class="under-btn">
30-
My user interface looks terrible. How do I style a web app?
31-
</p>
32-
</div>
33-
</div>
34-
</div>

‎web-frameworks.html‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,19 @@ <h2>Why are web frameworks necessary?</h2>
5353
to reuse code for common HTTP operations and to structure your code so that
5454
it is maintainable.</p>
5555
<h2>Web frameworks learning checklist</h2>
56-
<p>[ ] Choose a major web framework (<a href="/django.html">Django</a> or
57-
<a href="/flask.html">Flask</a> recommended) and stick with it</p>
58-
<p>[ ] Work through a detailed tutorial found within the resources links on the
59-
framework's page</p>
60-
<p>[ ] Study open source examples built with your framework of choice so you can
61-
take parts of those projects and use the code in your application</p>
62-
<p>[ ] Build the first simple iteration of your web application then go to
63-
the <a href="/deployment.html">deployment</a> section to make it accessible on the
64-
web</p>
56+
<p><i class="fa fa-check-square-o"></i>
57+
Choose a major web framework (<a href="/django.html">Django</a> or
58+
<a href="/flask.html">Flask</a> are recommended) and stick with it.</p>
59+
<p><i class="fa fa-check-square-o"></i>
60+
Work through a detailed tutorial found within the resources links on the
61+
framework's page.</p>
62+
<p><i class="fa fa-check-square-o"></i>
63+
Study open source examples built with your framework of choice so you can
64+
take parts of those projects and reuse the code in your application.</p>
65+
<p><i class="fa fa-check-square-o"></i>
66+
Build the first simple iteration of your web application then go to
67+
the <a href="/deployment.html">deployment</a> section to make it accessible on the
68+
web.</p>
6569
<h2>Common web framework functionality</h2>
6670
<p>Frameworks provide functionality in their code or through extensions to
6771
perform common operations required to run web applications. These common

0 commit comments

Comments
 (0)