[phpwiki-checkins] CVS: phpwiki/themes/default/templates signin.tmpl,1.19,1.20

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/themes/default/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv1693/themes/default/templates

Modified Files:
	signin.tmpl 
Log Message:
Fix form action URI and hidden inputs.

Eliminated "Sign In" button when javascript is enabled.
(It's unneccesary, and as it was there were two
identical "Sign In" buttons when javascript was disabled.)



Index: signin.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/signin.tmpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -2 -b -p -d -r1.19 -r1.20
--- signin.tmpl	17 Sep 2002 19:32:11 -0000	1.19
+++ signin.tmpl	17 Feb 2003 05:58:42 -0000	1.20
@@ -12,6 +12,6 @@
 ?>
 <?php if (empty($NOFORM)) { ?>
-  <form method="post" action="<?=$request->getURLtoSelf()?>" accept-charset="<?=CHARSET?>" name="<?=$FORMNAME?>">
-  <?= HiddenGets(array('auth')) ?>
+  <form method="post" action="<?= $request->getPostURL() ?>" accept-charset="<?=CHARSET?>" name="<?=$FORMNAME?>">
+  <?= HiddenInputs($request->getArgs(), false, array('auth')) ?>
 <?php } ?>
 <?php if ($user->isSignedIn()) {  ?>
@@ -30,5 +30,12 @@
     <?= Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?>
   </noscript>
-<?php } else { ?>
+<?php } else {
+  $SignInInput = HTML::input(array('type' => 'text',
+                                   'name' => "auth[userid]",
+                                   'size' => 12,
+                                   'maxlength' => 256,
+                                   'onchange' => "SignIn(this.form);"));
+  $SignInInput->addTooltip(_("Enter your UserId to sign in")) 
+?>
   <script type="text/javascript"> <!--
     function SignIn(form) {
@@ -43,12 +50,6 @@
     }
     //-->
+    document.write('&nbsp;<?= _("Sign in:") ?>');
     </script>
-  <?php $SignInInput = HTML::input(array('type' => 'text',
-                                         'name' => "auth[userid]",
-                                         'size' => 12,
-                                         'maxlength' => 256,
-                                         'onchange' => "SignIn(this.form);"));
-        $SignInInput->addTooltip(_("Enter your UserId to sign in")) ?>
-  <?= Button("submit:auth[login]", _("Sign In"), 'wikiaction')?>
   <?= $SignInInput ?>
   <noscript>