Merge branch 'master' of github.com:fetsite/fetsite

This commit is contained in:
Andreas Stephanides
2013-08-27 22:06:10 +02:00
3 changed files with 33 additions and 36 deletions

View File

@@ -1,6 +1,4 @@
<h1>Listing galleries</h1>
<%= %>
<div class="container-fluid">
<div class="row-fluid">
@@ -25,5 +23,4 @@
</div
<br />
<%= link_to 'New Gallery', new_gallery_path %>

View File

@@ -34,7 +34,7 @@
<% @gallery.fotos.each do |f| %>
<a href="<%= f.datei.resized.url%>" title="<%=f.title%>" data-gallery="gallery">
<%=image_tag(f.datei.big_thumb.url,{:class=>"img-polaroid"}) %></a>
<%=image_tag(f.datei.thumb.url,{:class=>"img-polaroid"}) %></a>
<% end %>