From fe2f440195998e6517807d2a177cd2fa787338e9 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@afi-sa.fr>
Date: Sat, 28 Nov 2015 17:07:40 +0100
Subject: [PATCH] dev #30973 pnb_backoffice_table
dilicom button actions refacto + test fix
---
library/ZendAfi/View/Helper/TagDilicomWidget.php | 6 +++---
public/opac/css/global.css | 11 +++++++++++
tests/fixtures/DilicomFixtures.php | 8 ++++----
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/library/ZendAfi/View/Helper/TagDilicomWidget.php b/library/ZendAfi/View/Helper/TagDilicomWidget.php
index a3bd45718a5..bca19dee6af 100644
--- a/library/ZendAfi/View/Helper/TagDilicomWidget.php
+++ b/library/ZendAfi/View/Helper/TagDilicomWidget.php
@@ -49,7 +49,7 @@ class ZendAfi_View_Helper_TagDilicomWidget extends Zend_View_Helper_HtmlElement
return $this->getDilicomAnchor(['controller' => 'bib-numerique',
'action' => 'consult-book-ajax',
'id' => $this->_album->getId()],
- $this->view->_('Consulter le livre en ligne'),
+ $this->view->_('Consulter le livre en ligne (depuis la médiathèque)'),
['data-popup' => 'true']);
}
@@ -67,8 +67,8 @@ class ZendAfi_View_Helper_TagDilicomWidget extends Zend_View_Helper_HtmlElement
return $this->view->tag('div',
$this->view->tagAnchor($url,
$label,
- array_merge(['style' => 'padding: 5px;margin: 5px; border: 1px solid #aaa; border-radius: 3px;display: inline-block;'],
- $attribs)));
+ $attribs),
+ ['class' => 'dilicom-action']);
}
}
?>
\ No newline at end of file
diff --git a/public/opac/css/global.css b/public/opac/css/global.css
index 3754d66f2e0..40e964f7c0a 100644
--- a/public/opac/css/global.css
+++ b/public/opac/css/global.css
@@ -3171,4 +3171,15 @@ a.loan-export {
#opac-dialog div.popup-content,
#opac-dialog div.popup-content * {
vertical-align: middle;
+}
+
+
+.dilicom-action {
+ padding: 5px;
+ margin: 10px;
+ border: 1px solid #aaa;
+ border-radius: 3px;
+ display: inline-block;
+ font-weight:bold;
+ font-size: 1.1em;
}
\ No newline at end of file
diff --git a/tests/fixtures/DilicomFixtures.php b/tests/fixtures/DilicomFixtures.php
index 2672ab3fc29..4d2dcea1299 100644
--- a/tests/fixtures/DilicomFixtures.php
+++ b/tests/fixtures/DilicomFixtures.php
@@ -187,13 +187,13 @@ class DilicomFixtures {
'album_id' => 3,
'usage_type' => Class_Album_UsageConstraint::LOAN_CONSTRAINT,
Class_Album_UsageConstraint::MAX_NB_OF_USERS => 50,
- Class_Album_Usageconstraint::QUANTITY => 50,
- 'order_line_id' => 'x321']),
+ Class_Album_Usageconstraint::QUANTITY => 50]),
$this->fixture('Class_Album_UsageConstraint',
['id' => 2,
'album_id' => 3,
'usage_type' => Class_Album_UsageConstraint::AVAILABILITY_CONSTRAINT,
- Class_Album_UsageConstraint::DURATION => '100',
- Class_Album_UsageConstraint::END_DATE => '2018-04-01 00:00:00'])]]);
+ Class_Album_UsageConstraint::DURATION => '10000',
+ Class_Album_UsageConstraint::ORDER_DATE => '2015-04-01 00:00:00',
+ 'order_line_id' => 'x321'])]]);
}
}
\ No newline at end of file
--
GitLab