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

neuigkeit tweak

Browse Source
This commit is contained in:
Andreas Stephanides
2013-08-23 17:56:56 +02:00
parent 2548ddb9ab
commit 7a8ca34a31
4 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,25 +1,15 @@
<div class="container-fluid">
<div class="row-fluid"> <div class="media">
<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>
</div>
</div>
<div class="row-fluid">
<div class="span12">
<div class="media">
<div class="pull-left" href="#"> <div class="pull-left" href="#">
<p><br><%= image_tag neuigkeit.picture.thumb.url %></p> <p><br><%= image_tag neuigkeit.picture.thumb.url unless neuigkeit.picture.url.nil? %></p>
</div> </div>
<div class="media-body"> <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> </div>
<h1><%= link_to neuigkeit.title,neuigkeit_path(neuigkeit) %></h1> <h1><%= link_to neuigkeit.title,neuigkeit_path(neuigkeit) %></h1>
<%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%> <%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%>
</div> <%= link_to "more" , neuigkeit_path(neuigkeit) %>
</div> <p></p>
</div>
</div> </div>
</div> </div>

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

@@ -9,21 +9,22 @@
<div class="span9"> <div class="span9">
<%= @neuigkeit.rubrik.name %> <%= @neuigkeit.rubrik.name %>
</div> </div>
<div class="span3"><p> <div class="span3">
<p>
<%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %> <%= @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> <%= "am " + I18n.l(@neuigkeit.try(:datum).try(:to_date)) unless @neuigkeit.try(:datum).try(:to_date).nil? %>
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<div class="media"> <div class="media">
<div class="pull-left" href="#"> <div class="pull-left" href="#">
<p><br><%= image_tag @neuigkeit.picture.big_thumb.url %></p> <p><br><%= link_to image_tag(@neuigkeit.picture.big_thumb.url),@neuigkeit.picture.url %></p>
</div> </div>
<div class="media-body"> <div class="media-body">
<h1><%= link_to @neuigkeit.title,neuigkeit_path(@neuigkeit) %></h1> <h1><%= link_to @neuigkeit.title,neuigkeit_path(@neuigkeit) %></h1>
<%= raw(@neuigkeit.text) %> <%= raw(@neuigkeit.text) %>
<p></p>
</div> </div>
</div> </div>
</div> </div>

3
app/views/rubriken/index.html.erb
View File

@@ -3,7 +3,8 @@
<% @rubriken.each do |rubrik| %> <% @rubriken.each do |rubrik| %>
<% rubrik.neuigkeiten.recent.each do |n| %> <% rubrik.neuigkeiten.recent.each do |n| %>
<li><%= link_to n.title+"("+rubrik.name+")" , n %> </li>
<li><%= render n %> </li>
<% end %> <% end %>
<%= link_to 'Weitere Artikel zu '+rubrik.name.to_s , rubrik %> <%= link_to 'Weitere Artikel zu '+rubrik.name.to_s , rubrik %>
<% end %> <% end %>

2
app/views/rubriken/show.html.erb
View File

@@ -21,7 +21,7 @@
<% row.each do |neuigkeit| %> <% row.each do |neuigkeit| %>
<div class="span6 min-width:13em;"> <div class="span6 min-width:13em;">
<%= render neuigkeit %> <%= render neuigkeit %>
<%= link_to "more" , neuigkeit_path(neuigkeit) %>
</div> </div>
<% end %> <% end %>
</div> </div>