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

Conflicts:
	app/models/neuigkeit.rb

app/models/neuigkeit.rb

@@ -20,6 +20,8 @@ class Neuigkeit < ActiveRecord::Base
   validates :rubrik, :presence=>true
   validates :author, :presence=>true
   translates :title,:text, :versioning=>true, :fallbacks_for_empty_translations => true
+
   scope :published, -> {where("datum >= ?", Time.now.to_date)}
+  scope :recent, -> { where("updated_at >= ? ",Time.now - 7.days)}
 
 end

app/views/rubriken/index.html.erb

@@ -1,16 +1,11 @@
-
-
 <%= render 'tabs' %>
 <h1><%= I18n.t("rubrik.title")%></h1>
 <% @rubriken.each do |rubrik| %>
 
-
-    <%=
-    html="<b>".html_safe + rubrik.name + "</b> <br>".html_safe + rubrik.desc + "<br>".html_safe
-    
-    link_to( html , rubrik )%>
-   
-
+<% rubrik.neuigkeiten.recent.each do |n| %>
+<li><%= link_to n.title+"("+rubrik.name+")" , n %> </li>
+<% end %>
+<%= link_to 'Weitere Artikel zu '+rubrik.name.to_s , rubrik %>   
 <% end %>