From 57b015a44e39254c394499eeaf42436ecc0fe555 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Thu, 22 Aug 2013 23:44:09 +0200
Subject: [PATCH] neuigkeit styling

---
 app/models/neuigkeit.rb           |  1 +
 app/views/rubriken/index.html.erb | 13 ++++---------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb
index e2b655e..3765b7b 100755
--- a/app/models/neuigkeit.rb
+++ b/app/models/neuigkeit.rb
@@ -19,4 +19,5 @@ class Neuigkeit < ActiveRecord::Base
   validates :rubrik, :presence=>true
   validates :author, :presence=>true
   translates :title,:text, :versioning=>true, :fallbacks_for_empty_translations => true
+  scope :recent, -> { where("updated_at >= ? ",Time.now - 7.days)}
 end
diff --git a/app/views/rubriken/index.html.erb b/app/views/rubriken/index.html.erb
index 7591824..0403397 100755
--- a/app/views/rubriken/index.html.erb
+++ b/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 %>