andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

fix neuigkeit

Browse Source
This commit is contained in:
Andreas Stephanides
2013-08-23 16:07:13 +02:00
parent ee7f06cb23
commit 2548ddb9ab
5 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,23 +1,25 @@
<div class="container-fluid"
<div class="container-fluid">
<div class="row-fluid">
<div class="span9">
<%= neuigkeit.rubrik.name %>
</div>
<div class="span3"><p>
<%= neuigkeit.author.email.to_s unless neuigkeit.try(:author).try(:email).to_s %> am
<%= I18n.l neuigkeit.try(:datum).try(:to_date) unless neuigkeit.try(:datum).try(:to_date).nil? %></p>
<%= neuigkeit.author.email.to_s unless neuigkeit.try(:author).try(:email).to_s %>
<%= "am "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil? %></p>
</div>
</div>
<div class="row-fluid">
<div class="span12">
<div class="media">
<div class="pull-right" href="#">
<div class="pull-left" href="#">
<p><br><%= image_tag neuigkeit.picture.thumb.url %></p>
</div>
<div class="media-body">
<h1><%= link_to neuigkeit.title,neuigkeit_path(neuigkeit) %></h1>
<%= raw(neuigkeit.text) %>
<%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%>
</div>
</div>
</div>
</div>
</div>

9
app/views/neuigkeiten/show.html.erb
View File

@@ -10,15 +10,16 @@
<%= @neuigkeit.rubrik.name %>
</div>
<div class="span3"><p>
<%= @neuigkeit.try(:author).email.to_s %> am
<%= I18n.l @neuigkeit.datum.to_date %></p>
<p>
<%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %>
<%= "am " + I18n.l(@neuigkeit.try(:datum).try(:to_date)) unless @neuigkeit.try(:datum).try(:to_date).nil? %></p>
</div>
</div>
<div class="row-fluid">
<div class="span12">
<div class="media">
<div class="pull-right" href="#">
<p><br><%= "FOTO" %></p>
<div class="pull-left" href="#">
<p><br><%= image_tag @neuigkeit.picture.big_thumb.url %></p>
</div>
<div class="media-body">
<h1><%= link_to @neuigkeit.title,neuigkeit_path(@neuigkeit) %></h1>