Skip to content

Commit 9aaced8

Browse files
mattmakaimattmakai
committed
working on diagrams for fsp
1 parent b6fe70b commit 9aaced8

File tree

13 files changed

+90
-12
lines changed

13 files changed

+90
-12
lines changed

‎css/c.css‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎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>2013-12-03T09:39:50Z</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>2013-12-04T09:50:23Z</updated></feed>

‎img/web-browser-server-requests.png‎

20.9 KB
Loading

‎index.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,10 @@ <h1>Web Server</h1>
277277
file and the file has not changed, the web server will pass back a 304
278278
&quot;Not modified&quot; response indicating the client already has the latest version
279279
of that file.</p>
280-
<img alt="Web server and web browser request-response cycles" src="../img/web-server-web-browser.jpg" />
280+
<img alt="Web server and web browser request-response cycles" class="technical-diagram" src="../img/web-browser-server-requests.png" />
281281
<p>A web server sends files to a web browser based on the web browser's
282-
request. In the first request, the browser accessed the &quot;www.example.com&quot;
282+
request. In the first request, the browser accessed the
283+
&quot;www.fullstackpython.com&quot;
283284
address and the server responded with the index.html HTML-formatted file.
284285
That HTML file contained references to other files, such as style.css and
285286
script.js that the browser then requested from the server.</p>

‎pages/web-server.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,10 @@ <h1>Web Server</h1>
6262
file and the file has not changed, the web server will pass back a 304
6363
&quot;Not modified&quot; response indicating the client already has the latest version
6464
of that file.</p>
65-
<img alt="Web server and web browser request-response cycles" src="../img/web-server-web-browser.jpg" />
65+
<img alt="Web server and web browser request-response cycles" class="technical-diagram" src="../img/web-browser-server-requests.png" />
6666
<p>A web server sends files to a web browser based on the web browser's
67-
request. In the first request, the browser accessed the &quot;www.example.com&quot;
67+
request. In the first request, the browser accessed the
68+
&quot;www.fullstackpython.com&quot;
6869
address and the server responded with the index.html HTML-formatted file.
6970
That HTML file contained references to other files, such as style.css and
7071
script.js that the browser then requested from the server.</p>

‎source/content/pages/web-server.rst‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@ file and the file has not changed, the web server will pass back a 304
2222
of that file.
2323

2424

25-
.. image:: ../img/web-server-web-browser.jpg
25+
.. image:: ../img/web-browser-server-requests.png
2626
:alt: Web server and web browser request-response cycles
27+
:class: technical-diagram
2728

2829
A web server sends files to a web browser based on the web browser's
29-
request. In the first request, the browser accessed the "www.example.com"
30+
request. In the first request, the browser accessed the
31+
"www.fullstackpython.com"
3032
address and the server responded with the index.html HTML-formatted file.
3133
That HTML file contained references to other files, such as style.css and
3234
script.js that the browser then requested from the server.

