From 80fae06de529c1c738ff4f141ad1abe85a42ac8e Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Wed, 4 Dec 2013 11:04:49 +0100
Subject: [PATCH] Termin bei Neuigkeit anzeigen

---
 app/models/calentry.rb                    |  3 +++
 app/views/calentries/_calentry.html.erb   |  2 +-
 app/views/neuigkeiten/_neuigkeit.html.erb | 14 +++++++++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/models/calentry.rb b/app/models/calentry.rb
index acc4baa..1bb1aba 100644
--- a/app/models/calentry.rb
+++ b/app/models/calentry.rb
@@ -57,6 +57,9 @@ end
       summary
     end
   end
+def text
+   I18n.l(self.start) +" bis "+ I18n.l(self.ende) 
+end
   scope :public, -> { where(:public => :true) } 
   scope :upcoming, -> { where("start >= ?" , Time.now).where("start <= ?", 8.days.from_now) }
 end
diff --git a/app/views/calentries/_calentry.html.erb b/app/views/calentries/_calentry.html.erb
index 447525b..fe2ae63 100644
--- a/app/views/calentries/_calentry.html.erb
+++ b/app/views/calentries/_calentry.html.erb
@@ -5,5 +5,5 @@ format=:timeonly
 else
 format =:default
 end%>
-<%= link_to I18n.l(calentry.start) +" bis "+ I18n.l(calentry.ende,:format=>format), calentry_path(calentry) %>
+<%= link_to calentry.name, calentry_path(calentry) %>
 </div>
diff --git a/app/views/neuigkeiten/_neuigkeit.html.erb b/app/views/neuigkeiten/_neuigkeit.html.erb
index e2f0ba6..a22f86c 100755
--- a/app/views/neuigkeiten/_neuigkeit.html.erb
+++ b/app/views/neuigkeiten/_neuigkeit.html.erb
@@ -8,11 +8,19 @@
   <div class="media-body">
     <div>
       <small><%= neuigkeit.rubrik.name %></small> 
-      <small class="pull-right"><%= "am "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil?  %></small> 
+      <small class="pull-right"> <%= "am "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil?  %></small> 
     </div>
-    <h1><%= image_tag("/iconnavy/time.png")  if neuigkeit.has_calentries? %>
-<%= neuigkeit.title%></h1>
+    <h1> 
+      <%= neuigkeit.title%>
+    </h1>
     <%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%>
+    </div>
+<% if neuigkeit.has_calentries? %>
+    <div class="pull-right" href="#">
+<%= image_tag("/iconnavy/time.png")  %>
+
+     <%=  neuigkeit.calentries.first.text %>
+    <% end %>
   </div>
 </div>