From 7a8ca34a31d44ce522ef57ad9e3de9cecbdf93dc Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Fri, 23 Aug 2013 17:56:56 +0200
Subject: [PATCH] neuigkeit tweak

---
 app/views/neuigkeiten/_neuigkeit.html.erb | 32 ++++++++---------------
 app/views/neuigkeiten/show.html.erb       |  9 ++++---
 app/views/rubriken/index.html.erb         |  3 ++-
 app/views/rubriken/show.html.erb          |  2 +-
 4 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/app/views/neuigkeiten/_neuigkeit.html.erb b/app/views/neuigkeiten/_neuigkeit.html.erb
index 7a9d70e..57efadc 100755
--- a/app/views/neuigkeiten/_neuigkeit.html.erb
+++ b/app/views/neuigkeiten/_neuigkeit.html.erb
@@ -1,25 +1,15 @@
 
-<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>
+
+<div class="media">
+	<div class="pull-left" href="#">
+		<p><br><%= image_tag neuigkeit.picture.thumb.url  unless neuigkeit.picture.url.nil? %></p>
 	</div>
-  </div>
-  <div class="row-fluid">
-	<div class="span12">
-		<div class="media">
-		<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_first_words) unless neuigkeit.text.nil?%>
-		</div>
-		</div>
+	<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>
+		<%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%>
+		<%= link_to "more" , neuigkeit_path(neuigkeit) %>
+		<p></p>
 	</div>
-  </div>
 </div>
+
diff --git a/app/views/neuigkeiten/show.html.erb b/app/views/neuigkeiten/show.html.erb
index 7db3875..5ba4922 100755
--- a/app/views/neuigkeiten/show.html.erb
+++ b/app/views/neuigkeiten/show.html.erb
@@ -9,21 +9,22 @@
 	<div class="span9">
 		<%= @neuigkeit.rubrik.name %>
 			</div>
-	<div class="span3"><p>
-<p>
+	<div class="span3">
+
 		<%= @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 class="row-fluid">
 	<div class="span12">
 		<div class="media">
 		<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 class="media-body">
 			<h1><%= link_to @neuigkeit.title,neuigkeit_path(@neuigkeit)  %></h1>
 			<%= raw(@neuigkeit.text) %>
+			<p></p>
 		</div>
 	</div>
   </div>
diff --git a/app/views/rubriken/index.html.erb b/app/views/rubriken/index.html.erb
index 0403397..46de7f6 100755
--- a/app/views/rubriken/index.html.erb
+++ b/app/views/rubriken/index.html.erb
@@ -3,7 +3,8 @@
 <% @rubriken.each do |rubrik| %>
 
 <% rubrik.neuigkeiten.recent.each do |n| %>
-<li><%= link_to n.title+"("+rubrik.name+")" , n %> </li>
+
+<li><%= render n %> </li>
 <% end %>
 <%= link_to 'Weitere Artikel zu '+rubrik.name.to_s , rubrik %>   
 <% end %>
diff --git a/app/views/rubriken/show.html.erb b/app/views/rubriken/show.html.erb
index 380d922..d1e3110 100755
--- a/app/views/rubriken/show.html.erb
+++ b/app/views/rubriken/show.html.erb
@@ -21,7 +21,7 @@
 <% row.each do |neuigkeit| %>
 <div class="span6 min-width:13em;">
 <%= render neuigkeit %>
-<%= link_to "more" , neuigkeit_path(neuigkeit) %>
+
 </div>
 <% end %>
 </div>