bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

calentries -neuigkeiten calender fix

Browse Source
This commit is contained in:
Andreas Stephanides
2013-10-04 16:11:36 +02:00
parent 0fe92a4b48
commit 2e01fd574b
13 changed files with 63 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/calendars/_form.html.erb
View File

@@ -3,6 +3,7 @@
<%= f.input :name %>
<%= f.input :public %>
<%= f.input :picture, :as => :file %>
<%= f.input :rubrik %>
<% end %>
<%= f.actions do %>

12
app/views/fetprofiles/_form.html.erb
View File

@@ -31,10 +31,11 @@
<%= f.inputs :for => :memberships do |membership,i| %>
<div class="row-fluid">
<div class="span1"></div>
<div class="span3"><%= membership.input :start, :as=>:datepicker %></div>
<div class="span3"><%= membership.input :stop, :as=>:datepicker,:label=>false %></div>
<div class="span3"><%= membership. input :gremium %></div>
<div class="span2"><%= membership.input :typ ,:as=>:radio, :collection=>Membership::TYPEN.invert %></div>
<div class="span3"><%= membership.input :start, :as=>:datepicker, :prepend=>"von",:label=>false%></div>
<div class="span3"><%= membership.input :stop, :as=>:datepicker,:label=>false, :prepend =>"bis" %></div>
<div class="span2"><%= membership.input :typ ,:as=>:select, :collection=>Membership::TYPEN.invert, :label=>false %></div>
<div class="span3"><%= membership.input :gremium, :label=>false %></div>
</div>
<% end %>
@@ -47,4 +48,7 @@
</div>
</div>
<% end %>
<script>$('.datepicker').datepicker()</script>
</div>

25
app/views/neuigkeiten/_form.html.erb
View File

@@ -1,19 +1,20 @@
<%= tinymce_assets %>
<%= semantic_form_for [@neuigkeit.rubrik,@neuigkeit] do |f| %>
<%= f.inputs do %>
<%= f.input :title, :placeholder=>"Titel" %>
<%= f.input :text, :as=>:tinymce_text %>
<% f.input :datum, :as=>:datepicker %>
<%= f.input :rubrik, :as=>:radio, :collection=>Rubrik.all %>
<%= f.input :author, :as=>:radio %>
<%= f.input :picture, :as=>:file %>
<%= f.inputs :for => :calentry do |calentry| %>
<%= calentry.input :start, :as =>:datepicker %>
<%= calentry.input :ende, :as =>:datepicker %>
<%= calentry.input :typ %>
<%= f.input :title, :placeholder=> "Titel" %>
<%= f.input :text, :as=> :tinymce_text %>
<% f.input :datum, :as=> :datepicker %>
<%= f.input :rubrik, :as=> :radio, :collection=>Rubrik.all %>
<%= f.input :author, :as=> :radio %>
<%= f.input :picture, :as=> :file %>
<% unless @neuigkeit.calentry.nil? %>
<%= f.inputs :for => :calentry do |calentry| %>
<%= calentry.input :start, :as => :datepicker %>
<%= calentry.input :ende , :as => :datepicker %>
<%= calentry.input :typ %>
<% end %>
<% end %>
<% end %>
<% end %>
<%= f.actions do %>
<%= f.action :submit, :as => :input %>
<% end %>

2
app/views/neuigkeiten/new.html.erb
View File

@@ -1,4 +1,4 @@
<h1><%=I18n.t("neuigkeit.new.title") %></h1>
<h1><%= I18n.t("neuigkeit.new.title") %></h1>
<%= render 'form' %>