From 5f2a9fe5546b38ec37ff088db4cfcbbcaa33b3ea Mon Sep 17 00:00:00 2001
From: "ccooper%deadsquid.com"
 <ccooper%deadsquid.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 10 Oct 2007 22:04:33 +0000
Subject: [PATCH] b=393586,397059 - add blurb to login and test run selection
 pages advising the user that both cookies and js are required

git-svn-id: svn://10.0.0.236/trunk@237550 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../templates/en/default/auth/login.html.tmpl | 31 ++++++++++++++-----
 .../instructions/selecting_a_test_run.tmpl    |  3 ++
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/mozilla/webtools/litmus/templates/en/default/auth/login.html.tmpl b/mozilla/webtools/litmus/templates/en/default/auth/login.html.tmpl
index c8e7a2ac0c8..66b40915710 100755
--- a/mozilla/webtools/litmus/templates/en/default/auth/login.html.tmpl
+++ b/mozilla/webtools/litmus/templates/en/default/auth/login.html.tmpl
@@ -133,17 +133,33 @@ function forgotPasswordForm(f) {
 
         <td rowspan="2" valign="top" width="50%">
           <div class="login_privacy">
-<h2 class="login_sectitle">Concerning Privacy:</h2>
+<h2 class="login_sectitle">Concerning Technology and Privacy:</h2>
 
 <p>In order to address the privacy concerns of our users, we have introduced a
 new system for managing user accounts.</p>
 
-<p>Even if testers don't plan to join us on IRC, we highly recommend that they supply an IRC nickname (any unique nickname will do) when they create their testing account. Wherever possible in Litmus, we will use the IRC nickname instead of your email address to identify your results or comments in an effort to reduce
-the potential for spam. If no nickname is supplied, we will display your Real Name, and if no name is supplied, we will default to displaying the email address.</p>
+<p>Litmus uses both <a href="http://en.wikipedia.org/wiki/HTTP_cookie">cookies</a>
+and <a href="http://en.wikipedia.org/wiki/Client-side_JavaScript">JavaScript</a>
+identify testers and pre-validate submitted results as much as possible. You
+will not be able to submit results if you do not have both cookies and
+JavaScript enabled, although some basic browsing and searching of results may
+still be possible.</p>
+
+<p>Even if testers don't plan to join us on IRC, we highly recommend that they
+supply an IRC nickname (any unique nickname will do) when they create their
+testing account. Wherever possible in Litmus, we will use the IRC nickname
+instead of your email address to identify your results or comments in an effort
+to reduce the potential for spam. If no nickname is supplied, we will display
+your Real Name, and if no name is supplied, we will default to displaying the
+email address.</p>
 
 <p>Like <a href="https://bugzilla.mozilla.org/">Bugzilla</a>, Litmus is an open
-system used by the Mozilla community. All testing results you submit will be visible to the public, including the email addresses of those involved and any comments you enter. Although Litmus takes steps to prevent spammers from harvesting
-your email address, spam cannot be eliminated entirely. We recommend using a free web email service (such as Yahoo, Gmail, or similar) and not your primary email address if this concerns you.</p>
+system used by the Mozilla community. All testing results you submit will be
+visible to the public, including the email addresses of those involved and any
+comments you enter. Although Litmus takes steps to prevent spammers from
+harvesting your email address, spam cannot be eliminated entirely. We recommend
+using a free web email service (such as Yahoo, Gmail, or similar) and not your
+primary email address if this concerns you.</p>
 
 <p>Thank you for your contribution to Mozilla QA.</p>
           </div>
@@ -188,10 +204,9 @@ your email address, spam cannot be eliminated entirely. We recommend using a fre
                  <td>Confirm Password:</td>
                  <td><input name="password_confirm" type="password" size="25"></td>
                </tr>
-               <tr>
-                 <td colspan="2"><input type="submit" name="Submit" value="Create Account"></td>
-               </tr>
              </table>
+             <br/>
+            <input type="submit" name="Submit" value="Create Account">
 
            </form>
 
diff --git a/mozilla/webtools/litmus/templates/en/default/instructions/selecting_a_test_run.tmpl b/mozilla/webtools/litmus/templates/en/default/instructions/selecting_a_test_run.tmpl
index 7864ccb86b2..2b6229755f0 100644
--- a/mozilla/webtools/litmus/templates/en/default/instructions/selecting_a_test_run.tmpl
+++ b/mozilla/webtools/litmus/templates/en/default/instructions/selecting_a_test_run.tmpl
@@ -15,6 +15,9 @@ recommended test runs for the product/branch you'd like to test, select an
 approriate test run from the remaining list. Don't worry: if a new recommended
 test run is created in the future for the product/branch you choose to test now,
 any results you submit will automatically be included in the new test run.</p>
+
+<p><em>NOTE</em>: You will not be able to submit results unless you have both <a href="http://en.wikipedia.org/wiki/HTTP_cookie">cookies</a>
+and <a href="http://en.wikipedia.org/wiki/Client-side_JavaScript">JavaScript</a> enabled.</p>
    
 <hr/>