From c7d334c4782dd4bc07e5bda8bb364d62e5537d1e Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Mon, 26 Apr 2010 23:13:32 -0700 Subject: Added about page --- include/output.php | 2 +- index.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/output.php b/include/output.php index a4b84a0..88cbf6b 100644 --- a/include/output.php +++ b/include/output.php @@ -418,7 +418,7 @@ function output_footer() echo "\n\n"; echo "
\n"; - echo "

copyright 2006,2007,2008,2009,2010 Arun Persaud, Lance Thornton(graphics), Jeff Zerger(database support)
\n". + echo "

copyright 2006,2007,2008,2009,2010 Arun Persaud, et al.
\n". " Verwendung der [deutschen] Kartenbilder mit Genehmigung
der Spielkartenfabrik Altenburg GmbH,(c) ASS Altenburger
\n". " - ASS Altenburger Spielkarten - Spielkartenfabrik Altenburg GmbH
\n". " a Carta Mundi Company Email: info@spielkarten.com Internet: www.spielkarten.com

\n"; diff --git a/index.php b/index.php index 61b0e3f..691e113 100644 --- a/index.php +++ b/index.php @@ -120,6 +120,9 @@ switch($action) case 'game': require './include/game.php'; break; + case 'about': + require './include/about.php'; + break; case 'stats': if(isset($_SESSION["name"])) require './include/stats.php'; -- cgit v1.2.3-18-g5258 From b9c5f3e252ab1f5725d653528cc8a719e6822f6d Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Mon, 26 Apr 2010 23:35:41 -0700 Subject: added an About page --- css/standard025.css | 709 ------------------------------------------------- css/standard026.css | 744 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/about.php | 67 +++++ include/output.php | 6 +- 4 files changed, 814 insertions(+), 712 deletions(-) delete mode 100644 css/standard025.css create mode 100644 css/standard026.css create mode 100644 include/about.php diff --git a/css/standard025.css b/css/standard025.css deleted file mode 100644 index 5a5d22f..0000000 --- a/css/standard025.css +++ /dev/null @@ -1,709 +0,0 @@ -/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud - * - * This file is part of e-DoKo. - * - * e-DoKo is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * e-DoKo is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with e-DoKo. If not, see . - * - */ - -/* reset CSS (taken from blueprint and modified a bit) */ - -html, body, div, span, -h1, h2, h3, h4, h5, h6, p, -a,img, dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; - vertical-align: baseline; -} -table { border-collapse: separate; border-spacing: 0; } -caption, th, td { text-align: left; font-weight: normal; } -table, td, th { vertical-align: middle; } - -/* end reset */ - -/* some general layout */ -h1, h2, h3, h4, h5, h6, p {margin: 2px; padding: 1px;} - -body { background-color: #ddd; } - - -/* the header, footer, etc */ -.header { - background-color: #fff; - text-align: center; - height: 4em; - padding-top: 1.5em; - margin-left: 3em; - margin-right: 3em; - border-bottom: 3px solid gray; -} - -.lastlogin { - position:absolute; - top:0; - left:3em; -} -.lastlogin span { font-size:smaller;} - -.main { - background-color: #fff; - margin-left: 3em; - margin-right: 3em; - min-height: 40em; -} - -.footer { - background-color: #fff; - margin-left: 3em; - margin-right: 3em; - padding:0; - border-top: 2px solid gray; - clear:both; - height: 8em; -} -.footer .right { float:right; font-size:smaller;} -.footer .left { float:left; font-size:smaller; } - -.status { - position:absolute; - right:4em; - top:0.1em; - font-size: smaller; -} - -/* sessions */ -.session { - width: 100%; - border-bottom: 1px solid #000; - text-align: center; -} -.session div.sessionrules { - width: 19em; - float: left; - text-align: left; -} -.session div.sessionrules div{ - display:none; - background-color: #fff; - border: 1px solid #000; - position:absolute; - z-index: 30; - padding:0.5em; -} -.session div.sessionrules:hover div{ display:block; } -.session div.sessionscore { - width: 19em; - float: right; - text-align: right; -} -.session div.sessionscore div{ - position:absolute; - width:12em; - right:3em; - display:none; - background-color: #fff; - border: 1px solid #000; - z-index: 30; -} -.session div.sessionscore:hover div{ display:block;} -.session img.rulesicon{ height: 1em; } - -.session .scoretable{ - height:20em; - overflow: auto; -} -.session table.score { - margin:0.5em; - width:10em; - border-collapse:collapse; -} - -/* all kind of message that should appear in the middle of the page/table */ -.joingame,.sickness,.poverty,.total,.message { - position: absolute; - background-color: #fff; - width: 20%; - top:19em; - left:40%; - right:40%; - text-align: center; - z-index:22 -} - -.total { - top:11em; - width: 14%; - left: 43%; -} -/* scoring */ -.total .re { - position: absolute; - left: -12em; - top:8em; - background-color: #eee; - z-index:15; -} -.total .contra { - position: absolute; - right: -14em; - top:8em; - background-color: #eee; - z-index:15; -} - -/* output possible rules for a new game */ -.rules { margin-top:24em;} - -/* playing cards*/ -.card { - position:absolute; - z-index:20; - top:18em; - left:28em; - text-align:center; - background-color:#fff; - border:2px solid gray; -} -.card img { width:8em; } - -/* display the table and the names */ -div.table { - position:absolute; - width:100%; - height:37em; - margin:0; - left:0; - padding:0; -/* border: 3px solid blue; */ - top: 9.2em; - text-align:center; -} - -div.table img.table { - position:absolute; - width:25%; - top:20%; - height:22em; - left:37.5%; - z-index:5; - display: block; - margin:0; - padding:0; -} -div.table div { - /*background-color:green;*/ - position:absolute; - width:12.5%; - text-align:center; - z-index:20; -} -div.table div img{ - /*background-color:green;*/ - width:20%; -} - -div.table div.table0 { - top:45%; - right:62.5%; -} -div.table div.table1 { - top:0%; - left:43.75%; -} -div.table div.table2 { - top:45%; - left:62.5%; -} -div.table div.table3 { - bottom:0%; - left: 43.75%; -} - -/* display the card tricks */ - -ul.tricks { - position:relative; - zoom:1; /* fixes an IE6 issue and hopefully doesn't mess up anything else */ - list-style:none; - margin:3px; - padding:0; - padding-bottom:3px; - text-align:center; - border-bottom:1px solid #444; -} -ul.tricks a { text-decoration:none; color:#000;} -ul.tricks li { - /*background-color:blue;*/ - padding:0.1em; - margin:0.2em 0.5em; - display:inline; -} -ul.tricks li.old { background-color:#fff; } -ul.tricks li:hover { background-color: #bbb;} -ul.tricks li.nohighlight:hover { background-color: #fff;} - -ul.tricks li div.trick { - position:absolute; - width:100%; - height:35em; - top:2.2em; - left: 0; - margin:0; - padding:0; -/* border: 2px solid red;*/ - display:block; -} -ul.tricks li div.trick { display:none;} -ul.tricks li div.trick img.arrow { - position:absolute; - margin:0; - padding:0; -/* border: 5px solid blue;*/ - text-align:center; - width:16%; - height:16em; - left:42%; - right:42%; - top:10em; - z-index:8; -} - -#trick0 img { float:left; width: 3em; } - -hr {clear:both;} - -/*ul.tricks li:hover div.table{ display:block; }*/ - -/* left player */ -ul.tricks li div div.card0 img, -ul.tricks li div div.card0 .score, -.vorbehalt0 { - position:absolute; - margin:0; - padding:0; - /*border: 1px solid red;*/ - top: 40%; - left:37.5%; - right:56.5%; - width:6%; - z-index:30; -} - -.vorbehalt0 { - left:37.5%; - right:57.5%; - width:10%; - text-align:left; -} -ul.tricks li div div.card0 span.comment{ - position:absolute; - margin:0; - padding:0; - /*border: 1px solid red;*/ - top: 5%; - right:66.5%; - left:17.5%; - width:16%; -} - -/* top player */ -ul.tricks li div div.card1 img, -ul.tricks li div div.card1 .score, -.vorbehalt1 { - position:absolute; - margin:0; - padding:0; - /*border: 1px solid red;*/ - top: 22%; - left:47%; - right:47%; - width:6%; - text-align:center; - z-index:30; -} -.vorbehalt1{ - left:45%; - right:45%; - width:10%; - z-index:30; -} -ul.tricks li div div.card1 span.comment{ - position:absolute; - margin:0; - padding:0; - /*border: 1px solid red;*/ - top: 5%; - left:66.5%; - right:17.5%; - width:16%; - text-align:center; -} - -/* right player */ -ul.tricks li div div.card2 img, -ul.tricks li div div.card2 .score, -.vorbehalt2{ - position:absolute; - margin:0; - padding:0; - /*border: 1px solid red;*/ - top: 40%; - right:37.5%; - left:56.5%; - width:6%; - z-index:30; -} -.vorbehalt2{ - left:auto; - right:38%; - width:10%; - text-align:right; -} -ul.tricks li div div.card2 span.comment{ - position:absolute; - margin:0; - padding:0; - /*border: 1px solid red;*/ - top: 85%; - left:66.5%; - right:17.5%; - width:16%; - text-align:center; -} - -/* bottom player */ -ul.tricks li div div.card3 img, -ul.tricks li div div.card3 .score, -.vorbehalt3{ - position:absolute; - margin:0; - padding:0; - /*border: 1px solid red;*/ - bottom: 20%; - left:47%; - right:47%; - width:6%; - text-align:center; - z-index:30; -} -.vorbehalt3{ - left:45%; - right:45%; - width:10%; - text-align:center; -} -ul.tricks li div div.card3 span.comment{ - position:absolute; - margin:0; - padding:0; - /*border: 1px solid red;*/ - top: 85%; - right:66.5%; - left:17.5%; - width:16%; -} - -span.comment{ - border: 3px solid green; - max-height:6em; - overflow: auto; - word-wrap: break-word; -} - -ul.tricks li div div span.comment span{ - display:block; - text-align:left; - border-top:1px solid green; -} - -.mycards { - margin:0; - margin-top:38.5em; - padding:0; - border-top: 2px solid gray; -/* border-bottom: 2px solid green;*/ - background-color: #faffc7; - text-align:center; -} - -.mycards img { height:6em;} - -.exchange { - clear:both; - margin:0; - padding:0; - border:1px solid red; - background-color:yellow; -} - -.exchange img { height:6em;} - -.line{ - clear:both; - border-top:2px solid gray; - margin:0; - padding:0; -} - -.gameinfo { - position:relative; - top:0em; - margin:0em; - padding:0em; - width:100%; - border-top: 2px solid gray; - background-color: #efaaaa; - text-align:center; -} - -.usermenu { - position:absolute; - top:10em; - left:3em; - margin:1em; - margin-top:0em; - margin-left:0em; - - width: 12em; - - border: 2px solid gray; - - padding:0.3em; - - background-color: #eee; -} - -.notes { - position:absolute; - top:27em; - left:0; - margin:1em; - margin-top:0em; - margin-left:3em; - - width: 12em; - - border: 2px solid gray; - - padding:0.3em; - - background-color: #efefef; - - height:10em; - overflow: auto; - z-index:50; -} - -.user { margin-left:25%;margin-right:5%; } - -div.user ul { - list-style:none; -} - -div.user ul li { - position: relative; - padding:3px; - margin: 0px; - width: 80%; - min-height: 1.2em; - border-left: 2px solid #babdb6 ; - border-right: 2px solid #babdb6 ; - border-bottom: 2px solid #babdb6 ; -} - -div.user ul li:first-child { - border-top: 2px solid #babdb6 ; -} -.gamessession { - display:none; -} -.link { - text-decoration:underline; - color: blue; -} - -.user .gameid { - float: left; - width: 5em; -} -.user .turn { - padding-left: 1em; - float: left; - width: 20em; -} -.user .gameshidesession { - float:right; - width: 10em; -} - -.wide { margin-left:5%;margin-right:5%; } - -.over { - text-align:center; - margin-bottom:0.1em; -} - -.cardinput { - display:inline; - position:relative; - border: 1px solid #000; -} - -.cardinput img { width: 4em;} - -.cardinput:hover{ background-color:red;} - -div span img.button { width: 2em;} -div span img.tinybutton { width: 1.4em;} - -.gamestatuspre { - padding: 0 0.3em; - background-color: #f57900; -} -.gamestatusover { - padding:0 0.3em; - background-color: #e9b96e ; - color: #fff; -} -.gamestatusplay { - padding:0 0.3em; - background-color: #8ae234; -} - -.bigger{ font-size:larger;} - - -/* statistics using jquery*/ -caption { - text-align: center; - margin: 0.5em; - padding: 0.5em; - padding-bottom: 0em; - margin-bottom: 0; - } - -table.stats { - margin: 0.5em 1em; - border: solid 0.2em #aeaeae; - -moz-border-radius: 0.5em ; - float: left; -} -table.stats tbody tr.odd td { background-color:#aeaeae; } -table.stats tbody tr.even td { background-color:#eaeaea; } -table.stats td, table.stats th { - margin-left: 0.2em; - margin-right: 0.2em; - padding-left: 0.2em; - padding-right: 0.2em; - border-right: solid 0.1em #000; -} -table.stats tr td:last-child, table.stats tr th:last-child { border-right: solid 0 #000; } -table.stats th { border-bottom: solid 0.2em #000 } - -table.stats thead tr .header { - background-image: url(bg.png); - background-repeat: no-repeat; - background-position: center right; - cursor: pointer; -} -table.stats tbody td { - padding: 4px; - background-color: #eaeaea; - vertical-align: top; -} -table.stats thead tr .headerSortUp { - background-image: url(asc.png); -} -table.stats thead tr .headerSortDown { - background-image: url(desc.png); -} -table.stats thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp { - background-color: #8dbdd8; -} - - - -/* the login window */ -.login { - text-align:center; - padding-top: 1em; -} - -.login p, { - padding: 0.1em 0.1em 0.15em; -} -.login h4 { - padding: 0.3em 0.3em 0.45em; -} - -/* the login form */ -.login form{ - width: 24em; - margin: 0.5em auto; - padding: 0.5em 0.5em 1.5em; - text-align: center; -} - -fieldset { - border: 2px solid #000; - padding: 0.5em 0.5em 0.75em; - background-color: #eee; -} - -.login label, .login input{ margin: 0.5em 0.5em 0.75em;} - -.login label{ - float:left; - width:7em; - text-align: left; -} - -.login input #email, .login input #password{ - width:9em; - float:right; -} - -.login .submitbutton { background-color: #fff;} -.login .submitbutton:hover { background-color: #aaa;} - -#openid_url { - background: #FFFFFF url('openid-icon-small.gif') no-repeat scroll 0pt 50%; - padding-left: 18px; -} - -table.openid td, table.openid th{ - padding: 0.0em 0.3em;; -} - -.newbiehint { - background-color: #fee; -} - -.vacation { - color: #666; - background-color: #fc3; -} - -div.table div img.gravatar, img.gravatar { - width: 4em; - height: 4em; - border: 3px solid #aaa; -} - -.highcall { - background-color: #fc3; -} diff --git a/css/standard026.css b/css/standard026.css new file mode 100644 index 0000000..7f9d145 --- /dev/null +++ b/css/standard026.css @@ -0,0 +1,744 @@ +/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud + * + * This file is part of e-DoKo. + * + * e-DoKo is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * e-DoKo is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with e-DoKo. If not, see . + * + */ + +/* reset CSS (taken from blueprint and modified a bit) */ + +html, body, div, span, +h1, h2, h3, h4, h5, h6, p, +a,img, dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, tbody, tfoot, thead, tr, th, td { + margin: 0; + padding: 0; + border: 0; + vertical-align: baseline; +} +table { border-collapse: separate; border-spacing: 0; } +caption, th, td { text-align: left; font-weight: normal; } +table, td, th { vertical-align: middle; } + +/* end reset */ + +/* some general layout */ +h1, h2, h3, h4, h5, h6, p {margin: 2px; padding: 1px;} + +body { background-color: #ddd; } + + +/* the header, footer, etc */ +.header { + background-color: #fff; + text-align: center; + height: 4em; + padding-top: 1.5em; + margin-left: 3em; + margin-right: 3em; + border-bottom: 3px solid gray; +} + +.lastlogin { + position:absolute; + top:0; + left:3em; +} +.lastlogin span { font-size:smaller;} + +.main { + background-color: #fff; + margin-left: 3em; + margin-right: 3em; + min-height: 40em; +} + +.footer { + background-color: #fff; + margin-left: 3em; + margin-right: 3em; + padding:0; + border-top: 2px solid gray; + clear:both; + height: 8em; +} +.footer .right { float:right; font-size:smaller;} +.footer .left { float:left; font-size:smaller; } + +.status { + position:absolute; + right:4em; + top:0.1em; + font-size: smaller; +} + +/* sessions */ +.session { + width: 100%; + border-bottom: 1px solid #000; + text-align: center; +} +.session div.sessionrules { + width: 19em; + float: left; + text-align: left; +} +.session div.sessionrules div{ + display:none; + background-color: #fff; + border: 1px solid #000; + position:absolute; + z-index: 30; + padding:0.5em; +} +.session div.sessionrules:hover div{ display:block; } +.session div.sessionscore { + width: 19em; + float: right; + text-align: right; +} +.session div.sessionscore div{ + position:absolute; + width:12em; + right:3em; + display:none; + background-color: #fff; + border: 1px solid #000; + z-index: 30; +} +.session div.sessionscore:hover div{ display:block;} +.session img.rulesicon{ height: 1em; } + +.session .scoretable{ + height:20em; + overflow: auto; +} +.session table.score { + margin:0.5em; + width:10em; + border-collapse:collapse; +} + +/* all kind of message that should appear in the middle of the page/table */ +.joingame,.sickness,.poverty,.total,.message { + position: absolute; + background-color: #fff; + width: 20%; + top:19em; + left:40%; + right:40%; + text-align: center; + z-index:22 +} + +.total { + top:11em; + width: 14%; + left: 43%; +} +/* scoring */ +.total .re { + position: absolute; + left: -12em; + top:8em; + background-color: #eee; + z-index:15; +} +.total .contra { + position: absolute; + right: -14em; + top:8em; + background-color: #eee; + z-index:15; +} + +/* output possible rules for a new game */ +.rules { margin-top:24em;} + +/* playing cards*/ +.card { + position:absolute; + z-index:20; + top:18em; + left:28em; + text-align:center; + background-color:#fff; + border:2px solid gray; +} +.card img { width:8em; } + +/* display the table and the names */ +div.table { + position:absolute; + width:100%; + height:37em; + margin:0; + left:0; + padding:0; +/* border: 3px solid blue; */ + top: 9.2em; + text-align:center; +} + +div.table img.table { + position:absolute; + width:25%; + top:20%; + height:22em; + left:37.5%; + z-index:5; + display: block; + margin:0; + padding:0; +} +div.table div { + /*background-color:green;*/ + position:absolute; + width:12.5%; + text-align:center; + z-index:20; +} +div.table div img{ + /*background-color:green;*/ + width:20%; +} + +div.table div.table0 { + top:45%; + right:62.5%; +} +div.table div.table1 { + top:0%; + left:43.75%; +} +div.table div.table2 { + top:45%; + left:62.5%; +} +div.table div.table3 { + bottom:0%; + left: 43.75%; +} + +/* display the card tricks */ + +ul.tricks { + position:relative; + zoom:1; /* fixes an IE6 issue and hopefully doesn't mess up anything else */ + list-style:none; + margin:3px; + padding:0; + padding-bottom:3px; + text-align:center; + border-bottom:1px solid #444; +} +ul.tricks a { text-decoration:none; color:#000;} +ul.tricks li { + /*background-color:blue;*/ + padding:0.1em; + margin:0.2em 0.5em; + display:inline; +} +ul.tricks li.old { background-color:#fff; } +ul.tricks li:hover { background-color: #bbb;} +ul.tricks li.nohighlight:hover { background-color: #fff;} + +ul.tricks li div.trick { + position:absolute; + width:100%; + height:35em; + top:2.2em; + left: 0; + margin:0; + padding:0; +/* border: 2px solid red;*/ + display:block; +} +ul.tricks li div.trick { display:none;} +ul.tricks li div.trick img.arrow { + position:absolute; + margin:0; + padding:0; +/* border: 5px solid blue;*/ + text-align:center; + width:16%; + height:16em; + left:42%; + right:42%; + top:10em; + z-index:8; +} + +#trick0 img { float:left; width: 3em; } + +hr {clear:both;} + +/*ul.tricks li:hover div.table{ display:block; }*/ + +/* left player */ +ul.tricks li div div.card0 img, +ul.tricks li div div.card0 .score, +.vorbehalt0 { + position:absolute; + margin:0; + padding:0; + /*border: 1px solid red;*/ + top: 40%; + left:37.5%; + right:56.5%; + width:6%; + z-index:30; +} + +.vorbehalt0 { + left:37.5%; + right:57.5%; + width:10%; + text-align:left; +} +ul.tricks li div div.card0 span.comment{ + position:absolute; + margin:0; + padding:0; + /*border: 1px solid red;*/ + top: 5%; + right:66.5%; + left:17.5%; + width:16%; +} + +/* top player */ +ul.tricks li div div.card1 img, +ul.tricks li div div.card1 .score, +.vorbehalt1 { + position:absolute; + margin:0; + padding:0; + /*border: 1px solid red;*/ + top: 22%; + left:47%; + right:47%; + width:6%; + text-align:center; + z-index:30; +} +.vorbehalt1{ + left:45%; + right:45%; + width:10%; + z-index:30; +} +ul.tricks li div div.card1 span.comment{ + position:absolute; + margin:0; + padding:0; + /*border: 1px solid red;*/ + top: 5%; + left:66.5%; + right:17.5%; + width:16%; + text-align:center; +} + +/* right player */ +ul.tricks li div div.card2 img, +ul.tricks li div div.card2 .score, +.vorbehalt2{ + position:absolute; + margin:0; + padding:0; + /*border: 1px solid red;*/ + top: 40%; + right:37.5%; + left:56.5%; + width:6%; + z-index:30; +} +.vorbehalt2{ + left:auto; + right:38%; + width:10%; + text-align:right; +} +ul.tricks li div div.card2 span.comment{ + position:absolute; + margin:0; + padding:0; + /*border: 1px solid red;*/ + top: 85%; + left:66.5%; + right:17.5%; + width:16%; + text-align:center; +} + +/* bottom player */ +ul.tricks li div div.card3 img, +ul.tricks li div div.card3 .score, +.vorbehalt3{ + position:absolute; + margin:0; + padding:0; + /*border: 1px solid red;*/ + bottom: 20%; + left:47%; + right:47%; + width:6%; + text-align:center; + z-index:30; +} +.vorbehalt3{ + left:45%; + right:45%; + width:10%; + text-align:center; +} +ul.tricks li div div.card3 span.comment{ + position:absolute; + margin:0; + padding:0; + /*border: 1px solid red;*/ + top: 85%; + right:66.5%; + left:17.5%; + width:16%; +} + +span.comment{ + border: 3px solid green; + max-height:6em; + overflow: auto; + word-wrap: break-word; +} + +ul.tricks li div div span.comment span{ + display:block; + text-align:left; + border-top:1px solid green; +} + +.mycards { + margin:0; + margin-top:38.5em; + padding:0; + border-top: 2px solid gray; +/* border-bottom: 2px solid green;*/ + background-color: #faffc7; + text-align:center; +} + +.mycards img { height:6em;} + +.exchange { + clear:both; + margin:0; + padding:0; + border:1px solid red; + background-color:yellow; +} + +.exchange img { height:6em;} + +.line{ + clear:both; + border-top:2px solid gray; + margin:0; + padding:0; +} + +.gameinfo { + position:relative; + top:0em; + margin:0em; + padding:0em; + width:100%; + border-top: 2px solid gray; + background-color: #efaaaa; + text-align:center; +} + +.usermenu { + position:absolute; + top:10em; + left:3em; + margin:1em; + margin-top:0em; + margin-left:0em; + + width: 12em; + + border: 2px solid gray; + + padding:0.3em; + + background-color: #eee; +} + +.notes { + position:absolute; + top:27em; + left:0; + margin:1em; + margin-top:0em; + margin-left:3em; + + width: 12em; + + border: 2px solid gray; + + padding:0.3em; + + background-color: #efefef; + + height:10em; + overflow: auto; + z-index:50; +} + +.user { margin-left:25%;margin-right:5%; } + +div.user ul { + list-style:none; +} + +div.user ul li { + position: relative; + padding:3px; + margin: 0px; + width: 80%; + min-height: 1.2em; + border-left: 2px solid #babdb6 ; + border-right: 2px solid #babdb6 ; + border-bottom: 2px solid #babdb6 ; +} + +div.user ul li:first-child { + border-top: 2px solid #babdb6 ; +} +.gamessession { + display:none; +} +.link { + text-decoration:underline; + color: blue; +} + +.user .gameid { + float: left; + width: 5em; +} +.user .turn { + padding-left: 1em; + float: left; + width: 20em; +} +.user .gameshidesession { + float:right; + width: 10em; +} + +.wide { margin-left:5%;margin-right:5%; } + +.over { + text-align:center; + margin-bottom:0.1em; +} + +.cardinput { + display:inline; + position:relative; + border: 1px solid #000; +} + +.cardinput img { width: 4em;} + +.cardinput:hover{ background-color:red;} + +div span img.button { width: 2em;} +div span img.tinybutton { width: 1.4em;} + +.gamestatuspre { + padding: 0 0.3em; + background-color: #f57900; +} +.gamestatusover { + padding:0 0.3em; + background-color: #e9b96e ; + color: #fff; +} +.gamestatusplay { + padding:0 0.3em; + background-color: #8ae234; +} + +.bigger{ font-size:larger;} + + +/* statistics using jquery*/ +caption { + text-align: center; + margin: 0.5em; + padding: 0.5em; + padding-bottom: 0em; + margin-bottom: 0; + } + +table.stats { + margin: 0.5em 1em; + border: solid 0.2em #aeaeae; + -moz-border-radius: 0.5em ; + float: left; +} +table.stats tbody tr.odd td { background-color:#aeaeae; } +table.stats tbody tr.even td { background-color:#eaeaea; } +table.stats td, table.stats th { + margin-left: 0.2em; + margin-right: 0.2em; + padding-left: 0.2em; + padding-right: 0.2em; + border-right: solid 0.1em #000; +} +table.stats tr td:last-child, table.stats tr th:last-child { border-right: solid 0 #000; } +table.stats th { border-bottom: solid 0.2em #000 } + +table.stats thead tr .header { + background-image: url(bg.png); + background-repeat: no-repeat; + background-position: center right; + cursor: pointer; +} +table.stats tbody td { + padding: 4px; + background-color: #eaeaea; + vertical-align: top; +} +table.stats thead tr .headerSortUp { + background-image: url(asc.png); +} +table.stats thead tr .headerSortDown { + background-image: url(desc.png); +} +table.stats thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp { + background-color: #8dbdd8; +} + + + +/* the login window */ +.login { + text-align:center; + padding-top: 1em; +} + +.login p, { + padding: 0.1em 0.1em 0.15em; +} +.login h4 { + padding: 0.3em 0.3em 0.45em; +} + +/* the login form */ +.login form{ + width: 24em; + margin: 0.5em auto; + padding: 0.5em 0.5em 1.5em; + text-align: center; +} + +fieldset { + border: 2px solid #000; + padding: 0.5em 0.5em 0.75em; + background-color: #eee; +} + +.login label, .login input{ margin: 0.5em 0.5em 0.75em;} + +.login label{ + float:left; + width:7em; + text-align: left; +} + +.login input #email, .login input #password{ + width:9em; + float:right; +} + +.login .submitbutton { background-color: #fff;} +.login .submitbutton:hover { background-color: #aaa;} + +#openid_url { + background: #FFFFFF url('openid-icon-small.gif') no-repeat scroll 0pt 50%; + padding-left: 18px; +} + +table.openid td, table.openid th{ + padding: 0.0em 0.3em;; +} + +.newbiehint { + background-color: #fee; +} + +.vacation { + color: #666; + background-color: #fc3; +} + +div.table div img.gravatar, img.gravatar { + width: 4em; + height: 4em; + border: 3px solid #aaa; +} + +.highcall { + background-color: #fc3; +} + +.about { + margin-left: 20%; + margin-right: 20%; + padding-top: 10%; +} + +.about ul { + margin-left: 2em; +} + +.about div { + width:12em; + height: 6em; + margin: 2em; + padding: 1em; + float:left; + border: 1px solid black; +} + +.about .code { + background-color: #729fcf; +} +.about .database { + background-color: #8ae234; +} +.about .graphics { + background-color: #e9b96e; +} +.about .translation { + background-color: #fce94f; +} + + + diff --git a/include/about.php b/include/about.php new file mode 100644 index 0000000..bcf7760 --- /dev/null +++ b/include/about.php @@ -0,0 +1,67 @@ + + * + * This file is part of e-DoKo. + * + * e-DoKo is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * e-DoKo is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with e-DoKo. If not, see . + * + */ + +/* make sure that we are not called from outside the scripts, + * use a variable defined in config.php to check this + */ +if(!isset($HOST)) + exit; + +echo ' +
+ +
+

