From 3b18fe06d6001bfd9ad67f3b903a26720f628a4a Mon Sep 17 00:00:00 2001 From: Deryck Hodge Date: Thu, 14 Jul 2005 18:11:07 +0000 Subject: [PATCH] r8477: Simplify header/footer handling. esp variables allow for individual page titles, so we don't need the split header/footer here like we do on samba.org. deryck (This used to be commit af893fe83346f516402d0d6271533eedefa0ce4b) --- swat/scripting/footer.esp | 1 - swat/scripting/footer_columns.esp | 2 +- swat/scripting/footer_plain.esp | 2 +- swat/scripting/header.esp | 4 ---- swat/scripting/header_columns.esp | 7 +++++-- swat/scripting/header_plain.esp | 7 +++++-- 6 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 swat/scripting/footer.esp delete mode 100644 swat/scripting/header.esp diff --git a/swat/scripting/footer.esp b/swat/scripting/footer.esp deleted file mode 100644 index 5f85cabb082..00000000000 --- a/swat/scripting/footer.esp +++ /dev/null @@ -1 +0,0 @@ - diff --git a/swat/scripting/footer_columns.esp b/swat/scripting/footer_columns.esp index 29b06a4caa6..7b5baaf0c82 100644 --- a/swat/scripting/footer_columns.esp +++ b/swat/scripting/footer_columns.esp @@ -4,4 +4,4 @@ -<% include("/scripting/footer.esp"); %> + diff --git a/swat/scripting/footer_plain.esp b/swat/scripting/footer_plain.esp index ea0a3f7816b..31ef8dd4eec 100644 --- a/swat/scripting/footer_plain.esp +++ b/swat/scripting/footer_plain.esp @@ -4,4 +4,4 @@ -<% include("/scripting/footer.esp"); %> + diff --git a/swat/scripting/header.esp b/swat/scripting/header.esp deleted file mode 100644 index 1630b2be040..00000000000 --- a/swat/scripting/header.esp +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/swat/scripting/header_columns.esp b/swat/scripting/header_columns.esp index 3bcdc4abe91..3d92bb9522f 100644 --- a/swat/scripting/header_columns.esp +++ b/swat/scripting/header_columns.esp @@ -1,6 +1,9 @@ -<% include("/scripting/header.esp"); %> + + + -@@global.page.title + @@global.page.title diff --git a/swat/scripting/header_plain.esp b/swat/scripting/header_plain.esp index 69bd0cd7183..f9eaae9b967 100644 --- a/swat/scripting/header_plain.esp +++ b/swat/scripting/header_plain.esp @@ -1,6 +1,9 @@ -<% include("/scripting/header.esp"); %> + + + -@@global.page.title + @@global.page.title -- 2.34.1