mehrere Termine je neuigkeit

app/views/calendars/index.html.erb

@@ -17,7 +17,7 @@
 	    <span class="pull-left" >
 	      <img class="media-object img-circle" src="<%= calendar.picture.thumb.url %>"/>
 	    </span>
-	    y<div class="media-body">
+	    <div class="media-body">
 	      <h4><%= calendar.name %></h4>
 	    </div>
 	  </div>

app/views/calendars/show.html.erb

@@ -24,7 +24,7 @@
 </div>
  <div class="row-fluid">
 <%= calendar @calendar.calentries do |entry| %>
-  <div><%= link_to entry.name.to_s, entry %></div>
+  <div><%= link_to entry.name.to_s, polymorphic_path(entry.object) %></div>
 <% end %>
 </div>
  <div class="row-fluid">

app/views/calentries/_calentry.html.erb

@@ -1,5 +1,9 @@
 <div class="contentbox">
 <%= image_tag("/icon_kalender_small.png")  %>
-
-<%= link_to I18n.l(calentry.start) +" bis "+ I18n.l(calentry.ende), calendar_path(calentry.calendar) %>
+<% if calentry.start.to_date == calentry.ende.to_date 
+format=:timeonly
+else
+format =:default
+end%>
+<%= link_to I18n.l(calentry.start) +" bis "+ I18n.l(calentry.ende,:format=>format), calendar_path(calentry.calendar) %>
 </div>

app/views/calentries/_nested_fields.html.erb

@@ -5,5 +5,5 @@
 <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>
+	<% f.input :typ %></div> <div class="span1"><%= f.check_box :_destroy %> <%= I18n.t 'common.delete' %></div>
      </div>

app/views/neuigkeiten/_form.html.erb

@@ -21,13 +21,13 @@
    <%= f.input :picture, :as=> :file            %>
   </div>  </div>  
 
-  <% unless @neuigkeit.calentry.nil?          %>
+  
 
  
-      <%= f.inputs :for => :calentry do |calentry| %>
+      <%= f.semantic_fields_for :calentries , @calentries do |calentry| %>
       <%= render 'calentries/nested_fields', :f => calentry %> 
       <% end %>
-    <% end %>
+   
   <% end %>
   <%= f.actions do %>
     <%= f.action :submit, :as => :input %>

app/views/neuigkeiten/show.html.erb

@@ -19,5 +19,7 @@
     <p></p>
   </div>
 </div>
-<%= render @neuigkeit.calentry unless @neuigkeit.calentry.nil? %>
+<% @calentries1.each do |ce|%>
+<%= render ce unless ce.nil? %>
+<% end %>
 <%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>

app/views/rubriken/_form.html.erb

@@ -3,7 +3,9 @@
     <%= f.input :name %>
     <%= f.input :desc %>
     <%= f.input :prio %>
-    <%= f.input :public %>
+    <%= f.input :public %>    
+  
+
   <% end %>
 
   <%= f.actions do %>

app/views/rubriken/show.html.erb

@@ -25,10 +25,9 @@
 <% end %>
 
 
+<br>
 
-    <%= link_to 'Verwalten', verwalten_rubrik_path(@rubrik) %> |
-    <%= link_to '<i class="icon-plus-sign"></i>'.html_safe+"Neuer Artikel", new_rubrik_neuigkeit_path(@rubrik) %> 
+<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
 
 
-<%= toolbar_html(@toolbar_elements)%>