--- FreeBSD/tinderbox/webui/templates/paefchen/display_login.tpl	2008/01/07 03:53:59	1.2
+++ FreeBSD/tinderbox/webui/templates/paefchen/display_login.tpl	2008/01/07 04:16:24	1.3
@@ -1,42 +1,40 @@
-<!-- $Paefchen: FreeBSD/tinderbox/webui/templates/paefchen/display_login.tpl,v 1.1 2008/01/05 12:25:17 as Exp $ //-->
+<!-- $Paefchen: FreeBSD/tinderbox/webui/templates/paefchen/display_login.tpl,v 1.2 2008/01/07 03:53:59 as Exp $ //-->
 <!-- user_name:<?=$user_name?>;user_id:<?=$user_id?>;is_www_admin:<?=$is_www_admin?> //-->
-<div id="user">
 <? if (empty($user_name)) { ?>
 	<form method="post" action="index.php">
-	<fieldset>
-		<label>Login</label>
+		<fieldset>
+			<label>Login</label>
 	<? if ($errors) { ?>
-		<p style="color:#FF0000">
+			<p style="color:#FF0000">
 		<? foreach($errors as $error){ ?>
-			<?=$error?><br />
+				<?=$error?><br />
 		<? } ?>
-		</p>
+			</p>
 	<?}?>
-	<table>
-		<tr>
-			<td>Username</td>
-			<td><input type="text" name="User_Name" /></td>
-			<td>&nbsp;</td>
-			<td>Password</td>
-			<td><input type="password" name="User_Password" /></td>
-			<td>&nbsp;</td>
-			<td><input type="submit" name="do_login" value="login" /></td>
-		</tr>
-	</table>
-	</fieldset>
+			<table>
+				<tr>
+					<td>Username</td>
+					<td><input type="text" name="User_Name" /></td>
+					<td>&nbsp;</td>
+					<td>Password</td>
+					<td><input type="password" name="User_Password" /></td>
+					<td>&nbsp;</td>
+					<td><input type="submit" name="do_login" value="login" /></td>
+				</tr>
+			</table>
+		</fieldset>
 	</form>
-<? } else { ?>
+<? } else if (! empty($user_name) && $is_www_admin == 1) { ?>
 	<form method="post" action="index.php">
-	<? if ($is_www_admin == 1) { ?>
-		<h1>Modify User</h1>
-		<input type="hidden" name="action" value="display_modify_user" />
-		<select name="modify_user_id">
+		<fieldset>
+			<label>Modify User</label>
+			<input type="hidden" name="action" value="display_modify_user" />
+			<select name="modify_user_id">
 		<?foreach($all_users as $user){?>
-			<option value="<?=$user['user_id']?>" <?if ($user_name == $user['user_name']) {?>selected="selected"<?}?>><?=$user['user_name']?></option>
+				<option value="<?=$user['user_id']?>" <?if ($user_name == $user['user_name']) {?>selected="selected"<?}?>><?=$user['user_name']?></option>
 		<? } ?>
-		</select>
-		<input type="submit" name="display_modify_user" value="Modify User" />
+			</select>
+			<input type="submit" name="display_modify_user" value="Modify User" />
+		</fieldset>
 	</form>
-	<? } ?>
 <? } ?>
-</div>