Improve table display.

diff --git a/imp/js/DimpBase.js b/imp/js/DimpBase.js
index 8ded714..675c3ee 100644 (file)
--- a/imp/js/DimpBase.js
+++ b/imp/js/DimpBase.js
@@ -1784,7 +1784,7 @@ var DimpBase = {
 
         if (elt.readAttribute('name') == 'search_criteria' &&
             elt.descendantOf('RB_window')) {
-            elt.up().nextSiblings().invoke($F(elt) ? 'show' : 'hide');
+            elt.next().invoke($F(elt) ? 'show' : 'hide');
             RedBox.setWindowPosition();
         }
     },

diff --git a/imp/templates/search/search-basic.html b/imp/templates/search/search-basic.html
index 24d2cfc..e7ee193 100644 (file)
--- a/imp/templates/search/search-basic.html
+++ b/imp/templates/search/search-basic.html
@@ -16,13 +16,11 @@
     <option value="<tag:s_fields.val />"><tag:s_fields.label /></option>
 </loop:s_fields>
    </select>
-  </td>
-  <td<if:hide_criteria> style="display:none"</if:hide_criteria>>
-   <input type="text" name="search_criteria_text" size="40" />
-  </td>
-  <td<if:hide_criteria> style="display:none"</if:hide_criteria>>
-   <input type="checkbox" class="checkbox" name="search_criteria_not" />
-   <label for="search_criteria_not"><gettext>Do NOT Match</gettext></label>
+   <span<if:hide_criteria> style="display:none"</if:hide_criteria>>
+    <input type="text" name="search_criteria_text" size="30" />
+    <input type="checkbox" class="checkbox" name="search_criteria_not" />
+    <label for="search_criteria_not"><gettext>Do NOT Match</gettext></label>
+   </span>
   </td>
  </tr>
  <tr>
@@ -36,12 +34,10 @@
 </loop:f_fields>
    </select>
   </td>
-  <td></td>
-  <td></td>
  </tr>
 <if:advsearch>
 <tr>
-  <td colspan="5"><tag:advsearch /><gettext>Go to Advanced Search Page...</gettext></td>
+  <td colspan="2"><tag:advsearch /><gettext>Go to Advanced Search Page...</gettext></td>
  </tr>
 </if:advsearch>
 </table>