small fixes rubriken und themen

This commit is contained in:
Andreas Stephanides
2014-04-11 13:02:00 +02:00
parent 9b6907f4cb
commit e9be76d6e4
8 changed files with 64 additions and 41 deletions

View File

@@ -1,7 +1,7 @@
<ul class="nav nav-tabs">
<li <%= 'class="active"'.html_safe if (request.fullpath == rubriken_path)%> >
<%= link_to I18n.t('rubriken.alle') , rubriken_path %> </li>
<% for r in Rubrik.all %>
<% for r in @rubriken %>
<% if can?(:show, r) %>
<li <%= (!@rubrik.nil? && r == @rubrik) ? 'class="active"'.html_safe : '' %> title="<%= r.name %>">
<%= link_to r.name, r %>

View File

@@ -31,7 +31,7 @@
</div>
<div class="span3">
<%= render 'calendars/calentries', :object=>@rubrik.calendar.calentries %>
<%= render 'calendars/calentries', :object=>@calentries %>
<%= link_to "ics-format", calendar_path(@rubrik.calendar,:format=>:ics) %>
</div>