Author: jablko
Date: Wed Aug 26 14:04:19 2009
New Revision: 3077
Log:
Take stab at simplifying links and hiding unspecified parameters
Modified:
trunk/apps/qubit/modules/actor/templates/listSuccess.php
trunk/apps/qubit/modules/repository/templates/listSuccess.php
Modified: trunk/apps/qubit/modules/actor/templates/listSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/actor/templates/listSuccess.php Wed Aug 26
13:43:42 2009 (r3076)
+++ trunk/apps/qubit/modules/actor/templates/listSuccess.php Wed Aug 26
14:04:19 2009 (r3077)
@@ -3,10 +3,10 @@
<table class="list"><thead><tr>
<th>
<?php if ($sort == 'nameUp'): ?>
- <?php echo link_to(__('name'),
'actor/list?role='.$role.'&sort=nameDown&page='.$page) ?>
+ <?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'),
'actor/list?role='.$role.'&sort=nameUp&page='.$page) ?>
+ <?php echo link_to(__('name'), array('sort' => 'nameUp') +
$sf_request->getParameterHolder()->getAll()) ?>
<?php endif; ?>
<?php if ($sort == 'nameDown'): ?>
<?php echo image_tag('down.gif', array('style' => 'padding-bottom:
3px'), 'sort down') ?>
@@ -16,10 +16,10 @@
<?php endif; ?>
</th><th>
<?php if ($sort == 'typeDown'): ?>
- <?php echo link_to(__('type'),
'actor/list?role='.$role.'&sort=typeUp&page='.$page) ?>
+ <?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'),
'actor/list?role='.$role.'&sort=typeDown&page='.$page) ?>
+ <?php echo link_to(__('type'), array('sort' => 'typeDown') +
$sf_request->getParameterHolder()->getAll()) ?>
<?php endif; ?>
<?php if ($sort == 'typeUp'): ?>
<?php echo image_tag('up.gif', array('style' => 'padding-bottom: 3px'),
'sort up') ?>
@@ -46,14 +46,14 @@
<div class="pager">
<?php $links = $actors->getLinks(); ?>
<?php if ($actors->getPage() != $actors->getFirstPage()): ?>
- <?php echo link_to('< '.__('previous'),
'actor/list?sort='.$sort.'&page='.($actors->getPage()-1)) ?>
+ <?php echo link_to('< '.__('previous'), array('page' => $actors->getPage() -
1) + $sf_request->getParameterHolder()->getAll()) ?>
<?php endif; ?>
<?php foreach ($links as $page): ?>
- <?php echo ($page == $actors->getPage()) ? '<strong>'.$page.'</strong>' :
link_to($page, 'actor/list?sort='.$sort.'&page='.$page) ?>
+ <?php echo ($page == $actors->getPage()) ? '<strong>'.$page.'</strong>' :
link_to($page, array('page' => $page) +
$sf_request->getParameterHolder()->getAll()) ?>
<?php if ($page != $actors->getCurrentMaxLink()): ?> <?php endif ?>
<?php endforeach ?>
<?php if ($actors->getPage() != $actors->getLastPage()): ?>
- <?php echo link_to(__('next').' >',
'actor/list?sort='.$sort.'&page='.($actors->getPage()+1)) ?>
+ <?php echo link_to(__('next').' >', array('page' => $actors->getPage() + 1) +
$sf_request->getParameterHolder()->getAll()) ?>
<?php endif; ?>
</div>
<?php endif ?>
Modified: trunk/apps/qubit/modules/repository/templates/listSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/repository/templates/listSuccess.php Wed Aug
26 13:43:42 2009 (r3076)
+++ trunk/apps/qubit/modules/repository/templates/listSuccess.php Wed Aug
26 14:04:19 2009 (r3077)
@@ -4,10 +4,10 @@
<thead>
<tr>
<th><?php if ($sort == 'nameUp'): ?>
- <?php echo link_to(__('name'),
'repository/list?country='.$country.'&sort=nameDown&page='.$page) ?>
+ <?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'),
'repository/list?country='.$country.'&sort=nameUp&page='.$page) ?>
+ <?php echo link_to(__('name'), array('sort' => 'nameUp') +
$sf_request->getParameterHolder()->getAll()) ?>
<?php endif; ?>
<?php if ($sort == 'nameDown'): ?>
@@ -20,10 +20,10 @@
</th>
<th><?php if ($sort == 'typeUp'): ?>
- <?php echo link_to(__('type'),
'repository/list?country='.$country.'&sort=typeDown&page='.$page) ?>
+ <?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'),
'repository/list?country='.$country.'&sort=typeUp&page='.$page) ?>
+ <?php echo link_to(__('type'), array('sort' => 'typeUp') +
$sf_request->getParameterHolder()->getAll()) ?>
<?php endif; ?>
<?php if ($sort == 'typeDown'): ?>
@@ -36,13 +36,13 @@
<?php echo __('country') ?>
<!-- hide sort option until it is working...
- <?php echo link_to(__('country'),
'repository/list?country='.$country.'&sort=countryUp&page='.$page) ?>
+ <?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'),
'repository/list?country='.$country.'&sort=countryDown&page='.$page) ?>
+ <?php echo link_to(__('country'), array('sort' => 'countryDown') +
$sf_request->getParameterHolder()->getAll()) ?>
-->
<?php endif; ?>
@@ -81,14 +81,14 @@
<div class="pager">
<?php $links = $repositories->getLinks(); ?>
<?php if ($repositories->getPage() != $repositories->getFirstPage()): ?>
- <?php echo link_to('< '.__('previous'),
'repository/list?sort='.$sort.'&page='.($repositories->getPage()-1)) ?>
+ <?php echo link_to('< '.__('previous'), array('page' =>
$repositories->getPage() - 1) + $sf_request->getParameterHolder()->getAll()) ?>
<?php endif; ?>
<?php foreach ($links as $page): ?>
- <?php echo ($page == $repositories->getPage()) ?
'<strong>'.$page.'</strong>' : link_to($page,
'repository/list?sort='.$sort.'&page='.$page) ?>
+ <?php echo ($page == $repositories->getPage()) ?
'<strong>'.$page.'</strong>' : link_to($page, array('page' => $page) +
$sf_request->getParameterHolder()->getAll()) ?>
<?php if ($page != $repositories->getCurrentMaxLink()): ?> <?php endif ?>
<?php endforeach ?>
<?php if ($repositories->getPage() != $repositories->getLastPage()): ?>
- <?php echo link_to(__('next').' >',
'repository/list?sort='.$sort.'&page='.($repositories->getPage()+1)) ?>
+ <?php echo link_to(__('next').' >', array('page' => $repositories->getPage()
+ 1) + $sf_request->getParameterHolder()->getAll()) ?>
<?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
-~----------~----~----~----~------~----~------~--~---
