From 69111eb8e7c849416e3d95623a9fb8d1aab4d782 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Mon, 24 Mar 2014 14:40:54 +0100
Subject: [PATCH] versions link fix

---
 app/views/layouts/_pretty_toolbar.html.erb | 16 +++++++++++-----
 app/views/neuigkeiten/show.html.erb        |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/_pretty_toolbar.html.erb b/app/views/layouts/_pretty_toolbar.html.erb
index 1a1f7c2..8922e02 100644
--- a/app/views/layouts/_pretty_toolbar.html.erb
+++ b/app/views/layouts/_pretty_toolbar.html.erb
@@ -17,13 +17,19 @@ Verwendung: Aufruf mit
 	Versionen<span class="caret"></span>
       </a>
       <ul class="dropdown-menu">
+	<li>	<%= link_to "active", t[:path]  %>
+	</li>
 	<% t[:versions].each_with_index do |v,i| %>
 	<li>
-<% 
-uri= URI.parse(t[:path]);
-uri.query= URI.encode_www_form(URI.decode_www_form(uri.query)<<["version",i.to_s])
-%>
-	  <%= link_to v[:created_at],uri.to_s ,:version=>v[:id]%>
+	  <% unless t[:path].nil?
+	     uri= URI.parse(t[:path]);
+	     q=[];
+	     q= q.merge(URI.decode_www_form(uri.query)) unless uri.query.nil?
+	    
+	     uri.query= URI.encode_www_form(q<<["version",i.to_s])
+									      %>
+	  <%= link_to I18n.l(v[:created_at]).to_s,uri.to_s ,:version=>v[:id] %>
+<% end %>
 	</li>
 	<% end %>    
       </ul>
diff --git a/app/views/neuigkeiten/show.html.erb b/app/views/neuigkeiten/show.html.erb
index 9781e9f..aade7be 100755
--- a/app/views/neuigkeiten/show.html.erb
+++ b/app/views/neuigkeiten/show.html.erb
@@ -11,7 +11,7 @@
 </span>
 <div class="media">
   <div class="pull-left" href="#">
-    <p><br><%= link_to image_tag(@neuigkeit.picture.big_thumb.url),@neuigkeit.picture.url  %>
+    <p><br><%= link_to image_tag(@neuigkeit.picture.big_thumb.url),@neuigkeit.picture.try(:url)  %>
     </p>
   </div>
   <div class="media-body">