‎source/mockups/web-browser-server-requests.bmml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<mockup version="1.0" skin="wireframe" fontFace="Balsamiq Sans" measuredW="1035" measuredH="480" mockupW="900" mockupH="398">
2+
<controls>
3+
<control controlID="1" controlTypeID="com.balsamiq.mockups::TextArea" x="135" y="83" w="200" h="397" measuredW="200" measuredH="140" zOrder="0" locked="false" isInGroup="-1">
4+
<controlProperties>
5+
<align>center</align>
6+
<backgroundAlpha>1</backgroundAlpha>
7+
<bold>true</bold>
8+
<color>15658734</color>
9+
<size>28</size>
10+
<text>%20%0A%20%0A%20%0A%20%0A%20%0AWeb%0Aserver</text>
11+
</controlProperties>
12+
</control>
13+
<control controlID="3" controlTypeID="com.balsamiq.mockups::BrowserWindow" x="703" y="82" w="332" h="398" measuredW="450" measuredH="400" zOrder="1" locked="false" isInGroup="-1">
14+
<controlProperties>
15+
<text>Full%20Stack%20Python%0Ahttp%3A//www.fullstackpython.com/</text>
16+
</controlProperties>
17+
</control>
18+
<control controlID="5" controlTypeID="com.balsamiq.mockups::Label" x="781" y="292" w="-1" h="-1" measuredW="176" measuredH="34" zOrder="2" locked="false" isInGroup="-1">
19+
<controlProperties>
20+
<bold>true</bold>
21+
<size>28</size>
22+
<text>Web%20browser</text>
23+
</controlProperties>
24+
</control>
25+
<control controlID="6" controlTypeID="com.balsamiq.mockups::Arrow" x="335" y="159" w="368" h="10" measuredW="150" measuredH="100" zOrder="3" locked="false" isInGroup="-1">
26+
<controlProperties>
27+
<direction>top</direction>
28+
<rightArrow>false</rightArrow>
29+
<text>www.fullstackpython.com</text>
30+
</controlProperties>
31+
</control>
32+
<control controlID="7" controlTypeID="com.balsamiq.mockups::Arrow" x="335" y="255" w="368" h="10" measuredW="150" measuredH="100" zOrder="4" locked="false" isInGroup="-1">
33+
<controlProperties>
34+
<direction>top</direction>
35+
<rightArrow>false</rightArrow>
36+
<text>GET%20style.css</text>
37+
</controlProperties>
38+
</control>
39+
<control controlID="8" controlTypeID="com.balsamiq.mockups::Arrow" x="335" y="352" w="368" h="10" measuredW="150" measuredH="100" zOrder="5" locked="false" isInGroup="-1">
40+
<controlProperties>
41+
<direction>top</direction>
42+
<rightArrow>false</rightArrow>
43+
<text>GET%20script.js</text>
44+
</controlProperties>
45+
</control>
46+
<control controlID="9" controlTypeID="com.balsamiq.mockups::Arrow" x="335" y="207" w="368" h="10" measuredW="150" measuredH="100" zOrder="6" locked="false" isInGroup="-1">
47+
<controlProperties>
48+
<direction>top</direction>
49+
<leftArrow>false</leftArrow>
50+
<rightArrow>true</rightArrow>
51+
<text>sends%20index.html%2C%20which%20references%20style.css%20%26%20script.js</text>
52+
</controlProperties>
53+
</control>
54+
<control controlID="10" controlTypeID="com.balsamiq.mockups::Arrow" x="335" y="304" w="368" h="10" measuredW="150" measuredH="100" zOrder="7" locked="false" isInGroup="-1">
55+
<controlProperties>
56+
<direction>top</direction>
57+
<leftArrow>false</leftArrow>
58+
<rightArrow>true</rightArrow>
59+
<text>sends%20style.css</text>
60+
</controlProperties>
61+
</control>
62+
<control controlID="11" controlTypeID="com.balsamiq.mockups::Arrow" x="335" y="400" w="368" h="10" measuredW="150" measuredH="100" zOrder="8" locked="false" isInGroup="-1">
63+
<controlProperties>
64+
<direction>top</direction>
65+
<leftArrow>false</leftArrow>
66+
<rightArrow>true</rightArrow>
67+
<text>sends%20script.js</text>
68+
</controlProperties>
69+
</control>
70+
</controls>
71+
</mockup>

‎source/theme/create_css.sh‎

100644100755
File mode changed.

‎source/theme/less/custom.less‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@import "bootswatch-variables.less";
33
@import "bootswatch.less";
44

5-
body {background: #fafafa;}
5+
body {background: #fff;}
66
@textColor: #171717;
77
@baseFontSize: 16px;
88
.underline {text-decoration: underline;}
@@ -20,4 +20,4 @@ p {color: #333; font-size: @baseFontSize+2; line-height: @baseFontSize+8;}
2020
.footer {margin-bottom: 15px;}
2121
img {border: 1px solid #222;}
2222
.logo-image {vertical-align: top; padding-bottom: 15px; border: none;}
23-
23+
.technical-diagram {padding: 20px; border: none;}

‎source/theme/static/css/c.css‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)