From 7d452a2ee0b0d52badb26120dd528438b74d0428 Mon Sep 17 00:00:00 2001
From: William Hearn <sylus1984@gmail.com>
Date: Thu, 3 Mar 2016 19:29:09 -0500
Subject: [PATCH] Issue #2680619: Sidebar Menu extra / missing tags

---
 templates/panes/megamenu.tpl.php         | 16 ++--------
 templates/panes/megamenu_nav.tpl.php     | 53 +++++++++++---------------------
 templates/panes/megamenu_sidebar.tpl.php | 14 ++-------
 templates/panes/sidebar.tpl.php          | 16 ++--------
 templates/panes/sidebar_nav.tpl.php      | 53 +++++++++++---------------------
 templates/panes/sidebar_sidebar.tpl.php  | 14 ++-------
 6 files changed, 44 insertions(+), 122 deletions(-)

diff --git a/templates/panes/megamenu.tpl.php b/templates/panes/megamenu.tpl.php
index 65494b7..8b47590 100644
--- a/templates/panes/megamenu.tpl.php
+++ b/templates/panes/megamenu.tpl.php
@@ -1,17 +1,7 @@
 <?php
 /**
- * @file
- * Adaptivetheme panel pane template.
- *
- * This template has block type classes that react to styles applied to blocks,
- * saving the trouble of having to style multiple selectors to target blocks
- * and panel panes. This template also makes use the attributes arrays for the
- * wrapper and content wrapper.
- *
- * Adaptivetheme variables:
- * - $is_mobile: Bool, requires the Browscap module to return TRUE for mobile
- *   devices. Use to test for a mobile context.
- * - $tag: top level wrapper element, section or div.
+ * @file panels-pane.tpl.php
+ * Main panel pane template
  *
  * Variables available:
  * - $pane->type: the content type inside this pane
@@ -30,7 +20,6 @@
 <?php if ($pane_prefix): ?>
   <?php print $pane_prefix; ?>
 <?php endif; ?>
-
 <?php print render($title_prefix); ?>
   <?php if ($title): ?>
     <?php if (!theme_get_setting('wetkit_render_no_link')): ?>
@@ -41,7 +30,6 @@
   <?php endif; ?>
 <?php print render($title_suffix); ?>
 <?php print render($content); ?>
-
 <?php if ($pane_suffix): ?>
   <?php print $pane_suffix; ?>
 <?php endif; ?>
diff --git a/templates/panes/megamenu_nav.tpl.php b/templates/panes/megamenu_nav.tpl.php
index 70b5ded..35a1146 100644
--- a/templates/panes/megamenu_nav.tpl.php
+++ b/templates/panes/megamenu_nav.tpl.php
@@ -1,17 +1,7 @@
 <?php
 /**
- * @file
- * Adaptivetheme panel pane template.
- *
- * This template has block type classes that react to styles applied to blocks,
- * saving the trouble of having to style multiple selectors to target blocks
- * and panel panes. This template also makes use the attributes arrays for the
- * wrapper and content wrapper.
- *
- * Adaptivetheme variables:
- * - $is_mobile: Bool, requires the Browscap module to return TRUE for mobile
- *   devices. Use to test for a mobile context.
- * - $tag: top level wrapper element, section or div.
+ * @file panels-pane.tpl.php
+ * Main panel pane template
  *
  * Variables available:
  * - $pane->type: the content type inside this pane
@@ -27,35 +17,28 @@
  *   data including the contexts and all of the other panes being displayed.
  */
 ?>
-<div class="span-2 float-right">
+<div class="wetkit-menu pull-right">
   <div class="module-menu-section">
   <?php if ($pane_prefix): ?>
     <?php print $pane_prefix; ?>
   <?php endif; ?>
