Permalink
Browse files

change gemfile to use my version of sinatra, and my patch to test the…

… patched gem
  • Loading branch information...
1 parent 00f8806 commit 0d57148dfbac5112289d12ae4364ca421845a0b6 @photomattmills committed Apr 26, 2012
Showing with 13 additions and 8 deletions.
  1. +1 −1 Gemfile
  2. +10 −5 Gemfile.lock
  3. +1 −1 sinatra.rb
  4. +1 −1 views/gallery.haml
View
2 Gemfile
@@ -1,5 +1,5 @@
source :rubygems
gem 'haml'
-gem 'sinatra'
+gem 'sinatra', :git => "git://github.com/mattmills/sinatra.git"
gem 'thin'
View
15 Gemfile.lock
@@ -1,3 +1,12 @@
+GIT
+ remote: git://github.com/mattmills/sinatra.git
+ revision: 0ff8998ac83c29349dfd6ca4779cc28b20804b45
+ specs:
+ sinatra (1.4.0)
+ rack (~> 1.3, >= 1.3.6)
+ rack-protection (~> 1.2)
+ tilt (~> 1.3, >= 1.3.3)
+
GEM
remote: http://rubygems.org/
specs:
@@ -7,10 +16,6 @@ GEM
rack (1.4.1)
rack-protection (1.2.0)
rack
- sinatra (1.3.2)
- rack (~> 1.3, >= 1.3.6)
- rack-protection (~> 1.2)
- tilt (~> 1.3, >= 1.3.3)
thin (1.3.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
@@ -22,5 +27,5 @@ PLATFORMS
DEPENDENCIES
haml
- sinatra
+ sinatra!
thin
View
2 sinatra.rb
@@ -39,7 +39,7 @@ class Gallery < Sinatra::Base
:thumbnails => thumbnails
}
- Dir.chdir "/home/matt/gallery"
+ #Dir.chdir "/home/matt/gallery"
haml :gallery, :locals => locals
end
View
2 views/gallery.haml
@@ -51,7 +51,7 @@
%br
#thumbnails{:style => "margin: 0 auto;"}
-thumbnails.each do |thumb|
- #thumb{:style => "float: left; width: 100px; height: 100px; margin: 10px 10px 10px 10px; text-align:center;"}
+ #thumb{:style => "float: left; width: 100px; height: 100px; margin: auto; text-align:center;"}
%a{:href=>"http://galleries.notuntitled.com/#{dir}/#{thumb.sub(".png",".jpg")}"}
%img{:src=>"http://photomattmills.com/images/#{dir}/thumbnails/#{thumb}", :style=>"border: 0pt none;"}
%br

0 comments on commit 0d57148

Please sign in to comment.