Done #499 @1.5

diff --git a/framework/application/forms/CMS/Sub/Social/Network.php b/framework/application/forms/CMS/Sub/Social/Network.php
index b7bbf56993b1cc852df4e1b7e4151395b863acfe..14e188e237b8bbcfbc2f9641fe508a7f19be4290 100644 (file)
--- a/framework/application/forms/CMS/Sub/Social/Network.php
+++ b/framework/application/forms/CMS/Sub/Social/Network.php
@@ -13,6 +13,10 @@ class Fluidbook_Form_CMS_Sub_Social_Network extends CubeIT_Form_SubForm {
         $url->setLabel('URL');
         $this->addElement($url);
 
+        $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);

diff --git a/framework/application/views/helpers/FooterMenu.php b/framework/application/views/helpers/FooterMenu.php
index 2de83dfc0e66035d5afd2f00e48880fab79d43eb..40823f1d016a865cbfe5651365187a3498e9a7ac 100644 (file)
--- a/framework/application/views/helpers/FooterMenu.php
+++ b/framework/application/views/helpers/FooterMenu.php
@@ -2,7 +2,7 @@
 
 class Fluidbook_View_Helper_FooterMenu extends CubeIT_View_Helper_Abstract {
 
-    public function footerMenu($pageIDs, $title = null) {
+    public function footerMenu($pageIDs, $title = null, $titleLink = null) {
 
         if (empty($pageIDs)) return false;
 
@@ -21,7 +21,13 @@ class Fluidbook_View_Helper_FooterMenu extends CubeIT_View_Helper_Abstract {
         $res = '<div class="footer-menu">';
 
         if ($title) {
-            $res .= '<strong class="menu-title">'. $title .'</strong>';
+            $titleHTML = '<strong class="menu-title">'. $title .'</strong>';
+            
+            if ($titleLink) {
+                $res .= $this->link($titleHTML, $titleLink);
+            } else {
+                $res .= $titleHTML;
+            }
         }
 
         $res .= $this->htmlList($links);

diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
index 93b1dac3bcfe16013501fa4c438b20a88af49945..b391110dab03425f792e07090d1f3166482a3644 100644 (file)
--- a/framework/application/views/scripts/common/footer.phtml
+++ b/framework/application/views/scripts/common/footer.phtml
@@ -16,7 +16,7 @@ $res .= $this->link($logo, 'internal:home');
 $res .= '<address>';\r
 $res .= "{$address['adresse']} - {$address['code_postal']} {$address['ville']} $country";\r
 $res .= '<br>';\r
-$res .= __('Tél.') . ' ' . $address['phone'];\r
+$res .= __('Tél.') . ' ' . $this->linkPhone($address['phone']);\r
 $res .= '<br>';\r
 $res .= $this->linkEmail($address['email']);\r
 $res .= '</address>';\r
@@ -24,11 +24,11 @@ $res .= '</div>'; // .contact-details
 \r
 // Menus\r
 $res .= $this->footerMenu($this->option('footer_menu_main'), __('Plan du site'));\r
-$res .= $this->footerMenu($this->option('footer_menu_contact'), __('Contactez-nous'));\r
+$res .= $this->footerMenu($this->option('footer_menu_contact'), __('Contactez-nous'), 'internal:contact');\r
 \r
 $res .= '<div class="footer-social">';\r
 foreach ($this->option('social_networks') as $social) {\r
-    $res .= '<a href="'. $social['url'] .'" class="social-link" target="_blank">';\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
 }\r

diff --git a/less/102-footer.less b/less/102-footer.less
index 544e7b35f33209f53220a8f4727875d4363c06e5..9856f90f32fe5ff7b3d14eb8daf05ea83be6094d 100644 (file)
--- a/less/102-footer.less
+++ b/less/102-footer.less
@@ -47,10 +47,23 @@ footer.site {
 
   .social-link {
     margin-right: 20px;
+    display: inline-block;
+    border-radius: 50%;
+    border: 1px solid #fff;
+    transition: all 0.25s;
 
     &:last-of-type {
       margin-right: 0;
     }
+
+    &:hover {
+      background-color: currentColor;
+      border-color: currentColor;
+    }
+
+    img {
+      display: block;
+    }
   }
 
   .workshop {
@@ -59,7 +72,7 @@ footer.site {
   .workshop-link {
     .rounded-button();
     .border-button(#fff, #fff);
-    padding: 19px 83px 22px 46px;
+    padding: 20px 83px 20px 46px;
     border-radius: 26px;
     text-transform: uppercase;
     font-size: 12px;
@@ -120,8 +133,9 @@ footer.legal {
     color: #fff;
     border: 1px solid currentColor;
     border-radius: 100%;
+    transition: all 0.25s;
 
-    &.active {
+    &.active, &:hover {
       color: #8aaa43;
     }