From 2622ef200b19a44dc1f95f732a372d834f1e0baf Mon Sep 17 00:00:00 2001
From: "Yann Esposito (Yogsototh)" <Yann.Esposito@gmail.com>
Date: Sun, 8 May 2011 02:56:21 +0200
Subject: [PATCH] Updated the website

---
 Rakefile                                      |   2 +-
 content/html/en/about.erb                     |  53 ------
 content/html/en/blog.erb                      |  27 ---
 content/html/en/blog/2011-05-02-First-post.md |  20 ---
 content/html/en/support.md                    |  21 +++
 content/html/fr/about.erb                     |  98 -----------
 content/html/fr/blog.erb                      |  29 ---
 content/html/fr/blog/2011-05-02-First-post.md |  21 ---
 content/html/fr/support.md                    |  21 +++
 multi/about.erb                               | 134 --------------
 multi/blog.erb                                |  49 ------
 multi/blog/2011-05-02-First-post.md           |  24 ---
 multi/support.md                              |  22 +++
 site/css/main.css                             |   2 +-
 site/index.html                               | 165 ++++++++++++++----
 site/src/main.scss                            |   2 +-
 16 files changed, 198 insertions(+), 492 deletions(-)
 delete mode 100644 content/html/en/about.erb
 delete mode 100644 content/html/en/blog/2011-05-02-First-post.md
 create mode 100644 content/html/en/support.md
 delete mode 100644 content/html/fr/about.erb
 delete mode 100644 content/html/fr/blog/2011-05-02-First-post.md
 create mode 100644 content/html/fr/support.md
 delete mode 100644 multi/about.erb
 delete mode 100644 multi/blog/2011-05-02-First-post.md
 create mode 100644 multi/support.md

diff --git a/Rakefile b/Rakefile
index b668a8c..092d5d3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,5 +3,5 @@ require 'rake/clean'
 
 CLEAN.include('tmp/**/*')
 CLEAN.include('content/html/**/*')
-CLOBBER.include('output/Scratch/{en,fr,assets}')
+CLOBBER.include('site/Scratch/{en,fr,assets}')
 
diff --git a/content/html/en/about.erb b/content/html/en/about.erb
deleted file mode 100644
index 9459c76..0000000
--- a/content/html/en/about.erb
+++ /dev/null
@@ -1,53 +0,0 @@
----
-title: About
-noSubMenu: true
-no_entete: true
-menupriority: 3
----
-<% content_for :title do %>
-<span style="font-weight: normal; margin-top: 0; line-height: 1ex">
-    <span style="letter-spacing:-.10em">YPassword</span>
-</span>
-<% end %>
-<% content_for :subtitle do %>
-    <span style="letter-spacing: 1em">Yogsototh</span>
-<% end %>
-
-            <div class="flush"></div>
-            <div class="block left">
-                <h3>
-                    <a href="<%=@config[:webprefix]%>/en/blog/" onclick="setLanguage('en')">
-                        Blog
-                        <span class="nicer">»</span>
-                    </a>
-                </h3>
-                <p>
-                Computer, Philosophy <i>&amp;</i> Life.
-                </p>
-            </div>
-            <div class="block left">
-                <h3>
-                    <a href="<%=@config[:webprefix]%>/en/softwares" onclick="setLanguage('en')">
-                        Softwares
-                        <span class="nicer">»</span>
-                    </a>
-                </h3>
-                <p>
-                Password Manager,
-                Screensavers  <i>&amp;</i>
-                Scientific Applications.
-                </p>
-            </div>
-            <div class="block right">
-                <h3>
-                    <a href="<%=@config[:webprefix]%>/en/about/contact" onclick="setLanguage('en')">Contact 
-                        <span class="nicer">»</span>
-                    </a>
-                </h3>
-                <p>
-                Don't be shy, I'll be happy to talk to <i>you</i>.
-                </p>
-            </h3>
-        </div>
-
-        <div class="flush"></div>
diff --git a/content/html/en/blog.erb b/content/html/en/blog.erb
index a331ea4..004a92a 100644
--- a/content/html/en/blog.erb
+++ b/content/html/en/blog.erb
@@ -69,30 +69,3 @@ Last <%= number_of_articles %> Articles
 <h2 id="archives">Archives</h2>
 
 <%= generateBlogSubMenu(language) %>
