From d693abc49c4fcdeb851db093c1c437ac52b9e857 Mon Sep 17 00:00:00 2001 From: Larissa Reis Date: Thu, 8 Oct 2015 22:49:51 -0300 Subject: [PATCH] custom_forms: small bug fixes in datepick and remove field --- plugins/custom_forms/public/field.js | 2 +- plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/custom_forms/public/field.js b/plugins/custom_forms/public/field.js index 9f9a0b2..c0579a5 100644 --- a/plugins/custom_forms/public/field.js +++ b/plugins/custom_forms/public/field.js @@ -40,7 +40,7 @@ var customFormsPlugin = { if (confirm(confirmMsg)) { fb = jQuery(button).closest('.field-box'); jQuery('input.destroy-field', fb).val(1); - jQuery('> div', fb).slideUp({easing:'linear', complete:function(){fb.slideUp({easing:'linear', duration:250})}}); + jQuery(fb).slideUp(600, 'linear'); } }, diff --git a/plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb b/plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb index d4d321d..c6b1c3b 100644 --- a/plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb +++ b/plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb @@ -5,7 +5,7 @@ <%= required labelled_form_field _('Name'), f.text_field(:name) %> <%= labelled_form_field(_('What is the time limit for this form to be filled?'), ( date_range_field('form[begining]', 'form[ending]', @form.begining, @form.ending, - '%Y-%m-%d %H:%M', + '%Y/%m/%d %H:%M', { :time => true, :change_month => true, :change_year => true, :date_format => 'yy-mm-dd', :time_format => 'hh:mm' }, { :size => 14 }) -- libgit2 0.21.2