Author: mj
Date: Fri Apr 6 09:02:12 2012
New Revision: 11413
Log:
Issue 2288. Small detail updates
Modified:
branches/2.0/plugins/qtDominionPlugin/modules/search/templates/autocompleteSuccess.php
branches/2.0/plugins/qtDominionPlugin/modules/staticpage/templates/indexSuccess.php
branches/2.0/plugins/qtDominionPlugin/modules/taxonomy/actions/browseAction.class.php
Modified:
branches/2.0/plugins/qtDominionPlugin/modules/search/templates/autocompleteSuccess.php
==============================================================================
---
branches/2.0/plugins/qtDominionPlugin/modules/search/templates/autocompleteSuccess.php
Fri Apr 6 08:48:56 2012 (r11412)
+++
branches/2.0/plugins/qtDominionPlugin/modules/search/templates/autocompleteSuccess.php
Fri Apr 6 09:02:12 2012 (r11413)
@@ -10,9 +10,9 @@
<?php foreach ($doc['i18n'] as $i18n): ?>
<?php $doc[$i18n['culture']] = $i18n ?>
<?php endforeach; ?>
- <?php unset($doc['i18n']) // continue; ?>
+ <?php unset($doc['i18n']) ?>
<li><?php echo link_to(($doc[$sf_user->getCulture()]['title'] ?:
$doc[$doc['sourceCulture']]['title']), array('module' => 'informationobject',
'slug' => $doc['slug'])) ?></li>
- <!-- TODO: include description level logic -->
+ <!-- TODO: include description level logic; performance impact? -->
<?php endforeach; ?>
<?php if ($descriptions->getTotalHits() > 3): ?>
<li class="showall"><?php echo link_to(__('all matching
descriptions'), array('module' => 'search', 'action' => 'index') +
$sf_request->getParameterHolder()->getAll()) ?></li>
@@ -21,7 +21,6 @@
</div>
<?php endif; ?>
- <!-- FIXME: ENSURE LINKS GO TO THE RIGHT PAGES -->
<?php if ($subjectsHits > 0): ?>
@@ -33,8 +32,8 @@
<?php foreach ($doc['i18n'] as $i18n): ?>
<?php $doc[$i18n['culture']] = $i18n ?>
<?php endforeach; ?>
- <?php unset($doc['i18n']) // continue; ?>
- <li><?php echo link_to(($doc[$sf_user->getCulture()]['name'] ?:
$doc[$doc['sourceCulture']]['name']), array('module' => 'term', 'slug' =>
$doc['slug'])) ?></li>
+ <?php unset($doc['i18n']) ?>
+ <li><?php echo link_to(($doc[$sf_user->getCulture()]['name'] ?:
$doc[$doc['sourceCulture']]['name']), array('module' => 'search', 'action' =>
'index', 'subjects_id' => $hit->getId())) ?></li>
<?php endforeach; ?>
<?php if ($subjects->getTotalHits() > 3): ?>
<li class="showall"><?php echo link_to(__('all matching subjects'),
array('module' => 'search', 'action' => 'index') +
$sf_request->getParameterHolder()->getAll()) ?></li>
@@ -76,7 +75,7 @@
<?php $doc[$i18n['culture']] = $i18n ?>
<?php endforeach; ?>
<?php unset($doc['i18n']) // continue; ?>
- <li><?php echo
link_to(($doc[$sf_user->getCulture()]['authorizedFormOfName'] ?:
$doc[$doc['sourceCulture']]['authorizedFormOfName']), array('module' =>
'actor', 'slug' => $doc['slug'])) ?></li>
+ <li><?php echo
link_to(($doc[$sf_user->getCulture()]['authorizedFormOfName'] ?:
$doc[$doc['sourceCulture']]['authorizedFormOfName']), array('module' =>
'search', 'action' => 'index', 'names_id' => $hit->getId())) ?></li>
<?php endforeach; ?>
<?php if ($actors->getTotalHits() > 3): ?>
<li class="showall"><?php echo link_to(__('all matching people &
organizations'), array('module' => 'search', 'action' => 'index') +
$sf_request->getParameterHolder()->getAll()) ?></li>
Modified:
branches/2.0/plugins/qtDominionPlugin/modules/staticpage/templates/indexSuccess.php
==============================================================================
---
branches/2.0/plugins/qtDominionPlugin/modules/staticpage/templates/indexSuccess.php
Fri Apr 6 08:48:56 2012 (r11412)
+++
branches/2.0/plugins/qtDominionPlugin/modules/staticpage/templates/indexSuccess.php
Fri Apr 6 09:02:12 2012 (r11413)
@@ -19,7 +19,7 @@
<div class="span3" id="intro">
<h1>Archives Canada</h1>
<h2>The Gateway to Canada's Past</h2>
- <p>This is the national database with 811 archival repositories across
the country and 7.4 million records. You can access these holdings and so much
more. </p>
+ <p>This is the national database with <?php echo
QubitSearch::getInstance()->index->getType('QubitRepository')->search(new
Elastica_Query(new Elastica_Query_MatchAll()))->getTotalHits(); ?> archival
repositories across the country and <?php echo
QubitSearch::getInstance()->index->getType('QubitInformationObject')->search(new
Elastica_Query(new Elastica_Query_MatchAll()))->getTotalHits(); ?> records.
You can access these holdings and so much more. </p>
</div>
</div> <!-- /#homepagehero -->
Modified:
branches/2.0/plugins/qtDominionPlugin/modules/taxonomy/actions/browseAction.class.php
==============================================================================
---
branches/2.0/plugins/qtDominionPlugin/modules/taxonomy/actions/browseAction.class.php
Fri Apr 6 08:48:56 2012 (r11412)
+++
branches/2.0/plugins/qtDominionPlugin/modules/taxonomy/actions/browseAction.class.php
Fri Apr 6 09:02:12 2012 (r11413)
@@ -19,7 +19,7 @@
/**
* @package qtDominionPlugin
- * @subpackage repository
+ * @subpackage taxonomy
* @author MJ Suhonos <[email protected]>
* @version svn:$Id$
*/
@@ -128,7 +128,7 @@
else if (empty($this->error))
{
// no error, must be empty result set
- $this->error = $this->context->i18n->__('No subjects found.');
+ $this->error = $this->context->i18n->__('No %1% found.', array('%1%' =>
__($this->field)));
}
}
--
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.
