Skip to content
Snippets Groups Projects
Commit 2f06b25d authored by llaffont's avatar llaffont
Browse files

Fil d'arianne: n'affiche plus le titre de la page (par rapport à

l'action)  mais le titre du contenu
parent fcbe739c
Branches
Tags 6.20
No related merge requests found
......@@ -30,7 +30,9 @@ class ZendAfi_Controller_Action_Helper_View extends Zend_View {
private $ouverture_boite; // Html du haut de la boite
private $fermeture_boite; // Html du bas de la boite
protected $_is_popup = false;
protected
$_is_popup = false,
$_first_subtitle = '';
public function __set($key, $val) {
......@@ -194,10 +196,19 @@ class ZendAfi_Controller_Action_Helper_View extends Zend_View {
public function titreAdd($subtitle) {
if (!isset($this->_main_title))
$this->_main_title = $subtitle;
$this->titre = $this->getTitre() . ' - ' . $subtitle;
}
public function getMainTitle() {
if (!isset($this->_main_title))
return $this->titre;
return $this->_main_title;
}
public function newForm($options = null) {
return ZendAfi_Form::newWithOptions($options);
......
......@@ -36,8 +36,10 @@ class ZendAfi_View_Helper_BarreNav extends Zend_View_Helper_HtmlElement {
foreach($links as $link)
$html .= '<span>'.$this->view->tagAnchor($link['url'], $link['label']).'</span>';
if ($current_action = $this->view->_current_module['preferences']['barre_nav'])
$html .= '<span>'.$current_action.'</span>';
// if ($current_action = $this->view->_current_module['preferences']['barre_nav'])
// $html .= '<span>'.$current_action.'</span>';
$html .= '<span>'.$this->view->getMainTitle().'</span>';
return $html.'</div>';
}
......
......@@ -305,13 +305,6 @@ class AbonneControllerFormationsListTest extends AbstractAbonneControllerFormati
}
/** @test */
public function barreNavShouldContainsLesFormations() {
$this->assertXPathContentContains('//div[@class="barre_nav"]//span',
'Les formations');
}
/** @test */
public function barreNavShouldContainsMonCompte() {
$this->assertXPathContentContains('//div[@class="barre_nav"]//span//a[contains(@href, "index/index?id_profil=2")]',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment