Author: sevein
Date: Fri Mar 30 10:53:14 2012
New Revision: 11324
Log:
Cleanups and fixes in responsive classes
Modified:
trunk/plugins/qtDominionPlugin/modules/search/templates/_searchResults.php
trunk/plugins/qtDominionPlugin/modules/search/templates/indexSuccess.php
Modified:
trunk/plugins/qtDominionPlugin/modules/search/templates/_searchResults.php
==============================================================================
--- trunk/plugins/qtDominionPlugin/modules/search/templates/_searchResults.php
Fri Mar 30 10:50:09 2012 (r11323)
+++ trunk/plugins/qtDominionPlugin/modules/search/templates/_searchResults.php
Fri Mar 30 10:53:14 2012 (r11324)
@@ -1,32 +1,39 @@
-<div id="searchresults">
+<div id="search-results">
+
<div class="row">
- <div class="span12" id="headline">
- <h1><?php echo __('%1% Search Results in %2% Institutions',
- array('%1%' => $pager->resultSet->getTotalHits(),
- '%2%' => count($pager->facets['repository_id']['terms'])))
?></h1>
+
+ <div class="span12 hidden-phone">
+ <h1><?php echo __('%1% Search Results in %2% Institutions', array(
+ '%1%' => $pager->resultSet->getTotalHits(),
+ '%2%' => count($pager->facets['repository_id']['terms']))) ?></h1>
</div>
- <div id="filter" class="span12 mobileonly">
- <h2 class="widebtn btn-huge" data-toggle="collapse"
data-target="#facets, #top-facet"><?php echo __('Filter %1% Results',
- array('%1%' => $pager->resultSet->getTotalHits())) ?></h2>
+ <div id="phone-filter" class="span12 visible-phone">
+ <h2 class="widebtn btn-huge" data-toggle="collapse"
data-target="#facets, #top-facet"><?php echo __('Filter %1% Results', array(
+ '%1%' => $pager->resultSet->getTotalHits())) ?></h2>
</div>
+
</div>
<div class="row">
+
<div class="span12" id="top-facet">
- <h2 class="mobileonly widebtn btn-huge" data-toggle="collapse"
data-target="#institutions"><?php echo __('Institutions'); ?></h2>
+
+ <h2 class="visible-phone widebtn btn-huge" data-toggle="collapse"
data-target="#institutions"><?php echo __('Institutions') ?></h2>
<div class="section well clearfix" id="institutions">
+
<div class="institution mini">
- <h2 class="filltext active"><?php echo link_to(__('All
Institutions'), array('repository_id' => null, 'page' => null) +
$sf_request->getParameterHolder()->getAll()); ?></h2><!-- FIXME: HACK HERE-->.
+ <h2 class="filltext active"><?php echo link_to(__('All
Institutions'), array('repository_id' => null, 'page' => null) +
$sf_request->getParameterHolder()->getAll()) ?></h2>
+ <!-- FIXME: HACK HERE -->.
</div>
<?php $numNav = 7; $i = 0; // NB: numNav could be hardcoded but might
change ?>
- <?php foreach($pager->facets['repository_id']['terms'] as $id =>
$term): ?>
+ <?php foreach ($pager->facets['repository_id']['terms'] as $id =>
$term): ?>
<?php $i++; ?>
<div class="institution mini">
- <h2 class="filltext"><?php echo link_to(__($term['term']),
array('repository_id' => $id, 'page' => null) +
$sf_request->getParameterHolder()->getAll()); ?></h2>
+ <h2 class="filltext"><?php echo link_to(__($term['term']),
array('repository_id' => $id, 'page' => null) +
$sf_request->getParameterHolder()->getAll()) ?></h2>
</div>
<?php if ($i >= $numNav) break; ?>
@@ -35,195 +42,187 @@
</div>
<?php if (count($pager->facets['repository_id']['terms']) > $numNav): ?>
- <div id="more-institutions" class="clearfix pull-right">
-
+
+ <div id="more-institutions" class="clearfix pull-right">
+
<select id="respository" data-placeholder="22 more institutions with
results" class="chzn-select" style="width:400px;" tabindex="2">
- <option value="" selected="selected"><?php echo __('%1% more
institutions with results', array('%1%' =>
count($pager->facets['repository_id']['terms']) - $numNav)); ?></option>
+ <option value="" selected="selected"><?php echo __('%1% more
institutions with results', array('%1%' =>
count($pager->facets['repository_id']['terms']) - $numNav)) ?></option>
<?php $i = 0; ?>
<?php foreach($pager->facets['repository_id']['terms'] as $id =>
$term): ?>
<?php $i++; ?>
<?php if ($i <= $numNav) continue; ?>
- <option value="<?php echo $id; ?>"><?php echo __($term['term']);
?></option>
+ <option value="<?php echo $id; ?>"><?php echo __($term['term'])
?></option>
<?php endforeach; ?>
</select>
</div>
+
<?php endif; ?>
</div>
+
</div>
<div class="row">
+
<div class="span3" id="facets">
+
<div class="section">
- <h2 class="mobileonly widebtn btn-huge" data-toggle="collapse"
data-target="#subjects"><?php echo __('Subject'); ?></h2>
- <h2 class="desktoponly"><?php echo __('Subject'); ?></h2>
+ <h2 class="visible-phone widebtn btn-huge" data-toggle="collapse"
data-target="#subjects"><?php echo __('Subject') ?></h2>
+
+ <h2 class="hidden-phone"><?php echo __('Subject') ?></h2>
<div class="scrollable" id="subjects">
<ul>
- <li <?php if ('' == $sf_request->getParameter('subjects_id')) echo
'class="active"'; ?>><?php echo link_to(__('All'), array('subjects_id' => null,
'page' => null) + $sf_request->getParameterHolder()->getAll()); ?></li>
+
+ <li <?php if ('' == $sf_request->getParameter('subjects_id')) echo
'class="active"'; ?>><?php echo link_to(__('All'), array('subjects_id' => null,
'page' => null) + $sf_request->getParameterHolder()->getAll()) ?></li>
<?php foreach($pager->facets['subjects_id']['terms'] as $id =>
$term): ?>
- <li <?php if (in_array($id, $filters['subjects_id'])) echo
'class="active"'; ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>',
array('subjects_id' => ($filters['subjects_id'] ? implode(',',
array_diff(array_merge($filters['subjects_id'], array($id)),
array_intersect($filters['subjects_id'], array($id)))) : $id), 'page' => null)
+ $sf_request->getParameterHolder()->getAll()); ?></li>
+ <li <?php if (in_array($id, $filters['subjects_id'])) echo
'class="active"'; ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>',
array('subjects_id' => ($filters['subjects_id'] ? implode(',',
array_diff(array_merge($filters['subjects_id'], array($id)),
array_intersect($filters['subjects_id'], array($id)))) : $id), 'page' => null)
+ $sf_request->getParameterHolder()->getAll()) ?></li>
<?php endforeach; ?>
</ul>
</div>
- </div><!-- /.section -->
+
+ </div>
<div class="section">
- <h2 class="mobileonly widebtn btn-huge" data-toggle="collapse"
data-target="#mediatypes"><?php echo __('Media Type'); ?></h2>
- <h2 class="desktoponly"><?php echo __('Media Type'); ?></h2>
+ <h2 class="visible-phone widebtn btn-huge" data-toggle="collapse"
data-target="#mediatypes"><?php echo __('Media Type') ?></h2>
+
+ <h2 class="hidden-phone"><?php echo __('Media Type') ?></h2>
<div class="scrollable" id="mediatypes">
<ul>
- <li <?php if ('' ==
$sf_request->getParameter('digitalObject_mediaTypeId')) echo 'class="active"';
?>><?php echo link_to(__('All'), array('digitalObject_mediaTypeId' => null,
'page' => null) + $sf_request->getParameterHolder()->getAll()); ?></li>
+
+ <li <?php if ('' ==
$sf_request->getParameter('digitalObject_mediaTypeId')) echo 'class="active"';
?>><?php echo link_to(__('All'), array('digitalObject_mediaTypeId' => null,
'page' => null) + $sf_request->getParameterHolder()->getAll()) ?></li>
<?php foreach($pager->facets['digitalObject_mediaTypeId']['terms']
as $id => $term): ?>
- <li <?php if (in_array($id,
$filters['digitalObject_mediaTypeId'])) echo 'class="active"'; ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>',
array('digitalObject_mediaTypeId' => ($filters['digitalObject_mediaTypeId'] ?
implode(',', array_diff(array_merge($filters['digitalObject_mediaTypeId'],
array($id)), array_intersect($filters['digitalObject_mediaTypeId'],
array($id)))) : $id), 'page' => null) +
$sf_request->getParameterHolder()->getAll()); ?></li>
+ <li <?php if (in_array($id,
$filters['digitalObject_mediaTypeId'])) echo 'class="active"'; ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>',
array('digitalObject_mediaTypeId' => ($filters['digitalObject_mediaTypeId'] ?
implode(',', array_diff(array_merge($filters['digitalObject_mediaTypeId'],
array($id)), array_intersect($filters['digitalObject_mediaTypeId'],
array($id)))) : $id), 'page' => null) +
$sf_request->getParameterHolder()->getAll()) ?></li>
<?php endforeach; ?>
</ul>
</div>
- </div><!-- /.section -->
+
+ </div>
<div class="section">
- <h2 class="mobileonly widebtn btn-huge" data-toggle="collapse"
data-target="#dates"><?php echo __('Creation Date'); ?></h2>
- <h2 class="desktoponly"><?php echo __('Creation Date'); ?></h2>
+ <h2 class="visible-phone widebtn btn-huge" data-toggle="collapse"
data-target="#dates"><?php echo __('Creation date') ?></h2>
+
+ <h2 class="hidden-phone"><?php echo __('Creation date') ?></h2>
<div class="scrollable dates" id="dates">
+
<input type="text" value="<?php echo
$pager->facets['dates_startDate']['min'] ?>" name="from" /> - <input
type="text" value="<?php echo $pager->facets['dates_startDate']['max'] ?>"
name="to" />
+
</div>
- </div><!-- /.section -->
-
-
+
+ </div>
+
<div class="section">
- <h2 class="mobileonly widebtn btn-huge" data-toggle="collapse"
data-target="#places"><?php echo __('Place'); ?></h2>
- <h2 class="desktoponly"><?php echo __('Place'); ?></h2>
+ <h2 class="visible-phone widebtn btn-huge" data-toggle="collapse"
data-target="#places"><?php echo __('Place') ?></h2>
+
+ <h2 class="hidden-phone"><?php echo __('Place') ?></h2>
<div class="scrollable" id="places">
<ul>
- <li <?php if ('' == $sf_request->getParameter('places_id')) echo
'class="active"'; ?>><?php echo link_to(__('All'), array('places_id' => null,
'page' => null) + $sf_request->getParameterHolder()->getAll()); ?></li>
+
+ <li <?php if ('' == $sf_request->getParameter('places_id')) echo
'class="active"'; ?>><?php echo link_to(__('All'), array('places_id' => null,
'page' => null) + $sf_request->getParameterHolder()->getAll()) ?></li>
<?php foreach($pager->facets['places_id']['terms'] as $id =>
$term): ?>
- <li <?php if (in_array($id, $filters['places_id'])) echo
'class="active"'; ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>', array('places_id'
=> ($filters['places_id'] ? implode(',',
array_diff(array_merge($filters['places_id'], array($id)),
array_intersect($filters['places_id'], array($id)))) : $id), 'page' => null) +
$sf_request->getParameterHolder()->getAll()); ?></li>
+ <li <?php if (in_array($id, $filters['places_id'])) echo
'class="active"'; ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>', array('places_id'
=> ($filters['places_id'] ? implode(',',
array_diff(array_merge($filters['places_id'], array($id)),
array_intersect($filters['places_id'], array($id)))) : $id), 'page' => null) +
$sf_request->getParameterHolder()->getAll()) ?></li>
<?php endforeach; ?>
</ul>
</div>
- </div><!-- /.section -->
-
+ </div>
+
<div class="section">
- <h2 class="mobileonly widebtn btn-huge" data-toggle="collapse"
data-target="#names"><?php echo __('Name'); ?></h2>
- <h2 class="desktoponly"><?php echo __('Name'); ?></h2>
+ <h2 class="visible-phone widebtn btn-huge" data-toggle="collapse"
data-target="#names"><?php echo __('Name') ?></h2>
+
+ <h2 class="hidden-phone"><?php echo __('Name') ?></h2>
<div class="scrollable" id="names">
<ul>
- <li <?php if ('' == $sf_request->getParameter('names_id')) echo
'class="active"'; ?>><?php echo link_to(__('All'), array('names_id' => null,
'page' => null) + $sf_request->getParameterHolder()->getAll()); ?></li>
+
+ <li <?php if ('' == $sf_request->getParameter('names_id')) echo
'class="active"'; ?>><?php echo link_to(__('All'), array('names_id' => null,
'page' => null) + $sf_request->getParameterHolder()->getAll()) ?></li>
<?php foreach($pager->facets['names_id']['terms'] as $id =>
$term): ?>
- <li <?php if (in_array($id, $filters['names_id'])) echo
'class="active"'; ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>', array('names_id'
=> ($filters['names_id'] ? implode(',',
array_diff(array_merge($filters['names_id'], array($id)),
array_intersect($filters['names_id'], array($id)))) : $id), 'page' => null) +
$sf_request->getParameterHolder()->getAll()); ?></li>
+ <li <?php if (in_array($id, $filters['names_id'])) echo
'class="active"'; ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>', array('names_id'
=> ($filters['names_id'] ? implode(',',
array_diff(array_merge($filters['names_id'], array($id)),
array_intersect($filters['names_id'], array($id)))) : $id), 'page' => null) +
$sf_request->getParameterHolder()->getAll()) ?></li>
<?php endforeach; ?>
</ul>
</div>
- </div><!-- /.section -->
+
+ </div>
<div class="section">
- <h2 class="mobileonly widebtn btn-huge" data-toggle="collapse"
data-target="#language"><?php echo __('Language'); ?></h2>
- <h2 class="desktoponly"><?php echo __('Language'); ?></h2>
+ <h2 class="visible-phone widebtn btn-huge" data-toggle="collapse"
data-target="#language"><?php echo __('Language') ?></h2>
+
+ <h2 class="hidden-phone"><?php echo __('Language') ?></h2>
<div class="scrollable" id="languages">
<ul>
- <li <?php if ('' == $sf_request->getParameter('i18n_culture'))
echo 'class="active"'; ?>><?php echo link_to(__('All'), array('i18n_culture' =>
null, 'page' => null) + $sf_request->getParameterHolder()->getAll()); ?></li>
-
- <?php foreach($pager->facets['i18n_culture']['terms'] as $id =>
$term): ?>
- <li <?php if (in_array($id, $filters['i18n_culture'])) echo
'class="active"'; ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>',
array('i18n_culture' => ($filters['i18n_culture'] ? implode(',',
array_diff(array_merge($filters['i18n_culture'], array($id)),
array_intersect($filters['i18n_culture'], array($id)))) : $id), 'page' => null)
+ $sf_request->getParameterHolder()->getAll()); ?></li>
+ <li <?php if ('' == $sf_request->getParameter('i18n_culture'))
echo 'class="active"'; ?>><?php echo link_to(__('All'), array('i18n_culture' =>
null, 'page' => null) + $sf_request->getParameterHolder()->getAll()) ?></li>
+ <?php foreach($pager->facets['i18n_culture']['terms'] as $id =>
$term): ?>
+ <li <?php if (in_array($id, $filters['i18n_culture'])) echo
'class="active"'; ?>><?php echo
link_to(__($term['term']).'<span>'.$term['count'].'</span>',
array('i18n_culture' => ($filters['i18n_culture'] ? implode(',',
array_diff(array_merge($filters['i18n_culture'], array($id)),
array_intersect($filters['i18n_culture'], array($id)))) : $id), 'page' => null)
+ $sf_request->getParameterHolder()->getAll()) ?></li>
<?php endforeach; ?>
</ul>
</div>
- </div><!-- /.section -->
- </div><!-- /.column .sidebar -->
+ </div>
+
+ </div>
<div class="span9" id="content">
- <div id="print-date">
- Printed: 2012-02-14
- </div>
<div class="listings">
+
<?php $numResults = 0; ?>
<?php foreach ($pager->facets['digitalObject_mediaTypeId']['terms'] as
$mediaType): ?>
<?php $numResults += $mediaType['count']; ?>
<?php endforeach; ?>
<?php if ($numResults > 0): ?>
- <div class="result media">
- <h3><a href="#"><?php echo __('%1% Results with Digital Media',
array('%1%' => $numResults)) ?>
- <strong><?php echo __('show all'); ?></strong></a></h3>
-
- <div>
- <a href="#" ><img rel="popover" data-placement="top" data-content=
- "<p>Description of this item, if
any.</p><p>Vancouver Maritime Museum Library > 11th Gun
Battalion</p>"
- data-original-title="Photo of Mr. Samuel
Clements" src="../../../images/placeholder/image-thumb.jpg" alt=
- "image-thumb" width="150" height="150" /></a>
- </div>
- <div>
- <a href="#" ><img rel="popover" data-placement="top" data-content=
- "<p></p><p>Vancouver Maritime Museum Library
> 11th Gun Battalion Fonds > Series 33</p>"
- data-original-title="Photo of Mr. Samuel
Clements" src="../../../images/placeholder/image2-thumb.jpg" alt=
- "image-thumb" width="150" height="150" /></a>
- </div>
+ <div class="result media">
- <div>
- <a href="#"><img rel="popover" data-placement="top" data-content=
- "<p>Description of this item, if
any.</p><p>Vancouver Maritime Museum Library > 11th Gun
Battalion</p>"
- data-original-title="Photo of Mr. Samuel
Clements" src="../../../images/placeholder/image-thumb.jpg" alt=
- "image-thumb" width="150" height="150" /></a>
- </div>
+ <h3><a href="#"><?php echo __('%1% results with digital media',
array('%1%' => $numResults)) ?><strong><?php echo __('Show all')
?></strong></a></h3>
- <div>
- <a href="#"><img rel="popover" data-placement="top" data-content=
- "<p>Description of this item, if
any.</p><p>Vancouver Maritime Museum Library > 11th Gun
Battalion</p>"
- data-original-title="Photo of Mr. Samuel Clements
aka Mark Twain" src=
- "../../../images/placeholder/image2-thumb.jpg" alt="image-thumb"
width="150" height="150" /></a>
</div>
- </div><!-- /.result -->
- <?php endif;?>
+
+ <?php endif; ?>
<?php foreach ($pager->resultSet->getResults() as $hit): ?>
- <?php $doc = $hit->getData(); ?>
+ <?php $doc = $hit->getData() ?>
<?php foreach ($doc['i18n'] as $i18n): ?>
-
- <?php $doc[$i18n['culture']] = $i18n; ?>
-
+ <?php $doc[$i18n['culture']] = $i18n ?>
<?php endforeach; ?>
<?php unset($doc['i18n']); // continue; ?>
<div class="result">
+
<?php if (isset($doc['digitalObject']['thumbnail_FullPath'])): ?>
<?php echo
link_to(image_tag($doc['digitalObject']['thumbnail_FullPath'], array('alt' =>
'image-thumb', 'width' => '150', 'height' => '150')), array('module' =>
'informationobject', 'slug' => $doc['slug']), array('title' =>
$doc[$sf_user->getCulture()]['title'] ?: $doc[$doc['sourceCulture']]['title']))
?>
<?php endif; ?>
@@ -245,13 +244,13 @@
</p>
<p>
- <?php echo Qubit::renderDateStartEnd(null,
$doc['dates'][0]['startDate'], $doc['dates'][0]['endDate']); ?>
+ <?php echo Qubit::renderDateStartEnd(null,
$doc['dates'][0]['startDate'], $doc['dates'][0]['endDate']) ?>
<?php if
(!empty($doc[$doc['sourceCulture']]['creator'][0]['name'])): ?>
<?php echo __('by %1%', // FIXME: ARRAY ENUMERATION
- array('%1%' =>
$doc[$sf_user->getCulture()]['creator'][0]['name'] ?:
$doc[$doc['sourceCulture']]['creator'][0]['name'])); ?>
+ array('%1%' =>
$doc[$sf_user->getCulture()]['creator'][0]['name'] ?:
$doc[$doc['sourceCulture']]['creator'][0]['name'])) ?>
<?php endif; ?>
</p>
- </div><!-- /.result -->
+ </div>
<?php endforeach; ?>
@@ -268,6 +267,10 @@
<?php endif; ?>
- </div><!-- /.listings -->
- </div><!-- /.content -->
- </div><!-- /.searchresults -->
\ No newline at end of file
+ </div>
+
+ </div>
+
+ </div>
+
+</div>
Modified:
trunk/plugins/qtDominionPlugin/modules/search/templates/indexSuccess.php
==============================================================================
--- trunk/plugins/qtDominionPlugin/modules/search/templates/indexSuccess.php
Fri Mar 30 10:50:09 2012 (r11323)
+++ trunk/plugins/qtDominionPlugin/modules/search/templates/indexSuccess.php
Fri Mar 30 10:53:14 2012 (r11324)
@@ -1,3 +1 @@
-<?php use_helper('Text') ?>
-
<?php echo get_partial('search/searchResults', array('pager' => $pager,
'filters' => $filters)) ?>
--
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.
