From 0b6a77328018b1e184fd1160c31fc275eea0d97b Mon Sep 17 00:00:00 2001 From: "wclouser%mozilla.com" Date: Mon, 24 Jul 2006 01:55:02 +0000 Subject: [PATCH] - More wording tweaks from rachel - statistics stuff for sherman git-svn-id: svn://10.0.0.236/trunk@203485 18797224-902f-48f8-a5cc-f745e15eee43 --- .../controllers/users_controller.php | 43 +- .../views/elements/header.thtml | 7 + .../firefox_survey/views/layouts/submit.thtml | 5 + .../firefox_survey/views/users/add.thtml | 1 - .../webroot/img/firefox-survey-title2.gif | Bin 0 -> 3290 bytes .../webroot/img/userpanel1-form.gif | Bin 0 -> 35 bytes .../webroot/img/userpanel2-response.gif | Bin 0 -> 35 bytes .../img/userpanel3-alreadysignedup.gif | Bin 0 -> 35 bytes .../firefox_survey/webroot/js/__utm.js | 488 ++++++++++++++++++ 9 files changed, 521 insertions(+), 23 deletions(-) create mode 100644 mozilla/webtools/firefox_survey/views/layouts/submit.thtml create mode 100644 mozilla/webtools/firefox_survey/webroot/img/firefox-survey-title2.gif create mode 100644 mozilla/webtools/firefox_survey/webroot/img/userpanel1-form.gif create mode 100644 mozilla/webtools/firefox_survey/webroot/img/userpanel2-response.gif create mode 100644 mozilla/webtools/firefox_survey/webroot/img/userpanel3-alreadysignedup.gif create mode 100644 mozilla/webtools/firefox_survey/webroot/js/__utm.js diff --git a/mozilla/webtools/firefox_survey/controllers/users_controller.php b/mozilla/webtools/firefox_survey/controllers/users_controller.php index 5d61e68beb7..a945f3f9c59 100644 --- a/mozilla/webtools/firefox_survey/controllers/users_controller.php +++ b/mozilla/webtools/firefox_survey/controllers/users_controller.php @@ -23,6 +23,7 @@ class UsersController extends AppController { { if (empty($this->params['data'])) { + $this->set('tracking_image','userpanel1-form.gif'); $this->render(); } else @@ -93,20 +94,19 @@ use in marketing or solicitation.

$mail->send(); - // rather than just flash a screen, we want to show a page with - // some content. We do a little trickery here, but it gets the - // job done. content is in /views/layouts/flash.thtml - $this->Session->setFlash(' -

You are already signed up for the Firefox User Panel!

+ $this->layout = 'submit'; + $this->set('content',' +

You are already signed up for the Firefox User Panel!

-

If you don\'t receive an email with a link to the survey within 24 hours, please check - your junk mail. If you still haven\'t received an email with a link to the survey - please let us know - and we\'ll send another copy.

+

If you don\'t receive an email with a link to the survey within 24 hours, please check + your junk mail. If you still haven\'t received an email with a link to the survey + please let us know + and we\'ll send another copy.

-

Continue to Firefox Central.

+

Continue to Firefox Central.

'); - $this->flash(null,null,0); + $this->set('tracking_image','userpanel3-alreadysignedup.gif'); + $this->render(); return; } @@ -143,20 +143,19 @@ use in marketing or solicitation.

$mail->send(); - // rather than just flash a screen, we want to show a page with - // some content. We do a little trickery here, but it gets the - // job done. content is in /views/layouts/flash.thtml - $this->Session->setFlash(' -

Thanks for helping to make a better browsing experience!

+ $this->layout = 'submit'; + $this->set('content',' +

Thanks for helping us make a better browser!

-

Be sure to check your email for a link to the first survey.
- Continue to Firefox Central.

+

Be sure to check your email for a link to the first survey.
+ Continue to Firefox Central.

-

If you don\'t receive an email with a link to - the survey within 24 hours, please check your junk mail or let us - know and we\'ll send another copy.

+

If you don\'t receive an email with a link to + the survey within 24 hours, please check your junk mail or let us + know and we\'ll send another copy.

'); - $this->flash(null,null,0); + $this->set('tracking_image','userpanel2-response.gif'); + $this->render(); } } diff --git a/mozilla/webtools/firefox_survey/views/elements/header.thtml b/mozilla/webtools/firefox_survey/views/elements/header.thtml index 67e0fc29846..3deeb85029e 100644 --- a/mozilla/webtools/firefox_survey/views/elements/header.thtml +++ b/mozilla/webtools/firefox_survey/views/elements/header.thtml @@ -28,6 +28,12 @@ + image($tracking_image, array('alt'=>'', 'width'=>1, 'height'=>1)); + } + ?>