From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 29 Nov 2013 18:33:07 +0000 (-0800)
Subject: CRM-10693 - Wrap main content to facilitate ajax refresh
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6bb066a3257531deeeecb9e1528c7a37f3fe50fb;p=civicrm-core.git

CRM-10693 - Wrap main content to facilitate ajax refresh
---

diff --git a/templates/CRM/common/drupal.tpl b/templates/CRM/common/drupal.tpl
index 9dc68a191c..e785556e18 100644
--- a/templates/CRM/common/drupal.tpl
+++ b/templates/CRM/common/drupal.tpl
@@ -58,17 +58,17 @@
 {if isset($localTasks) and $localTasks}
     {include file="CRM/common/localNav.tpl"}
 {/if}
-
-{include file="CRM/common/status.tpl"}
-
-{crmRegion name='page-body'}
-<!-- .tpl file invoked: {$tplFile}. Call via form.tpl if we have a form in the page. -->
-{if isset($isForm) and $isForm}
-    {include file="CRM/Form/$formTpl.tpl"}
-{else}
-    {include file=$tplFile}
-{/if}
-{/crmRegion}
+<div id="crm-main-content-wrapper">
+  {include file="CRM/common/status.tpl"}
+  {crmRegion name='page-body'}
+    <!-- .tpl file invoked: {$tplFile}. Call via form.tpl if we have a form in the page. -->
+    {if isset($isForm) and $isForm}
+      {include file="CRM/Form/$formTpl.tpl"}
+    {else}
+      {include file=$tplFile}
+    {/if}
+  {/crmRegion}
+</div>
 
 {crmRegion name='page-footer'}
 {if ! $urlIsPublic}
diff --git a/templates/CRM/common/drupal6.tpl b/templates/CRM/common/drupal6.tpl
index 4dfc1047b0..2e99110c9a 100644
--- a/templates/CRM/common/drupal6.tpl
+++ b/templates/CRM/common/drupal6.tpl
@@ -60,16 +60,17 @@
     {include file="CRM/common/localNav.tpl"}
 {/if}
 
-{include file="CRM/common/status.tpl"}
-
-{crmRegion name='page-body'}
-<!-- .tpl file invoked: {$tplFile}. Call via form.tpl if we have a form in the page. -->
-{if isset($isForm) and $isForm}
-    {include file="CRM/Form/$formTpl.tpl"}
-{else}
-    {include file=$tplFile}
-{/if}
-{/crmRegion}
+<div id="crm-main-content-wrapper">
+  {include file="CRM/common/status.tpl"}
+  {crmRegion name='page-body'}
+    <!-- .tpl file invoked: {$tplFile}. Call via form.tpl if we have a form in the page. -->
+    {if isset($isForm) and $isForm}
+      {include file="CRM/Form/$formTpl.tpl"}
+    {else}
+      {include file=$tplFile}
+    {/if}
+  {/crmRegion}
+</div>
 
 {crmRegion name='page-footer'}
 {if ! $urlIsPublic}
diff --git a/templates/CRM/common/joomla.tpl b/templates/CRM/common/joomla.tpl
index a197613d47..2411e41ed3 100644
--- a/templates/CRM/common/joomla.tpl
+++ b/templates/CRM/common/joomla.tpl
@@ -80,16 +80,17 @@
         {include file="CRM/common/localNav.tpl"}
     {/if}
 
-    {include file="CRM/common/status.tpl"}
-
-    <!-- .tpl file invoked: {$tplFile}. Call via form.tpl if we have a form in the page. -->
-    {crmRegion name='page-body'}
-    {if $isForm}
-        {include file="CRM/Form/$formTpl.tpl"}
-    {else}
-        {include file=$tplFile}
-    {/if}
-    {/crmRegion}
+    <div id="crm-main-content-wrapper">
+      {include file="CRM/common/status.tpl"}
+      {crmRegion name='page-body'}
+        <!-- .tpl file invoked: {$tplFile}. Call via form.tpl if we have a form in the page. -->
+        {if isset($isForm) and $isForm}
+          {include file="CRM/Form/$formTpl.tpl"}
+        {else}
+          {include file=$tplFile}
+        {/if}
+      {/crmRegion}
+    </div>
 
     {crmRegion name='page-footer'}
     {if ! $urlIsPublic}
diff --git a/templates/CRM/common/wordpress.tpl b/templates/CRM/common/wordpress.tpl
index 2c1d4edf57..f78a8569ac 100644
--- a/templates/CRM/common/wordpress.tpl
+++ b/templates/CRM/common/wordpress.tpl
@@ -97,17 +97,17 @@
     {include file="CRM/common/localNav.tpl"}
 {/if}
 
-{include file="CRM/common/status.tpl"}
-
-
-{crmRegion name='page-body'}
-<!-- .tpl file invoked: {$tplFile}. Call via form.tpl if we have a form in the page. -->
-{if isset($isForm) and $isForm}
-    {include file="CRM/Form/$formTpl.tpl"}
-{else}
-    {include file=$tplFile}
-{/if}
-{/crmRegion}
+<div id="crm-main-content-wrapper">
+  {include file="CRM/common/status.tpl"}
+  {crmRegion name='page-body'}
+    <!-- .tpl file invoked: {$tplFile}. Call via form.tpl if we have a form in the page. -->
+    {if isset($isForm) and $isForm}
+      {include file="CRM/Form/$formTpl.tpl"}
+    {else}
+      {include file=$tplFile}
+    {/if}
+  {/crmRegion}
+</div>
 
 
 {crmRegion name='page-footer'}