Coding

+
    +
  • Arun Persaud
    • +
  • Sean Brennan
    • +
+
+ +
+

Database support

+
    +
  • Arun Persaud
    • +
  • Jeff Zerger
    • +
+
+ +
+

Graphics

+
    +
  • Lance Thornton
    • +
  • Frances Allen
    • +
  • Arun Persaud
    • +
+
+ +
+

Translation

+
    +
  • German +
      +
    • Arun Persaud
      • +
    +
    • +
+
+
+' +?> diff --git a/include/output.php b/include/output.php index 88cbf6b..729452a 100644 --- a/include/output.php +++ b/include/output.php @@ -376,7 +376,7 @@ function output_header() e-Doko - + @@ -414,11 +414,11 @@ function output_header() function output_footer() { - global $REV,$PREF; + global $REV, $PREF, $INDEX; echo "
\n\n"; echo "
\n"; - echo "

copyright 2006,2007,2008,2009,2010 Arun Persaud, et al.
\n". + echo "

copyright 2006,2007,2008,2009,2010 Arun Persaud, et al.
\n". " Verwendung der [deutschen] Kartenbilder mit Genehmigung
der Spielkartenfabrik Altenburg GmbH,(c) ASS Altenburger
\n". " - ASS Altenburger Spielkarten - Spielkartenfabrik Altenburg GmbH
\n". " a Carta Mundi Company Email: info@spielkarten.com Internet: www.spielkarten.com

