Merge branch 'master' of github.com:marano/fotologffffffu

marano · Sep 23, 2010 · 32e4f60 · 32e4f60
2 parents bade492 + 29bfe2f
commit 32e4f60
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 10 deletions.
diff --git a/app/main_controller.rb b/app/main_controller.rb
@@ -9,7 +9,7 @@
 
 get '/:name' do
   retrieve_photos
-  haml :index
+  haml :wall
 end
 
 get '/:name/slide' do

diff --git a/views/index.haml b/views/index.haml
@@ -1,12 +1,12 @@
-- @title = "fotologffffffu -- #{params[:name]}"
+- @title = "fotologffffffu"
 
 %h1 fotologffffffu!
 
 #search
     %form{:action => '/', :style => 'float: none;'}
         %label{:for => 'name', :id => 'search_label'}
             = 'fotolog.com/'
-        %input{:name => 'name', :value => @name, :id => 'search_box'}
+        %input{:name => 'name', :id => 'search_box'}
         %input{:id => 'search_button', :type => 'submit', :value => 'Give it to me baby!'}
 
 - unless @recent_users.nil?
@@ -19,11 +19,6 @@
                     %a{:href => "/#{each}"}
                         = "/#{each}"
 
-- unless @photos.nil?
-    %div{:id => 'photos'}
-        - @photos.each do |photo|
-            %img(src = photo)
-
 #share{:style => 'margin-top: 20px;'}
     #facebook_share{:style => 'margin: 10px;'}
         %a{:href => "http://www.facebook.com/sharer.php", :name => "fb_share", :type => "button"} Share
@@ -32,5 +27,3 @@
         %a.twitter-share-button{"data-count" => "none", "data-text" => "Check out my Fotolog photos on Fotologffffffu", :href => "http://twitter.com/share"} Tweet
         %script{:src => "http://platform.twitter.com/widgets.js", :type => "text/javascript"}
 
-%script{:src => "http://www.google.com/jsapi", :type => "text/javascript"}
-
diff --git a/views/layout.haml b/views/layout.haml
@@ -43,6 +43,8 @@
                     = yield
                 %footer
 
+        %script{:src => "http://www.google.com/jsapi", :type => "text/javascript"}
+
     -#
         Javascript at the bottom for fast page loading
         Grab Google CDN's jQuery. fall back to local if necessary

diff --git a/views/wall.haml b/views/wall.haml
@@ -0,0 +1,24 @@
+- @title = "#{@name} at fotologffffffu"
+
+%h1
+    = "/#{@name}"
+
+#search
+    %form{:action => '/', :style => 'float: none;'}
+        %label{:for => 'name', :id => 'search_label'}
+            = 'fotolog.com/'
+        %input{:name => 'name', :value => @name, :id => 'search_box'}
+        %input{:id => 'search_button', :type => 'submit', :value => 'Give it to me baby!'}
+
+%div{:id => 'photos'}
+    - @photos.each do |photo|
+        %img(src = photo)
+
+#share{:style => 'margin-top: 20px;'}
+    #facebook_share{:style => 'margin: 10px;'}
+        %a{:href => "http://www.facebook.com/sharer.php", :name => "fb_share", :type => "button"} Share
+    #twitter_share{:style => 'margin: 10px;'}
+        %script{:src => "http://static.ak.fbcdn.net/connect.php/js/FB.Share", :type => "text/javascript"}
+        %a.twitter-share-button{"data-count" => "none", "data-text" => "Check out my Fotolog photos on Fotologffffffu", :href => "http://twitter.com/share"} Tweet
+        %script{:src => "http://platform.twitter.com/widgets.js", :type => "text/javascript"}
+