From 10caaa3680122fb10876a24266e36dce7a157049 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Mon, 20 Aug 2012 15:39:27 +0000
Subject: [PATCH] =?UTF-8?q?R=C3=A9sa=20multim=C3=A9dia:=20il=20est=20possi?=
=?UTF-8?q?ble=20de=20revenir=20=C3=A0=20une=20=C3=A9tape=20pr=C3=A9c?=
=?UTF-8?q?=C3=A9dente?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
library/ZendAfi/View/Helper/Timeline.php | 14 +++++++++-----
public/opac/css/global.css | 2 +-
.../controllers/AbonneControllerMultimediaTest.php | 11 +++++++++++
3 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/library/ZendAfi/View/Helper/Timeline.php b/library/ZendAfi/View/Helper/Timeline.php
index 5957140c8c3..eedea365b05 100644
--- a/library/ZendAfi/View/Helper/Timeline.php
+++ b/library/ZendAfi/View/Helper/Timeline.php
@@ -43,9 +43,13 @@ class ZendAfi_View_Helper_Timeline extends Zend_View_Helper_Abstract {
protected function _renderAction($action) {
- $html = sprintf('<li%s>%s</li>',
- $this->_getClassForAction($action),
- $this->view->_($action['label']));
+ $class = $this->_getClassForAction($action);
+ $content = $this->view->_($action['label']);
+ if ($class == 'passed')
+ $content = '<a href="'.$action[self::URL].'">'.$content.'</a>';
+
+ $html = sprintf('<li class="%s">%s</li>', $class, $content);
+
if ($action[self::CURRENT])
$this->_after_current = true;
@@ -55,9 +59,9 @@ class ZendAfi_View_Helper_Timeline extends Zend_View_Helper_Abstract {
protected function _getClassForAction($action) {
if ($action[self::CURRENT])
- return ' class="selected"';
+ return 'selected';
if (!$this->_after_current)
- return ' class="passed"';
+ return 'passed';
return '';
}
}
diff --git a/public/opac/css/global.css b/public/opac/css/global.css
index 3198209c30c..48cfbd87ce0 100644
--- a/public/opac/css/global.css
+++ b/public/opac/css/global.css
@@ -940,7 +940,7 @@ div.ui-sortable-placeholder {
width: 130px;
list-style: none;
background: url(../images/reservation_timeline.png) no-repeat;
- margin-left: -18px;
+ margin-left: -16px;
font-weight: bold;
}
diff --git a/tests/application/modules/opac/controllers/AbonneControllerMultimediaTest.php b/tests/application/modules/opac/controllers/AbonneControllerMultimediaTest.php
index 480fbea661a..d5ca00dcc85 100644
--- a/tests/application/modules/opac/controllers/AbonneControllerMultimediaTest.php
+++ b/tests/application/modules/opac/controllers/AbonneControllerMultimediaTest.php
@@ -808,6 +808,17 @@ class AbonneControllerMultimediaHoldGroupTest extends AbonneControllerMultimedia
public function currentTimelineShouldBeSection() {
$this->_assertCurrentTimelineStep('Section');
}
+
+
+ /** @test */
+ public function timelinePreviousActionsShouldHaveLink() {
+ $this->assertXPathContentContains('//div[@class="timeline"]//li//a[contains(@href, abonne/multimedia-hold-location)]', 'Lieu');
+ $this->assertXPathContentContains('//div[@class="timeline"]//li//a[contains(@href, abonne/multimedia-hold-day)]', 'Jour');
+ $this->assertXPathContentContains('//div[@class="timeline"]//li//a[contains(@href, abonne/multimedia-hold-hours)]', 'Horaires');
+ $this->assertNotXPathContentContains('//div[@class="timeline"]//li//a', 'Section');
+ $this->assertNotXPathContentContains('//div[@class="timeline"]//li//a', 'Poste');
+ $this->assertNotXPathContentContains('//div[@class="timeline"]//li//a', 'Confirmation');
+ }
}
--
GitLab