From 55b4102a684e0aed36dab41f728b99865b4af68e Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 18 Aug 2013 22:12:28 +0200
Subject: [PATCH] try fix tabs rubriken/calendar

---
 app/views/calendars/_tabs.html.erb | 2 +-
 app/views/rubriken/_tabs.html.erb  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/calendars/_tabs.html.erb b/app/views/calendars/_tabs.html.erb
index f9fe80f..07d259a 100644
--- a/app/views/calendars/_tabs.html.erb
+++ b/app/views/calendars/_tabs.html.erb
@@ -1,5 +1,5 @@
 <ul class="nav nav-tabs">
- <li <%= (request.fullpath == calendars_path)? 'class="active"'.html_safe : ''%> >
+ <li <%= (request.fullpath == "")? 'class="active"'.html_safe : ''%> >
  <%= link_to I18n.t 'calendars.alle' , calendars_path %> </li>
 <% for c in Calendar.all %>
   <li <%= (!@calendar.nil? && c == @calendar) ? 'class="active"'.html_safe : '' %> title="<%= c.name %>">
diff --git a/app/views/rubriken/_tabs.html.erb b/app/views/rubriken/_tabs.html.erb
index 86af436..04ed2a5 100644
--- a/app/views/rubriken/_tabs.html.erb
+++ b/app/views/rubriken/_tabs.html.erb
@@ -1,8 +1,8 @@
 <ul class="nav nav-tabs">
- <li <%= (request.fullpath == rubriken_path)? 'class="active"' : ''%> >
- <%= link_to I18n.t 'rubriken.alle' , calendars_path %> </li>
+ <li <%= (request.fullpath == rubriken_path)? 'class="active"'.html_safe : ''%> >
+ <%= link_to I18n.t ('rubriken.alle') , calendars_url %> </li>
 <% for r in Rubrik.all %>
-  <li <%= (!@rubrik.nil? && r == @rubrik) ? 'class="active"' : '' %> title="<%= r.name %>">
+  <li <%= (!@rubrik.nil? && r == @rubrik) ? 'class="active"'.html_safe : '' %> title="<%= r.name %>">
     <%= link_to r.name, r %>
     </li>
 <% end %>