Merge pull request #29 from finnlabs/fix/4179_duplicated_fieldset_readout

[Fix] 4179 duplicated fieldset readout
pull/6827/head
kgalli 11 years ago
commit 5bbbe15289
  1. 5
      lib/assets/stylesheets/reporting_engine/reporting.css.erb
  2. 5
      lib/widget/group_bys.rb

@ -292,6 +292,11 @@ fieldset#filters table td > label {
cursor: move;
}
fieldset.collapsible.header_collapsible legend.in_row {
width: inherit;
background-image: inherit;
}
/* have #content here to overwrite line-heigth of other themes through being more specific*/
#content .group_by_label {
margin: 0px;

@ -32,8 +32,7 @@ class Widget::GroupBys < Widget::Base
def render_group_caption(type)
content_tag :span do
out = content_tag :span, l("label_#{type}".to_sym), :class => 'in_row group_by_caption'
out += content_tag :span, :class => 'arrow in_row arrow_group_by_caption' do
out = content_tag :span, :class => 'arrow in_row arrow_group_by_caption' do
'' #cannot use tag here as it would generate <span ... /> which leads to wrong interpretation in most browsers
end
out.html_safe
@ -50,7 +49,7 @@ class Widget::GroupBys < Widget::Base
:class => 'drag_target drag_container',
:'data-initially-selected' => initially_selected.to_json.gsub('"', "'") do
out = content_tag :legend, l(:"label_#{type}"), :class => "hidden-for-sighted"
out = content_tag :legend, l(:"label_#{type}"), :class => 'in_row group_by_caption'
out += render_group_caption type

Loading…
Cancel
Save