[phpBT-dev] CVS: phpbt/templates/default footer.html,1.1,1.2 header.html,1.3,1.4 user.html,1.5,1.6

[Benjamin C. <bc...@us...>]

Update of /cvsroot/phpbt/phpbt/templates/default
In directory usw-pr-cvs1:/tmp/cvs-serv26191

Modified Files:
	footer.html header.html user.html 
Log Message:
Cleanup

Index: footer.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/footer.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- footer.html	3 Apr 2002 00:57:51 -0000	1.1
+++ footer.html	3 Apr 2002 19:01:04 -0000	1.2
@@ -4,34 +4,34 @@
 			<td width="150" height="30" class="sidenav">
 				&nbsp
 			</td>
-			<form method="post" action="{$smarty.server.REQUEST_URI}">
 			<td height="30" class="bottomnav">
-				&nbsp;
-				{if not $smarty.session.uid}
-					{if EMAIL_IS_LOGIN}
-						{assign var="loginlabel" value="Email"}
+				<form method="post" action="{$smarty.server.REQUEST_URI}">
+					&nbsp;
+					{if not $smarty.session.uid}
+						{if EMAIL_IS_LOGIN}
+							{assign var="loginlabel" value="Email"}
+						{else}
+							{assign var="loginlabel" value="Login"}
+						{/if}
+						{$loginerror}
+						{$loginlabel}: <input type="text" name="username" class="bottomnavinput" value="{$smarty.cookies.phpbt_user}"> 
+						Password: <input type="password" name="password" class="bottomnavinput"> 
+						<input type="hidden" name="dologin" value="1">
+						<input type="submit" value="Login" class="bottomnavinput"> 
+						<input type="submit" name="sendpass" value="Email Password" class="bottomnavinput" title="Forgot your password?  Have it sent to you"> 
+          	{if RECALL_LOGIN}
+            	<input type="checkbox" name="savecookie" value="1" {if !empty($smarty.cookies.phpbt_user)}checked{/if} class="bottomnavinput" title="Remember {$loginlabel} for next time"> Remember me   				  
+    				{/if}
 					{else}
-						{assign var="loginlabel" value="Login"}
+						[ Bugs assigned to me: <a href="query.php?op=mybugs&assignedto=1&open=1" title="Open">{$owner_open}</a> / <a href="query.php?op=mybugs&assignedto=1&open=0" title="Closed">{$owner_closed}</a> 
+						| Bugs reported by me: <a href="query.php?op=mybugs&reportedby=1&open=1" title="Open">{$reporter_open}</a> / <a href="query.php?op=mybugs&reportedby=1&open=0" title="Closed">{$reporter_closed}</a> 
+						| <a href="user.php">Personal Page</a> 
+						| <a href="logout.php">Logout {$smarty.session.uname}</a> 
+						]
 					{/if}
-					{$loginerror}
-					{$loginlabel}: <input type="text" name="username" class="bottomnavinput" value="{$smarty.cookies.phpbt_user}"> 
-					Password: <input type="password" name="password" class="bottomnavinput"> 
-					<input type="hidden" name="dologin" value="1">
-					<input type="submit" value="Login" class="bottomnavinput"> 
-					<input type="submit" name="sendpass" value="Email Password" class="bottomnavinput" title="Forgot your password?  Have it sent to you"> 
-          {if RECALL_LOGIN}
-            <input type="checkbox" name="savecookie" value="1" {if !empty($smarty.cookies.phpbt_user)}checked{/if} class="bottomnavinput" title="Remember {$loginlabel} for next time"> Remember me   				  
-    			{/if}
-				{else}
-					[ Bugs assigned to me: <a href="query.php?op=mybugs&assignedto=1&open=1" title="Open">{$owner_open}</a> / <a href="query.php?op=mybugs&assignedto=1&open=0" title="Closed">{$owner_closed}</a> 
-					| Bugs reported by me: <a href="query.php?op=mybugs&reportedby=1&open=1" title="Open">{$reporter_open}</a> / <a href="query.php?op=mybugs&reportedby=1&open=0" title="Closed">{$reporter_closed}</a> 
-					| <a href="user.php">Personal Page</a> 
-					| <a href="logout.php">Logout {$smarty.session.uname}</a> 
-					]
-				{/if}
-				&nbsp;
+					&nbsp;
+				</form>
 			</td>
-			</form>
 		</tr>
 	</table>
 </body>

Index: header.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/header.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- header.html	3 Apr 2002 18:52:31 -0000	1.3
+++ header.html	3 Apr 2002 19:01:04 -0000	1.4
@@ -10,13 +10,13 @@
 			<td width="150" height="30" class="nav">
 				&nbsp;&nbsp;phpBugTracker
 			</td>
-			<form action="bug.php">
-			<input type="hidden" name="op" value="show">
 			<td height="30" class="nav" align="right">
-				Find bug <input type="text" name="bugid" size="4" class="navinput">
-				&nbsp;
+				<form action="bug.php">
+				<input type="hidden" name="op" value="show">
+					Find bug <input type="text" name="bugid" size="4" class="navinput">
+					&nbsp;
+				</form>
 			</td>
-			</form>
 		</tr>
 		<tr>
 			<td width="150" class="sidenav">

Index: user.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/user.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- user.html	3 Apr 2002 00:57:51 -0000	1.5
+++ user.html	3 Apr 2002 19:01:04 -0000	1.6
@@ -60,7 +60,6 @@
 		</form>
 	</td>
 </table>
-</form>
 <br>
 <form action="{$SCRIPT_NAME}" method="post">
 <input type="hidden" name="do" value="changecolumnlist">