Author: mj
Date: Mon Oct 24 11:40:00 2011
New Revision: 10170
Log:
Fixes to pager code in advanced search, search-replace
Modified:
trunk/apps/qubit/modules/search/templates/_searchResults.php
trunk/apps/qubit/modules/search/templates/advancedSuccess.php
trunk/apps/qubit/modules/search/templates/globalReplaceSuccess.php
trunk/apps/qubit/modules/search/templates/indexSuccess.php
Modified: trunk/apps/qubit/modules/search/templates/_searchResults.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/_searchResults.php Fri Oct
21 16:05:27 2011 (r10169)
+++ trunk/apps/qubit/modules/search/templates/_searchResults.php Mon Oct
24 11:40:00 2011 (r10170)
@@ -8,6 +8,10 @@
<?php endif; ?>
</div>
+<?php if ('print' != $sf_request->getGetParameter('media')): ?>
+ <?php echo get_partial('default/pager', array('pager' => $pager)) ?>
+<?php endif; ?>
+
<div class="section">
<?php foreach ($pager->getResults() as $hit): ?>
<?php $doc = $hit->getDocument(); ?>
@@ -72,3 +76,7 @@
</div>
<?php endforeach; ?>
</div>
+
+<?php if ('print' != $sf_request->getGetParameter('media')): ?>
+ <?php echo get_partial('default/pager', array('pager' => $pager)) ?>
+<?php endif; ?>
Modified: trunk/apps/qubit/modules/search/templates/advancedSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/advancedSuccess.php Fri Oct
21 16:05:27 2011 (r10169)
+++ trunk/apps/qubit/modules/search/templates/advancedSuccess.php Mon Oct
24 11:40:00 2011 (r10170)
@@ -29,7 +29,6 @@
<?php if (isset($pager)): ?>
- <?php echo get_partial('search/searchResults', array('pager' => $pager)) ?>
- <?php echo get_partial('default/pager', array('pager' => $pager)) ?>
+ <?php echo get_partial('search/searchResults', array('pager' => $pager,
'timer' => $timer)) ?>
<?php endif; ?>
\ No newline at end of file
Modified: trunk/apps/qubit/modules/search/templates/globalReplaceSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/globalReplaceSuccess.php Fri Oct
21 16:05:27 2011 (r10169)
+++ trunk/apps/qubit/modules/search/templates/globalReplaceSuccess.php Mon Oct
24 11:40:00 2011 (r10170)
@@ -89,7 +89,6 @@
<?php if (isset($pager) && !isset($form->confirm)): ?>
- <?php echo get_partial('search/searchResults', array('pager' => $pager)) ?>
- <?php echo get_partial('default/pager', array('pager' => $pager)) ?>
+ <?php echo get_partial('search/searchResults', array('pager' => $pager,
'timer' => $timer)) ?>
<?php endif; ?>
\ No newline at end of file
Modified: trunk/apps/qubit/modules/search/templates/indexSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/indexSuccess.php Fri Oct 21
16:05:27 2011 (r10169)
+++ trunk/apps/qubit/modules/search/templates/indexSuccess.php Mon Oct 24
11:40:00 2011 (r10170)
@@ -33,10 +33,6 @@
<?php echo get_partial('search/searchResults', array('pager' => $pager,
'timer' => $timer)) ?>
- <?php if ('print' != $sf_request->getGetParameter('media')): ?>
- <?php echo get_partial('default/pager', array('pager' => $pager)) ?>
- <?php endif; ?>
-
<?php endif; ?>
<?php endif; ?>
--
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.
