Skip to content

Commit 9d94de0

Browse files
jmMeessenjmMeessen
committed
Merge pull request #23 from dduportal/slides-maj
WiP on slides
2 parents 9f55cd6 + 406fdff commit 9d94de0

22 files changed

+5311
-233
lines changed

‎.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
.vagrant
2-
.DS_Store
2+
.DS_Store
3+
*gz
4+
*tgz
5+
*zip

‎Makefile

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: build shell test all presentation start clean
1+
.PHONY: build shell test all presentation start clean backup
22

33
DOCKER_IMAGE := cpt_igloo/devbox
44
DOCKER_NAME = devbox
@@ -22,18 +22,24 @@ shell:
2222
docker exec --tty --interactive $(DOCKER_NAME) sudo -u dockerx bash -l
2323

2424
presentation:
25-
@docker run -d -v $(CURDIR)/slides:/www -p 80:80 fnichol/uhttpd
25+
@docker kill $(DOCKER_NAME)-web
26+
@docker rm $(DOCKER_NAME)-web
27+
@docker run -d --name $(DOCKER_NAME)-web -v $(CURDIR)/slides:/www -p 80:80 fnichol/uhttpd
2628
@echo http://$$(boot2docker ip 2>/dev/null):80
2729

2830
test:
2931
docker run \
30-
-v $(CURDIR)/tests/bats:/bats-tests \
32+
-v $(CURDIR):/app \
3133
-v $$(which docker):$$(which docker) \
3234
-v /var/run/docker.sock:/var/run/docker.sock \
3335
-e DOCKER_HOST=unix:///var/run/docker.sock \
3436
dduportal/bats:0.4.0 \
35-
/bats-tests/
37+
/app/tests/bats/
38+
39+
backup:
40+
docker exec --detach $(DOCKER_NAME) tar czf /tmp/bkp-data-latest.tgz /data/
41+
docker cp $(DOCKER_NAME):/tmp/bkp-data-latest.tgz ./
3642

3743
clean:
38-
docker kill devbox
39-
docker rm devbox
44+
docker kill $(DOCKER_NAME)
45+
docker rm $(DOCKER_NAME)

‎TODO.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
* [x] Script shell de lancement de la devbox (avec partage docker socket + docker bin)
77
* [ ] Script de "backup" du workspace (docker run --volume-from=devbox debian:wheezy -v /vagrant:/backup tar czf /data /backup/$(date).tgz ou truc du genre)
8+
* [ ] make clean : utiliser la variable globale + confirmation
89

910
* [x] LXDE raccourci pour IntelliJ avec image
1011
* [x] LXDE IntelliJ dans main taskbar
@@ -27,11 +28,11 @@
2728

2829
## Slide related TODO
2930

30-
* [ ] faire le plan
31-
* [ ] clarifier ce qu'on veut que les auditeurs "ramènent chez eux"
31+
* [x] make presentation est idempotent
32+
* [x] faire le plan
33+
* [x] clarifier ce qu'on veut que les auditeurs "ramènent chez eux"
3234

33-
* [ ] changer le fond d'un slide
34-
* [ ] Est-ce que le slide show fonctionne aussi off-line ?
35+
* [x] Est-ce que le slide show fonctionne aussi off-line ? Maintenant Oui (remark min JS + fonts googles avec css font google)
3536

3637

3738
## Nice to have

‎slides/fonts/0AKsP294HTD-nvJgucYTaCwlidHJgAgmTjOEEzwu1L8.ttf

25.2 KB
Binary file not shown.

‎slides/fonts/QQt14e8dY39u-eYBZmppwTdGNerWpg2Hn6A-BxWgZ_I.ttf

25.2 KB
Binary file not shown.

‎slides/fonts/YDAoLskQQ5MOAgvHUQCcLXH4RvoIgd8UGj-uxFsyfXs.ttf

46.4 KB
Binary file not shown.

‎slides/fonts/YDAoLskQQ5MOAgvHUQCcLbvy90DtE_Pg_qiF9bHvTzw.ttf

56 KB
Binary file not shown.

‎slides/index.html

