diff --git a/app/controllers/fetprofiles_controller.rb b/app/controllers/fetprofiles_controller.rb index 587182a..79242f4 100644 --- a/app/controllers/fetprofiles_controller.rb +++ b/app/controllers/fetprofiles_controller.rb @@ -3,7 +3,7 @@ class FetprofilesController < ApplicationController # GET /fetprofiles.json def index - @fetprofiles = Fetprofile.active + @fetprofiles = Fetprofile.active.order(:vorname,:nachname) @fetprofiles = Fetprofile.order(:vorname,:nachname) if params[:filter]== "all" @gremientabs=Gremium.order(:typ) respond_to do |format| diff --git a/app/inputs/datepicker_input.rb b/app/inputs/datepicker_input.rb new file mode 100644 index 0000000..e91e71c --- /dev/null +++ b/app/inputs/datepicker_input.rb @@ -0,0 +1,6 @@ +class DatepickerInput < FormtasticBootstrap::Inputs::StringInput + def input_html_options + super.merge(:class => "datepicker") + end + +end diff --git a/app/views/calentries/_form.html.erb b/app/views/calentries/_form.html.erb index eb9bb02..f82c63b 100644 --- a/app/views/calentries/_form.html.erb +++ b/app/views/calentries/_form.html.erb @@ -6,7 +6,7 @@ <%= f.input :start , :as => :date_string %>
- <%= f.input :ende , :as => :date_string %> + <%= f.input :ende , :as => :datepicker %>
@@ -23,7 +23,7 @@
<% end %> -
+
<%= f.actions do %> <%= f.action :submit, :as => :input %> @@ -32,3 +32,4 @@
<% end %>
+ diff --git a/app/views/neuigkeiten/_form.html.erb b/app/views/neuigkeiten/_form.html.erb index 347cfdd..2c91a2e 100755 --- a/app/views/neuigkeiten/_form.html.erb +++ b/app/views/neuigkeiten/_form.html.erb @@ -3,7 +3,7 @@ <%= f.inputs do %> <%= f.input :title, :placeholder=>"Titel" %> <%= f.input :text, :as=>:tinymce_text %> - <% f.input :datum %> + <% f.input :datum, :as=>:datepicker %> <%= f.input :rubrik, :as=>:radio, :collection=>Rubrik.all %> <%= f.input :author, :as=>:radio %> <%= f.input :picture, :as=>:file %> @@ -13,4 +13,5 @@ <%= f.action :submit, :as => :input %> <% end %> <% end %> + <%= tinymce %>