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

app/views/galleries/edit.html.erb

@@ -2,5 +2,7 @@
 
 <%= render 'form' %>
 
+<!--
 <%= link_to 'Show', @gallery %> |
 <%= link_to 'Back', galleries_path %>
+-->

app/views/galleries/index.html.erb

@@ -1,26 +1,35 @@
 <h1><%= I18n.t('fotos.galleries')%></h1>
- <%= %>
-<div class="container-fluid">
-	<div class="row-fluid">
-		<div class="span12"> 
-		<% @galleries.each do |gallery| %>
-			<%= link_to gallery do %>
-			<div class="media">
-				<div class="pull-left" href="#">
-					<%= image_tag gallery.fotos.first.datei.big_thumb.url %>
-				</div>
-				<div class="media-body">
-					<h1><%= gallery.datum %> - <%= gallery.name %></h1>
-					<p><%= gallery.desc %>
-					</p>
-				</div>
-			</div>
-			<% end %>
-
-		<% end %>
-		</div>
-	</div>
-</div
+<% @galleries.each_slice(2) do |row| %>
+<div class="row-fluid">
+  <% row.each do |gallery| %>
+  <div class="span6"> 
+    <%= link_to gallery, :class => 'gallery-block' do %>
+    <div class="media gallery-block">
+      <div class="pull-left" href="#">
+	<%= if(gallery.fotos.empty?)
+	    image_tag "no_image_128.png", {:class => "img-rounded"}
+	    else
+	    image_tag gallery.fotos.sample.datei.big_thumb.url, {:class => "img-rounded"}
+	    end %>
+      </div>
+      <div class="media-body">
+	<small class="pull-left"><%= gallery.fotos.size.to_s + " " + I18n.t('fotos.bilder')%> </small>
+	<small class="pull-right"><%=I18n.l(gallery.try(:datum).try(:to_date)) unless gallery.try(:datum).try(:to_date).nil? %></small></br>
+	<h1><%= gallery.name %></h1>
+	<p>
+	  <%= if gallery.desc.split.size > Gallery::WORD_COUNT
+	  gallery.desc.split[0..Gallery::WORD_COUNT].join(" ") + " ..."
+	  else
+	  gallery.desc
+	  end%>
+	</p>
+      </div>
+    </div>
+    <% end %> <!-- end link -->
+  </div> <!-- close span6 -->
+  <% end %> <!-- end row -->
+</div>
+<% end %>
 
 <br />
-<%= link_to I18n.t('fotos.new-gallery'), new_gallery_path %>
+<%= render :partial => 'layouts/pretty_toolbar' %>

app/views/galleries/show.html.erb

@@ -1,18 +1,17 @@
 
 <p id="notice"><%= notice %></p>
 <div>
-  <small> <%= @gallery.datum %> </small>
+  <small class="pull-left"><%= @gallery.fotos.size.to_s + " " + I18n.t('fotos.bilder')%> </small>
+  <small class="pull-right"><%=I18n.l(@gallery.try(:datum).try(:to_date)) unless @gallery.try(:datum).try(:to_date).nil? %></small></br>
   <h1>
     <%= @gallery.name %>
   </h1>
-
 </div>
+
 <p>
   <%= @gallery.desc %>
 </p>
-
-
- 
+</br>
 
 <!-- modal-gallery is the modal dialog used for the image gallery -->
 <div id="modal-gallery" class="modal hide fade modal-gallery modal-fullscreen modal-loading" tabindex="-1">
@@ -32,13 +31,13 @@
 <div id="gallery" data-toggle="modal-gallery" data-target="#modal-gallery">
   <% @gallery.fotos.each do |f| %>
 
-<a href="<%= f.datei.resized.url%>" title="<%=f.title%>" data-gallery="gallery">
-<%=image_tag(f.datei.thumb.url,{:class=>"img-polaroid"}) %></a>
+  <a href="<%= f.datei.resized.url%>" title="<%=f.title%>" data-gallery="gallery">
+    <%=image_tag(f.datei.thumb.url,{:class=>"img-polaroid"}) %></a>
 
 
-<% end %>
+  <% end %>
 </div>
-
+</br>
 <%= render 'layouts/pretty_toolbar' %>
 
 
@@ -48,6 +47,5 @@
 <script src="js/load-image.js"></script>
 <script src="js/bootstrap-image-gallery.js"></script>
 <script type="text/javascript">
-
-//$('#modal-gallery.fade').css('top', '50%');
-  </script>
+  //$('#modal-gallery.fade').css('top', '50%');
+</script>

app/views/themengruppen/_themengruppe.html.erb

@@ -1,7 +1,7 @@
 <%= link_to themengruppe,{:class=>'themengruppe'} do %>
 <div class="row-fluid">
   <div class="span2">
-    <%= image_tag themengruppe.picture.thumb.url,{:class=>"img-circle"} %>
+    <%= image_tag themengruppe.picture.thumb.url,{:class=>"img-rounded"} %>
   </div>
   <div class="span10">
     <h3><%=themengruppe.title%> </h3>