Merge branch 'master' of https://github.com/fetsite/fetsite

app/controllers/calentries_controller.rb

@@ -35,10 +35,12 @@ class CalentriesController < ApplicationController
  # end
 
   # GET /calentries/1/edit
-  #def edit
+  def edit
-  #  @calentry = Calentry.find(params[:id])
+    @calentry = Calentry.find(params[:id])
-    
+    respond_to do |format|
- # end
+      format.html
+    end
+  end
 
   # POST /calentries
   # POST /calentries.json

app/views/beispiele/_form.html.erb

@@ -1,17 +1,15 @@
 
 <%= semantic_form_for @beispiel, :html => { :multipart => true } do |f| %>
 
-<%= f.inputs do %>
-
 <div class="row-fluid">
   <div class="span8">
     <div class="row-fluid">
   <div class="span6">
     <%= f.file_field :beispieldatei, :label=>"Beispiel"%>
   </div>
-    <%=f.input :datum%>
+  <%=f.input :datum , :as => :datetimepicker %>
     
-</div>
+    </div>
     
 <div class="row-fluid">
   <%= f.input :name %>
@@ -20,6 +18,10 @@
 </div>
 
 <%= f.hidden_field :beispieldatei_cache %>
+<%= f.actions do %>
+<%= f.action :submit, :as => :input %>
+
+<% end %>
 
     </div>
   <div class="span4">
@@ -30,12 +32,4 @@
 
 
 
-
-<% end %>    
-
-<%= f.actions do %>
-<%= f.action :submit, :as => :input %>
-
-<% end %>
-
 <% end %>

app/views/calentries/_calentry.html.erb

@@ -1,4 +1,4 @@
-<div class="contentbox">
+<div class="contentbox" id="calentry_<%= calentry.id%>">
 <% image_tag("/iconnavy/time.png")  %>
 <%= fa_icon("calendar 2x") %>
 
@@ -9,5 +9,5 @@ format =:default
 end%>
 <%= calentry.text %>
 
-
+<%= link_to "edit", edit_calentry_path(calentry) if can? :edit, calentry %>
 </div>