From 2b483ae9e932438b598e9908787a96c50a5835d1 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Tue, 10 Feb 2015 14:04:18 +0100 Subject: [PATCH] themen auf eigenen seiten anzeigen --- app/controllers/themen_controller.rb | 2 +- app/views/themen/show.html.erb | 25 ++++++++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/controllers/themen_controller.rb b/app/controllers/themen_controller.rb index 3490b13..18b9dfb 100644 --- a/app/controllers/themen_controller.rb +++ b/app/controllers/themen_controller.rb @@ -14,7 +14,7 @@ class ThemenController < ApplicationController respond_to do |format| format.html { - redirect_to :controller=>'themengruppen', :id=>@thema.themengruppe.id, :action=>:show, :anchor=> "thema_"+params[:id].to_s +# redirect_to :controller=>'themengruppen', :id=>@thema.themengruppe.id, :action=>:show, :anchor=> "thema_"+params[:id].to_s } format.js end diff --git a/app/views/themen/show.html.erb b/app/views/themen/show.html.erb index 78a47ea..6d16cb7 100644 --- a/app/views/themen/show.html.erb +++ b/app/views/themen/show.html.erb @@ -1,8 +1,27 @@

<%= notice %>

<%= link_to "Zurück", @thema.themengruppe %>
-
-<%= render :partial=>"themen/small", :object=>@thema %> +<% thema=@thema %> +
+ <%= render :partial => 'themen/small', :object => thema %> +
    + <% unless thema.gremium.nil? %> +
  • + <%= link_to fa_icon("users 2x")+thema.gremium.name , thema.gremium,:class=>"linkbox" %> +
  • + <% end %> + + <% thema.nlinks.each do |l| %> +
  • + <%= render l.neuigkeit if can? :show, l.neuigkeit%> +
  • + <% end %> + +
-<%= render :partial=>'layouts/pretty_toolbar' %> + + + + +<% # render :partial=>'layouts/pretty_toolbar' %>