X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fwelcome.php;h=76d99d33d36f1173684807de98b801ad92a4a88b;hp=2b2a23b72efe084490fce87a93cd6eaa7495cd18;hb=46140faa11b97252647178a811da22509256d6c4;hpb=9d2e48f960548296e71256a282bbf2bec3efbd47

diff --git a/include/welcome.php b/include/welcome.php
index 2b2a23b..76d99d3 100644
--- a/include/welcome.php
+++ b/include/welcome.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud <arun@nubati.net>
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arun Persaud <arun@nubati.net>
  *
  *   This file is part of e-DoKo.
  *
@@ -51,10 +51,98 @@ $avgage	= $avgage[0];
 
 echo "\n\n<div class=\"login\">\n";
 
-echo "<p> If you want to play a game of Doppelkopf, you found the right place ;)</p>".
-"<p> For more information please visit our <a href=\"$WIKI\">wiki</a>. </p>".
-"<h4>Some statistics:</h4>";
+?>
+  <div class="hero-unit">
+  <h1>E-DoKo</h1>
+  <p>Play Doppelkopf online</p>
+  <p> For more information please visit our <a href="<?php echo "$WIKI"; ?>">wiki</a> or just log in. </p>
+  </div>
+
+
+  <ul class="loginregister nav nav-tabs">
+  <li class="active"><a href="#login" data-toggle="tab"> Login </a></li>
+  <li><a href="#register" data-toggle="tab"> Register</a> </li>
+  </ul>
+
+  <div class="tab-content">
+  <div class="tab-pane active" id="login">
+  <form class="loginregister form-inline" action="index.php?action=login" method="post">
+  <fieldset>
+      <input type="email"    id="email"    name="email"    size="20" maxlength="30" placeholder="email" autofocus />
+      <input type="password" id="password" name="password" size="20" maxlength="30" placeholder="password"/>
+<?php
+  if($OPENIDPATH)
+    {?>
+    <br /> or use openid <br />
+    <input type="text" id="openid_url" name="openid_url" size="20" maxlength="50" placeholder="http://username.openid.net"/>
+         <span class="help-bloc">See <a href="http://openid.net">openid.net</a> for more information</span>.
+    <hr />
+    <input type="submit" class="submitbutton" name="login"  value="login" />
+    <input type="submit" class="button"       name="forgot" value="Forgot your password?" />
+<?php }?>
+  </fieldset>
+  </form>
+   </div>
+
+  <div class="tab-pane" id="register">
+
+<?php
+     /* check for openid information */
+     $openid_url = '';
+     $name	 = '';
+     $email	 = '';
+     if(myisset('openid_url'))
+       $openid_url = $_REQUEST['openid_url'];
+     if(myisset('openidname'))
+       $name       = $_REQUEST['openidname'];
+     if(myisset('openidemail'))
+       $email      = $_REQUEST['openidemail'];
+
+     echo '  <form class="loginregister form-horizontal doregister" action="index.php?action=register" method="post">'; echo "\n";
+     echo '  <fieldset>'; echo "\n";
+     echo '     <label for="Rfullname">Full name:</label>'; echo "\n";
+     echo "     <input type=\"text\" id=\"Rfullname\" name=\"Rfullname\" size=\"20\" maxlength=\"30\" value=\"$name\" /> <br />\n";
+     echo '     <label for="Remail">Email:</label>'; echo "\n";
+     echo "     <input type=\"text\" id=\"Remail\" name=\"Remail\" size=\"20\" maxlength=\"30\" value=\"$email\" />  <br />\n";
+     if($openid_url=='')
+       {
+	 echo '     <label for="Rpassword">Password:</label>'; echo "\n";
+	 echo '     <input type="password" id="Rpassword" name="Rpassword" size="20" maxlength="30" />'; echo "<br />\n";
+       }
+     else
+       {
+	 echo '    <label for="Ropenid">OpenId:</label>'; echo "\n";
+	 echo '    <input type="text" id="Ropenid" name="Ropenid" size="20" maxlength="50" value="'.htmlentities($openid_url).'" /> <br />'; echo "\n";
+       }
+     echo '     <label for="Rtimezone">Timezone:</label>'; echo "\n";
+     output_select_timezone("Rtimezone");
+
+     /* random number to select robotproof question */
+     $rand_number = mt_rand(0,3); /* to get numbers between 0 and 4  */
+     $Robotproof = "Robotproof".$rand_number;
+?>
+    Please answer this anti-spam question:<br />
+    <label for="Robotproof">  <?php echo output_robotproof($rand_number); ?></label>
+<?php
+	 echo "    <input type=\"text\" id=\"Robotproof\" name=\"$Robotproof\" size=\"20\" maxlength=\"30\" /> <br />\n";
+?>
+    <input type="submit" class="submitbutton" value="register" />
 
+<?php
+       if($openid_url=='')
+	 echo "  <p><strong> IMPORTANT: passwords are going over the net as clear text, so pick an easy password. ".
+	   "No need to pick anything complicated here ;)</strong></p>\n";
+
+     echo "  <p><strong>N.B. Your email address will be visible to players you play games with.</strong></p>\n";
+?>
+  </fieldset>
+  </form>
+   </div>
+   </div>
+
+<?php
+  echo "<hr />";
+echo "<h4>Some statistics:</h4>\n";
 
 if($pre == 0)
   echo "<p> At the moment there are no games that are being started ";
@@ -79,37 +167,7 @@ if($done==0)
  else if($done==1)
    echo "One game has been completed on this server. </p>";
  else
-   echo "$done games have been completed on this server. Average time of a game: $avgage days</p>";
+   echo "$done games have been completed on this server. Average time of a game: $avgage days</p>\n";
 ?>
 
-  <h4> Login/Register:</h4>
-  <p>
-  Please <a href="index.php?action=register">register</a>, in case you have not done that yet  <br />
-  or login with you email-address or name and password here:
-  </p>
-
-  <form action="index.php?action=login" method="post">
-  <fieldset>
-    <label for="email">Email:</label>
-    <input type="text" id="email" name="email" size="20" maxlength="30" autofocus /> <br />
-    <script>
-    if (!("autofocus" in document.createElement("input"))) {
-      document.getElementById("email").focus();
-    }
-    </script>
-    <label for="password">Password:</label>
-    <input type="password" id="password" name="password" size="20" maxlength="30" /> <br />
-    <input type="submit" class="submitbutton" name="login" value="login" />
-    <input type="submit" class="submitbutton" name="forgot" value="Forgot your password?" />
-<?php
-  if($OPENIDPATH)
-    {?>
-    <hr />
-    <p> Have an OpenID account? Sign in below <br />
-    <input type="text" id="openid_url" name="openid_url" size="20" maxlength="50" />
-    <input type="submit" class="submitbutton" name="login" value="Sign in" /><br />
-     e.g. http://username.openid.net. See <a href="http://openid.net">openid.net</a> for more information.</p>
-<?php }?>
-  </fieldset>
-  </form>
 </div>