From 3ae4799859d82b3fede3067e71ed07b75f980c54 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Sat, 8 Sep 2012 14:47:07 +0000
Subject: [PATCH] Upload vignette: ajout d'un bouton pour fermer le popup et
recharger la page si transfert OK
---
.../admin/views/scripts/upload/vignette-uploaded.phtml | 6 +++++-
.../modules/admin/controllers/UploadControllerTest.php | 7 +++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/application/modules/admin/views/scripts/upload/vignette-uploaded.phtml b/application/modules/admin/views/scripts/upload/vignette-uploaded.phtml
index e5c395785d8..76ca269d57d 100644
--- a/application/modules/admin/views/scripts/upload/vignette-uploaded.phtml
+++ b/application/modules/admin/views/scripts/upload/vignette-uploaded.phtml
@@ -2,4 +2,8 @@
<?php
echo $this->_('La vignette a bien été transférée');
?>
-</p>
\ No newline at end of file
+</p>
+
+<button style="margin:0 auto; display:block" onclick="parent.hidePopWin(false);parent.window.location=parent.document.location.href;">
+ <?php echo $this->_('Fermer'); ?>
+</button>
\ No newline at end of file
diff --git a/tests/application/modules/admin/controllers/UploadControllerTest.php b/tests/application/modules/admin/controllers/UploadControllerTest.php
index eba87c19378..0d292ff86a5 100644
--- a/tests/application/modules/admin/controllers/UploadControllerTest.php
+++ b/tests/application/modules/admin/controllers/UploadControllerTest.php
@@ -237,6 +237,13 @@ class UploadControllerVignetteNoticeActionPostValidUrlTest extends UploadControl
public function pageShouldDisplayVignetteTransferee() {
$this->assertXPathContentContains('//p', 'La vignette a bien été transférée');
}
+
+
+ /** @test */
+ public function pageShouldContainsAButtonToCloseWindow() {
+ $this->assertXPathContentContains('//button[contains(@onclick, "hidePopWin")]',
+ 'Fermer');
+ }
}
--
GitLab