[Git][noosfero/noosfero][master] 2 commits: custom_forms: small bug fixes in datepick and remove field

[Daniela Feitosa]

Daniela Feitosa pushed to branch master at Noosfero / noosfero


Commits:
d693abc4 by Larissa Reis at 2015-10-08T22:59:11Z
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.

- - - - -
9231baf2 by Daniela Feitosa at 2015-10-09T02:25:23Z
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
- - - - -


2 changed files:

- plugins/custom_forms/public/field.js
- plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb


Changes:

=====================================
plugins/custom_forms/public/field.js
=====================================
--- 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');
     }
   },
 


=====================================
plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
=====================================
--- 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 })



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/9ece558f8c976f41aa8070835b5fdeb515774ab7...9231baf25d9576675ba31bcc380cc5813d6b9f07
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20151009/273e7fe0/attachment-0001.html>