-
-<h2 id="two-words-about-the-content"> 
-Two words about the content
-</h2>
-
-
-<div class="corps">
-
-<p>
-Here you'll can find mostly technical articles.
-Some are just reminder of technical tips.
-But some are long and technically detailled articles.
-</p>
-<hr/>
-<p> 
- I do my best to traduce each page in french and in english.
-It not always easy. English is not my natural language.
-I make many errors, orthographic, grammatical, typographical&hellip;
-</p>
-<p>
-<strong> Thanks not to judge me based on these errors! And don't forget content is more important than presentation! </strong>
-</p><p> 
-The first impression I'll let you if we meet in real life should be different from the one I let you based on my website.
-</p><p> 
-I wish you to find something useful or interesting on this website.
-</p>
-
diff --git a/content/html/en/blog/2011-05-02-First-post.md b/content/html/en/blog/2011-05-02-First-post.md
deleted file mode 100644
index f2d43fb..0000000
--- a/content/html/en/blog/2011-05-02-First-post.md
+++ /dev/null
@@ -1,20 +0,0 @@
------
-isHidden:       false
-menupriority:   1
-kind:           article
-created_at:     2011-05-02T14:56:25+02:00
-title: First post
-author_name: Yann Esposito
-author_uri: yannesposito.com
-tags:
-    - test
-    - article
------
-begindiv(intro)
-
-<%= tldr %> This is a first post.
-
-
-enddiv
-
-Hello guys. This is a first post test.
diff --git a/content/html/en/support.md b/content/html/en/support.md
new file mode 100644
index 0000000..6b7ec23
--- /dev/null
+++ b/content/html/en/support.md
@@ -0,0 +1,21 @@
+---
+title: Support
+noSubMenu: false
+no_entete: true
+menupriority: 4
+---
+<% content_for :title do %>
+<span style="font-weight: normal; margin-top: 0; line-height: 1ex">
+    <span style="letter-spacing:-.10em">YPassword</span>
+</span>
+<% end %>
+<% content_for :subtitle do %>
+    <span style="letter-spacing: 1em">Support</span>
+<% end %>
+
+A problem? A remark? Just send me a mail: 
+
+<yann.esposito.help@gmail.com>
+{: .big} 
+
+Tell me on twitter: [@yogsototh](http://twitter.com/yogsototh)
diff --git a/content/html/fr/about.erb b/content/html/fr/about.erb
deleted file mode 100644
index 344443b..0000000
--- a/content/html/fr/about.erb
+++ /dev/null
@@ -1,98 +0,0 @@
----
-title: À propos
-noSubMenu: true
-no_entete: true
-menupriority: 3
----
-<% content_for :title do %>
-<span style="font-weight: normal; margin-top: 0; line-height: 1ex">
-    <span style="letter-spacing:-.10em">YPassword</span>
-</span>
-<% end %>
-<% content_for :subtitle do %>
-    <span style="letter-spacing: 1em">Yogsototh</span>
-<% end %>
-
-            <div class="flush"></div>
-
-        <div class="block left">
-            <h3>
-                <a href="<%=@config[:webprefix]%>/fr/blog/" onclick="setLanguage('fr')">
-                    Blog
-                    <span class="nicer">»</span>
-                </a>
-            </h3>
-            <p>
-            Ordinateurs, philosophie <i>&amp;</i> des choses de la vie. 
-            </p>
-        </div>
-        <div class="block left">
-            <h3>
-                <a href="<%=@config[:webprefix]%>/fr/softwares" onclick="setLanguage('fr')">
-                    Logiciels
-                    <span class="nicer">»</span>
-                </a>
-            </h3>
-            <p>
-            Des économiseurs d'écran,
-            un gestionnaire de mots de passe <i>&amp;</i>
-            des applications scientifiques.
-            </p>
-        </div>
-        <div class="block right">
-            <h3>
-                <a href="<%=@config[:webprefix]%>/fr/about/contact" onclick="setLanguage('fr')">
-                    Contact
-                    <span class="nicer">»</span>
-                </a>
-            </h3>
-            <p>
-            Au diable la timidité, n'hésitez pas à me contacter, je serai ravi de <i>vous</i> parler.
-            </p>
-        </div>
-        <div class="flush"></div>
-        <div class="block left">
-            <h3>
-                <a href="http://j.mp/btfRJ2">
-                    Curriculum Vitæ
-                    <span class="nicer">»</span>
-                </a>
-            </h3>
-            <p>
-            Doctorat &rarr; Post Doc &rarr; Consultant<br/>
-            <i>Geek &rarr; G33K &rarr; G33|&lt;
-            </i>
-            </p>
-        </h4>
-        </div>
-        <div class="block left">
-            <h3>
-                <a href="http://yann.esposito.free.fr/enseignement/enseignement.php">
-                    Enseignement
-                    <span class="nicer">»</span>
-                </a>
-            </h3>
-            <p>
-            Informatique:<br/>
-            TD, TD <i>&amp;</i> solutions<br/>
-            BAC+1 à BAC+5<br/>
-            <i><a href="http://yann.esposito.free.fr/enseignement/projetrez0/projetrez0.html">Projet réseau anonyme
-                        <span class="nicer">»</span></a>
-            </i>
-             </p>
-        </div>
-        <div class="block right">
-            <h3>
-                <a href="http://web.me.com/yann.esposito/Perso/Welcome.html">
-                    Photos
-                    <span class="nicer">»</span>
-                </a>
-            </h3>
-            <p>
-            <a href="mailto:yannesposito@gmail.com?Subject=Permission%20site%20famille" >
-            Cliquez ici pour avoir le mot de passe.
-                    <span class="nicer">»</span>
-            </a>
-            </p>
-        </div>
-        <div class="flush"></div>
diff --git a/content/html/fr/blog.erb b/content/html/fr/blog.erb
index 0606e6e..6e7fe5f 100644
--- a/content/html/fr/blog.erb
+++ b/content/html/fr/blog.erb
@@ -69,32 +69,3 @@ Les <%= number_of_articles %> derniers articles
 <h2 id="archives">Archives</h2>
 
 <%= generateBlogSubMenu(language) %>
-
-<h2 id="un-petit-mot-sur-le-contenu"> 
-Un petit mot sur le contenu
-</h2>
-
-
-<div class="corps">
-
-
-<p>
-Vous trouverez ici des articles qui sont pour la plupart
-écrits en anglais et qui sont techniques.
-Certain sont justes là pour me souvenir de petits trucs, que
-d'autres pourraient trouver utiles. Mais il y a aussi de
-long articles techniques qui vont un peu plus dans les détails.
-</p><p> 
-<hr/>
-<p> 
- Je fais de mon mieux pour traduire chaque page en anglais et en français.
-Cependant, ce n'est pas toujours évident. 
-Il m'arrive de faire de nombreuses fautes d'orthographes, des erreurs typographiques et autres. 
-</p> 
-<p>
-<strong> Merci de ne pas me juger sur ces erreurs et de ne pas oublier que le fond est plus important que la forme. </strong>
-</p><p> 
-L'impression que ce site laisse de moi n'est certainement pas l'impression que je vous laisserais si on se rencontrait.
-</p><p> 
-Je vous souhaite de trouver ce que vous cherchez sur ce site.
-</p>
diff --git a/content/html/fr/blog/2011-05-02-First-post.md b/content/html/fr/blog/2011-05-02-First-post.md
deleted file mode 100644
index c0a06a1..0000000
--- a/content/html/fr/blog/2011-05-02-First-post.md
+++ /dev/null
@@ -1,21 +0,0 @@
------
-isHidden:       false
-menupriority:   1
-kind:           article
-created_at:     2011-05-02T14:56:25+02:00
-title: First post
-author_name: Yann Esposito
-author_uri: yannesposito.com
-tags:
-    - test
-    - article
-    - entry
------
-begindiv(intro)
-
-
-<%= tlal %> C'est une premier post.
-
-enddiv
-
-Salut ! C'est le premier article pour tester `nanoc`.
diff --git a/content/html/fr/support.md b/content/html/fr/support.md
new file mode 100644
index 0000000..63ad894
--- /dev/null
+++ b/content/html/fr/support.md
@@ -0,0 +1,21 @@
+---
+title: Aide
+noSubMenu: false
+no_entete: true
+menupriority: 4
+---
+<% content_for :title do %>
+<span style="font-weight: normal; margin-top: 0; line-height: 1ex">
+    <span style="letter-spacing:-.10em">YPassword</span>
+</span>
+<% end %>
+<% content_for :subtitle do %>
+    <span style="letter-spacing: 1em">Support</span>
+<% end %>
+
+A problem? A remark? Just send me a mail: 
+
+<yann.esposito.help@gmail.com>
+{: .big} 
+
+Tell me on twitter: [@yogsototh](http://twitter.com/yogsototh)
diff --git a/multi/about.erb b/multi/about.erb
deleted file mode 100644
index 50e5ca1..0000000
--- a/multi/about.erb
+++ /dev/null
@@ -1,134 +0,0 @@
----
-en: title: About
-fr: title: À propos
-noSubMenu: true
-no_entete: true
-menupriority: 3
----
-<% content_for :title do %>
-<span style="font-weight: normal; margin-top: 0; line-height: 1ex">
-    <span style="letter-spacing:-.10em">YPassword</span>
-</span>
-<% end %>
-<% content_for :subtitle do %>
-    <span style="letter-spacing: 1em">Yogsototh</span>
-<% end %>
-
-            <div class="flush"></div>
-en:             <div class="block left">
-en:                 <h3>
-en:                     <a href="<%=@config[:webprefix]%>/en/blog/" onclick="setLanguage('en')">
-en:                         Blog
-en:                         <span class="nicer">»</span>
-en:                     </a>
-en:                 </h3>
-en:                 <p>
-en:                 Computer, Philosophy <i>&amp;</i> Life.
-en:                 </p>
-en:             </div>
-en:             <div class="block left">
-en:                 <h3>
-en:                     <a href="<%=@config[:webprefix]%>/en/softwares" onclick="setLanguage('en')">
-en:                         Softwares
-en:                         <span class="nicer">»</span>
-en:                     </a>
-en:                 </h3>
-en:                 <p>
-en:                 Password Manager,
-en:                 Screensavers  <i>&amp;</i>
-en:                 Scientific Applications.
-en:                 </p>
-en:             </div>
-en:             <div class="block right">
-en:                 <h3>
-en:                     <a href="<%=@config[:webprefix]%>/en/about/contact" onclick="setLanguage('en')">Contact 
-en:                         <span class="nicer">»</span>
-en:                     </a>
-en:                 </h3>
-en:                 <p>
-en:                 Don't be shy, I'll be happy to talk to <i>you</i>.
-en:                 </p>
-en:             </h3>
-en:         </div>
-
-fr:         <div class="block left">
-fr:             <h3>
-fr:                 <a href="<%=@config[:webprefix]%>/fr/blog/" onclick="setLanguage('fr')">
-fr:                     Blog
-fr:                     <span class="nicer">»</span>
-fr:                 </a>
-fr:             </h3>
-fr:             <p>
-fr:             Ordinateurs, philosophie <i>&amp;</i> des choses de la vie. 
-fr:             </p>
-fr:         </div>
-fr:         <div class="block left">
-fr:             <h3>
-fr:                 <a href="<%=@config[:webprefix]%>/fr/softwares" onclick="setLanguage('fr')">
-fr:                     Logiciels
-fr:                     <span class="nicer">»</span>
-fr:                 </a>
-fr:             </h3>
-fr:             <p>
-fr:             Des économiseurs d'écran,
-fr:             un gestionnaire de mots de passe <i>&amp;</i>
-fr:             des applications scientifiques.
-fr:             </p>
-fr:         </div>
-fr:         <div class="block right">
-fr:             <h3>
-fr:                 <a href="<%=@config[:webprefix]%>/fr/about/contact" onclick="setLanguage('fr')">
-fr:                     Contact
-fr:                     <span class="nicer">»</span>
-fr:                 </a>
-fr:             </h3>
-fr:             <p>
-fr:             Au diable la timidité, n'hésitez pas à me contacter, je serai ravi de <i>vous</i> parler.
-fr:             </p>
-fr:         </div>
-fr:         <div class="flush"></div>
-fr:         <div class="block left">
-fr:             <h3>
-fr:                 <a href="http://j.mp/btfRJ2">
-fr:                     Curriculum Vitæ
-fr:                     <span class="nicer">»</span>
-fr:                 </a>
-fr:             </h3>
-fr:             <p>
-fr:             Doctorat &rarr; Post Doc &rarr; Consultant<br/>
-fr:             <i>Geek &rarr; G33K &rarr; G33|&lt;
-fr:             </i>
-fr:             </p>
-fr:         </h4>
-fr:         </div>
-fr:         <div class="block left">
-fr:             <h3>
-fr:                 <a href="http://yann.esposito.free.fr/enseignement/enseignement.php">
-fr:                     Enseignement
-fr:                     <span class="nicer">»</span>
-fr:                 </a>
-fr:             </h3>
-fr:             <p>
-fr:             Informatique:<br/>
-fr:             TD, TD <i>&amp;</i> solutions<br/>
-fr:             BAC+1 à BAC+5<br/>
-fr:             <i><a href="http://yann.esposito.free.fr/enseignement/projetrez0/projetrez0.html">Projet réseau anonyme
-fr:                         <span class="nicer">»</span></a>
-fr:             </i>
-fr:              </p>
-fr:         </div>
-fr:         <div class="block right">
-fr:             <h3>
-fr:                 <a href="http://web.me.com/yann.esposito/Perso/Welcome.html">
-fr:                     Photos
-fr:                     <span class="nicer">»</span>
-fr:                 </a>
-fr:             </h3>
-fr:             <p>
-fr:             <a href="mailto:yannesposito@gmail.com?Subject=Permission%20site%20famille" >
-fr:             Cliquez ici pour avoir le mot de passe.
-fr:                     <span class="nicer">»</span>
-fr:             </a>
-fr:             </p>
-fr:         </div>
-        <div class="flush"></div>
diff --git a/multi/blog.erb b/multi/blog.erb
index 3b5650f..4c6847c 100644
--- a/multi/blog.erb
+++ b/multi/blog.erb
@@ -74,52 +74,3 @@ en:             <%= link_to(%{Read more <span class="nicer">»</span>}, a, :clas
 <h2 id="archives">Archives</h2>
 
 <%= generateBlogSubMenu(language) %>
-
-en: <h2 id="two-words-about-the-content"> 
-en: Two words about the content
-fr: <h2 id="un-petit-mot-sur-le-contenu"> 
-fr: Un petit mot sur le contenu
-</h2>
-
-
-<div class="corps">
-
-en: <p>
-en: Here you'll can find mostly technical articles.
-en: Some are just reminder of technical tips.
-en: But some are long and technically detailled articles.
-en: </p>
-en: <hr/>
-en: <p> 
-en:  I do my best to traduce each page in french and in english.
-en: It not always easy. English is not my natural language.
-en: I make many errors, orthographic, grammatical, typographical&hellip;
-en: </p>
-en: <p>
-en: <strong> Thanks not to judge me based on these errors! And don't forget content is more important than presentation! </strong>
-en: </p><p> 
-en: The first impression I'll let you if we meet in real life should be different from the one I let you based on my website.
-en: </p><p> 
-en: I wish you to find something useful or interesting on this website.
-en: </p>
-
-fr: <p>
-fr: Vous trouverez ici des articles qui sont pour la plupart
-fr: écrits en anglais et qui sont techniques.
-fr: Certain sont justes là pour me souvenir de petits trucs, que
-fr: d'autres pourraient trouver utiles. Mais il y a aussi de
-fr: long articles techniques qui vont un peu plus dans les détails.
-fr: </p><p> 
-fr: <hr/>
-fr: <p> 
-fr:  Je fais de mon mieux pour traduire chaque page en anglais et en français.
-fr: Cependant, ce n'est pas toujours évident. 
-fr: Il m'arrive de faire de nombreuses fautes d'orthographes, des erreurs typographiques et autres. 
-fr: </p> 
-fr: <p>
-fr: <strong> Merci de ne pas me juger sur ces erreurs et de ne pas oublier que le fond est plus important que la forme. </strong>
-fr: </p><p> 
-fr: L'impression que ce site laisse de moi n'est certainement pas l'impression que je vous laisserais si on se rencontrait.
-fr: </p><p> 
-fr: Je vous souhaite de trouver ce que vous cherchez sur ce site.
-fr: </p>
diff --git a/multi/blog/2011-05-02-First-post.md b/multi/blog/2011-05-02-First-post.md
deleted file mode 100644
index 74deb87..0000000
--- a/multi/blog/2011-05-02-First-post.md
+++ /dev/null
@@ -1,24 +0,0 @@
------
-isHidden:       false
-menupriority:   1
-kind:           article
-created_at:     2011-05-02T14:56:25+02:00
-fr: title: First post
-en: title: First post
-author_name: Yann Esposito
-author_uri: yannesposito.com
-tags:
-    - test
-    - article
-fr:     - entry
------
-begindiv(intro)
-
-en: <%= tldr %> This is a first post.
-
-fr: <%= tlal %> C'est une premier post.
-
-enddiv
-
-en: Hello guys. This is a first post test.
-fr: Salut ! C'est le premier article pour tester `nanoc`.
diff --git a/multi/support.md b/multi/support.md
new file mode 100644
index 0000000..2157b93
--- /dev/null
+++ b/multi/support.md
@@ -0,0 +1,22 @@
+---
+en: title: Support
+fr: title: Aide
+noSubMenu: false
+no_entete: true
+menupriority: 4
+---
+<% content_for :title do %>
+<span style="font-weight: normal; margin-top: 0; line-height: 1ex">
+    <span style="letter-spacing:-.10em">YPassword</span>
+</span>
+<% end %>
+<% content_for :subtitle do %>
+    <span style="letter-spacing: 1em">Support</span>
+<% end %>
+
+A problem? A remark? Just send me a mail: 
+
+<yann.esposito.help@gmail.com>
+{: .big} 
+
+Tell me on twitter: [@yogsototh](http://twitter.com/yogsototh)
diff --git a/site/css/main.css b/site/css/main.css
index de515f7..6219586 100644
--- a/site/css/main.css
+++ b/site/css/main.css
@@ -361,7 +361,7 @@ article article h1, article article h2, article article h3, article article h4,
 
 /* line 275, ../src/main.scss */
 .date {
-  font-size: 0.8em;
+  font-size: 0.4em;
   border: 1px solid #7689a6;
   text-align: center;
   width: 4.1em;
diff --git a/site/index.html b/site/index.html
index 6ed8247..9a5938f 100644
--- a/site/index.html
+++ b/site/index.html
@@ -14,41 +14,43 @@
        Remove this if you use the .htaccess -->
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
-  <title><%= @item[title] %></title>
+  <title>YPassword</title>
   <meta name="description" content="">
   <meta name="author" content="">
+  
 
-  <link href='http://fonts.googleapis.com/css?family=Expletus+Sans:bold' rel='stylesheet' type='text/css'>
-  <link href='http://fonts.googleapis.com/css?family=Kreon:regular,bold' rel='stylesheet' type='text/css'>
 
   <!-- Mobile viewport optimized: j.mp/bplateviewport -->
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
 
   <!-- Place favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
-  <link rel="shortcut icon" href="/favicon.ico">
+  <link rel="shortcut icon" href="/Scratch/img/favicon.ico" />
   <link rel="apple-touch-icon" href="/apple-touch-icon.png">
 
 
   <!-- CSS: implied media="all" -->
-  <link rel="stylesheet" href="css/less.css"/>
-  <link rel="stylesheet" href="css/main.css">
+  <link rel="stylesheet" href="/css/less.css"/>
+  <link href='http://fonts.googleapis.com/css?family=Expletus+Sans:bold' rel='stylesheet' type='text/css'>
+  <link href='http://fonts.googleapis.com/css?family=Kreon:regular,bold' rel='stylesheet' type='text/css'>
+  <link rel="stylesheet" href="/css/main.css">
 
   <!-- Uncomment if you are specifically targeting less enabled mobile browsers
   <link rel="stylesheet" media="handheld" href="css/handheld.css?v=2">  -->
 
   <!-- All JavaScript at the bottom, except for Modernizr which enables HTML5 elements & feature detects -->
-  <script src="js/libs/modernizr-1.7.min.js"></script>
+  <script src="/js/libs/modernizr-1.7.min.js"></script>
+
+  <link rel="alternate" type="application/rss+xml" title="RSS" href="http://feeds.feedburner.com/yannespositocomen"/>
 
 </head>
 
-<body>
+<body lang="en">
   <header>
+    <div id="choixrss"><a id="rss" href="http://feeds.feedburner.com/yannespositocomen">Subscribe</a></div>
+    <div id="choixlang"><a href="/Scratch/fr/" onclick="setLanguage('fr')">en Français</a></div>
     <nav id="mainnav">
         <ul>
-            <li><a href="#">{item 1}</a>
-            </li><li><a href="#">{item 2}</a>
-            </li><li><a href="#">{item 3}</a>
-            </li>
+            <ul><li><span class="active" title="You're here.">YPassword</span></li><li><a href="/Scratch/en/blog/">Blog</a></li><li><a href="/Scratch/en/about/">About</a></li></ul>
         </ul>
     </nav>
   </header>
@@ -56,38 +58,95 @@
     <div id="container">
 
       <div id="main" role="main">
-        <hgoup>
-          <h1>{title}</h1>
-          <h2>{subtitle}</h2>
+        <hgroup>
+          <h1>YPassword</h1>
+          
         </hgroup>
+        
         <article>
-            <header>
-                <hgroup>
-                    <h2>{article title}</h2>
-                    <h3>{article subtitle}</h3>
-                </hgroup>
-            </header>
-            <div class="intro">
-                <div class="tldr">{tldr}</div>
-                {introduction}
-            </div>
             <div class="content">
-                {content}
+                
+<div id="mainlinks">
+<div class="block left secure">
+        <div class="inner">
+            <h3>
+                <a href="javascript:return false;"> Secure 
+                    <span class="nicer">»</span> 
+                </a>
+            </h3>
+            <p>
+                SHA1 ensure strong password generation
+            </p>
+        </div>
+    </div>
+<div class="block left easy">
+        <div class="inner">
+            <h3>
+                <a href="javascript:return false;"> Easy 
+                    <span class="nicer">»</span> 
+                </a>
+            </h3>
+            <p>
+                Remember only one master password
+            </p>
+        </div>
+    </div>
+<div class="block left portable">
+        <div class="inner">
+            <h3>
+                <a href="javascript:return false;"> Portable 
+                    <span class="nicer">»</span> 
+                </a>
+            </h3>
+            <p>
+                Dashboard widget, Javascript applet, etc...
+            </p>
+        </div>
+    </div>
+</div>
+
+<div class="flush"></div>
+
+<div id="securecontent" class="slideshow big"><div class="inner">
+YPassword use SHA1
+</div></div>
+
+<div id="easycontent" class="slideshow big"><div class="inner">
+You remember only one password the rest follow.
+</div></div>
+
+<div id="portablecontent" class="slideshow big">
+    <div class="inner">
+        You can use YPassword on 
+        <ul>
+            <li> iPhone, </li>
+            <li> Mac using Dashboard widget, </li>
+            <li> on UNIX system using the command line <code>openssl</code> </li>
+        </ul>
+    </div>
+</div>
+
             </div>
             <footer>
                 <ul class="article_metadata">
-                    <li>Created: <time>{time}</time></li>
-                    <li>Updated: <time>{time}</time></li>
-                    <li>{copyright}</li>
+                    <li>Modified: <time> 05/05/2011</time></li>
+                    <li><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Copyright ©, Yann Esposito</a></li>
                 </ul>
             </footer>
         </article>
+
       </div>
     </div> <!--! end of #container -->
   </div> <!--! end of #metacontainer -->
   <footer>
     <div id="webpageinfo">
-        {copyright_infos}
+        <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Copyright ©, Yann Esposito</a>
+        <div>
+            Entirely done with
+            <a href="http://www.vim.org">Vim</a>
+            and 
+            <a href="http://nanoc.stoneship.org">nanoc</a>
+        </div>
     </div>
   </footer>
 
@@ -96,17 +155,42 @@
 
   <!-- Grab Google CDN's jQuery, with a protocol relative URL; fall back to local if necessary -->
   <script src="//ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.js"></script>
-  <script>window.jQuery || document.write("<script src='js/libs/jquery-1.5.1.min.js'>\x3C/script>")</script>
+  <script>window.jQuery || document.write("<script src='/js/libs/jquery-1.5.1.min.js'>\x3C/script>")</script>
 
 
   <!-- scripts concatenated and minified via ant build script-->
-  <script src="js/plugins.js"></script>
-  <script src="js/script.js"></script>
+  <script src="/js/plugins.js"></script>
+  <script src="/js/script.js"></script>
+  
+<script>
+var blocks=["secure","easy","portable"];
+function show(name) {
+    for ( var i in blocks ) {
+        el=blocks[i];
+        if (el == name) { continue; }
+        // console.log('HIDE: #'+el+'content');
+        $('#'+el+'content').hide();
+    }
+    $('#'+name+'content').show();
+    // console.log('SHOW: #'+name+'content');
+}
+
+$('document').ready(function() {
+    $('.secure').click(function() {show("secure")});
+    $('.easy').click(function() {show("easy")});
+    $('.portable').click(function() {show("portable")});
+    for (var i in blocks) {
+        el=blocks[i];
+        $('#'+el+'content').hide();
+    }
+});
+</script>
+
   <!-- end scripts-->
 
 
   <!--[if lt IE 7 ]>
-    <script src="js/libs/dd_belatedpng.js"></script>
+    <script src="/js/libs/dd_belatedpng.js"></script>
     <script>DD_belatedPNG.fix("img, .png_bg"); // Fix any <img> or .png_bg bg-images. Also, please read goo.gl/mZiyb </script>
   <![endif]-->
 
@@ -119,5 +203,18 @@
     s.parentNode.insertBefore(g,s)}(document,"script"));
   </script>
 
+  <script type="text/javascript">
+        var clicky = { log: function(){ return; }, goal: function(){ return; }};
+        var clicky_site_id = 66374971;
+        (function() {
+              var s = document.createElement('script');
+              s.type = 'text/javascript';
+              s.async = true;
+              s.src = ( document.location.protocol == 'https:' ? 'https://static.getclicky.com/js' : 'http://static.getclicky.com/js' );
+              ( document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0] ).appendChild( s );
+        })();
+</script>
+<noscript><p><img alt="Clicky" width="1" height="1" src="http://in.getclicky.com/66374971ns.gif" /></p></noscript>
+    
 </body>
 </html>
diff --git a/site/src/main.scss b/site/src/main.scss
index 445ec1b..ace71cf 100644
--- a/site/src/main.scss
+++ b/site/src/main.scss
@@ -273,7 +273,7 @@ article article {
 }
 
 .date {
-    font-size: 0.8em;
+    font-size: 0.4em;
     border: 1px solid $darkGrey;
     text-align: center;
     width: 4.1em;