Fix some layout issues

content/html/en/index.md

@@ -7,17 +7,32 @@ menupriority: 1
     <a href="http://itunes.apple.com/WebObjects/MZStore.woa/wa/viewSoftware?id=436268354&mt=8">Get it! &raquo;</a>
 <% end %>
 
-<div id="securecontent" class="slideshow big"><div class="inner">
-YPassword use SHA1
-<img src="/img/main/iPhone_Easy.png" class="clean" alt="main password view" />
-</div></div>
+<div id="securecontent" class="slideshow big">
+    <div class="inner">
+        <div class="leftcontent">
+            <img src="/img/main/iPhone pw.png" class="clean" alt="main password view" style="float:left" />
+        </div>
+        <div class="rightcontent">
+            <h3>Secure</h3>
+            YPassword use SHA1
+        </div>
+    </div>
+    <div class="flush"></div>
+</div>
 
 <div id="easycontent" class="slideshow big"><div class="inner">
-You remember only one password the rest follow.
-<img src="/Scratch//img/blog/2011-05-05-Screenshots/main_view.jpg" alt="main view" style="display:block;margin-left:0;"/>
-If you click on "go to website" you are redirected to the website.
-Your password is copied, you can paste it.
-</div></div>
+        <div class="rightcontent">
+            <img src="/img/main/iPhone_Easy.png" alt="main view" style="display:block;margin-left:0;float:right"/>
+        </div>
+        <div class="leftcontent">
+            <h3>Easy</h3>
+            You remember only one password the rest follow.
+            If you click on "go to website" you are redirected to the website.
+            Your password is copied, you can paste it.
+        </div>
+    </div>
+    <div class="flush"></div>
+</div>
 
 <div id="portablecontent" class="slideshow big">
     <div class="inner">
@@ -28,6 +43,7 @@ Your password is copied, you can paste it.
             <li> on UNIX system using the command line <code>openssl</code> </li>
         </ul>
     </div>
+    <div class="flush"></div>
 </div>
 
 <div class="flush"></div>

content/html/fr/index.md

@@ -7,17 +7,32 @@ menupriority: 1
     <a href="http://itunes.apple.com/WebObjects/MZStore.woa/wa/viewSoftware?id=436268354&mt=8">Get it! &raquo;</a>
 <% end %>
 
-<div id="securecontent" class="slideshow big"><div class="inner">
-YPassword use SHA1
-<img src="/img/main/iPhone_Easy.png" class="clean" alt="main password view" />
-</div></div>
+<div id="securecontent" class="slideshow big">
+    <div class="inner">
+        <div class="leftcontent">
+            <img src="/img/main/iPhone pw.png" class="clean" alt="main password view" style="float:left" />
+        </div>
+        <div class="rightcontent">
+            <h3>Secure</h3>
+            YPassword use SHA1
+        </div>
+    </div>
+    <div class="flush"></div>
+</div>
 
 <div id="easycontent" class="slideshow big"><div class="inner">
-You remember only one password the rest follow.
-<img src="/Scratch//img/blog/2011-05-05-Screenshots/main_view.jpg" alt="main view" style="display:block;margin-left:0;"/>
-If you click on "go to website" you are redirected to the website.
-Your password is copied, you can paste it.
-</div></div>
+        <div class="rightcontent">
+            <img src="/img/main/iPhone_Easy.png" alt="main view" style="display:block;margin-left:0;float:right"/>
+        </div>
+        <div class="leftcontent">
+            <h3>Easy</h3>
+            You remember only one password the rest follow.
+            If you click on "go to website" you are redirected to the website.
+            Your password is copied, you can paste it.
+        </div>
+    </div>
+    <div class="flush"></div>
+</div>
 
 <div id="portablecontent" class="slideshow big">
     <div class="inner">
@@ -28,6 +43,7 @@ Your password is copied, you can paste it.
             <li> on UNIX system using the command line <code>openssl</code> </li>
         </ul>
     </div>
