From: stephen@cubedesigners.com <stephen@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 29 Jul 2016 17:05:11 +0000 (+0000)
Subject: Microdata improvements. WIP #580 @3
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=634af198c3dc783bfbfc77f6f0b0634be330c1dd;p=fluidbook-v3.git

Microdata improvements. WIP #580 @3
---

diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
index 1006b6c..2e06d82 100644
--- a/framework/application/views/scripts/common/footer.phtml
+++ b/framework/application/views/scripts/common/footer.phtml
@@ -2,28 +2,44 @@
 
 $this->headScript()->addScriptAndStyle('102-footer');
 
+// Microdata note: the whole footer is wrapped in the "Organization" item so that social links can be included
+// See final output at bottom for microdata wrapper
+
 $res = '<footer class="site">';
 
 // Wrapper element needed so percentage based padding matches the main content areas
 // Padding needs to be based on a max-width of 1680px, not the actual screen width
 $res .= '<div class="footer-inner">';
 
-$logo = $this->imageCms($this->option('logo'), 'Fluidbook', 180, 45);
+$res .= '<div class="contact-details">';
+
+$logo = $this->imageCms($this->option('logo'), 'Fluidbook', 180, 45, ['itemprop' => 'logo']);
 $address = $this->option('address');
 
+
 // Get translation for country code
 $locale = new Zend_Locale();
 $country = strtoupper($locale->getTranslation($address['pays'], 'Territory'));
 
-$res .= '<div class="contact-details">';
-$res .= $this->link($logo, 'internal:home');
-$res .= '<address>';
-$res .= "{$address['adresse']}<br>{$address['code_postal']} {$address['ville']} - $country";
-$res .= '<br>';
-$res .= __('Tél.') . ' ' . $this->linkPhone($address['phone']);
-$res .= '<br>';
-$res .= $this->linkEmail($address['email']);
-$res .= '</address>';
+// Microdata
+$res .= $this->microdataMeta($address['company'], 'name'); // Since we only have the logo and no text version of the name, it will be a meta microdata
+$res .= $this->link($logo, 'internal:home', ['itemprop' => 'url']);
+
+// Address block
+$a  = $this->microdataProp($address['adresse'], 'streetAddress');
+$a .= '<br>';
+$a .= $this->microdataProp($address['code_postal'], 'postalCode');
+$a .= ' ';
+$a .= $this->microdataProp($address['ville'], 'addressLocality');
+$a .= ' - ';
+$a .= $this->microdataProp($country, 'addressCountry');
+$a .= '<br>';
+$a .= __('Tél.') . ' ';
+$a .= $this->linkPhone($address['phone'], $address['phone'], ['itemprop' => 'telephone']);
+$a .= '<br>';
+$a .= $this->linkEmail($address['email'], $address['email'], ['itemprop' => 'email']);
+
+$res .= $this->microdataPostalAddress($a, ['tag' => 'address'], 'address');
 $res .= '</div>'; // .contact-details
 
 // Menus
@@ -38,7 +54,12 @@ foreach ($this->option('social_networks') as $social) {
 	$res .= '<style type="text/css">';
 	$res .= '#s-' . $social['icon'] . ':hover{background-color: ' . $social['color'] . ';border-color: ' . $social['color'] . ';}';
 	$res .= '</style>';
-	$res .= $this->link('', $social['url'], array('id' => 's-' . $social['icon'], 'class' => 'social-link fb-' . $social['icon'], 'data-event' => array('category' => 'social', 'action' => 'go', 'label' => $social['icon'])));
+	$res .= $this->link('', $social['url'], array('id' => 's-' . $social['icon'],
+                                                  'class' => 'social-link fb-' . $social['icon'],
+                                                  'itemprop' => 'sameAs',
+                                                  'data-event' => array('category' => 'social',
+                                                                        'action' => 'go',
+                                                                        'label' => $social['icon'])));
 	$res .= '</a>';
 }
 $res .= '</div>'; // .footer-external
@@ -64,6 +85,5 @@ $res .= $this->markupDotclear($this->option('footer'));
 $res .= '</div>'; // .footer-inner
 $res .= '</footer>'; // footer.legal
 
-echo '<div class="section fp-auto-height">';
-echo $res;
-echo '</div>';
\ No newline at end of file
+// Output footer with Organization microdata wrapper
+echo $this->microdata($res, ['class' => 'section fp-auto-height'], 'Organization');
\ No newline at end of file