From ab3241a57ea6d242ff2785e671c4649d49e25f79 Mon Sep 17 00:00:00 2001
From: Paul McLanahan <pmac@mozilla.com>
Date: Fri, 13 Sep 2013 09:58:55 -0400
Subject: [PATCH] Bug 915867: Port unsupported/details/ billboard.

Also make sure any unsupported billboards accessed
at */index.html redirect to remove the filename.
---
 bedrock/firefox/templates/firefox/unsupported-details.html | 3 ++-
 bedrock/firefox/urls.py                                    | 1 +
 etc/httpd/global.conf                                      | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bedrock/firefox/templates/firefox/unsupported-details.html b/bedrock/firefox/templates/firefox/unsupported-details.html
index 9c1b20564e9..4bd4193c45c 100644
--- a/bedrock/firefox/templates/firefox/unsupported-details.html
+++ b/bedrock/firefox/templates/firefox/unsupported-details.html
@@ -27,7 +27,8 @@ <h1>{{ _('URGENT!') }}</h1>
           <li>{{ _('experience faster performance') }}</li>
           <li>{{ _('Enjoy new features') }}</li>
         </ul>
-        <p>{{ _('This is your last reminder before you will be automatically updated to the latest version') }} </p>
+        {# Current version of this file in SVN does not have this paragraph.
+         #<p>{{ _('This is your last reminder before you will be automatically updated to the latest version') }} </p>#}
       </div>
     </div>
   </body>
diff --git a/bedrock/firefox/urls.py b/bedrock/firefox/urls.py
index cef87cdb3cd..e570aae928c 100644
--- a/bedrock/firefox/urls.py
+++ b/bedrock/firefox/urls.py
@@ -57,6 +57,7 @@
     page('firefox/unsupported/warning', 'firefox/unsupported-warning.html'),
     page('firefox/unsupported/EOL', 'firefox/unsupported-EOL.html'),
     page('firefox/unsupported/mac', 'firefox/unsupported-mac.html'),
+    page('firefox/unsupported/details', 'firefox/unsupported-details.html'),
 
     url(r'^firefox/unsupported/win/$', views.windows_billboards),
     url('^dnt/$', views.dnt, name='firefox.dnt'),
diff --git a/etc/httpd/global.conf b/etc/httpd/global.conf
index 468743a847e..e56a17c0788 100644
--- a/etc/httpd/global.conf
+++ b/etc/httpd/global.conf
@@ -153,8 +153,8 @@ RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/update(.*)$ /b/$1firefox/update$2 [P
 # TODO: Remove when all locales are done.
 RewriteRule ^/(an|ast|bg|br|cs|csb|cy|da|de|el|eo|es-AR|es-CL|es-ES|es-MX|et|eu|fi|fr|fy-NL|ga-IE|gd|hr|hu|hy-AM|id|is|it|ko|lij|lt|lv|ml|mk|mr|my|nb-NO|nl|pl|pt-BR|pt-PT|rm|ro|ru|sl|sk|sq|sr|sv-SE|te|tr|uk|zh-TW)/firefox/new(/?)$ /b/$1/firefox/new$2 [PT]
 
-# bug 796952, 915845
-RewriteCond %{REQUEST_URI} !firefox/unsupported/details/index\.html$
+# bug 796952, 915845, 915867
+RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/unsupported/(.+)/index\.html$ /$1firefox/unsupported/$2/ [L,R=301]
 RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/unsupported/(.*)$ /b/$1firefox/unsupported/$2 [PT]
 
 # bug 757117