Author: mj
Date: Mon Oct 24 13:36:06 2011
New Revision: 10173
Log:
Closes #2062, #2117.
Modified:
trunk/apps/qubit/modules/search/templates/_searchResults.php
trunk/plugins/qtTrilliumPlugin/modules/search/templates/_box.php
Modified: trunk/apps/qubit/modules/search/templates/_searchResults.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/_searchResults.php Mon Oct
24 12:21:11 2011 (r10172)
+++ trunk/apps/qubit/modules/search/templates/_searchResults.php Mon Oct
24 13:36:06 2011 (r10173)
@@ -1,17 +1,15 @@
<div id="search-stats">
- <?php echo __('Found %1% results in %2% seconds', array(
- '%1%' => $pager->getNbResults(),
- '%2%' => $timer->elapsed())) ?>
+ <?php if (0 < $pager->getNbResults()): ?>
+ <?php echo __('Results %1% to %2% of %3%', array('%1%' =>
$pager->getFirstIndice(), '%2%' => $pager->getLastIndice(), '%3%' =>
$pager->getNbResults())) ?>
+ <?php else: ?>
+ <?php echo __('No results') ?>
+ <?php endif; ?>
<?php if ('print' == $sf_request->getGetParameter('media') &&
$pager->haveToPaginate()): ?>
<?php echo __('(Only showing first %1% results for performance reasons)',
array('%1%' => $pager->maxPerPage)) ?>
<?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(); ?>
Modified: trunk/plugins/qtTrilliumPlugin/modules/search/templates/_box.php
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/modules/search/templates/_box.php Mon Oct
24 12:21:11 2011 (r10172)
+++ trunk/plugins/qtTrilliumPlugin/modules/search/templates/_box.php Mon Oct
24 13:36:06 2011 (r10173)
@@ -7,7 +7,8 @@
<input name="query"<?php if (isset($sf_request->query)) echo '
class="focused"' ?> value="<?php echo esc_entities($sf_request->query) ?>"/>
<input class="form-submit" type="submit" value="<?php echo __('Search')
?>"/>
<div class="advanced-search">
- <?php echo link_to(__('Advanced search'), array('module' => 'search',
'action' => 'advanced')) ?>
+ <?php echo link_to(__('Advanced search'), array('module' => 'search',
'action' => 'advanced'),
+ array('query_string' => (isset($sf_request->query))
? 'searchFields[0][query]=' . $sf_request->query : null)) ?>
</div>
</form>
</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 [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.
