Issue #93 fixed

This commit is contained in:
Andreas Stephanides
2013-12-01 12:29:10 +01:00
parent 13dd45e783
commit c08bd75fe8
3 changed files with 15 additions and 4 deletions

View File

@@ -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 %>
<script>$('.datepicker').datepicker()</script>
<%= tinymce %>

View File

@@ -9,6 +9,9 @@
<p>
<%= @gremium.desc %>
</p>
<% unless @gremium.thema.nil? %>
<p><%= link_to "Mehr zum Gremium lesen ..." ,themengruppe_path(@gremium.thema.themengruppe , {:thema=>@gremium.thema.id})%></p>
<% end %>
</div>
<% @gremium.memberships.order(:typ).active.each_slice(4) do |r| %>

View File

@@ -12,9 +12,15 @@
<%= thema.title %>
</a>
</div>
<div id="collapse<%=thema.id%>" class="accordion-body collapse">
<div id="collapse<%=thema.id%>" class="accordion-body<%= 'collapse' unless params['thema']==thema.id %>">
<div class="accordion-inner">
<% unless thema.gremium.nil? %>
<p><%= link_to "Zu dem Gremium ..." , thema.gremium %>
</p>
<% end %>
<%= render :partial => 'themen/small', :object => thema %>
</div>
</div>
</div>