Skip to content

Commit

Permalink
[slides] Nuevos slides sobre Git
Browse files Browse the repository at this point in the history
  • Loading branch information
cronopio committed Nov 1, 2013
1 parent 6493839 commit 565cb49
Show file tree
Hide file tree
Showing 7 changed files with 135 additions and 2 deletions.
4 changes: 4 additions & 0 deletions app.js
Expand Up @@ -88,6 +88,10 @@ app.get('/gpg', function (req, res) {
res.render('cronopio/gpg/index', { layout: 'cronopio/gpg/layout' });
});

app.get('/git', function (req, res) {
res.render('cronopio/git/index', { layout: 'cronopio/git/layout' });
});

app.get('/seguridad-con-firefox', function(req, res) {
res.render('jaruiz33/index', { layout: 'jaruiz33/layout' });
});
Expand Down
4 changes: 2 additions & 2 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "nodeSlides",
"version": "0.0.9",
"version": "0.0.9-1",
"private": true,
"dependencies": {
"express": "2.5.x",
Expand All @@ -9,7 +9,7 @@
},
"subdomain": "fcbosque",
"scripts": {
"start": "app.js"
"start": "node app.js"
},
"engines": {
"node": "v0.6.x"
Expand Down
Binary file added public/images/control-versiones.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/git-workflow.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/git.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
80 changes: 80 additions & 0 deletions views/cronopio/git/index.jade
@@ -0,0 +1,80 @@
section.slide
a(href="http://fcbosque.org")
img(src="/images/header-logotype.jpg", style="margin-top:20px;float:right;")
h2 Sistemas de control de versiones: Git
hr
h3 Daniel Aristizabal Romero [cronopio]
h5 Test lead engineer at Nodejitsu

br

p Esta presentacion es una página web, puedes usar el mouse o las flechas
| para moverte a través de los slides. Ingresa a
a(href="http://fcbosque.jit.su/git") fcbosque.jit.su/git
p Esta disponible en la
a(href="http://fcbosque.jit.su") Plataforma de presentaciones de la Fundación Casa del Bosque
| junto a otras presentaciones muy interesantes.

img(src="/images/git.jpg")

.sources
h5
a(href="mailto:aristizabal.daniel@gmail.com") aristizabal.daniel@gmail.com
br
a(href="http://gplus.to/cronopio") www.gplus.to/cronopio
br
a(href="http://twitter.com/cronopio2") @cronopio2
br
a(href="http://github.com/cronopio")
img(src="/images/github.png", style="margin:10px")

section.slide
h1 Sistemas de control de versions
section.slide
br
br
img(src="/images/control-versiones.jpg")
section.slide
h1 Git
section.slide
h2 Git
hr
ul
li.slide Creado por Linus Torvalds
li.slide Cambio entre versiones facilmente
li.slide Distribuido
li.slide Encaja perfecto en equipos pequeños y equipos grandes
li.slide Muchas mas caractaresticas que los dejo que consulten
section.slide
h1 Manos a la obra!
section.slide
h2 Como Empezar
hr
h3 Podemos inicializar un repositorio tan solo con
blockquote git init
br
h3 Podemos clonar un reposotorio existente en otra maquina
blockquote git clone URL

section.slide
h1 git status
section.slide
h1 staging zone
section.slide
h2 Staging zone
hr
h2.slide git add
h2.slide git diff
h2.slide git commit
section.slide
h1 git log
section.slide
h1 Ramas! (Branch)
section.slide
h1 git branch
section.slide
h1 git checkout
section.slide
img(src="/images/git-workflow.png")
section.slide
h1 Ramas Remotas ¿0_0?
49 changes: 49 additions & 0 deletions views/cronopio/git/layout.jade
@@ -0,0 +1,49 @@
!!!
html
head
meta(charset="utf-8")
title Introducción a Git
meta(name="viewport", content="width=1024, user-scalable=yes")
link(rel="stylesheet", href="/stylesheets/cronopio/style.css")
link(rel="stylesheet", href="/stylesheets/cronopio/horizontal-slide.css")
link(rel="stylesheet", href="/stylesheets/cronopio/web-2.0.css")
link(rel="icon", type="image/png", href="/images/favicon.png")
script(src="/javascripts/modernizr.custom.js")
body(class="deck-container")
.deck-remote-join-message
p Hay una presentacion disponible, desea ingresar a verla?
p.deck-remote-links
a.deck-remote-ignore-link(href="#") Cancelar
|
a.deck-remote-join-link(href="#") Ingresar
.deck-remote-leave-message
p La presentacion ha terminado.
p.deck-remote-links
a.deck-remote-close-link(href="#") Cerrar

.deck-remote-master-message
p La clave es ...
p.deck-remote-master-feedback
form.deck-remote-master-form(action="")
p
input.deck-remote-password(type="password")
br
p.deck-remote-links
input(type="submit", value="Iniciar Sesion")
!= body
a.deck-prev-link(title="Anterior", href="#") ←
a.deck-next-link(title="Siguiente", href="#") →
p.deck-status
span.deck-status-current
/
span.deck-status-total
script(src="/javascripts/jquery-1.6.4.min.js")
script(src="/javascripts/deck/deck.core.js")
script(src="/javascripts/deck/deck.status.js")
script(src="/javascripts/deck/deck.navigation.js")
script(src="/javascripts/deck/deck.remote.js")
script
$(function() {
$.deck('.slide');
$.deck('remote');
});

0 comments on commit 565cb49

Please sign in to comment.