-  <<?php print $tag . $attributes . $id; ?>>
-    <div class="block-inner clearfix">
-      <?php if ($admin_links): ?>
-        <?php print $admin_links; ?>
+  <div class="<?php print $classes; ?>" <?php print $id; ?>>
+    <?php if ($admin_links): ?>
+      <?php print $admin_links; ?>
+    <?php endif; ?>
+    <?php print render($title_prefix); ?>
+    <?php if ($title): ?>
+      <?php if($display->title_pane == $pane->pid) : ?>
+        <h1 id="wb-cont"><?php print $title; ?></h1>
+      <?php else : ?>
+        <h2<?php print $title_attributes; ?>><?php print $title; ?></h2>
       <?php endif; ?>
-
-      <?php print render($title_prefix); ?>
-
-      <?php if ($title): ?>
-        <?php if($display->title_pane == $pane->pid) : ?>
-          <h1 id="wb-cont"><?php print $title; ?></h1>
-        <?php else : ?>
-          <h2<?php print $title_attributes; ?>><?php print $title; ?></h2>
-        <?php endif; ?>
-      <?php endif; ?>
-
-      <?php print render($title_suffix); ?>
-
-      <div<?php print $content_attributes; ?>>
-        <?php print render($content); ?>
-      </div>
-
+    <?php endif; ?>
+    <?php print render($title_suffix); ?>
+    <div<?php print $content_attributes; ?>>
+      <?php print render($content); ?>
     </div>
-  </<?php print $tag; ?>>
+  </div>
   <?php if ($pane_suffix): ?>
     <?php print $pane_suffix; ?>
   <?php endif; ?>
diff --git a/templates/panes/megamenu_sidebar.tpl.php b/templates/panes/megamenu_sidebar.tpl.php
index c65b356..80eea22 100644
--- a/templates/panes/megamenu_sidebar.tpl.php
+++ b/templates/panes/megamenu_sidebar.tpl.php
@@ -1,17 +1,7 @@
 <?php
 /**
- * @file
- * Adaptivetheme panel pane template.
- *
- * This template has block type classes that react to styles applied to blocks,
- * saving the trouble of having to style multiple selectors to target blocks
- * and panel panes. This template also makes use the attributes arrays for the
- * wrapper and content wrapper.
- *
- * Adaptivetheme variables:
- * - $is_mobile: Bool, requires the Browscap module to return TRUE for mobile
- *   devices. Use to test for a mobile context.
- * - $tag: top level wrapper element, section or div.
+ * @file panels-pane.tpl.php
+ * Main panel pane template
  *
  * Variables available:
  * - $pane->type: the content type inside this pane
diff --git a/templates/panes/sidebar.tpl.php b/templates/panes/sidebar.tpl.php
index 65494b7..8b47590 100644
--- a/templates/panes/sidebar.tpl.php
+++ b/templates/panes/sidebar.tpl.php
@@ -1,17 +1,7 @@
 <?php
 /**
- * @file
- * Adaptivetheme panel pane template.
- *
- * This template has block type classes that react to styles applied to blocks,
- * saving the trouble of having to style multiple selectors to target blocks
- * and panel panes. This template also makes use the attributes arrays for the
- * wrapper and content wrapper.
- *
- * Adaptivetheme variables:
- * - $is_mobile: Bool, requires the Browscap module to return TRUE for mobile
- *   devices. Use to test for a mobile context.
- * - $tag: top level wrapper element, section or div.
+ * @file panels-pane.tpl.php
+ * Main panel pane template
  *
  * Variables available:
  * - $pane->type: the content type inside this pane
@@ -30,7 +20,6 @@
 <?php if ($pane_prefix): ?>
   <?php print $pane_prefix; ?>
 <?php endif; ?>
-
 <?php print render($title_prefix); ?>
   <?php if ($title): ?>
     <?php if (!theme_get_setting('wetkit_render_no_link')): ?>
@@ -41,7 +30,6 @@
   <?php endif; ?>
 <?php print render($title_suffix); ?>
 <?php print render($content); ?>
-
 <?php if ($pane_suffix): ?>
   <?php print $pane_suffix; ?>
 <?php endif; ?>
diff --git a/templates/panes/sidebar_nav.tpl.php b/templates/panes/sidebar_nav.tpl.php
index 70b5ded..35a1146 100644
--- a/templates/panes/sidebar_nav.tpl.php
+++ b/templates/panes/sidebar_nav.tpl.php
@@ -1,17 +1,7 @@
 <?php
 /**
- * @file
- * Adaptivetheme panel pane template.
- *
- * This template has block type classes that react to styles applied to blocks,
- * saving the trouble of having to style multiple selectors to target blocks
- * and panel panes. This template also makes use the attributes arrays for the
- * wrapper and content wrapper.
- *
- * Adaptivetheme variables:
- * - $is_mobile: Bool, requires the Browscap module to return TRUE for mobile
- *   devices. Use to test for a mobile context.
- * - $tag: top level wrapper element, section or div.
+ * @file panels-pane.tpl.php
+ * Main panel pane template
  *
  * Variables available:
  * - $pane->type: the content type inside this pane
@@ -27,35 +17,28 @@
  *   data including the contexts and all of the other panes being displayed.
  */
 ?>
