diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/output.php | 50 | ||||
| -rw-r--r-- | include/welcome.php | 48 |
2 files changed, 52 insertions, 46 deletions
diff --git a/include/output.php b/include/output.php index fa61c87..c267b0c 100644 --- a/include/output.php +++ b/include/output.php @@ -443,16 +443,16 @@ function output_footer() echo "</div>\n\n"; echo "<footer>\n"; - echo " <p class=\"left\"> copyright 2006-2012 <a href=\"$INDEX?action=about\">Arun Persaud, et al.</a> <br />\n". - " Verwendung der [deutschen] Kartenbilder mit Genehmigung <br />der Spielkartenfabrik Altenburg GmbH,(c) ASS Altenburger <br />\n". - " - ASS Altenburger Spielkarten - Spielkartenfabrik Altenburg GmbH <br />\n". - " a Carta Mundi Company Email: info@spielkarten.com Internet: www.spielkarten.com</p>\n"; echo " <p class=\"right\"> See the latest changes <a href=\"http://nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=summary\">\n". " via git </a> <br />or download the source via <br />\n'git clone http://nubati.net/git/e-DoKo.git' <br />\n". " <a href=\"http://www.dreamhost.com/green.cgi\">\n". " <img alt=\"Green Web Hosting! This site hosted by DreamHost.\"". " src=\"pics/green1.gif\" height=\"32\" width=\"100\" /></a>\n". " </p> \n"; + echo " <p class=\"left\"> copyright 2006-2012 <a href=\"$INDEX?action=about\">Arun Persaud, et al.</a> <br />\n". + " Verwendung der [deutschen] Kartenbilder mit Genehmigung <br />der Spielkartenfabrik Altenburg GmbH,(c) ASS Altenburger <br />\n". + " - ASS Altenburger Spielkarten - Spielkartenfabrik Altenburg GmbH <br />\n". + " a Carta Mundi Company Email: info@spielkarten.com Internet: www.spielkarten.com</p>\n"; echo "</footer>\n\n"; echo '<script src="'.autoversion('js/jquery.min.js'). '"></script>'; @@ -474,7 +474,8 @@ function output_navbar() if(isset($_SESSION['name'])) { - $name = $_SESSION['name']; + $name = $_SESSION['name']; + $email = DB_get_email('name',$name); /* last logon time */ $myid = DB_get_userid('name',$name); @@ -489,28 +490,23 @@ function output_navbar() $token = get_user_token($myid); /* logout info */ - echo "\n<div class=\"navbar navbar-fixed-top\">\n"; - echo " <div class=\"navbar-inner\">\n"; - echo " <span class=\"brand\" href=\"#\">E-DoKo</span>\n"; - echo " <ul class=\"nav\">"; - echo " <li><a href=\"#\">$name</a> </li>\n"; - echo " <li class=\"divider-vertical\"></li>\n"; - echo " <li> <a href=\"".$INDEX."\">"._('mypage')."</a></li>\n"; - echo " <li class=\"divider-vertical\"></li>\n"; - echo " <li> <a href=\"".$INDEX."?action=prefs\">"._('settings')."</a></li>\n"; - echo " <li class=\"divider-vertical\"></li>\n"; - echo " <li> <a href=\"".$INDEX."?action=new\">"._('new game')."</a></li>\n"; - echo " <li class=\"divider-vertical\"></li>\n"; - echo " <li> <a href=\"".$INDEX."?action=stats\">"._('statistics')."</a></li>\n"; - echo " <li class=\"divider-vertical\"></li>\n"; - echo " <li> <a href=\"".$WIKI."\">"._('wiki/bugs')."</a></li>\n"; - echo " <li class=\"divider-vertical\"></li>\n"; - echo " <li> <a href=\"".$RSS."?uid=".$myid."&token=".$token."\">"._('atom')."</a></li>\n"; - echo " <li class=\"divider-vertical\"></li>\n"; - echo " <li> <a href=\"".$INDEX."?action=logout\">"._('logout')."</a></li>\n"; - echo " </ul>\n"; - echo " </div>\n"; - echo "</div>\n\n"; + echo "\n<div class=\"navigation\">\n"; + echo " <span class=\"brand\" href=\"#\">E-DoKo</span>\n"; + echo " <ul class=\"nav\">"; + echo " <li>\n"; + echo " <img title=\"$name\" "; + echo "src=\"http://www.gravatar.com/avatar/".md5(strtolower(trim($email)))."?d=identicon\" />\n"; + echo " </li>\n"; + echo " <li> <a href=\"".$INDEX."\"><i class=\"icon-home\"></i><span class=\"navhide\">"._('Home')."</span></a></li>\n"; + echo " <li> <a href=\"".$INDEX."?action=prefs\"><i class=\"icon-cog\"></i><span class=\"navhide\">". + _('settings')."</span></a></li>\n"; + echo " <li> <a href=\"".$INDEX."?action=new\">"._('new game')."</a></li>\n"; + echo " <li> <a href=\"".$INDEX."?action=stats\">"._('statistics')."</a></li>\n"; + echo " <li> <a href=\"".$WIKI."\">"._('wiki/bugs')."</a></li>\n"; + echo " <li> <a href=\"".$RSS."?uid=".$myid."&token=".$token."\">"._('atom')."</a></li>\n"; + echo " <li> <a href=\"".$INDEX."?action=logout\"><i class=\"icon-off\"></i><span class=\"navhide\">"._('logout')."</span></a></li>\n"; + echo " </ul>\n"; + echo "</div>\n"; echo "<div class=\"lastlogin\"><span>"._('last login').": ".date("r",$unixtime)."</span></div>\n\n"; } diff --git a/include/welcome.php b/include/welcome.php index 62087a3..5ba7b38 100644 --- a/include/welcome.php +++ b/include/welcome.php @@ -51,33 +51,40 @@ $avgage = $avgage[0]; echo "\n\n<div class=\"login\">\n"; -echo " <p> Play Doppelkopf online.</p>\n". -" <p> For more information please visit our <a href=\"$WIKI\">wiki</a>. </p>\n"; ?> - <ul class="loginregister"> - <li> Login </li> - <li> Register </li> + <div class="hero-unit"> + <h1>E-DoKo</h1> + <p>Play Doppelkopf online</p> + <p> For more information please visit our <a href="<?php $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> - <form class="dologin" action="index.php?action=login" method="post"> + <div class="tab-content"> + <div class="tab-pane active" id="login"> + <form class="loginregister form-inline" action="index.php?action=login" method="post"> <fieldset> - <label for="email">Email:</label> - <input type="email" id="email" name="email" size="20" maxlength="30" autofocus /> <br /> - <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?" /> + <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 /> - <label for="openid_url">Openid:</label> - <input type="text" id="openid_url" name="openid_url" size="20" maxlength="50" placeholder="http://username.openid.net"/> <br /> - <p>See <a href="http://openid.net">openid.net</a> for more information.</p> - <input type="submit" class="submitbutton" name="login" value="Sign in" /><br /> + <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 */ @@ -91,7 +98,7 @@ echo " <p> Play Doppelkopf online.</p>\n". if(myisset('openidemail')) $email = $_REQUEST['openidemail']; - echo ' <form class="doregister" action="index.php?action=register" method="post">'; echo "\n"; + 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"; @@ -114,12 +121,12 @@ echo " <p> Play Doppelkopf online.</p>\n". $rand_number = mt_rand(0,3); /* to get numbers between 0 and 4 */ $Robotproof = "Robotproof".$rand_number; ?> - <p style="float: left">Please answer this anti-spam question:</p> + 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" value="register" /> + <input type="submit" class="submitbutton" value="register" /> <?php if($openid_url=='') @@ -130,8 +137,11 @@ echo " <p> Play Doppelkopf online.</p>\n". ?> </fieldset> </form> + </div> + </div> <?php + echo "<hr />"; echo "<h4>Some statistics:</h4>\n"; if($pre == 0) |