Author: sevein
Date: Mon May 14 11:26:27 2012
New Revision: 11671
Log:
Move search box into the tabs menu, check if array items are set before using
them
Modified:
branches/2.0/apps/qubit/modules/actor/templates/browseSuccess.php
Modified: branches/2.0/apps/qubit/modules/actor/templates/browseSuccess.php
==============================================================================
--- branches/2.0/apps/qubit/modules/actor/templates/browseSuccess.php Mon May
14 11:02:11 2012 (r11670)
+++ branches/2.0/apps/qubit/modules/actor/templates/browseSuccess.php Mon May
14 11:26:27 2012 (r11671)
@@ -28,17 +28,8 @@
<div class="span9" id="main-column">
- <div class="search">
- <form method="get" action="<?php echo url_for(array('module' => 'actor',
'action' => 'browse')) ?>">
- <?php foreach ($sf_request->getGetParameters() as $key => $value): ?>
- <input type="hidden" name="<?php echo esc_entities($key) ?>"
value="<?php echo esc_entities($value) ?>"/>
- <?php endforeach; ?>
- <input name="subquery" value="<?php echo
esc_entities($sf_request->subquery) ?>" placeholder="<?php echo __('Search
%1%', array('%1%' => sfConfig::get('app_ui_label_actor'))) ?>"/>
- <input class="form-submit" type="submit" value="<?php echo __('Search
%1%', array('%1%' => sfConfig::get('app_ui_label_actor'))) ?>"/>
- </form>
- </div>
-
<ul class="nav nav-tabs">
+
<?php if ('lastUpdated' == $sortSetting): ?>
<li<?php if ('nameDown' != $sf_request->sort && 'nameUp' !=
$sf_request->sort): ?> class="active"<?php endif; ?>><?php echo
link_to(__('Recent changes'), array('sort' => 'updatedDown') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort')))
?></li>
<li<?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort): ?> class="active"<?php endif; ?>><?php echo
link_to(__('Alphabetic'), array('sort' => 'nameUp') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort')))
?></li>
@@ -46,8 +37,19 @@
<li<?php if ('updatedDown' == $sf_request->sort || 'updatedUp' ==
$sf_request->sort): ?> class="active"<?php endif; ?>><?php echo
link_to(__('Recent changes'), array('sort' => 'updatedDown') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort')))
?></li>
<li<?php if ('updatedDown' != $sf_request->sort && 'updatedUp' !=
$sf_request->sort): ?> class="active"<?php endif; ?>><?php echo
link_to(__('Alphabetic'), array('sort' => 'nameUp') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort')))
?></li>
<?php endif; ?>
- <li class="pull-right">
+
+ <li class="search">
+ <div class="search">
+ <form method="get" action="<?php echo url_for(array('module' =>
'actor', 'action' => 'browse')) ?>">
+ <?php foreach ($sf_request->getGetParameters() as $key => $value):
?>
+ <input type="hidden" name="<?php echo esc_entities($key) ?>"
value="<?php echo esc_entities($value) ?>"/>
+ <?php endforeach; ?>
+ <input class="subquery" name="subquery" value="<?php echo
esc_entities($sf_request->subquery) ?>" placeholder="<?php echo __('Search
%1%', array('%1%' => sfConfig::get('app_ui_label_actor'))) ?>"/>
+ <input class="form-submit" type="submit" value="<?php echo
__('Search %1%', array('%1%' => sfConfig::get('app_ui_label_actor'))) ?>"/>
+ </form>
+ </div>
</li>
+
</ul>
<div id="content">
@@ -97,7 +99,11 @@
<?php echo
link_to($doc[$sf_user->getCulture()]['authorizedFormOfName'], array('module' =>
'actor', 'slug' => $doc['slug'])) ?>
</td><td>
<?php if ('nameDown' == $sf_request->sort || 'nameUp' ==
$sf_request->sort || ('lastUpdated' != $sortSetting && 'updatedDown' !=
$sf_request->sort && 'updatedUp' != $sf_request->sort) ): ?>
- <?php echo $types[$doc['entityTypeId']] ?>
+ <?php if (isset($doc['entityTypeId']) &&
isset($types[$doc['entityTypeId']])): ?>
+ <?php echo $types[$doc['entityTypeId']] ?>
+ <?php else: ?>
+ <?php echo __('N/A') ?>
+ <?php endif; ?>
<?php else: ?>
<?php echo format_date($item->updatedAt, 'f') ?>
<?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.
