Author: sevein
Date: Mon Sep 28 20:35:58 2009
New Revision: 3584
Log:
Remove sort logic and display from list templates (informationobject,
digitalobject, actor, repository, user, term, taxonomy and search). Fixes issue
989.
Modified:
trunk/apps/qubit/modules/actor/templates/listSuccess.php
trunk/apps/qubit/modules/digitalobject/actions/listAction.class.php
trunk/apps/qubit/modules/digitalobject/templates/listSuccess.php
trunk/apps/qubit/modules/informationobject/templates/listSuccess.php
trunk/apps/qubit/modules/repository/templates/listSuccess.php
trunk/apps/qubit/modules/search/templates/recentUpdatesSuccess.php
trunk/apps/qubit/modules/term/actions/listAction.class.php
trunk/apps/qubit/modules/term/templates/listSuccess.php
trunk/apps/qubit/modules/term/templates/listTaxonomySuccess.php
Modified: trunk/apps/qubit/modules/actor/templates/listSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/actor/templates/listSuccess.php Mon Sep 28
17:42:32 2009 (r3583)
+++ trunk/apps/qubit/modules/actor/templates/listSuccess.php Mon Sep 28
20:35:58 2009 (r3584)
@@ -1,40 +1,27 @@
<div class="pageTitle"><?php echo __('list %1%', array('%1%' =>
sfConfig::get('app_ui_label_actor'))) ?></div>
-<table class="list"><thead><tr>
- <th>
- <?php if ('nameUp' == $sf_request->sort): ?>
- <?php echo link_to(__('name'), array('sort' => 'nameDown') +
$sf_request->getParameterHolder()->getAll()) ?>
- <?php echo image_tag('up.gif', array('style' => 'padding-bottom: 3px'),
__('Sort up')) ?>
- <?php else: ?>
- <?php echo link_to(__('name'), array('sort' => 'nameUp') +
$sf_request->getParameterHolder()->getAll()) ?>
- <?php endif; ?>
- <?php if ('nameDown' == $sf_request->sort): ?>
- <?php echo image_tag('down.gif', array('style' => 'padding-bottom:
3px'), __('Sort down')) ?>
- <?php endif; ?>
- <?php if (SecurityPriviliges::editCredentials($sf_user, 'actor')): ?>
- <span class="th-link"><?php echo link_to(__('add new'), array('module'
=> 'actor', 'action' => 'create')) ?></span>
- <?php endif; ?>
- </th><th>
- <?php if ('typeDown' == $sf_request->sort): ?>
- <?php echo link_to(__('type'), array('sort' => 'typeUp') +
$sf_request->getParameterHolder()->getAll()) ?>
- <?php echo image_tag('down.gif', array('style' => 'padding-bottom:
3px'), __('Sort down')) ?>
- <?php else: ?>
- <?php echo link_to(__('type'), array('sort' => 'typeDown') +
$sf_request->getParameterHolder()->getAll()) ?>
- <?php endif; ?>
- <?php if ('typeUp' == $sf_request->sort): ?>
- <?php echo image_tag('up.gif', array('style' => 'padding-bottom: 3px'),
__('Sort up')) ?>
- <?php endif; ?>
- </th>
-</tr></thead><tbody><?php foreach ($actors as $actor): ?><tr>
- <td>
-
- <div>
- <?php echo link_to(render_title($actor), array('module' => 'actor',
'action' => 'show', 'id' => $actor->id)) ?>
- </div>
- </td><td>
- <?php echo $actor->entityType ?>
+<table class="list">
+<thead>
+ <tr>
+ <th>
+ <?php echo __('name'); ?>
+ <?php if (SecurityPriviliges::editCredentials($sf_user, 'actor')): ?>
+ <span class="th-link"><?php echo link_to(__('add new'), array('module'
=> 'actor', 'action' => 'create')) ?></span>
+ <?php endif; ?>
+ </th>
+ <th><?php echo __('type'); ?></th>
+ </tr>
+</thead>
+<tbody>
+<?php foreach ($actors as $actor): ?>
+ <tr>
+ <td>
+ <div><?php echo link_to(render_title($actor), array('module' => 'actor',
'action' => 'show', 'id' => $actor->id)) ?></div>
</td>
-</tr><?php endforeach; ?></tbody></table>
+ <td><?php echo $actor->entityType ?></td>
+ </tr><?php endforeach; ?>
+</tbody>
+</table>
<?php echo get_partial('default/pager', array('pager' => $pager)) ?>
Modified: trunk/apps/qubit/modules/digitalobject/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/actions/listAction.class.php Mon Sep
28 17:42:32 2009 (r3583)
+++ trunk/apps/qubit/modules/digitalobject/actions/listAction.class.php Mon Sep
28 20:35:58 2009 (r3584)
@@ -32,16 +32,6 @@
*/
public function execute($request)
{
- if ($this->getRequestParameter('sort'))
- {
- $this->sort = $this->getRequestParameter('sort');
- }
- else
- {
- //default sort column for list view
- $this->sort = 'nameUp';
- }
-
// Build funky join query to get a count of top level digital objects
// for each media type (term)
$criteria = new Criteria;
@@ -49,23 +39,7 @@
$criteria->addJoin(QubitTerm::ID, QubitDigitalObject::MEDIA_TYPE_ID,
Criteria::LEFT_JOIN);
$criteria->addAsColumn('hits', 'COUNT('.QubitDigitalObject::ID.')');
$criteria->addGroupByColumn(QubitTerm::ID);
-
- // Sort the list
- switch ($this->sort)
- {
- case 'nameUp':
- $criteria->addAscendingOrderByColumn('name');
- break;
- case 'nameDown':
- $criteria->addDescendingOrderByColumn('name');
- break;
- case 'hitsUp':
- $criteria->addAscendingOrderByColumn('hits');
- break;
- case 'hitsDown':
- $criteria->addDescendingOrderByColumn('hits');
- break;
- }
+ $criteria->addAscendingOrderByColumn('name');
// Add I18n fallback
$options = array();
Modified: trunk/apps/qubit/modules/digitalobject/templates/listSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/templates/listSuccess.php Mon Sep
28 17:42:32 2009 (r3583)
+++ trunk/apps/qubit/modules/digitalobject/templates/listSuccess.php Mon Sep
28 20:35:58 2009 (r3584)
@@ -1,29 +1,11 @@
<div class="pageTitle"><?php echo __('list %1%', array('%1%' =>
sfConfig::get('app_ui_label_mediatype'))) ?></div>
-<table class="list"><thead><tr>
- <th>
- <?php if ($sort == 'nameUp'): ?>
- <?php echo link_to(__('name'), 'digitalobject/list?sort=nameDown') ?>
- <?php echo image_tag('up.gif', 'style="padding-bottom: 3px;"', 'sort up')
?>
- <?php else: ?>
- <?php echo link_to(__('name'), 'digitalobject/list?sort=nameUp') ?>
- <?php endif; ?>
- <?php if ($sort == 'nameDown'): ?>
- <?php echo image_tag('down.gif', 'style="padding-bottom: 3px;"', 'sort
down') ?>
- <?php endif; ?>
- </th>
- <th>
- <?php if ($sort == 'hitsUp'): ?>
- <?php echo link_to(__('results'), 'digitalobject/list?sort=hitsDown') ?>
- <?php echo image_tag('up.gif', 'style="padding-bottom: 3px;"', 'sort up')
?>
- <?php else: ?>
- <?php echo link_to(__('results'), 'digitalobject/list?sort=hitsUp') ?>
- <?php endif; ?>
- <?php if ($sort == 'hitsDown'): ?>
- <?php echo image_tag('down.gif', 'style="padding-bottom: 3px;"', 'sort
down') ?>
- <?php endif; ?>
- </th>
-</tr>
+<table class="list">
+<thead>
+ <tr>
+ <th><?php echo __('name'); ?></th>
+ <th><?php echo __('results'); ?></th>
+ </tr>
</thead>
<tbody>
Modified: trunk/apps/qubit/modules/informationobject/templates/listSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/listSuccess.php
Mon Sep 28 17:42:32 2009 (r3583)
+++ trunk/apps/qubit/modules/informationobject/templates/listSuccess.php
Mon Sep 28 20:35:58 2009 (r3584)
@@ -2,42 +2,19 @@
<table class="list">
<thead>
-<tr>
- <th><?php if ('titleUp' == $sf_request->sort): ?>
- <?php echo link_to(__('title'), array('sort' => 'titleDown') +
$sf_request->getParameterHolder()->getAll()) ?>
- <?php echo image_tag('up.gif', 'style="padding-bottom: 3px;"', __('Sort
up')) ?>
- <?php else: ?>
- <?php echo link_to(__('title'), array('sort' => 'titleUp') +
$sf_request->getParameterHolder()->getAll()) ?>
- <?php endif; ?>
-
- <?php if ('titleDown' == $sf_request->sort): ?>
- <?php echo image_tag('down.gif', 'style="padding-bottom: 3px;"', __('Sort
down')) ?>
- <?php endif; ?>
-
- <?php if (SecurityPriviliges::editCredentials($sf_user,
'informationObject')): ?>
- <span class="th-link"><?php echo link_to(__('add new'), array('module' =>
'informationobject', 'action' => 'create', 'parent' => url_for(array('module'
=> 'informationobject', 'action' => 'show', 'id' => $informationObject->id))))
?></span>
- <?php endif; ?>
- </th>
-
- <?php if (sfConfig::get('app_multi_repository')): ?>
- <th>
- <?php if ('repositoryUp' == $sf_request->sort): ?>
- <?php echo link_to(__(sfConfig::get('app_ui_label_repository')),
array('sort' => 'repositoryDown') +
$sf_request->getParameterHolder()->getAll()) ?>
- <?php echo image_tag('up.gif', 'style="padding-bottom: 3px;"', __('Sort
up')) ?>
- <?php else: ?>
- <?php echo link_to(__(sfConfig::get('app_ui_label_repository')),
array('sort' => 'repositoryUp') + $sf_request->getParameterHolder()->getAll())
?>
- <?php endif; ?>
-
- <?php if ('repositoryDown' == $sf_request->sort): // multi-repository:
show repository (w/ sorting) ?>
- <?php echo image_tag('down.gif', 'style="padding-bottom: 3px;"',
__('Sort down')) ?>
- <?php endif; ?>
- </th>
- <?php else: // NOT multi-repostiory: show creators (no sorting,
multi-value) ?>
+ <tr>
<th>
- <?php echo __('creator(s)') ?>
+ <?php echo __('title'); ?>
+ <?php if (SecurityPriviliges::editCredentials($sf_user,
'informationObject')): ?>
+ <span class="th-link"><?php echo link_to(__('add new'), array('module'
=> 'informationobject', 'action' => 'create', 'parent' =>
url_for(array('module' => 'informationobject', 'action' => 'show', 'id' =>
$informationObject->id)))) ?></span>
+ <?php endif; ?>
</th>
+ <?php if (sfConfig::get('app_multi_repository')): ?>
+ <th><?php echo __(sfConfig::get('app_ui_label_repository')); ?></th>
+ <?php else: // NOT multi-repostiory: show creators ?>
+ <th><?php echo __('creator(s)') ?></th>
<?php endif; ?>
-</tr>
+ </tr>
</thead>
<tbody>
<?php foreach ($informationObjects as $informationObject): ?>
Modified: trunk/apps/qubit/modules/repository/templates/listSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/repository/templates/listSuccess.php Mon Sep
28 17:42:32 2009 (r3583)
+++ trunk/apps/qubit/modules/repository/templates/listSuccess.php Mon Sep
28 20:35:58 2009 (r3584)
@@ -2,58 +2,16 @@
<table class="list">
<thead>
-<tr>
- <th><?php if ('nameUp' == $sf_request->sort): ?>
- <?php echo link_to(__('name'), array('sort' => 'nameDown') +
$sf_request->getParameterHolder()->getAll()) ?>
- <?php echo image_tag('up.gif', 'style="padding-bottom: 3px;"', __('Sort
up')) ?>
- <?php else: ?>
- <?php echo link_to(__('name'), array('sort' => 'nameUp') +
$sf_request->getParameterHolder()->getAll()) ?>
- <?php endif; ?>
-
- <?php if ('nameDown' == $sf_request->sort): ?>
- <?php echo image_tag('down.gif', 'style="padding-bottom: 3px;"', __('Sort
down')) ?>
- <?php endif; ?>
-
- <?php if (SecurityPriviliges::editCredentials($sf_user, 'repository')): ?>
- <span class="th-link"><?php echo link_to(__('add new'), array('module' =>
'repository', 'action' => 'create')) ?></span>
- <?php endif; ?>
- </th>
-
- <th><?php if ('typeUp' == $sf_request->sort): ?>
- <?php echo link_to(__('type'), array('sort' => 'typeDown') +
$sf_request->getParameterHolder()->getAll()) ?>
- <?php echo image_tag('up.gif', 'style="padding-bottom: 3px;"', __('Sort
up')) ?>
- <?php else: ?>
- <?php echo link_to(__('type'), array('sort' => 'typeUp') +
$sf_request->getParameterHolder()->getAll()) ?>
- <?php endif; ?>
-
- <?php if ('typeDown' == $sf_request->sort): ?>
- <?php echo image_tag('down.gif', 'style="padding-bottom: 3px;"', __('Sort
down')) ?>
- <?php endif; ?>
- </th>
-
- <th>
- <?php if ('countryDown' == $sf_request->sort): ?>
- <?php echo __('country') ?>
-
- <!-- hide sort option until it is working...
- <?php echo link_to(__('country'), array('sort' => 'countryUp') +
$sf_request->getParameterHolder()->getAll()) ?>
- <?php echo image_tag('down.gif', 'style="padding-bottom: 3px;"', __('Sort
down')) ?>
- -->
- <?php else: ?>
- <?php echo __('country') ?>
- <!-- hide sort option until it is working...
- <?php echo link_to(__('country'), array('sort' => 'countryDown') +
$sf_request->getParameterHolder()->getAll()) ?>
- -->
- <?php endif; ?>
-
- <?php if ('countryUp' == $sf_request->sort): ?>
- <!-- hide sort option until it is working...
- <?php echo image_tag('up.gif', 'style="padding-bottom: 3px;"', __('Sort
up')) ?>
- -->
- <?php endif; ?>
- </th>
-
-</tr>
+ <tr>
+ <th>
+ <?php echo __('name'); ?>
+ <?php if (SecurityPriviliges::editCredentials($sf_user, 'repository')):
?>
+ <span class="th-link"><?php echo link_to(__('add new'), array('module'
=> 'repository', 'action' => 'create')) ?></span>
+ <?php endif; ?>
+ </th>
+ <th><?php echo __('type'); ?></th>
+ <th><?php echo __('country') ?></th>
+ </tr>
</thead>
<tbody>
<?php foreach ($repositories as $repository): ?>
Modified: trunk/apps/qubit/modules/search/templates/recentUpdatesSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/recentUpdatesSuccess.php Mon Sep
28 17:42:32 2009 (r3583)
+++ trunk/apps/qubit/modules/search/templates/recentUpdatesSuccess.php Mon Sep
28 20:35:58 2009 (r3584)
@@ -14,42 +14,15 @@
<table class="list">
<thead>
-<tr>
- <th>
- <?php if ($sort == 'nameUp'): ?>
- <?php echo link_to(__($nameColumnDisplay), array_merge($defaultParamList,
array('sort' => 'nameDown'))) ?>
- <?php echo image_tag('up.gif', 'style="padding-bottom: 3px;"', 'sort up')
?>
- <?php else: ?>
- <?php echo link_to(__($nameColumnDisplay), array_merge($defaultParamList,
array('sort' => 'nameUp'))) ?>
- <?php endif; ?>
- <?php if ($sort == 'nameDown'): ?>
- <?php echo image_tag('down.gif', 'style="padding-bottom: 3px;"', 'sort
down') ?>
- <?php endif; ?>
- </th>
-
- <?php if('informationobject' == $objectType && 0 <
sfConfig::get('app_multi_repository')): ?>
- <th>
- <?php echo __('repository') ?>
- </th>
- <?php elseif('term' == $objectType): ?>
- <th>
- <?php echo __('taxonomy') ?>
- </th>
- <?php endif; ?>
-
- <th style="width: 110px">
- <?php if ($sort == 'updatedDown'): ?>
- <?php echo link_to(__('updated'), array_merge($defaultParamList,
array('sort' => 'updatedUp'))) ?>
- <?php echo image_tag('down.gif', 'style="padding-bottom: 3px;"', 'sort
down') ?>
- <?php else: ?>
- <?php echo link_to(__('updated'), array_merge($defaultParamList,
array('sort' => 'updatedDown'))) ?>
- <?php endif; ?>
-
- <?php if ($sort == 'updatedUp'): ?>
- <?php echo image_tag('up.gif', 'style="padding-bottom: 3px;"', 'sort up')
?>
- <?php endif; ?>
- </th>
-</tr>
+ <tr>
+ <th><?php echo __($nameColumnDisplay); ?></th>
+ <?php if('informationobject' == $objectType && 0 <
sfConfig::get('app_multi_repository')): ?>
+ <th><?php echo __('repository') ?></th>
+ <?php elseif('term' == $objectType): ?>
+ <th><?php echo __('taxonomy'); ?></th>
+ <?php endif; ?>
+ <th style="width: 110px"><?php echo __('updated'); ?></th>
+ </tr>
</thead>
<tbody>
<?php foreach ($pager->getResults() as $result): ?>
Modified: trunk/apps/qubit/modules/term/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/term/actions/listAction.class.php Mon Sep 28
17:42:32 2009 (r3583)
+++ trunk/apps/qubit/modules/term/actions/listAction.class.php Mon Sep 28
20:35:58 2009 (r3584)
@@ -88,15 +88,6 @@
protected function htmlResponse($request)
{
- if ($this->hasRequestParameter('sort'))
- {
- $this->sort = $this->getRequestParameter('sort');
- }
- else
- {
- $this->sort = 'nameUp';
- }
-
if ($this->hasRequestParameter('page') && 0 <
intval($this->getRequestParameter('page')))
{
$this->page = $this->getRequestParameter('page');
@@ -141,17 +132,7 @@
$criterion2 = $criteria->getNewCriterion(QubitRelation::TYPE_ID, null,
Criteria::ISNULL);
$criterion1->addOr($criterion2);
$criteria->add($criterion1);
-
- // Sort results
- switch($this->sort)
- {
- case 'nameDown':
- $criteria->addDescendingOrderByColumn('name');
- break;
- case 'nameUp':
- default:
- $criteria->addAscendingOrderByColumn('name');
- }
+ $criteria->addDescendingOrderByColumn('name');
// Do source culture fallback
$criteria = QubitCultureFallback::addFallbackCriteria($criteria,
'QubitTerm');
@@ -171,17 +152,7 @@
// Show only editable taxonomies
$criteria = QubitTaxonomy::addEditableTaxonomyCriteria($criteria);
-
- // Sort results
- switch($this->sort)
- {
- case 'nameDown':
- $criteria->addDescendingOrderByColumn('name');
- break;
- case 'nameUp':
- default:
- $criteria->addAscendingOrderByColumn('name');
- }
+ $criteria->addAscendingOrderByColumn('name');
// Do source culture fallback
$criteria = QubitCultureFallback::addFallbackCriteria($criteria,
'QubitTaxonomy');
Modified: trunk/apps/qubit/modules/term/templates/listSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/term/templates/listSuccess.php Mon Sep 28
17:42:32 2009 (r3583)
+++ trunk/apps/qubit/modules/term/templates/listSuccess.php Mon Sep 28
20:35:58 2009 (r3584)
@@ -2,22 +2,10 @@
<table class="list">
<thead>
-<tr>
- <th style="width: 40%">
- <?php if ($sort == 'nameUp'): ?>
- <?php echo link_to(__('name'), array('module' => 'term', 'action' =>
'list', 'sort' => 'nameDown', 'page' => $page)) ?>
- <?php echo image_tag('up.gif', 'style="padding-bottom: 3px;"', 'sort up')
?>
- <?php else: ?>
- <?php echo link_to(__('name'), array('module' => 'term', 'action' =>
'list', 'sort' => 'nameUp', 'page' => $page)) ?>
- <?php endif; ?>
- <?php if ($sort == 'nameDown'): ?>
- <?php echo image_tag('down.gif', 'style="padding-bottom: 3px;"', 'sort
down') ?>
- <?php endif; ?>
- </th>
- <th style="width: 60%">
- <?php echo __('note') ?>
- </th>
-</tr>
+ <tr>
+ <th style="width: 40%"><?php echo __('name'); ?></th>
+ <th style="width: 60%"><?php echo __('note') ?></th>
+ </tr>
<tbody>
<?php foreach ($hitlist->getResults() as $taxonomy): ?>
<tr>
@@ -37,14 +25,14 @@
<div class="pager">
<?php $links = $hitlist->getLinks() ?>
<?php if ($hitlist->getPage() != $hitlist->getFirstPage()): ?>
- <?php echo link_to('< '.__('previous'), array('module' => 'term', 'action' =>
'list', 'sort' => $sort, 'page' => $hitlist->getPage() - 1)) ?>
+ <?php echo link_to('< '.__('previous'), array('module' => 'term', 'action' =>
'list', 'page' => $hitlist->getPage() - 1)) ?>
<?php endif; ?>
<?php foreach ($links as $page): ?>
- <?php echo ($page == $hitlist->getPage()) ? '<strong>'.$page.'</strong>' :
link_to($page, array('module' => 'term', 'action' => 'list', 'sort' => $sort,
'page' => $page)) ?>
+ <?php echo ($page == $hitlist->getPage()) ? '<strong>'.$page.'</strong>' :
link_to($page, array('module' => 'term', 'action' => 'list', 'page' => $page))
?>
<?php if ($page != $hitlist->getCurrentMaxLink()): ?> <?php endif; ?>
<?php endforeach ?>
<?php if ($hitlist->getPage() != $hitlist->getLastPage()): ?>
- <?php echo link_to(__('next').' >', array('module' => 'term', 'action' =>
'list', 'sort' => $sort, 'page' => $hitlist->getPage() + 1)) ?>
+ <?php echo link_to(__('next').' >', array('module' => 'term', 'action' =>
'list', 'page' => $hitlist->getPage() + 1)) ?>
<?php endif; ?>
</div>
<?php endif; ?>
Modified: trunk/apps/qubit/modules/term/templates/listTaxonomySuccess.php
==============================================================================
--- trunk/apps/qubit/modules/term/templates/listTaxonomySuccess.php Mon Sep
28 17:42:32 2009 (r3583)
+++ trunk/apps/qubit/modules/term/templates/listTaxonomySuccess.php Mon Sep
28 20:35:58 2009 (r3584)
@@ -4,20 +4,10 @@
<thead>
<tr>
<th>
- <?php if ($sort == 'nameUp'): ?>
- <?php echo link_to(__('%1% term', array('%1%'
=>$taxonomy->getName(array('cultureFallback' => true)))),
'term/list?taxonomyId='.$taxonomy->getId().'&sort=nameDown') ?>
- <?php echo image_tag('up.gif', 'style="padding-bottom: 3px;"', 'sort up')
?>
- <?php else: ?>
- <?php echo link_to(__('%1% term', array('%1%'
=>$taxonomy->getName(array('cultureFallback' => true)))),
'term/list?taxonomyId='.$taxonomy->getId().'&sort=nameUp') ?>
- <?php endif; ?>
-
- <?php if ($sort == 'nameDown'): ?>
- <?php echo image_tag('down.gif', 'style="padding-bottom: 3px;"', 'sort
down') ?>
- <?php endif; ?>
-
- <?php if ($editCredentials): ?>
- <span class="th-link"><?php echo link_to(__('add new'),
'term/create?taxonomyId='.$taxonomy->getId()); ?></span>
- <?php endif; ?>
+ <?php echo __('%1% term', array('%1%'
=>$taxonomy->getName(array('cultureFallback' => true)))); ?>
+ <?php if ($editCredentials): ?>
+ <span class="th-link"><?php echo link_to(__('add new'),
'term/create?taxonomyId='.$taxonomy->getId()); ?></span>
+ <?php endif; ?>
</th>
<th><?php echo __('scope note') ?></th>
</tr>
@@ -53,14 +43,14 @@
<div class="pager">
<?php $links = $hitlist->getLinks() ?>
<?php if ($hitlist->getPage() != $hitlist->getFirstPage()): ?>
- <?php echo link_to('< '.__('previous'), array('module' => 'term', 'action' =>
'list', 'taxonomyId' => $taxonomy->getId(), 'sort' => $sort, 'page' =>
$hitlist->getPage() - 1)) ?>
+ <?php echo link_to('< '.__('previous'), array('module' => 'term', 'action' =>
'list', 'taxonomyId' => $taxonomy->getId(), 'page' => $hitlist->getPage() - 1))
?>
<?php endif; ?>
<?php foreach ($links as $page): ?>
- <?php echo ($page == $hitlist->getPage()) ? '<strong>'.$page.'</strong>' :
link_to($page, array('module' => 'term', 'action' => 'list', 'taxonomyId' =>
$taxonomy->getId(), 'sort' => $sort, 'page' => $page)) ?>
+ <?php echo ($page == $hitlist->getPage()) ? '<strong>'.$page.'</strong>' :
link_to($page, array('module' => 'term', 'action' => 'list', 'taxonomyId' =>
$taxonomy->getId(), 'page' => $page)) ?>
<?php if ($page != $hitlist->getCurrentMaxLink()): ?> <?php endif; ?>
<?php endforeach ?>
<?php if ($hitlist->getPage() != $hitlist->getLastPage()): ?>
- <?php echo link_to(__('next').' >', array('module' => 'term', 'action' =>
'list', 'taxonomyId' => $taxonomy->getId(), 'sort' => $sort, 'page' =>
$hitlist->getPage() + 1)) ?>
+ <?php echo link_to(__('next').' >', array('module' => 'term', 'action' =>
'list', 'taxonomyId' => $taxonomy->getId(), 'page' => $hitlist->getPage() + 1))
?>
<?php endif; ?>
</div>
<?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.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
