diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/output.php | 44 | ||||
| -rw-r--r-- | include/user.php | 14 | ||||
| -rw-r--r-- | include/welcome.php | 16 |
3 files changed, 46 insertions, 28 deletions
diff --git a/include/output.php b/include/output.php index f467558..5157a90 100644 --- a/include/output.php +++ b/include/output.php @@ -489,25 +489,33 @@ function output_navbar() $token = get_user_token($myid); /* logout info */ - 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 "\n<nav class=\"navbar navbar-default navbar-fixed-top\" role=\"navigation\">\n"; + echo " <div class=\"container-fluid\">\n"; + echo " <div class=\"navbar-header\">"; + echo " <img class=\"grav navbar-right\" title=\""._('last login').": ".date("r",$unixtime)."\" "; 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"; + echo ' <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-elements"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button>'; + echo " <a class=\"navbar-brand\" href=\"#\">E-DoKo</a>\n"; + echo " </div>"; + echo ' <div class="collapse navbar-collapse" id="navbar-collapse-elements">'; + echo " <ul class=\"nav navbar-nav\">"; + echo " <li> <a href=\"".$INDEX."\"><span class=\"glyphicon glyphicon-home\"></span>"._('Home')."</a></li>\n"; + echo " <li> <a href=\"".$INDEX."?action=prefs\"><span class=\"glyphicon glyphicon-cog\"></span>". + _('settings')."</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\"><span class=\"glyphicon glyphicon-off\"></span>"._('logout')."</a></li>\n"; + echo " </ul>\n"; + echo " </div>\n"; + echo " </div>\n"; + echo "</nav>\n"; } return; } diff --git a/include/user.php b/include/user.php index ef63e43..764c694 100644 --- a/include/user.php +++ b/include/user.php @@ -204,8 +204,8 @@ else /* create output */ $sessionoutput .= $gameoutput; - $gameoutput = " <span class=\"gamestatusover \"><a href=\"".$INDEX."?action=game&me=".$myhash."\">" - .$gamefrequence."</a></span>\n"; + $gameoutput = " <a class=\"gamestatusover\" href=\"".$INDEX."?action=game&me=".$myhash."\">" + .$gamefrequence."</a>\n"; } else { /* new session */ @@ -218,13 +218,13 @@ else { $output_active .= "<li> "; if($gamestatus == 'pre') - $output_active .= '<span class="gamestatuspre gameid">'; + $class= 'class="gamestatuspre gameid"'; else if($gamestatus == 'play') - $output_active .= '<span class="gamestatusplay gameid">'; + $class= 'class="gamestatusplay gameid"'; else - $output_active .= '<span class="gamestatusover gameid">'; - $output_active .= "<a href=\"$INDEX?action=game&me=$myhash\">". - DB_format_gameid($gameid).'</a></span> '; + $class= 'class="gamestatusover gameid"'; + $output_active .= "<a $class href=\"$INDEX?action=game&me=$myhash\">". + DB_format_gameid($gameid).'</a> '; diff --git a/include/welcome.php b/include/welcome.php index 3e52e44..0654e20 100644 --- a/include/welcome.php +++ b/include/welcome.php @@ -52,7 +52,7 @@ $avgage = $avgage[0]; echo "\n\n<div class=\"login\">\n"; ?> - <div class="hero-unit"> + <div class="jumbotron"> <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> @@ -100,10 +100,15 @@ echo "\n\n<div class=\"login\">\n"; echo ' <form class="loginregister form-horizontal doregister" action="index.php?action=register" method="post">'; echo "\n"; echo ' <fieldset>'; echo "\n"; + echo ' <div class="form-group">'; 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 " </div>\n"; + echo ' <div class="form-group">'; echo "\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"; + echo " <input type=\"email\" id=\"Remail\" name=\"Remail\" size=\"20\" maxlength=\"30\" value=\"$email\" /> <br />\n"; + echo " </div>\n"; + echo ' <div class="form-group">'; echo "\n"; if($openid_url=='') { echo ' <label for="Rpassword">Password:</label>'; echo "\n"; @@ -114,18 +119,23 @@ echo "\n\n<div class=\"login\">\n"; 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 " </div>\n"; + echo ' <div class="form-group">'; echo "\n"; echo ' <label for="Rtimezone">Timezone:</label>'; echo "\n"; output_select_timezone("Rtimezone"); + echo " </div>\n"; /* 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 /> + <p>Please answer this anti-spam question:</p> + <div class="form-group"> <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"; ?> + </div> <input type="submit" class="submitbutton" value="register" /> <?php |