From f5477e9f33d97eaacfe6a03a157832e1b8419e62 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Mon, 11 Feb 2013 09:44:42 +0000
Subject: [PATCH] =?UTF-8?q?Ajout=20infobulles=20sur=20icones=20=C3=A9ditio?=
=?UTF-8?q?n/visu/suppression=20....=20articles=20/=20sito=20/=20bib=20num?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitattributes | 1 -
.../admin/controllers/SitoController.php | 68 ++++++++-----------
.../views/scripts/cms/_newsform_head.phtml | 2 +-
.../admin/views/scripts/sito/sitoform.phtml | 25 ++++---
.../admin/views/scripts/sito/viewsito.phtml | 10 ---
library/ZendAfi/View/Helper/TreeView.php | 4 +-
.../controllers/SitothequeControllerTest.php | 28 ++++++++
7 files changed, 74 insertions(+), 64 deletions(-)
delete mode 100644 application/modules/admin/views/scripts/sito/viewsito.phtml
diff --git a/.gitattributes b/.gitattributes
index 9778d124be4..d85091d3ef8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -635,7 +635,6 @@ application/modules/admin/views/scripts/sito/index.phtml -text
application/modules/admin/views/scripts/sito/sitoadd.phtml -text
application/modules/admin/views/scripts/sito/sitoedit.phtml -text
application/modules/admin/views/scripts/sito/sitoform.phtml -text
-application/modules/admin/views/scripts/sito/viewsito.phtml -text
application/modules/admin/views/scripts/stat/palmaresreservationnotice.phtml -text
application/modules/admin/views/scripts/stat/palmaresvisunotice.phtml -text
application/modules/admin/views/scripts/stat/rechercheinfructueuse.phtml -text
diff --git a/application/modules/admin/controllers/SitoController.php b/application/modules/admin/controllers/SitoController.php
index f1590e49069..d117d120964 100644
--- a/application/modules/admin/controllers/SitoController.php
+++ b/application/modules/admin/controllers/SitoController.php
@@ -142,21 +142,32 @@ class Admin_SitoController extends Zend_Controller_Action {
private function _getTreeViewItemActions() {
- return array(
- array(
- 'url' => $this->_getUrlForActionAndIdName('sitoedit'),
- 'icon' => 'ico/edit.gif',
- 'label' => 'Modifier',
- ),
- array(
- 'url' => $this->_getUrlForActionAndIdName('sitodel'),
- 'icon' => 'ico/del.gif',
- 'label' => 'Supprimer',
- 'anchorOptions' => array(
- 'onclick' => "return confirm('Etes-vous sûr de vouloir supprimer ce site ?')"
- ),
- )
- );
+ return
+ [
+ [
+ 'url' => $this->_getUrlForActionAndIdName('sitoview').'?&iframe=true&width=80%%&height=80%%',
+ 'icon' => 'ico/show.gif',
+ 'label' => 'Visualiser',
+ 'anchorOptions' => [
+ 'rel' => 'prettyPhoto'
+ ]
+ ],
+
+ [
+ 'url' => $this->_getUrlForActionAndIdName('sitoedit'),
+ 'icon' => 'ico/edit.gif',
+ 'label' => 'Modifier',
+ ],
+
+ [
+ 'url' => $this->_getUrlForActionAndIdName('sitodel'),
+ 'icon' => 'ico/del.gif',
+ 'label' => 'Supprimer',
+ 'anchorOptions' => [
+ 'onclick' => "return confirm('Etes-vous sûr de vouloir supprimer ce site ?')"
+ ],
+ ]
+ ];
}
@@ -288,30 +299,7 @@ class Admin_SitoController extends Zend_Controller_Action {
}
- function viewsitoAction()
- {
- $this->view->titre = "Afficher un site";
- $id_sito = (int)$this->_request->getParam('id', 0);
- $class_sito = new Class_Sitotheque();
- $sito = $class_sito->getSitoById($id_sito);
-
- $this->view->sito = $sito;
- $this->view->sess_id_zone = $this->id_zone;
- $this->view->sess_id_site = $this->id_bib;
- }
-
-
- function rendComboCat($id_bib,$id_cat,$id_cat_mere) {
- $categories = Class_SitothequeCategorie::findAllBy(['order' => 'libelle']);
-
- $html[]='<select name="id_cat_mere" id="id_cat_mere" style="width:100%">';
- $html[]='<option value="'.$id_cat_mere.'" selected="selected">Aucune</option>';
-
- foreach ($categories as $cat) {
- if (($id_cat !=$cat->getId()) && ($id_cat != $cat->getIdCatMere()))
- $html[]='<option value="'.$cat->getId().'">'.$cat->getLibelle().'</option>';
- }
- $html[]='</select>';
- return implode('',$html);
+ function sitoviewAction() {
+ $this->_redirect(Class_Sitotheque::find((int)$this->_getParam('id'))->getUrl());
}
}
\ No newline at end of file
diff --git a/application/modules/admin/views/scripts/cms/_newsform_head.phtml b/application/modules/admin/views/scripts/cms/_newsform_head.phtml
index 61c90dabe3d..74e663867c5 100644
--- a/application/modules/admin/views/scripts/cms/_newsform_head.phtml
+++ b/application/modules/admin/views/scripts/cms/_newsform_head.phtml
@@ -7,7 +7,7 @@
$title = "Visualisation de l'article: ".$this->article->getTitre(); ?>
<a rel="prettyPhoto" href="<?php echo $article_url ?>&iframe=true&width=80%&height=80%" title="<?php echo $title ?>">
<img
- src="<?php echo URL_ADMIN_IMG ?>picto/find.gif"
+ src="<?php echo URL_ADMIN_IMG ?>picto/show.gif"
title="<?php echo $title ?>"
alt="Visualisation de l'article: <?php echo $this->article->getTitre() ?>" />
</a>
diff --git a/application/modules/admin/views/scripts/sito/sitoform.phtml b/application/modules/admin/views/scripts/sito/sitoform.phtml
index 6e5abbbd63a..8c706ac24fc 100644
--- a/application/modules/admin/views/scripts/sito/sitoform.phtml
+++ b/application/modules/admin/views/scripts/sito/sitoform.phtml
@@ -1,5 +1,5 @@
<div class="content_edit_head">
-<?php echo $this->_('Localisation') . ' : ' . $this->site->getBibLibelle(); ?>
+ <?php echo $this->_('Localisation') . ' : ' . $this->site->getBibLibelle(); ?>
</div>
<div class="form">
@@ -38,12 +38,15 @@
<table>
<tr>
<td align="right"> <?php echo $this->bouton('type=V'); ?></td>
- <td><?php echo $this->bouton('id=c_2',
- 'picto=back.gif',
- 'texte=Retour',
- 'url='.$this->url(['action' => 'index',
- 'id_cat' => $this->site->getIdCat()]),
- 'largeur=120px'); ?></td>
+ <td>
+ <?php echo $this->bouton('id=c_2',
+ 'picto=back.gif',
+ 'texte=Retour',
+ 'url='.$this->url(['action' => 'index',
+ 'id_cat' => $this->site->getIdCat()]),
+ 'largeur=120px');
+ ?>
+ </td>
</tr>
</table>
</form>
@@ -51,7 +54,7 @@
<br>
-<script>
-oField = document.getElementById('titre');
-oField.focus();
-</script>
+ <script>
+ oField = document.getElementById('titre');
+ oField.focus();
+ </script>
diff --git a/application/modules/admin/views/scripts/sito/viewsito.phtml b/application/modules/admin/views/scripts/sito/viewsito.phtml
deleted file mode 100644
index ab6d60d2a70..00000000000
--- a/application/modules/admin/views/scripts/sito/viewsito.phtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<script src="<?php echo URL_ADMIN_JS?>sito.js"> </script>
-
-<?php print('<h1>'.$this->sito->TITRE.'</h1>');
-
-echo '<p>'.$this->sito->DESCRIPTION.'<br /><br />';
-echo '<a href="'.$this->sito->URL.'" target="_blank">voir le site</a></p>';
-$url = 'url='.BASE_URL.'/admin/sito?z='.$this->sess_id_zone.'&b='.$this->sess_id_site;
-
-echo '<br /><center><div align="center">'.$this->bouton('id=c_2','picto=back.gif','texte=Retour',$url,'largeur=100px').'</div></center>';
-?>
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/TreeView.php b/library/ZendAfi/View/Helper/TreeView.php
index 54610416d48..452f5a24c41 100644
--- a/library/ZendAfi/View/Helper/TreeView.php
+++ b/library/ZendAfi/View/Helper/TreeView.php
@@ -223,7 +223,9 @@ class ZendAfi_View_Helper_TreeView extends Zend_View_Helper_Abstract {
}
$content = $this->view->tagImg(URL_ADMIN_IMG . $options['icon'],
- array('alt' => $options['label'], 'class' => 'ico'));
+ ['alt' => $options['label'],
+ 'title' => $options['label'],
+ 'class' => 'ico']);
if (array_key_exists('caption', $options))
$content .= $options['caption'];
diff --git a/tests/application/modules/admin/controllers/SitothequeControllerTest.php b/tests/application/modules/admin/controllers/SitothequeControllerTest.php
index 89ed701f36c..28a33b69e0c 100644
--- a/tests/application/modules/admin/controllers/SitothequeControllerTest.php
+++ b/tests/application/modules/admin/controllers/SitothequeControllerTest.php
@@ -97,6 +97,18 @@ class SitothequeControllerIndexTest extends SitothequeControllerTestCase {
}
+ /** @test */
+ public function siteLeCanardShouldHaveLinkForView() {
+ $this->assertXPath('//li[1]//a[contains(@href, "sito/sitoview/id/22")]');
+ }
+
+
+ /** @test */
+ public function iconForViewsiteLeCanardShouldHaveTitleVisualiser() {
+ $this->assertXPath('//li[1]//a[contains(@href, "sito/sitoview/id/22")]//img[@title="Visualiser"]');
+ }
+
+
/** @test */
public function liWithSiteLeMondeShouldBePresent() {
$this->assertXPathContentContains('//li[2]//div', 'Le Monde');
@@ -136,6 +148,22 @@ class SitothequeControllerSitoEditTest extends SitothequeControllerTestCase {
+class SitothequeControllerSitoViewTest extends SitothequeControllerTestCase {
+ public function setUp() {
+ parent::setUp();
+ $this->dispatch('/admin/sito/sitoview/id/22', true);
+ }
+
+
+ /** @test */
+ public function responseShouldRedirectToCanardFr() {
+ $this->assertRedirectTo('http://www.canard.fr');
+ }
+}
+
+
+
+
class SitothequeControllerAddActionTest extends SitothequeControllerTestCase {
public function setUp() {
parent::setUp();
--
GitLab