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

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|

app/inputs/datepicker_input.rb

@@ -0,0 +1,6 @@
+class DatepickerInput < FormtasticBootstrap::Inputs::StringInput
+	def input_html_options
+		super.merge(:class => "datepicker")
+	end
+	
+end

app/views/calentries/_form.html.erb

@@ -6,7 +6,7 @@
     <%= f.input :start , :as => :date_string %>
  </div>
  <div class="span6">
-    <%= f.input :ende , :as => :date_string %>
+    <%= f.input :ende , :as => :datepicker %>
  </div>   
  </div>
  <div class="row-fluid">  
@@ -23,7 +23,7 @@
  </div>
  </div>
   <% end %>
-  <div class="row-fluid">
+  <div class="row-fluid"><script>$('.datepicker').datepicker()</script>
   <div class="span12">
   <%= f.actions do %>
     <%= f.action :submit, :as => :input %>
@@ -32,3 +32,4 @@
   </div>
 <% end %>
 </div>
+<script>$('.datepicker').datepicker()</script>

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 %>
+<script>$('.datepicker').datepicker()</script>
 <%= tinymce %>