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

app/views/lvas/show.html.erb

@@ -111,6 +111,9 @@
 	<%= render 'beispiele/form_bulk' %>
       </div>
     </div>
+
+    <% end %>
+
     <div class="row-fluid">
       <div class="span12">
 	<% @crawlobjects.each do |co| %>
@@ -119,7 +122,6 @@
       </div>
     </div>
 
-    <% end %>
 
   </div>
 </div>

app/views/themes/blue1/home/index.html.erb

@@ -44,7 +44,7 @@
 <%= render 'beispiele' %>
 
 </div>
-<% cache("neuigkeiten_startpage_"+  cache_array_key(@neuigkeiten)) do %>
+
 <div class="span5">
   <ul class="unstyled linklist">
 	<% @neuigkeiten.each do |n| %>
@@ -52,7 +52,7 @@
 	<% end %>
   </ul>
 </div>
-<% end %>
+
 <div class="span3">
 <% cache("calendar_" + cache_array_key(@calentries)+params[:month].to_s+params[:year].to_s) do %>
 <%= render 'calendars/calentries', :object=>@calentries %>