From 12bf92249c7c49a3e00e575f97b89c8fc1596040 Mon Sep 17 00:00:00 2001 From: Olivier PEREZ Date: Fri, 27 Mar 2015 13:06:29 +0100 Subject: [PATCH] Smarty: Inline head.tpl and footer.tpl into page.tpl --- tpl/footer.tpl | 4 ---- tpl/head.tpl | 31 ------------------------------- tpl/page.tpl | 38 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 36 insertions(+), 37 deletions(-) delete mode 100644 tpl/footer.tpl delete mode 100644 tpl/head.tpl diff --git a/tpl/footer.tpl b/tpl/footer.tpl deleted file mode 100644 index 0313ca5..0000000 --- a/tpl/footer.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/tpl/head.tpl b/tpl/head.tpl deleted file mode 100644 index 401a271..0000000 --- a/tpl/head.tpl +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - {if !empty($title)} - {$title|html} - {$APPLICATION_NAME|html} - {else} - {$APPLICATION_NAME|html} - {/if} - - - - - - - - - - - - - {if !empty($nav_js)} - - {/if} - - {block name="header"}{/block} - - - -
\ No newline at end of file diff --git a/tpl/page.tpl b/tpl/page.tpl index 025864a..1d94cf7 100644 --- a/tpl/page.tpl +++ b/tpl/page.tpl @@ -1,6 +1,40 @@ -{include file='head.tpl'} + + + + + + {if !empty($title)} + {$title|html} - {$APPLICATION_NAME|html} + {else} + {$APPLICATION_NAME|html} + {/if} + + + + + + + + + + + + + {if !empty($nav_js)} + + {/if} + + {block name="header"}{/block} + + + +
+ {include file='header.tpl'} {block name=main}{/block} -{include file='footer.tpl'} \ No newline at end of file + +
+ + \ No newline at end of file