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) %> 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 @@