Commit Diff

Commit:
9569d4ce0725a196d43f803cffdd962ba6a6d317
From:
mischa <mischa@rx.high5.nl>
Date:
Message:
template cleanup
Actions:
Patch | Tree
commit - fae4c3876fd433069bb252131982c03593043a4f
commit + 9569d4ce0725a196d43f803cffdd962ba6a6d317
blob - ffe1f72d9b2e502024b64275e632f2e4409574cf
blob + 188dd0c0a3e73aba81b5d375fa1414a11ecbf8ca
--- templates/footer.tpl
+++ templates/footer.tpl
@@ -2,8 +2,8 @@
 <a href="https://git.high5.nl/opensmtpdadmin/">OpenSMTPD Admin <?php echo VERSION; ?></a>
 <?php
 if (SHOW_FOOTER == "YES" && FOOTER_LINK) {
-	echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;";
-	echo "<a href=\"" . FOOTER_LINK . "\">" . FOOTER_TEXT . "</a>";
+	echo '&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;';
+	echo '<a href="' . FOOTER_LINK . '">' . FOOTER_TEXT . '</a>';
 }
 ?>
 </div>
blob - 705f4dcf0d08f08d1c69f50807339cde18728447
blob + 4dcc433647adb5ae45bb7538d55e552630f19bb5
--- templates/header.tpl
+++ templates/header.tpl
@@ -10,25 +10,18 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo isset($LANG['charset']) ? $LANG['charset'] : 'iso-8859-1' ?>" />
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<?php
-if (file_exists(realpath("./stylesheet.css"))) echo "<link rel=\"stylesheet\" href=\"stylesheet.css\">";
-if (file_exists(realpath("../stylesheet.css"))) echo "<link rel=\"stylesheet\" href=\"../stylesheet.css\">";
-?>
+<link rel="stylesheet" href="stylesheet.css">
 <title>OpenSMTPD Admin - <?php echo $_SERVER['HTTP_HOST']; ?></title>
 </head>
 <body>
 <div id="login_header">
 <?php
 if (file_exists(realpath("./stylesheet.css"))) {
-	echo "<img id=\"login_header_logo\" src=\"images/postbox.png\" />";
-	echo "<img id=\"login_header_logo\" height=\"30px\" src=\"images/opensmtpdadmin.png\" />";
+	echo '<img id="login_header_logo" src="images/postbox.png" />';
+	echo '<img id="login_header_logo" height="30px" src="images/opensmtpdadmin.png" />';
 }
-if (file_exists(realpath("../stylesheet.css"))) {
-	echo "<img id=\"login_header_logo\" src=\"../images/postbox.png\" />";
-	echo "<img id=\"login_header_logo\" height=\"30px\"% src=\"../images/opensmtpdadmin.png\" />";
-}
 if (SHOW_HEADER == "YES" && HEADER_TEXT) {
-	echo "<h2>" . HEADER_TEXT . "</h2>";
+	echo '<h2>' . HEADER_TEXT . '</h2>';
 }
 ?>
 </div>
blob - a2d281dcbf0bc6ce0673835e99ab7b15919ee465
blob + 47305996479aff1eec5fe02073eee3d54d9b0c56
--- templates/menu.tpl
+++ templates/menu.tpl
@@ -6,10 +6,8 @@
 		<li><a target="_top" href="vacation.php"><?php echo $LANG['Menu_user_vacation']; ?></a></li>
 		<?php } ?>
 	<?php } else {?>
-	
 		<li><a target="_top" href="list-domain.php"><?php echo $LANG['Menu_list_domain']; ?></a></li>
 		<li><a target="_top" href="list-virtual.php"><?php echo $LANG['Menu_list_virtual']; ?></a></li>
-
 		<?php if ($ROLE == ADMIN_ROLE) { ?>
 			<li><a target="_top" href="list-admin.php"><?php echo $LANG['Menu_list_admin']; ?></a></li>
 			<li><a target="_top" href="backup.php"><?php echo $LANG['Menu_backup']; ?></a></li>
@@ -28,8 +26,8 @@
 </div>
 <?php
 if (file_exists(realpath("motd.txt"))) {
-	echo "<div id=\"motd\">";
-	include("motd.txt");
-	echo "</div>";
+	echo '<div id="motd">';
+	include 'motd.txt';
+	echo '</div>';
 }
 ?>