497194 - Mobile: SMS thank you page

Status: VERIFIED FIXED

(www.mozilla.org :: General, defect)

Description

[Ryan Doherty (:rdoherty)]

Tracking creating of desktop Fennec SMS thank you page

Comment 1

[Dave Dash [:davedash, :dd] (assign all bugs to mbrandt)]

This page seems superfluous...

Comment 2

[Dave Dash [:davedash, :dd] (assign all bugs to mbrandt)]

Hm... maybe it's not.

Comment 3

[Dave Dash [:davedash, :dd] (assign all bugs to mbrandt)]

Marking this as blocked by 497185, since I do need to remove stuff in the home page before I commit.

Comment 4

[Dave Dash [:davedash, :dd] (assign all bugs to mbrandt)]

Attachment: v1

Comment 5

[Ryan Doherty (:rdoherty)]

Comment on attachment 386617 [details] [diff] [review]
v1

Looks good!

Comment 6

[Ryan Doherty (:rdoherty)]

Just noticed the last list item has an apostrophe before 'Enjoy' that should be removed.

Comment 7

[Dave Dash [:davedash, :dd] (assign all bugs to mbrandt)]

host-6-222:~/Projects/Fennec/mozilla.com % git svn dcommit             (497194)
Committing to https://svn.mozilla.org/projects/mozilla.com/trunk ...
        A       en-US/mobile/include/privacy_blurb.inc
        M       en-US/mobile/send.php
        A       en-US/mobile/sms-thanks.html
Committed r29480
        M       en-US/mobile/send.php
        A       en-US/mobile/include/privacy_blurb.inc
        A       en-US/mobile/sms-thanks.html
r29480 = ea66b84bc7759f9ed94a6513965a8ea4bcf28fdc (trunk)
W: b105c8aab704ed35bd9f29f8785d41fd0a04b725 and refs/remotes/trunk differ, using rebase:
:040000 040000 0242769a11dd15f214aa6d25225a199aed169dd1 319e64450d623f5b0142f06f37aab81d91212ba6 M      ca
:040000 040000 e4b8125e05e304541a314db5af875501af353d16 0a030362fe79cdad27f5dd6c50b97091db566fa5 M      cs
:040000 040000 8cddaedeb45e43726e33b2e00133f2e2927c79ee e5dd3d475dff983f6498667fca2c7372095fdf32 M      da
:040000 040000 3e4cac4acca1f622f7a83aca9c2dbcd833fcc4c6 b24f4f351d4dc64656203bc532b4b64e73880583 M      de
:040000 040000 21e8dd96315e77e1c83e86bc0b6f364b4720b046 2ee8a788c6100db8d824000bfb11ee96faf59239 M      el
:040000 040000 efb80afbab3dd6d6eb0a3641af377b5f9c2cbcc5 573a428926b2d2bdb3596382b3e7d0fbd1e79591 M      en-GB
:040000 040000 87916ef1cd1b14613c9868d46470dd724d3474e7 0518c5e4df41866c434bc2da967767cea7447896 M      en-US
:040000 040000 2641321827c47f9090f8f11df05e6b7011e10186 a05489d1718f79e0c3f51ae2f30de3c3616db649 M      es-ES
:040000 040000 b4597b379a74dfda48347b7973aa8179190b094a 4f48d70defb508dea66ae0c2ba58455b672d1339 M      eu
:040000 040000 99cd127f9744197417d5b2e0d9d41dc7f9abfd2d 06e63c36527caf8bbcf8eab2d114533e0e3195ed M      fi
:040000 040000 b0f38ae26892a39bdb65d706e4fc81e56af7a17d 39f40312bc630a3eec707d5be3010c4ea6c554ea M      fr
:040000 040000 81d3ca26d2ba0595912c043cc2d381930002ea56 d7a8e4e27791d6c3025a4a52ac4a590aefed1638 M      hu
:040000 040000 58b79bbf9975c22af1dec7337a8b0ee24c19f591 9ba187bdd465ff991ad2e2b9bd15cab8bff909b4 M      includes
:040000 040000 da0f78461fc965e7dec0c89e753abab562b6767d 93e876106b11a254ac79fa4545908889ebdc2ca0 M      it
:040000 040000 439184d4340b99da5038d5cc8d8470066df51df7 b25a670e4f0da3eda2c3bcd60abd07eb7d1480f2 M      lt
:040000 040000 08ddab9e2f39f0b13aac57c9aefe26a7566017d8 e0b948d6adba01a67313292e98a69a7759b21dec M      nb-NO
:040000 040000 a6b9a280601c793480f9161dc374eac8648a501e d315907626c1396d81156bdd330146f54c76aa75 M      nl
:040000 040000 31729183c68cba079f8f0e25ac917f65694685dc 711715c177814569d888b2ab2160f704662e1d81 M      pl
:040000 040000 f9cff3503d958bd327eef5fc062648a3f347a61c 411f99426f56e3e212f173bfcb9cb205d86a47a8 M      pt-BR
:040000 040000 44dbf7b5f4019276b7b56c64672812ea7608aef3 dd83c05a5a443965bbdc8371e0a7175bac00a37a M      pt-PT
:040000 040000 234fa75eebe05adb16e63a8071d6cd382ffc59e1 6ce2b7a0093373862753e9b0b32216d231f051ea M      ro
:040000 040000 0c49cf265fd0f9a8a17aac11252936e93d81d9a3 550218dac1ff0781b0a61c480c0434b65a739d91 M      ru
:040000 040000 05989229a71630b329dd9d05581f9784fc49eb42 06c127968ffdcd2b318fceca8f59b6b34b16b159 M      sk
:040000 040000 4f2ff1cf358d5a08dfb35442636d688a0c2a7d8d b6d6dd1aa25c6fddec92f708ade07dd078ad7d66 M      sq
:040000 040000 9291bfce174d81bbecf6df4031f2275ebb7739cf e9b05cee8a8b75a87f7467799c9874fd3058b2c4 M      tr
:040000 040000 a4d7ebe6d6f9f6dbf6078069ee8f94703bd91238 3189b3118459e58aa4aa11cdf68fe8a46ba52532 M      uk
:040000 040000 25070dd3a2aa0680d7d7be553fde0590ac9b7e2b f26a5a8df5827ecb094649e91e79a9d67fdb8672 M      vi
First, rewinding head to replay your work on top of it...
Applying: [bug 497194] Removed crufty SMS success code from m.home
/Users/dash/Projects/Fennec/mozilla.com/.git/rebase-apply/patch:17: trailing whitespace.
                            We could not send a text message to you.  
