Skip to content

Commit 0ac1dc6

Browse files
mattmakaimattmakai
committed
updating javascript page with checklist
1 parent 85f9f16 commit 0ac1dc6

File tree

7 files changed

+92
-56
lines changed

7 files changed

+92
-56
lines changed

‎cascading-style-sheets.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,10 @@ <h2>Why is CSS necessary?</h2>
5959
<h2>CSS learning checklist</h2>
6060
<p><i class="fa fa-check-square-o"></i>
6161
Create a simple HTML file with basic elements in it. Use the
62-
<code>python -m SimpleHTTPServer</code> command to serve it up. Create a <code>&lt;style&gt;</code>
63-
section within the <code>&lt;head&gt;</code> section in the HTML page. Start playing with CSS
64-
to change the look and feel of the page.</p>
62+
<code>python -m SimpleHTTPServer</code> command to serve it up. Create a
63+
<code>&lt;style&gt;&lt;/style&gt;</code> element within the <code>&lt;head&gt;</code> section in the HTML page.
64+
Start playing with CSS within that style element to change the look and feel
65+
of the page.</p>
6566
<p><i class="fa fa-check-square-o"></i>
6667
Check out front end frameworks such as Bootstrap and Foundation and integrate
6768
one of those into the HTML page.</p>

‎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-27T14:40:54Z</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-27T15:27:47Z</updated></feed>

‎javascript.html‎

Lines changed: 40 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,30 @@
4646
<div class="col-md-8">
4747
<h1>JavaScript</h1>
4848
<p>JavaScript is a small scripting programming language embedded in web browsers
49-
to enable dynamic content. </p>
50-
<h2>Where does JavaScript come from?</h2>
49+
to enable dynamic content and interaction. </p>
50+
<h2>Why is JavaScript necessary?</h2>
51+
<p>JavaScript executes in the client and enables dynamic content and interaction
52+
that is not possible with HTML and CSS alone. </p>
53+
<h2>JavaScript learning checklist</h2>
54+
<p><i class="fa fa-check-square-o"></i>
55+
Create a simple HTML file with basic elements in it. Use the
56+
<code>python -m SimpleHTTPServer</code> command to serve it up. Create a
57+
<code>&lt;script type="text/javascript"&gt;&lt;/script&gt;</code>
58+
element at the end of the <code>&lt;body&gt;</code> section in the HTML page. Start playing
59+
with JavaScript within that element to learn the basic syntax.</p>
60+
<p><i class="fa fa-check-square-o"></i>
61+
Download <a href="http://jquery.com/">JQuery</a> and add it to the page above your
62+
JavaScript element. Start working with JQuery and learning how it makes basic
63+
JavaScript easier.</p>
64+
<p><i class="fa fa-check-square-o"></i>
65+
Work with JavaScript on the page. Incorporate examples from open source
66+
projects listed below as well as JQuery plugins. Check out the Unheap link
67+
below to find a large collection of categorized JQuery plugins.</p>
68+
<p><i class="fa fa-check-square-o"></i>
69+
Integrate JavaScript into your web application and check the
70+
<a href="/static-content.html">static content</a> section for how to host the JavaScript
71+
files.</p>
72+
<h2>Where did JavaScript originate?</h2>
5173
<p>JavaScript is an implementation of
5274
<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/JavaScript_Overview">the ECMAScript specification</a>
5375
which is defined by the
@@ -79,32 +101,41 @@ <h2>JavaScript resources</h2>
79101
</li>
80102
</ul>
81103
<h3>Do you need to style your app or deploy it next?</h3>
82-
<div class="row">
83-
<div class="col-md-4">
104+
<div class="row">
105+
<div class="col-md-3">
84106
<div class="well select-next">
85107
<a href="/cascading-style-sheets.html" class="btn btn-success btn-full"><i class="fa fa-css3 fa-inverse fa-2x"></i></a>
86108
<p class="under-btn">
87109
How do I style my web application's user interface?
88110
</p>
89111
</div>
90112
</div>
91-
<div class="col-md-4">
113+
<div class="col-md-3">
92114
<div class="well select-next">
93115
<a href="/static-content.html" class="btn btn-success btn-full"><i class="fa fa-spinner fa-inverse fa-2x"></i></a>
116+
</a>
94117
<p class="under-btn">
95-
How should I host my static content such as my CSS files?
118+
Where should I host static content such as my JavaScript files?
96119
</p>
97120
</div>
98121
</div>
99-
<div class="col-md-4">
122+
<div class="col-md-3">
100123
<div class="well select-next">
101124
<a href="/source-control.html" class="btn btn-success btn-full"><i class="fa fa-code-fork fa-inverse fa-2x"></i></a>
102125
<p class="under-btn">
103-
How do I save and version my code so it doesn't get lost?
126+
How do I save and version my code so it does not get lost?
104127
</p>
105128
</div>
106129
</div>
107-
</div> <style type="text/css">
130+
<div class="col-md-3">
131+
<div class="well select-next">
132+
<a href="/deployment.html" class="btn btn-success btn-full"><i class="fa fa-share fa-inverse fa-2x"></i></a>
133+
<p class="under-btn">
134+
How do I deploy my web application?
135+
</p>
136+
</div>
137+
</div>
138+
</div> <style type="text/css">
108139
#mc_embed_signup{background:#fff; clear:left; font:12px "Helvetica Neue",Arial,sans-serif; }
109140
/* Add your own MailChimp form style overrides in your site stylesheet or in this style block.
110141
We recommend moving this block and the preceding CSS link to the HEAD of your HTML file. */

