diff --git a/app/controllers/flickr_controller.rb b/app/controllers/flickr_controller.rb index 8fe2b21..24359fa 100644 --- a/app/controllers/flickr_controller.rb +++ b/app/controllers/flickr_controller.rb @@ -1,5 +1,7 @@ class FlickrController < ApplicationController require 'flickraw' + @@flickr_id = "13827925@N00" + def index @@ -11,9 +13,14 @@ class FlickrController < ApplicationController def photo @pid = params[:id] - @pinfo = flickr.photos.getInfo :photo_id => @pid - getSizes = flickr.photos.getSizes :photo_id => @pid - @psizes = getSizes.find{|m| m.label == "Medium"} + begin + @pinfo = flickr.photos.getInfo :photo_id => @pid + rescue => e + @error = true; + @pid = flickr.photos.search(:user_id => @@flickr_id).rand.id + @pinfo = flickr.photos.getInfo :photo_id => @pid + end + @psize = flickr.photos.getSizes(:photo_id => @pid).find{|m| m.label == "Medium"} respond_to do |format| format.html @@ -22,12 +29,10 @@ class FlickrController < ApplicationController end def home - photos = flickr.photos.search(:user_id => "13827925@N00") - random = photos[rand(photos.size)] - @pid = random.id - @pinfo = flickr.photos.getInfo :secret => random.secret, :photo_id => @pid - getSizes = flickr.photos.getSizes :photo_id => @pid - @psizes = getSizes.find{|m| m.label == "Medium"} + + @pid = flickr.photos.search(:user_id => @@flickr_id).rand.id + @pinfo = flickr.photos.getInfo(:photo_id => @pid) + @psize = flickr.photos.getSizes(:photo_id => @pid).find{|m| m.label == "Medium"} respond_to do |format| format.html diff --git a/app/views/flickr/_single.html.erb b/app/views/flickr/_single.html.erb index 1637ed6..3cbc6c7 100644 --- a/app/views/flickr/_single.html.erb +++ b/app/views/flickr/_single.html.erb @@ -1,6 +1,9 @@ -
-
- <%= link_to image_tag(@psizes.source, :alt => @pinfo.title), :controller => "flickr", :action => "photo", :id => @pid %> +
+
+ <%= link_to image_tag(@psize.source, :alt => @pinfo.title), :controller => "flickr", :action => "photo", :id => @pid %>

<%= @pinfo.title %>

-
\ No newline at end of file + <% if (@error) then %> +

requested photo id not found, random photo displayed.

+ <% end %> +
diff --git a/app/views/flickr/home.html.erb b/app/views/flickr/home.html.erb index c2ead3e..921f58f 100644 --- a/app/views/flickr/home.html.erb +++ b/app/views/flickr/home.html.erb @@ -1,3 +1 @@ -<%= render :partial => 'single' %> - - \ No newline at end of file +<%= render :partial => 'single' %> \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a644d3f..ea4df5e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -6,6 +6,16 @@
<%= yield %> + +
+
\ No newline at end of file diff --git a/public/stylesheets/global.css b/public/stylesheets/global.css index 4d152c2..5797d82 100644 --- a/public/stylesheets/global.css +++ b/public/stylesheets/global.css @@ -1,5 +1,5 @@ body { - color: #858C94; + color:#BBB3A6; background-color: #332920; font-family: Helvetica, Verdana, sans-serif; font-size: .8em; @@ -11,7 +11,6 @@ body { #header { color:#BBB3A6; - font-size:1.5em; padding:40px; margin:0 auto; text-align:center; @@ -24,14 +23,28 @@ body { text-align:center; } -div.flickr { - padding-top:100px; +div.box { + padding-top:50px; margin:0em auto; text-align:center; } + div.border { background-color:#BBB3A6; padding:5px; margin:0 auto; color:#48362A; +} + +#header a, #header a:visited { + color:#48362A; +} + +.light { + color:#BBB3A6; +} + +h1 { + font-size:1.5em; + font-weight:lighter; } \ No newline at end of file