Author: sevein
Date: Sat Apr 30 04:41:29 2011
New Revision: 9089
Log:
Apply Wu's patch, fixes issue 1976. Thanks, Wu\!
Modified:
trunk/apps/qubit/modules/actor/templates/browseSuccess.php
trunk/apps/qubit/modules/function/templates/browseSuccess.php
trunk/apps/qubit/modules/informationobject/templates/browseSuccess.php
trunk/apps/qubit/modules/repository/templates/browseSuccess.php
Modified: trunk/apps/qubit/modules/actor/templates/browseSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/actor/templates/browseSuccess.php Sat Apr 30
00:02:52 2011 (r9088)
+++ trunk/apps/qubit/modules/actor/templates/browseSuccess.php Sat Apr 30
04:41:29 2011 (r9089)
@@ -25,13 +25,22 @@
<tr>
<th>
<?php echo __('Name') ?>
- <?php if ('nameDown' == $sf_request->sort): ?>
- <?php echo link_to(image_tag('up.gif'), array('sort' => 'nameUp') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'))) ?>
- <?php elseif ('nameUp' == $sf_request->sort): ?>
- <?php echo link_to(image_tag('down.gif'), array('sort' =>
'nameDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
- <?php endif; ?>
+ <?php if ($sf_user->isAuthenticated()): ?>
+ <?php if ('nameDown' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('up.gif'), array('sort' => 'nameUp')
+ $sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'))) ?>
+ <?php elseif ('nameUp' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('down.gif'), array('sort' =>
'nameDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php endif; ?>
+ <?php else: ?>
+ <?php if (('nameDown' != $sf_request->sort && 'updatedDown' !=
$sf_request->sort && 'updatedUp' != $sf_request->sort) || ('nameUp' ==
$sf_request->sort)): ?>
+ <?php echo link_to(image_tag('down.gif'), array('sort' =>
'nameDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php endif; ?>
+ <?php if ('nameDown' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('up.gif'), array('sort' => 'nameUp')
+ $sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'))) ?>
+ <?php endif; ?>
+ <?php endif; ?>
</th><th>
- <?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort): ?>
+ <?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort || (!$sf_user->isAuthenticated() && 'updatedDown' !=
$sf_request->sort && 'updatedUp' != $sf_request->sort) ): ?>
<?php echo __('Type') ?>
<?php if ('typeDown' == $sf_request->sort): ?>
<?php echo link_to(image_tag('up.gif'), array('sort' => 'typeUp')
+ $sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'))) ?>
@@ -54,7 +63,7 @@
<td>
<?php echo link_to(render_title($item), array($item, 'module' =>
'actor')) ?>
</td><td>
- <?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort): ?>
+ <?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort || (!$sf_user->isAuthenticated() && 'updatedDown' !=
$sf_request->sort && 'updatedUp' != $sf_request->sort) ): ?>
<?php echo $item->entityType ?>
<?php else: ?>
<?php echo format_date($item->updatedAt, 'f') ?>
Modified: trunk/apps/qubit/modules/function/templates/browseSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/function/templates/browseSuccess.php Sat Apr
30 00:02:52 2011 (r9088)
+++ trunk/apps/qubit/modules/function/templates/browseSuccess.php Sat Apr
30 04:41:29 2011 (r9089)
@@ -33,17 +33,16 @@
<?php echo link_to(image_tag('down.gif'), array('sort' =>
'nameDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
<?php endif; ?>
<?php else: ?>
- <?php if ('nameDown' == $sf_request->sort): ?>
- <?php echo link_to(image_tag('up.gif'), array('sort' => 'nameUp')
+ $sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'))) ?>
- <?php elseif ('nameUp' == $sf_request->sort): ?>
+ <?php if (('nameDown' != $sf_request->sort && 'updatedDown' !=
$sf_request->sort && 'updatedUp' != $sf_request->sort) || ('nameUp' ==
$sf_request->sort)): ?>
<?php echo link_to(image_tag('down.gif'), array('sort' =>
'nameDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
- <?php elseif ('' == $sf_request->sort): ?>
+ <?php endif; ?>
+ <?php if ('nameDown' == $sf_request->sort): ?>
<?php echo link_to(image_tag('up.gif'), array('sort' => 'nameUp')
+ $sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'))) ?>
<?php endif; ?>
- <?php endif; ?>
+ <?php endif; ?>
</th>
- <?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort): ?>
+ <?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort || (!$sf_user->isAuthenticated() && 'updatedDown' !=
$sf_request->sort && 'updatedUp' != $sf_request->sort)): ?>
<th>
<?php echo __('Type') ?>
</th>
@@ -75,7 +74,7 @@
<?php echo link_to(render_title($item), array($item, 'module' =>
'function')) ?>
</td>
- <?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort): ?>
+ <?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort || (!$sf_user->isAuthenticated() && 'updatedDown' !=
$sf_request->sort && 'updatedUp' != $sf_request->sort) ): ?>
<td>
<?php echo $item->type ?>
</td>
Modified: trunk/apps/qubit/modules/informationobject/templates/browseSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/browseSuccess.php
Sat Apr 30 00:02:52 2011 (r9088)
+++ trunk/apps/qubit/modules/informationobject/templates/browseSuccess.php
Sat Apr 30 04:41:29 2011 (r9089)
@@ -25,11 +25,20 @@
<tr>
<th>
<?php echo __('Title') ?>
- <?php if ('titleDown' == $sf_request->sort): ?>
- <?php echo link_to(image_tag('up.gif'), array('sort' => 'titleUp') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'))) ?>
- <?php elseif ('titleUp' == $sf_request->sort): ?>
- <?php echo link_to(image_tag('down.gif'), array('sort' =>
'titleDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
- <?php endif; ?>
+ <?php if ($sf_user->isAuthenticated()): ?>
+ <?php if ('titleDown' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('up.gif'), array('sort' => 'titleUp')
+ $sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'))) ?>
+ <?php elseif ('titleUp' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('down.gif'), array('sort' =>
'titleDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php endif; ?>
+ <?php else: ?>
+ <?php if (('titleDown' != $sf_request->sort && 'updatedDown' !=
$sf_request->sort && 'updatedUp' != $sf_request->sort) || ('titleUp' ==
$sf_request->sort)): ?>
+ <?php echo link_to(image_tag('down.gif'), array('sort' =>
'titleDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php endif; ?>
+ <?php if ('titleDown' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('up.gif'), array('sort' => 'titleUp')
+ $sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'))) ?>
+ <?php endif; ?>
+ <?php endif; ?>
</th><th>
<?php if ($sf_user->isAuthenticated()): ?>
<?php if ('titleUp' == $sf_request->sort || 'titleDown' ==
$sf_request->sort): ?>
Modified: trunk/apps/qubit/modules/repository/templates/browseSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/repository/templates/browseSuccess.php Sat Apr
30 00:02:52 2011 (r9088)
+++ trunk/apps/qubit/modules/repository/templates/browseSuccess.php Sat Apr
30 04:41:29 2011 (r9089)
@@ -25,13 +25,22 @@
<tr>
<th>
<?php echo __('Name') ?>
- <?php if ('nameDown' == $sf_request->sort): ?>
- <?php echo link_to(image_tag('up.gif'), array('sort' => 'nameUp') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'))) ?>
- <?php elseif ('nameUp' == $sf_request->sort): ?>
- <?php echo link_to(image_tag('down.gif'), array('sort' =>
'nameDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
- <?php endif; ?>
+ <?php if ($sf_user->isAuthenticated()): ?>
+ <?php if ('nameDown' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('up.gif'), array('sort' => 'nameUp')
+ $sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'))) ?>
+ <?php elseif ('nameUp' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('down.gif'), array('sort' =>
'nameDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php endif; ?>
+ <?php else: ?>
+ <?php if (('nameDown' != $sf_request->sort && 'updatedDown' !=
$sf_request->sort && 'updatedUp' != $sf_request->sort) || ('nameUp' ==
$sf_request->sort)): ?>
+ <?php echo link_to(image_tag('down.gif'), array('sort' =>
'nameDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php endif; ?>
+ <?php if ('nameDown' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('up.gif'), array('sort' => 'nameUp')
+ $sf_request->getParameterHolder()->getAll(), array('title' => __('Sort'))) ?>
+ <?php endif; ?>
+ <?php endif; ?>
</th>
- <?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort): ?>
+ <?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort || (!$sf_user->isAuthenticated() && 'updatedDown' !=
$sf_request->sort && 'updatedUp' != $sf_request->sort) ): ?>
<th>
<?php echo __('Type') ?>
</th><th>
@@ -40,11 +49,19 @@
<?php else: ?>
<th>
<?php echo __('Updated') ?>
- <?php if ('updatedUp' == $sf_request->sort): ?>
- <?php echo link_to(image_tag('up.gif'), array('sort' =>
'updatedDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
- <?php elseif ('updatedDown' == $sf_request->sort): ?>
- <?php echo link_to(image_tag('down.gif'), array('sort' =>
'updatedUp') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
- <?php endif; ?>
+ <?php if ($sf_user->isAuthenticated()): ?>
+ <?php if ('updatedUp' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('up.gif'), array('sort' =>
'updatedDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php else: ?>
+ <?php echo link_to(image_tag('down.gif'), array('sort' =>
'updatedUp') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php endif; ?>
+ <?php else: ?>
+ <?php if ('updatedUp' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('up.gif'), array('sort' =>
'updatedDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php elseif ('updatedDown' == $sf_request->sort): ?>
+ <?php echo link_to(image_tag('down.gif'), array('sort' =>
'updatedUp') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php endif; ?>
+ <?php endif; ?>
</th>
<?php endif; ?>
@@ -55,7 +72,7 @@
<td>
<?php echo link_to(render_title($item), array($item, 'module' =>
'repository')) ?>
</td>
- <?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort): ?>
+ <?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort || (!$sf_user->isAuthenticated() && 'updatedDown' !=
$sf_request->sort && 'updatedUp' != $sf_request->sort) ): ?>
<td>
<ul>
<?php foreach
($item->getTermRelations(QubitTaxonomy::REPOSITORY_TYPE_ID) as $relation): ?>
--
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.
