done #539 @3

diff --git a/framework/application/forms/CMS/Sub/Social/Network.php b/framework/application/forms/CMS/Sub/Social/Network.php
index 14e188e237b8bbcfbc2f9641fe508a7f19be4290..3c57872e3849f24eb547c880d4fa3013783b2f38 100644 (file)
--- a/framework/application/forms/CMS/Sub/Social/Network.php
+++ b/framework/application/forms/CMS/Sub/Social/Network.php
@@ -2,25 +2,24 @@
 
 class Fluidbook_Form_CMS_Sub_Social_Network extends CubeIT_Form_SubForm {
 
-    public function init() {
-        parent::init();
+       public function init() {
+               parent::init();
 
-        $title = new Zend_Form_Element_Text('title');
-        $title->setLabel('Titre du réseau social');
-        $this->addElement($title);
+               $title = new Zend_Form_Element_Text('title');
+               $title->setLabel('Titre du réseau social');
+               $this->addElement($title);
 
-        $url = new CubeIT_Form_Element_Url('url');
-        $url->setLabel('URL');
-        $this->addElement($url);
+               $url = new CubeIT_Form_Element_Url('url');
+               $url->setLabel('URL');
+               $this->addElement($url);
 
-        $couleur = new CubeIT_Form_Element_Color('color');
-        $couleur->setLabel('Couleur');
-        $this->addElement($couleur);
+               $couleur = new CubeIT_Form_Element_Color('color');
+               $couleur->setLabel('Couleur');
+               $this->addElement($couleur);
 
-        $icon = new CubeIT_Form_Element_File_Image('icon');
-        $icon->setLabel('Pictogramme');
-        $icon->setMaxItems(1);
-        $this->addElement($icon);
-    }
+               $icon = new Zend_Form_Element_Text('icon');
+               $icon->setLabel('Pictogramme (fontastic)');
+               $this->addElement($icon);
+       }
 
 }
\ No newline at end of file

diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
index b1249209bbb48cbd5fe7b00246cb87e810777288..d9370beaa22f146be98d0349b1be1a9ed8163618 100644 (file)
--- a/framework/application/views/scripts/common/footer.phtml
+++ b/framework/application/views/scripts/common/footer.phtml
@@ -29,9 +29,11 @@ $res .= $this->footerMenu($this->option('footer_menu_contact'), __('Contactez-no
 \r
 $res .= '<div class="footer-social">';\r
 foreach ($this->option('social_networks') as $social) {\r
-    $res .= '<a href="'. $social['url'] .'" style="color:'. $social['color'] .'" class="social-link" target="_blank">';\r
-    $res .= $this->imageCms($social['icon'], $social['title'], 52, 52);\r
-    $res .= '</a>';\r
+       $res .= '<style type="text/css">';\r
+       $res .= '#s-' . $social['icon'] . ':hover{background-color: ' . $social['color'] . ';border-color: ' . $social['color'] . ';}';\r
+       $res .= '</style>';\r
+       $res .= '<a href="' . $social['url'] . '" id="s-' . $social['icon'] . '" class="social-link fb-' . $social['icon'] . '" target="_blank">';\r
+       $res .= '</a>';\r
 }\r
 $res .= '</div>'; // .footer-social\r
 \r

diff --git a/js/104-nav.js b/js/104-nav.js
index 16ad0ae97c60c5a3a36aa16d1ce7940f418efec5..57f5c9d869e6f2d32fcb049f2221b82bbb4a4deb 100644 (file)
--- a/js/104-nav.js
+++ b/js/104-nav.js
@@ -14,11 +14,9 @@ function load_nav() {
     var social = [];\r
 \r
     $(".footer-social a").each(function () {\r
-        social.push($(this)[0].outerHTML);\r
+        social.push('<div>' + $(this)[0].outerHTML + '</div>');\r
     });\r
 \r
-    fb(social);\r
-\r
 \r
     $("#mmenu").mmenu({\r
         offCanvas: {\r

diff --git a/less/102-footer.less b/less/102-footer.less
index 3fb5ca341717b24c6aa9fa71676862e75a5549f9..ece8796b41f53381c38ecda08e5612c6ab59f452 100644 (file)
--- a/less/102-footer.less
+++ b/less/102-footer.less
@@ -115,16 +115,17 @@ footer.site {
        height: 54px;
        width: 54px;
        color: #fff;
+       font-size: 27px;
+       line-height: 60px;
+       text-align: center;
+       &:hover {
+               color: #fff;
+       }
 
        &:last-of-type {
                margin-right: 0;
        }
 
-       &:hover {
-               background-color: currentColor;
-               border-color: currentColor;
-       }
-
        img {
                display: block;
        }

diff --git a/less/105-mmenu.less b/less/105-mmenu.less
index 224b23368c5a9a000636078eacedd79f4645f35a..bbfa915e3e0fcf829f04a26ea6c7361881720d90 100644 (file)
--- a/less/105-mmenu.less
+++ b/less/105-mmenu.less
@@ -143,8 +143,22 @@ html.mm-front #mm-blocker {
        }\r
 }\r
 \r
+.mm-navbar-bottom {\r
+       text-align: center;\r
+       display: inline-block;\r
+       margin: 0 auto;\r
+       bottom: 50px;\r
+}\r
+\r
 #mmenu {\r
        .social-link {\r
+               border-color: #a5acb2;\r
                color: #a5acb2;\r
+               line-height: 60px;\r
+               padding: 0;\r
+               &:hover {\r
+                       text-shadow: none;\r
+                       color: #fff;\r
+               }\r
        }\r
 }\r