From 12bf92249c7c49a3e00e575f97b89c8fc1596040 Mon Sep 17 00:00:00 2001
From: Olivier PEREZ <olivier@olivierperez.fr>
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 0313ca55..00000000
--- a/tpl/footer.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
- </main>
- </div> <!-- .container -->
-</body>
-</html>
\ No newline at end of file
diff --git a/tpl/head.tpl b/tpl/head.tpl
deleted file mode 100644
index 401a271a..00000000
--- a/tpl/head.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
- <html lang="{$html_lang}">
- <head>
- <meta charset="utf-8">
-
- {if !empty($title)}
- <title>{$title|html} - {$APPLICATION_NAME|html}</title>
- {else}
- <title>{$APPLICATION_NAME|html}</title>
- {/if}
-
- <link rel="stylesheet" href="{'css/bootstrap.min.css'|resource}">
- <link rel="stylesheet" href="{'css/datepicker3.css'|resource}">
- <link rel="stylesheet" href="{'css/style.css'|resource}">
- <link rel="stylesheet" href="{'css/frama.css'|resource}">
- <link rel="stylesheet" href="{'css/print.css'|resource}" media="print">
- <script type="text/javascript" src="{'js/jquery-1.11.1.min.js'|resource}"></script>
- <script type="text/javascript" src="{'js/bootstrap.min.js'|resource}"></script>
- <script type="text/javascript" src="{'js/bootstrap-datepicker.js'|resource}"></script>
- <script type="text/javascript" src="{"js/locales/bootstrap-datepicker.$html_lang.js"|resource}"></script>
- <script type="text/javascript" src="{'js/core.js'|resource}"></script>
-
- {if !empty($nav_js)}
- <script src="{'nav/nav.js'|resource}" id="nav_js" type="text/javascript" charset="utf-8"></script><!-- /Framanav -->
- {/if}
-
- {block name="header"}{/block}
-
- </head>
- <body>
- <div class="container ombre">
\ No newline at end of file
diff --git a/tpl/page.tpl b/tpl/page.tpl
index 025864a5..1d94cf70 100644
--- a/tpl/page.tpl
+++ b/tpl/page.tpl
@@ -1,6 +1,40 @@
-{include file='head.tpl'}
+<!DOCTYPE html>
+<html lang="{$html_lang}">
+<head>
+ <meta charset="utf-8">
+
+ {if !empty($title)}
+ <title>{$title|html} - {$APPLICATION_NAME|html}</title>
+ {else}
+ <title>{$APPLICATION_NAME|html}</title>
+ {/if}
+
+ <link rel="stylesheet" href="{'css/bootstrap.min.css'|resource}">
+ <link rel="stylesheet" href="{'css/datepicker3.css'|resource}">
+ <link rel="stylesheet" href="{'css/style.css'|resource}">
+ <link rel="stylesheet" href="{'css/frama.css'|resource}">
+ <link rel="stylesheet" href="{'css/print.css'|resource}" media="print">
+ <script type="text/javascript" src="{'js/jquery-1.11.1.min.js'|resource}"></script>
+ <script type="text/javascript" src="{'js/bootstrap.min.js'|resource}"></script>
+ <script type="text/javascript" src="{'js/bootstrap-datepicker.js'|resource}"></script>
+ <script type="text/javascript" src="{"js/locales/bootstrap-datepicker.$html_lang.js"|resource}"></script>
+ <script type="text/javascript" src="{'js/core.js'|resource}"></script>
+
+ {if !empty($nav_js)}
+ <script src="{'nav/nav.js'|resource}" id="nav_js" type="text/javascript" charset="utf-8"></script><!-- /Framanav -->
+ {/if}
+
+ {block name="header"}{/block}
+
+</head>
+<body>
+<div class="container ombre">
+
{include file='header.tpl'}
{block name=main}{/block}
-{include file='footer.tpl'}
\ No newline at end of file
+</main>
+</div> <!-- .container -->
+</body>
+</html>
\ No newline at end of file
--
GitLab