Author: david
Date: Fri Oct 7 13:53:04 2011
New Revision: 9970
Log:
Use a 'media' parameter to generate a print-preview for information object
Modified:
trunk/apps/qubit/modules/informationobject/actions/indexAction.class.php
trunk/apps/qubit/modules/informationobject/actions/reportsAction.class.php
trunk/apps/qubit/modules/informationobject/templates/reportsSuccess.php
Modified:
trunk/apps/qubit/modules/informationobject/actions/indexAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/indexAction.class.php
Fri Oct 7 13:51:19 2011 (r9969)
+++ trunk/apps/qubit/modules/informationobject/actions/indexAction.class.php
Fri Oct 7 13:53:04 2011 (r9970)
@@ -108,6 +108,11 @@
QubitAcl::forwardToSecureAction();
}
+ if ('print' == $request->getGetParameter('media', 'screen'))
+ {
+ $this->getResponse()->addStylesheet('print-preview', 'last');
+ }
+
// Only show link to view/download master copy of digital object if the
// user has readMaster permissions OR it's a text object (to allow reading)
$this->digitalObjectLink = null;
Modified:
trunk/apps/qubit/modules/informationobject/actions/reportsAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/reportsAction.class.php
Fri Oct 7 13:51:19 2011 (r9969)
+++ trunk/apps/qubit/modules/informationobject/actions/reportsAction.class.php
Fri Oct 7 13:53:04 2011 (r9970)
@@ -31,13 +31,13 @@
{
case 'report':
$choices = array(
- $this->context->routing->generate(null, array($this->resource,
'module' => 'informationobject', 'action' => 'print')) =>
$this->context->i18n->__('Full description'),
+ $this->context->routing->generate(null, array($this->resource,
'module' => 'informationobject', 'media' => 'print')) =>
$this->context->i18n->__('Full description'),
$this->context->routing->generate(null, array($this->resource,
'module' => 'informationobject', 'action' => 'fileList')) =>
$this->context->i18n->__('File list'),
$this->context->routing->generate(null, array($this->resource,
'module' => 'informationobject', 'action' => 'itemList')) =>
$this->context->i18n->__('Item list'),
$this->context->routing->generate(null, array($this->resource,
'module' => 'informationobject', 'action' => 'storageLocations')) =>
$this->context->i18n->__('Physical storage locations'),
);
- $this->form->setDefault($name, $this->context->routing->generate(null,
array($this->resource, 'module' => 'informationobject', 'action' => 'print')));
+ $this->form->setDefault($name, $this->context->routing->generate(null,
array($this->resource, 'module' => 'informationobject', 'media' => 'print')));
$this->form->setValidator($name, new sfValidatorChoice(array('choices'
=> array_keys($choices))));
$this->form->setWidget($name, new sfWidgetFormChoice(array(
'expanded' => true,
Modified:
trunk/apps/qubit/modules/informationobject/templates/reportsSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/reportsSuccess.php
Fri Oct 7 13:51:19 2011 (r9969)
+++ trunk/apps/qubit/modules/informationobject/templates/reportsSuccess.php
Fri Oct 7 13:53:04 2011 (r9970)
@@ -19,7 +19,7 @@
<div class="content">
<ul class="clearfix links">
<li><input class="form-submit" type="submit" value="<?php echo
__('Continue') ?>"/></li>
- <li><?php echo link_to(__('Cancel'), array($resource, 'module' =>
'informationobject', 'action' => 'index')) ?></li>
+ <li><?php echo link_to(__('Cancel'), array($resource, 'module' =>
'informationobject')) ?></li>
</ul>
</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.