+    <div class="flush"></div>
 </div>
 
 <div class="flush"></div>

multi/index.md

@@ -7,17 +7,32 @@ menupriority: 1
     <a href="http://itunes.apple.com/WebObjects/MZStore.woa/wa/viewSoftware?id=436268354&mt=8">Get it! &raquo;</a>
 <% end %>
 
-<div id="securecontent" class="slideshow big"><div class="inner">
-YPassword use SHA1
-<img src="/img/main/iPhone_Easy.png" class="clean" alt="main password view" />
-</div></div>
+<div id="securecontent" class="slideshow big">
+    <div class="inner">
+        <div class="leftcontent">
+            <img src="/img/main/iPhone pw.png" class="clean" alt="main password view" style="float:left" />
+        </div>
+        <div class="rightcontent">
+            <h3>Secure</h3>
+            YPassword use SHA1
+        </div>
+    </div>
+    <div class="flush"></div>
+</div>
 
 <div id="easycontent" class="slideshow big"><div class="inner">
-You remember only one password the rest follow.
-<img src="/Scratch//img/blog/2011-05-05-Screenshots/main_view.jpg" alt="main view" style="display:block;margin-left:0;"/>
-If you click on "go to website" you are redirected to the website.
-Your password is copied, you can paste it.
-</div></div>
+        <div class="rightcontent">
+            <img src="/img/main/iPhone_Easy.png" alt="main view" style="display:block;margin-left:0;float:right"/>
+        </div>
+        <div class="leftcontent">
+            <h3>Easy</h3>
+            You remember only one password the rest follow.
+            If you click on "go to website" you are redirected to the website.
+            Your password is copied, you can paste it.
+        </div>
+    </div>
+    <div class="flush"></div>
+</div>
 
 <div id="portablecontent" class="slideshow big">
     <div class="inner">
@@ -28,6 +43,7 @@ Your password is copied, you can paste it.
             <li> on UNIX system using the command line <code>openssl</code> </li>
         </ul>
     </div>
+    <div class="flush"></div>
 </div>
 
 <div class="flush"></div>

site/Scratch/en/index.html

@@ -61,17 +61,32 @@
         <article>
             <div class="content">
                 
-<div id="securecontent" class="slideshow big"><div class="inner">
-YPassword use SHA1
-<img src="/img/main/iPhone_Easy.png" class="clean" alt="main password view" />
-</div></div>
+<div id="securecontent" class="slideshow big">
+    <div class="inner">
+        <div class="leftcontent">
+            <img src="/img/main/iPhone pw.png" class="clean" alt="main password view" style="float:left" />
+        </div>
+        <div class="rightcontent">
+            <h3>Secure</h3>
+            YPassword use SHA1
+        </div>
+    </div>
+    <div class="flush"></div>
+</div>
 
 <div id="easycontent" class="slideshow big"><div class="inner">
-You remember only one password the rest follow.
-<img src="/Scratch//img/blog/2011-05-05-Screenshots/main_view.jpg" alt="main view" style="display:block;margin-left:0;" />
-If you click on "go to website" you are redirected to the website.
-Your password is copied, you can paste it.
-</div></div>
+        <div class="rightcontent">
+            <img src="/img/main/iPhone_Easy.png" alt="main view" style="display:block;margin-left:0;float:right" />
+        </div>
+        <div class="leftcontent">
+            <h3>Easy</h3>
+            You remember only one password the rest follow.
+            If you click on "go to website" you are redirected to the website.
+            Your password is copied, you can paste it.
+        </div>
+    </div>
+    <div class="flush"></div>
+</div>
 
 <div id="portablecontent" class="slideshow big">
     <div class="inner">
@@ -82,6 +97,7 @@ Your password is copied, you can paste it.
             <li> on UNIX system using the command line <code>openssl</code> </li>
         </ul>
     </div>
+    <div class="flush"></div>
 </div>
 
 <div class="flush"></div>
