Author: david
Date: Mon Sep 26 13:48:02 2011
New Revision: 9828
Log:
Remove pager. Add #result-count div
Modified:
trunk/apps/qubit/modules/physicalobject/actions/boxListAction.class.php
trunk/apps/qubit/modules/physicalobject/templates/boxListSuccess.php
trunk/css/print.css
trunk/plugins/sfCaribouPlugin/css/print-preview.css
Modified:
trunk/apps/qubit/modules/physicalobject/actions/boxListAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/physicalobject/actions/boxListAction.class.php
Mon Sep 26 11:51:27 2011 (r9827)
+++ trunk/apps/qubit/modules/physicalobject/actions/boxListAction.class.php
Mon Sep 26 13:48:02 2011 (r9828)
@@ -33,11 +33,9 @@
$criteria->add(QubitRelation::TYPE_ID, QubitTerm::HAS_PHYSICAL_OBJECT_ID);
$criteria->addJoin(QubitRelation::OBJECT_ID, QubitInformationObject::ID);
- $this->pager = new QubitPager('QubitInformationObject');
- $this->pager->setCriteria($criteria);
- $this->pager->setMaxPerPage($request->limit);
- $this->pager->setPage($request->page);
+ $this->informationObjects = QubitInformationObject::get($criteria);
- $this->informationObjects = $this->pager->getResults();
+ $c2 = clone $criteria;
+ $this->foundcount = BasePeer::doCount($c2)->fetchColumn(0);
}
}
Modified: trunk/apps/qubit/modules/physicalobject/templates/boxListSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/physicalobject/templates/boxListSuccess.php
Mon Sep 26 11:51:27 2011 (r9827)
+++ trunk/apps/qubit/modules/physicalobject/templates/boxListSuccess.php
Mon Sep 26 13:48:02 2011 (r9828)
@@ -58,4 +58,6 @@
</tbody>
</table>
-<?php echo get_partial('default/pager', array('pager' => $pager)) ?>
+<div id="result-count">
+ <?php echo __('Found %1% results', array('%1%' => $foundcount)) ?>
+</div>
Modified: trunk/css/print.css
==============================================================================
--- trunk/css/print.css Mon Sep 26 11:51:27 2011 (r9827)
+++ trunk/css/print.css Mon Sep 26 13:48:02 2011 (r9828)
@@ -74,3 +74,9 @@
{
display: none;
}
+
+#result-count
+{
+ text-align: center;
+ color: #999;
+}
Modified: trunk/plugins/sfCaribouPlugin/css/print-preview.css
==============================================================================
--- trunk/plugins/sfCaribouPlugin/css/print-preview.css Mon Sep 26 11:51:27
2011 (r9827)
+++ trunk/plugins/sfCaribouPlugin/css/print-preview.css Mon Sep 26 13:48:02
2011 (r9828)
@@ -15,3 +15,8 @@
{
float: right;
}
+
+#sfWebDebug
+{
+ display: block;
+}
--
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.
