From 1d7bd4e52491dd4a28865bb194e44660257e8530 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 20 Sep 2010 14:25:18 -0700 Subject: [PATCH] Use table row highlighting instead of images for deliniating query fragments. Fixes bug #11877. --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Asset/Shortcut.pm | 3 ++- www/extras/wobject/Shortcut/querybuilder.css | 12 +++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index abab56630..1b75aae02 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -14,6 +14,7 @@ - fixed #11866: Default ordering for Zip files is wrong - fixed: typo in the Gallery Add Archive default templateId. - fixed #11876: packing templates, snippets, headtags removes conditional CSS comments + - fixed #11877: Criteria Builder on "shortcut by alternate criteria" gets ugly with many checkbox items 7.10.0 - fixed #11812: Checking www_ajaxSave's response in the cart js, urlencoding post parameters diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm index 8ed480268..a91ac79a3 100644 --- a/lib/WebGUI/Asset/Shortcut.pm +++ b/lib/WebGUI/Asset/Shortcut.pm @@ -157,8 +157,9 @@ sub _drawQueryBuilder { # Table row with field info my $disabled = $self->{_disabled}; + my $odd_row = $i % 2 ? q{class="qbtr_alt"} : ""; $output .= qq| - +

$fieldLabel

$opField diff --git a/www/extras/wobject/Shortcut/querybuilder.css b/www/extras/wobject/Shortcut/querybuilder.css index 71f59fcc1..3bbf2cc21 100644 --- a/www/extras/wobject/Shortcut/querybuilder.css +++ b/www/extras/wobject/Shortcut/querybuilder.css @@ -1,20 +1,22 @@ +.qbtr_alt { + background-color:#DCE4EE; +} + .qbtd { - height: 20px; - background-image: url(hline.gif); padding-left: 5px; padding-right: 5px; + height: 20px; } .qbtdleft { - height: 20px; - background-image: url(hline.gif); padding-right: 5px; + height: 20px; } .qbtdright { - height: 20px; background-image: url(vline.gif); background-repeat: repeat-y; + height: 20px; align: right; }