From 386dee36accaa6de611f656dbfa4edda50f13fc3 Mon Sep 17 00:00:00 2001
From: Przemyslaw Bialik <firefox@poczta.neostrada.pl>
Date: Tue, 9 Dec 2008 14:03:27 +0100
Subject: [PATCH] Bug 463923 - show expanded technical details in expert mode
 (SSL error pages). r=johnath/gavin

---
 browser/components/certerror/content/aboutCertError.xhtml | 7 ++++---
 browser/components/certerror/test/browser_bug431826.js    | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/browser/components/certerror/content/aboutCertError.xhtml b/browser/components/certerror/content/aboutCertError.xhtml
index 830ad34275dd..c4e4cd86fe66 100644
--- a/browser/components/certerror/content/aboutCertError.xhtml
+++ b/browser/components/certerror/content/aboutCertError.xhtml
@@ -119,6 +119,7 @@
         replaceWithHost(intro);
         
         if (getCSSClass() == "expertBadCert") {
+          toggle('technicalContent');
           toggle('expertContent');
         }
         
@@ -206,7 +207,7 @@
           
         // If we set a link, meaning there's something helpful for
         // the user here, expand the section by default
-        if (link.href)
+        if (link.href && getCSSClass() != "expertBadCert")
           toggle("technicalContent");
       }
       
@@ -249,13 +250,13 @@
           </div>
         </div>
         
+        <!-- The following sections can be unhidden by default by setting the
+             "browser.xul.error_pages.expert_bad_cert" pref to true -->
         <div id="technicalContent" collapsed="true">
           <h2 onclick="toggle('technicalContent');" id="technicalContentHeading">&certerror.technical.heading;</h2>
           <p id="technicalContentText"/>
         </div>
         
-        <!-- This section can be unhidden by default by setting the
-        "browser.xul.error_pages.expert_bad_cert" pref to true -->
         <div id="expertContent" collapsed="true">
           <h2 onclick="toggle('expertContent');" id="expertContentHeading">&certerror.expert.heading;</h2>
           <div>
diff --git a/browser/components/certerror/test/browser_bug431826.js b/browser/components/certerror/test/browser_bug431826.js
index 686aa79c04bb..dc08ed442af1 100644
--- a/browser/components/certerror/test/browser_bug431826.js
+++ b/browser/components/certerror/test/browser_bug431826.js
@@ -35,7 +35,9 @@ function testBrokenCert() {
 function testExpertPref() {
   
   var expertDiv = gBrowser.contentWindow.document.getElementById("expertContent");
+  var technicalDiv = gBrowser.contentWindow.document.getElementById("technicalContent");
   ok(!expertDiv.hasAttribute("collapsed"), "Expert content should not be collapsed with the expert mode pref set");
+  ok(!technicalDiv.hasAttribute("collapsed"), "Technical content should not be collapsed with the expert mode pref set");
   
   // Clean up
   gBrowser.removeCurrentTab();