Bug 729898 - Make better error indicator pages [r=cjones]
authorFabrice Desré <fabrice@mozilla.com>
Thu, 23 Feb 2012 10:38:17 -0800
changeset 90392 9ad5dd5c1dd14e5fe76170db1a53220b57cb025c
parent 90391 7b4a4b236fa8000477372922c9c56cba20f1343c
child 90393 13b571bde26a76a26ea59ae85c661b2f8f32ab53
child 112177 f322d97d334c0003b93679a4943de623383c523a
push id783
push userlsblakk@mozilla.com
push dateTue, 24 Apr 2012 17:33:42 +0000
treeherdermozilla-beta@11faed19f136 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscjones
bugs729898
milestone13.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 729898 - Make better error indicator pages [r=cjones]
b2g/chrome/content/images/errorpage-larry-black.png
b2g/chrome/content/images/errorpage-larry-white.png
b2g/chrome/content/images/errorpage-warning.png
b2g/chrome/content/netError.css
b2g/chrome/content/netError.xhtml
b2g/chrome/jar.mn
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9f2e4a6e7366abd9123ad34ed8d369c387111fee
GIT binary patch
literal 850
zc$@)J1FigtP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!^hrcPRCwC#n(J|+Fc5$tlLAx%>3|YQ
z2c&|K4x9?2tH33Y4t%MAbl`M=J0Kl!=tj;k8cFP~Ry<;MM&myQ^l6`3Dee0{xhYY=
zGeVc@lgtCm_@8rTU?s;}0~W(**8q(DP&1622%RqloL;q?rs??Miykg1^zY{|9*NL$
z7;g*~lR|)h{_Fr&@<&g~WtJWEgC05QcZJ9!26)P(mDy&l_drc*Et$w?(qs7^#_KTN
zEx@4~u00F7h=#|*G`~;{*IS6v=Mi)WaJ8khbO;3IOi5_qdt%`bBDu~0S9x0`f+1E^
zGDqolP7U9!AZvUDJo^{>z#4!*W_@-ACY|W$k2U2prSMpThLybN0tYJUzfW@ot!A{R
z?HHkRpr#vab;h+l>@_&IR2s@w=~bb%^cYwoG%R(yW>ak}TgRi&W(o;f$rgdlN=t3%
z9|F4>zNSIJ{LXiyQBmkh@Z!wxo}Si`Ny8<;YAB;NzLOc>`B56CiD#QE2Dpv@YVO*u
z^}Q{^tGQ=Wz``&;GhIL<<slMmXK^>*!qz_E%Ft-1wJbEiVWBPHc$CP!b>{*uner`n
z-`O{h91<T~z*CcKfP3L4qTeO}zXbzR{m1Mz$MRc24Tw|?+uA&4o`p^x3tWT*M2Zi)
z@}Mvp^N`Lb)(T{3K%9!wSigeqa$3DG7~m5}K%C0Md8EoHNBVhd@!J#S+mK32Fh|>p
z5ZH3ALIzV>$_O>DL@rQpA%i^-4=Mi77PFMd1rnhyM!5ly5gKi-oGp<H6zp2mD-Qy>
z`zeubVp|}VLMHT%M+GpkBcU2AiG@sb;A;?RiTz>;SRlcf8o6%q2tCoxQGG#yo7fwW
z7}u6CCyH`nQ^0+Xt6%z_mh@~2V%*eQ4e(*23HPgjPfQ1Dn*c87@LLz~_}bD^2LqX<
zoTQ{l;W>FoA&vMgNdwjJU2<b`bHGdZu&TwMncoTa;rj&^Ig4<LxSRA2yaVsRJMa#?
cMfoSd04yL1uj;}d)c^nh07*qoM6N<$g2EqxIsgCw
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..fc153c7314e82e12a75ac2589c63db3344a5eb34
GIT binary patch
literal 886
zc$@)t1Bv{JP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#7)eAyRCwC#T8nX`Fc8I=6hH}12c&}F
z4oC$@I&dlosep8VJ0Mqqa}}5l><(}ToJjU&G&%`Mt6d`}yqTR0j*axR`&O&ZY8Zy(
zC*fv>HVa_`u|-YzUD(@P9$w89(y6e6ur(DAtcQI=X)i28bnq<fF$NFI4<|4aa`^ip
zY=dmS683UQ4^I&u@d}+Xg=O#Cpaw0xD+C)V!v8$@WbpPtKscI^RyFr5Y{x*jAxK^u
zYQplA@&p4wL3kuv#-w2#IvCM&AmI`S&pIu+AS3WfMo88Rw*iGiDB)M>`6YJ3p-_|G
zFT$!Tx?0+l7eZ?Dt0VmTQooIb@DAzaP9u-2Ae<=kJKF*TOZY)pEj3J~<Bg-I$8z`H
zvbfP>EIcH`pjO^NVWqIWrmYtKhkmzOX}K=f#u5Gl-gr;037S#Jh4mJ%Rt#Rfh}{~z
zcNegmkythja)u0lQrbx2v(ClCveiT$E*zo;gGOm*t+X@dflU4mwzEEjn}G)hVX4$k
z3ZJRyVIU?6r=aB=o-^fTu9<SnM7CEwXBpULig2lTv<EMzKw#@gHXHa*X!>j$AT8m7
zXucf>=g361)(osme$W!Ob#kxh#$<a&-6jsYbta6}k8BmAZqtB-i1M(Et)Xaf?YuAY
zz=Y_nVN>=?rSNhg(juauB1njnS=v`unWL7DFfcxZTcU(GIS*$8Pi2&O>inqDZHsLC
z^Y=FsYtuWZt0@=wzPlQa%6fa7d>yEhu9i5mZi9GdNnFS{*V3WI|3MR$mFEDZ1QMGJ
zY28-nJt8E}h`p)~4(_OrRK54KPO#^+W7Mr~fGW~8bikgIEyQX>UMP@-47r9)Q`gb4
z=5--lGw2qrVUyNIUB4+IxJ&%+e0*@~mLjB0OG4N0R+dFU%~13NdsvrnFi?w&0t$?8
zd3yM)RC8<YgYr2E>#iX3=r#hv9n7~fYKDFA|1X0?a($R0lru|otYRWefxV?7Tg7%h
zd=dOO!gGamnS9;cp@fr$=eoAEW;jJ$LV6**5MBr`gcrishQ9&~07cZf+~wI#>Hq)$
M07*qoM6N<$f|_oW82|tP
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8bf9d8e7decc3642be80e0d6dc615c2f50f64a79
GIT binary patch
literal 631
zc$@)u0*L*IP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!8A(JzRCwC#o9%6bFc5~J>i=d0kH83w
zzzA$mHYgj=PQVDX6L^GlgN(okG)P8DBRkml;n>NY^h%KkwjZ5+zB?u5vMj|j*-P<c
zCcpwLzyd750-TV&x*n8e$u*}st2Lj0&-&(=#F<d74{TzxW}Wg%BNwohD<bgWtl0v*
zs(wV^(E+>a^k~4<4cJZnBLQm<;MoMU?15Vk*iBRJz_$X`!WqEs1v~`8t~%xltN^f^
zx*UNu0(dsZAsgTZ0ZWpB#RNW>L}G8t*5<sj1hAOEeSqio&bdw<*e6g`SMN+a-)~a}
zo;-j<cLXSa#Q?5>cdXBQLyEvBkA-U>u<a;-fT>zMy=UT&xmyR4l@fSZ1?J1w)&;!V
zq~PHXq~{KSUPfhLSl}9ZZ6L0_?w(uvScIpHq1Td4>K<FV3yqu?Ub?h5V1F#CharW%
zD?ipm<FI-d6FjONkMnvN;Nhykm3<T8SbdC4OBeWBS9$cReH#Ue6SyUS-E!)VXsn3~
z7!#<tRdWCjiNac|Ff6blT-;=G;@Siqs$J7j0&Aj0X~wwluTg*jZV0{Wx<;tRAF;qb
z9mo(3j$lY0z@WfA@nU96rZp1Jp`pNvDWc8>vIkaMK58MrDPKc-Izftus>s(ASH~ke
zy9NA}G1sT-LFp<K%n#Gn5dV&CoJF>u71+roe*q9+0Ty5Z7GMDu;8^x2zyNbwkV-1)
R8RGx|002ovPDHLkV1nb47!m*g
new file mode 100644
--- /dev/null
+++ b/b2g/chrome/content/netError.css
@@ -0,0 +1,127 @@
+/*
+ *  This defines the look-and-feel styling of the error pages.
+ *  (see: netError.xhtml)
+ *
+ *  Original styling by William Price <bugzilla@mob.rice.edu>
+ *  Updated for mobile by: Wes Johnston <wjohnston@mozilla.com>
+ */
+
+body {
+  margin: 0;
+  padding: 0 8px 8px;
+  font-family: "Nokia Sans", Tahoma, sans-serif !important;
+}
+
+h1 {
+  font-size: 22px;
+}
+
+h2 {
+  font-size: 16px;
+}
+
+ul {
+  margin: 0px;
+  padding: 0px 0px 0px 1em;
+}
+
+li {
+  margin: 0px;
+  padding: 8px 0px;
+}
+
+#errorPage {
+  background-color: #CEE6F4;
+}
+
+#errorPage.certerror {
+  background-color: #EFD400;
+}
+
+#errorPage.blockedsite {
+  background-color: #BF0000;
+}
+
+#errorTitle {
+  background: url("chrome://browser/content/images/errorpage-warning.png") left center no-repeat;
+  /* Scaled by .666 of their actual size */
+  background-size: 40px 40px;
+  background-origin: content-box;
+  min-height: 60px;
+  margin-left: auto;
+  margin-right: auto;
+  max-width: 500px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+#errorPage.certerror #errorTitle {
+  background-image: url("chrome://browser/content/images/errorpage-larry-black.png");
+}
+
+#errorPage.blockedsite #errorTitle {
+  background-image: url("chrome://browser/content/images/errorpage-larry-white.png");
+  color: white;
+}
+
+.errorTitleText {
+  padding: 0px 0px 0px 50px;
+  display: inline-block;
+  vertical-align: middle
+}
+
+#errorPageContainer {
+  background-color: white;
+  border: 1px solid #999999;
+  border-radius: 6px;
+  padding: 6px 20px 20px;
+  font-size: 14px;
+  max-width: 500px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+#errorShortDesc > p:empty {
+  display: none;
+}
+
+#errorShortDesc > p {
+  overflow: auto;
+  border-bottom: 1px solid #999999;
+  padding-bottom: 1em;
+}
+
+#errorPage.blockedsite #errorShortDesc > p {
+  font-weight: bold;
+  border-bottom: none;
+  padding-bottom: 0px;
+}
+
+#securityOverrideDiv {
+  padding-top: 10px;
+}
+
+div[collapsed] {
+  padding-left: 15px;
+  background-image: url("chrome://browser/skin/images/arrowright-16.png");
+  background-size: 11px 11px;
+  background-repeat: no-repeat;
+  background-position: left 0.3em;  
+}
+
+div[collapsed="true"] {
+  background-image: url("chrome://browser/skin/images/arrowright-16.png");
+}
+
+div[collapsed="false"] {
+  background-image: url("chrome://browser/skin/images/arrowdown-16.png");
+}
+
+div[collapsed="true"] > p,
+div[collapsed="true"] > div {
+  display: none;
+}
+
+button {
+  padding: 0.3em !important;
+}
--- a/b2g/chrome/content/netError.xhtml
+++ b/b2g/chrome/content/netError.xhtml
@@ -299,30 +299,30 @@
       function endsWith(haystack, needle) {
         return haystack.slice(-needle.length) == needle;
       }
 
     ]]></script>
   </head>
 
   <body id="errorPage" dir="&locale.dir;">
-
     <!-- ERROR ITEM CONTAINER (removed during loading to avoid bug 39098) -->
     <div id="errorContainer">
       <div id="errorTitlesContainer">
         <h1 id="et_generic">&generic.title;</h1>
         <h1 id="et_dnsNotFound">&dnsNotFound.title;</h1>
         <h1 id="et_fileNotFound">&fileNotFound.title;</h1>
         <h1 id="et_malformedURI">&malformedURI.title;</h1>
         <h1 id="et_protocolNotFound">&protocolNotFound.title;</h1>
         <h1 id="et_connectionFailure">&connectionFailure.title;</h1>
         <h1 id="et_netTimeout">&netTimeout.title;</h1>
         <h1 id="et_redirectLoop">&redirectLoop.title;</h1>
         <h1 id="et_unknownSocketType">&unknownSocketType.title;</h1>
         <h1 id="et_netReset">&netReset.title;</h1>
+        <h1 id="et_notCached">&notCached.title;</h1>
         <h1 id="et_netOffline">&netOffline.title;</h1>
         <h1 id="et_netInterrupt">&netInterrupt.title;</h1>
         <h1 id="et_deniedPortAccess">&deniedPortAccess.title;</h1>
         <h1 id="et_proxyResolveFailure">&proxyResolveFailure.title;</h1>
         <h1 id="et_proxyConnectFailure">&proxyConnectFailure.title;</h1>
         <h1 id="et_contentEncodingError">&contentEncodingError.title;</h1>
         <h1 id="et_unsafeContentType">&unsafeContentType.title;</h1>
         <h1 id="et_nssFailure2">&nssFailure2.title;</h1>
@@ -337,16 +337,17 @@
         <div id="ed_fileNotFound">&fileNotFound.longDesc;</div>
         <div id="ed_malformedURI">&malformedURI.longDesc;</div>
         <div id="ed_protocolNotFound">&protocolNotFound.longDesc;</div>
         <div id="ed_connectionFailure">&connectionFailure.longDesc;</div>
         <div id="ed_netTimeout">&netTimeout.longDesc;</div>
         <div id="ed_redirectLoop">&redirectLoop.longDesc;</div>
         <div id="ed_unknownSocketType">&unknownSocketType.longDesc;</div>
         <div id="ed_netReset">&netReset.longDesc;</div>
+        <div id="ed_notCached">&notCached.longDesc;</div>
         <div id="ed_netOffline">&netOffline.longDesc2;</div>
         <div id="ed_netInterrupt">&netInterrupt.longDesc;</div>
         <div id="ed_deniedPortAccess">&deniedPortAccess.longDesc;</div>
         <div id="ed_proxyResolveFailure">&proxyResolveFailure.longDesc2;</div>
         <div id="ed_proxyConnectFailure">&proxyConnectFailure.longDesc;</div>
         <div id="ed_contentEncodingError">&contentEncodingError.longDesc;</div>
         <div id="ed_unsafeContentType">&unsafeContentType.longDesc;</div>
         <div id="ed_nssFailure2">&nssFailure2.longDesc;</div>
--- a/b2g/chrome/jar.mn
+++ b/b2g/chrome/jar.mn
@@ -10,9 +10,14 @@ chrome.jar:
   content/touch.js                      (content/touch.js)
 #endif
   content/commandUtil.js                (content/commandUtil.js)
   content/httpd.js                      (content/httpd.js)
   content/webapi.js                     (content/webapi.js)
   content/content.css                   (content/content.css)
 
 % override chrome://global/content/netError.xhtml chrome://browser/content/netError.xhtml
+% override chrome://global/skin/netError.css chrome://browser/content/netError.css
   content/netError.xhtml                (content/netError.xhtml)
+  content/netError.css                  (content/netError.css)
+  content/images/errorpage-larry-black.png (content/images/errorpage-larry-black.png)
+  content/images/errorpage-larry-white.png (content/images/errorpage-larry-white.png)
+  content/images/errorpage-warning.png (content/images/errorpage-warning.png)
\ No newline at end of file