forked from atomantic/slides-versioncontrol
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathindex.html
More file actions
506 lines (412 loc) · 20.4 KB
/
index.html
File metadata and controls
506 lines (412 loc) · 20.4 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=1024" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<title>Adam Eivy | Web Development Engineer | @antic</title>
<meta name="description" content="" />
<meta name="author" content="Adam Eivy" />
<link href="http://fonts.googleapis.com/css?family=Open+Sans:regular,semibold,italic,italicsemibold|PT+Sans:400,700,400italic,700italic|PT+Serif:400,700,400italic,700italic" rel="stylesheet" />
<!--
Impress.js doesn't depend on any external stylesheet. Script adds all styles it needs for
presentation to work.
This style below contains styles only for demo presentation. Browse it to see how impress.js
classes are used to style presentation steps, or how to apply fallback styles, but I don't want
you to use them directly in your presentation.
Be creative, build your own. We don't really want all impress.js presentations to look the same,
do we?
When creating your own presentation get rid of this file. Start from scratch, it's fun!
-->
<link href="css/impress.css" rel="stylesheet" />
<link rel="shortcut icon" href="favicon.png" />
<link rel="apple-touch-icon" href="apple-touch-icon.png" />
</head>
<!--
Body element is used by impress.js to set some useful class names, that will allow you to detect
the support and state of the presentation in CSS or other scripts.
First very useful class name is `impress-not-supported`. This class means, that browser doesn't
support features required by impress.js, so you should apply some fallback styles in your CSS.
It's not necessary to add it manually on this element. If the script detects that browser is not
good enough it will add this class, but keeping it in HTML means that users without JavaScript
will also get fallback styles.
When impress.js script detects that browser supports all required features, this class name will
be removed.
The class name on body element also depends on currently active presentation step. More details about
it can be found later, when `hint` element is being described.
-->
<body class="impress-not-supported">
<!--
For example this fallback message is only visible when there is `impress-not-supported` class on body.
-->
<div class="fallback-message">
<p>Your browser <b>doesn't support the features required</b> by impress.js, so you are presented with a simplified version of this presentation.</p>
<p>For the best experience please use the latest <b>Chrome</b>, <b>Safari</b> or <b>Firefox</b> browser.</p>
</div>
<!--
Now that's the core element used by impress.js.
That's the wrapper for your presentation steps. In this element all the impress.js magic happens.
It doesn't have to be a `<div>`. Only `id` is important here as that's how the script find it.
You probably won't need it now, but there are some configuration options that can be set on this element.
To change the duration of the transition between slides use `data-transition-duration="2000"` giving it
a number of ms. It defaults to 1000 (1s).
You can also control the perspective with `data-perspective="500"` giving it a number of pixels.
It defaults to 1000. You can set it to 0 if you don't want any 3D effects.
If you are willing to change this value make sure you understand how CSS perspective works:
https://developer.mozilla.org/en/CSS/perspective
But as I said, you won't need it for now, so don't worry - there are some simple but interesing things
right around the corner of this tag ;)
-->
<div id="impress">
<!--
In the example below we only specify x and y position of the step element with `data-x="-1000"`
and `data-y="-1500` attributes. This means that **the center** of the element (yes, the center)
will be positioned in point x = -1000px and y = -1500px of the presentation 'canvas'.
It will not be rotated or scaled.
-->
<div id="hi" class="step slide" data-x="0" data-y="0" data-scale="4">
<h1><b class="rotating">\[._.]/</b> - Oh, Hi!</h1>
<q>I'm <b>Adam Eivy</b> (<a href="http://twitter.com/antic" target="off">@antic)</a></q>
<p>
Sr. Staff Software Engineer, Disney<br />
Occasional Web Development Instructor, SCCC
</p>
<q>Let's talk about <b>Version Control Systems (VCS)</b>...</q>
</div>
<div id="brainmelt" class="step slide" data-x="0" data-y="0" data-z="4000" data-scale="4">
<h1>This is complicated...</h1>
<q>
Step 1: Melt Your Brains (Overview)<br />
Step 2: Try Some Hands On Git<br />
Step 3: Push You Out of the Nest<br />
</q>
</div>
<div id="why" class="step slide" data-x="2800" data-y="50" data-scale="2" data-rotate="-90">
<h1>Why?</h1>
<ul>
<li>Centralizing code / Backup</li>
<li>Collaboration</li>
<li>Maintain history and versions</li>
<li>Branching</li>
</ul>
</div>
<div id="centralized" class="step slide" data-x="4000" data-y="1500" data-z="300" data-rotate-x="-20" data-rotate-y="0" data-rotate="-90">
<h1>Centralizing Code</h1>
<ul>
<li>Network Share (been there)</li>
<li>DropBox, etc (done that)</li>
<li>Web Server (yep)</li>
<li>Remote Code Repository
<ul>
<li>Subversion (SVN)</li>
<li>Mercurial (Hg)</li>
<li>Git</li>
</ul></li>
</ul>
</div>
<div id="collaboration" class="step slide" data-x="4000" data-y="500" data-rotate="-90" data-z="300">
<h1>Collaboration</h1>
<p><br />It isn't always easy.</p><br /><br />
<ul>
<li>Change conflicts</li>
<li>Accountability ( <b class="scaling">blame</b> / <b class="rotating">kudos</b> )</li>
</li>
</ul>
</div>
<div id="history" class="step slide" data-x="4000" data-y="-500" data-rotate="-90" data-z="300">
<h1>History</h1>
<p>Looking up code history can answer a lot of questions about how code got where it is:</p>
<ul>
<li><b class="label">Who?</b> Commit Author</li>
<li><b class="label">What?</b> File Diffs</li>
<li><b class="label">When?</b> Each commit is timestamped</li>
<li><b class="label">Why?</b> Commit Messages</li>
</ul>
</div>
<div id="branching" class="step slide" data-x="4000" data-y="-1500" data-z="300" data-rotate-x="20" data-rotate-y="0" data-rotate="-90">
<h1>Branching</h1>
<p>A little later, we'll go over Git Flow to see how this works</p>
<ul>
<li>Features (specific stories)</li>
<li>Releases (versions)</li>
<li>Hotfixes (bugs to production)</li>
<li>Development</li>
<li>External Teams</li>
</ul>
</div>
<div id="methods" class="step slide" data-x="50" data-y="2300" data-scale="2">
<h1>Methods</h1>
<p>some flawed attempts*</p>
<ul>
<li>File Renaming</li>
<li>Dreamweaver Check-in/out</li>
</ul>
<p>Some actual versioning tools*</p>
<ul>
<li>Subversion</li>
<li>Git</li>
</ul>
<span class="footnote"><sup>*</sup> list goes on and on (Hg, Perforce, CVS, Bridge...)</span>
</div>
<div id="rename" class="step slide" data-x="-1500" data-y="3500">
<h1>File Renaming</h1>
<blockquote>(index.html, index_2.html, index_3.html, index_adam_2.html)</blockquote>
<ul>
<li>Doesn't require any software...but</li>
<li>Tedious 句_句</li>
<li>Explodes size of codebase</li>
<li>Editing vs debugging version confusion</li>
<li>Still causes conflicts with multiple devs</li>
</ul>
</div>
<div id="rename-person" class="step" data-x="-1500" data-y="3500" data-z="3000">
<img src="img/meme-neverusesvcs.jpg" class="center" />
</div>
<div id="rename-result" class="step" data-x="-1500" data-y="3500" data-z="6000">
<img src="img/meme-filerename.jpg" class="center" />
</div>
<div id="dreamweaver" class="step slide" data-x="-500" data-y="3500">
<h1>Dreamweaver</h1>
<p></p>
<ul>
<li>Prevents conflicts by locking files</li>
<li>Tedious</li>
<li>Only one editor at a time</li>
<li>If you forget to check in your file, nobody else can work on it</li>
<li>No history/versioning/backup/etc</li>
</ul>
</div>
<div id="dreamweaver-result" class="step" data-x="-500" data-y="3500" data-z="6000">
<h1>ಠ_ಠ</h1>
<img src="img/meme-noneedforscm.jpg" class="center" />
</div>
<div id="svn" class="step slide" data-x="500" data-y="3500">
<h1>Subversion (SVN)</h1>
<p></p>
<ul>
<li>Centralized remote repository</li>
<li>Changes made on the remote server</li>
<li>Single source of truth</li>
<li>Branch merging is PAINFUL!</li>
</ul>
</div>
<div id="svn-person" class="step" data-x="500" data-y="3500" data-z="6000">
<img src="img/meme-notdistributed.jpg" class="center" />
</div>
<div id="svn-result" class="step" data-x="500" data-y="3500" data-z="12000">
<img src="img/meme-svnlost.jpg" class="center" />
</div>
<div id="git" class="step slide" data-x="1500" data-y="3500">
<h1>Git</h1>
<ul>
<li>Entire repository is local</li>
<li>Whole repo/history is smaller</li>
<li>Branching is super easy</li>
<li>It's social!</li>
</ul>
<img src="img/github-social.jpg" class="center" />
</div>
<div id="git-result" class="step" data-x="1500" data-y="4300">
<h1><a href="http://github.com/atomantic" target="off">GitHub</a></h1>
<img src="img/octocat.png" class="center" />
</div>
<div id="process" class="step slide" data-x="-2800" data-y="50" data-scale="2" data-rotate="90">
<h1>Process</h1>
<ul>
<li>Check in frequently</li>
<li><a href="http://en.wikipedia.org/wiki/Diff" target="off">What's the diff?</a></li>
<li>Code Review</li>
<li>Fork and Pull Request</li>
</ul>
</div>
<div id="process-frequent" class="step slide" data-x="-4000" data-y="1500" data-rotate="90" data-rotate-x="-20" data-rotate-y="0" data-rotate="-90">
<h1>Check in frequently</h1>
<ol>
<li>Commit locally
<pre>git commit -m 'added some stuff'</pre>
</li>
<li>Rebase to wrap-up changes
<pre>git rebase</pre>
</li>
<li>Push it out
<pre>git push</pre>
</li>
<li>Bask in awesomeness
<pre>\[._.]/</pre>
</li>
</ol>
</div>
<div id="merge" class="step slide" data-x="-4000" data-y="500" data-rotate="90">
<h1>Merge Conflict!</h1>
<img src="img/mergetool.png" class="center" />
</div>
<div id="merge-clean" class="step" data-x="-4000" data-y="500" data-z="4000" data-rotate="90">
<h2>Clean</h2>
<img src="img/merge_clean.png" class="center" />
</div>
<div id="merge-raw" class="step" data-x="-4000" data-y="500" data-z="8000" data-rotate="90">
<h2>Raw Merge</h2>
<img src="img/merge_conflict.png" class="center" />
</div>
<div id="merge-araxis" class="step" data-x="-4000" data-y="500" data-z="12000" data-rotate="90">
<h2>Araxis</h2>
<img src="img/merge_araxis.png" class="center" />
</div>
<div id="process-review" class="step slide" data-x="-4000" data-y="-500" data-rotate="90">
<h1>Code Review</h1>
<ul>
<li>Comment on checkins</li>
<li>Line commenting</li>
<li>Tag and add notes</li>
<li>Kudos (^5)</li>
</ul>
</div>
<div id="process-fork" class="step slide" data-x="-4000" data-y="-1500" data-rotate="90" data-rotate-x="20" data-rotate-y="0" data-rotate="-90">
<h1>Fork and Pull Request</h1>
<p>If you do this, you rock!</p>
<ul>
<li>Fork a project on Github<br/><img src="img/fork.png" /></li>
<li>Create a branch
<pre>git checkout -b FixingResponsiveLayout</pre>
</li>
<li>Fix a bug
<pre>git commit -m 'now the plugin handles responsive layout';
git push</pre>
</li>
<li>Submit a pull request<br/><img src="img/pullrequest.png" /></li>
</ul>
</div>
<div id="nextsteps" class="step slide" data-x="50" data-y="-2300" data-scale="2" data-rotate="180">
<h1>What now?</h1><br /><br />
<img src="img/meme-versioncontrolallthings.jpg" class="center" />
</div>
<div id="trygit" class="step slide" data-x="1500" data-y="-3500" data-rotate="180">
<h1><a href="http://try.github.com">Code School</a></h1>
<a href="http://try.github.com" target="off">
<img src="img/trygit.gif" class="center" /><br />
http://try.github.com
</a>
</div>
<div id="markdown" class="step slide" data-x="500" data-y="-3500" data-rotate="180">
<h1><a href="http://daringfireball.net/projects/markdown/" target="off">Markdown</a></h1>
<p>Create a README.md file in every project!</p>
<a href="http://daringfireball.net/projects/markdown" target="off">
<img src="img/markdown.png" class="center" /><br />
http://daringfireball.net/projects/markdown
</a>
</div>
<div id="commandline" class="step slide" data-x="-500" data-y="-3500" data-rotate="180">
<h1>Command Line</h1>
<ul>
<li>Learn it</li>
<li>Use it</li>
<li><3 it</li>
</ul>
</div>
<div id="N4" class="step slide" data-x="-1500" data-y="-3500" data-rotate="180">
<h1>Free Ebook: Pro Git</h1>
<a href="http://git-scm.com/book/" target="off">
<img src="img/pro-git-118x157.jpg" class="center" /><br />
http://git-scm.com/book/
</a>
</div>
<div id="close" class="step slide" data-x="50" data-y="-5000" data-scale="2" data-rotate="180">
<h1>Thanks!</h1>
<ul>
<li>Slides: <a href="https://github.com/atomantic/slides-versioncontrol" target="github">https://github.com/atomantic/slides-versioncontrol</a></li>
</ul>
</div>
<!--
So to make a summary of all the possible attributes used to position presentation steps, we have:
* `data-x`, `data-y`, `data-z` - they define the position of **the center** of step element on
the canvas in pixels; their default value is 0;
* `data-rotate-x`, `data-rotate-y`, 'data-rotate-z`, `data-rotate` - they define the rotation of
the element around given axis in degrees; their default value is 0; `data-rotate` and `data-rotate-z`
are exactly the same;
* `data-scale` - defines the scale of step element; default value is 1
These values are used by impress.js in CSS transformation functions, so for more information consult
CSS transfrom docs: https://developer.mozilla.org/en/CSS/transform
-->
<div id="overview" class="step" data-x="0" data-y="0" data-scale="10">
</div>
</div>
<!--
Hint is not related to impress.js in any way.
But it can show you how to use impress.js features in creative way.
When the presentation step is shown (selected) its element gets the class of "active" and the body element
gets the class based on active step id `impress-on-ID` (where ID is the step's id)... It may not be
so clear because of all these "ids" in previous sentence, so for example when the first step (the one with
the id of `bored`) is active, body element gets a class of `impress-on-bored`.
This class is used by this hint below. Check CSS file to see how it's shown with delayed CSS animation when
the first step of presentation is visible for a couple of seconds.
...
And when it comes to this piece of JavaScript below ... kids, don't do this at home ;)
It's just a quick and dirty workaround to get different hint text for touch devices.
In a real world it should be at least placed in separate JS file ... and the touch content should be
probably just hidden somewhere in HTML - not hard-coded in the script.
Just sayin' ;)
-->
<div class="hint">
<p>Use a spacebar or arrow keys to navigate</p>
</div>
<script>
if ("ontouchstart" in document.documentElement) {
document.querySelector(".hint").innerHTML = "<p>Tap on the left or right to navigate</p>";
}
</script>
<!--
Last, but not least.
To make all described above really work, you need to include impress.js in the page.
I strongly encourage to minify it first.
In here I just include full source of the script to make it more readable.
You also need to call a `impress().init()` function to initialize impress.js presentation.
And you should do it in the end of your document. Not only because it's a good practice, but also
because it should be done when the whole document is ready.
Of course you can wrap it in any kind of "DOM ready" event, but I was too lazy to do so ;)
-->
<script src="js/impress.js"></script>
<script>impress().init();</script>
<!--
The `impress()` function also gives you access to the API that controls the presentation.
Just store the result of the call:
var api = impress();
and you will get three functions you can call:
`api.init()` - initializes the presentation,
`api.next()` - moves to next step of the presentation,
`api.prev()` - moves to previous step of the presentation,
`api.goto( idx | id | element, [duration] )` - moves the presentation to the step given by its index number
id or the DOM element; second parameter can be used to define duration of the transition in ms,
but it's optional - if not provided default transition duration for the presentation will be used.
You can also simply call `impress()` again to get the API, so `impress().next()` is also allowed.
Don't worry, it wont initialize the presentation again.
For some example uses of this API check the last part of the source of impress.js where the API
is used in event handlers.
-->
</body>
</html>
<!--
Now you know more or less everything you need to build your first impress.js presentation, but before
you start...
Oh, you've already cloned the code from GitHub?
You have it open in text editor?
Stop right there!
That's not how you create awesome presentations. This is only a code. Implementation of the idea that
first needs to grow in your mind.
So if you want to build great presentation take a pencil and piece of paper. And turn off the computer.
Sketch, draw and write. Brainstorm your ideas on a paper. Try to build a mind-map of what you'd like
to present. It will get you closer and closer to the layout you'll build later with impress.js.
Get back to the code only when you have your presentation ready on a paper. It doesn't make sense to do
it earlier, because you'll only waste your time fighting with positioning of useless points.
If you think I'm crazy, please put your hands on a book called "Presentation Zen". It's all about
creating awesome and engaging presentations.
Think about it. 'Cause impress.js may not help you, if you have nothing interesting to say.
-->
<!--
Are you still reading this?
For real?
I'm impressed! Feel free to let me know that you got that far (I'm @bartaz on Twitter), 'cause I'd like
to congratulate you personally :)
But you don't have to do it now. Take my advice and take some time off. Make yourself a cup of coffee, tea,
or anything you like to drink. And raise a glass for me ;)
Cheers!
-->