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
14 years ago · 27ce979678
parent 058f46f1a5
commit 27ce979678
3 changed files with 24 additions and 21 deletions
--- a/templates/flash_error.tpl
+++ b/templates/flash_error.tpl
@ -0,0 +1,20 @@
+<!-- {$smarty.template} -->
+<br clear="all"/><br />
+{strip}
+		{if $smarty.session.flash}
+			{if $smarty.session.flash.info}
+				<ul class="flash-info">
+					{foreach from=$smarty.session.flash.info item=msg}
+						<li>{$msg}</li>
+					{/foreach}
+				</ul>
+			{/if}
+			{if $smarty.session.flash.error}
+				<ul class="flash-error">
+					{foreach from=$smarty.session.flash.error item=msg}
+						<li>{$msg}</li>
+					{/foreach}
+				</ul>
+			{/if}
+		{/if}
+{/strip}
--- a/templates/header.tpl
+++ b/templates/header.tpl
@ -12,32 +12,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link rel="stylesheet" type="text/css" href="{$CONF.theme_css}"/>
+		<link rel="stylesheet" type="text/css" href="{$CONF.theme_css}" />
 		<title>Postfix Admin - {$smarty.server.HTTP_HOST}</title>
 	</head>
 	<body class="lang-{$smarty.session.lang}">
+		<div id="container">
 		<div id="login_header">
-		<img id="login_header_logo" src="{$CONF.theme_logo}" alt="Logo"/>
+		<img id="login_header_logo" src="{$CONF.theme_logo}" alt="Logo" />
 {if $CONF.show_header_text==='YES' && $CONF.header_text}
 		<h2>{$CONF.header_text}</h2>
 {/if}
 		</div>
-
-{strip}
-		{if $smarty.session.flash}
-			{if $smarty.session.flash.info}
-				<ul class="flash-info">
-					{foreach from=$smarty.session.flash.info item=msg}
-						<li>{$msg}</li>
-					{/foreach}
-				</ul>
-			{/if}
-			{if $smarty.session.flash.error}
-				<ul class="flash-error">
-					{foreach from=$smarty.session.flash.error item=msg}
-						<li>{$msg}</li>
-					{/foreach}
-				</ul>
-			{/if}
-		{/if}
-{/strip}
--- 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}