diff options
-rw-r--r-- | css/standard009.css (renamed from css/standard008.css) | 123 | ||||
-rw-r--r-- | include/output.php | 6 | ||||
-rw-r--r-- | include/stats.php | 3 | ||||
-rw-r--r-- | include/welcome.php | 34 | ||||
-rw-r--r-- | pics/arrow0.png | bin | 3300 -> 22088 bytes | |||
-rw-r--r-- | pics/arrow1.png | bin | 3435 -> 22873 bytes | |||
-rw-r--r-- | pics/arrow2.png | bin | 3356 -> 22124 bytes | |||
-rw-r--r-- | pics/arrow3.png | bin | 3490 -> 23056 bytes | |||
-rw-r--r-- | pics/table.png | bin | 2103 -> 62360 bytes |
9 files changed, 119 insertions, 47 deletions
diff --git a/css/standard008.css b/css/standard009.css index 46b738c..6d13028 100644 --- a/css/standard008.css +++ b/css/standard009.css @@ -18,38 +18,52 @@ table, td, th { vertical-align: middle; } h1, h2, h3, h4, h5, h6, p {margin: 2px; padding: 1px;} +body { background-color: #ddd; } + .header { background-color: white; text-align: center; height: 4em; + padding-top: 1.5em; + margin-left: 3em; + margin-right: 3em; border-bottom: 3px solid gray; } .lastlogin { position:absolute; - font-size:smaller; top:0; - left:0; + left:3em; +} +.lastlogin span { + font-size:smaller; } .main { + background-color: white; + margin-left: 3em; + margin-right: 3em; min-height: 40em; } .footer { + background-color: #fff; margin:0; - margin-top:0.3em; + margin-left: 3em; + margin-right: 3em; padding:0; - border-top: 2px solid #444; - font-size:smaller; + border-top: 2px solid gray; clear:both; + height: 8em; +} +.footer .right { float:right; font-size:smaller; } -.footer .right { float:right; } -.footer .left { float:left; } +.footer .left { float:left; font-size:smaller; + } .status { position:absolute; - right:1em; + right:4em; top:0.1em; font-size: smaller; } @@ -116,7 +130,7 @@ div.table img.table { top:20%; height:22em; left:37.5%; - z-indexk:9; + z-index:5; display: block; margin:0; padding:0; @@ -138,7 +152,7 @@ div.table div.table0 { right:62.5%; } div.table div.table1 { - top:5%; + top:7.5%; left:43.75%; } div.table div.table2 { @@ -196,7 +210,7 @@ ul.tricks li div.trick img.arrow { height:16em; left:42%; right:42%; - top:11em; + top:10em; z-index:8; } @@ -209,7 +223,7 @@ ul.tricks li div div.card0 img,ul.tricks li div div.card0 .score, .vorbehalt0 { margin:0; padding:0; /*border: 1px solid red;*/ - top: 45%; + top: 40%; left:37.5%; right:56.5%; width:6%; @@ -230,7 +244,7 @@ ul.tricks li div div.card1 img,ul.tricks li div div.card1 .score, .vorbehalt1 { margin:0; padding:0; /*border: 1px solid red;*/ - top: 25%; + top: 22%; left:47%; right:47%; width:6%; @@ -253,7 +267,7 @@ ul.tricks li div div.card2 img,ul.tricks li div div.card2 .score, .vorbehalt2{ margin:0; padding:0; /*border: 1px solid red;*/ - top: 45%; + top: 40%; right:37.5%; left:56x.5%; width:6%; @@ -275,7 +289,7 @@ ul.tricks li div div.card3 img,ul.tricks li div div.card3 .score, .vorbehalt3{ margin:0; padding:0; /*border: 1px solid red;*/ - bottom: 15%; + bottom: 20%; left:47%; right:47%; width:6%; @@ -307,8 +321,10 @@ ul.tricks li div div span.comment span{ margin:0; margin-top:34.5em; padding:0; - border:1px solid red; - background-color:yellow; + border-top: 2px solid gray; +/* border-bottom: 2px solid green;*/ + background-color: #faffc7; + text-align:center; } .mycards img { @@ -362,7 +378,7 @@ div.session div.sessionrules:hover div{ div.session div.sessionscore div{ position:absolute; width:12em; - right:0em; + right:3em; display:none; background-color: white; border: 1px solid black; @@ -388,32 +404,27 @@ table.score { right:0em; margin:1em; margin-top:0em; - margin-right:0em; + margin-right:3em; width:12em; - border-top: 2px solid gray; - border-left: 2px solid gray; - border-bottom: 2px solid gray; - padding:0.3em; + border: 2px solid gray; background-color: #efefef; } .usermenu { position:absolute; top:10em; - left:0; + left:3em; margin:1em; margin-top:0em; margin-left:0em; width: 12em; - border-top: 2px solid gray; - border-right: 2px solid gray; - border-bottom: 2px solid gray; + border: 2px solid gray; padding:0.3em; @@ -426,13 +437,11 @@ table.score { left:0; margin:1em; margin-top:0em; - margin-left:0em; + margin-left:3em; width: 12em; - border-top: 2px solid gray; - border-right: 2px solid gray; - border-bottom: 2px solid gray; + border: 2px solid gray; padding:0.3em; @@ -453,6 +462,8 @@ table.score { } .submitbutton { + padding: 0.2em; + padding-bottom: 0.3em; border:0; background-color: #efe; } @@ -523,3 +534,53 @@ table.stats tr td:last-child, table.stats tr th:last-child { border-right: sol table.stats th { border-bottom: solid 0.2em black } +.login { + text-align:center; + padding-top: 1em; +} + +.login p, { + padding: 0.1em; + padding-bottom: 0.15em; +} +.login h4 { + padding: 0.3em; + padding-bottom: 0.45em; +} + +.login form{ + width: 20em; + margin: 0.5em auto; + padding: 0.5em; + padding-bottom: 1.5em; + text-align: center; +} + +.login legend, .login label{ + padding: 0.5em; + padding-bottom: 0.75em; +} + +.login input{ + margin: 0.5em; + margin-bottom: 0.75em; +} + +.login fieldset { + border: 2px solid black; + padding: 0.5em; + padding-bottom: 0.75em; + background-color: #eee; +} + +.login .submitbutton { + background-color: #fff; +} + +.login .submitbutton:hover { + background-color: #aaa; +} + +.login tr.center td{ + text-align: center; +} diff --git a/include/output.php b/include/output.php index 81f01c5..21f7e8e 100644 --- a/include/output.php +++ b/include/output.php @@ -270,7 +270,7 @@ function output_header() <title>e-Doko</title> <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type" /> <link rel="shortcut icon" type="image/x-icon" href="pics/edoko-favicon.png" /> - <link rel="stylesheet" type="text/css" href="css/standard008.css" /> + <link rel="stylesheet" type="text/css" href="css/standard009.css" /> <script type="text/javascript"> var current=0; function hl(num) { @@ -329,7 +329,7 @@ function output_footer() " 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". + 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 border=\"0\" alt=\"Green Web Hosting! This site hosted by DreamHost.\"". @@ -371,7 +371,7 @@ function output_status() $unixtime = strtotime($time); date_default_timezone_set($zone); - echo "<div class=\"lastlogin\">last login: ".date("r",$unixtime)."</div>\n"; + echo "<div class=\"lastlogin\"><span>last login: ".date("r",$unixtime)."</span></div>\n"; } else { diff --git a/include/stats.php b/include/stats.php index 97e1979..d49d57a 100644 --- a/include/stats.php +++ b/include/stats.php @@ -227,6 +227,9 @@ if( !$content = getCache("cache/stats.html",60*60*24) ) how often is the last trick a non-trump trick */ + /* needs this so that all tables are within the div and don't float around */ + echo "<p style=\"clear:both;\"> </p>\n"; + echo "</div>\n"; /* end output */ /* write file to cache */ diff --git a/include/welcome.php b/include/welcome.php index ccbaea5..5436ecf 100644 --- a/include/welcome.php +++ b/include/welcome.php @@ -27,8 +27,12 @@ $game = $game[0]; $done = $done[0]; $avgage = $avgage[0]; -echo "<p> If you want to play a game of Doppelkopf, you found the right place ;)". -" For more information please visit our <a href=\"$WIKI\">wiki</a>. </p>"; +echo "<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>"; + if($pre == 0) echo "<p> At the moment there are no games that are being started "; @@ -56,25 +60,29 @@ if($done==0) echo "$done games have been completed on this server. Average time of a game: $avgage days</p>"; ?> -<p> Please <a href="index.php?action=register">register</a>, in case you have not done that yet <br /> + <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> - <legend>Login</legend> <table> <tr> - <td><label for="email">Email:</label></td> - <td><input type="text" id="email" name="email" size="20" maxlength="30" /> </td> - </tr><tr> - <td><label for="password">Password:</label></td> - <td><input type="password" id="password" name="password" size="20" maxlength="30" /></td> - </tr><tr> - <td> <input type="submit" class="submitbutton" name="login" value="login" /></td> - <td> <input type="submit" class="submitbutton" name="forgot" value="Forgot your password?" /></td> + <td><label for="email">Email:</label></td> + <td><input type="text" class="submitbutton" id="email" name="email" size="20" maxlength="30" /> </td> + </tr> + <tr> + <td><label for="password">Password:</label></td> + <td><input type="password" class="submitbutton" id="password" name="password" size="20" maxlength="30" /></td> + </tr> + <tr class="center"> + <td> <input type="submit" class="submitbutton" name="login" value="login" /></td> + <td> <input type="submit" class="submitbutton" name="forgot" value="Forgot your password?" /></td> </tr> </table> </fieldset> </form> -
\ No newline at end of file +</div>
\ No newline at end of file diff --git a/pics/arrow0.png b/pics/arrow0.png Binary files differindex e43ac8e..eb81a4a 100644 --- a/pics/arrow0.png +++ b/pics/arrow0.png diff --git a/pics/arrow1.png b/pics/arrow1.png Binary files differindex b261a19..81f41fe 100644 --- a/pics/arrow1.png +++ b/pics/arrow1.png diff --git a/pics/arrow2.png b/pics/arrow2.png Binary files differindex 9cc76b3..ae2806a 100644 --- a/pics/arrow2.png +++ b/pics/arrow2.png diff --git a/pics/arrow3.png b/pics/arrow3.png Binary files differindex 6a14195..c6f41db 100644 --- a/pics/arrow3.png +++ b/pics/arrow3.png diff --git a/pics/table.png b/pics/table.png Binary files differindex a0892d4..d09c045 100644 --- a/pics/table.png +++ b/pics/table.png |