warning: 1 line adds whitespace errors.
Applying: [bug 497194] Finishing touches on sms thanks page
/Users/dash/Projects/Fennec/mozilla.com/.git/rebase-apply/patch:85: trailing whitespace.
#fennec-sms-thanks #main-content 
/Users/dash/Projects/Fennec/mozilla.com/.git/rebase-apply/patch:90: trailing whitespace.
#fennec-sms-thanks ol li 
/Users/dash/Projects/Fennec/mozilla.com/.git/rebase-apply/patch:97: trailing whitespace.
    margin-left: 1em;    
error: patch failed: en-US/mobile/index.html:301
error: en-US/mobile/index.html: patch does not apply
Using index info to reconstruct a base tree...
<stdin>:85: trailing whitespace.
#fennec-sms-thanks #main-content 
<stdin>:90: trailing whitespace.
#fennec-sms-thanks ol li 
<stdin>:97: trailing whitespace.
    margin-left: 1em;    
warning: 3 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging en-US/mobile/index.html
Applying: [bug 497194] Fixed a typo.
        M       en-US/mobile/index.html
Committed r29481
        M       en-US/mobile/index.html
r29481 = 42e9dea82dd7572bd0aed4c8228360c514ec7729 (trunk)
No changes between current HEAD and refs/remotes/trunk
Resetting to the latest refs/remotes/trunk
en-US/mobile/include/privacy_blurb.inc: locally modified
en-US/mobile/index.html: locally modified
en-US/mobile/sms-thanks.html: locally modified
style/tignish/mobile.css: locally modified
        M       en-US/mobile/include/privacy_blurb.inc
        M       en-US/mobile/index.html
        M       en-US/mobile/sms-thanks.html
        M       style/tignish/mobile.css
Committed r29482
        M       en-US/mobile/include/privacy_blurb.inc
        M       en-US/mobile/index.html
        M       en-US/mobile/sms-thanks.html
        M       style/tignish/mobile.css
r29482 = 0e8c28bd5a331b9dedc5f035d0505229463e6f07 (trunk)
No changes between current HEAD and refs/remotes/trunk
Resetting to the latest refs/remotes/trunk
en-US/mobile/sms-thanks.html: locally modified
        M       en-US/mobile/sms-thanks.html
Committed r29483
        M       en-US/mobile/sms-thanks.html
r29483 = f65d9e0d00f874142883c3a0dc626c6bc18f1e4b (trunk)
No changes between current HEAD and refs/remotes/trunk
Resetting to the latest refs/remotes/trunk

Comment 8

[Stephen Donner [:stephend] Not actively reading bugmail]

Supplanted by bug 513302.