From d8ba29e6717a87cf5fc36309165c2802c9f6e061 Mon Sep 17 00:00:00 2001
From: Dan Scott <dscott@laurentian.ca>
Date: Tue, 24 Sep 2013 09:14:59 -0400
Subject: [PATCH] TPAC: Revert change to table layout in advanced search

We're throwing out the table layout entirely in the responsive TPAC
design. Attempts to fix the old broken design unfortunately get in the
way of a more responsive approach.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---
 Open-ILS/src/templates/opac/parts/advanced/search.tt2       | 8 +++-----
 Open-ILS/src/templates/opac/parts/coded_value_selector.tt2  | 1 -
 Open-ILS/src/templates/opac/parts/config.tt2                | 7 -------
 Open-ILS/src/templates/opac/parts/filter_group_selector.tt2 | 1 -
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Open-ILS/src/templates/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
index 0f8b43f9d6..56fd012123 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
@@ -44,9 +44,7 @@
         END; %]
             <td valign='top'[% IF adv_chunk.js_only %] 
                 id='adv_chunk_[% adv_chunk.adv_special %]' 
-                class='hidden'[% END %]
-		[% IF adv_chunk.colspan %]colspan='[% adv_chunk.colspan %]'[% END %]
-		[% IF adv_chunk.rowspan %]rowspan='[% adv_chunk.rowspan %]'[% END %]>
+                class='hidden'[% END %]>
                 <strong>[% adv_chunk.adv_label %]</strong><br />
 [%
         IF adv_chunk.adv_special;
@@ -97,10 +95,10 @@
             END;
         ELSIF adv_chunk.adv_attr;
             INCLUDE "opac/parts/coded_value_selector.tt2"
-                attr=adv_chunk.adv_attr multiple="multiple" size=adv_chunk.adv_size || search.default_adv_select_height || "4";
+                attr=adv_chunk.adv_attr multiple="multiple" size="4";
         ELSIF adv_chunk.adv_filter;
             INCLUDE "opac/parts/filter_group_selector.tt2"
-                filter_group=adv_chunk.adv_filter multiple="multiple" size=adv_chunk.adv_size || search.default_adv_select_height || "4";
+                filter_group=adv_chunk.adv_filter multiple="multiple" size="4";
         END; %]
             </td>
 [%
diff --git a/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2 b/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2
index 7e6beb8eed..7d7a03ad19 100644
--- a/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2
+++ b/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2
@@ -13,7 +13,6 @@
     name = name || "fi:" _ attr_class;
     id = id || attr_class _ "_selector";
     values = values || CGI.param(name); 
-    IF size AND size < 1; size = all_values.size; END;
 -%]
 
 <select id='[% id %]' name='[% name %]'[%
diff --git a/Open-ILS/src/templates/opac/parts/config.tt2 b/Open-ILS/src/templates/opac/parts/config.tt2
index 49e0e430cd..d798fb92b8 100644
--- a/Open-ILS/src/templates/opac/parts/config.tt2
+++ b/Open-ILS/src/templates/opac/parts/config.tt2
@@ -97,20 +97,16 @@ facet.default_display_count = 5;
 
 ##############################################################################
 # Define the advanced search limiters and labels.
-# Each entry is put into a table cell.
 # adv_label is the (translated) label for the limiter
 # adv_attr is an array of possible limiters, the first one that has any
 #   values will be used
 # adv_filter is the same as adv_attr, but for search filter groups
-# adv_size lets you set the height of the adv_attr or adv_filter select box.
-# if adv_size < 1, the box height is set to the number of options in it.
 # adv_break will end the current row. If specified with a label/attr it
 #   will do so *after* that limiter.
 # adv_special will drop in a special entry:
 #   lib_selector will put the search library box (with limit to available)
 #   pub_year will put the publication year box
 #   sort_selector will put the sort results selector
-# if present, colspan and rowspan will be used for the table cell.
 
 search.adv_config = [
     {adv_label => l("Item Type"), adv_attr => ["mattype", "item_type"]},
@@ -126,9 +122,6 @@ search.adv_config = [
     {adv_label => l("Sort Results"), adv_special => "sort_selector"},
 ];
 
-# Set the default height of the select boxes. Defaults to 4.
-#search.default_adv_select_height = 4;
-
 ##############################################################################
 # For each search box the default "query type" value can be specified here
 # This is the actual backend value, not the label
diff --git a/Open-ILS/src/templates/opac/parts/filter_group_selector.tt2 b/Open-ILS/src/templates/opac/parts/filter_group_selector.tt2
index 239516d96c..bede19e8ec 100644
--- a/Open-ILS/src/templates/opac/parts/filter_group_selector.tt2
+++ b/Open-ILS/src/templates/opac/parts/filter_group_selector.tt2
@@ -11,7 +11,6 @@
     id = id || group.code _ "_selector";
     class = class || '';
     values = values || CGI.param(name); 
-    IF size AND size < 1; size = group.entries.size; END;
 -%]
 
 <select id='[% id %]' class='[% class %]' name='[% name %]'[%
-- 
2.11.0