Skip to content

Commit cada800

Browse files
mattmakaimattmakai
committed
changing the way options are generated
1 parent a93dd8e commit cada800

File tree

8 files changed

+121
-14
lines changed

8 files changed

+121
-14
lines changed

‎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-25T16:22:52Z</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-26T07:56:56Z</updated></feed>

‎index.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ <h1>Introduction</h1>
126126
you're currently trying to do. This guide walks you through steps based
127127
on what you want to do when you need to get it done.</p>
128128
<h3>Let's get started. What do you need to do right now?</h3>
129-
<div class="row">
129+
<div class="row">
130130
<div class="col-md-3">
131131
<div class="well select-next">
132132
<a href="/web-frameworks.html" class="btn btn-success btn-full"><i class="fa fa-code fa-inverse fa-2x"></i></a>
@@ -147,20 +147,23 @@ <h3>Let's get started. What do you need to do right now?</h3>
147147
<div class="col-md-3">
148148
<div class="well select-next">
149149
<a href="/best-python-resources.html" class="btn btn-success btn-full"><i class="fa fa-book fa-inverse fa-2x"></i></a>
150+
</a>
150151
<p class="under-btn">
151-
I need to prepare myself first with more resources.
152+
I need to prepare myself with more Python resources first.
152153
</p>
153154
</div>
154155
</div>
155156
<div class="col-md-3">
156157
<div class="well select-next">
157158
<a href="/change-log.html" class="btn btn-success btn-full"><i class="fa fa-pencil-square-o fa-inverse fa-2x"></i></a>
159+
</a>
158160
<p class="under-btn">
159161
I've read Full Stack Python before. What's new?
160162
</p>
161163
</div>
162164
</div>
163-
</div> </div>
165+
</div>
166+
</div>
164167
<div class="col-md-offset-1 col-md-3" id="sidebar">
165168
<div class="panel panel-success">
166169
<div class="panel-heading"><h3 class="panel-head">Full Stack Python</h3></div>

‎introduction.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,16 @@ <h3>Let's get started. What do you need to do right now?</h3>
147147
<div class="col-md-3">
148148
<div class="well select-next">
149149
<a href="/best-python-resources.html" class="btn btn-success btn-full"><i class="fa fa-book fa-inverse fa-2x"></i></a>
150+
</a>
150151
<p class="under-btn">
151-
I need to prepare myself first with more resources.
152+
I need to prepare myself with more Python resources first.
152153
</p>
153154
</div>
154155
</div>
155156
<div class="col-md-3">
156157
<div class="well select-next">
157158
<a href="/change-log.html" class="btn btn-success btn-full"><i class="fa fa-pencil-square-o fa-inverse fa-2x"></i></a>
159+
</a>
158160
<p class="under-btn">
159161
I've read Full Stack Python before. What's new?
160162
</p>

‎source/content/pages/01-introduction/0101-introduction.markdown‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@ title: Introduction
22
category: page
33
slug: introduction
44
sort-order: 01
5+
choice1url: /web-frameworks.html
6+
choice1icon: fa-code fa-inverse
7+
choice1text: I want to learn how to code a web application with Python.
8+
choice2url: /deployment.html
9+
choice2icon: fa-share
10+
choice2text: I already built a Python web application. I need to deploy it.
11+
choice3url: /best-python-resources.html
12+
choice3icon: fa-book fa-inverse
13+
choice3text: I need to prepare myself with more Python resources first.
14+
choice4url: /change-log.html
15+
choice4icon: fa-pencil-square-o fa-inverse
16+
choice4text: I've read Full Stack Python before. What's new?
17+
518

619

720
# Introduction

