nettere Kalendereinttragsbearbeitung

app/views/calentries/_calentry.html.erb

@@ -0,0 +1,5 @@
+<div class="contentbox">
+<%= image_tag("/icon_kalender_small.png")  %>
+
+<%= link_to I18n.l(calentry.start) +" bis "+ I18n.l(calentry.ende), calendar_path(calentry.calendar) %>
+</div>

app/views/calentries/_nested_fields.html.erb

@@ -0,0 +1,9 @@
+<div class="row-fluid">
+<div class="span1"></div><div class="span1">
+<%= image_tag("/icon_kalender_small.png")  %>
+</div>
+<div class="span4">
+  <%= f.input :start, :as => :datepicker  %></div><div class="span4">
+	<%= f.input :dauer , :as => :string, :append=>"h"  %></div><div class="span1">
+	<%= f.input :typ %></div> <div class="span1"><%= f.check_box :_destroy %></div>
+     </div>

app/views/neuigkeiten/_form.html.erb

@@ -1,17 +1,31 @@
 <%= tinymce_assets %>
+<div class="container-fluid">
 <%= semantic_form_for [@neuigkeit.rubrik,@neuigkeit] do |f| %>
   <%= f.inputs do %>
+<div class="row-fluid">
+<div class="span12">
     <%= f.input :title,   :placeholder=> "Titel" %>
     <%= f.input :text,    :as=> :tinymce_text    %>
-    <%  f.input :datum,   :as=> :datepicker      %>
+</div>  
+</div>
+<div class="row-fluid">
+<div class="span6">
+  <%  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?          %>
+</div>  
+<div class="span6">  
+  <%= f.input :author,  :as=> :select           %>
+</div>  </div>  
+<div class="row-fluid">
+<div class="span12"> 
+   <%= f.input :picture, :as=> :file            %>
+  </div>  </div>  
+
+  <% unless @neuigkeit.calentry.nil?          %>
+
+ 
       <%= f.inputs :for => :calentry do |calentry| %>
-        <%= calentry.input :start, :as => :datepicker  %>
-	<%= calentry.input :dauer , :as => :string  %>
-	<%= calentry.input :typ %>
+      <%= render 'calentries/nested_fields', :f => calentry %> 
       <% end %>
     <% end %>
   <% end %>
@@ -19,5 +33,6 @@
     <%= f.action :submit, :as => :input %>
   <% end %>
 <% end %>
+</div>
 <script>$('.datepicker').datepicker()</script>
 <%= tinymce %>