‎source/content/pages/05-client-side/0501-css.markdown‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ shows that scenario when you resize the browser width.
3535
## CSS learning checklist
3636
<i class="fa fa-check-square-o"></i>
3737
Create a simple HTML file with basic elements in it. Use the
38-
``python -m SimpleHTTPServer`` command to serve it up. Create a ``<style>``
39-
section within the ``<head>`` section in the HTML page. Start playing with CSS
40-
to change the look and feel of the page.
38+
``python -m SimpleHTTPServer`` command to serve it up. Create a
39+
``<style></style>`` element within the ``<head>`` section in the HTML page.
40+
Start playing with CSS within that style element to change the look and feel
41+
of the page.
4142

4243
<i class="fa fa-check-square-o"></i>
4344
Check out front end frameworks such as Bootstrap and Foundation and integrate

‎source/content/pages/05-client-side/0503-javascript.markdown‎

Lines changed: 43 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,55 @@ title: JavaScript
22
category: page
33
slug: javascript
44
sort-order: 052
5-
choice1url:
6-
choice1icon:
7-
choice1text:
8-
choice2url:
9-
choice2icon:
10-
choice2text:
11-
choice3url:
12-
choice3icon:
13-
choice3text:
14-
choice4url:
15-
choice4icon:
16-
choice4text:
5+
choice1url: /cascading-style-sheets.html
6+
choice1icon: fa-css3 fa-inverse
7+
choice1text: How do I style my web application's user interface?
8+
choice2url: /static-content.html
9+
choice2icon: fa-spinner fa-inverse
10+
choice2text: Where should I host static content such as my JavaScript files?
11+
choice3url: /source-control.html
12+
choice3icon: fa-code-fork fa-inverse
13+
choice3text: How do I save and version my code so it does not get lost?
14+
choice4url: /deployment.html
15+
choice4icon: fa-share fa-inverse
16+
choice4text: How do I deploy my web application?
1717

1818

1919
# JavaScript
2020
JavaScript is a small scripting programming language embedded in web browsers
21-
to enable dynamic content.
21+
to enable dynamic content and interaction.
2222

2323

24-
## Where does JavaScript come from?
24+
## Why is JavaScript necessary?
25+
JavaScript executes in the client and enables dynamic content and interaction
26+
that is not possible with HTML and CSS alone.
27+
28+
29+
## JavaScript learning checklist
30+
<i class="fa fa-check-square-o"></i>
31+
Create a simple HTML file with basic elements in it. Use the
32+
``python -m SimpleHTTPServer`` command to serve it up. Create a
33+
``<script type="text/javascript"></script>``
34+
element at the end of the ``<body>`` section in the HTML page. Start playing
35+
with JavaScript within that element to learn the basic syntax.
36+
37+
<i class="fa fa-check-square-o"></i>
38+
Download [JQuery](http://jquery.com/) and add it to the page above your
39+
JavaScript element. Start working with JQuery and learning how it makes basic
40+
JavaScript easier.
41+
42+
<i class="fa fa-check-square-o"></i>
43+
Work with JavaScript on the page. Incorporate examples from open source
44+
projects listed below as well as JQuery plugins. Check out the Unheap link
45+
below to find a large collection of categorized JQuery plugins.
46+
47+
<i class="fa fa-check-square-o"></i>
48+
Integrate JavaScript into your web application and check the
49+
[static content](/static-content.html) section for how to host the JavaScript
50+
files.
51+
52+
53+
## Where did JavaScript originate?
2554
JavaScript is an implementation of
2655
[the ECMAScript specification](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/JavaScript_Overview)
2756
which is defined by the

‎source/theme/templates/chapters/cascading-style-sheets.html‎

Whitespace-only changes.

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

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)