Merge pull request #2628 from differentreality/fixes

Fix datepicker for admin/conferences#edit

app/assets/javascripts/osem-datepickers.js

@@ -15,13 +15,13 @@ $(function () {
 
    $("#conference-start-datepicker").datetimepicker({
        useCurrent: false,
+       ignoreReadonly: true,
        format: "YYYY-MM-DD",
-       // conference-start-day >= Current_date
-       minDate : today
    });
 
    $("#conference-end-datepicker").datetimepicker({
        useCurrent: false,
+       ignoreReadonly: true,
        format: "YYYY-MM-DD"
    });
 

app/views/layouts/_user_menu.html.haml

@@ -23,8 +23,8 @@
   %li
     = link_to(conference_conference_registration_path(@conference)) do
       %span.fa.fa-id-badge
-        = @conference.short_title
-        registration
+      = @conference.short_title
+      registration
 -if @conference && @conference.program
   %li
     = link_to(conference_program_proposals_path(@conference.short_title)) do