yogsototh/sharieswebsite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplifications

Browse source
This commit is contained in:
Yann Esposito (Yogsototh) 2011-07-12 14:03:38 +02:00
parent 9c56a5ccd9
commit a11b56fd9a
15 changed files with 46 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
content/html/en/blog.erb
View file

@ -17,7 +17,7 @@ noSubMenu: true
<% end %>
<%
number_of_articles=5
number_of_char_for_resume=800
number_of_char_for_resume=400
language=@item_rep.path.sub(/\/Scratch\//,'').sub(/\/.*$/,'')
last_articles = @items.select do |a|
a.reps[0].path =~ /\/#{language}\// && a[:kind] == 'article'
@ -44,7 +44,7 @@ Last <%= number_of_articles %> Articles
<h1> <%= link_to(a[:title]+%{ <span class="nicer">»</span>}, a) %> </h1>
<div class="content">
<%= repair_html ( excerptize( a.reps[0].compiled_content, {:length => number_of_char_for_resume} ) ) %>
<%= repair_html ( excerptize( a.reps[0].compiled_content, {:length => number_of_char_for_resume} ).gsub(/<img[^>]*(\/|><\/img)>/,"") ) %>
<div class="flush"></div>
<div>
@ -65,6 +65,8 @@ Last <%= number_of_articles %> Articles
</div>
</div>
<hr/>
<h2 id="archives">Archives</h2>
<%= generateBlogSubMenu(language) %>

8
content/html/fr/blog.erb
View file

@ -17,7 +17,7 @@ noSubMenu: true
<% end %>
<%
number_of_articles=5
number_of_char_for_resume=800
number_of_char_for_resume=400
language=@item_rep.path.sub(/\/Scratch\//,'').sub(/\/.*$/,'')
last_articles = @items.select do |a|
a.reps[0].path =~ /\/#{language}\// && a[:kind] == 'article'
@ -28,7 +28,7 @@ noSubMenu: true
<div id="elementblock">
<ul class="menu">
<li> <a href="#last-articles">&darr; Les <%= number_of_articles %> derniers articles &darr;</a></li>
<li> <a href="#last-articles">&darr; <%= number_of_articles %> articles récents &darr;</a></li>
<li> <a href="#tagcloud">&darr; Nuage de mots clés &darr;</a></li>
<li> <a href="#archives">&darr; Achives &darr;</a></li>
</ul>
@ -44,7 +44,7 @@ Les <%= number_of_articles %> derniers articles
<h1> <%= link_to(a[:title]+%{ <span class="nicer">»</span>}, a) %> </h1>
<div class="content">
<%= repair_html ( excerptize( a.reps[0].compiled_content, {:length => number_of_char_for_resume} ) ) %>
<%= repair_html ( excerptize( a.reps[0].compiled_content, {:length => number_of_char_for_resume} ).gsub(/<img[^>]*(\/|><\/img)>/,"") ) %>
<div class="flush"></div>
<div>
@ -65,6 +65,8 @@ Les <%= number_of_articles %> derniers articles
</div>
</div>
<hr/>
<h2 id="archives">Archives</h2>
<%= generateBlogSubMenu(language) %>

6
multi/blog.erb
View file

@ -17,7 +17,7 @@ noSubMenu: true
<% end %>
<%
number_of_articles=5
number_of_char_for_resume=800
number_of_char_for_resume=400
language=@item_rep.path.sub(/\/Scratch\//,'').sub(/\/.*$/,'')
last_articles = @items.select do |a|
a.reps[0].path =~ /\/#{language}\// && a[:kind] == 'article'
@ -29,7 +29,7 @@ noSubMenu: true
<div id="elementblock">
<ul class="menu">
en: <li> <a href="#last-articles">&darr; <%= number_of_articles %> latest articles &darr;</a> </li>
fr: <li> <a href="#last-articles">&darr; Les <%= number_of_articles %> derniers articles &darr;</a></li>
fr: <li> <a href="#last-articles">&darr; <%= number_of_articles %> articles récents &darr;</a></li>
en: <li> <a href="#tagcloud">&darr; Tag Cloud &darr;</a></li>
fr: <li> <a href="#tagcloud">&darr; Nuage de mots clés &darr;</a></li>
<li> <a href="#archives">&darr; Achives &darr;</a></li>
@ -47,7 +47,7 @@ fr: Les <%= number_of_articles %> derniers articles
<h1> <%= link_to(a[:title]+%{ <span class="nicer">»</span>}, a) %> </h1>
<div class="content">
<%= repair_html ( excerptize( a.reps[0].compiled_content, {:length => number_of_char_for_resume} ) ) %>
<%= repair_html ( excerptize( a.reps[0].compiled_content, {:length => number_of_char_for_resume} ).gsub(/<img[^>]*(\/|><\/img)>/,"") ) %>
<div class="flush"></div>
<div>

3
site/Scratch/en/blog/2011-05-05-Screenshots/index.html
View file

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

23
site/Scratch/en/blog/index.html
View file

@ -95,24 +95,10 @@ Last 5 Articles
<p>Here are some screenshots of YPassword.</p>
<p><img alt="Entry screen" src="/Scratch/img/blog/2011-05-05-Screenshots/entry_screen.jpg" class="left" /></p>
<p></p>
<p><img alt="main view" src="/Scratch/img/blog/2011-05-05-Screenshots/main_view.jpg" class="left" /></p>
<ul class="big">
<li>Tap <em>login</em> or <em>password</em>, </li>
<li>The light glow, the field is copied,</li>
<li>Paste it in any other application.</li>
</ul>
<ul class="big">
<li>Tap <em>&ldquo;Go to website&rdquo;</em></li>
<li>You are sent to the website <em>&amp;</em> your password is copied for you.</li>
</ul>
<div class="flush"></div>
<p></p></p></p>
<p></p>
...
<div class="flush"></div>
<div>
@ -159,6 +145,8 @@ Last 5 Articles
</div>
</div>
<hr/>
<h2 id="archives">Archives</h2>
<div id="sousliens" class="archive"><h4 class="button"><a onclick="$('#archives_2011').slideToggle();return false;" href="#">[2011]</a></h4><ul id="archives_2011"><li><span class="date">
@ -170,7 +158,6 @@ Last 5 Articles
<footer>
<ul class="article_metadata">
<li>Modified: <time>07/11/2011</time></li>
<li><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Copyright ©, Yann Esposito</a></li>
</ul>
</footer>
</article>

3
site/Scratch/en/index.html
View file

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

3
site/Scratch/en/support/index.html
View file

@ -81,8 +81,7 @@
</div>
<footer>
<ul class="article_metadata">
<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>
<li>Modified: <time>07/12/2011</time></li>
</ul>
</footer>
</article>

3
site/Scratch/fr/blog/2011-05-05-Screenshots/index.html
View file

@ -98,8 +98,7 @@
<footer>
<ul class="article_metadata">
<li>Écrit le : <time>05/05/2011</time></li>
<li>modifié le : <time> 14/05/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>
<li>modifié le : <time> 12/07/2011</time></li>
</ul>
</footer>
</article>

19
site/Scratch/fr/blog/index.html
View file

@ -63,7 +63,7 @@
<div id="elementblock">
<ul class="menu">
<li> <a href="#last-articles">&darr; Les 5 derniers articles &darr;</a></li>
<li> <a href="#last-articles">&darr; 5 articles récents &darr;</a></li>
<li> <a href="#tagcloud">&darr; Nuage de mots clés &darr;</a></li>
<li> <a href="#archives">&darr; Achives &darr;</a></li>
</ul>
@ -95,19 +95,9 @@ Les 5 derniers articles
<p>Ceci est une suite de quelques captures d&rsquo;écran d&rsquo;YPassword.</p>
<p><img alt="Entry screen" src="/Scratch/img/blog/2011-05-05-Screenshots/entry_screen.jpg" class="left" /></p>
<p></p>
<p><img alt="main view" src="/Scratch/img/blog/2011-05-05-Screenshots/main_view.jpg" class="left" /></p>
<ul class="big">
<li>Tapez sur le login ou le mot de passe&nbsp;;</li>
<li>La lumière &ldquo;pulse&rdquo;&nbsp;; </li>
<li>Votre mot de passe est copié, prêt à être collé dans une autre application.</li>
</ul>
<ul class="big">
<li>Tappez sur &ldquo;go to website&rdquo; </li>
<li>Vous allez sur le site web et votre mot de passe a Ã...</li></ul></p></p>
<p></p>
<div class="flush"></div>
<div>
@ -145,6 +135,8 @@ Les 5 derniers articles
</div>
</div>
<hr/>
<h2 id="archives">Archives</h2>
<div id="sousliens" class="archive"><h4 class="button"><a onclick="$('#archives_2011').slideToggle();return false;" href="#">[2011]</a></h4><ul id="archives_2011"><li><span class="date">
@ -156,7 +148,6 @@ Les 5 derniers articles
<footer>
<ul class="article_metadata">
<li>modifié le : <time>11/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>
</article>

3
site/Scratch/fr/index.html
View file

@ -108,8 +108,7 @@
</div>
<footer>
<ul class="article_metadata">
<li>modifié le : <time>11/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>
<li>modifié le : <time>12/07/2011</time></li>
</ul>
</footer>
</article>

3
site/Scratch/fr/support/index.html
View file

@ -81,8 +81,7 @@
</div>
<footer>
<ul class="article_metadata">
<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>
<li>modifié le : <time>12/07/2011</time></li>
</ul>
</footer>
</article>

4
site/Scratch/sitemap.xml
View file

@ -6,7 +6,7 @@
</url>
<url>
<loc>http://ypassword.espozito.com/Scratch/fr/blog/</loc>
<lastmod>2011-07-11</lastmod>
<lastmod>2011-07-12</lastmod>
</url>
<url>
<loc>http://ypassword.espozito.com/Scratch/en/support/</loc>
@ -38,7 +38,7 @@
</url>
<url>
<loc>http://ypassword.espozito.com/Scratch/en/blog/</loc>
<lastmod>2011-07-11</lastmod>
<lastmod>2011-07-12</lastmod>
</url>
<url>
<loc>http://ypassword.espozito.com/Scratch/fr/</loc>

19
site/css/main.css
View file

@ -609,8 +609,13 @@ article article, .archive {
article article > *, .archive > * {
margin: 20px;
}
/* line 318, ../src/main.sass */
article article .content, .archive .content {
width: 600px;
margin: 0 auto;
}
/* line 319, ../src/main.sass */
/* line 322, ../src/main.sass */
#hiddenDivs {
width: 600px;
margin: 1em auto;
@ -633,7 +638,7 @@ article article > *, .archive > * {
margin: 20px;
}
/* line 327, ../src/main.sass */
/* line 330, ../src/main.sass */
.archive .button {
font-size: 14px;
width: 5em;
@ -684,28 +689,28 @@ article article > *, .archive > * {
box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px inset, rgba(255, 255, 255, 0.3) 0 1px 3px inset;
}
/* line 331, ../src/main.sass */
/* line 334, ../src/main.sass */
.return {
float: right;
opacity: 0.3;
}
/* line 334, ../src/main.sass */
/* line 337, ../src/main.sass */
.return:hover {
opacity: 1;
}
/* line 337, ../src/main.sass */
/* line 340, ../src/main.sass */
.big {
font-size: 1.2em;
}
/* line 340, ../src/main.sass */
/* line 343, ../src/main.sass */
body.support #main > article {
width: 600px;
margin: 3em auto;
font-size: 1.2em;
}
/* line 344, ../src/main.sass */
/* line 347, ../src/main.sass */
body.support #main > article form {
margin: 1em;
}

3
site/index.html
View file

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

3
site/src/main.sass
View file

@ -315,6 +315,9 @@ article article, .archive
+innerblock
background-color: $ycolorb
padding: 1em
.content
width: $navWidth
margin: 0 auto
#hiddenDivs
width: $navWidth