[Git][noosfero/noosfero][master] 2 commits: Show one option per line in poll

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
8137ba2b by mendesiasmin at 2018-05-14T14:30:24Z
Show one option per line in poll

- - - - -
eae7f3db by Rodrigo Souto at 2018-05-15T16:44:01Z
Merge branch 'custom-forms-labels' into 'master'

Show one option per line in query forms

See merge request noosfero/noosfero!1487
- - - - -


2 changed files:

- plugins/custom_forms/lib/custom_forms_plugin/helper.rb
- plugins/custom_forms/public/style.scss


Changes:

=====================================
plugins/custom_forms/lib/custom_forms_plugin/helper.rb
=====================================
--- a/plugins/custom_forms/lib/custom_forms_plugin/helper.rb
+++ b/plugins/custom_forms/lib/custom_forms_plugin/helper.rb
@@ -103,19 +103,48 @@ module CustomFormsPlugin::Helper
     case field.show_as
     when 'select'
       selected = default_selected(field, answer)
-      select_tag form.to_s + "[#{field.id}]", options_for_select([['','']] + field.alternatives.map {|a| [a.label, a.id.to_s]}, selected), :disabled => display_disabled?(field, answer)
+      select_tag form.to_s + "[#{field.id}]",
+                 options_for_select([['','']] +
+                   field.alternatives.map {|a| [a.label, a.id.to_s]}, selected),
+                 :disabled => display_disabled?(field, answer)
+
     when 'multiple_select'
       selected = default_selected(field, answer)
-      select_tag form.to_s + "[#{field.id}]", options_for_select(field.alternatives.map{|a| [a.label, a.id.to_s]}, selected), :multiple => true, :title => _('Hold down Ctrl to select options'), :size => field.alternatives.size, :disabled => display_disabled?(field, answer)
+      select_tag form.to_s + "[#{field.id}]",
+                 options_for_select(field.alternatives.map{|a| [a.label, a.id.to_s]}, selected),
+                 :multiple => true, :title => _('Hold down Ctrl to select options'),
+                 :size => field.alternatives.size,
+                 :disabled => display_disabled?(field, answer)
+
     when 'check_box'
       field.alternatives.map do |alternative|
-        default = answer.present? ? answer.value.split(',').include?(alternative.id.to_s) : alternative.selected_by_default
-        labelled_check_box alternative.label, form.to_s + "[#{field.id}][#{alternative.id}]", '1', default, :disabled => display_disabled?(field, answer)
+        default = if answer.present?
+                    answer.value.split(',').include?(alternative.id.to_s)
+                  else
+                    alternative.selected_by_default
+                  end
+
+        content_tag(:div, (labelled_check_box alternative.label,
+                           form.to_s + "[#{field.id}][#{alternative.id}]",
+                           '1',
+                           default,
+                           :disabled => display_disabled?(field, answer)),
+                    :class => 'labelled-check')
       end.join("\n")
     when 'radio'
       field.alternatives.map do |alternative|
-        default = answer.present? ? answer.value == alternative.id.to_s : alternative.selected_by_default
-        labelled_radio_button alternative.label, form.to_s + "[#{field.id}]", alternative.id, default, :disabled => display_disabled?(field, answer)
+        default = if answer.present?
+                    answer.value == alternative.id.to_s
+                  else
+                    alternative.selected_by_default
+                  end
+
+        content_tag(:div, (labelled_radio_button alternative.label,
+                           form.to_s + "[#{field.id}]",
+                           alternative.id,
+                           default,
+                           :disabled => display_disabled?(field, answer)),
+                    :class => 'labelled-check')
       end.join("\n")
     end
   end


=====================================
plugins/custom_forms/public/style.scss
=====================================
--- a/plugins/custom_forms/public/style.scss
+++ b/plugins/custom_forms/public/style.scss
@@ -558,3 +558,7 @@ div.import-submissions, div.import-report {
     justify-content: space-between;
   }
 }
+
+div.labelled-check {
+  margin-bottom: 5px;
+}



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/42db84788c6e8cda0d85f74333c838285547efd7...eae7f3dbe5e6398be5735ad04dc5d94292ff668c

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/42db84788c6e8cda0d85f74333c838285547efd7...eae7f3dbe5e6398be5735ad04dc5d94292ff668c
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180515/99329a0c/attachment-0001.html>