From: stephen@cubedesigners.com <stephen@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 24 Jun 2016 12:28:33 +0000 (+0000)
Subject: Done #499 @1.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=24e3436adaa04cd3fa873995c9fa3762550f4180;p=fluidbook-v3.git

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 b7bbf56..14e188e 100644
--- 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 2de83df..40823f1 100644
--- 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 93b1dac..b391110 100644
--- 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>';
 $res .= "{$address['adresse']} - {$address['code_postal']} {$address['ville']} $country";
 $res .= '<br>';
-$res .= __('Tél.') . ' ' . $address['phone'];
+$res .= __('Tél.') . ' ' . $this->linkPhone($address['phone']);
 $res .= '<br>';
 $res .= $this->linkEmail($address['email']);
 $res .= '</address>';
@@ -24,11 +24,11 @@ $res .= '</div>'; // .contact-details
 
 // Menus
 $res .= $this->footerMenu($this->option('footer_menu_main'), __('Plan du site'));
-$res .= $this->footerMenu($this->option('footer_menu_contact'), __('Contactez-nous'));
+$res .= $this->footerMenu($this->option('footer_menu_contact'), __('Contactez-nous'), 'internal:contact');
 
 $res .= '<div class="footer-social">';
 foreach ($this->option('social_networks') as $social) {
-    $res .= '<a href="'. $social['url'] .'" class="social-link" target="_blank">';
+    $res .= '<a href="'. $social['url'] .'" style="color:'. $social['color'] .'" class="social-link" target="_blank">';
     $res .= $this->imageCms($social['icon'], $social['title'], 52, 52);
     $res .= '</a>';
 }
diff --git a/less/102-footer.less b/less/102-footer.less
index 544e7b3..9856f90 100644
--- 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;
     }