Author: david
Date: Mon Oct 24 15:43:10 2011
New Revision: 10179
Log:
Add print button for advanced search
Modified:
trunk/apps/qubit/modules/search/actions/advancedAction.class.php
trunk/apps/qubit/modules/search/templates/_advancedSearch.php
trunk/apps/qubit/modules/search/templates/advancedSuccess.php
Modified: trunk/apps/qubit/modules/search/actions/advancedAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/search/actions/advancedAction.class.php Mon Oct
24 15:26:42 2011 (r10178)
+++ trunk/apps/qubit/modules/search/actions/advancedAction.class.php Mon Oct
24 15:43:10 2011 (r10179)
@@ -23,12 +23,17 @@
$NAMES = array(
'searchFields',
'repository',
- 'media',
+ 'mediatype',
'hasDigitalObject'
);
public function execute($request)
{
+ if ('print' == $request->getGetParameter('media'))
+ {
+ $this->getResponse()->addStylesheet('print-preview', 'last');
+ }
+
$this->form = new sfForm;
$this->form->getValidatorSchema()->setOption('allow_extra_fields', true);
@@ -76,7 +81,7 @@
break;
- case 'media':
+ case 'mediatype':
// Get list of media types
$criteria = new Criteria;
$criteria->add(QubitTerm::TAXONOMY_ID,
QubitTaxonomy::MATERIAL_TYPE_ID);
@@ -87,8 +92,8 @@
$criteria->addAscendingOrderByColumn('name');
$choices = array('' => '');
- foreach (QubitTerm::get($criteria) as $media) {
- $choices[$media->id] = $media;
+ foreach (QubitTerm::get($criteria) as $mediatype) {
+ $choices[$mediatype->id] = $mediatype;
}
$this->form->setValidator($name, new sfValidatorChoice(array('choices'
=> array_keys($choices))));
@@ -185,9 +190,9 @@
$query->addSubquery(QubitSearch::getInstance()->addTerm('false',
'hasDigitalObject'), true);
}
- if (!empty($this->request->media))
+ if (!empty($this->request->mediatype))
{
-
$query->addSubquery(QubitSearch::getInstance()->addTerm($this->request->media,
'do_mediaTypeId'), true);
+
$query->addSubquery(QubitSearch::getInstance()->addTerm($this->request->mediatype,
'do_mediaTypeId'), true);
}
$query = parent::filterQuery($query);
Modified: trunk/apps/qubit/modules/search/templates/_advancedSearch.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/_advancedSearch.php Mon Oct
24 15:26:42 2011 (r10178)
+++ trunk/apps/qubit/modules/search/templates/_advancedSearch.php Mon Oct
24 15:43:10 2011 (r10179)
@@ -14,7 +14,7 @@
->label(__('Repository'))
->renderRow() ?>
- <?php echo $form->media
+ <?php echo $form->mediatype
->label(__('Media'))
->renderRow() ?>
Modified: trunk/apps/qubit/modules/search/templates/advancedSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/advancedSuccess.php Mon Oct
24 15:26:42 2011 (r10178)
+++ trunk/apps/qubit/modules/search/templates/advancedSuccess.php Mon Oct
24 15:43:10 2011 (r10179)
@@ -1,4 +1,20 @@
-<h1><?php echo __('Advanced search') ?></h1>
+<?php if ('print' == $sf_request->getParameter('media')): ?>
+<div id="preview-message">
+ <?php echo __('Print preview') ?>
+ <?php echo link_to('Close',
array_diff($sf_request->getParameterHolder()->getAll(), array('media' =>
'print'))) ?>
+</div>
+<?php endif; ?>
+
+<h1 class="do-print">
+ <?php echo __('Advanced search') ?>
+
+ <div id="action-icons">
+ <?php echo link_to(
+ image_tag('printer-icon.png', array('alt' => __('Print'))),
+ array_merge($sf_request->getParameterHolder()->getAll(), array('media'
=> 'print')),
+ array('title' => __('Print'))) ?>
+ </div>
+</h1>
<?php echo $form->renderFormTag(url_for(array('module' => 'search', 'action'
=> 'advanced')), array('method' => 'get')) ?>
@@ -31,4 +47,4 @@
<?php echo get_partial('search/searchResults', array('pager' => $pager,
'timer' => $timer)) ?>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
--
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.
