From a11b56fd9a5749113e533c902cca8fc5e02af52d Mon Sep 17 00:00:00 2001 From: "Yann Esposito (Yogsototh)" Date: Tue, 12 Jul 2011 14:03:38 +0200 Subject: [PATCH] Simplifications --- content/html/en/blog.erb | 6 +++-- content/html/fr/blog.erb | 8 ++++--- multi/blog.erb | 6 ++--- .../en/blog/2011-05-05-Screenshots/index.html | 3 +-- site/Scratch/en/blog/index.html | 23 ++++--------------- site/Scratch/en/index.html | 3 +-- site/Scratch/en/support/index.html | 3 +-- .../fr/blog/2011-05-05-Screenshots/index.html | 3 +-- site/Scratch/fr/blog/index.html | 19 ++++----------- site/Scratch/fr/index.html | 3 +-- site/Scratch/fr/support/index.html | 3 +-- site/Scratch/sitemap.xml | 4 ++-- site/css/main.css | 19 +++++++++------ site/index.html | 3 +-- site/src/main.sass | 3 +++ 15 files changed, 46 insertions(+), 63 deletions(-) diff --git a/content/html/en/blog.erb b/content/html/en/blog.erb index accd6fa..ed9aa1d 100644 --- a/content/html/en/blog.erb +++ b/content/html/en/blog.erb @@ -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

<%= link_to(a[:title]+%{ »}, a) %>

- <%= 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)>/,"") ) %>
@@ -65,6 +65,8 @@ Last <%= number_of_articles %> Articles
+
+

Archives

<%= generateBlogSubMenu(language) %> diff --git a/content/html/fr/blog.erb b/content/html/fr/blog.erb index c319dd5..17109d3 100644 --- a/content/html/fr/blog.erb +++ b/content/html/fr/blog.erb @@ -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
@@ -44,7 +44,7 @@ Les <%= number_of_articles %> derniers articles

<%= link_to(a[:title]+%{ »}, a) %>

- <%= 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)>/,"") ) %>
@@ -65,6 +65,8 @@ Les <%= number_of_articles %> derniers articles
+
+

Archives