-<div class="span-2 float-right">
+<div class="wetkit-menu pull-right">
   <div class="module-menu-section">
   <?php if ($pane_prefix): ?>
     <?php print $pane_prefix; ?>
   <?php endif; ?>
-  <<?php print $tag . $attributes . $id; ?>>
-    <div class="block-inner clearfix">
-      <?php if ($admin_links): ?>
-        <?php print $admin_links; ?>
+  <div class="<?php print $classes; ?>" <?php print $id; ?>>
+    <?php if ($admin_links): ?>
+      <?php print $admin_links; ?>
+    <?php endif; ?>
+    <?php print render($title_prefix); ?>
+    <?php if ($title): ?>
+      <?php if($display->title_pane == $pane->pid) : ?>
+        <h1 id="wb-cont"><?php print $title; ?></h1>
+      <?php else : ?>
+        <h2<?php print $title_attributes; ?>><?php print $title; ?></h2>
       <?php endif; ?>
-
-      <?php print render($title_prefix); ?>
-
-      <?php if ($title): ?>
-        <?php if($display->title_pane == $pane->pid) : ?>
-          <h1 id="wb-cont"><?php print $title; ?></h1>
-        <?php else : ?>
-          <h2<?php print $title_attributes; ?>><?php print $title; ?></h2>
-        <?php endif; ?>
-      <?php endif; ?>
-
-      <?php print render($title_suffix); ?>
-
-      <div<?php print $content_attributes; ?>>
-        <?php print render($content); ?>
-      </div>
-
+    <?php endif; ?>
+    <?php print render($title_suffix); ?>
+    <div<?php print $content_attributes; ?>>
+      <?php print render($content); ?>
     </div>
-  </<?php print $tag; ?>>
+  </div>
   <?php if ($pane_suffix): ?>
     <?php print $pane_suffix; ?>
   <?php endif; ?>
diff --git a/templates/panes/sidebar_sidebar.tpl.php b/templates/panes/sidebar_sidebar.tpl.php
index c65b356..80eea22 100644
--- a/templates/panes/sidebar_sidebar.tpl.php
+++ b/templates/panes/sidebar_sidebar.tpl.php
@@ -1,17 +1,7 @@
 <?php
 /**
- * @file
- * Adaptivetheme panel pane template.
- *
- * This template has block type classes that react to styles applied to blocks,
- * saving the trouble of having to style multiple selectors to target blocks
- * and panel panes. This template also makes use the attributes arrays for the
- * wrapper and content wrapper.
- *
- * Adaptivetheme variables:
- * - $is_mobile: Bool, requires the Browscap module to return TRUE for mobile
- *   devices. Use to test for a mobile context.
- * - $tag: top level wrapper element, section or div.
+ * @file panels-pane.tpl.php
+ * Main panel pane template
  *
  * Variables available:
  * - $pane->type: the content type inside this pane
-- 
2.3.8 (Apple Git-58)