BUGFIX: css index prevented user from selecting a radio button and minor tweaks

* fixed in sickness screen
* removed unnessecary questions
* pre-selected yes for starting a game
* some minor css tweaks

2 files changed, 34 insertions, 40 deletions

diff --git a/css/standard.css b/css/standard.css
index 88ff9fd..8f609f5 100644
--- a/css/standard.css
+++ b/css/standard.css
@@ -126,12 +126,13 @@ footer .left  { float:left;         font-size:smaller;}
 .joingame,.sickness,.poverty,.total {
  position: absolute;
  background-color: #fff;
+ border-radius: 5px;
  width: 20%;
  top: 30%;
  left: 40%;
  margin: auto;
  text-align: center;
- z-index:22;
+ z-index:42;
 }
 .total {
     width: 14%;
@@ -204,6 +205,7 @@ div.table div.table0 .start {
   background-color: #f00;
   border-radius: 5px;
   padding: 3px;
+  padding-bottom: 1px;
   margin: 3px;
 }
 
@@ -311,18 +313,14 @@ hr {clear:both;}
   padding:0;
  /*border: 1px solid red;*/
   top: 30%;
-  left:37.5%;
-  right:56.5%;
+  left:33.5%;
+  right:59.5%;
   height:40%;
   z-index:30;
-}
-
-.vorbehalt0 {
-  left:37.5%;
-  right:57.5%;
   width:10%;
   text-align:left;
 }
+
 .tricks div div.card0 span.comment{
   position:absolute;
   margin:0;
@@ -343,18 +341,14 @@ hr {clear:both;}
   padding:0;
   /*border: 1px solid red;*/
   top: 0%;
-  left:47%;
-  right:47%;
-  height:40%;
-  text-align:center;
-  z-index:30;
-}
-.vorbehalt1{
   left:45%;
   right:45%;
   width:10%;
+  height:40%;
+  text-align:center;
   z-index:30;
 }
+
 .tricks div div.card1 span.comment{
   position:absolute;
   margin:0;
@@ -376,17 +370,14 @@ hr {clear:both;}
   padding:0;
   /*border: 1px solid red;*/
   top: 30%;
-  right:37.5%;
-  left:56.5%;
+  right:34%;
+  width:10%;
+  left:56%;
   height:40%;
   z-index:30;
-}
-.vorbehalt2{
-  left:auto;
-  right:38%;
-  width:10%;
   text-align:right;
 }
+
 .tricks div div.card2 span.comment{
   position:absolute;
   margin:0;
@@ -408,12 +399,15 @@ hr {clear:both;}
   padding:0;
   /*border: 1px solid red;*/
   bottom: 0%;
-  left:47%;
-  right:47%;
+  left:45%;
+  right:45%;
   height: 40%;
   z-index:30;
+  width:10%;
+  height: 3em;
+  text-align:center;
 }
-.tricks div div.card3 .score, .vorbehalt3{
+.tricks div div.card3 .score{
   left:45%;
   right:45%;
   width:10%;
diff --git a/include/output.php b/include/output.php
index c2a644b..0b18e00 100644
--- a/include/output.php
+++ b/include/output.php
@@ -280,61 +280,61 @@ function output_check_for_sickness($me,$mycards)
   echo '    </select>';
   echo '    <br />';
 
-  echo _('Wedding?');
   if(check_wedding($mycards))
      {
+       echo _('Do you want to call Wedding?');
        echo ' '._('yes')."<input type=\"radio\" name=\"wedding\" value=\"yes\" checked=\"checked\" />";
        echo ' '._('no')." <input type=\"radio\" name=\"wedding\" value=\"no\" /> <br />\n";
      }
    else
      {
-       echo ' '._('no')." <input type=\"hidden\" name=\"wedding\" value=\"no\" /> <br />\n";
+       echo "  <input type=\"hidden\" name=\"wedding\" value=\"no\" />\n";
      };
 
-  echo _('Do you have poverty?');
   if(count_trump($mycards)<4)
     {
+      echo _('Do you want to call poverty?');
       echo ' '._('yes')."<input type=\"radio\" name=\"poverty\" value=\"yes\" checked=\"checked\" />";
       echo ' '._('no')." <input type=\"radio\" name=\"poverty\" value=\"no\" /> <br />\n";
     }
   else
     {
-      echo ' '._('no')." <input type=\"hidden\" name=\"poverty\" value=\"no\" /> <br />\n";
+      echo "  <input type=\"hidden\" name=\"poverty\" value=\"no\" />\n";
     };
 
-  echo _('Do you have too many nines?');
   if(count_nines($mycards)>4)
      {
+       echo _('Do you want to call too many nines?');
        echo ' '._('yes')."<input type=\"radio\" name=\"nines\" value=\"yes\" checked=\"checked\" />";
        echo ' '._('no')." <input type=\"radio\" name=\"nines\" value=\"no\" /> <br />\n";
      }
    else
      {
-       echo ' '._('no')." <input type=\"hidden\" name=\"nines\" value=\"no\" /> <br />\n";
+       echo "  <input type=\"hidden\" name=\"nines\" value=\"no\" />\n";
      };
 
   if($RULES['lowtrump']=='cancel' || $RULES['lowtrump']=='poverty')
     {
-      if($RULES['lowtrump']=='cancel')
-	echo _('Do you have low trump (cancel game)?');
-      else
-	echo _('Do you have low trump (poverty)?');
-
       if(check_low_trump($mycards))
 	{
+          if($RULES['lowtrump']=='cancel')
+            echo _('Do you want to call low trump (cancel game)?');
+          else
+	    echo _('Do you want to call low trump (poverty)?');
+
 	  echo ' '._('yes')."<input type=\"radio\" name=\"lowtrump\" value=\"yes\" checked=\"checked\" />";
 	  echo ' '._('no')." <input type=\"radio\" name=\"lowtrump\" value=\"no\" /> <br />\n";
 	}
       else
 	{
-	  echo ' '._('no')." <input type=\"hidden\" name=\"lowtrump\" value=\"no\" /> <br />\n";
+	  echo "  <input type=\"hidden\" name=\"lowtrump\" value=\"no\" />\n";
 	};
     }
   else
-    echo "<input type=\"hidden\" name=\"lowtrump\" value=\"no\" />";
+    echo "  <input type=\"hidden\" name=\"lowtrump\" value=\"no\" />";
 
    echo "<input type=\"hidden\" name=\"me\" value=\"$me\" />\n";
-   echo "<input type=\"submit\" value=\""._('count me in')."\" />\n";
+   echo "<br /><input type=\"submit\" value=\""._('count me in')."\" />\n";
 
    echo "</div>\n";
 
@@ -404,7 +404,7 @@ function output_check_want_to_play($me)
 {
   echo ' <div class="joingame">';
   echo '   '._('Do you want to play a game of DoKo?').' <br />';
-  echo '   '._('yes').'<input type="radio" name="in" value="yes" />';
+  echo '   '._('yes').'<input type="radio" name="in" value="yes" checked="checked" />';
   echo '   '._('no').'<input type="radio" name="in" value="no" /> <br />';
   echo "<input type=\"hidden\" name=\"me\" value=\"$me\" />\n";
   echo "\n";