small fixes rubriken und themen

app/views/rubriken/_tabs.html.erb

@@ -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 %>

app/views/rubriken/show.html.erb

@@ -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>
 

app/views/themen/verwalten.html.erb

@@ -20,5 +20,7 @@
 <h2><%= I18n.t('attachment.title')%>:</h2>
 <div id="attachmentform">
 </div>
+
 <%= link_to new_thema_attachment_path(@thema) ,:remote=>true do %> new Attachment <% end %>
 <%= render :partial => "themen/select", :object => @thema, :locals=>{:editor => :false} %>
+<%= link_to I18n.t('common.back'), themengruppen_path, :class=>:btn %>

app/views/themengruppen/show.html.erb

@@ -1,38 +1,38 @@
 <div class="content-wrap content-column" >
-<%= link_to fa_icon("arrow-circle-left 2x")+" Alle Themengruppen", themengruppen_path, :class=>"linkbox" %>
-<%= link_to fa_icon("question 2x")+" Häufige Fragen", faqs_themengruppen_path(:anchor=>"themengruppe_"+@themengruppe.id.to_s), :class=>"linkbox" %>
-<h1><%= @themengruppe.title %></h1>
-<p>
-  <%= @themengruppe.text %>
-</p>
-<ul class="unstyled linkbox-list" >
-  <% @themengruppe.themen.each do |thema| %>
-  <li>
-    <div class="contentbox">	
-      <%= render :partial => 'themen/small', :object => thema %>
-tools:
-      <% 
-	 @small_elements2 = []
-	 @small_elements2 << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('common.verwalten'), :path=>verwalten_thema_path(thema)} if can? :edit, thema 
+  <%= link_to fa_icon("arrow-circle-left 2x")+" Alle Themengruppen", themengruppen_path, :class=>"linkbox" %>
+  <%= link_to fa_icon("question 2x")+" Häufige Fragen", faqs_themengruppen_path(:anchor=>"themengruppe_"+@themengruppe.id.to_s), :class=>"linkbox" %>
+  <h1><%= @themengruppe.title %></h1>
+  <p>
+    <%= @themengruppe.text %>
+  </p>
+  <ul class="unstyled linkbox-list" >
+    <% @themengruppe.themen.each do |thema| %>
+    <li>
+      <div class="contentbox">	
+	<%= render :partial => 'themen/small', :object => thema %>
+	tools:
+	<% 
+	   @small_elements2 = []
+	   @small_elements2 << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('common.verwalten'), :path=>verwalten_thema_path(thema)} if can? :edit, thema 
 
-   %>
+	%>
 	<%= render :partial=>'layouts/pretty_toolbar', :object=>@small_elements2 unless @small_elements2.empty? %>
-<ul class="unstyled">
-	<% unless thema.gremium.nil? %>
-	
-	<li>
-	<%= link_to fa_icon("users 2x")+thema.gremium.name , thema.gremium,:class=>"linkbox" %>
-  </li>
-      <% end %>		
-     
-      <% thema.nlinks.each do |l| %> 
-<li><%= render l.neuigkeit %></li>
-      <% end %>
-</ul>
-    </div>
-  </li>
-  <% end %>
-</ul>
+	<ul class="unstyled">
+	  <% unless thema.gremium.nil? %>
+	  
+	  <li>
+	    <%= link_to fa_icon("users 2x")+thema.gremium.name , thema.gremium,:class=>"linkbox" %>
+	  </li>
+	  <% end %>		
+	  
+	  <% thema.nlinks.each do |l| %> 
+	  <li><%= render l.neuigkeit %></li>
+	  <% end %>
+	</ul>
+      </div>
+    </li>
+    <% end %>
+  </ul>
 
-<%= render :partial=>'layouts/pretty_toolbar' %>
+  <%= render :partial=>'layouts/pretty_toolbar' %>
 </div>