CVS: phpwiki/themes/default/templates signin.tmpl,1.28,1.29

Update of /cvsroot/phpwiki/phpwiki/themes/default/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15355/default/templates

Modified Files:
        signin.tmpl 
Log Message:
fix bug #950841 "Sign In:" button appears twice, more signin unification

Index: signin.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/signin.tmpl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -2 -b -p -d -r1.28 -r1.29
--- signin.tmpl 1 May 2004 11:59:05 -0000       1.28
+++ signin.tmpl 16 May 2004 17:38:02 -0000      1.29
@@ -1,3 +1,3 @@
-<?php // -*-html-*-
+<?php // -*-php-*-
 rcs_id('$Id$');
 
@@ -7,6 +7,6 @@ else
     $NOFORM = true;
 ?>
-<?php if (empty($NOFORM)) { ?>
-  <form method="post" action="<?=$request->getURLtoSelf()?>" 
accept-charset="<?=CHARSET?>" name="<?=$FORMNAME?>">
+<?php if (empty($NOFORM)) { ? >
+  <form method="post" action="<?=$request->getPostURL()?>" 
accept-charset="<?=$charset?>" name="<?=$FORMNAME?>">
   <?= HiddenInputs($request->getArgs(), false, array('auth')) ?>
 <?php } ?>
@@ -21,6 +21,7 @@ if ($user->isAuthenticated()) {
     document.write('<input type="hidden" name="auth[logout]" value="0" />');
     function SignOut() { 
-      document.forms["<?=$FORMNAME?>"].elements["auth[logout]"].value = 1;
-      document.forms["<?=$FORMNAME?>"].submit();
+      var form = document.forms["<?=$FORMNAME?>"];
+      form.elements["auth[logout]"].value = 1;
+      form.submit();
     }
     document.write('<?=$SignOutB?>'); // -->
@@ -29,6 +30,5 @@ if ($user->isAuthenticated()) {
     <?= Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?>
   </noscript>
-<?php } else { ?>
-    <?php
+<?php } else {
     $SignInInput = HTML::input(array('type' => 'text',
                                     'name' => "auth[userid]",
@@ -46,5 +46,4 @@ if ($user->isAuthenticated()) {
                                 $userid)));
 ?>
-
   <script type="text/javascript"> <!--
      function SignIn(form,userid) {
@@ -65,10 +64,10 @@ if ($user->isAuthenticated()) {
   <?= Button("submit:auth[login]", _("Sign in as:"), 'wikiaction')?>
   <?= $SignInInput ?>
+<?php /* // sf.net bug #950841 "Sign In:" button appears twice
   <noscript>
     <?= Button("submit:auth[login]", _("Sign in as:"), 'wikiaction')?>
   </noscript>
-
+*/ ?>
 <?php } ?>
-
 <?php if (empty($NOFORM)) { ?>
   </form>



-------------------------------------------------------
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562&alloc_id=6184&op=click