@@ -103,7 +119,7 @@ Your password is copied, you can paste it.
             </div>
             <footer>
                 <ul class="article_metadata">
-                    <li>Modified: <time>07/09/2011</time></li>
+                    <li>Modified: <time>07/10/2011</time></li>
                     <li><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Copyright ©, Yann Esposito</a></li>
                 </ul>
             </footer>

site/Scratch/en/support/index.html

@@ -80,7 +80,7 @@
             </div>
             <footer>
                 <ul class="article_metadata">
-                    <li>Modified: <time>05/12/2011</time></li>
+                    <li>Modified: <time>07/10/2011</time></li>
                     <li><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Copyright ©, Yann Esposito</a></li>
                 </ul>
             </footer>

site/Scratch/fr/index.html

@@ -61,17 +61,32 @@
         <article>
             <div class="content">
                 
-<div id="securecontent" class="slideshow big"><div class="inner">
-YPassword use SHA1
-<img src="/img/main/iPhone_Easy.png" class="clean" alt="main password view" />
-</div></div>
+<div id="securecontent" class="slideshow big">
+    <div class="inner">
+        <div class="leftcontent">
+            <img src="/img/main/iPhone pw.png" class="clean" alt="main password view" style="float:left" />
+        </div>
+        <div class="rightcontent">
+            <h3>Secure</h3>
+            YPassword use SHA1
+        </div>
+    </div>
+    <div class="flush"></div>
+</div>
 
 <div id="easycontent" class="slideshow big"><div class="inner">
-You remember only one password the rest follow.
-<img src="/Scratch//img/blog/2011-05-05-Screenshots/main_view.jpg" alt="main view" style="display:block;margin-left:0;" />
-If you click on "go to website" you are redirected to the website.
-Your password is copied, you can paste it.
-</div></div>
+        <div class="rightcontent">
+            <img src="/img/main/iPhone_Easy.png" alt="main view" style="display:block;margin-left:0;float:right" />
+        </div>
+        <div class="leftcontent">
+            <h3>Easy</h3>
+            You remember only one password the rest follow.
+            If you click on "go to website" you are redirected to the website.
+            Your password is copied, you can paste it.
+        </div>
+    </div>
+    <div class="flush"></div>
+</div>
 
 <div id="portablecontent" class="slideshow big">
     <div class="inner">
@@ -82,6 +97,7 @@ Your password is copied, you can paste it.
             <li> on UNIX system using the command line <code>openssl</code> </li>
         </ul>
     </div>
+    <div class="flush"></div>
 </div>
 
 <div class="flush"></div>
@@ -103,7 +119,7 @@ Your password is copied, you can paste it.
             </div>
             <footer>
                 <ul class="article_metadata">
-                    <li>modifié le : <time>09/07/2011</time></li>
+                    <li>modifié le : <time>10/07/2011</time></li>
                     <li><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.fr">Droits de reproduction ©, Yann Esposito</a></li>
                 </ul>
             </footer>

site/Scratch/fr/support/index.html

@@ -80,7 +80,7 @@
             </div>
             <footer>
                 <ul class="article_metadata">
-                    <li>modifié le : <time>12/05/2011</time></li>
+                    <li>modifié le : <time>10/07/2011</time></li>
                     <li><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.fr">Droits de reproduction ©, Yann Esposito</a></li>
                 </ul>
             </footer>

site/css/main.css

@@ -306,7 +306,25 @@ h1, h2 {
   font-size: 1.5em;
 }
 
