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

app/models/meeting.rb

@@ -42,6 +42,7 @@ class Meeting < ActiveRecord::Base
     n.text ="Agenda im Anhang"
     n.rubrik = self.meetingtyp.rubrik
     n.author=user
+      n.datum=Date.today
     n.save    
     self.neuigkeit= n
     end

app/views/neuigkeiten/_compact.html.erb

@@ -1,5 +1,5 @@
 <div class="media"> 
-  <div class="pull-left" href="#">
+  <div class="pull-left">
     <p><br>
 <%  unless neuigkeit.picture_robust.url.nil? %><%= image_tag neuigkeit.picture_robust.thumb.url  %> 
    <% end %> </p>

app/views/rubriken/show.html.erb

@@ -46,11 +46,11 @@
 </div>
 </div>
 <div class="span3">
-
+<% unless @calentries.nil? || @calentries.empty? %>
   <% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+I18n.locale.to_s+params[:month].to_s+params[:year].to_s) do %>
 <%= render 'calendars/calentries', :object=>@calentries %>
 <% end %>
-
+<% end %>
 <%= link_to "ics-format", calendar_path(@rubrik.calendar,:format=>:ics) %>
 </div>