Author: sevein
Date: Tue Apr 17 11:46:40 2012
New Revision: 11451

Log:
Cleanups, add markup to pager

Modified:
   
branches/2.0/plugins/qtDominionPlugin/modules/search/templates/_searchResults.php

Modified: 
branches/2.0/plugins/qtDominionPlugin/modules/search/templates/_searchResults.php
==============================================================================
--- 
branches/2.0/plugins/qtDominionPlugin/modules/search/templates/_searchResults.php
   Tue Apr 17 11:45:59 2012        (r11450)
+++ 
branches/2.0/plugins/qtDominionPlugin/modules/search/templates/_searchResults.php
   Tue Apr 17 11:46:40 2012        (r11451)
@@ -25,7 +25,6 @@
 
         <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 -->.
         </div>
 
         <?php $numNav = 7; $i = 0; // NB: numNav could be hardcoded but might 
change ?>
@@ -198,7 +197,7 @@
 
       <div class="listings">
 
-        <?php $numResults = 0; ?>
+        <?php $numResults = 0 ?>
         <?php foreach ($pager->facets['digitalObject_mediaTypeId']['terms'] as 
$mediaType): ?>
           <?php $numResults += $mediaType['count']; ?>
         <?php endforeach; ?>
@@ -206,9 +205,7 @@
         <?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>
 
         <?php endif; ?>
@@ -233,15 +230,12 @@
 
             <ul class="breadcrumb">
               <?php foreach($doc['ancestors'] as $id): ?>
-                <?php if ($id == QubitInformationObject::ROOT_ID) continue; ?>
-
+                <?php if ($id == QubitInformationObject::ROOT_ID) continue ?>
                 <li><?php echo link_to($pager->ancestors[$id]['title'], 
array('module' => 'informationobject', 'slug' => 
$pager->ancestors[$id]['slug']), array('title' => 
$pager->ancestors[$id]['title'])) ?></li>
-
               <?php endforeach; ?>
             </ul>
 
-            <p><?php echo 
link_to($doc[$sf_user->getCulture()]['scopeAndContent'] ?: 
$doc[$doc['sourceCulture']]['scopeAndContent'], array('module' => 
'informationobject', 'slug' => $doc['slug']), array('title' => 
$doc[$sf_user->getCulture()]['title'] ?: $doc[$doc['sourceCulture']]['title'])) 
?>
-            </p>
+            <p><?php echo 
link_to($doc[$sf_user->getCulture()]['scopeAndContent'] ?: 
$doc[$doc['sourceCulture']]['scopeAndContent'], array('module' => 
'informationobject', 'slug' => $doc['slug']), array('title' => 
$doc[$sf_user->getCulture()]['title'] ?: $doc[$doc['sourceCulture']]['title'])) 
?></p>
 
             <p>
               <?php echo Qubit::renderDateStartEnd(null, 
$doc['dates'][0]['startDate'], $doc['dates'][0]['endDate']) ?>
@@ -255,16 +249,18 @@
         <?php endforeach; ?>
 
         <?php if ($pager->resultSet->getTotalHits() > $pager->maxPerPage): ?>
-
-          <!-- FIXME: these should probably share a line -->
-          <?php if (1 < $pager->page): ?>
-            <?php echo link_to('&laquo;'. __('Previous'), array('page' => 
$pager->page - 1) + $sf_request->getParameterHolder()->getAll(), array('rel' => 
'prev', 'class' => 'widebtn gray btn-huge')) ?>
-          <?php endif; ?>
-
-          <?php if ($pager->resultSet->getTotalHits() > ($pager->maxPerPage * 
$pager->page)): ?>
-            <?php echo link_to(__('Next'). ' &raquo;', array('page' => 
$pager->page + 1) + $sf_request->getParameterHolder()->getAll(), array('rel' => 
'next', 'class' => 'widebtn gray btn-huge')) ?>
-          <?php endif; ?>
-
+          <div class="pager">
+            <?php if (1 < $pager->page): ?>
+              <div class="previous">
+                <?php echo link_to('&laquo;'. __('Previous'), array('page' => 
$pager->page - 1) + $sf_request->getParameterHolder()->getAll(), array('rel' => 
'prev', 'class' => 'widebtn gray btn-huge')) ?>
+              </div>
+            <?php endif; ?>
+            <?php if ($pager->resultSet->getTotalHits() > ($pager->maxPerPage 
* $pager->page)): ?>
+              <div class="next">
+                <?php echo link_to(__('Next'). ' &raquo;', array('page' => 
$pager->page + 1) + $sf_request->getParameterHolder()->getAll(), array('rel' => 
'next', 'class' => 'widebtn gray btn-huge')) ?>
+              </div>
+            <?php endif; ?>
+          </div>
         <?php endif; ?>
 
       </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.

Reply via email to