Flickr Galleries added.

404.haml

@@ -12,5 +12,5 @@ title: Page not found (Error 404)
   :javascript
     $('#pathname').text(location.pathname).css('fontWeight', 'bold');
     var GOOG_FIXURL_LANG = 'en';
-    var GOOG_FIXURL_SITE = 'http://www.lucasefe.com.ar/';
+    var GOOG_FIXURL_SITE = 'http://www.justoalcaer.com.ar/';
   %script{ :type => "text/javascript", :src => "http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js" }

_helpers.rb

@@ -2,10 +2,10 @@
 require 'haml-coderay'
 require 'lib/slugalizer'
 
-FEED_URL = "http://www.lucasefe.com.ar/feed/atom.xml"
+FEED_URL = "http://www.justoalcaer.com.ar/feed/atom.xml"
 MYSPACE_URL = "http://www.myspace.com/justoalcaer"
-module Helpers
 
+module Helpers
   def array_to_sentence(array)
     connector = "and"
     case array.length

_layouts/default.haml

@@ -1,66 +1,49 @@
-!!!strict
-
+!!!Strict
 %html{html_attrs}
-
   %head
     %meta{ :"http-equiv" => 'Content-Type', :content => 'text/html; charset=utf-8' }
-    %title= page.title.match(/Vera$/) ? page.title : "#{page.title} – Vera"
-    %meta{ :name => 'author', :content => 'Lucas Florio (http://www.lucasefe.com.ar)' }
+    %title= page.title.match(/Justo al Caer$/) ? page.title : "#{page.title} – Justo al Caer"
+    %meta{ :name => 'author', :content => 'Justo al Caer (http://www.justoalcaer.com.ar)' }
     %link{ :href => FEED_URL, :rel => "alternate", :title => "Lucas Efe", :type => "application/atom+xml" }
-    %link{ :rel => "stylesheet", :type => 'text/css', :href => '/css/thickbox.css' }
-    %link{ :rel => "stylesheet", :type => 'text/css', :href => '/css/coderay.css' }
-    %link{:href=>'http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz', :rel=>'stylesheet', :type=>'text/css'}
-    %link{:href=>'http://fonts.googleapis.com/css?family=Reenie+Beanie', :rel=>'stylesheet', :type=>'text/css'}
-    %link{ :rel => "stylesheet", :type => 'text/css', :href => '/css/screen.css' }
+    %link{ :rel => "stylesheet", :type => 'text/css', :href => '/stylesheets/thickbox.css' }
+    %link{ :rel => "stylesheet", :type => 'text/css', :href => '/stylesheets/reset.css' }
+    %link{ :rel => "stylesheet", :type => 'text/css', :href => '/stylesheets/960.css' }
+    %link{ :rel => "stylesheet", :type => 'text/css', :href => '/stylesheets/text.css' }
+    %link{ :rel => "stylesheet", :type => 'text/css', :href => '/stylesheets/colorbox.css' }
+    %link{ :rel => "stylesheet", :type => 'text/css', :href => '/stylesheets/default.css' }
+
     %script{ :src => '/js/jquery.min.js', :type => 'text/javascript' }
+    %script{ :src => '/js/jquery.flickr.js', :type => 'text/javascript' }
     %script{ :src => '/js/jquery.cookie.js', :type => 'text/javascript' }
     %script{ :src => '/js/jquery.twitter.js', :type => 'text/javascript' }
-    %script{ :src => '/js/thickbox-compressed.js', :type => 'text/javascript' }
+    %script{ :src => '/js/jquery.colorbox-min.js', :type => 'text/javascript' }
+    %script{ :src => '/js/jquery.livequery.js', :type => 'text/javascript' }
     %script{ :src => '/js/app.js', :type => 'text/javascript' }
-
   %body
-    #top-banner
-      .left-box
-        = link_to('<img src="http://www.gravatar.com/avatar/1156b6ec7075396cf55fcc7425b79b37?s=48&d=http%3A%2F%2Fgithub.com%2Fimages%2Fgravatars%2Fgravatar-48.png" width="30" height="30" alt="" />', "/cv.html")
-        = link_to("<img alt='Acerca de Lucas Florio' src='/images/logo.png' width='100' height='20' />", '/about.html') 
-
-      .right-box
-        = link_to("<img src='/images/myspace.png' width='20' height='20' />", MYSPACE_URL)
-        = link_to("<img src='/images/rss.png' width='20' height='20' />", FEED_URL)
-
-    #site
-      #sidebar
-        %form#search{ :method => 'get', :action => 'http://www.google.com/search' }
-          %input.text{ :type => 'text', :name => 'q' }
-          %input{ :type => 'hidden', :name => 'sitesearch', :value => 'lucasefe.com.ar' }
-          %input.button{ :type => 'submit', :value => 'Google' }
-
-        #github
-          %a{ :href => 'http://github.com/lucasefe' }
-            %img{ :src => 'http://github.com/images/modules/header/logov3.png', :alt => 'github.com/lucasefe' }
-        #working-with-rails
-          %a{:href=>"http://www.workingwithrails.com/recommendation/new/person/7277-lucas-florio"}
-            %img{:alt=>"Recommend Me", :src=>"http://workingwithrails.com/images/tools/compact-small.jpg"}
+    #top
+    #container.container_12
+      #header.grid_12
+      #top-header.grid_12
+        %ul
+          %li= link_to('Justo al Caer', "/bio.html")
+          %li= link_to('Blog', "/")
+          %li= link_to('M&uacute;sica', "/musica.html")
+          %li= link_to('Fotos', "/fotos.html")
+          %li= link_to('Fechas', "/fechas.html")
+          %li= link_to('Cont&aacute;ctate', "/contactate.html")
+      #main.grid_9
+        = content
+      #sidebar.grid_3
         #tweets
-
-      #content= content
-
-      %p#footer
-        Powered by
-        = link_to('Jekyll', 'http://github.com/henrik/jekyll')
-        and
-        = link_to('Disqus', 'http://disqus.com'), '.'
-        = link_to('View source', 'http://github.com/lucasefe/lucasefe.com.ar'), '.'
-
-      :javascript
-
-        // Google Analytics
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-
-        <script type="text/javascript">
-        var pageTracker = _gat._getTracker("UA-83541-8");
-        pageTracker._trackPageview();
-        
-      
+      #footer.grid_12
+        .grid_6.alpha
+          = link_to('Twitter', "http://www.twitter.com/justoalcaer")
+          = link_to('MySpace', "http://www.myspace.com/justoalcaer")
+          = link_to('Facebook', "http://www.facebook.com/#!/pages/Justo-Al-Caer/39438329526")
+        .grid_6.right.omega
+          Powered by
+          = link_to('Jekyll', 'http://github.com/henrik/jekyll')
+          and
+          = link_to('Disqus', 'http://disqus.com')
+          = link_to('Open Source', 'http://github.com/lucasefe/www.justoalcaer.com.ar')
+    #bottom

_layouts/post.haml

@@ -4,9 +4,9 @@ layout: default
 #post
   =header page.title
   %p.subtitle
-    = page.date.strftime("%d/%m/%Y"), '.'
+    = page.date.strftime("%d/%m/%Y")
     Tags: 
-    = tag_links(page.tags), "."
+    = tag_links(page.tags)
 
     -# TextMate edit link. JS sets the link text if a cookie is present: see js/app.js.
     %span#edit= link_to('', "txmt://open?url=file://#{page.path}")