Author: david
Date: Mon Oct 24 17:26:29 2011
New Revision: 10181
Log:
Improvements to advanced search print view
Modified:
trunk/apps/qubit/modules/search/actions/advancedAction.class.php
trunk/apps/qubit/modules/search/templates/_advancedSearch.php
trunk/apps/qubit/modules/search/templates/_printAdvancedSearchTerms.php
trunk/apps/qubit/modules/search/templates/advancedSuccess.php
Modified: trunk/apps/qubit/modules/search/actions/advancedAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/search/actions/advancedAction.class.php Mon Oct
24 17:15:29 2011 (r10180)
+++ trunk/apps/qubit/modules/search/actions/advancedAction.class.php Mon Oct
24 17:26:29 2011 (r10181)
@@ -151,7 +151,7 @@
if (!empty($searchField['field']))
{
- $field = $searchField['field'];
+ $field = ucfirst($searchField['field']);
}
else
{
Modified: trunk/apps/qubit/modules/search/templates/_advancedSearch.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/_advancedSearch.php Mon Oct
24 17:15:29 2011 (r10180)
+++ trunk/apps/qubit/modules/search/templates/_advancedSearch.php Mon Oct
24 17:26:29 2011 (r10181)
@@ -1,3 +1,5 @@
+<?php echo $form->renderFormTag(url_for(array('module' => 'search', 'action'
=> 'advanced')), array('method' => 'get')) ?>
+
<div class="form-item form-item-identifier">
<table class="multiRow" style="white-space: nowrap;">
<tbody>
@@ -34,3 +36,5 @@
</div>
</div>
+
+</form>
Modified:
trunk/apps/qubit/modules/search/templates/_printAdvancedSearchTerms.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/_printAdvancedSearchTerms.php
Mon Oct 24 17:15:29 2011 (r10180)
+++ trunk/apps/qubit/modules/search/templates/_printAdvancedSearchTerms.php
Mon Oct 24 17:26:29 2011 (r10181)
@@ -1,9 +1,12 @@
-<h2><?php echo __('Search for') ?></h2>
-<ul>
-<?php $i = 0; foreach ($queryTerms as $item): ?>
- <li>
- <?php echo (0 < $i++) ?
'<strong>'.strtoupper($item['operator'])."</strong>\n" : '' ?>
- <?php echo $item['term'] ?>
- </li>
-<?php endforeach; ?>
-</ul>
+<h3><?php echo __('Search for') ?></h3>
+
+<div class="section search-terms">
+ <ul>
+ <?php $i = 0; foreach ($queryTerms as $item): ?>
+ <li>
+ <?php echo (0 < $i++) ?
'<strong>'.strtoupper($item['operator'])."</strong>\n" : '' ?>
+ <?php echo $item['term'] ?>
+ </li>
+ <?php endforeach; ?>
+ </ul>
+</div>
Modified: trunk/apps/qubit/modules/search/templates/advancedSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/advancedSuccess.php Mon Oct
24 17:15:29 2011 (r10180)
+++ trunk/apps/qubit/modules/search/templates/advancedSuccess.php Mon Oct
24 17:26:29 2011 (r10181)
@@ -18,8 +18,6 @@
</div>
</h1>
-<?php echo $form->renderFormTag(url_for(array('module' => 'search', 'action'
=> 'advanced')), array('method' => 'get')) ?>
-
<?php if ('print' != $sf_request->getParameter('media')): ?>
<?php echo get_partial('search/advancedSearch', array('form' => $form)) ?>
<?php else: ?>
@@ -36,8 +34,6 @@
<?php endif; ?>
-</form>
-
<?php if (isset($pager)): ?>
<?php echo get_partial('search/searchResults', array('pager' => $pager,
'timer' => $timer)) ?>
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
