From 38e6eac3a194035167d439f3fc02b0a636a8e324 Mon Sep 17 00:00:00 2001 From: Eric House Date: Sat, 1 Dec 2012 10:10:28 -0800 Subject: [PATCH] improve page users see when opening invite from new device on an old one. --- xwords4/android/scripts/and_index.php | 76 ++++++++++++++++----------- xwords4/android/scripts/xw4mobile.css | 5 +- 2 files changed, 47 insertions(+), 34 deletions(-) diff --git a/xwords4/android/scripts/and_index.php b/xwords4/android/scripts/and_index.php index e13137d26..baee28084 100644 --- a/xwords4/android/scripts/and_index.php +++ b/xwords4/android/scripts/and_index.php @@ -6,16 +6,16 @@ $g_apk = 'XWords4-release_android_beta_55-39-gbffb231.apk'; function printHead() { print << - - - - Crosswords Invite redirect - - -

UNDER CONSTRUCTION -- certain assumptions will go away before the next version ships

- - + + + + + Crosswords Invite redirect + + +
+ +
EOF; } @@ -26,47 +26,59 @@ print <<Please open the link that sent you here on an Android device.

- -

(If you are viewing this on an Android device, you've - found a bug! Please email me (and be - sure to leave the user agent string in the email body.) -

+
+

This page is meant to be viewed on an Android device.

+
+

(If you are viewing this on an Android device, you've + found a bug! Please email me (and be + sure to leave the user agent string in the email body.) +

+
EOF; } function printAndroid() { print <<Hello Kati, Chris, Mana, Deb, and maybe Brynn,

- -

You'll have come here after clicking a link in an invite - email. But you should not be seeing this page.

+
+

You'll have come here after clicking a link in an email or + text inviting you to a Crosswords game. But you should not be seeing + this page.

If you got this page on your device, it means either

    -
  • you haven't installed a copy of Crosswords built after Nov. 25
    • +
  • The copy of Crosswords you have is NOT beta 56 or newer (dating from about Dec. 1, 2012).
  • OR
    • -
  • that you have, and when you clicked on the link and were asked to - choose between a browser and Crosswords you chose the browser.
    • +
  • that your copy of Crosswords is new enough BUT that + when you clicked on the link and were asked to choose between a + browser and Crosswords you chose the browser.

-

In the first -case, download -and install the latest Crosswords. Then go back to the invite -email (or text) and tap the link again.

+

In the first case, install the latest Crosswords, +either via +the Google Play store or +(sideloading) via +Sourceforge.net. After the install is finished go back to the +invite email (or text) and tap the link again.

-

In the second, hit your back button, click the link in your invite -email (or text) again, and this time choose Crosswords.

+

In the second case, hit your browser's back button, click the +link in your invite email (or text) again, and this time let +Crosswords handle it.

+

Have fun. And as always, let +me know if you have problems or suggestions.

+
+
+ +
EOF; } @@ -86,7 +98,7 @@ printHead(); if ( /*true || */ $onFire || $onAndroid ) { printAndroid(); } else { - printNonAndroid(); + printNonAndroid($agent); } printTail(); diff --git a/xwords4/android/scripts/xw4mobile.css b/xwords4/android/scripts/xw4mobile.css index a116fc92b..d628a7a8e 100644 --- a/xwords4/android/scripts/xw4mobile.css +++ b/xwords4/android/scripts/xw4mobile.css @@ -1,2 +1,3 @@ -body { font-size: 2em; } -table { font-size: 2em; } +body { font-size: 1.5em; } +table { font-size: 1.5em; } +.center { text-align: center; }