From cad0bdd1c3c2aef6dabd7b570697b1dee84a9980 Mon Sep 17 00:00:00 2001
From: William Hearn <sylus1984@gmail.com>
Date: Thu, 22 Sep 2016 12:27:01 -0400
Subject: [PATCH] Issue #2799287: Update to gcweb footer

---
 templates/menu/menu-link.func.php            | 39 ++++++++++++----------------
 templates/page/page--gcweb.tpl.php           | 34 ++++++++----------------
 templates/panels/page--panels--gcweb.tpl.php | 34 ++++++++----------------
 templates/system/page.vars.php               |  7 ++++-
 4 files changed, 45 insertions(+), 69 deletions(-)

diff --git a/templates/menu/menu-link.func.php b/templates/menu/menu-link.func.php
index b9ff06b..e41d500 100644
--- a/templates/menu/menu-link.func.php
+++ b/templates/menu/menu-link.func.php
@@ -120,12 +120,6 @@ function wetkit_bootstrap_menu_link__menu_block__mid_footer_menu(&$variables) {
   $wxt_active = str_replace('-', '_', $wxt_active);
   $wxt_active = str_replace('theme_', '', $wxt_active);
 
-  if ($element['#below']) {
-    if ((!empty($element['#original_link']['depth'])) && ($element['#original_link']['depth'] == 1)) {
-      $sub_menu = '<ul class="list-unstyled">' . drupal_render($element['#below']) . '</ul>';
-    }
-  }
-
   // On primary navigation menu, class 'active' is not set on active menu item.
   // @see https://drupal.org/node/1896674.
   if (($element['#href'] == $_GET['q'] || ($element['#href'] == '<front>' && drupal_is_front_page())) && (empty($element['#localized_options']['language']))) {
@@ -141,31 +135,32 @@ function wetkit_bootstrap_menu_link__menu_block__mid_footer_menu(&$variables) {
     );
   }
 
-  if ($element['#original_link']['depth'] == 1) {
-    if ($wxt_active == 'gcweb') {
-      $counter = $counter + 1;
-      $output = '<h3>' . l($element['#title'], $element['#href'], $element['#localized_options']) . '</h3>';
-      if ($counter == 3) {
-        return '<section class="col-sm-3">' . $output . $sub_menu . '</section>';
-      }
-      elseif ($counter >= 4) {
-        return '<section class="col-sm-3 brdr-lft">' . $output . $sub_menu . '</section>';
-      }
-      elseif ($counter % 2 != 0) {
-        return '<div class="col-sm-3"><section>' . $output . $sub_menu . '</section>';
-      }
-      elseif ($counter % 2 == 0) {
-        return '<section>' . $output . $sub_menu . '</section></div>';
+  if ($wxt_active != 'gcweb') {
+    if ($element['#below']) {
+      if ((!empty($element['#original_link']['depth'])) && ($element['#original_link']['depth'] == 1)) {
+        $sub_menu = '<ul class="list-unstyled">' . drupal_render($element['#below']) . '</ul>';
       }
     }
-    else {
+    if ($element['#original_link']['depth'] == 1) {
       $output = '<h3>' . l($element['#title'], $element['#href'], $element['#localized_options']) . '</h3>';
       return '<section class="col-sm-3">' . $output . $sub_menu . '</section>';
     }
+    else {
+      $output = l($element['#title'], $element['#href'], $element['#localized_options']);
+      return '<li' . drupal_attributes($element['#attributes']) . '>' . $output . $sub_menu . "</li>\n";
+    }
   }
   else {
+    if ($element['#below']) {
+      if ((!empty($element['#original_link']['depth'])) && ($element['#original_link']['depth'] == 1)) {
+        // Add our own wrapper.
+        unset($element['#below']['#theme_wrappers']);
+        $sub_menu = drupal_render($element['#below']);
+      }
+    }
     $output = l($element['#title'], $element['#href'], $element['#localized_options']);
     return '<li' . drupal_attributes($element['#attributes']) . '>' . $output . $sub_menu . "</li>\n";
+
   }
 }
 
diff --git a/templates/page/page--gcweb.tpl.php b/templates/page/page--gcweb.tpl.php
index 9bd8b86..22f6244 100644
--- a/templates/page/page--gcweb.tpl.php
+++ b/templates/page/page--gcweb.tpl.php
@@ -201,35 +201,23 @@
   <?php endif; ?>
 <?php endif; ?>
 <footer role="contentinfo" id="wb-info">
-  <div class="<?php print $container_class; ?>">
-    <nav role="navigation" class="visible-sm visible-md visible-lg wb-navcurr">
-    <h2><?php print t('About this site'); ?></h2>
-    <div class="row">
-      <?php print render($page['footer']); ?>
-      <div class="col-sm-3 col-lg-3 brdr-lft">
-        <section>
-          <h3><?php print t('Feedback'); ?></h3>
-          <p><a href="<?php print $gcweb['feedback'][$language]; ?>" class="gl-footer"><img src="<?php print $library_path; ?>/assets/feedback.png" alt="<?php print t('Feedback about this Web site'); ?>"></a></p>
-        </section>
-        <section>
-          <h3><?php print t('Social media'); ?></h3>
-          <p><a href="<?php print $gcweb['social'][$language]; ?>" class="gl-footer"><img src="<?php print $library_path; ?>/assets/social.png" alt="<?php print t('Social media'); ?>"></a></p>
-        </section>
-        <section>
-          <h3><?php print t('Mobile centre'); ?></h3>
-          <p><a href="<?php print $gcweb['mobile'][$language]; ?>" class="gl-footer"><img src="<?php print $library_path; ?>/assets/mobile.png" alt="<?php print t('Mobile centre'); ?>"></a></p>
-        </section>
-      </div>
-    </div>
-    </nav>
-  </div>
+  <nav role="navigation" class="<?php print $container_class; ?> wb-navcurr">
+    <h2 class="wb-inv"><?php print t('About government'); ?></h2>
+      <ul class="list-unstyled colcount-sm-2 colcount-md-3">
+        <?php print render($page['footer']); ?>
+      </ul>
+  </nav>
   <div class="brand">
     <div class="<?php print $container_class; ?>">
       <div class="row ">
+        <nav class="col-md-10 ftr-urlt-lnk">
+          <h2 class="wb-inv"><?php print t('About this site'); ?></h2>
+          <?php print $page['menu_terms_bar']; ?>
+        </nav>
         <div class="col-xs-6 visible-sm visible-xs tofpg">
           <a href="#wb-cont"><?php print t('Top of Page'); ?><span class="glyphicon glyphicon-chevron-up"></span></a>
         </div>
-        <div class="col-xs-6 col-md-12 text-right">
+        <div class="col-xs-6 col-md-2 text-right">
           <?php if ($logo && $logo_bottom_svg): ?>
             <object data='<?php print $logo_bottom_svg; ?>' role="img" tabindex="-1" type="image/svg+xml">
               <img alt="<?php print t('WxT Logo'); ?>" src="<?php print $logo_bottom_svg; ?>"  />
diff --git a/templates/panels/page--panels--gcweb.tpl.php b/templates/panels/page--panels--gcweb.tpl.php
index b67ab87..3f8872e 100644
--- a/templates/panels/page--panels--gcweb.tpl.php
+++ b/templates/panels/page--panels--gcweb.tpl.php
@@ -199,35 +199,23 @@
   <?php endif; ?>
 <?php endif; ?>
 <footer role="contentinfo" id="wb-info">
-  <div class="<?php print $container_class; ?>">
-    <nav role="navigation" class="visible-sm visible-md visible-lg wb-navcurr">
-    <h2><?php print t('About this site'); ?></h2>
-    <div class="row">
-      <?php print render($page['footer']); ?>
-      <div class="col-sm-3 col-lg-3 brdr-lft">
-        <section>
-          <h3><?php print t('Feedback'); ?></h3>
-          <p><a href="<?php print $gcweb['feedback'][$language]; ?>" class="gl-footer"><img src="<?php print $library_path; ?>/assets/feedback.png" alt="<?php print t('Feedback about this Web site'); ?>"></a></p>
-        </section>
-        <section>
-          <h3><?php print t('Social media'); ?></h3>
-          <p><a href="<?php print $gcweb['social'][$language]; ?>" class="gl-footer"><img src="<?php print $library_path; ?>/assets/social.png" alt="<?php print t('Social media'); ?>"></a></p>
-        </section>
-        <section>
-          <h3><?php print t('Mobile centre'); ?></h3>
-          <p><a href="<?php print $gcweb['mobile'][$language]; ?>" class="gl-footer"><img src="<?php print $library_path; ?>/assets/mobile.png" alt="<?php print t('Mobile centre'); ?>"></a></p>
-        </section>
-      </div>
-    </div>
-    </nav>
-  </div>
+  <nav role="navigation" class="<?php print $container_class; ?> wb-navcurr">
+    <h2 class="wb-inv"><?php print t('About government'); ?></h2>
+      <ul class="list-unstyled colcount-sm-2 colcount-md-3">
+        <?php print render($page['footer']); ?>
+      </ul>
+  </nav>
   <div class="brand">
     <div class="<?php print $container_class; ?>">
       <div class="row ">
+        <nav class="col-md-10 ftr-urlt-lnk">
+          <h2 class="wb-inv"><?php print t('About this site'); ?></h2>
+          <?php print $page['menu_terms_bar']; ?>
+        </nav>
         <div class="col-xs-6 visible-sm visible-xs tofpg">
           <a href="#wb-cont"><?php print t('Top of Page'); ?><span class="glyphicon glyphicon-chevron-up"></span></a>
         </div>
-        <div class="col-xs-6 col-md-12 text-right">
+        <div class="col-xs-6 col-md-2 text-right">
           <?php if ($logo && $logo_bottom_svg): ?>
             <object data='<?php print $logo_bottom_svg; ?>' role="img" tabindex="-1" type="image/svg+xml">
               <img alt="<?php print t('WxT Logo'); ?>" src="<?php print $logo_bottom_svg; ?>"  />
diff --git a/templates/system/page.vars.php b/templates/system/page.vars.php
index 2989b33..28c7b50 100644
--- a/templates/system/page.vars.php
+++ b/templates/system/page.vars.php
@@ -322,10 +322,15 @@ function wetkit_bootstrap_preprocess_page(&$variables) {
   // Terms Navigation.
   $menu = ($is_multilingual) ? i18n_menu_navigation_links('menu-wet-terms') : menu_navigation_links('menu-wet-terms');
   $class = ($wxt_active == 'gcwu_fegc' || $wxt_active == 'gc_intranet') ? array('list-inline') : array('links', 'clearfix');
+  $terms_class = 'gc-tctr';
+  if ($wxt_active == 'gcweb') {
+    $terms_class = '';
+    $class = '';
+  }
   $terms_bar_markup = theme('links__menu_menu_wet_terms', array(
     'links' => $menu,
     'attributes' => array(
-      'id' => 'gc-tctr',
+      'id' => $terms_class,
       'class' => $class,
     ),
     'heading' => array(),
-- 
2.5.4 (Apple Git-61)