(no commit message)

diff --git a/framework/application/forms/Settings.php b/framework/application/forms/Settings.php
index 8966e058a69f724003c2fa47eb6c2b0e528ad759..585dbfda274f9ba294fd66154572f919ca8fc37c 100644 (file)
--- a/framework/application/forms/Settings.php
+++ b/framework/application/forms/Settings.php
@@ -11,7 +11,6 @@ class Cubedesigners_Form_Settings extends CubeIT_Form_Settings {
                $locales->setLabel('Langues actives');
                $this->addElement($locales);
 
-
                $longTitle = new Zend_Form_Element_Text('longTitle');
                $longTitle->setLabel('Titre long par défaut (limité à 65 caractères)');
                $longTitle->setAttrib('maxlength', 65);
@@ -23,6 +22,18 @@ class Cubedesigners_Form_Settings extends CubeIT_Form_Settings {
                $description->setAttrib('rows', 2);
                $this->addElementLocalized($description);
 
+               /*
+                * Logo
+                */
+
+               $logoTitle = new Zend_Form_Element_Text('logoTitle');
+               $logoTitle->setLabel('Titre (logo)');
+               $this->addElementLocalized($logoTitle);
+
+               $baseline = new Zend_Form_Element_Text('baseline');
+               $baseline->setLabel('Baseline');
+               $this->addElementLocalized($baseline);
+
                /* BLOC CONTACT */
                $contact = new Cubedesigners_Form_CMS_Sub_Contact();
                $contact->setLabel('Informations de contact');

diff --git a/framework/application/views/scripts/common/header.phtml b/framework/application/views/scripts/common/header.phtml
index 43868fdcd836cb02a74dfc83ed7eef5928f76f85..ec7d33ea2186efb3020033ed0e3727920fdf2ebb 100644 (file)
--- a/framework/application/views/scripts/common/header.phtml
+++ b/framework/application/views/scripts/common/header.phtml
@@ -9,21 +9,17 @@ if (!is_null($homepage)) {
 ?>
 <header>
     <div id="header" class="content">
-
                <?php
                /* LOGO */
-
                echo $this->link($this->image('/images/logo.svg', '', 318, 132), $home, array('class' => 'logo'));
                if ($this->currentPage && $this->currentPage->getTemplate() == 'home') {
-                       echo '<div class="sublogo"><h1>Cubedesigners</h1><h2>Agence de création sur mesure</h2></div>';
+                       echo '<div class="sublogo"><h1>' . $this->logoTitle . '</h1><h2>' . $this->baseline . '</h2></div>';
                } else {
-                       echo '<div class="sublogo"><h2>Cubedesigners</h2><h3>Agence de création sur mesure</h3></div>';
+                       echo '<div class="sublogo"><h2>' . $this->logoTitle . '</h2><h3>' . $this->baseline . '</h3></div>';
                }
-
                /* NAVIGATION */
                $mainMenu = $this->navigation()->findOneById($this->localeDefault() . '/' . CubeIT_Navigation::MAIN);
                echo $this->navigation()->menu()->renderMenu($mainMenu, array('maxDepth' => 0)) . "\n";
                ?>
-
     </div>
 </header>
\ No newline at end of file