Download as
Browse Code »

Commit 9231baf25d9576675ba31bcc380cc5813d6b9f07

Authored by Daniela Feitosa
2 parents 9ece558f d693abc4
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'fix-custom_forms-small-bugs' into 'master' 

custom_forms: small bug fixes in datepick and remove field

- Fixes slide up of field box when removing a field, since the outer
  box was being left behind and only the content was being slided up.
- Fixes date pick on Firefox/Iceweasel, which was not showing the date
  stored on the database and instead was always being initialized with
  the current date because the format with dashes '1995-12-17 03:24:00'
  is not a valid date format for Date(), while '1995-12-17T03:24:00' or
  '1995/12/17 03:24:00' are correct formats.

See merge request !703
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
plugins/custom_forms/public/field.js
  Diff comments   View file @9231baf
@@ -40,7 +40,7 @@ var customFormsPlugin = { @@ -40,7 +40,7 @@ var customFormsPlugin = {
40 if (confirm(confirmMsg)) { 40 if (confirm(confirmMsg)) {
41 fb = jQuery(button).closest('.field-box'); 41 fb = jQuery(button).closest('.field-box');
42 jQuery('input.destroy-field', fb).val(1); 42 jQuery('input.destroy-field', fb).val(1);
43 - jQuery('> div', fb).slideUp({easing:'linear', complete:function(){fb.slideUp({easing:'linear', duration:250})}}); 43 + jQuery(fb).slideUp(600, 'linear');
44 } 44 }
45 }, 45 },
46 46
plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
  Diff comments   View file @9231baf
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <%= required labelled_form_field _('Name'), f.text_field(:name) %> 5 <%= required labelled_form_field _('Name'), f.text_field(:name) %>
6 <%= labelled_form_field(_('What is the time limit for this form to be filled?'), ( 6 <%= labelled_form_field(_('What is the time limit for this form to be filled?'), (
7 date_range_field('form[begining]', 'form[ending]', @form.begining, @form.ending, 7 date_range_field('form[begining]', 'form[ending]', @form.begining, @form.ending,
8 - '%Y-%m-%d %H:%M', 8 + '%Y/%m/%d %H:%M',
9 { :time => true, :change_month => true, :change_year => true, 9 { :time => true, :change_month => true, :change_year => true,
10 :date_format => 'yy-mm-dd', :time_format => 'hh:mm' }, 10 :date_format => 'yy-mm-dd', :time_format => 'hh:mm' },
11 { :size => 14 }) 11 { :size => 14 })