-/* line 187, ../src/main.sass */
+/* line 188, ../src/main.sass */
+.flush {
+  clear: both;
+}
+
+/* line 191, ../src/main.sass */
+.clean {
+  background: none;
+  border: none;
+  margin: none;
+}
+
+/* line 196, ../src/main.sass */
+#main {
+  width: 960px;
+  margin: 0 auto;
+}
+
+/* line 200, ../src/main.sass */
 .slideshow {
   padding: 3em;
   margin: 3em;
@@ -326,21 +344,13 @@ h1, h2 {
 .slideshow > * {
   padding: 20px;
 }
-
-/* line 192, ../src/main.sass */
-.flush {
-  clear: both;
+/* line 205, ../src/main.sass */
+.slideshow .inner img {
+  margin: 0 3em;
 }
-
-/* line 195, ../src/main.sass */
-.clean {
-  background: none;
-  border: none;
-  margin: none;
-}
-
-/* line 200, ../src/main.sass */
-#main {
-  width: 960px;
-  margin: 0 auto;
+/* line 207, ../src/main.sass */
+.slideshow .inner h3 {
+  font-size: 2.5em;
+  font-weight: bold;
+  color: #b4b8c5;
 }

site/index.html

@@ -61,17 +61,32 @@
         <article>
             <div class="content">
                 
-<div id="securecontent" class="slideshow big"><div class="inner">
-YPassword use SHA1
-<img src="/img/main/iPhone_Easy.png" class="clean" alt="main password view" />
-</div></div>
+<div id="securecontent" class="slideshow big">
+    <div class="inner">
+        <div class="leftcontent">
+            <img src="/img/main/iPhone pw.png" class="clean" alt="main password view" style="float:left" />
+        </div>
+        <div class="rightcontent">
+            <h3>Secure</h3>
+            YPassword use SHA1
+        </div>
+    </div>
+    <div class="flush"></div>
+</div>
 
 <div id="easycontent" class="slideshow big"><div class="inner">
-You remember only one password the rest follow.
-<img src="/Scratch//img/blog/2011-05-05-Screenshots/main_view.jpg" alt="main view" style="display:block;margin-left:0;" />
-If you click on "go to website" you are redirected to the website.
-Your password is copied, you can paste it.
-</div></div>
+        <div class="rightcontent">
+            <img src="/img/main/iPhone_Easy.png" alt="main view" style="display:block;margin-left:0;float:right" />
+        </div>
+        <div class="leftcontent">
+            <h3>Easy</h3>
+            You remember only one password the rest follow.
+            If you click on "go to website" you are redirected to the website.
+            Your password is copied, you can paste it.
+        </div>
+    </div>
+    <div class="flush"></div>
+</div>
 
 <div id="portablecontent" class="slideshow big">
     <div class="inner">
@@ -82,6 +97,7 @@ Your password is copied, you can paste it.
             <li> on UNIX system using the command line <code>openssl</code> </li>
         </ul>
     </div>
+    <div class="flush"></div>
 </div>
 
 <div class="flush"></div>
@@ -103,7 +119,7 @@ Your password is copied, you can paste it.
             </div>
             <footer>
                 <ul class="article_metadata">
-                    <li>Modified: <time>07/09/2011</time></li>
+                    <li>Modified: <time>07/10/2011</time></li>
                     <li><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Copyright ©, Yann Esposito</a></li>
                 </ul>
             </footer>

site/src/main.sass

@@ -184,10 +184,6 @@ $navWidth: 600px
       *
         font-size: 1.5em
 
-.slideshow
-  padding: 3em
-  margin: 3em
-  +innerblock
 
 .flush
   clear: both
@@ -200,3 +196,15 @@ $navWidth: 600px
 #main
   width: $stdWidth
   margin: 0 auto
+
+.slideshow
+  padding: 3em
+  margin: 3em
+  +innerblock
+  .inner 
+    img
+      margin: 0 3em
+    h3
+      font-size: 2.5em
+      font-weight: bold
+      color: $ycolor1

tasks/correctpng.sh

@@ -4,6 +4,6 @@ for fic in $rootdir/site/img/**/*.png; do
     print -n "$fic"
     newname=${fic}.uncorrected
     mv "$fic" "$newname" && \
-    convert -colorspace sRGB "$newname" "${fic}" && \
+    convert -strip "$newname" "${fic}" && \
     print "\t[DONE]"
 done