Bug 808636 - Restyle mobile error pages. r=margaret

shellylin · Aug 15, 2013 · e0f8ef1 · e0f8ef1
1 parent 549289d
commit e0f8ef1
Show file tree

Hide file tree

Showing 9 changed files with 169 additions and 124 deletions.
diff --git a/mobile/android/chrome/content/aboutCertError.xhtml b/mobile/android/chrome/content/aboutCertError.xhtml
@@ -27,7 +27,7 @@
          should be updated. If this page starts using a different favicon
          than neterrorm nsFaviconService->SetAndLoadFaviconForPage
          should be updated to ignore this one as well. -->
-    <link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://global/skin/icons/warning-64.png"/>
+    <link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://browser/skin/images/certerror-warning.png"/>
 
     <script type="application/javascript"><![CDATA[
       // Error url MUST be formatted like this:
@@ -189,14 +189,14 @@
 
   <body id="errorPage" class="certerror" dir="&locale.dir;">
 
-   <!-- Error Title -->
-   <div id="errorTitle">
-     <h1 class="errorTitleText">&certerror.longpagetitle;</h1>
-   </div>
-
     <!-- PAGE CONTAINER (for styling purposes only) -->
     <div id="errorPageContainer">
 
+      <!-- Error Title -->
+      <div id="errorTitle">
+        <h1 class="errorTitleText">&certerror.longpagetitle;</h1>
+      </div>
+
       <!-- LONG CONTENT (the section most likely to require scrolling) -->
       <div id="errorLongContent">
         <div id="introContent">

diff --git a/mobile/android/chrome/content/blockedSite.xhtml b/mobile/android/chrome/content/blockedSite.xhtml
@@ -19,7 +19,7 @@
   <head>
     <meta name="viewport" content="width=device-width; user-scalable=false" />
     <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" />
-    <link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://global/skin/icons/blacklist_large.png"/>
+    <link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://browser/skin/images/blocked-warning.png"/>
 
     <script type="application/javascript"><![CDATA[
       // Error url MUST be formatted like this:
@@ -123,40 +123,18 @@
                                  .innerHTML;
       }
     ]]></script>
-    <style type="text/css">
-      /* Style warning button to look like a small text link in the
-         bottom right. This is preferable to just using a text link
-         since there is already a mechanism in browser.js for trapping
-         oncommand events from unprivileged chrome pages (BrowserOnCommand).*/
-      #ignoreWarningButton {
-        -moz-appearance: none;
-        background: transparent;
-        border: none;
-        text-decoration: underline;
-        margin: 0;
-        padding: 0;
-        position: relative;
-        top: 23px;
-        left: 20px;
-        font-size: smaller;
-      }
-
-      #ignoreWarning {
-        text-align: right;
-      }
-    </style>
   </head>
 
   <body id="errorPage" class="blockedsite" dir="&locale.dir;">
 
-    <!-- Error Title -->
-    <div id="errorTitle">
-      <h1 id="errorTitleText_phishing" class="errorTitleText">&safeb.blocked.phishingPage.title2;</h1>
-      <h1 id="errorTitleText_malware" class="errorTitleText">&safeb.blocked.malwarePage.title;</h1>
-    </div>
-
     <div id="errorPageContainer">
 
+      <!-- Error Title -->
+      <div id="errorTitle">
+        <h1 id="errorTitleText_phishing" class="errorTitleText">&safeb.blocked.phishingPage.title2;</h1>
+        <h1 id="errorTitleText_malware" class="errorTitleText">&safeb.blocked.malwarePage.title;</h1>
+      </div>
+
       <div id="errorLongContent">
 
         <!-- Short Description -->

diff --git a/mobile/android/chrome/content/netError.xhtml b/mobile/android/chrome/content/netError.xhtml
@@ -24,7 +24,7 @@
     <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" />
     <!-- If the location of the favicon is changed here, the FAVICON_ERRORPAGE_URL symbol in
          toolkit/components/places/src/nsFaviconService.h should be updated. -->
-    <link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://global/skin/icons/warning-64.png"/>
+    <link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://browser/skin/images/errorpage-warning.png"/>
 
     <script type="application/javascript"><![CDATA[
       // Error url MUST be formatted like this:
@@ -330,14 +330,14 @@
       </div>
     </div>
 
-    <!-- Error Title -->
-    <div id="errorTitle">
-      <h1 class="errorTitleText" />
-    </div>
-
     <!-- PAGE CONTAINER (for styling purposes only) -->
     <div id="errorPageContainer">
 
+      <!-- Error Title -->
+      <div id="errorTitle">
+        <h1 class="errorTitleText" />
+      </div>
+
       <!-- LONG CONTENT (the section most likely to require scrolling) -->
       <div id="errorLongContent">
 

diff --git a/mobile/android/themes/core/images/certerror-warning.png b/mobile/android/themes/core/images/certerror-warning.png
diff --git a/mobile/android/themes/core/images/dropmarker-right.svg b/mobile/android/themes/core/images/dropmarker-right.svg
diff --git a/mobile/android/themes/core/images/dropmarker.svg b/mobile/android/themes/core/images/dropmarker.svg
diff --git a/mobile/android/themes/core/images/errorpage-warning.png b/mobile/android/themes/core/images/errorpage-warning.png
diff --git a/mobile/android/themes/core/jar.mn b/mobile/android/themes/core/jar.mn
@@ -37,6 +37,7 @@ chrome.jar:
   skin/images/arrowleft-16.png              (images/arrowleft-16.png)
   skin/images/arrowright-16.png             (images/arrowright-16.png)
   skin/images/arrowdown-16.png              (images/arrowdown-16.png)
+  skin/images/blocked-warning.png           (images/blocked-warning.png)
   skin/images/checkbox_checked.png          (images/checkbox_checked.png)
   skin/images/checkbox_checked_disabled.png (images/checkbox_checked_disabled.png)
   skin/images/checkbox_checked_pressed.png  (images/checkbox_checked_pressed.png)
@@ -46,8 +47,9 @@ chrome.jar:
   skin/images/chevron.png                   (images/chevron.png)
   skin/images/default-app-icon.png          (images/default-app-icon.png)
   skin/images/dropmarker.svg                (images/dropmarker.svg)
+  skin/images/dropmarker-right.svg          (images/dropmarker-right.svg)
   skin/images/errorpage-warning.png         (images/errorpage-warning.png)
-  skin/images/errorpage-warning.png         (images/errorpage-warning.png)
+  skin/images/certerror-warning.png         (images/certerror-warning.png)
   skin/images/errorpage-larry-white.png     (images/errorpage-larry-white.png)
   skin/images/errorpage-larry-black.png     (images/errorpage-larry-black.png)
   skin/images/marketplace-logo.png          (images/marketplace-logo.png)