diff options
| -rw-r--r-- | themes/xtemplate/xtemplate.theme | 5 | ||||
| -rw-r--r-- | themes/xtemplate/xtemplate.xtmpl | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/themes/xtemplate/xtemplate.theme b/themes/xtemplate/xtemplate.theme index fbc5df663..b5eac5df5 100644 --- a/themes/xtemplate/xtemplate.theme +++ b/themes/xtemplate/xtemplate.theme @@ -90,7 +90,7 @@ class Theme_xtemplate extends BaseTheme { } if (!arg(0)) { - $this->template->assign("message", variable_get("xtemplate_message", l("edit message", "admin/system/themes/settings"))); + $this->template->assign("header_message", variable_get("xtemplate_message", l("edit message", "admin/system/themes/settings"))); $this->template->parse("header.message"); } @@ -128,7 +128,8 @@ class Theme_xtemplate extends BaseTheme { theme_blocks("all"); $this->template->assign( array( "blocks" => ob_get_contents(), - "footer" => variable_get("site_footer", "") + "footer_message" => variable_get("site_footer", ""), + "footer" => theme_footer() )); ob_end_clean(); diff --git a/themes/xtemplate/xtemplate.xtmpl b/themes/xtemplate/xtemplate.xtmpl index d04e6e3e9..1f309df28 100644 --- a/themes/xtemplate/xtemplate.xtmpl +++ b/themes/xtemplate/xtemplate.xtmpl @@ -39,7 +39,7 @@ <tr> <td valign="top" width="100%"> <!-- BEGIN: message --> - <div id="message">{message}</div> + <div id="message">{header_message}</div> <!-- END: message --> <div id="main"> <!-- END: header --> @@ -97,9 +97,9 @@ </table> <div id="footer"> - {footer} + {footer_message} </div> - +{footer} </body> </html> <!-- END: footer --> |