Lines changed: 5 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -3,126 +3,13 @@
33
<head>
44
<title>Devbox presentation</title>
55
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
6-
<style type="text/css">
7-
@import url(http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz);
8-
@import url(http://fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic);
9-
@import url(http://fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic);
10-
11-
body {
12-
font-family: 'Droid Serif';
13-
}
14-
h1, h2, h3 {
15-
font-family: 'Yanone Kaffeesatz';
16-
font-weight: 400;
17-
margin-bottom: 0;
18-
}
19-
.remark-code, .remark-inline-code {
20-
font-family: 'Ubuntu Mono';
21-
}
22-
.remark-slide-content h1 { font-size: 3em; }
23-
.remark-slide-content h2 { font-size: 2em; }
24-
.remark-slide-content h3 { font-size: 1.6em; }
25-
.footnote {
26-
position: absolute;
27-
bottom: 3em;
28-
}
29-
li p { line-height: 1.25em; }
30-
.red { color: #fa0000; }
31-
.large { font-size: 2em; }
32-
a, a > code {
33-
color: rgb(249, 38, 114);
34-
text-decoration: none;
35-
}
36-
code {
37-
-moz-border-radius: 5px;
38-
-web-border-radius: 5px;
39-
background: #e7e8e2;
40-
border-radius: 5px;
41-
}
42-
.remark-code, .remark-inline-code { font-family: 'Ubuntu Mono'; }
43-
.remark-code-line-highlighted { background-color: #373832; }
44-
.pull-left {
45-
float: left;
46-
width: 47%;
47-
}
48-
.pull-right {
49-
float: right;
50-
width: 47%;
51-
}
52-
.pull-right ~ p {
53-
clear: both;
54-
}
55-
#slideshow .slide .content code {
56-
font-size: 0.8em;
57-
}
58-
#slideshow .slide .content pre code {
59-
font-size: 0.9em;
60-
padding: 15px;
61-
}
62-
.inverse {
63-
background: #272822;
64-
color: #777872;
65-
text-shadow: 0 0 20px #333;
66-
}
67-
.inverse h1, .inverse h2 {
68-
color: #f3f3f3;
69-
line-height: 0.8em;
70-
}
71-
72-
/* Slide-specific styling */
73-
#slide-inverse .footnote {
74-
bottom: 12px;
75-
left: 20px;
76-
}
77-
#slide-how .slides {
78-
font-size: 0.9em;
79-
position: absolute;
80-
top: 151px;
81-
right: 140px;
82-
}
83-
#slide-how .slides h3 {
84-
margin-top: 0.2em;
85-
}
86-
#slide-how .slides .first, #slide-how .slides .second {
87-
padding: 1px 20px;
88-
height: 90px;
89-
width: 120px;
90-
-moz-box-shadow: 0 0 10px #777;
91-
-webkit-box-shadow: 0 0 10px #777;
92-
box-shadow: 0 0 10px #777;
93-
}
94-
#slide-how .slides .first {
95-
background: #fff;
96-
position: absolute;
97-
top: 20%;
98-
left: 20%;
99-
z-index: 1;
100-
}
101-
#slide-how .slides .second {
102-
position: relative;
103-
background: #fff;
104-
z-index: 0;
105-
}
106-
107-
/* Two-column layout */
108-
.left-column {
109-
color: #777;
110-
width: 20%;
111-
height: 92%;
112-
float: left;
113-
}
114-
.left-column h2:last-of-type, .left-column h3:last-child {
115-
color: #000;
116-
}
117-
.right-column {
118-
width: 75%;
119-
float: right;
120-
padding-top: 1em;
121-
}
122-
</style>
6+
<link rel="stylesheet" href="styles/google-font-Droid+Serif.css" />
7+
<link rel="stylesheet" href="styles/google-font-Ubuntu+Mono.css" />
8+
<link rel="stylesheet" href="styles/google-font-Yanone+Kaffeesatz.css" />
9+
<link rel="stylesheet" href="styles/presentation.css" />
12310
</head>
12411
<body>
125-
<script src="http://gnab.github.io/remark/downloads/remark-latest.min.js" type="text/javascript">
12+
<script src="/scripts/remark-latest.min.js" type="text/javascript">
12613
</script>
12714
<script type="text/javascript">
12815
var slideshow = remark.create({

‎slides/pictures/belgianBeers.jpg

19.1 KB
Loading

‎slides/pictures/bruxelles_brussels.jpg

21.5 KB
Loading

‎slides/pictures/chokotoff2.jpg

-31.1 KB
Loading

‎slides/pictures/defile20106.jpg

-11.2 KB
Loading

‎slides/pictures/download.jpg

-8.42 KB
Binary file not shown.

‎slides/pictures/sortieDePiste.png

155 KB
Loading

‎slides/pictures/vitr.jpg

-27.4 KB
Loading

‎slides/raws/sortieDePiste.xcf

270 KB
Binary file not shown.

0 commit comments

Comments
 (0)