From 44351b361bed6656b611f85129b8de63c64405ab Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Fri, 4 Oct 2013 08:53:49 +0000
Subject: [PATCH] =?UTF-8?q?Correction=20pr=C3=A9visualisation=20des=20prof?=
=?UTF-8?q?ils=20avec=20prettyPhoto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/views/scripts/profil/_page_row.phtml | 14 +++++++-------
library/ZendAfi/View/Helper/TagPreview.php | 2 +-
.../controllers/ProfilControllerIndexTest.php | 5 ++---
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/application/modules/admin/views/scripts/profil/_page_row.phtml b/application/modules/admin/views/scripts/profil/_page_row.phtml
index 1cdada78398..91d58e7a80b 100644
--- a/application/modules/admin/views/scripts/profil/_page_row.phtml
+++ b/application/modules/admin/views/scripts/profil/_page_row.phtml
@@ -33,19 +33,19 @@ $url_delete_profil = $this->url(['module' => 'admin',
<?php
- echo $this->tagPreview($this->url(['id_profil' => $this->profil->getId()]),
- sprintf("Visualisation de la page '%s'", $this->profil->getLibelle()));
-
- ?>
+ echo $this->tagPreview($this->url(['id_profil' => $this->profil->getId()], null, true),
+ sprintf("Visualisation de la page '%s'", $this->profil->getLibelle()));
+
+ ?>
<a href="<?php echo $url_copy_profil ?>">
<?php echo '<img src="'.URL_ADMIN_IMG.'ico/page_copy.png'.'" alt="Dupliquer la page" title="Dupliquer la page"/>'; ?>
</a>
<?php if ($this->include_delete_action) { ?>
- <a href="<?php echo $url_delete_profil ?>">
- <?php echo $this->boutonIco("type=del") ?>
- </a>
+ <a href="<?php echo $url_delete_profil ?>">
+ <?php echo $this->boutonIco("type=del") ?>
+ </a>
<?php } ?>
diff --git a/library/ZendAfi/View/Helper/TagPreview.php b/library/ZendAfi/View/Helper/TagPreview.php
index 8ffd69c44a9..74276dea4cc 100644
--- a/library/ZendAfi/View/Helper/TagPreview.php
+++ b/library/ZendAfi/View/Helper/TagPreview.php
@@ -21,7 +21,7 @@
class ZendAfi_View_Helper_TagPreview extends ZendAfi_View_Helper_BaseHelper {
public function tagPreview($url, $libelle) {
return
- '<a data-prettyphoto="true" href="'.$url.'&iframe=true&width=95%25&height=95%25;" title="'.$libelle.'">
+ '<a data-prettyphoto="true" href="'.$url.'?'.http_build_query(['iframe' => 'true', 'width' => '95%', 'height' => '95%']).'" title="'.$libelle.'">
<img
src="'.URL_ADMIN_IMG.'picto/show.gif"
title="'.$libelle.'"
diff --git a/tests/application/modules/admin/controllers/ProfilControllerIndexTest.php b/tests/application/modules/admin/controllers/ProfilControllerIndexTest.php
index 6bfd8751de0..4112d276753 100644
--- a/tests/application/modules/admin/controllers/ProfilControllerIndexTest.php
+++ b/tests/application/modules/admin/controllers/ProfilControllerIndexTest.php
@@ -124,14 +124,13 @@ class Admin_ProfilControllerWithAdminPortailIndexTest extends Admin_ProfilContro
/** @test */
function previewPageAccueilAnchorTitleShouldBeVisualisationDeLaPageAdulte() {
- $this->assertXPath('//div/ul[1]//li[1]//a[@data-prettyphoto="true"][contains(@title, "Visualisation de la page \'Adulte\'")]',
- $this->_response->getBody());
+ $this->assertXPath('//div/ul[1]//li[1]//a[@data-prettyphoto="true"][contains(@title, "Visualisation de la page \'Adulte\'")][@href="/index/index/id_profil/8?iframe=true&width=95%25&height=95%25"]');
}
/** @test */
public function prettyPhotoShouldBeLoaded() {
-
+ $this->assertXPath('//script[contains(@src, "public/admin/js/prettyphoto/js/jquery.prettyPhoto.js")]');
}
--
GitLab