‎source/theme/templates/chapter-choices.html‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
2+
{% if page %}
3+
<div class="row">
4+
<div class="col-md-3">
5+
<div class="well select-next">
6+
<a href="{{ page.choice1Url }}" class="btn btn-success btn-full"><i class="fa {{ page.choice1Icon }} fa-2x"></i></a>
7+
<p class="under-btn">
8+
{{ page.choice1Text }}
9+
</p>
10+
</div>
11+
</div>
12+
<div class="col-md-3">
13+
<div class="well select-next">
14+
<a href="/deployment.html" class="btn btn-success btn-full"><i class="fa fa-share fa-2x"></i></a>
15+
</a>
16+
<p class="under-btn">
17+
I already built a Python web application. I need to deploy it.
18+
</p>
19+
</div>
20+
</div>
21+
<div class="col-md-3">
22+
<div class="well select-next">
23+
<a href="/best-python-resources.html" class="btn btn-success btn-full"><i class="fa fa-book fa-inverse fa-2x"></i></a>
24+
<p class="under-btn">
25+
I need to prepare myself first with more resources.
26+
</p>
27+
</div>
28+
</div>
29+
<div class="col-md-3">
30+
<div class="well select-next">
31+
<a href="/change-log.html" class="btn btn-success btn-full"><i class="fa fa-pencil-square-o fa-inverse fa-2x"></i></a>
32+
<p class="under-btn">
33+
I've read Full Stack Python before. What's new?
34+
</p>
35+
</div>
36+
</div>
37+
</div>
38+
{% else %}
39+
40+
{% for page in pages|sort(attribute='sort-order') %}
41+
{% if loop.first %}
42+
{{ page.content }}
43+
{% endif %}
44+
{% endfor %}
45+
46+
{% endif %}

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,36 @@
11
<div class="row">
22
<div class="col-md-3">
33
<div class="well select-next">
4-
<a href="/web-frameworks.html" class="btn btn-success btn-full"><i class="fa fa-code fa-inverse fa-2x"></i></a>
4+
<a href="{{ page.choice1url }}" class="btn btn-success btn-full"><i class="fa {{ page.choice1icon }} fa-2x"></i></a>
55
<p class="under-btn">
6-
I want to learn how to code a web application with Python.
6+
{{ page.choice1text }}
77
</p>
88
</div>
99
</div>
1010
<div class="col-md-3">
1111
<div class="well select-next">
12-
<a href="/deployment.html" class="btn btn-success btn-full"><i class="fa fa-share fa-2x"></i></a>
12+
<a href="{{ page.choice2url }}" class="btn btn-success btn-full"><i class="fa {{ page.choice2icon }} fa-2x"></i></a>
1313
</a>
1414
<p class="under-btn">
15-
I already built a Python web application. I need to deploy it.
15+
{{ page.choice2text }}
1616
</p>
1717
</div>
1818
</div>
1919
<div class="col-md-3">
2020
<div class="well select-next">
21-
<a href="/best-python-resources.html" class="btn btn-success btn-full"><i class="fa fa-book fa-inverse fa-2x"></i></a>
21+
<a href="{{ page.choice3url }}" class="btn btn-success btn-full"><i class="fa {{ page.choice3icon }} fa-2x"></i></a>
22+
</a>
2223
<p class="under-btn">
23-
I need to prepare myself first with more resources.
24+
{{ page.choice3text }}
2425
</p>
2526
</div>
2627
</div>
2728
<div class="col-md-3">
2829
<div class="well select-next">
29-
<a href="/change-log.html" class="btn btn-success btn-full"><i class="fa fa-pencil-square-o fa-inverse fa-2x"></i></a>
30+
<a href="{{ page.choice4url }}" class="btn btn-success btn-full"><i class="fa {{ page.choice4icon }} fa-2x"></i></a>
31+
</a>
3032
<p class="under-btn">
31-
I've read Full Stack Python before. What's new?
33+
{{ page.choice4text }}
3234
</p>
3335
</div>
3436
</div>

‎source/theme/templates/index-choices.html‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{% for page in pages|sort(attribute='sort-order') %}
2+
{% if loop.first %}
3+
<div class="row">
4+
<div class="col-md-3">
5+
<div class="well select-next">
6+
<a href="{{ page.choice1url }}" class="btn btn-success btn-full"><i class="fa {{ page.choice1icon }} fa-2x"></i></a>
7+
<p class="under-btn">
8+
{{ page.choice1text }}
9+
</p>
10+
</div>
11+
</div>
12+
<div class="col-md-3">
13+
<div class="well select-next">
14+
<a href="{{ page.choice2url }}" class="btn btn-success btn-full"><i class="fa {{ page.choice2icon }} fa-2x"></i></a>
15+
</a>
16+
<p class="under-btn">
17+
{{ page.choice2text }}
18+
</p>
19+
</div>
20+
</div>
21+
<div class="col-md-3">
22+
<div class="well select-next">
23+
<a href="{{ page.choice3url }}" class="btn btn-success btn-full"><i class="fa {{ page.choice3icon }} fa-2x"></i></a>
24+
</a>
25+
<p class="under-btn">
26+
{{ page.choice3text }}
27+
</p>
28+
</div>
29+
</div>
30+
<div class="col-md-3">
31+
<div class="well select-next">
32+
<a href="{{ page.choice4url }}" class="btn btn-success btn-full"><i class="fa {{ page.choice4icon }} fa-2x"></i></a>
33+
</a>
34+
<p class="under-btn">
35+
{{ page.choice4text }}
36+
</p>
37+
</div>
38+
</div>
39+
</div>
40+
{% endif %}
41+
{% endfor %}

‎source/theme/templates/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
{% for page in pages|sort(attribute='sort-order') %}
77
{% if loop.first %}
88
{{ page.content }}
9+
{% include "index-choices.html" %}
910
{% endif %}
1011
{% endfor %}
11-
{% include "chapters/introduction.html" %}
1212
</div>
1313
{% include "sidebar.html" %}
1414
</div>

0 commit comments

Comments
 (0)