CRM-10693 - Wrap main content to facilitate ajax refresh

diff --git a/templates/CRM/common/drupal.tpl b/templates/CRM/common/drupal.tpl
index 9dc68a191c8f4d6bdf9d2012cdbb3b4835076e0f..e785556e18345aa3579f844a611f644a251b3113 100644 (file)
--- 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 4dfc1047b0da7f30b319e1e3ee12243be425c0b8..2e99110c9a1b0931bc40d1e3e33026e5ac8349a0 100644 (file)
--- 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 a197613d47207f31bd4a675951c8dc77646d634d..2411e41ed3010783eb15ff3a50c0e86fc1bf6fdf 100644 (file)
--- 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 2c1d4edf57e99e2182df522bb0cc3e601bfab769..f78a8569acd8c4ac6a620cf8cedc6fa9fa7da527 100644 (file)
--- 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'}