From 27ce97967811a49301a1cf101ed6db90d4085ce5 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Mon, 18 Jul 2011 21:56:08 +0000 Subject: [PATCH] header.tpl, index.tpl, flash_error.tpl: - move flash_error and flash_info output from header.tpl to separate flash_error.tpl file - some HTML whitespace fixing in header.tpl This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF), https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583 git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1077 a1433add-5e2c-0410-b055-b7f2511e0802 --- templates/flash_error.tpl | 20 ++++++++++++++++++++ templates/header.tpl | 24 +++--------------------- templates/index.tpl | 1 + 3 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 templates/flash_error.tpl diff --git a/templates/flash_error.tpl b/templates/flash_error.tpl new file mode 100644 index 00000000..babec2e3 --- /dev/null +++ b/templates/flash_error.tpl @@ -0,0 +1,20 @@ + +

+{strip} + {if $smarty.session.flash} + {if $smarty.session.flash.info} + + {/if} + {if $smarty.session.flash.error} + + {/if} + {/if} +{/strip} \ No newline at end of file diff --git a/templates/header.tpl b/templates/header.tpl index fb3dd430..c973d0a4 100644 --- a/templates/header.tpl +++ b/templates/header.tpl @@ -12,32 +12,14 @@ - + Postfix Admin - {$smarty.server.HTTP_HOST} +
- + {if $CONF.show_header_text==='YES' && $CONF.header_text}

{$CONF.header_text}

{/if}
- -{strip} - {if $smarty.session.flash} - {if $smarty.session.flash.info} - - {/if} - {if $smarty.session.flash.error} - - {/if} - {/if} -{/strip} diff --git a/templates/index.tpl b/templates/index.tpl index b4efbb2c..7696338c 100644 --- a/templates/index.tpl +++ b/templates/index.tpl @@ -9,6 +9,7 @@ {include file='menu.tpl'} {/if} {/if} +{include file='flash_error.tpl'} {if $smarty_template} {include file="$smarty_template.tpl"} {else}