bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Termin bei Neuigkeit anzeigen

Browse Source
This commit is contained in:
Andreas Stephanides
2013-12-04 11:04:49 +01:00
parent b21156f05c
commit 80fae06de5
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/calentry.rb
View File

@@ -57,6 +57,9 @@ end
summary summary
end end
end end
def text
I18n.l(self.start) +" bis "+ I18n.l(self.ende)
end
scope :public, -> { where(:public => :true) } scope :public, -> { where(:public => :true) }
scope :upcoming, -> { where("start >= ?" , Time.now).where("start <= ?", 8.days.from_now) } scope :upcoming, -> { where("start >= ?" , Time.now).where("start <= ?", 8.days.from_now) }
end end

2
app/views/calentries/_calentry.html.erb
View File

@@ -5,5 +5,5 @@ format=:timeonly
else else
format =:default format =:default
end%> 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> </div>

14
app/views/neuigkeiten/_neuigkeit.html.erb
View File

@@ -8,12 +8,20 @@
<div class="media-body"> <div class="media-body">
<div> <div>
<small><%= neuigkeit.rubrik.name %></small> <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> </div>
<h1><%= image_tag("/iconnavy/time.png") if neuigkeit.has_calentries? %> <h1>
<%= neuigkeit.title%></h1> <%= neuigkeit.title%>
</h1>
<%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%> <%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%>
</div> </div>
<% if neuigkeit.has_calentries? %>
<div class="pull-right" href="#">
<%= image_tag("/iconnavy/time.png") %>
<%= neuigkeit.calentries.first.text %>
<% end %>
</div>
</div> </div>
<% end %> <% end %>