diff --git a/app/views/gremien/_form.html.erb b/app/views/gremien/_form.html.erb index d448de1..d253575 100644 --- a/app/views/gremien/_form.html.erb +++ b/app/views/gremien/_form.html.erb @@ -1,7 +1,7 @@ <%= semantic_form_for @gremium do |f| %> <%= f.inputs do %> <%= f.input :name %> - <%= f.input :desc %> + <%= f.input :desc, :as=>:tinymce_text %> <%= f.input :typ, :as => :select, :collection => Gremium::TYPEN.invert %> <%= f.input :geschlecht, :as => :select, :collection => Gremium::GESCHLECHT.invert %> <%= f.input :thema, :as=> :select, :collection => Thema.all %> @@ -41,3 +41,5 @@ <%= f.action :submit, :as => :input %> <% end %> <% end %> + +<%= tinymce %> diff --git a/app/views/gremien/show.html.erb b/app/views/gremien/show.html.erb index d87e96a..c08c3cd 100644 --- a/app/views/gremien/show.html.erb +++ b/app/views/gremien/show.html.erb @@ -9,8 +9,11 @@

<%= @gremium.desc %>

+<% unless @gremium.thema.nil? %> +

<%= link_to "Mehr zum Gremium lesen ..." ,themengruppe_path(@gremium.thema.themengruppe , {:thema=>@gremium.thema.id})%>

+<% end %> - + <% @gremium.memberships.order(:typ).active.each_slice(4) do |r| %>
<% r.each do |m| %> diff --git a/app/views/themengruppen/show.html.erb b/app/views/themengruppen/show.html.erb index b3b8d36..bb98d06 100644 --- a/app/views/themengruppen/show.html.erb +++ b/app/views/themengruppen/show.html.erb @@ -12,9 +12,15 @@ <%= thema.title %>
-
+
- <%= render :partial => 'themen/small', :object => thema %> + <% unless thema.gremium.nil? %> +

<%= link_to "Zu dem Gremium ..." , thema.gremium %> +

+<% end %> + <%= render :partial => 'themen/small', :object => thema %> + +