Author: sevein
Date: Fri Apr 20 14:46:38 2012
New Revision: 11483
Log:
Template changes regarding to search realm
Modified:
branches/2.0/apps/qubit/modules/search/templates/_box.php
branches/2.0/apps/qubit/modules/search/templates/autocompleteSuccess.php
branches/2.0/plugins/qtDominionPlugin/templates/_header.php
Modified: branches/2.0/apps/qubit/modules/search/templates/_box.php
==============================================================================
--- branches/2.0/apps/qubit/modules/search/templates/_box.php Fri Apr 20
14:42:57 2012 (r11482)
+++ branches/2.0/apps/qubit/modules/search/templates/_box.php Fri Apr 20
14:46:38 2012 (r11483)
@@ -2,4 +2,26 @@
<input name="query"<?php if (isset($sf_request->query)) echo '
class="focused"' ?> value="<?php echo esc_entities($sf_request->query) ?>"
placeholder="<?php echo __('Search') ?>"/>
+ <div id="search-realm" class="search-popover">
+
+ <div>
+ <label>
+ <input name="realm" type="radio" value="institution" checked="checked">
+ <?php echo __('Search Vancouver Maritime Museum Archives') ?>
+ </label>
+ </div>
+
+ <div>
+ <label>
+ <input name="realm" type="radio" value="all">
+ <?php echo __('Search all of Archives Canada') ?>
+ </label>
+ </div>
+
+ <div>
+ <?php echo link_to(__('Advanced search'), array('module' => 'search',
'action' => 'advanced')) ?>
+ </div>
+
+ </div>
+
</form>
Modified:
branches/2.0/apps/qubit/modules/search/templates/autocompleteSuccess.php
==============================================================================
--- branches/2.0/apps/qubit/modules/search/templates/autocompleteSuccess.php
Fri Apr 20 14:42:57 2012 (r11482)
+++ branches/2.0/apps/qubit/modules/search/templates/autocompleteSuccess.php
Fri Apr 20 14:46:38 2012 (r11483)
@@ -1,84 +1,85 @@
-<div class="span6">
- <?php if ($descriptionsHits > 0): ?>
+<?php if ($descriptionsHits > 0): ?>
- <div class="group">
- <?php echo
image_tag('/plugins/qtDominionPlugin/images/icons-small/icon-archival-small.png',
array('width' => '32', 'height' => '32')) ?>
- <ul>
+ <div>
+ <?php echo
image_tag('/plugins/qtDominionPlugin/images/icons-small/icon-archival-small.png',
array('width' => '32', 'height' => '32')) ?>
+ <ul>
- <?php foreach ($descriptions->getResults() as $hit): ?>
- <?php $doc = build_i18n_doc($hit) ?>
- <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; performance impact? -->
- <?php endforeach; ?>
+ <?php foreach ($descriptions->getResults() as $hit): ?>
+ <?php $doc = build_i18n_doc($hit) ?>
+ <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; 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>
- <?php endif; ?>
+ <?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>
+ <?php endif; ?>
- </ul>
- </div>
+ </ul>
+ </div>
- <?php endif; ?>
+<?php endif; ?>
- <?php if ($subjectsHits > 0): ?>
+<?php if ($subjectsHits > 0): ?>
- <div class="group">
- <?php echo
image_tag('/plugins/qtDominionPlugin/images/icons-small/icon-topics-small.png',
array('width' => '32', 'height' => '32')) ?>
- <ul>
+ <div>
+ <?php echo
image_tag('/plugins/qtDominionPlugin/images/icons-small/icon-topics-small.png',
array('width' => '32', 'height' => '32')) ?>
+ <ul>
- <?php foreach ($subjects->getResults() as $hit): ?>
- <?php $doc = build_i18n_doc($hit) ?>
- <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 foreach ($subjects->getResults() as $hit): ?>
+ <?php $doc = build_i18n_doc($hit) ?>
+ <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>
- <?php endif; ?>
+ <?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>
+ <?php endif; ?>
- </ul>
- </div>
+ </ul>
+ </div>
- <?php endif; ?>
+<?php endif; ?>
- <?php if ($repositoriesHits > 0): ?>
+<?php if ($repositoriesHits > 0): ?>
- <div class="group">
- <?php echo
image_tag('/plugins/qtDominionPlugin/images/icons-small/icon-institutions-small.png',
array('width' => '32', 'height' => '32')) ?>
- <ul>
+ <div>
+ <?php echo
image_tag('/plugins/qtDominionPlugin/images/icons-small/icon-institutions-small.png',
array('width' => '32', 'height' => '32')) ?>
+ <ul>
- <?php foreach ($repositories->getResults() as $hit): ?>
- <?php $doc = build_i18n_doc($hit) ?>
- <li><?php echo
link_to(($doc[$sf_user->getCulture()]['authorizedFormOfName'] ?:
$doc[$doc['sourceCulture']]['authorizedFormOfName']), array('module' =>
'repository', 'slug' => $doc['slug'])) ?></li>
- <?php endforeach; ?>
+ <?php foreach ($repositories->getResults() as $hit): ?>
+ <?php $doc = build_i18n_doc($hit) ?>
+ <li><?php echo
link_to(($doc[$sf_user->getCulture()]['authorizedFormOfName'] ?:
$doc[$doc['sourceCulture']]['authorizedFormOfName']), array('module' =>
'repository', 'slug' => $doc['slug'])) ?></li>
+ <?php endforeach; ?>
- <?php if ($repositories->getTotalHits() > 3): ?>
- <li class="showall"><?php echo link_to(__('all matching
institutions'), array('module' => 'search', 'action' => 'index') +
$sf_request->getParameterHolder()->getAll()) ?></li>
- <?php endif; ?>
+ <?php if ($repositories->getTotalHits() > 3): ?>
+ <li class="showall"><?php echo link_to(__('all matching
institutions'), array('module' => 'search', 'action' => 'index') +
$sf_request->getParameterHolder()->getAll()) ?></li>
+ <?php endif; ?>
- </ul>
- </div>
+ </ul>
+ </div>
- <?php endif; ?>
+<?php endif; ?>
- <?php if ($actorsHits > 0): ?>
+<?php if ($actorsHits > 0): ?>
- <div class="group">
- <?php echo
image_tag('/plugins/qtDominionPlugin/images/icons-small/icon-people-small.png',
array('width' => '32', 'height' => '32')) ?>
- <ul>
+ <div>
+ <?php echo
image_tag('/plugins/qtDominionPlugin/images/icons-small/icon-people-small.png',
array('width' => '32', 'height' => '32')) ?>
+ <ul>
- <?php foreach ($actors->getResults() as $hit): ?>
- <?php $doc = build_i18n_doc($hit) ?>
- <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 foreach ($actors->getResults() as $hit): ?>
+ <?php $doc = build_i18n_doc($hit) ?>
+ <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>
- <?php endif; ?>
+ <?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>
+ <?php endif; ?>
- </ul>
- </div>
+ </ul>
+ </div>
- <?php endif; ?>
+<?php endif; ?>
+<div>
+ <?php echo link_to(__('Advanced search'), array('module' => 'search',
'action' => 'advanced')) ?>
</div>
Modified: branches/2.0/plugins/qtDominionPlugin/templates/_header.php
==============================================================================
--- branches/2.0/plugins/qtDominionPlugin/templates/_header.php Fri Apr 20
14:42:57 2012 (r11482)
+++ branches/2.0/plugins/qtDominionPlugin/templates/_header.php Fri Apr 20
14:46:38 2012 (r11483)
@@ -42,7 +42,7 @@
<h1><?php echo
link_to(image_tag('/plugins/qtDominionPlugin/images/logo'), '@homepage',
array('rel' => 'home', 'title' => __('Home'))) ?></h1>
</div>
- <div id="header-search" class="span6">
+ <div id="header-search">
<?php echo get_component('search', 'box') ?>
</div>
--
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.
