From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 11 Aug 2015 14:30:39 +0000 (-0400)
Subject: Sidebar inside, disallow forms
X-Git-Tag: V1.0.0^2~122
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=482b88ce45c64c200238781b3920e942ef1e4c8c;p=WP-Themes%2FGovernmentEmmet.git

Sidebar inside, disallow forms
---

diff --git a/page.php b/page.php
index 0fea665..af55f21 100644
--- a/page.php
+++ b/page.php
@@ -1,8 +1,8 @@
 <?php get_header(); ?>
                 <main>
                     <div class="row" data-equalizer>
-                        <?php get_sidebar(); ?>
-                        <?php if (get_the_block( 'sidebar' ) != ""
+                        <?php if (get_the_block( 'sidebar' ) != "" 
+                            && empty($ninja_forms_append_page_form_id)
                             && $name != "request-brochures"
                             && $name != "contact-us"
                             && $name != "tips-hotline") { ?>
@@ -32,7 +32,11 @@
                                 </div>
                             </footer>
                         </div>
-                        <?php if (get_the_block( 'sidebar' ) != "" && $name != "request-brochures" && $name != "contact-us") {
+                        <?php if (get_the_block( 'sidebar' ) != ""
+                                && empty($ninja_forms_append_page_form_id)
+                                && $name != "request-brochures" 
+                                && $name != "contact-us"
+                                && $name != "tips-hotline") {
                             get_template_part('parts/right-sidebar');
                         } ?>
                     </div>