Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

improve page users see when opening invite from new device on an old one.

Browse source
This commit is contained in:
Eric House 2012-12-01 10:10:28 -08:00
parent dd882ba9d4
commit 38e6eac3a1
2 changed files with 47 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
xwords4/android/scripts/and_index.php
View file

@ -6,16 +6,16 @@ $g_apk = 'XWords4-release_android_beta_55-39-gbffb231.apk';
function printHead() { function printHead() {
print <<<EOF print <<<EOF
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html> <html>
<head> <head>
<link rel="stylesheet" type="text/css" href="/xw4mobile.css" /> <link rel="stylesheet" type="text/css" href="/xw4mobile.css" />
<title>Crosswords Invite redirect</title> <title>Crosswords Invite redirect</title>
</head> </head>
<body> <body>
<p><em>UNDER CONSTRUCTION -- certain assumptions will go away before the next version ships</em></p> <div class="center">
<img class="center" src="../icon48x48.png"/>
<img src="../icon48x48.png"/> </div>
EOF; EOF;
} }
@ -26,47 +26,59 @@ print <<<EOF
EOF; EOF;
} }
function printNonAndroid() { function printNonAndroid($agent) {
$subject = "Android device not identified"; $subject = "Android device not identified";
$body = htmlentities("My browser is running on an android device but" $body = htmlentities("My browser is running on an android device but"
. " says its user agent is: \"$agent\". Please fix your script to recognize" . " says its user agent is: \"$agent\". Please fix your script to recognize"
. " this as an Android browser."); . " this as an Android browser.");
print <<<EOF print <<<EOF
<p>Please open the link that sent you here on an Android device.</p> <div class="center">
<p>This page is meant to be viewed on an Android device.</p>
<p>(If you <em>are</em> viewing this on an Android device, you&apos;ve <hr>
found a bug! Please <a href="mailto: <p>(If you <em>are</em> viewing this on an Android device, you&apos;ve
xwords@eehouse.org?subject=$subject&body=$body">email me</a> (and be found a bug! Please <a href="mailto:
sure to leave the user agent string in the email body.) xwords@eehouse.org?subject=$subject&body=$body">email me</a> (and be
</p> sure to leave the user agent string in the email body.)
</p>
</div>
EOF; EOF;
} }
function printAndroid() { function printAndroid() {
print <<<EOF print <<<EOF
<p>Hello Kati, Chris, Mana, Deb, and maybe Brynn,</p> <div>
<p>You&apos;ll have come here after clicking a link in an email or
<p>You&apos;ll have come here after clicking a link in an invite text inviting you to a Crosswords game. But you should not be seeing
email. But you should not be seeing this page.</p> this page.</p>
<p>If you got this page on your device, it means either <p>If you got this page on your device, it means either
<ul> <ul>
<li> you haven&apos;t installed a copy of Crosswords built after Nov. 25</li> <li>The copy of Crosswords you have is NOT beta 56 or newer (dating from about Dec. 1, 2012).</li>
<li> OR </li> <li> OR </li>
<li> that you have, and when you clicked on the link and were asked to <li> that your copy of Crosswords is new enough <em>BUT</em> that
choose between a browser and Crosswords you chose the browser.</li> when you clicked on the link and were asked to choose between a
browser and Crosswords you chose the browser.</li>
</ul></p> </ul></p>
<p>In the first <p>In the first case, install the latest Crosswords,
case, <a href="http://eehouse.org/xw4/android/$g_apk">download either <a href="market://search?q=pname:org.eehouse.android.xw4">via
and install the latest Crosswords</a>. Then go back to the invite the Google Play store</a> or
email (or text) and tap the link again.</p> (sideloading) <a href="https://sourceforge.net/projects/xwords/files/xwords_Android/4.4%20beta%2056/XWords4-release_android_beta_56.apk/download">via
Sourceforge.net</a>. After the install is finished go back to the
invite email (or text) and tap the link again.</p>
<p>In the second, hit your back button, click the link in your invite <p>In the second case, hit your browser&apos;s back button, click the
email (or text) again, and this time choose Crosswords.</p> link in your invite email (or text) again, and this time let
Crosswords handle it.</p>
<p>Have fun. And as always, <a href="mailto:xwords@eehouse.org">let
me know</a> if you have problems or suggestions.</p>
</div>
<div class="center">
<img class="center" src="../icon48x48.png"/>
</div>
EOF; EOF;
} }
@ -86,7 +98,7 @@ printHead();
if ( /*true || */ $onFire || $onAndroid ) { if ( /*true || */ $onFire || $onAndroid ) {
printAndroid(); printAndroid();
} else { } else {
printNonAndroid(); printNonAndroid($agent);
} }
printTail(); printTail();

5
xwords4/android/scripts/xw4mobile.css
View file

@ -1,2 +1,3 @@
body { font-size: 2em; } body { font-size: 1.5em; }
table { font-size: 2em; } table { font-size: 1.5em; }
.center { text-align: center; }