X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Foutput.php;h=c6d78e32bfa53931d0c5fdb3bbc7437b841cd897;hp=9c4316c8c35fdf9485f5433f6164e7d2e692b892;hb=0b8f00b41b22dc971f8415f1e6de4700ea86c0fb;hpb=e395151af6c953c0e7fa9229dd921f8d721ab69c
diff --git a/include/output.php b/include/output.php
index 9c4316c..c6d78e3 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 = 'checked="checked"';
+
if( $card/2 - (int)($card/2) == 0.5)
- echo "
\n";
+ echo "\n";
else
- echo "\n";
+ echo "\n";
return;
}
@@ -219,14 +222,14 @@ function output_check_for_sickness($me,$mycards)
echo '';
echo ' '._('Do you want to play solo?').'';
echo ' ';
echo '
';
@@ -293,60 +296,60 @@ function output_check_for_sickness($me,$mycards)
function output_form_calls($me,$myparty)
{
- $highstart = "";
- $highend = "";
+ $highstart = ' ';
+ $highend = '';
$tmp = can_call(120,$me);
if( $tmp )
{
if($tmp==2) echo $highstart;
if($myparty=='re')
- echo "re (120):";
+ echo ' re (120):';
else if ($myparty=='contra')
- echo "contra (120):";
+ echo ' contra (120):';
else
- echo " re/contra (120):";
- echo " ";
+ echo ' re/contra (120):';
+ echo ' ';
if($tmp==2) echo $highend;
- echo "
\n";
+ echo "\n";
}
- $tmp = can_call(90,$me);
+ $tmp = can_call(90,$me);
if( $tmp )
{
if($tmp==2) echo $highstart;
- echo " 90:".
- " ";
+ echo ' 90:'.
+ ' ';
if($tmp==2) echo $highend;
- echo "
\n";
+ echo "\n";
}
$tmp = can_call(60,$me);
if( $tmp )
{
if($tmp==2) echo $highstart;
- echo " 60:".
- " ";
+ echo ' 60:'.
+ ' ';
if($tmp==2) echo $highend;
- echo "
\n";
+ echo "\n";
}
$tmp = can_call(30,$me);
if( $tmp )
{
if($tmp==2) echo $highstart;
- echo " 30:".
- " ";
+ echo ' 30:'.
+ ' ';
if($tmp==2) echo $highend;
- echo "
\n";
+ echo "\n";
}
$tmp = can_call(0,$me);
if( $tmp )
{
if($tmp==2) echo $highstart;
- echo " 0:".
- " ";
+ echo ' 0:'.
+ ' ';
if($tmp==2) echo $highend;
- echo "
\n".
- " no call:".
- "
";
+ echo "\n".
+ ' no call:'.
+ ' '."\n";
}
}
@@ -368,31 +371,29 @@ function output_header()
{
global $REV;
?>
-
-
+
+
e-Doko
-
-
-
-
+
+
+
+
+
+
+
+
-
+
";
@@ -401,23 +402,21 @@ function output_header()
function output_footer()
{
- global $REV,$PREF;
+ global $REV, $PREF, $INDEX;
echo "\n\n";
- echo "\n";
-
+ echo "\n\n";
echo "\n";
echo "\n";
@@ -454,15 +453,9 @@ function output_status()
echo " | "._('wiki/bugs')."\n";
echo " | "._('atom')."\n";
echo " | "._('logout')."\n";
- echo "\n";
+ echo "\n\n";
- echo ""._('last login').": ".date("r",$unixtime)."
\n";
- }
- else
- {
- echo "\n\n";
+ echo ""._('last login').": ".date("r",$unixtime)."
\n\n";
}
return;
}
@@ -546,13 +539,13 @@ function output_password_recovery($email,$password)