diff --git a/application/modules/opac/views/scripts/footer.phtml b/application/modules/opac/views/scripts/footer.phtml
index 8ddc4c2afc31d121c819f247b0cb1e348195f874..22f58ff6d8f1ff5cfe6e5721f38170083f710443 100644
--- a/application/modules/opac/views/scripts/footer.phtml
+++ b/application/modules/opac/views/scripts/footer.phtml
@@ -1,23 +1,29 @@
- <div class="footer" style="overflow:hidden;clear:both;width:<?php echo Class_Profil::getCurrentProfil()->getLargeurSite() ?>px">
+<?php $profil = Class_Profil::getCurrentProfil();?>
+ <div class="footer" style="overflow:hidden;clear:both;width:<?php echo $profil->getLargeurSite() ?>px">
<table style="boder-spacing:0; border-collapse:collapse; width:100%">
<tr>
<td style="padding-left:15px;">
- <a href="<?php echo $this->url(['module'=>'admin'], null, true); ?>"><?php echo $this->_('Accès pro.') ?></a>
+ <?php
+ echo $this->tagAnchor($this->url(['module'=>'admin'], null, true),
+ $this->_('Accès pro.'),
+ ['title' => $this->_('Accéder à l\'espace professionnel')]);
+ ?>
</td>
<?php
// Combo des profils pour les admins
if(Class_Users::getLoader()->isCurrentUserCanAccesBackend()) {
echo '<td style="text-align:center; white-space: nowrap">';
- $profil = Class_Profil::getCurrentProfil();
echo $this->tagAnchor(['module' => 'admin',
'controller' => 'profil',
'action' => 'accueil',
'id_profil' => $profil->getId()],
-
+
$this->tagImg(URL_ADMIN_IMG.'ico/edit.gif',
['alt' => $this->_("Paramétrer cette page"),
'title' => $this->_("Paramétrer cette page")]),
- ['class' => 'edit_profil']);
+ ['class' => 'edit_profil',
+ 'title' => $this->_('Paramétrer la page "%s"',
+ $profil->getLibelle())]);
echo $this->ComboProfils("ALL","ALL", $profil->getId(),true);
echo '</td>';
@@ -26,8 +32,8 @@
<td style="text-align:right;padding-right:10px">
<div class="credit">
© 2006-<?php print(date("Y")); ?>
- <?php echo $this->traduire('- Tous droits réservés - Hébergement & Conception graphique');?>
- <a href="http://www.afi-sa.net" target="_blank">AFI</a>
+ <?php echo $this->_('- Propulsé par ');?>
+ <a href="http://www.bokeh-library-portal.org" target="_blank" title="<?php echo $this->_('Site communautaire du projet Bokeh');?>">Bokeh</a>
</div>
</td>
</tr>
diff --git a/application/modules/opac/views/scripts/recherche/resultatRecherche.phtml b/application/modules/opac/views/scripts/recherche/resultatRecherche.phtml
index f2f3cca934f6f6349dc93f20e53cfd3949fbb6e7..500aa30802a28ce7ca42ee32095cb24c465b1195 100644
--- a/application/modules/opac/views/scripts/recherche/resultatRecherche.phtml
+++ b/application/modules/opac/views/scripts/recherche/resultatRecherche.phtml
@@ -33,18 +33,21 @@ if ($this->is_pertinence) {
<span>
<?php
echo $this->tagAnchor($this->url($this->criteres_recherche->getUrlRetourRechercheInitiale(), null, true),
- $this->_('Retour à la recherche initiale'));?>
+ $this->_('Retour à la recherche initiale'),
+ ['title' => $this->_('Accéder au formulaire de recherche pré-rempli avec les critères actuels')]);?>
</span>
<span>
<?php echo $this->tagAnchor($this->url($this->criteres_recherche->getUrlNouvelleRecherche(), null, true),
- $this->_('Nouvelle recherche')); ?>
+ $this->_('Nouvelle recherche'),
+ ['title' => $this->_('Lancer une recherche avec réinitialisation des paramètres')]); ?>
</span>
<?php
if ((int)$preferences['suggestion_achat'] == 1 && !Class_AdminVar::areSuggestionsDisabled())
echo $this->tag('span',
$this->tagAnchor(['controller' => 'abonne',
'action' => 'suggestion-achat'],
- $this->_('Suggérer un achat')));
+ $this->_('Suggérer un achat'),
+ ['title' => $this->_('Envoyer une demande d\'achat de document')]));
?>
<span class="print">
<?php
diff --git a/application/modules/opac/views/scripts/recherche/viewnotice.phtml b/application/modules/opac/views/scripts/recherche/viewnotice.phtml
index 558fb0ab8d336a64c66b8769cf3ff58cacae71f1..39a09cad42cd89fbc44994fa6699d179b5484ad7 100644
--- a/application/modules/opac/views/scripts/recherche/viewnotice.phtml
+++ b/application/modules/opac/views/scripts/recherche/viewnotice.phtml
@@ -16,27 +16,28 @@ $script_loader = Class_ScriptLoader::getInstance()
?>
<div class="navigation">
- <a class="retour" href="<?php echo $this->url($this->criteres_recherche->getUrlRetourListe(), null, true).'#'.$this->notice->getId(); ?>">
- <?php echo $this->_('Retour à la liste') ?>
- </a>
+ <?php
+ echo $this->tagAnchor(
+ $this->url($this->criteres_recherche->getUrlRetourListe(), null, true).'#'.$this->notice->getId(),
+ $this->_('Retour à la liste'),
+ ['title' => $this->_('Retourner au résultat de recherche'),
+ 'class' => 'retour']);
-<?php
echo $this->tagPrintLink([$this->notice], 'Notice_View');
-?>
+ echo $this->tagAnchor($this->url_panier,
+ $this->_('Ajouter au panier'),
+ ['class'=>'panier'.
+ ($this->notice->isInPanier()
+ ? ' dans_panier'
+ : ''),
+ 'data-popup' => 'true',
+ 'data-action' => $this->url_panier,
+ 'title' => $this->_('Ajouter "%s" dans un panier', $this->notice->getTitrePrincipal())]);
- <?php echo $this->tagAnchor($this->url_panier,
- $this->_('Ajouter au Panier'),
- ['class'=>'panier'.
- ($this->notice->isInPanier()
- ? ' dans_panier'
- : ''),
- 'data-popup' => 'true',
- 'data-action' => $this->url_panier,
- 'title' => $this->notice->getPaniersLibelles()]); ?>
- <?php
echo $this->Notice_LienReserver($this->notice);
+
if ($this->notice_navigation)
echo $this->Notice_Navigation($this->notice_navigation);
?>
@@ -51,12 +52,16 @@ $script_loader = Class_ScriptLoader::getInstance()
ZendAfi_View_Helper_Notice_Vignette::MODE_VIEW);
if ($this->display_modifier_vignette_link)
- echo sprintf('<a href="#" onclick="showPopWin(\'%s\', 750, 350); return false;">%s</a>',
- $this->url(['module' => 'admin',
- 'controller' => 'upload',
- 'action' => 'vignette-notice',
- ]),
- $this->_('Modifier la vignette'));
+ echo $this->tagAnchor('#',
+ $this->_('Modifier la vignette'),
+ ['onclick' => sprintf('showPopWin(\'%s\', 750, 350); return false;',
+ $this->url(['module' => 'admin',
+ 'controller' => 'upload',
+ 'action' => 'vignette-notice',
+ ])),
+ 'title' => $this->_('Modifier la vignette de la notice "%s"',
+ $this->notice->getTitrePrincipal())]
+ );
?>
<div id="reseaux-sociaux"><?php echo $this->reseauxSociaux($this->notice); ?></div>
@@ -86,9 +91,9 @@ $script_loader = Class_ScriptLoader::getInstance()
</div>
</div>
<?php
-//picto premier-chapitre
+
echo $this->premierChapitre_Lien($this->notice,['targetLink'=>'ancre']);
-// Entete Notice
+
echo sprintf('<div class="entete_notice">%s</div>'.
'<div class="flags_notice">%s</div>'.
'<div class="blocs_notice">%s</div>'.
@@ -97,7 +102,8 @@ echo sprintf('<div class="entete_notice">%s</div>'.
$this->notice_Flags($this->notice, $this->preferences),
$this->notice_Blocs($this->notice, $this->preferences)."<div class='clear'></div>",
$this->notice_Onglets($this->notice, $this->preferences));
-//frame premier-chapitre
-echo '<a name="pc_ancre"></a>'.$this->premierChapitre_Frame($this->notice);
+
+
+echo $this->premierChapitre_Frame($this->notice);
$this->closeBoite();
?>
diff --git a/library/Class/Notice.php b/library/Class/Notice.php
index a95909b86dbae606e52e409a780ef7de9c6205dd..bddeed951fc012a012ecdfcf60259bb6b3c85e8a 100644
--- a/library/Class/Notice.php
+++ b/library/Class/Notice.php
@@ -673,7 +673,9 @@ class Class_Notice extends Storm_Model_Abstract {
if (($item[0] != $champ) || (!$label = $codification->getLibelleFacette($item)))
continue;
- $ret[] = $this->getReboundFieldForFacet($item, $label);
+ $ret[] = $this->getReboundFieldForFacet($item,
+ $label,
+ $this->_('Rechercher tous les documents ayant comme %s:', $codification->getNomChamp($champ)));
}
return $ret;
}
@@ -1221,14 +1223,17 @@ class Class_Notice extends Storm_Model_Abstract {
$label = trim($prenom . ' ' . $nom) . (($fonction) ? ' (' . $fonction . ')': '');
return $this->getReboundFieldForFacet('A'.$codif_auteur->getId(),
- $label);
+ $label,
+ $this->_('Rechercher tous les documents ayant comme auteur: %s', $label));
}
- public function getReboundFieldForFacet($facet, $label) {
+ public function getReboundFieldForFacet($facet, $label, $title) {
return (new Class_Notice_Field())
->setId(substr($facet, 1))
->setLabel($label)
+ ->setTitle($title)
+
->setUrlParams(['controller' => 'recherche',
'action' => 'simple',
'code_rebond' => $facet,
diff --git a/library/Class/Notice/Field.php b/library/Class/Notice/Field.php
index bd438cdaca31686bbd14c2d2e0ff0356fab528a2..7dbd3056ad194bb28596b8bd37a60b4449d3ffda 100644
--- a/library/Class/Notice/Field.php
+++ b/library/Class/Notice/Field.php
@@ -42,7 +42,13 @@ class Class_Notice_Field extends Class_Entity {
if ($target = $this->getTarget())
$attribs['target'] = $target;
- return $view->tag('a', ($label = $this->getLabel()) ? $label : $url,
- $attribs);
+ $label = $this->getLabel()
+ ? $this->getLabel()
+ : $url;
+
+ if ($title = $this->getTitle())
+ $attribs['title'] = $title . ' ' . $label;
+
+ return $view->tag('a', $label, $attribs);
}
}
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/Accueil/Kiosque.php b/library/ZendAfi/View/Helper/Accueil/Kiosque.php
index 49bc06e4af3b9b4f72f140cbd31c1fe0d9fc9290..2bcb93e59fc0c8f918c0a5026e0cf5726beb450d 100644
--- a/library/ZendAfi/View/Helper/Accueil/Kiosque.php
+++ b/library/ZendAfi/View/Helper/Accueil/Kiosque.php
@@ -325,9 +325,26 @@ class ZendAfi_View_Helper_Accueil_Kiosque extends ZendAfi_View_Helper_Accueil_Ba
.'contenu.load($(this).attr(\'href\'), function(){contenu.animate({opacity:1}); initializeNoticeMurAnimation()});'
.'return false';
+ $title = $this->preferences['titre'];
return '<div class="controls">'
- .'<a href="'.$this->view->url(['controller' => 'java', 'action' => 'page', 'no' => $previous_page, 'id_module' => $this->id_module]).'" onclick="'.$onclick.'"></a>'
- .'<a href="'.$this->view->url(['controller' => 'java', 'action' => 'page', 'no' => $next_page, 'id_module' => $this->id_module]).'" onclick="'.$onclick.'"></a>'
+
+ . $this->view->tagAnchor(['controller' => 'java',
+ 'action' => 'page',
+ 'no' => $previous_page,
+ 'id_module' => $this->id_module],
+ '',
+ ['onclick' => $onclick,
+ 'title' => $this->view->_('Page précédente du kiosque "%s"',
+ $title)])
+
+ . $this->view->tagAnchor(['controller' => 'java',
+ 'action' => 'page',
+ 'no' => $next_page,
+ 'id_module' => $this->id_module],
+ '',
+ ['onclick' => $onclick,
+ 'title' => $this->view->_('Page suivante du kiosque "%s"',
+ $title)])
.'</div>';
}
}
diff --git a/library/ZendAfi/View/Helper/BarreNav.php b/library/ZendAfi/View/Helper/BarreNav.php
index 7f4f8406156e4f1f85d091cf71e0c66be8a2e07a..abe44128f485368ad5366ac66568ad0c507317de 100644
--- a/library/ZendAfi/View/Helper/BarreNav.php
+++ b/library/ZendAfi/View/Helper/BarreNav.php
@@ -41,7 +41,9 @@ class ZendAfi_View_Helper_BarreNav extends Zend_View_Helper_HtmlElement {
protected function getHtmlForLinks($links) {
$html = '<div class="barre_nav">';
foreach($links as $link)
- $html .= '<span>'.$this->view->tagAnchor($link['url'], $link['label']).'</span>';
+ $html .= '<span>'.$this->view->tagAnchor($link['url'],
+ $link['label'],
+ ['title' => $this->view->_('Niveau supérieur: %s', $link['label'])]).'</span>';
foreach($this->view->getMainTitles() as $title)
$html .= $this->view->tag('span', $title);
diff --git a/library/ZendAfi/View/Helper/BoitesBanniere.php b/library/ZendAfi/View/Helper/BoitesBanniere.php
index c18f86814cd417ac4a54c06dfbe8496d802ccfcd..f1c5ba73a5af0b071c4120f372415a93c5900723 100644
--- a/library/ZendAfi/View/Helper/BoitesBanniere.php
+++ b/library/ZendAfi/View/Helper/BoitesBanniere.php
@@ -16,18 +16,14 @@
*
* You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
* along with BOKEH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-// OPAC3 - Banniere de la page d'accueil
-//////////////////////////////////////////////////////////////////////////////////////////////////////
class ZendAfi_View_Helper_BoitesBanniere extends ZendAfi_View_Helper_BaseHelper {
public function boitesBanniere($profil) {
$boites_banniere = $profil->getBoitesDivision(Class_Profil::DIV_BANNIERE);
- $contenu = $this->view->portail(array('modules' => $boites_banniere));
+ $contenu = $this->view->portail(['modules' => $boites_banniere]);
return $contenu[Class_Profil::DIV_BANNIERE];
}
}
-
?>
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/Bookmarks.php b/library/ZendAfi/View/Helper/Bookmarks.php
index 7d719cacca70df1cc50095ba5f331f99f6ded25c..a328dd7d3978010196ed1fd670db8350b8789078 100644
--- a/library/ZendAfi/View/Helper/Bookmarks.php
+++ b/library/ZendAfi/View/Helper/Bookmarks.php
@@ -74,11 +74,14 @@ class ZendAfi_View_Helper_Bookmarks extends ZendAfi_View_Helper_BaseHelper {
},
$this->_bookmarks);
- $edit = $this->view->tagAnchor($this->view->url(['module' => 'opac', 'controller' => 'abonne' , 'action' => 'settings'], null, true),
- $this->_('Modifier mes favoris'),
- ['title' => $this->_('Modifier mes favoris'),
- 'class' => 'bookmarks_edit',
- 'data-popup' => 'true']);
+ $edit = $this->view->tagAnchor(
+ $this->view->url(['module' => 'opac',
+ 'controller' => 'abonne' ,
+ 'action' => 'settings'], null, true),
+ $this->_('Modifier mes favoris (bibliothèques, domaines, ...)'),
+ ['class' => 'bookmarks_edit',
+ 'data-popup' => 'true',
+ 'title' => $this->_('Modifier mes favoris (bibliothèques, domaines, ...) dans une boîte de dialogue')]);
diff --git a/library/ZendAfi/View/Helper/Facettes.php b/library/ZendAfi/View/Helper/Facettes.php
index 6b3bdf6dcec536e56c0835a6003ab9bdb5b3060f..e70d8bac6e09fe2ff12413a4a05dc8a4ab685423 100644
--- a/library/ZendAfi/View/Helper/Facettes.php
+++ b/library/ZendAfi/View/Helper/Facettes.php
@@ -110,8 +110,11 @@ class ZendAfi_View_Helper_Facettes extends ZendAfi_View_Helper_BaseHelper {
return $this
->_tag('li',
- $this->_tag('a', $this->_('Afficher plus de facettes...'),
- ['href' => '#'])
+ $this->_tag('a',
+ $this->_('Afficher plus de facettes...'),
+ ['href' => '#',
+ 'title' => $this->_('Afficher plus de facettes "%s"',
+ Class_Codification::getInstance()->getNomChamp($code))])
. $this->_tag('ul', $html,
['id' => $type . '_msg',
'style' => 'display:none']),
@@ -127,10 +130,11 @@ class ZendAfi_View_Helper_Facettes extends ZendAfi_View_Helper_BaseHelper {
protected function renderLi($url, $code, $count) {
$label = Class_Codification::getInstance()->getLibelleFacette($code);
+ $title = Class_Codification::getInstance()->getNomChamp($code);
return $this
->_tag('li',
$this->renderCheckbox($code)
- . $this->renderLabel($url, $label)
+ . $this->renderLabel($url, $label, $title)
. $this->renderCount($count)
. $this->renderRemove($code, $label),
['class' => 'facette' . ($this->isActive($code) ? ' selected' : '')]);
@@ -146,10 +150,11 @@ class ZendAfi_View_Helper_Facettes extends ZendAfi_View_Helper_BaseHelper {
}
- protected function renderLabel($url, $label) {
+ protected function renderLabel($url, $label, $title) {
return $this->view->tagAnchor($this->view->url($url, null, true),
$label,
- ['class' => 'facette']);
+ ['class' => 'facette',
+ 'title' => $this->view->_('Affiner le résultat par %s: %s', lcfirst($title), $label)]);
}
@@ -166,7 +171,8 @@ class ZendAfi_View_Helper_Facettes extends ZendAfi_View_Helper_BaseHelper {
return $this->view->tagAnchor($remove_url,
$this->_('Retirer ') . $label,
['class' => 'remove_facette',
- 'style' => 'display:none']);
+ 'style' => 'display:none',
+ 'title' => $this->view->_('Retirer la facette: %s', $label)]);
}
diff --git a/library/ZendAfi/View/Helper/IconeSupport.php b/library/ZendAfi/View/Helper/IconeSupport.php
index eedd8d2e68ba81caeedd7b05d00396396770b239..10b381c9cda62182befe2c2b4d47817aeee56b18 100644
--- a/library/ZendAfi/View/Helper/IconeSupport.php
+++ b/library/ZendAfi/View/Helper/IconeSupport.php
@@ -18,7 +18,8 @@
* along with BOKEH; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-class ZendAfi_View_Helper_IconeSupport extends Zend_View_Helper_HtmlElement {
+
+class ZendAfi_View_Helper_IconeSupport extends ZendAfi_View_Helper_BaseHelper {
protected $_filename_by_support = array(
1 => 'famille_livre_small.png',
2 => 'famille_periodique_small.png',
@@ -44,34 +45,43 @@ class ZendAfi_View_Helper_IconeSupport extends Zend_View_Helper_HtmlElement {
public function iconeSupport($type_doc_id) {
$type_doc = Class_TypeDoc::find($type_doc_id);
- return sprintf('<img class="icone_support" src="%s" alt="%s" style="border:0" title="%s" />',
- $this->imageForSupport($type_doc_id),
- $this->view->_('Support'),
- isset($type_doc) ? $type_doc->getLibelle() : '');
+
+ $type_doc_label = isset($type_doc)
+ ? $this->_('Type de document: %s', $type_doc->getLibelle())
+ : '';
+
+ return $this->view
+ ->tagImg($this->imageForSupport($type_doc_id),
+ ['class' => 'icone_support',
+ 'alt' => $type_doc_label,
+ 'title' => $type_doc_label]);
}
public function pathInSkin($filename) {
- return PATH_SKIN.'/images/supports/'.$filename;
+ return PATH_SKIN . '/images/supports/' . $filename;
}
+
public function urlInSkin($filename) {
- return URL_IMG.'supports/'.$filename;
+ return URL_IMG . 'supports/' . $filename;
}
+
public function pathInAdmin($filename) {
- return PATH_ADMIN_SUPPORTS.$filename;
+ return PATH_ADMIN_SUPPORTS . $filename;
}
+
public function urlInAdmin($filename) {
- return URL_ADMIN_IMG.'supports/'.$filename;
+ return URL_ADMIN_IMG . 'supports/' . $filename;
}
public function imageForSupport($type_doc_id) {
//keep format support_xxx_.gif for backward compatibility
foreach(['gif', 'png'] as $extension) {
- $filename = 'support_'.$type_doc_id.'.'.$extension;
+ $filename = 'support_' . $type_doc_id . '.' . $extension;
if ($this->fileExists($this->pathInSkin($filename)))
return $this->urlInSkin($filename);
diff --git a/library/ZendAfi/View/Helper/ListeNotices/Tableau.php b/library/ZendAfi/View/Helper/ListeNotices/Tableau.php
index e2034b5188fc7e805d9e0128dd0dacfa8d38e524..20cc09afbe599aae00acf508f809be95abcf04a0 100644
--- a/library/ZendAfi/View/Helper/ListeNotices/Tableau.php
+++ b/library/ZendAfi/View/Helper/ListeNotices/Tableau.php
@@ -52,10 +52,9 @@ class ZendAfi_View_Helper_ListeNotices_Tableau extends ZendAfi_View_Helper_Liste
$this->view->urlNotice($notice),
$notice->getTitrePrincipal());
else if($champ=="A") {
- $html.= sprintf('<td class="%s"><a href="%s">%s</a></td>',
+ $html.= sprintf('<td class="%s">%s</td>',
$style_css,
- $this->view->notice_LienRebondAuteur($notice),
- $notice->getAuteurPrincipal());
+ $this->view->notice_LienRebondAuteur($notice));
}
else {
if (!$value = $notice->getChampNotice($champ, $notice->getFacettes())) {
diff --git a/library/ZendAfi/View/Helper/Menu/Entry.php b/library/ZendAfi/View/Helper/Menu/Entry.php
index 4e24a1b871610f666d323d0b3661ffeeda2d7560..e8c6b536fdc0f5f448287133f1573ccf4a7ebf76 100644
--- a/library/ZendAfi/View/Helper/Menu/Entry.php
+++ b/library/ZendAfi/View/Helper/Menu/Entry.php
@@ -64,7 +64,7 @@ class ZendAfi_View_Helper_Menu_Entry extends ZendAfi_View_Helper_Menu_Base {
? "target='".$params['target']."'"
: '';
- $anchor='<a href="'.htmlspecialchars($url).'" '.$target.'>';
+ $anchor='<a href="'.htmlspecialchars($url).'" '.$target.' >';
if($this->_picto > '' and $this->_picto != "vide.gif") {
$anchor.= $this->view->tagImgHover($img_URL.$this->_picto,
diff --git a/library/ZendAfi/View/Helper/MenuHorizontal.php b/library/ZendAfi/View/Helper/MenuHorizontal.php
index cc3fcbf840a10c99eb3ff7d37d645e1c7829bc8d..08cfb62b6e38329a2825f9512a76e4f4cec842fd 100644
--- a/library/ZendAfi/View/Helper/MenuHorizontal.php
+++ b/library/ZendAfi/View/Helper/MenuHorizontal.php
@@ -44,7 +44,7 @@ class ZendAfi_View_Helper_MenuHorizontal extends ZendAfi_View_Helper_BaseHelper
$helper->setIdMenu('H');
$helper->setView($this->view);
- return '<div id="'.$tag_id.'" class="menu_horizontal">'
+ return '<div id="'.$tag_id.'" class="menu_horizontal" role="navigation">'
.$this->tagEditMenu()
.$helper->getBoite()
.'</div>';
diff --git a/library/ZendAfi/View/Helper/Notice/Entete.php b/library/ZendAfi/View/Helper/Notice/Entete.php
index c0f9d30883b3f6024ba4a7f11093ba2840ef5899..5630c6390135251a1f0f2ad912b020c86404eec3 100644
--- a/library/ZendAfi/View/Helper/Notice/Entete.php
+++ b/library/ZendAfi/View/Helper/Notice/Entete.php
@@ -42,9 +42,13 @@ class ZendAfi_View_Helper_Notice_Entete extends ZendAfi_View_Helper_BaseHelper {
$criteres = new Class_CriteresRecherche();
$serie = $notice->getClefChapeau();
+ $label = Class_Codification::getLibelleForSerie($notice);
+
return $this
- ->_tag('a', Class_Codification::getLibelleForSerie($notice),
+ ->_tag('a',
+ $label,
['class' => 'serie',
+ 'title' => $this->view->_('Lancer une recherche pour %s', lcfirst($label)),
'href' => $this->view->url($criteres->getNewUrlCriteresSerie($serie), null, true)]);
}
diff --git a/library/ZendAfi/View/Helper/Notice/HtmlThumbnail.php b/library/ZendAfi/View/Helper/Notice/HtmlThumbnail.php
index 9787ddbe1a394a159a86459f3b309f61fd9556fc..8235744ba4f951a024e87418e489d65ea2945809 100644
--- a/library/ZendAfi/View/Helper/Notice/HtmlThumbnail.php
+++ b/library/ZendAfi/View/Helper/Notice/HtmlThumbnail.php
@@ -20,21 +20,26 @@
*/
-class ZendAfi_View_Helper_Notice_HtmlThumbnail extends Zend_View_Helper_HtmlElement {
+class ZendAfi_View_Helper_Notice_HtmlThumbnail extends ZendAfi_View_Helper_BaseHelper {
public function Notice_HtmlThumbnail($notice, $preferences = []) {
$url = $this->view->urlNotice($notice, $preferences);
$onclick = 'javascript:window.location=\''.$url.'\'';
- $img = $this->view->tagImg(URL_ADMIN_IMG . 'blank.gif', ['title' => '',
- 'alt' => '']);
+ $img = $this->view->tagImg(URL_ADMIN_IMG . 'blank.gif');
- $anchor = $this->view->tagAnchor($url, $this->view->tag('div', $notice->getAuteurPrincipal()) .
- $this->view->tag('div', $notice->getTitrePrincipal()));
+ $title = $notice->getTitrePrincipal();
+ $author = $notice->getAuteurPrincipal();
- $nothumbnail = $this->view->tag('div', $img . $anchor, ['class' => 'nothumbnail type_doc_'.$notice->getTypeDoc(),
- 'onclick' => $onclick]);
+ $anchor = $this->view->tagAnchor($url,
+ $this->_tag('div', $author) .
+ $this->_tag('div', $title),
+ ['title' => $this->_('Afficher "%s" de %s', $title, $author)]);
- return $this->view->tag('div', $nothumbnail, ['class' => 'nothumbnail_wrapper']);
+ $nothumbnail = $this->_tag('div', $img . $anchor,
+ ['class' => 'nothumbnail type_doc_' . $notice->getTypeDoc(),
+ 'onclick' => $onclick]);
+
+ return $this->_tag('div', $nothumbnail,
+ ['class' => 'nothumbnail_wrapper']);
}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/Notice/LienRebondAuteur.php b/library/ZendAfi/View/Helper/Notice/LienRebondAuteur.php
index 494f6132ddf96655e7a33b8f27038da0966a25d2..cfb9821abdd58956a50234d1a8cd9d1ef0738d0d 100644
--- a/library/ZendAfi/View/Helper/Notice/LienRebondAuteur.php
+++ b/library/ZendAfi/View/Helper/Notice/LienRebondAuteur.php
@@ -20,10 +20,14 @@
*/
class ZendAfi_View_Helper_Notice_LienRebondAuteur extends Zend_View_Helper_HtmlElement {
public function notice_LienRebondAuteur($notice) {
- return $this->view->url(['controller' => 'recherche',
- 'action' => 'simple',
- 'code_rebond' => $notice->getCodeFacette('A'),
- 'page' => null]);
+ return $this->view->tagAnchor(['controller' => 'recherche',
+ 'action' => 'simple',
+ 'code_rebond' => $notice->getCodeFacette('A'),
+ 'page' => null],
+
+ $notice->getAuteurPrincipal(),
+
+ ['title' => $this->view->_('Rechercher tous les documents ayant pour auteur: "%s"', $notice->getAuteurPrincipal())]);
}
}
diff --git a/library/ZendAfi/View/Helper/Notice/LienReserver.php b/library/ZendAfi/View/Helper/Notice/LienReserver.php
index 14beed7d98f20061d919852a606289d5fa0039a7..f7ebc3aa51ee3418096bf2ca722c9636e37dd643 100644
--- a/library/ZendAfi/View/Helper/Notice/LienReserver.php
+++ b/library/ZendAfi/View/Helper/Notice/LienReserver.php
@@ -25,15 +25,21 @@ class ZendAfi_View_Helper_Notice_LienReserver extends Zend_View_Helper_HtmlEleme
$this->loadScript();
$can_request_sigb = Class_AdminVar::isAfficherDispoSurRechercheEnabled();
$id_notice = $notice->getId();
- $titre = str_replace(['\'','"'], ['\\\'',''], $this->view->_('Réserver %s', $notice->getTitrePrincipal()));
- $labelle = $this->view->_('Réserver');
+
$url = $this->view->url(['controller' => 'noticeAjax',
'action' => 'exemplaires'],
null,
true).'/id_notice/'.$id_notice;
- $link = '<a href="#" title="Réserver" data-popup="true" onclick="openDialogExemplaires(\''.$titre.'\',\''.$url.'\',$(this));return false;">'.$labelle.'</a>';
-
+ $titre = str_replace(['\'','"'], ['\\\'',''], $notice->getTitrePrincipal());
+ $link = $this->view->tagAnchor('#',
+ $this->view->_('Réserver'),
+ ['data-popup' => 'true',
+ 'onclick' =>
+ "openDialogExemplaires('"
+ . $titre . "','"
+ . $url . "', $(this));return false;",
+ 'title' => $this->view->_('Réserver "%s"', $notice->getTitrePrincipal())]);
if ($can_request_sigb && $notice->hasExemplaireReservable())
return $link;
diff --git a/library/ZendAfi/View/Helper/Notice/Mur.php b/library/ZendAfi/View/Helper/Notice/Mur.php
index 6a15cf33fd0d815f254fd05ac74b8b859c773fca..e71a459fabf375ae70edca2ff7e6b1c112e45b29 100644
--- a/library/ZendAfi/View/Helper/Notice/Mur.php
+++ b/library/ZendAfi/View/Helper/Notice/Mur.php
@@ -23,13 +23,16 @@ class ZendAfi_View_Helper_Notice_Mur extends Zend_View_Helper_HtmlElement {
public function notice_Mur($notice, $preferences=[]) {
$champs = isset($preferences['liste_codes']) ? $preferences['liste_codes'] : 'TANE';
- $datas = sprintf('<span class="notice_titre"><a href="%s">%s</a></span>',
- $this->view->urlNotice($notice, $preferences),
- $notice->getTitreEtSousTitre());
- $datas .= sprintf('- <span class="notice_auteur"><a href="%s">%s</a></span>',
- $this->view->notice_LienRebondAuteur($notice),
- $notice->getAuteurPrincipal());
+ $datas = $this->view->tag('span',
+ $this->view->tagAnchor($this->view->urlNotice($notice, $preferences),
+ $notice->getTitreEtSousTitre(),
+ ['title' => $this->_('Afficher "%s"',
+ $notice->getTitrePrincipal())]),
+ ['class' => 'notice_titre']);
+
+ $datas .= sprintf('- <span class="notice_auteur">%s</span>',
+ $this->view->notice_LienRebondAuteur($notice));
$datas .=
(strrchr($champs,'9') && $notice->isNouveaute())
@@ -63,7 +66,11 @@ class ZendAfi_View_Helper_Notice_Mur extends Zend_View_Helper_HtmlElement {
$notice->numberOfAvisBibliothecaire(),
'coups de coeur');
- $html .= '<li><a href="'. $this->view->urlNotice($notice) .'#reseaux-sociaux" data-mur-partager="' . $notice->getId() . '" title="Partager"> </a></li>';
+ $html .= $this->view->tag('li',
+ $this->view->tagAnchor($this->view->urlNotice($notice) .'#reseaux-sociaux',
+ ' ',
+ ['data-mur-partager' => $notice->getId(),
+ 'title' => $this->view->_('Partager "%s" sur les réseaux sociaux', $notice->getTitrePrincipal())]));
$html .= $this->barreDeLienPanier($notice);
diff --git a/library/ZendAfi/View/Helper/Notice/Vignette.php b/library/ZendAfi/View/Helper/Notice/Vignette.php
index 7347a191548a833b4f89e79fc04df6cd9519d9b0..14e17dfe35b79320150b0ca545dbc0131e63036e 100644
--- a/library/ZendAfi/View/Helper/Notice/Vignette.php
+++ b/library/ZendAfi/View/Helper/Notice/Vignette.php
@@ -77,12 +77,8 @@ abstract class ZendAfi_View_Helper_Notice_VignetteStrategy {
protected function _renderImage() {
$url = $this->_record->fetchUrlVignette();
return $this->view->tagImg($this->view->absoluteUrl($url),
- array_merge(
- ['alt' => $this->_('Vignette'),
- 'title' => Class_WebService_Vignette::getSource($url),
- 'style' => 'border:0'],
- $this->_extraThumbnailParams()
- ));
+ array_merge(['alt' => $this->_record->getTitrePrincipal()],
+ $this->_extraThumbnailParams()));
}
@@ -95,16 +91,26 @@ abstract class ZendAfi_View_Helper_Notice_VignetteStrategy {
class ZendAfi_View_Helper_Notice_VignetteStrategyResult
extends ZendAfi_View_Helper_Notice_VignetteStrategy {
+ protected $_label;
+
+ public function render($view, $record, $preferences) {
+ $this->_label = $this->_('Afficher "%s"', $record->getTitrePrincipal());
+
+ return parent::render($view, $record, $preferences);
+ }
+
protected function _renderThumbnail() {
return $this->view->tagAnchor($this->view->urlNotice($this->_record,
$this->_preferences),
- $this->_renderImage());
+ $this->_renderImage(),
+ ['title' => $this->_label]);
}
protected function _extraThumbnailParams() {
- return ['width' => 90];
+ return ['style' => 'width:90px',
+ 'alt' => $this->_label];
}
}
diff --git a/library/ZendAfi/View/Helper/NuageTags.php b/library/ZendAfi/View/Helper/NuageTags.php
index f7aa7994eb330ae4ad1bdd7a8c542f603485633e..bda4a619a66adb41fa675912647be6634a7bd8b0 100644
--- a/library/ZendAfi/View/Helper/NuageTags.php
+++ b/library/ZendAfi/View/Helper/NuageTags.php
@@ -18,12 +18,8 @@
* along with BOKEH; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-//////////////////////////////////////////////////////////////////////////////////////////
-// OPAC3 : Nuages de tags
-//////////////////////////////////////////////////////////////////////////////////////////
class ZendAfi_View_Helper_NuageTags extends ZendAfi_View_Helper_BaseHelper {
-
function nuageTags($tags,$calcul=3,$criteres_recherche=null) {
Class_ScriptLoader::getInstance()->addSkinStyleSheet('nuage_tags');
// Parametres
@@ -59,8 +55,12 @@ class ZendAfi_View_Helper_NuageTags extends ZendAfi_View_Helper_BaseHelper {
else
$tag_url = $url.'/code_rebond/'.$tag['id'];
- $html.='<span class="nuage"><a class="'.$classe.'" href="'.$tag_url.'">'.$tag["libelle"].' </a></span>';
-
+ $html .= $this->view->tag('span',
+ $this->view->tagAnchor($tag_url,
+ $tag["libelle"],
+ ['class' => $classe,
+ 'title' => $this->view->_('Lancer une recherche sur: %s', $tag['libelle'])]),
+ ['class' => 'nuage']);
}
$html.='</div>';
return $html;
diff --git a/library/ZendAfi/View/Helper/Pager.php b/library/ZendAfi/View/Helper/Pager.php
index 3624cc48c4964d56b8474312075283ec78267b76..5b1ed8697535336a8c2ea85ec9eb2ffc8a8840bd 100644
--- a/library/ZendAfi/View/Helper/Pager.php
+++ b/library/ZendAfi/View/Helper/Pager.php
@@ -49,7 +49,10 @@ class ZendAfi_View_Helper_Pager extends ZendAfi_View_Helper_BaseHelper {
$html = '';
for($i=$deb; $i <= $fin; $i++)
- $html .= $this->_renderLink(($i == $page ? '#' : $url), $i, $i);
+ $html .= $this->_renderLink(($i == $page ? '#' : $url),
+ $i,
+ $i,
+ $this->view->_('Aller à la page %d', $i));
return $html;
}
@@ -57,14 +60,21 @@ class ZendAfi_View_Helper_Pager extends ZendAfi_View_Helper_BaseHelper {
protected function _renderPreviousLink($url, $page) {
return ($page > 1)
- ? $this->_renderLink($url, ($page - 1), "«", 'previous')
+ ? $this->_renderLink($url, ($page - 1),
+ "«",
+ $this->view->_('Aller à la page précédente'),
+ 'previous')
: '';
}
protected function _renderNextLink($url, $page, $nb_pages) {
return ($page < $nb_pages)
- ? $this->_renderLink($url, ($page + 1), "»", 'next')
+ ? $this->_renderLink($url,
+ ($page + 1),
+ "»",
+ $this->view->_('Aller à la page suivante'),
+ 'next')
: '';
}
@@ -88,7 +98,7 @@ class ZendAfi_View_Helper_Pager extends ZendAfi_View_Helper_BaseHelper {
}
- protected function _renderLink($href, $page, $libelle, $class = '') {
+ protected function _renderLink($href, $page, $libelle, $title, $class = '') {
if ($href == "#")
$class = 'current';
@@ -99,8 +109,10 @@ class ZendAfi_View_Helper_Pager extends ZendAfi_View_Helper_BaseHelper {
return
$this->_tag('span',
- $this->view->tagAnchor($href, $libelle),
- $class ? ['class' => $class] : []);
+ $this->view->tagAnchor($href,
+ $libelle,
+ ['title' => $title]),
+ array_filter(['class' => $class]));
}
}
diff --git a/library/ZendAfi/View/Helper/PremierChapitre/Frame.php b/library/ZendAfi/View/Helper/PremierChapitre/Frame.php
index 88efe23edc62d6daab5b603bcbfacda3897fbd8a..2dc2ea05ab67b852a6c3a22425f4711323f0f3d6 100644
--- a/library/ZendAfi/View/Helper/PremierChapitre/Frame.php
+++ b/library/ZendAfi/View/Helper/PremierChapitre/Frame.php
@@ -30,7 +30,7 @@ class ZendAfi_View_Helper_PremierChapitre_Frame
if (!$model = $this->_detectPremierChapitre($data))
return '';
- return $this
+ return '<a name="pc_ancre"></a>'.$this
->_tag('iframe',
'',
['id' => 'pc_frame',
diff --git a/library/ZendAfi/View/Helper/ReseauxSociaux.php b/library/ZendAfi/View/Helper/ReseauxSociaux.php
index d85895592b5071ca1c2920eca2c46ed6d2e63884..f826ca84ee5ffaefc8644a8360a711bbae8ca823 100644
--- a/library/ZendAfi/View/Helper/ReseauxSociaux.php
+++ b/library/ZendAfi/View/Helper/ReseauxSociaux.php
@@ -22,24 +22,19 @@
class ZendAfi_View_Helper_ReseauxSociaux extends ZendAfi_View_Helper_BaseHelper {
protected $reseaux;
- /**
- * @param $object Class_Article or Class_Notice
- * @return string
- */
public function reseauxSociaux($article_or_notice_or_profil, $reseaux = []) {
$this->reseaux = array_merge($this->view->getHelper('ShareUrl')->getReseaux(),
$reseaux);
- if (!$article_or_notice_or_profil)
- return '';
-
- return $article_or_notice_or_profil->renderOn($this);
-
+ return $article_or_notice_or_profil
+ ? $article_or_notice_or_profil->renderOn($this)
+ : '';
}
public function renderArticle($article) {
- return $this->links(['url_to_share'=>$this->view->url($article->getUrl()).'?id_profil=' . Class_Profil::getCurrentProfil()->getId(),
+ $url = $this->view->url($article->getUrl());
+ return $this->links(['url_to_share' => $this->_urlWithProfil($url),
'titre' => $article->getTitre(),
'message' => 'article',
'img_url' => $article->getFirstImageURL()]);
@@ -47,17 +42,20 @@ class ZendAfi_View_Helper_ReseauxSociaux extends ZendAfi_View_Helper_BaseHelper
public function renderNotice($notice) {
- $id_profil = Class_Profil::getCurrentProfil()->getId();
-
- return $this->links(['url_to_share'=>$this->view->urlNotice($notice).'?id_profil='.$id_profil,
+ return $this->links(['url_to_share' => $this->_urlWithProfil($this->view->urlNotice($notice)),
'titre' => $notice->getTitreEtSousTitre().' - '.$notice->getAuteurPrincipal(),
'message' => $notice->getResume(),
'img_url' => $notice->getUrlVignette()]);
}
+ protected function _urlWithProfil($url) {
+ return $url .'?id_profil=' . Class_Profil::getCurrentProfil()->getId();
+ }
+
+
public function renderProfil($profil) {
- return $this->headerLinks(['url_to_share'=>Zend_Controller_Front::getInstance()->getBaseUrl(),
+ return $this->headerLinks(['url_to_share' => Zend_Controller_Front::getInstance()->getBaseUrl(),
'titre' => $profil->getTitreSite(),
'message' => $profil->getCommentaire(),
'img_url' => $profil->getHeaderImg()]);
@@ -65,30 +63,30 @@ class ZendAfi_View_Helper_ReseauxSociaux extends ZendAfi_View_Helper_BaseHelper
public function links($info_to_share) {
- $html='<div class="vignette-reseaux-sociaux reseaux-sociaux">';
- $html.= $this->shareLinkHtmlHeader($info_to_share);
- $html.= $this->view->permalink($this->view->absoluteUrl($info_to_share['url_to_share']));
- $html.='</div>';
- return $html;
+ return $this->_tag('div',
+ $this->shareLinkHtmlHeader($info_to_share) .
+ $this->view->permalink($this->view->absoluteUrl($info_to_share['url_to_share'])),
+ ['class' => 'vignette-reseaux-sociaux reseaux-sociaux']);
}
- public function headerLinks($info_to_share){
- $html= '<div class="share">';
- $html.= $this->shareLinkHtmlHeader($info_to_share);
- if(isset($this->reseaux['mail']) && !$this->reseaux['mail']=='')
- $html.= $this->view->shareByMail($this->getHeaderShareIco('mail')['url_ico_reseau']);
- return $html.= '</div>';
+ public function headerLinks($info_to_share) {
+ $mail_share = isset($this->reseaux['mail']) && $this->reseaux['mail'] != ''
+ ? $this->view->shareByMail($this->getHeaderShareIco('mail')['url_ico_reseau'])
+ : '';
+
+ return $this->_tag('div',
+ $this->shareLinkHtmlHeader($info_to_share) . $mail_share,
+ ['class' => 'share']);
}
public function shareLinkHtml($info) {
$html = '';
- foreach($this->reseaux as $clef => $reseau) {
+ foreach($this->reseaux as $clef => $reseau)
$html.= $this->shareLinkImgHtml($clef,
- array_merge($this->shareLinkUrlTable($clef,$info),
+ array_merge($this->shareLinkUrlTable($clef, $info),
$this->getShareIco($clef)));
- }
return $html;
}
@@ -96,27 +94,30 @@ class ZendAfi_View_Helper_ReseauxSociaux extends ZendAfi_View_Helper_BaseHelper
public function shareLinkHtmlHeader($info) {
$html = '';
foreach($this->reseaux as $clef => $reseau) {
- if($clef=='mail')
+ if ($clef == 'mail')
continue;
- $html.= $this->shareLinkImgHtml($clef,
- array_merge($this->shareLinkUrlTable($clef,$info),
- $this->getHeaderShareIco($clef)));
+ $html .= $this->shareLinkImgHtml($clef,
+ array_merge($this->shareLinkUrlTable($clef,$info),
+ $this->getHeaderShareIco($clef)));
}
+
return $html;
}
- public function shareLinkImgHtml($clef,$url_table) {
+ public function shareLinkImgHtml($clef, $url_table) {
+ $label = $this->_('Partager "%s" sur %s', $url_table['titre'], $clef);
+
return $this->view->tagImgHover($url_table['url_ico_reseau'],
['class' => 'reseau-social-img',
- 'alt' => sprintf("%s ".$clef, $this->translate()->_('icone')),
- 'title' => sprintf("%s ".$clef, $this->translate()->_('partager sur')),
- 'onclick' => sprintf('$.getScript(\'%s\')',$this->getScriptFromController($url_table))]);
+ 'alt' => $label,
+ 'title' => $label,
+ 'onclick' => sprintf('$.getScript(\'%s\')', $this->getScriptFromController($url_table))]);
}
- public function shareLinkUrlTable($clef,$info){
+ public function shareLinkUrlTable($clef, $info){
return ['on' => $clef,
'url' => urlencode($info['url_to_share']),
'titre' => $info['titre'],
@@ -125,11 +126,10 @@ class ZendAfi_View_Helper_ReseauxSociaux extends ZendAfi_View_Helper_BaseHelper
}
-
public function getScriptFromController($url_table){
return $this->view->url(['controller' => 'social-network',
'action' => 'share',
- 'on' =>$url_table['on'],
+ 'on' => $url_table['on'],
'url' => $url_table['url'],
'titre' => $url_table['titre'],
'message'=> $url_table['message'],
diff --git a/library/ZendAfi/View/Helper/Suggests.php b/library/ZendAfi/View/Helper/Suggests.php
index 6e9994158ce3a7efa18bc1213fb431cbced401c5..7d0653b6ac1a5e6223b550e32a1fb3dc1767951d 100644
--- a/library/ZendAfi/View/Helper/Suggests.php
+++ b/library/ZendAfi/View/Helper/Suggests.php
@@ -34,8 +34,9 @@ class ZendAfi_View_Helper_Suggests extends ZendAfi_View_Helper_BaseHelper {
return
$this->_tag('li',
$this->_tag('a',
- $suggest['label'],
- ['href' => $url_base . '/code_rebond/'.$suggest['id']]),
+ $suggest['label'],
+ ['href' => $url_base . '/code_rebond/'.$suggest['id'],
+ 'title' => $this->view->_('Lancer une recherche sur: %s', $suggest['label'])]),
['class' => 'facette']);
},
diff --git a/library/ZendAfi/View/Helper/TagAddToCart.php b/library/ZendAfi/View/Helper/TagAddToCart.php
index c19556defb0ac56cd084f77cafa9339021bc5580..da277a12160a56953f8a3bfcac6fa752f9aa3312 100644
--- a/library/ZendAfi/View/Helper/TagAddToCart.php
+++ b/library/ZendAfi/View/Helper/TagAddToCart.php
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
* along with BOKEH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
@@ -31,12 +31,13 @@ class ZendAfi_View_Helper_TagAddToCart extends Zend_View_Helper_HtmlElement {
'id_notice' => $notice->getId(),
], null, true);
- return $this->view->tagAnchor($url, ' ', [
- 'data-popup' => "true",
- 'data-action' => $url,
- 'title' => $this->_("Ajouter au panier"),
- ]);
-
+ return $this->view->tagAnchor($url,
+ ' ',
+ [
+ 'data-popup' => "true",
+ 'data-action' => $url,
+ 'title' => $this->_('Ajouter "%s" au panier', $notice->getTitrePrincipal()),
+ ]);
}
}
?>
diff --git a/library/ZendAfi/View/Helper/TagBanniere.php b/library/ZendAfi/View/Helper/TagBanniere.php
index ecf131f14644d6b636d9bde472a46ef4cb8c8c93..f5467d0955bface6043713c6f9deda0d5893e3d1 100644
--- a/library/ZendAfi/View/Helper/TagBanniere.php
+++ b/library/ZendAfi/View/Helper/TagBanniere.php
@@ -32,11 +32,12 @@ class ZendAfi_View_Helper_TagBanniere extends Zend_View_Helper_HtmlElement {
$top_profil = $this->_profil->getParentsAndSelf()[0];
- return sprintf('<div id="banniere">%s<a class="home" href="%s" style="display:block">%s</a></div>',
+ return sprintf('<div id="banniere">%s<a class="home" href="%s" title="%s" style="display:block">%s</a></div>',
$this->_getLogos(),
$this->view->url(['id_profil' => $top_profil->getId()],
null,
true),
+ $this->view->_('Page d\'accueil du site'),
$this->_getImages());
}
diff --git a/library/ZendAfi/View/Helper/TagCriteresRecherche.php b/library/ZendAfi/View/Helper/TagCriteresRecherche.php
index 2f0b895f9960cb9875a53d72ad0a8b7bd6e820d6..903b31af94fb9587d5f5d9f9916edd415739b316 100644
--- a/library/ZendAfi/View/Helper/TagCriteresRecherche.php
+++ b/library/ZendAfi/View/Helper/TagCriteresRecherche.php
@@ -30,7 +30,9 @@ class ZendAfi_View_Helper_TagCriteresRecherche extends ZendAfi_View_Helper_BaseH
public function tagCriteresRecherche($criteres_recherche) {
$this->visitCriteresRecherche($criteres_recherche);
$this->_injectMultiFacets();
- return '<div class="criteres_recherche">'.$this->_html.'</div>';
+
+ return $this->_tag('div', $this->_html,
+ ['class' => 'criteres_recherche']);
}
@@ -77,53 +79,53 @@ class ZendAfi_View_Helper_TagCriteresRecherche extends ZendAfi_View_Helper_BaseH
$url = $this->_criteres_recherche->getUrlCriteresWithoutElement('nouveaute');
$libelle = $this->view->_('Nouveautés de moins de: ') . $nouveaute . ' ' . $this->_('mois');
- $this->htmlAppend($this->getSuppressionImgUrlForLibelle($libelle,$url));
+ $this->htmlAppend($this->getSuppressionImgUrlForLibelle($libelle, $url));
}
public function visitAnnexe($annexe) {
$this
- ->htmlAppend($this->view->_("Site: ".Class_Codification::getInstance()->getLibelleFacette("Y".$annexe)))
- ->htmlAppend(' » <a href="'. $this->view->url(['annexe' => null]) . '">' . $this->_('Elargir la recherche à tous les sites') .'</a>');
+ ->htmlAppend($this->view->_('Site: %s', Class_Codification::getInstance()->getLibelleFacette('Y' . $annexe)))
+ ->htmlAppend(' » ' . $this->_tag('a', $this->_('Elargir la recherche à tous les sites'),
+ ['href' => $this->view->url(['annexe' => null])]));
}
public function visitTypeDoc($type_doc) {
$url = $this->_criteres_recherche->getUrlCriteresWithoutElement('type_doc');
- $libelle = $this->view->_("Type de document: %s", Class_Codification::getInstance()->getLibelleFacette("T".$type_doc));
- $this->htmlAppend($this->getSuppressionImgUrlForLibelle($libelle,$url));
+ $libelle = $this->view->_('Type de document: %s', Class_Codification::getInstance()->getLibelleFacette('T' . $type_doc));
+ $this->htmlAppend($this->getSuppressionImgUrlForLibelle($libelle, $url));
}
public function visitSerie($serie,$tri) {
$url = $this->_criteres_recherche->getUrlCriteresWithoutElement('serie');
$libelle = Class_Codification::getLibelleForSerie(Class_Notice::findFirstNoticeForClefChapeau($serie));
- $this->htmlAppend($this->getSuppressionImgUrlForLibelle($libelle,$url));
-
+ $this->htmlAppend($this->getSuppressionImgUrlForLibelle($libelle, $url));
}
public function visitCodeRebond($code_rebond) {
$url = $this->_criteres_recherche->getUrlCriteresWithoutElement('code_rebond');
$libelle = $this->view->_("Recherche élargie à : %s", Class_Codification::getInstance()->getLibelleFacette($code_rebond));
- $this->htmlAppend($this->getSuppressionImgUrlForLibelle($libelle,$url));
+ $this->htmlAppend($this->getSuppressionImgUrlForLibelle($libelle, $url));
}
public function visitAnneeDebutFin($annee_debut, $annee_fin) {
- $texte = $this->view->_("Documents parus ");
+ $texte = $this->view->_('Documents parus ');
$texte .= ($annee_debut == $annee_fin)
- ? "en " . $annee_debut
- : $this->view->_("entre %s et %s", $annee_debut, $annee_fin);
+ ? 'en ' . $annee_debut
+ : $this->view->_('entre %s et %s', $annee_debut, $annee_fin);
$url = $this->_criteres_recherche->getUrlCriteresWithoutElement('annee_debut');
unset($url['annee_fin']);
- $this->htmlAppend($this->getSuppressionImgUrlForLibelle($texte,$url));
+ $this->htmlAppend($this->getSuppressionImgUrlForLibelle($texte, $url));
}
public function visitFacette($facette) {
$facette = new Class_Notice_Facette($facette);
- $libelle = $facette->getCodeRubriqueLibelle().': '.$facette->getLibelleFacette();
+ $libelle = $facette->getCodeRubriqueLibelle() . ': ' . $facette->getLibelleFacette();
$this->htmlAppend($this->getSuppressionImgUrlForLibelle($libelle,
$this->_criteres_recherche->getUrlRemoveFacette($facette)));
}
@@ -131,7 +133,11 @@ class ZendAfi_View_Helper_TagCriteresRecherche extends ZendAfi_View_Helper_BaseH
public function getSuppressionImgUrlForLibelle($libelle,$url) {
unset($url['page']);
- return '<a href="'.$this->view->url($url,null,true).'">'.$libelle.'<img src="'.URL_IMG.'suppression.gif" style="border:0" title="'.$this->_('Retirer').'" alt="'.$this->_('Retirer').'"></a>';
+ $title = $this->view->_('Retirer le critère: %s', $libelle);
+ return $this->view->tagAnchor($this->view->url($url, null, true),
+ $libelle .
+ $this->view->tagImg(URL_IMG . 'suppression.gif'),
+ ['title' => $title]);
}
@@ -147,27 +153,13 @@ class ZendAfi_View_Helper_TagCriteresRecherche extends ZendAfi_View_Helper_BaseH
}
- public function visitFiltre($filtre) {
- return;
-
- $libelle_filtre = $this->_('Filtre ').Class_Codification::getInstance()->getNomFacette($filtre[0]).': ';
-
- $libelle_facettes = [];
- foreach($filtre as $facette)
- $libelle_facettes []= Class_Codification::getInstance()->getLibelleFacette($facette);
-
- $this->htmlAppend($libelle_filtre.implode(', ', $libelle_facettes));
- }
-
-
public function visitSection($section) {
$url = $this->_criteres_recherche->getUrlCriteresWithoutElement('section');
- $libelle = $this->_("Section: %s", Class_Codification::getInstance()->getLibelleFacette("S".$section));
+ $libelle = $this->_('Section: %s', Class_Codification::getInstance()->getLibelleFacette('S'.$section));
$this->htmlAppend($this->getSuppressionImgUrlForLibelle($libelle,$url));
}
-
public function visitMultiFacet($facet) {
if (!$facet)
return;
diff --git a/library/ZendAfi/View/Helper/TagImgHover.php b/library/ZendAfi/View/Helper/TagImgHover.php
index 0428a2999beaf55cecee655c7136b37c8629cd09..34188e17be79aea9ed02bdc1e0fa6cc0e5333ae1 100644
--- a/library/ZendAfi/View/Helper/TagImgHover.php
+++ b/library/ZendAfi/View/Helper/TagImgHover.php
@@ -16,31 +16,33 @@
*
* You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
* along with BOKEH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
class ZendAfi_View_Helper_TagImgHover extends Zend_View_Helper_HtmlElement {
/**
* @param string $path
* @param array $attribs
* @return string
*/
- public function tagImgHover($url, Array $attribs = array()) {
- $tronked= $this->getTronk($url);
+ public function tagImgHover($url, $attribs = []) {
+ $tronked = $this->getTronk($url);
$path_hover = Class_Profil::getCurrentProfil()->getSkinImagePath($tronked);
- $url_hover = URL_IMG.$tronked;
- if(file_exists($path_hover)){
+ $url_hover = URL_IMG . $tronked;
+
+ if(file_exists($path_hover))
$attribs['data-hover'] = $url_hover;
- }
+
return $this->view->tagImg($url, $attribs);
}
+
public function getTronk($url) {
- $hover='/hover/';
- $tronked_url= str_replace(URL_IMG,'',$url);
- $tronked_array = explode('/',$tronked_url);
+ $hover = '/hover/';
+ $tronked_url = str_replace(URL_IMG, '', $url);
+ $tronked_array = explode('/', $tronked_url);
$img = array_pop($tronked_array);
- $tronk=implode($tronked_array).$hover.$img;
- return $tronk;
+
+ return implode($tronked_array) . $hover . $img;
}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/TagRechercheSimple.php b/library/ZendAfi/View/Helper/TagRechercheSimple.php
index 20eaa3e716a761f2958501f67ab089e7a4a45a9e..870480a22afb04e5c81b1b0496f7001f0f750068 100644
--- a/library/ZendAfi/View/Helper/TagRechercheSimple.php
+++ b/library/ZendAfi/View/Helper/TagRechercheSimple.php
@@ -165,7 +165,7 @@ class ZendAfi_View_Helper_TagRechercheSimple extends Zend_View_Helper_HtmlElemen
$action_url['id_profil'] = $this->preferences["profil_redirect"];
return
- '<form name="form" action="'.$this->view->url($action_url, null, true).'" method="get" class="rechSimpleForm">'
+ '<form name="form" role="search" action="'.$this->view->url($action_url, null, true).'" method="get" class="rechSimpleForm">'
.'<div>'.$content.'</div>'
.'</form>';
}
@@ -174,10 +174,11 @@ class ZendAfi_View_Helper_TagRechercheSimple extends Zend_View_Helper_HtmlElemen
// Champ de saisie
//---------------------------------------------------------------------
private function getChampSaisie() {
- $attribs = ['type' => 'text',
+ $attribs = ['type' => 'search',
'id' => 'expressionRecherche_'.$this->id_module,
'class' => 'expressionRecherche',
'name' => 'expressionRecherche',
+ 'title' => $this->view->_('Expression recherchée'),
'placeholder' => $this->preferences['placeholder'],
'style' => 'width:'.$this->preferences["largeur"].'px',
'onkeypress' => 'if (event.keyCode == 13) {this.form.submit();return false;}'];
diff --git a/library/ZendAfi/View/Helper/TagRss.php b/library/ZendAfi/View/Helper/TagRss.php
index b5616ed642a5cda309fb279fec7a2c1188b156e7..4a45674eeb97383126586dbde6099d2019553df4 100644
--- a/library/ZendAfi/View/Helper/TagRss.php
+++ b/library/ZendAfi/View/Helper/TagRss.php
@@ -16,22 +16,18 @@
*
* You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
* along with BOKEH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-class ZendAfi_View_Helper_TagRss extends Zend_View_Helper_HtmlElement {
- /**
- * @param string $url
- * @param string $description
- * @return string
- */
- public function tagRss($url, $description) {
- return sprintf('<div class="rss"><a href="%s" target="_blank"><img src="%s" border="0" alt="%s" title="%s"/></a></div>',
- $url,
- URL_IMG.'rss.gif',
- $description,
- $description);
- }
-}
+class ZendAfi_View_Helper_TagRss extends ZendAfi_View_Helper_BaseHelper {
+ public function tagRss($url, $label) {
+ $label = $this->_('%s dans une nouvelle fenêtre', $label);
-?>
\ No newline at end of file
+ return $this->_tag('div',
+ $this->view->tagAnchor($url,
+ $this->view->tagImg(URL_IMG . 'rss.gif', ['alt' => $label]),
+ ['title' => $label,
+ 'target' => '_blank']),
+ ['class' => 'rss']);
+ }
+}
\ No newline at end of file
diff --git a/tests/application/modules/AbstractControllerTestCase.php b/tests/application/modules/AbstractControllerTestCase.php
index 656c487e779095482f22b455b31efe5e25240e42..baece20fee2abb30d7ab5571c3d485783bb46f33 100644
--- a/tests/application/modules/AbstractControllerTestCase.php
+++ b/tests/application/modules/AbstractControllerTestCase.php
@@ -312,6 +312,95 @@ abstract class AbstractControllerTestCase extends Zend_Test_PHPUnit_ControllerTe
}
+ public function assertAnchorsHaveTitle($message = '') {
+ $links = '';
+
+ foreach($this->queryXPath('//a[not(@title)]') as $element) {
+ $links .= '* ' . $element->getAttribute('href') . "\n";
+ }
+
+ $this->assertEmpty($links,
+ "Failed asserting no anchors without title:\n" . $links . $message);
+ return $this;
+ }
+
+
+
+ public function assertAnchorsTitlesDuplicationLimitCount($count_limit = 3,
+ $message = '') {
+ $links = [];
+
+ foreach($this->queryXPath('//a[@title]') as $element) {
+ $links []= $element->getAttribute('title');
+ }
+
+ $duplicates = array_filter(array_count_values($links),
+ function($count, $title) use ($count_limit)
+ {
+ return $count >= $count_limit;
+ },
+ ARRAY_FILTER_USE_BOTH);
+
+ $links = '';
+ foreach($duplicates as $title => $count) {
+ $links .= '* ' . $count . ' -> ' . $title . "\n";
+ }
+
+ $this->assertEmpty($links,
+ "Failed asserting anchors title duplicates less than $count_limit:\n"
+ . $links
+ . $message);
+ return $this;
+ }
+
+
+ public function assertImgWithTitleHaveIdenticalAlt($message = '') {
+ $imgs = [];
+ foreach($this->queryXPath('//img[@title][not(@title=@alt)]') as $element) {
+ $imgs []= $element->getAttribute('src');
+ }
+
+ $this->assertEmpty($imgs,
+ "Failed asserting img with titles have same alt:\n* "
+ . implode("\n* ", $imgs)
+ . $message);
+ return $this;
+ }
+
+
+ public function assertAnchorsTitleDifferentFromContent($message = '') {
+ $links = [];
+ foreach($this->queryXPath('//a[@title=text()]') as $element) {
+ $links []= $element->getAttribute('href');
+ }
+
+ $this->assertEmpty($links,
+ "Failed asserting anchors have different title than content:\n* "
+ . implode("\n* ", $links)
+ . $message);
+ return $this;
+ }
+
+
+ public function queryXPath($xpath) {
+ $dom = new Zend_Dom_Query($this->_response->getBody());
+ $result = $dom->queryXPath($xpath);
+ return count($result)
+ ? $result
+ : [];
+ }
+
+
+ public function assertAccessible($message = '') {
+ $this
+ ->assertAnchorsTitleDifferentFromContent($message)
+ ->assertImgWithTitleHaveIdenticalAlt($message)
+ ->assertAnchorsHaveTitle($message)
+ ->assertAnchorsTitlesDuplicationLimitCount(8,
+ $message);
+ }
+
+
public function xhprofile($closure) {
xhprof_enable();
diff --git a/tests/application/modules/opac/controllers/JavaControllerTest.php b/tests/application/modules/opac/controllers/JavaControllerTest.php
index 62e944ed8537e01437edf666c7d7c3d60c004387..4f708a3c6fbb3afa075f9c26cc8868c4c0d6a7f3 100644
--- a/tests/application/modules/opac/controllers/JavaControllerTest.php
+++ b/tests/application/modules/opac/controllers/JavaControllerTest.php
@@ -123,6 +123,12 @@ class JavaControllerWithKiosqueMurPageTest extends AbstractControllerTestCase {
public function lastControlShouldLinkToPageThree() {
$this->assertXPath('//div[@class="controls"]/a[2][contains(@href, "java/page/no/3/id_module/1")]');
}
+
+
+ /** @test */
+ public function pageShouldBeAccessible() {
+ $this->assertAccessible($this->_response->getBody());
+ }
}
diff --git a/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php b/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php
index 711efbada485c484eda91d4385694f8db1131976..d9e49dfc5d6cbbf1ce390a083d148f844007a3e1 100644
--- a/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php
+++ b/tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php
@@ -499,6 +499,12 @@ class ProfilOptionsControllerViewProfilAdulteTest extends ProfilOptionsControlle
}
+ /** @test */
+ public function horizontalMenuShouldHaveRoleNavigation() {
+ $this->assertXPath('//div[@id="menu_horizontal"][@role="navigation"]');
+ }
+
+
/** @test */
public function menuHorizontalShouldIncludeLinkToArticleCms() {
$this->assertXPathContentContains("//div[@id='menu_horizontal']//li//a[contains(@href, 'cms/articleviewpreferences/id_items/1-3/nb_aff/5/nb_analyse/10/display_order/Selection')]",
@@ -721,6 +727,12 @@ class ProfilOptionsControllerViewProfilAdulteHtml5Test extends ProfilOptionsCont
public function pageShouldBeHtml5Valid() {
$this->assertHTML5($this->_response->getBody());
}
+
+
+ /** @test */
+ public function pageShouldBeAccessible() {
+ $this->assertAccessible($this->_response->getBody());
+ }
}
diff --git a/tests/application/modules/opac/controllers/RechercheControllerTest.php b/tests/application/modules/opac/controllers/RechercheControllerTest.php
index b041d711b402fe80f66565539aa0222ffcfb1f19..84cf6854f52a57eea2bbbb7fc9d276d09e595e2a 100644
--- a/tests/application/modules/opac/controllers/RechercheControllerTest.php
+++ b/tests/application/modules/opac/controllers/RechercheControllerTest.php
@@ -486,17 +486,25 @@ class RechercheControllerViewNoticeWithPreferencesTest extends RechercheControll
$this->assertXPath('//div[@class="view_notice type_doc_1"]');
}
+
/** @test */
public function tabTitleShouldContainTitle() {
$this->assertXPath('//div[contains(@class, "titre_onglet") and h2]');
}
+
/** @test */
public function pageShouldBeHTML5Valid() {
$this->assertHTML5();
}
+ /** @test */
+ public function pageShouldBeAccessible() {
+ $this->assertAccessible($this->_response->getBody());
+ }
+
+
/**
* @test
*/
@@ -689,7 +697,8 @@ class RechercheControllerViewNoticeClefAlphaTest extends RechercheControllerNoti
/** @test */
public function retourListeShouldLinkToRechercheSimpleWithHashTagIdNotice() {
$this->assertXPathContentContains('//div/a[@class="retour"][contains(@href, "/recherche/simple/expressionRecherche/Millenium#345")]',
- 'Retour à la liste');
+ 'Retour à la liste',
+ $this->_response->getBody());
}
/** @test */
@@ -1389,6 +1398,7 @@ abstract class RechercheControllerSimpleActionListeFormatTestCase extends Abstra
class RechercheControllerSimpleActionWithListeFormatMurTest extends RechercheControllerSimpleActionListeFormatTestCase {
protected $_liste_format = Class_Systeme_ModulesAppli::LISTE_FORMAT_MUR;
+
public function setUp() {
parent::setUp();
$this->dispatch('/recherche/simple/expressionRecherche/potter/facettes/T1/facette/B1/page/2', true);
@@ -1443,15 +1453,25 @@ class RechercheControllerSimpleActionWithListeFormatMurTest extends RechercheCon
$this->assertXPathContentContains('//div[@class="criteres_recherche"]//div', 'Type de document: Livre');
}
+
/** @test */
- public function iconeSupportShouldHaveTitleLivres() {
- $this->assertXPath('//img[@class="icone_support"][@title="Livres"]');
+ public function iconeSupportShouldHaveTitleDocTypeLivres() {
+ $this->assertXPath('//img[@class="icone_support"][@title="Type de document: Livres"]',
+ $this->_response->getBody());
}
+
/** @test */
public function pageResultatMurShouldBeHTML5Valid() {
$this->assertHTML5();
}
+
+
+ /** @test */
+ public function pageShouldBeAccessible() {
+ $this->assertAccessible($this->_response->getBody());
+ }
+
}
@@ -2526,9 +2546,9 @@ class RechercheControllerViewNoticeWhichIsInMyPanier extends RechercheController
/** @test **/
- public function viewnoticeLinkAddToPanierTitleShouldBeDansBd() {
+ public function viewnoticeLinkAddToPanierTitleShouldBeAccessible() {
$this->dispatch('recherche/viewnotice/id/10',true);
- $this->assertXpath('//div[@class="navigation"]/a[@class="panier dans_panier"][@title="Dans le panier Mes BD"]',$this->_response->getBody());
+ $this->assertXpath('//div[@class="navigation"]/a[@title=\'Ajouter "Le combat des pommes" dans un panier\']',$this->_response->getBody());
}
diff --git a/tests/library/ZendAfi/View/Helper/Accueil/RechSimpleTest.php b/tests/library/ZendAfi/View/Helper/Accueil/RechSimpleTest.php
index 4c8302ed4eaa67a75b05987e0baffd26908f9cc6..59b04cc56e85b467abf2d95458c7eae5f03f0a66 100644
--- a/tests/library/ZendAfi/View/Helper/Accueil/RechSimpleTest.php
+++ b/tests/library/ZendAfi/View/Helper/Accueil/RechSimpleTest.php
@@ -57,6 +57,12 @@ class ZendAfi_View_Helper_Accueil_RechSimpleWithAdminTest extends ZendAfi_View_H
}
+ /** @test */
+ public function inputSearchExpressionShouldHaveTypeSearchRoleSearch() {
+ $this->assertLocalXPath('//form[@role="search"]//input[@type="search"][@name="expressionRecherche"][@title="Expression recherchée"]');
+ }
+
+
/** @test */
public function configActionShouldBePresent() {
$this->assertLocalXPath('//img[contains(@onclick, "/admin/accueil/rechsimple?config=accueil")]');
diff --git a/tests/library/ZendAfi/View/Helper/FacettesTest.php b/tests/library/ZendAfi/View/Helper/FacettesTest.php
index 490e4649807d8503c5c07ad1eb0d3e37f32a1ee3..815b6272faa7f7000bf6bdfbe6c808bc134becd5 100644
--- a/tests/library/ZendAfi/View/Helper/FacettesTest.php
+++ b/tests/library/ZendAfi/View/Helper/FacettesTest.php
@@ -169,6 +169,15 @@ class ZendAfi_View_Helper_FacettesRestrainedTest extends ZendAfi_View_Helper_Fac
}
+ /** @test */
+ public function facetFrancoisChattotTitleShouldContainsRefineSearchForAuthor() {
+ $this->assertXPath($this->_html,
+ '//a[@class="facette"][contains(@href, "/A63246")][contains(@title, "Affiner le résultat par auteur: François Chattot")]', $this->_html);
+ }
+
+
+
+
/** @test */
public function linkForFacetOlivierRichardShouldNotBePresent() {
$this->assertNotXPath($this->_html,
diff --git a/tests/library/ZendAfi/View/Helper/Notice/EnteteTest.php b/tests/library/ZendAfi/View/Helper/Notice/EnteteTest.php
index 1d3798e18279cefd1b5bc5ae05c280b42ec7023f..715aeb2c08957db7f22395c3c007fbc2037c2fe3 100644
--- a/tests/library/ZendAfi/View/Helper/Notice/EnteteTest.php
+++ b/tests/library/ZendAfi/View/Helper/Notice/EnteteTest.php
@@ -107,4 +107,11 @@ class ZendAfi_View_Helper_Notice_EnteteTest extends ViewHelperTestCase {
'//dl//dd/a[contains(@href, "/code_rebond/T101")]',
'Diaporama');
}
+
+
+ /** @test */
+ public function doctypeReboudTitleShouldBeSearchAllDiaporamaDocuments() {
+ $this->assertXPath($this->_html,
+ '//dl/dd/a[contains(@title, "Rechercher tous les documents ayant comme Type de document: Diaporama")]', $this->_html);
+ }
}
\ No newline at end of file
diff --git a/tests/library/ZendAfi/View/Helper/Notice/MurTest.php b/tests/library/ZendAfi/View/Helper/Notice/MurTest.php
index 1aacee23b445a19f740af87985a5d9cd52116440..23f2db51d2b031e559c1fabea1c2bac4ff7fad38 100644
--- a/tests/library/ZendAfi/View/Helper/Notice/MurTest.php
+++ b/tests/library/ZendAfi/View/Helper/Notice/MurTest.php
@@ -57,7 +57,7 @@ class ZendAfi_View_Helper_Notice_MurForNoticeTest extends ZendAfi_View_Helper_No
/** @test */
public function divShouldContainsVignette() {
$this->assertXPath($this->_html,
- '//div[@class="notice"]//a[contains(@href,"/recherche/viewnotice/id/2")]//img[contains(@src, "hp.png")][@width="90"]', $this->_html);
+ '//div[@class="notice"]//a[contains(@href,"/recherche/viewnotice/id/2")]//img[contains(@src, "hp.png")][@style="width:90px"]', $this->_html);
}
/** @test */