<%= generateBlogSubMenu(language) %> diff --git a/multi/blog.erb b/multi/blog.erb index 124a992..b03573b 100644 --- a/multi/blog.erb +++ b/multi/blog.erb @@ -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
    en:
  • ↓ <%= number_of_articles %> latest articles ↓
    • -fr:
  • ↓ Les <%= number_of_articles %> derniers articles ↓
    • +fr:
  • ↓ <%= number_of_articles %> articles récents ↓
    • en:
  • ↓ Tag Cloud ↓
    • fr:
  • ↓ Nuage de mots clés ↓
  • ↓ Achives ↓
    • @@ -47,7 +47,7 @@ fr: Les <%= number_of_articles %> derniers articles

    <%= link_to(a[:title]+%{ »}, a) %>

    - <%= 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)>/,"") ) %>
    diff --git a/site/Scratch/en/blog/2011-05-05-Screenshots/index.html b/site/Scratch/en/blog/2011-05-05-Screenshots/index.html index 869efd4..df69f33 100644 --- a/site/Scratch/en/blog/2011-05-05-Screenshots/index.html +++ b/site/Scratch/en/blog/2011-05-05-Screenshots/index.html @@ -98,8 +98,7 @@ diff --git a/site/Scratch/en/blog/index.html b/site/Scratch/en/blog/index.html index 51a80cd..2717b5f 100644 --- a/site/Scratch/en/blog/index.html +++ b/site/Scratch/en/blog/index.html @@ -95,24 +95,10 @@ Last 5 Articles

    Here are some screenshots of YPassword.

    -

    Entry screen

    +

    -

    main view

    - -
      -
    • Tap login or password,
      • -
    • The light glow, the field is copied,
      • -
    • Paste it in any other application.
      • -
    - -
      -
    • Tap “Go to website”
      • -
    • You are sent to the website & your password is copied for you.
      • -
    - -
    - -

    +

    +...
    @@ -159,6 +145,8 @@ Last 5 Articles
    +
    +

    Archives

    [2011]

    • @@ -170,7 +158,6 @@ Last 5 Articles diff --git a/site/Scratch/en/index.html b/site/Scratch/en/index.html index fa49c8e..1e16ecc 100644 --- a/site/Scratch/en/index.html +++ b/site/Scratch/en/index.html @@ -108,8 +108,7 @@
    diff --git a/site/Scratch/en/support/index.html b/site/Scratch/en/support/index.html index 4b020b3..cdb1ddd 100644 --- a/site/Scratch/en/support/index.html +++ b/site/Scratch/en/support/index.html @@ -81,8 +81,7 @@
    diff --git a/site/Scratch/fr/blog/2011-05-05-Screenshots/index.html b/site/Scratch/fr/blog/2011-05-05-Screenshots/index.html index 224cbdf..39e0cfd 100644 --- a/site/Scratch/fr/blog/2011-05-05-Screenshots/index.html +++ b/site/Scratch/fr/blog/2011-05-05-Screenshots/index.html @@ -98,8 +98,7 @@ diff --git a/site/Scratch/fr/blog/index.html b/site/Scratch/fr/blog/index.html index e2f65c2..a331fc7 100644 --- a/site/Scratch/fr/blog/index.html +++ b/site/Scratch/fr/blog/index.html @@ -63,7 +63,7 @@
    @@ -95,19 +95,9 @@ Les 5 derniers articles

    Ceci est une suite de quelques captures d’écran d’YPassword.

    -

    Entry screen

    +

    -

    main view

    - -
      -
    • Tapez sur le login ou le mot de passe ;
      • -
    • La lumière “pulse” ;
      • -
    • Votre mot de passe est copié, prêt à être collé dans une autre application.
      • -
    - -
      -
    • Tappez sur “go to website”
      • -
    • Vous allez sur le site web et votre mot de passe a Ã...

    +

    @@ -145,6 +135,8 @@ Les 5 derniers articles
    +
    +

    Archives

    [2011]

    • @@ -156,7 +148,6 @@ Les 5 derniers articles diff --git a/site/Scratch/fr/index.html b/site/Scratch/fr/index.html index aa444b7..6b044d2 100644 --- a/site/Scratch/fr/index.html +++ b/site/Scratch/fr/index.html @@ -108,8 +108,7 @@
    diff --git a/site/Scratch/fr/support/index.html b/site/Scratch/fr/support/index.html index d62700c..0250953 100644 --- a/site/Scratch/fr/support/index.html +++ b/site/Scratch/fr/support/index.html @@ -81,8 +81,7 @@
diff --git a/site/Scratch/sitemap.xml b/site/Scratch/sitemap.xml index d3a2097..56868ec 100644 --- a/site/Scratch/sitemap.xml +++ b/site/Scratch/sitemap.xml @@ -6,7 +6,7 @@ http://ypassword.espozito.com/Scratch/fr/blog/ - 2011-07-11 + 2011-07-12 http://ypassword.espozito.com/Scratch/en/support/ @@ -38,7 +38,7 @@ http://ypassword.espozito.com/Scratch/en/blog/ - 2011-07-11 + 2011-07-12 http://ypassword.espozito.com/Scratch/fr/ diff --git a/site/css/main.css b/site/css/main.css index 5f7b511..9e226ec 100644 --- a/site/css/main.css +++ b/site/css/main.css @@ -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; } diff --git a/site/index.html b/site/index.html index fa49c8e..1e16ecc 100644 --- a/site/index.html +++ b/site/index.html @@ -108,8 +108,7 @@
diff --git a/site/src/main.sass b/site/src/main.sass index a5c577b..7794416 100644 --- a/site/src/main.sass +++ b/site/src/main.sass @@ -315,6 +315,9 @@ article article, .archive +innerblock background-color: $ycolorb padding: 1em + .content + width: $navWidth + margin: 0 auto #hiddenDivs width: $navWidth