r11510 - branches/2.0/apps/qubit/modules/search/templates

[correo]

Author: sevein
Date: Wed Apr 25 09:49:44 2012
New Revision: 11510

Log:
Issue 2288. Update advanced search fields markup.

Modified:
   branches/2.0/apps/qubit/modules/search/templates/_searchFields.php

Modified: branches/2.0/apps/qubit/modules/search/templates/_searchFields.php
==============================================================================
--- branches/2.0/apps/qubit/modules/search/templates/_searchFields.php  Wed Apr 
25 00:02:58 2012        (r11509)
+++ branches/2.0/apps/qubit/modules/search/templates/_searchFields.php  Wed Apr 
25 09:49:44 2012        (r11510)
@@ -1,19 +1,21 @@
+<?php $count = 0 ?>
+
 <?php if (isset($sf_request->searchFields)): ?>
 
   <?php foreach ($sf_request->searchFields as $key => $item): ?>
+
     <?php if (empty($item['query'])) continue ?>
-    <?php @$count++ ?>
-    <tr>
-      <td>
-        <select name="searchFields[<?php echo $key ?>][operator]">
-          <option value="and"<?php echo $item['operator'] == 'and' ? ' 
selected="selected"' : '' ?>><?php echo __('and') ?></option>
-          <option value="or"<?php echo $item['operator'] == 'or' ? ' 
selected="selected"' : '' ?>><?php echo __('or') ?></option>
-          <option value="not"<?php echo $item['operator'] == 'not' ? ' 
selected="selected"' : '' ?>><?php echo __('not') ?></option>
-        </select>
-      </td><td>
+    <?php $count++ ?>
+
+    <div class="criteria">
+
+      <div class="criterion form-inline">
+
         <input type="text" name="searchFields[<?php echo $key ?>][query]" 
value="<?php echo esc_entities($item['query']) ?>"/>
-      </td><td><?php echo __('in') ?>&nbsp;
-        <select style="width: 90%;" name="searchFields[<?php echo $key 
?>][field]">
+
+        <span><?php echo __('in') ?></span>
+
+        <select name="searchFields[<?php echo $key ?>][field]">
           <option value=""<?php echo $item['field'] == '' ? ' 
selected="selected"' : '' ?>><?php echo __('Any field') ?></option>
           <option value="title"<?php echo $item['field'] == 'title' ? ' 
selected="selected"' : '' ?>><?php echo __('Title') ?></option>
           <option value="creatorHistory"<?php echo $item['field'] == 
'creatorHistory' ? ' selected="selected"' : '' ?>><?php echo 
__('Admin/biographical history') ?></option>
@@ -25,32 +27,34 @@
           <option value="place"<?php echo $item['field'] == 'place' ? ' 
selected="selected"' : '' ?>><?php echo __('Place access points') ?></option>
           <option value="identifier"<?php echo $item['field'] == 'identifier' 
? ' selected="selected"' : '' ?>><?php echo __('Identifier') ?></option>
         </select>
-      </td><td><?php echo __('using') ?>&nbsp;
-        <select name="searchFields[<?php echo $key ?>][match]" style="width: 
100px;">
-          <option value="keyword"<?php echo $item['match'] == 'keyword' ? ' 
selected="selected"' : '' ?>><?php echo __('keyword') ?></option>
-          <option value="phrase"<?php echo $item['match'] == 'phrase' ? ' 
selected="selected"' : '' ?>><?php echo __('phrase') ?></option>
+
+      </div>
+
+      <div class="boolean form-inline">
+
+        <select name="searchFields[<?php echo $count ?>][operator]">
+          <option value="and"<?php echo $item['operator'] == 'and' ? ' 
selected="selected"' : '' ?>><?php echo __('and') ?></option>
+          <option value="or"<?php echo $item['operator'] == 'or' ? ' 
selected="selected"' : '' ?>><?php echo __('or') ?></option>
+          <option value="not"<?php echo $item['operator'] == 'not' ? ' 
selected="selected"' : '' ?>><?php echo __('not') ?></option>
         </select>
-      </td>
-    </tr>
-  <?php endforeach; ?>
 
-<?php else: ?>
+      </div>
+
+    </div>
 
-  <?php $count = 0 ?>
+  <?php endforeach; ?>
 
 <?php endif; ?>
 
-<tr>
-  <td>
-    <select name="searchFields[<?php echo $count ?>][operator]">
-      <option value="and"><?php echo __('and') ?></option>
-      <option value="or"><?php echo __('or') ?></option>
-      <option value="not"><?php echo __('not') ?></option>
-    </select>
-  </td><td>
-    <input type="text" name="searchFields[<?php echo $count ?>][query]"/>
-  </td><td><?php echo __('in') ?>&nbsp;
-    <select style="width: 90%;" name="searchFields[<?php echo $count 
?>][field]">
+<div class="criteria">
+
+  <div class="criterion form-inline">
+
+    <input type="text" class="input-xlarge" name="searchFields[<?php echo 
$count?>][query]"/>
+
+    <span><?php echo __('in') ?></span>
+
+    <select name="searchFields[<?php echo $count ?>][field]">
       <option value=""><?php echo __('Any field') ?></option>
       <option value="title"><?php echo __('Title') ?></option>
       <option value="creatorHistory"><?php echo __('Admin/biographical 
history') ?></option>
@@ -62,10 +66,17 @@
       <option value="place"><?php echo __('Place access points') ?></option>
       <option value="identifier"><?php echo __('Identifier') ?></option>
     </select>
-  </td><td><?php echo __('using') ?>&nbsp;
-    <select name="searchFields[<?php echo $count ?>][match]" style="width: 
100px;">
-      <option value="keyword"><?php echo __('keyword') ?></option>
-      <option value="phrase"><?php echo __('phrase') ?></option>
+
+  </div>
+
+  <div class="boolean form-inline">
+
+    <select name="searchFields[<?php echo $count ?>][operator]">
+      <option value="and"><?php echo __('and') ?></option>
+      <option value="or"><?php echo __('or') ?></option>
+      <option value="not"><?php echo __('not') ?></option>
     </select>
-  </td>
-</tr>
+
+  </div>
+
+</div>

-- 
You received this message because you are subscribed to the Google Groups 
"Qubit Toolkit Commits" group.
To post to this group, send email to qubit-commits@googlegroups.com.
To unsubscribe from this group, send email to 
qubit-commits+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/qubit-commits?hl=en.