\n"; -- cgit v1.2.3-18-g5258 From 93b077aa861b3e0ef6f6025b0ecadb37bc31a3e7 Mon Sep 17 00:00:00 2001 From: BK Date: Tue, 4 May 2010 19:38:18 -0700 Subject: updated German translation --- locale/de/LC_MESSAGES/edoko.mo | Bin 6277 -> 7244 bytes po/de.po | 20 ++++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/locale/de/LC_MESSAGES/edoko.mo b/locale/de/LC_MESSAGES/edoko.mo index 620bc4e..fc816ee 100644 Binary files a/locale/de/LC_MESSAGES/edoko.mo and b/locale/de/LC_MESSAGES/edoko.mo differ diff --git a/po/de.po b/po/de.po index a16b5bd..90b2ab2 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: edoko\n" "Report-Msgid-Bugs-To: arun@nubati.net\n" "POT-Creation-Date: 2010-04-26 22:33-0700\n" -"PO-Revision-Date: 2010-04-26 22:44-0700\n" -"Last-Translator: Arun Persaud \n" +"PO-Revision-Date: 2010-05-04 19:36-0700\n" +"Last-Translator: BK \n" "Language-Team: English\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" @@ -137,6 +137,10 @@ msgid "" "email once that is the case, please use the link in that email to continue " "the game." msgstr "" +"Dieser Schritt kann erst ausgeführt werden, wenn alle anderen den letzten " +"Schritt ausgeführt haben. Anscheinend ist das nicht der Fall, daher musst du " +"noch etwas warten... du bekommst eine Email, sobald du wieder aktiv werden " +"kannst. Nutze den Link in der Email, um das Spiel fortzusetzen." #: include/game.php:601 msgid "Ok, everyone is done... figuring out what kind of game we are playing." @@ -273,7 +277,7 @@ msgstr "" #: include/output.php:129 msgid "Low trump" -msgstr "" +msgstr "Niedrige Trumpf" #: include/output.php:131 msgid "" @@ -286,7 +290,7 @@ msgstr "" #: include/output.php:134 msgid "The game will be canceled unless there is a solo." -msgstr "" +msgstr "Das Spiel wird annuliert, es sei denn, jemand spielt ein Solo." #: include/output.php:135 msgid "Bad luck, the player needs to play a normal game." @@ -345,11 +349,11 @@ msgstr "" #: include/output.php:287 msgid "count me in" -msgstr "" +msgstr "Ich bin dabei!" #: include/output.php:356 msgid "Do you want to play a game of DoKo?" -msgstr "" +msgstr "Willst du eine Runde DoKo spielen?" #: include/output.php:406 msgid "Welcome to E-Doko" @@ -398,7 +402,7 @@ msgstr "Notizen" #: include/output.php:712 include/output.php:724 include/output.php:736 #: include/output.php:749 msgid "Trump back" -msgstr "" +msgstr "Trumpf zurück" #: include/preferences.php:330 msgid "Your settings are" @@ -503,7 +507,7 @@ msgstr "" #: include/user.php:229 msgid "your turn" -msgstr "" +msgstr "Du bist dran" #: include/user.php:247 msgid "Send a reminder?" -- cgit v1.2.3-18-g5258 From 11823f4dd6a5b231893b84ca94861e3e6ba57f1d Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Tue, 4 May 2010 19:39:51 -0700 Subject: added BK as translator --- include/about.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/about.php b/include/about.php index bcf7760..ad39eaf 100644 --- a/include/about.php +++ b/include/about.php @@ -58,6 +58,7 @@ echo '
  • German
    • Arun Persaud
      • +
    • BK
    • -- cgit v1.2.3-18-g5258 From 5e3f5fe45c7d05a85f5e36637b3dd937e1ac3596 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Tue, 4 May 2010 21:44:30 -0700 Subject: improved jquery on user home page the text will now say either show or hide not both depending on the situation. --- css/standard026.css | 744 --------------------------------------------------- css/standard027.css | 745 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/output.php | 18 +- include/user.php | 7 +- 4 files changed, 764 insertions(+), 750 deletions(-) delete mode 100644 css/standard026.css create mode 100644 css/standard027.css diff --git a/css/standard026.css b/css/standard026.css deleted file mode 100644 index 7f9d145..0000000 --- a/css/standard026.css +++ /dev/null @@ -1,744 +0,0 @@ -/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud - * - * This file is part of e-DoKo. - * - * e-DoKo is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * e-DoKo is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with e-DoKo. If not, see . - * - */ - -/* reset CSS (taken from blueprint and modified a bit) */ - -html, body, div, span, -h1, h2, h3, h4, h5, h6, p, -a,img, dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; - vertical-align: baseline; -} -table { border-collapse: separate; border-spacing: 0; } -caption, th, td { text-align: left; font-weight: normal; } -table, td, th { vertical-align: middle; } - -/* end reset */ - -/* some general layout */ -h1, h2, h3, h4, h5, h6, p {margin: 2px; padding: 1px;} - -body { background-color: #ddd; } - - -/* the header, footer, etc */ -.header { - background-color: #fff; - text-align: center; - height: 4em; - padding-top: 1.5em; - margin-left: 3em; - margin-right: 3em; - border-bottom: 3px solid gray; -} - -.lastlogin { - position:absolute; - top:0; - left:3em; -} -.lastlogin span { font-size:smaller;} - -.main { - background-color: #fff; - margin-left: 3em; - margin-right: 3em; - min-height: 40em; -} - -.footer { - background-color: #fff; - margin-left: 3em; - margin-right: 3em; - padding:0; - border-top: 2px solid gray; - clear:both; - height: 8em; -} -.footer .right { float:right; font-size:smaller;} -.footer .left { float:left; font-size:smaller; } - -.status { - position:absolute; - right:4em; - top:0.1em; - font-size: smaller; -} - -/* sessions */ -.session { - width: 100%; - border-bottom: 1px solid #000; - text-align: center; -} -.session div.sessionrules { - width: 19em; - float: left; - text-align: left; -} -.session div.sessionrules div{ - display:none; - background-color: #fff; - border: 1px solid #000; - position:absolute; - z-index: 30; - padding:0.5em; -} -.session div.sessionrules:hover div{ display:block; } -.session div.sessionscore { - width: 19em; - float: right; - text-align: right; -} -.session div.sessionscore div{ - position:absolute; - width:12em; - right:3em; - display:none; - background-color: #fff; - border: 1px solid #000; - z-index: 30; -} -.session div.sessionscore:hover div{ display:block;} -.session img.rulesicon{ height: 1em; } - -.session .scoretable{ - height:20em; - overflow: auto; -} -.session table.score { - margin:0.5em; - width:10em; - border-collapse:collapse; -} - -/* all kind of message that should appear in the middle of the page/table */ -.joingame,.sickness,.poverty,.total,.message { - position: absolute; - background-color: #fff; - width: 20%; - top:19em; - left:40%; - right:40%; - text-align: center; - z-index:22 -} - -.total { - top:11em; - width: 14%; - left: 43%; -} -/* scoring */ -.total .re { - position: absolute; - left: -12em; - top:8em; - background-color: #eee; - z-index:15; -} -.total .contra { - position: absolute; - right: -14em; - top:8em; - background-color: #eee; - z-index:15; -} - -/* output possible rules for a new game */ -.rules { margin-top:24em;} - -/* playing cards*/ -.card { - position:absolute; - z-index:20; - top:18em; - left:28em; - text-align:center; - background-color:#fff; - border:2px solid gray; -} -.card img { width:8em; } - -/* display the table and the names */ -div.table { - position:absolute; - width:100%; - height:37em; - margin:0; - left:0; - padding:0; -/* border: 3px solid blue; */ - top: 9.2em; - text-align:center; -} - -div.table img.table { - position:absolute; - width:25%; - top:20%; - height:22em; - left:37.5%; - z-index:5; - display: block; - margin:0; - padding:0; -} -div.table div { - /*background-color:green;*/ - position:absolute; - width:12.5%; - text-align:center; - z-index:20; -} -div.table div img{ - /*background-color:green;*/ - width:20%; -} - -div.table div.table0 { - top:45%; - right:62.5%; -} -div.table div.table1 { - top:0%; - left:43.75%; -} -div.table div.table2 { - top:45%; - left:62.5%; -} -div.table div.table3 { - bottom:0%; - left: 43.75%; -} - -/* display the card tricks */ - -ul.tricks { - position:relative; - zoom:1; /* fixes an IE6 issue and hopefully doesn't mess up anything else */ - list-style:none; - margin:3px; - padding:0; - padding-bottom:3px; - text-align:center; - border-bottom:1px solid #444; -} -ul.tricks a { text-decoration:none; color:#000;} -ul.tricks li { - /*background-color:blue;*/ - padding:0.1em; - margin:0.2em 0.5em; - display:inline; -} -ul.tricks li.old { background-color:#fff; } -ul.tricks li:hover { background-color: #bbb;} -ul.tricks li.nohighlight:hover { background-color: #fff;} - -ul.tricks li div.trick { - position:absolute; - width:100%; - height:35em; - top:2.2em; - left: 0; - margin:0; - padding:0; -/* border: 2px solid red;*/ - display:block; -} -ul.tricks li div.trick { display:none;} -ul.tricks li div.trick img.arrow { - position:absolute; - margin:0; - padding:0; -/* border: 5px solid blue;*/ - text-align:center; - width:16%; - height:16em; - left:42%; - right:42%; - top:10em; - z-index:8; -} - -#trick0 img { float:left; width: 3em; } - -hr {clear:both;} - -/*ul.tricks li:hover div.table{ display:block; }*/ - -/* left player */ -ul.tricks li div div.card0 img, -ul.tricks li div div.card0 .score, -.vorbehalt0 { - position:absolute; - margin:0; - padding:0; - /*border: 1px solid red;*/ - top: 40%; - left:37.5%; - right:56.5%; - width:6%; - z-index:30; -} - -.vorbehalt0 { - left:37.5%; - right:57.5%; - width:10%; - text-align:left; -} -ul.tricks li div div.card0 span.comment{ - position:absolute; - margin:0; - padding:0; - /*border: 1px solid red;*/ - top: 5%; - right:66.5%; - left:17.5%; - width:16%; -} - -/* top player */ -ul.tricks li div div.card1 img, -ul.tricks li div div.card1 .score, -.vorbehalt1 { - position:absolute; - margin:0; - padding:0; - /*border: 1px solid red;*/ - top: 22%; - left:47%; - right:47%; - width:6%; - text-align:center; - z-index:30; -} -.vorbehalt1{ - left:45%; - right:45%; - width:10%; - z-index:30; -} -ul.tricks li div div.card1 span.comment{ - position:absolute; - margin:0; - padding:0; - /*border: 1px solid red;*/ - top: 5%; - left:66.5%; - right:17.5%; - width:16%; - text-align:center; -} - -/* right player */ -ul.tricks li div div.card2 img, -ul.tricks li div div.card2 .score, -.vorbehalt2{ - position:absolute; - margin:0; - padding:0; - /*border: 1px solid red;*/ - top: 40%; - right:37.5%; - left:56.5%; - width:6%; - z-index:30; -} -.vorbehalt2{ - left:auto; - right:38%; - width:10%; - text-align:right; -} -ul.tricks li div div.card2 span.comment{ - position:absolute; - margin:0; - padding:0; - /*border: 1px solid red;*/ - top: 85%; - left:66.5%; - right:17.5%; - width:16%; - text-align:center; -} - -/* bottom player */ -ul.tricks li div div.card3 img, -ul.tricks li div div.card3 .score, -.vorbehalt3{ - position:absolute; - margin:0; - padding:0; - /*border: 1px solid red;*/ - bottom: 20%; - left:47%; - right:47%; - width:6%; - text-align:center; - z-index:30; -} -.vorbehalt3{ - left:45%; - right:45%; - width:10%; - text-align:center; -} -ul.tricks li div div.card3 span.comment{ - position:absolute; - margin:0; - padding:0; - /*border: 1px solid red;*/ - top: 85%; - right:66.5%; - left:17.5%; - width:16%; -} - -span.comment{ - border: 3px solid green; - max-height:6em; - overflow: auto; - word-wrap: break-word; -} - -ul.tricks li div div span.comment span{ - display:block; - text-align:left; - border-top:1px solid green; -} - -.mycards { - margin:0; - margin-top:38.5em; - padding:0; - border-top: 2px solid gray; -/* border-bottom: 2px solid green;*/ - background-color: #faffc7; - text-align:center; -} - -.mycards img { height:6em;} - -.exchange { - clear:both; - margin:0; - padding:0; - border:1px solid red; - background-color:yellow; -} - -.exchange img { height:6em;} - -.line{ - clear:both; - border-top:2px solid gray; - margin:0; - padding:0; -} - -.gameinfo { - position:relative; - top:0em; - margin:0em; - padding:0em; - width:100%; - border-top: 2px solid gray; - background-color: #efaaaa; - text-align:center; -} - -.usermenu { - position:absolute; - top:10em; - left:3em; - margin:1em; - margin-top:0em; - margin-left:0em; - - width: 12em; - - border: 2px solid gray; - - padding:0.3em; - - background-color: #eee; -} - -.notes { - position:absolute; - top:27em; - left:0; - margin:1em; - margin-top:0em; - margin-left:3em; - - width: 12em; - - border: 2px solid gray; - - padding:0.3em; - - background-color: #efefef; - - height:10em; - overflow: auto; - z-index:50; -} - -.user { margin-left:25%;margin-right:5%; } - -div.user ul { - list-style:none; -} - -div.user ul li { - position: relative; - padding:3px; - margin: 0px; - width: 80%; - min-height: 1.2em; - border-left: 2px solid #babdb6 ; - border-right: 2px solid #babdb6 ; - border-bottom: 2px solid #babdb6 ; -} - -div.user ul li:first-child { - border-top: 2px solid #babdb6 ; -} -.gamessession { - display:none; -} -.link { - text-decoration:underline; - color: blue; -} - -.user .gameid { - float: left; - width: 5em; -} -.user .turn { - padding-left: 1em; - float: left; - width: 20em; -} -.user .gameshidesession { - float:right; - width: 10em; -} - -.wide { margin-left:5%;margin-right:5%; } - -.over { - text-align:center; - margin-bottom:0.1em; -} - -.cardinput { - display:inline; - position:relative; - border: 1px solid #000; -} - -.cardinput img { width: 4em;} - -.cardinput:hover{ background-color:red;} - -div span img.button { width: 2em;} -div span img.tinybutton { width: 1.4em;} - -.gamestatuspre { - padding: 0 0.3em; - background-color: #f57900; -} -.gamestatusover { - padding:0 0.3em; - background-color: #e9b96e ; - color: #fff; -} -.gamestatusplay { - padding:0 0.3em; - background-color: #8ae234; -} - -.bigger{ font-size:larger;} - - -/* statistics using jquery*/ -caption { - text-align: center; - margin: 0.5em; - padding: 0.5em; - padding-bottom: 0em; - margin-bottom: 0; - } - -table.stats { - margin: 0.5em 1em; - border: solid 0.2em #aeaeae; - -moz-border-radius: 0.5em ; - float: left; -} -table.stats tbody tr.odd td { background-color:#aeaeae; } -table.stats tbody tr.even td { background-color:#eaeaea; } -table.stats td, table.stats th { - margin-left: 0.2em; - margin-right: 0.2em; - padding-left: 0.2em; - padding-right: 0.2em; - border-right: solid 0.1em #000; -} -table.stats tr td:last-child, table.stats tr th:last-child { border-right: solid 0 #000; } -table.stats th { border-bottom: solid 0.2em #000 } - -table.stats thead tr .header { - background-image: url(bg.png); - background-repeat: no-repeat; - background-position: center right; - cursor: pointer; -} -table.stats tbody td { - padding: 4px; - background-color: #eaeaea; - vertical-align: top; -} -table.stats thead tr .headerSortUp { - background-image: url(asc.png); -} -table.stats thead tr .headerSortDown { - background-image: url(desc.png); -} -table.stats thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp { - background-color: #8dbdd8; -} - - - -/* the login window */ -.login { - text-align:center; - padding-top: 1em; -} - -.login p, { - padding: 0.1em 0.1em 0.15em; -} -.login h4 { - padding: 0.3em 0.3em 0.45em; -} - -/* the login form */ -.login form{ - width: 24em; - margin: 0.5em auto; - padding: 0.5em 0.5em 1.5em; - text-align: center; -} - -fieldset { - border: 2px solid #000; - padding: 0.5em 0.5em 0.75em; - background-color: #eee; -} - -.login label, .login input{ margin: 0.5em 0.5em 0.75em;} - -.login label{ - float:left; - width:7em; - text-align: left; -} - -.login input #email, .login input #password{ - width:9em; - float:right; -} - -.login .submitbutton { background-color: #fff;} -.login .submitbutton:hover { background-color: #aaa;} - -#openid_url { - background: #FFFFFF url('openid-icon-small.gif') no-repeat scroll 0pt 50%; - padding-left: 18px; -} - -table.openid td, table.openid th{ - padding: 0.0em 0.3em;; -} - -.newbiehint { - background-color: #fee; -} - -.vacation { - color: #666; - background-color: #fc3; -} - -div.table div img.gravatar, img.gravatar { - width: 4em; - height: 4em; - border: 3px solid #aaa; -} - -.highcall { - background-color: #fc3; -} - -.about { - margin-left: 20%; - margin-right: 20%; - padding-top: 10%; -} - -.about ul { - margin-left: 2em; -} - -.about div { - width:12em; - height: 6em; - margin: 2em; - padding: 1em; - float:left; - border: 1px solid black; -} - -.about .code { - background-color: #729fcf; -} -.about .database { - background-color: #8ae234; -} -.about .graphics { - background-color: #e9b96e; -} -.about .translation { - background-color: #fce94f; -} - - - diff --git a/css/standard027.css b/css/standard027.css new file mode 100644 index 0000000..0af0e3b --- /dev/null +++ b/css/standard027.css @@ -0,0 +1,745 @@ +/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud + * + * This file is part of e-DoKo. + * + * e-DoKo is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * e-DoKo is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with e-DoKo. If not, see . + * + */ + +/* reset CSS (taken from blueprint and modified a bit) */ + +html, body, div, span, +h1, h2, h3, h4, h5, h6, p, +a,img, dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, tbody, tfoot, thead, tr, th, td { + margin: 0; + padding: 0; + border: 0; + vertical-align: baseline; +} +table { border-collapse: separate; border-spacing: 0; } +caption, th, td { text-align: left; font-weight: normal; } +table, td, th { vertical-align: middle; } + +/* end reset */ + +/* some general layout */ +h1, h2, h3, h4, h5, h6, p {margin: 2px; padding: 1px;} + +body { background-color: #ddd; } + + +/* the header, footer, etc */ +.header { + background-color: #fff; + text-align: center; + height: 4em; + padding-top: 1.5em; + margin-left: 3em; + margin-right: 3em; + border-bottom: 3px solid gray; +} + +.lastlogin { + position:absolute; + top:0; + left:3em; +} +.lastlogin span { font-size:smaller;} + +.main { + background-color: #fff; + margin-left: 3em; + margin-right: 3em; + min-height: 40em; +} + +.footer { + background-color: #fff; + margin-left: 3em; + margin-right: 3em; + padding:0; + border-top: 2px solid gray; + clear:both; + height: 8em; +} +.footer .right { float:right; font-size:smaller;} +.footer .left { float:left; font-size:smaller; } + +.status { + position:absolute; + right:4em; + top:0.1em; + font-size: smaller; +} + +/* sessions */ +.session { + width: 100%; + border-bottom: 1px solid #000; + text-align: center; +} +.session div.sessionrules { + width: 19em; + float: left; + text-align: left; +} +.session div.sessionrules div{ + display:none; + background-color: #fff; + border: 1px solid #000; + position:absolute; + z-index: 30; + padding:0.5em; +} +.session div.sessionrules:hover div{ display:block; } +.session div.sessionscore { + width: 19em; + float: right; + text-align: right; +} +.session div.sessionscore div{ + position:absolute; + width:12em; + right:3em; + display:none; + background-color: #fff; + border: 1px solid #000; + z-index: 30; +} +.session div.sessionscore:hover div{ display:block;} +.session img.rulesicon{ height: 1em; } + +.session .scoretable{ + height:20em; + overflow: auto; +} +.session table.score { + margin:0.5em; + width:10em; + border-collapse:collapse; +} + +/* all kind of message that should appear in the middle of the page/table */ +.joingame,.sickness,.poverty,.total,.message { + position: absolute; + background-color: #fff; + width: 20%; + top:19em; + left:40%; + right:40%; + text-align: center; + z-index:22 +} + +.total { + top:11em; + width: 14%; + left: 43%; +} +/* scoring */ +.total .re { + position: absolute; + left: -12em; + top:8em; + background-color: #eee; + z-index:15; +} +.total .contra { + position: absolute; + right: -14em; + top:8em; + background-color: #eee; + z-index:15; +} + +/* output possible rules for a new game */ +.rules { margin-top:24em;} + +/* playing cards*/ +.card { + position:absolute; + z-index:20; + top:18em; + left:28em; + text-align:center; + background-color:#fff; + border:2px solid gray; +} +.card img { width:8em; } + +/* display the table and the names */ +div.table { + position:absolute; + width:100%; + height:37em; + margin:0; + left:0; + padding:0; +/* border: 3px solid blue; */ + top: 9.2em; + text-align:center; +} + +div.table img.table { + position:absolute; + width:25%; + top:20%; + height:22em; + left:37.5%; + z-index:5; + display: block; + margin:0; + padding:0; +} +div.table div { + /*background-color:green;*/ + position:absolute; + width:12.5%; + text-align:center; + z-index:20; +} +div.table div img{ + /*background-color:green;*/ + width:20%; +} + +div.table div.table0 { + top:45%; + right:62.5%; +} +div.table div.table1 { + top:0%; + left:43.75%; +} +div.table div.table2 { + top:45%; + left:62.5%; +} +div.table div.table3 { + bottom:0%; + left: 43.75%; +} + +/* display the card tricks */ + +ul.tricks { + position:relative; + zoom:1; /* fixes an IE6 issue and hopefully doesn't mess up anything else */ + list-style:none; + margin:3px; + padding:0; + padding-bottom:3px; + text-align:center; + border-bottom:1px solid #444; +} +ul.tricks a { text-decoration:none; color:#000;} +ul.tricks li { + /*background-color:blue;*/ + padding:0.1em; + margin:0.2em 0.5em; + display:inline; +} +ul.tricks li.old { background-color:#fff; } +ul.tricks li:hover { background-color: #bbb;} +ul.tricks li.nohighlight:hover { background-color: #fff;} + +ul.tricks li div.trick { + position:absolute; + width:100%; + height:35em; + top:2.2em; + left: 0; + margin:0; + padding:0; +/* border: 2px solid red;*/ + display:block; +} +ul.tricks li div.trick { display:none;} +ul.tricks li div.trick img.arrow { + position:absolute; + margin:0; + padding:0; +/* border: 5px solid blue;*/ + text-align:center; + width:16%; + height:16em; + left:42%; + right:42%; + top:10em; + z-index:8; +} + +#trick0 img { float:left; width: 3em; } + +hr {clear:both;} + +/*ul.tricks li:hover div.table{ display:block; }*/ + +/* left player */ +ul.tricks li div div.card0 img, +ul.tricks li div div.card0 .score, +.vorbehalt0 { + position:absolute; + margin:0; + padding:0; + /*border: 1px solid red;*/ + top: 40%; + left:37.5%; + right:56.5%; + width:6%; + z-index:30; +} + +.vorbehalt0 { + left:37.5%; + right:57.5%; + width:10%; + text-align:left; +} +ul.tricks li div div.card0 span.comment{ + position:absolute; + margin:0; + padding:0; + /*border: 1px solid red;*/ + top: 5%; + right:66.5%; + left:17.5%; + width:16%; +} + +/* top player */ +ul.tricks li div div.card1 img, +ul.tricks li div div.card1 .score, +.vorbehalt1 { + position:absolute; + margin:0; + padding:0; + /*border: 1px solid red;*/ + top: 22%; + left:47%; + right:47%; + width:6%; + text-align:center; + z-index:30; +} +.vorbehalt1{ + left:45%; + right:45%; + width:10%; + z-index:30; +} +ul.tricks li div div.card1 span.comment{ + position:absolute; + margin:0; + padding:0; + /*border: 1px solid red;*/ + top: 5%; + left:66.5%; + right:17.5%; + width:16%; + text-align:center; +} + +/* right player */ +ul.tricks li div div.card2 img, +ul.tricks li div div.card2 .score, +.vorbehalt2{ + position:absolute; + margin:0; + padding:0; + /*border: 1px solid red;*/ + top: 40%; + right:37.5%; + left:56.5%; + width:6%; + z-index:30; +} +.vorbehalt2{ + left:auto; + right:38%; + width:10%; + text-align:right; +} +ul.tricks li div div.card2 span.comment{ + position:absolute; + margin:0; + padding:0; + /*border: 1px solid red;*/ + top: 85%; + left:66.5%; + right:17.5%; + width:16%; + text-align:center; +} + +/* bottom player */ +ul.tricks li div div.card3 img, +ul.tricks li div div.card3 .score, +.vorbehalt3{ + position:absolute; + margin:0; + padding:0; + /*border: 1px solid red;*/ + bottom: 20%; + left:47%; + right:47%; + width:6%; + text-align:center; + z-index:30; +} +.vorbehalt3{ + left:45%; + right:45%; + width:10%; + text-align:center; +} +ul.tricks li div div.card3 span.comment{ + position:absolute; + margin:0; + padding:0; + /*border: 1px solid red;*/ + top: 85%; + right:66.5%; + left:17.5%; + width:16%; +} + +span.comment{ + border: 3px solid green; + max-height:6em; + overflow: auto; + word-wrap: break-word; +} + +ul.tricks li div div span.comment span{ + display:block; + text-align:left; + border-top:1px solid green; +} + +.mycards { + margin:0; + margin-top:38.5em; + padding:0; + border-top: 2px solid gray; +/* border-bottom: 2px solid green;*/ + background-color: #faffc7; + text-align:center; +} + +.mycards img { height:6em;} + +.exchange { + clear:both; + margin:0; + padding:0; + border:1px solid red; + background-color:yellow; +} + +.exchange img { height:6em;} + +.line{ + clear:both; + border-top:2px solid gray; + margin:0; + padding:0; +} + +.gameinfo { + position:relative; + top:0em; + margin:0em; + padding:0em; + width:100%; + border-top: 2px solid gray; + background-color: #efaaaa; + text-align:center; +} + +.usermenu { + position:absolute; + top:10em; + left:3em; + margin:1em; + margin-top:0em; + margin-left:0em; + + width: 12em; + + border: 2px solid gray; + + padding:0.3em; + + background-color: #eee; +} + +.notes { + position:absolute; + top:27em; + left:0; + margin:1em; + margin-top:0em; + margin-left:3em; + + width: 12em; + + border: 2px solid gray; + + padding:0.3em; + + background-color: #efefef; + + height:10em; + overflow: auto; + z-index:50; +} + +.user { margin-left:25%;margin-right:5%; } + +div.user ul { + list-style:none; +} + +div.user ul li { + position: relative; + padding:3px; + margin: 0px; + width: 80%; + min-height: 1.2em; + border-left: 2px solid #babdb6 ; + border-right: 2px solid #babdb6 ; + border-bottom: 2px solid #babdb6 ; +} + +div.user ul li:first-child { + border-top: 2px solid #babdb6 ; +} +.gamessession { + display:none; +} + +.user .gameid { + float: left; + width: 5em; +} +.user .turn { + padding-left: 1em; + float: left; + width: 20em; +} + +.user .gameshidesession { + display: none; +} + +.user .gameshidesession , .user .gamesshowsession { + float:right; + width: 10em; +} + +.wide { margin-left:5%;margin-right:5%; } + +.over { + text-align:center; + margin-bottom:0.1em; +} + +.cardinput { + display:inline; + position:relative; + border: 1px solid #000; +} + +.cardinput img { width: 4em;} + +.cardinput:hover{ background-color:red;} + +div span img.button { width: 2em;} +div span img.tinybutton { width: 1.4em;} + +.gamestatuspre { + padding: 0 0.3em; + background-color: #f57900; +} +.gamestatusover { + padding:0 0.3em; + background-color: #e9b96e ; + color: #fff; +} +.gamestatusplay { + padding:0 0.3em; + background-color: #8ae234; +} + +.bigger{ font-size:larger;} + + +/* statistics using jquery*/ +caption { + text-align: center; + margin: 0.5em; + padding: 0.5em; + padding-bottom: 0em; + margin-bottom: 0; + } + +table.stats { + margin: 0.5em 1em; + border: solid 0.2em #aeaeae; + -moz-border-radius: 0.5em ; + float: left; +} +table.stats tbody tr.odd td { background-color:#aeaeae; } +table.stats tbody tr.even td { background-color:#eaeaea; } +table.stats td, table.stats th { + margin-left: 0.2em; + margin-right: 0.2em; + padding-left: 0.2em; + padding-right: 0.2em; + border-right: solid 0.1em #000; +} +table.stats tr td:last-child, table.stats tr th:last-child { border-right: solid 0 #000; } +table.stats th { border-bottom: solid 0.2em #000 } + +table.stats thead tr .header { + background-image: url(bg.png); + background-repeat: no-repeat; + background-position: center right; + cursor: pointer; +} +table.stats tbody td { + padding: 4px; + background-color: #eaeaea; + vertical-align: top; +} +table.stats thead tr .headerSortUp { + background-image: url(asc.png); +} +table.stats thead tr .headerSortDown { + background-image: url(desc.png); +} +table.stats thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp { + background-color: #8dbdd8; +} + + + +/* the login window */ +.login { + text-align:center; + padding-top: 1em; +} + +.login p, { + padding: 0.1em 0.1em 0.15em; +} +.login h4 { + padding: 0.3em 0.3em 0.45em; +} + +/* the login form */ +.login form{ + width: 24em; + margin: 0.5em auto; + padding: 0.5em 0.5em 1.5em; + text-align: center; +} + +fieldset { + border: 2px solid #000; + padding: 0.5em 0.5em 0.75em; + background-color: #eee; +} + +.login label, .login input{ margin: 0.5em 0.5em 0.75em;} + +.login label{ + float:left; + width:7em; + text-align: left; +} + +.login input #email, .login input #password{ + width:9em; + float:right; +} + +.login .submitbutton { background-color: #fff;} +.login .submitbutton:hover { background-color: #aaa;} + +#openid_url { + background: #FFFFFF url('openid-icon-small.gif') no-repeat scroll 0pt 50%; + padding-left: 18px; +} + +table.openid td, table.openid th{ + padding: 0.0em 0.3em;; +} + +.newbiehint { + background-color: #fee; +} + +.vacation { + color: #666; + background-color: #fc3; +} + +div.table div img.gravatar, img.gravatar { + width: 4em; + height: 4em; + border: 3px solid #aaa; +} + +.highcall { + background-color: #fc3; +} + +.about { + margin-left: 20%; + margin-right: 20%; + padding-top: 10%; +} + +.about ul { + margin-left: 2em; +} + +.about div { + width:12em; + height: 6em; + margin: 2em; + padding: 1em; + float:left; + border: 1px solid black; +} + +.about .code { + background-color: #729fcf; +} +.about .database { + background-color: #8ae234; +} +.about .graphics { + background-color: #e9b96e; +} +.about .translation { + background-color: #fce94f; +} + + + diff --git a/include/output.php b/include/output.php index 729452a..13bc6f7 100644 --- a/include/output.php +++ b/include/output.php @@ -376,24 +376,36 @@ function output_header() e-Doko - - + + -- cgit v1.2.3-18-g5258 From 615fb7c0fec9ec6f187a3c568cf1e2e6c1572b1e Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Tue, 21 Sep 2010 20:10:00 -0700 Subject: TRANSLATION: some more strings and updated po.de --- include/output.php | 16 +- include/preferences.php | 60 ++++---- include/user.php | 30 ++-- locale/de/LC_MESSAGES/edoko.mo | Bin 7244 -> 12148 bytes po/de.po | 325 ++++++++++++++++++++++++++++++----------- po/messages.pot | 244 +++++++++++++++++++++++++------ 6 files changed, 495 insertions(+), 180 deletions(-) diff --git a/include/output.php b/include/output.php index 23c9199..3ad0552 100644 --- a/include/output.php +++ b/include/output.php @@ -219,14 +219,14 @@ function output_check_for_sickness($me,$mycards) echo ''; echo ' '._('Do you want to play solo?').''; echo ' '; echo '
    '; diff --git a/include/preferences.php b/include/preferences.php index 3a841c3..0485d9e 100644 --- a/include/preferences.php +++ b/include/preferences.php @@ -337,12 +337,12 @@ if($PREF['vacation_start']) $value = substr($PREF['vacation_start'],0,10); else $value = ''; -echo " start:\n"; +echo " "._('start').":\n"; if($PREF['vacation_stop']) $value = substr($PREF['vacation_stop'],0,10); else $value = ''; -echo " stop:\n"; +echo " "._('stop').":\n"; if($PREF['vacation_comment']) $value = $PREF['vacation_comment']; else @@ -351,8 +351,8 @@ echo ' '._('comment:')."\n"; -echo "use YYYY-MM-DDuse '-' in start field to unset vacation\n"; -echo " Notification: \n"; +echo ''._('use YYYY-MM-DD').''._("use '-' in start field to unset vacation")."\n"; +echo ' '._('Notification').": \n"; echo " "; if($changed_notify) echo _('changed'); echo " \n"; -echo " Digest: \n"; +echo ' '._('Digest').": \n"; echo " \n"; if($PREF['autosetup']=="yes") { @@ -440,33 +440,33 @@ if($PREF['sorting']=="high-low") echo " "; if($changed_sorting) echo _('changed'); echo " \n"; -echo " Open for new games: \n"; +echo ' '._('Open for new games').": \n"; echo " "; if($changed_openforgames) echo _('changed'); echo " \n"; -echo " Card set: \n"; +echo ' '.('Card set').": \n"; echo " "; if($changed_cards) echo _('changed'); @@ -474,45 +474,45 @@ echo " \n"; echo " \n"; echo " \n"; echo "
    \n"; -echo " Personal\n"; +echo ' '._('Personal')."\n"; echo " \n"; -echo " \n"; -echo " \n"; +echo ' \n"; -echo " \n"; -echo " \n"; -echo " \n"; -echo " \n"; echo "
    Email: $email
    Timezone: \n"; +echo '
    '._('Email').": $email
    '._('Timezone').": \n"; output_select_timezone("timezone",$timezone); if($changed_timezone) echo _('changed'); echo "
    Language: \n"; +echo '
    '._('Language').": \n"; output_select_language("language",$PREF['language']); if($changed_language == 1) echo _('changed'); echo "
    Password(old): ", +echo '
    '._('Password(old)').": ", ""; switch($changed_password) { case '-3': - echo "The new passwords is not long enough (you need at least 4 characters)."; + echo _('The new passwords is not long enough (you need at least 4 characters).'); break; case '-2': - echo "The new passwords don't match."; + echo _('The new passwords don\'t match.'); break; case '-1': - echo "The old password is not correct."; + echo _('The old password is not correct.'); break; case '1': echo _('changed'); break; } echo "
    Password(new): ", +echo '
    '._('Password(new)').": ", "", "
    Password(new, retype): ", +echo '
    '._('Password(new, retype)').": ", "", "
    \n"; echo "
    \n"; echo "
    \n"; -echo " OpenID\n"; +echo ' '._('OpenID')."\n"; $openids = array(); $openids = DB_GetOpenIDsByUser($myid); @@ -531,14 +531,14 @@ if(sizeof($openids)) echo " \n"; } -echo " add OpenID: ", +echo ' '._('add OpenID').': ', ""; if($changed_openid) - echo " Deleted some OpenIDs!
    \n"; + echo ' '._('Deleted some OpenIDs!')."
    \n"; echo "
    \n"; -echo "
    Submit
    \n"; +echo '
    '._('Submit')."
    \n"; echo " \n"; -echo "

    E-DoKo uses gravatars as icons.

    "; +echo '

    '._('E-DoKo uses gravatars as icons.').'

    '; echo "
    \n"; return; diff --git a/include/user.php b/include/user.php index 3046b34..e8d38f7 100644 --- a/include/user.php +++ b/include/user.php @@ -25,20 +25,22 @@ if(!isset($HOST)) exit; /* test id and password, should really be done in one step */ -if(!isset($_SESSION["name"])) +if(!isset($_SESSION['name'])) { - $email = $_REQUEST["email"]; - $password = $_REQUEST["password"]; + $email = $_REQUEST['email']; + $password = $_REQUEST['password']; } else { - $name = $_SESSION["name"]; + $name = $_SESSION['name']; $email = DB_get_email('name',$name); $password = DB_get_passwd_by_name($name); }; +global $ADMIN_NAME; + /* user has forgotten his password */ -if(myisset("forgot")) +if(myisset('forgot')) { /* check if player is in the database */ $ok = 1; @@ -55,16 +57,16 @@ if(myisset("forgot")) /* if less than N recent ones, add a new one and send out email */ if( $number < 5 ) { - echo "Ok, I send you a new password.
    "; + echo _('Ok, I will send you a new password.').'
    '; if($number >1) echo "N.B. You tried this already $number times during the last day and it will only work ". " 5 times during a day.
    "; - echo "The new password will be valid for one day, make sure you reset it to something else.
    "; + echo _('The new password will be valid for one day, make sure you reset it to something else.').'
    '; echo "Back to the main page."; /* create temporary password, use the fist 8 letters of a md5 hash */ $TIME = (string) time(); /* to avoid collisions */ - $hash = md5("Anewpassword".$email.$TIME); + $hash = md5('Anewpassword'.$email.$TIME); $newpw = substr($hash,1,8); $message = "Someone (hopefully you) requested a new password. \n". @@ -83,8 +85,8 @@ if(myisset("forgot")) { /* make it so that people (or a robot) can request thousands of passwords within a short time * and spam a user this way */ - echo "Sorry you already tried 5 times during the last 24h.
    ". - "You need to use one of those passwords or wait to get a new one.
    "; + echo _('Sorry you already tried 5 times during the last 24h.
    '. + 'You need to use one of those passwords or wait to get a new one.').'
    '; echo "Back to the main page."; } } @@ -97,7 +99,7 @@ if(myisset("forgot")) "Please try again."; else /* default error message */ echo "Couldn't find a player with this email!
    ". - "Please contact Arun, if you think this is a mistake
    ". + "Please contact $ADMIN_NAME, if you think this is a mistake
    ". "or else try again."; } } @@ -117,7 +119,7 @@ else { /* user information is ok */ $myname = DB_get_name('email',$email); - $_SESSION["name"] = $myname; + $_SESSION['name'] = $myname; $PREF = DB_get_PREF($myid); @@ -126,7 +128,7 @@ else display_user_menu($myid); /* display all games the user has played */ - echo "
    "; + echo '
    '; if($myvacation = check_vacation($myid)) { @@ -327,7 +329,7 @@ else } else { - echo "
    Sorry email and password don't match. Please try again.
    "; + echo '
    '."Sorry email and password don't match. Please try again.".'
    '; } }; ?> \ No newline at end of file diff --git a/locale/de/LC_MESSAGES/edoko.mo b/locale/de/LC_MESSAGES/edoko.mo index fc816ee..d9f528c 100644 Binary files a/locale/de/LC_MESSAGES/edoko.mo and b/locale/de/LC_MESSAGES/edoko.mo differ diff --git a/po/de.po b/po/de.po index 90b2ab2..6060f17 100644 --- a/po/de.po +++ b/po/de.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: edoko\n" "Report-Msgid-Bugs-To: arun@nubati.net\n" -"POT-Creation-Date: 2010-04-26 22:33-0700\n" -"PO-Revision-Date: 2010-05-04 19:36-0700\n" +"POT-Creation-Date: 2010-09-21 19:52-0700\n" +"PO-Revision-Date: 2010-09-21 20:09-0700\n" "Last-Translator: BK \n" "Language-Team: English\n" "MIME-Version: 1.0\n" @@ -76,7 +76,7 @@ msgstr "Ansage" msgid "lowtrump" msgstr "Trumpfarmut" -#: include/game.php:242 include/game.php:1916 +#: include/game.php:242 include/game.php:1918 msgid "Score" msgstr "Punkte" @@ -90,7 +90,7 @@ msgstr "naechstes Spiel" #: include/game.php:431 include/game.php:453 include/game.php:588 #: include/game.php:907 include/game.php:971 include/game.php:1239 -#: include/game.php:1984 include/game.php:2016 +#: include/game.php:1986 include/game.php:2018 msgid "Your cards are" msgstr "Deine Karten sind" @@ -166,36 +166,36 @@ msgstr "" msgid "Game" msgstr "Spiel" -#: include/game.php:1335 include/game.php:1342 include/game.php:1605 +#: include/game.php:1337 include/game.php:1344 include/game.php:1607 msgid "Trick" msgstr "Stich" -#: include/game.php:1907 +#: include/game.php:1909 msgid "please wait until it's your turn!" msgstr "Bitte warte bis Du dran bist!" -#: include/game.php:1973 +#: include/game.php:1975 msgid "prev" msgstr "zurueck" -#: include/game.php:1974 +#: include/game.php:1976 msgid "next" msgstr "vor" -#: include/game.php:2026 +#: include/game.php:2028 msgid "Your cards were" msgstr "Deine Karten waren" -#: include/game.php:2064 +#: include/game.php:2066 msgid "The game is over for you... other people still need to play though" msgstr "" "Das Spiel ist fuer dich vorbei... andere muessen aber noch eine Karte spielen" -#: include/game.php:2111 +#: include/game.php:2113 msgid "A short comment" msgstr "Ein kurzer Kommentar" -#: include/game.php:2124 include/output.php:361 +#: include/game.php:2126 include/output.php:361 msgid "submit" msgstr "abschicken" @@ -218,7 +218,7 @@ msgstr "Waehle Spieler aus (beachte: du musst einer der Spieler sein)" #: include/output.php:102 msgid "Gameplay-related" -msgstr "" +msgstr "Spielbezogen" #: include/output.php:103 msgid "Ten of hearts" @@ -226,7 +226,7 @@ msgstr "Herzzehn" #: include/output.php:106 msgid "just normal non-trump" -msgstr "" +msgstr "kein Trumpf" #: include/output.php:107 msgid "first ten of hearts wins the trick" @@ -243,37 +243,42 @@ msgstr "Keine" #: include/output.php:115 msgid "both become highest trump (automatic call at beginning of the game)" -msgstr "" +msgstr "Beide werden zu dem hoechsten Trumpf" #: include/output.php:116 msgid "first one normal, second one becomes highest (call during the game)" msgstr "" +"erster Fuchs normal, zweiter als hoechster Trumpf (Ansage waehrend dem Spiel)" #: include/output.php:117 msgid "second one become highest only in case re/contra was announced" -msgstr "" +msgstr "Zweiter Fuchs wird nur hoechster Trumpf nach Ansage (re/contra)" #: include/output.php:121 msgid "Call Re/Contra, etc." -msgstr "" +msgstr "Ansagen" #: include/output.php:124 msgid "" "Can call re/contra on the first own card played, 90 on the " "second, etc." msgstr "" +"Re/Contra mit der ersten eigenen Karte, U90 mit der " +"zweiten, etc. " #: include/output.php:125 msgid "" "Can call re/contra until 5th card is played, 90 until 9th card is played, " "etc." -msgstr "" +msgstr "Re/Contra bis zur fuenften Karte, U90 bis zur 9ten, etc." #: include/output.php:126 msgid "" "Can call re/contra until 5th card is played, 90 if player still has 9 cards, " "etc." msgstr "" +"Re/Contra bis die fuenfte Karte gespielt ist, U90 solange der Spieler noch 9 " +"KKarten auf der Hand hat, etc." #: include/output.php:129 msgid "Low trump" @@ -283,10 +288,12 @@ msgstr "Niedrige Trumpf" msgid "" "Player can't trump a fox, that is none of his trump is higher than a fox." msgstr "" +"Spieler kann keinen Fuchs stechen, dh. keine Karte ist hoeher als ein Fuchs." #: include/output.php:133 msgid "The trump will be treated as poverty and offered to another player." msgstr "" +"Die Trumpfkarten werde als Armut behandelt und an andere Spieler angeboten." #: include/output.php:134 msgid "The game will be canceled unless there is a solo." @@ -294,15 +301,15 @@ msgstr "Das Spiel wird annuliert, es sei denn, jemand spielt ein Solo." #: include/output.php:135 msgid "Bad luck, the player needs to play a normal game." -msgstr "" +msgstr "Pech gehabt, der Spieler muss ein normales Spiel spielen." #: include/output.php:138 msgid "Scoring-related" -msgstr "" +msgstr "Punktezaehlung" #: include/output.php:139 msgid "(not yet implemented)" -msgstr "" +msgstr "(noch nicht implementiert)" #: include/output.php:140 msgid "start game" @@ -316,18 +323,47 @@ msgstr "Danke, dass du am Spiel teilnimmst" msgid "Do you want to play solo?" msgstr "Willst du Solo spielen?" +#: include/output.php:223 +msgid "trumpless" +msgstr "fleischlos" + +#: include/output.php:224 +msgid "trump" +msgstr "Trumpf" + +#: include/output.php:225 +msgid "queen" +msgstr "Damen" + +#: include/output.php:226 +msgid "jack" +msgstr "Buben" + +#: include/output.php:227 +msgid "club" +msgstr "Kreuz" + +#: include/output.php:228 +msgid "spade" +msgstr "Pik" + +#: include/output.php:229 +msgid "heart" +msgstr "Herz" + #: include/output.php:233 msgid "Wedding?" msgstr "Hochzeit?" #: include/output.php:236 include/output.php:247 include/output.php:258 -#: include/output.php:275 include/output.php:357 +#: include/output.php:275 include/output.php:357 include/preferences.php:447 msgid "yes" msgstr "Ja" #: include/output.php:237 include/output.php:241 include/output.php:248 #: include/output.php:252 include/output.php:259 include/output.php:263 #: include/output.php:276 include/output.php:280 include/output.php:358 +#: include/preferences.php:453 msgid "no" msgstr "Nein" @@ -341,11 +377,11 @@ msgstr "Hast du zuviele Neuner?" #: include/output.php:269 msgid "Do you have low trump (cancel game)?" -msgstr "" +msgstr "Hast du zu niedrige Trumpf (Spiel abbrechen)?" #: include/output.php:271 msgid "Do you have low trump (poverty)?" -msgstr "" +msgstr "Hast du zu niedrige Trump (Armut)?" #: include/output.php:287 msgid "count me in" @@ -355,52 +391,52 @@ msgstr "Ich bin dabei!" msgid "Do you want to play a game of DoKo?" msgstr "Willst du eine Runde DoKo spielen?" -#: include/output.php:406 +#: include/output.php:418 msgid "Welcome to E-Doko" msgstr "Willkommen bei E-Doko" -#: include/output.php:463 +#: include/output.php:475 msgid "mypage" -msgstr "" +msgstr "Hauptseite" -#: include/output.php:464 +#: include/output.php:476 msgid "settings" msgstr "Einstellungen" -#: include/output.php:465 +#: include/output.php:477 msgid "new game" msgstr "neues Spiel" -#: include/output.php:466 +#: include/output.php:478 msgid "statistics" msgstr "Statistik" -#: include/output.php:467 +#: include/output.php:479 msgid "wiki/bugs" msgstr "Wiki/Bugs" -#: include/output.php:468 +#: include/output.php:480 msgid "atom" msgstr "Atom" -#: include/output.php:469 +#: include/output.php:481 msgid "logout" msgstr "ausloggen" -#: include/output.php:472 +#: include/output.php:484 msgid "last login" msgstr "Letzter Login" -#: include/output.php:477 +#: include/output.php:489 msgid "login" -msgstr "" +msgstr "Einloggen" -#: include/output.php:583 +#: include/output.php:595 msgid "Personal notes" msgstr "Notizen" -#: include/output.php:712 include/output.php:724 include/output.php:736 -#: include/output.php:749 +#: include/output.php:724 include/output.php:736 include/output.php:748 +#: include/output.php:761 msgid "Trump back" msgstr "Trumpf zurück" @@ -410,12 +446,20 @@ msgstr "Deine Einstellungen sind" #: include/preferences.php:332 msgid "Game-related" -msgstr "" +msgstr "Spielbezogen" #: include/preferences.php:335 msgid "Vacation" msgstr "Urlaub" +#: include/preferences.php:340 +msgid "start" +msgstr "Starte Spiel" + +#: include/preferences.php:345 +msgid "stop" +msgstr "Ende" + #: include/preferences.php:350 msgid "comment:" msgstr "Kommentar:" @@ -432,6 +476,19 @@ msgstr "geaendert" msgid "wrong date format" msgstr "Falsches Datumformat" +#: include/preferences.php:354 +msgid "use YYYY-MM-DD" +msgstr "benutze JJJJ-MM-TT" + +#: include/preferences.php:354 +msgid "use '-' in start field to unset vacation" +msgstr "benutze '-' im Anfangsfeld, um den Urlaub zu beenden" + +#: include/preferences.php:355 +#, fuzzy +msgid "Notification" +msgstr "Urlaub" + #: include/preferences.php:359 include/preferences.php:364 msgid "less emails" msgstr "weniger E-mails" @@ -440,6 +497,14 @@ msgstr "weniger E-mails" msgid "lots of emails" msgstr "viele E-mails" +#: include/preferences.php:371 +msgid "Digest" +msgstr "" + +#: include/preferences.php:377 +msgid "digest off" +msgstr "Digest aus" + #: include/preferences.php:381 msgid "every hour" msgstr "stuendlich" @@ -468,6 +533,10 @@ msgstr "alle 12h" msgid "every 24h" msgstr "alle 24h" +#: include/preferences.php:412 +msgid "Autosetup" +msgstr "" + #: include/preferences.php:416 include/preferences.php:421 msgid "accept every game" msgstr "jedes Spiel akzeptieren" @@ -476,91 +545,177 @@ msgstr "jedes Spiel akzeptieren" msgid "ask for games" msgstr "" -#: include/user.php:136 +#: include/preferences.php:443 +#, fuzzy +msgid "Open for new games" +msgstr "neues Spiel" + +#: include/preferences.php:463 include/preferences.php:468 +msgid "German cards" +msgstr "Franzoesisches Blatt" + +#: include/preferences.php:464 include/preferences.php:469 +msgid "English cards" +msgstr "Englisches Blatt" + +#: include/preferences.php:477 +#, fuzzy +msgid "Personal" +msgstr "Notizen" + +#: include/preferences.php:479 +msgid "Email" +msgstr "E-Mail" + +#: include/preferences.php:480 +msgid "Timezone" +msgstr "Zeitzone" + +#: include/preferences.php:484 +msgid "Language" +msgstr "Sprache" + +#: include/preferences.php:488 +msgid "Password(old)" +msgstr "Passwort(alt)" + +#: include/preferences.php:493 +msgid "The new passwords is not long enough (you need at least 4 characters)." +msgstr "Das neue Passwort ist nicht lange genug (mindestens 4 Zeichen)." + +#: include/preferences.php:496 +msgid "The new passwords don't match." +msgstr "Die neuen Passwoerter stimmen nicht ueberein." + +#: include/preferences.php:499 +msgid "The old password is not correct." +msgstr "Das alte Passwort stimmt nicht." + +#: include/preferences.php:506 +msgid "Password(new)" +msgstr "Passwort(neu)" + +#: include/preferences.php:509 +msgid "Password(new, retype)" +msgstr "Passwort(neu, wiederholen)" + +#: include/preferences.php:515 +msgid "OpenID" +msgstr "Open-Id" + +#: include/preferences.php:534 +msgid "add OpenID" +msgstr "Open-Id hinzufuegen" + +#: include/preferences.php:537 +msgid "Deleted some OpenIDs!" +msgstr "Open-ID loeschen" + +#: include/preferences.php:539 +#, fuzzy +msgid "Submit" +msgstr "abschicken" + +#: include/preferences.php:541 +msgid "" +"E-DoKo uses gravatars as icons." +msgstr "" +"E-DoKo benutzt gravatars als " +"Icons." + +#: include/user.php:60 +msgid "Ok, I will send you a new password." +msgstr "Ok, ich werde Dir ein neues Passwort zuschicken." + +#: include/user.php:64 +msgid "" +"The new password will be valid for one day, make sure you reset it to " +"something else." +msgstr "" +"Das neue Passwort wird fuer einen Tag gueltig sein, bitte setze in dieser " +"Zeit ein neues." + +#: include/user.php:88 +msgid "" +"Sorry you already tried 5 times during the last 24h.
    You need to use " +"one of those passwords or wait to get a new one." +msgstr "" + +#: include/user.php:138 msgid "" "Enjoy your vacation (don't forgot to change your settings once you're back)." msgstr "" +"Viel Spass beim Urlaub (und nicht vergessen die Urlaubseinstellung wieder " +"auszustellen, wenn du wieder zurueck bist)." -#: include/user.php:140 +#: include/user.php:142 msgid "These are all your games" msgstr "Hier sind alle deine Spiele" -#: include/user.php:142 +#: include/user.php:144 msgid "Games" msgstr "Spiele" -#: include/user.php:143 +#: include/user.php:145 msgid "pre-game phase" msgstr "Anfangsphase" -#: include/user.php:144 +#: include/user.php:146 msgid "game in progess" msgstr "Spiel laeuft" -#: include/user.php:145 +#: include/user.php:147 msgid "game over (N people played the same hand)" -msgstr "" +msgstr "Spiel beendet (N Spieler haben dieses Blatt schon gespielt)" -#: include/user.php:146 +#: include/user.php:148 msgid "Reminder: canceling a game can't be reversed!" msgstr "" +"Erinnerung: Abbrechen eines Spieles kann nicht rueckgaengig gemacht werden!" -#: include/user.php:229 +#: include/user.php:231 msgid "your turn" msgstr "Du bist dran" -#: include/user.php:247 +#: include/user.php:249 msgid "Send a reminder?" -msgstr "" +msgstr "eine Erinnerungsemail schicken?" -#: include/user.php:258 -msgid "(hide/show) old" -msgstr "" +#: include/user.php:260 +msgid "show old" +msgstr "zeige alte" + +#: include/user.php:261 +msgid "hide old" +msgstr "verstecke alte" -#: include/user.php:299 +#: include/user.php:302 msgid "show all" msgstr "zeige alle" -#: include/user.php:299 +#: include/user.php:302 msgid "hide all" -msgstr "" +msgstr "verstecke alle" -#: include/user.php:301 -msgid "hide/show inactive" -msgstr "" +#: include/user.php:304 +msgid "show inactive" +msgstr "zeige inaktive" + +#: include/user.php:304 +msgid "hide inactive" +msgstr "verstecke inaktive" -#: include/user.php:306 +#: include/user.php:309 msgid "You can start new games using the link in the top right corner!" -msgstr "" +msgstr "Du kannst neue Runden mit dem Link oben rechts starten!" -#: include/user.php:310 +#: include/user.php:313 msgid "New Players" msgstr "Neue Mitspieler" -#: include/user.php:315 +#: include/user.php:318 msgid "Players last logged in" msgstr "Zuletzt eingeloggt" #~ msgid "No" #~ msgstr "Nein" - -#~ msgid "trumpless" -#~ msgstr "fleischlos" - -#~ msgid "trump" -#~ msgstr "Trumpf" - -#~ msgid "queen" -#~ msgstr "Damen" - -#~ msgid "jack" -#~ msgstr "Buben" - -#~ msgid "club" -#~ msgstr "Kreuz" - -#~ msgid "spade" -#~ msgstr "Pik" - -#~ msgid "heart" -#~ msgstr "Herz" diff --git a/po/messages.pot b/po/messages.pot index c3e1b9d..063f706 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: edoko\n" "Report-Msgid-Bugs-To: arun@nubati.net\n" -"POT-Creation-Date: 2010-04-26 22:33-0700\n" +"POT-Creation-Date: 2010-09-21 19:52-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -76,7 +76,7 @@ msgstr "" msgid "lowtrump" msgstr "" -#: include/game.php:242 include/game.php:1916 +#: include/game.php:242 include/game.php:1918 msgid "Score" msgstr "" @@ -90,7 +90,7 @@ msgstr "" #: include/game.php:431 include/game.php:453 include/game.php:588 #: include/game.php:907 include/game.php:971 include/game.php:1239 -#: include/game.php:1984 include/game.php:2016 +#: include/game.php:1986 include/game.php:2018 msgid "Your cards are" msgstr "" @@ -152,35 +152,35 @@ msgstr "" msgid "Game" msgstr "" -#: include/game.php:1335 include/game.php:1342 include/game.php:1605 +#: include/game.php:1337 include/game.php:1344 include/game.php:1607 msgid "Trick" msgstr "" -#: include/game.php:1907 +#: include/game.php:1909 msgid "please wait until it's your turn!" msgstr "" -#: include/game.php:1973 +#: include/game.php:1975 msgid "prev" msgstr "" -#: include/game.php:1974 +#: include/game.php:1976 msgid "next" msgstr "" -#: include/game.php:2026 +#: include/game.php:2028 msgid "Your cards were" msgstr "" -#: include/game.php:2064 +#: include/game.php:2066 msgid "The game is over for you... other people still need to play though" msgstr "" -#: include/game.php:2111 +#: include/game.php:2113 msgid "A short comment" msgstr "" -#: include/game.php:2124 include/output.php:361 +#: include/game.php:2126 include/output.php:361 msgid "submit" msgstr "" @@ -298,18 +298,47 @@ msgstr "" msgid "Do you want to play solo?" msgstr "" +#: include/output.php:223 +msgid "trumpless" +msgstr "" + +#: include/output.php:224 +msgid "trump" +msgstr "" + +#: include/output.php:225 +msgid "queen" +msgstr "" + +#: include/output.php:226 +msgid "jack" +msgstr "" + +#: include/output.php:227 +msgid "club" +msgstr "" + +#: include/output.php:228 +msgid "spade" +msgstr "" + +#: include/output.php:229 +msgid "heart" +msgstr "" + #: include/output.php:233 msgid "Wedding?" msgstr "" #: include/output.php:236 include/output.php:247 include/output.php:258 -#: include/output.php:275 include/output.php:357 +#: include/output.php:275 include/output.php:357 include/preferences.php:447 msgid "yes" msgstr "" #: include/output.php:237 include/output.php:241 include/output.php:248 #: include/output.php:252 include/output.php:259 include/output.php:263 #: include/output.php:276 include/output.php:280 include/output.php:358 +#: include/preferences.php:453 msgid "no" msgstr "" @@ -337,52 +366,52 @@ msgstr "" msgid "Do you want to play a game of DoKo?" msgstr "" -#: include/output.php:406 +#: include/output.php:418 msgid "Welcome to E-Doko" msgstr "" -#: include/output.php:463 +#: include/output.php:475 msgid "mypage" msgstr "" -#: include/output.php:464 +#: include/output.php:476 msgid "settings" msgstr "" -#: include/output.php:465 +#: include/output.php:477 msgid "new game" msgstr "" -#: include/output.php:466 +#: include/output.php:478 msgid "statistics" msgstr "" -#: include/output.php:467 +#: include/output.php:479 msgid "wiki/bugs" msgstr "" -#: include/output.php:468 +#: include/output.php:480 msgid "atom" msgstr "" -#: include/output.php:469 +#: include/output.php:481 msgid "logout" msgstr "" -#: include/output.php:472 +#: include/output.php:484 msgid "last login" msgstr "" -#: include/output.php:477 +#: include/output.php:489 msgid "login" msgstr "" -#: include/output.php:583 +#: include/output.php:595 msgid "Personal notes" msgstr "" -#: include/output.php:712 include/output.php:724 include/output.php:736 -#: include/output.php:749 +#: include/output.php:724 include/output.php:736 include/output.php:748 +#: include/output.php:761 msgid "Trump back" msgstr "" @@ -398,6 +427,14 @@ msgstr "" msgid "Vacation" msgstr "" +#: include/preferences.php:340 +msgid "start" +msgstr "" + +#: include/preferences.php:345 +msgid "stop" +msgstr "" + #: include/preferences.php:350 msgid "comment:" msgstr "" @@ -414,6 +451,18 @@ msgstr "" msgid "wrong date format" msgstr "" +#: include/preferences.php:354 +msgid "use YYYY-MM-DD" +msgstr "" + +#: include/preferences.php:354 +msgid "use '-' in start field to unset vacation" +msgstr "" + +#: include/preferences.php:355 +msgid "Notification" +msgstr "" + #: include/preferences.php:359 include/preferences.php:364 msgid "less emails" msgstr "" @@ -422,6 +471,14 @@ msgstr "" msgid "lots of emails" msgstr "" +#: include/preferences.php:371 +msgid "Digest" +msgstr "" + +#: include/preferences.php:377 +msgid "digest off" +msgstr "" + #: include/preferences.php:381 msgid "every hour" msgstr "" @@ -450,6 +507,10 @@ msgstr "" msgid "every 24h" msgstr "" +#: include/preferences.php:412 +msgid "Autosetup" +msgstr "" + #: include/preferences.php:416 include/preferences.php:421 msgid "accept every game" msgstr "" @@ -458,67 +519,164 @@ msgstr "" msgid "ask for games" msgstr "" -#: include/user.php:136 +#: include/preferences.php:443 +msgid "Open for new games" +msgstr "" + +#: include/preferences.php:463 include/preferences.php:468 +msgid "German cards" +msgstr "" + +#: include/preferences.php:464 include/preferences.php:469 +msgid "English cards" +msgstr "" + +#: include/preferences.php:477 +msgid "Personal" +msgstr "" + +#: include/preferences.php:479 +msgid "Email" +msgstr "" + +#: include/preferences.php:480 +msgid "Timezone" +msgstr "" + +#: include/preferences.php:484 +msgid "Language" +msgstr "" + +#: include/preferences.php:488 +msgid "Password(old)" +msgstr "" + +#: include/preferences.php:493 +msgid "The new passwords is not long enough (you need at least 4 characters)." +msgstr "" + +#: include/preferences.php:496 +msgid "The new passwords don't match." +msgstr "" + +#: include/preferences.php:499 +msgid "The old password is not correct." +msgstr "" + +#: include/preferences.php:506 +msgid "Password(new)" +msgstr "" + +#: include/preferences.php:509 +msgid "Password(new, retype)" +msgstr "" + +#: include/preferences.php:515 +msgid "OpenID" +msgstr "" + +#: include/preferences.php:534 +msgid "add OpenID" +msgstr "" + +#: include/preferences.php:537 +msgid "Deleted some OpenIDs!" +msgstr "" + +#: include/preferences.php:539 +msgid "Submit" +msgstr "" + +#: include/preferences.php:541 +msgid "" +"E-DoKo uses gravatars as icons." +msgstr "" + +#: include/user.php:60 +msgid "Ok, I will send you a new password." +msgstr "" + +#: include/user.php:64 +msgid "" +"The new password will be valid for one day, make sure you reset it to " +"something else." +msgstr "" + +#: include/user.php:88 +msgid "" +"Sorry you already tried 5 times during the last 24h.
    You need to use " +"one of those passwords or wait to get a new one." +msgstr "" + +#: include/user.php:138 msgid "" "Enjoy your vacation (don't forgot to change your settings once you're back)." msgstr "" -#: include/user.php:140 +#: include/user.php:142 msgid "These are all your games" msgstr "" -#: include/user.php:142 +#: include/user.php:144 msgid "Games" msgstr "" -#: include/user.php:143 +#: include/user.php:145 msgid "pre-game phase" msgstr "" -#: include/user.php:144 +#: include/user.php:146 msgid "game in progess" msgstr "" -#: include/user.php:145 +#: include/user.php:147 msgid "game over (N people played the same hand)" msgstr "" -#: include/user.php:146 +#: include/user.php:148 msgid "Reminder: canceling a game can't be reversed!" msgstr "" -#: include/user.php:229 +#: include/user.php:231 msgid "your turn" msgstr "" -#: include/user.php:247 +#: include/user.php:249 msgid "Send a reminder?" msgstr "" -#: include/user.php:258 -msgid "(hide/show) old" +#: include/user.php:260 +msgid "show old" +msgstr "" + +#: include/user.php:261 +msgid "hide old" msgstr "" -#: include/user.php:299 +#: include/user.php:302 msgid "show all" msgstr "" -#: include/user.php:299 +#: include/user.php:302 msgid "hide all" msgstr "" -#: include/user.php:301 -msgid "hide/show inactive" +#: include/user.php:304 +msgid "show inactive" +msgstr "" + +#: include/user.php:304 +msgid "hide inactive" msgstr "" -#: include/user.php:306 +#: include/user.php:309 msgid "You can start new games using the link in the top right corner!" msgstr "" -#: include/user.php:310 +#: include/user.php:313 msgid "New Players" msgstr "" -#: include/user.php:315 +#: include/user.php:318 msgid "Players last logged in" msgstr "" -- cgit v1.2.3-18-g5258 From f94dd2d6d58f37306d1da0f6bb12f5276883cd6b Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Tue, 21 Sep 2010 20:27:12 -0700 Subject: NEW FEATURE: pre select card to play if there is only one option --- include/game.php | 34 +++++++++++++++++++++++++++++++++- include/output.php | 9 ++++++--- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/include/game.php b/include/game.php index eb66a98..04df162 100644 --- a/include/game.php +++ b/include/game.php @@ -1990,6 +1990,38 @@ switch($mystatus) if(have_suit($mycards,$firstcard)) $followsuit = 1; + /* count how many cards we can play, so that we can pre-select it if there is only one */ + $howmanycards = 0; + foreach($mycards as $card) + { + if($howmanycard>1) + break; + + /* display only cards that the player is allowed to play as links, the rest just display normal + * also check if we have both schweinchen, in that case only display on of them as playable + */ + if( ($followsuit && !same_type($card,$firstcard)) || + ( (int)($card)==19 && + !$GAME['schweinchen-first'] && + ( $RULES['schweinchen']=='second' || + ( $RULES['schweinchen']=='secondaftercall' && + (DB_get_call_by_hash($GAME['schweinchen-who']) || + DB_get_partner_call_by_hash($GAME['schweinchen-who']) ) + ) + ) && + $GAME['schweinchen-who']==$me && + in_array($gametype,array('normal','wedding','trump','silent')) + ) + ) + continue ; + else + $howmanycards++; + } + if($howmanycards==1) + $howmanycards=1; + else + $howmanycards=0; + foreach($mycards as $card) { /* display only cards that the player is allowed to play as links, the rest just display normal @@ -2010,7 +2042,7 @@ switch($mystatus) ) display_card($card,$PREF['cardset']); else - display_link_card($card,$PREF['cardset']); + display_link_card($card,$PREF['cardset'],$selected=$howmanycards); } } else if($mystatus=='play' ) diff --git a/include/output.php b/include/output.php index 3ad0552..0c2ff96 100644 --- a/include/output.php +++ b/include/output.php @@ -202,12 +202,15 @@ function display_card($card,$dir="english") return; } -function display_link_card($card,$dir="english",$type="card") +function display_link_card($card,$dir="english",$type="card", $selected=0) { + if($selected) + $selected = 'selected="selected"'; + if( $card/2 - (int)($card/2) == 0.5) - echo "
    \"".DB_get_card_name($card)."\"
    \n"; + echo "
    \"".DB_get_card_name($card)."\"
    \n"; else - echo "
    \"".DB_get_card_name($card-1)."\"
    \n"; + echo "
    \"".DB_get_card_name($card-1)."\"
    \n"; return; } -- cgit v1.2.3-18-g5258