Author: bpapez
Date: Mon Oct 1 15:55:30 2007
New Revision: 18713
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18713&repname=
=3Djahia
Log:
http://www.jahia.net/jira/browse/JAHIA-2424: SP3: bad HTML on 403 error - b=
ottom right part of table
Refactored CSS - border is now defined on table element and not on the tabl=
e-cell
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/css/erro=
r.css
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_400=
.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_403=
.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_403=
_forbidden.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_404=
.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_503=
.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/maintenan=
ce.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/cs=
s/error.css
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/css/error.css&rev=3D18713&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/css/erro=
r.css (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/css/erro=
r.css Mon Oct 1 15:55:30 2007
@@ -11,7 +11,10 @@
text-decoration: none;
color: #006699;
}
-.boxtitlecolor1 {
+.errorbox {
+ border: 1px solid #A8A8A8;
+}
+.boxtitle {
color: #ffffff;
background-color: #006699;
padding-left: 5px;
@@ -20,35 +23,8 @@
padding-bottom: 2px;
white-space: nowrap;
}
-.boxcontentcolor2 {
- font-family: Arial, Helvetica, sans-serif;
- border-left: 1px solid #A8A8A8;
- border-right: 1px solid #A8A8A8;
- border-bottom: 1px solid #A8A8A8;
- padding: 5px;
- color: #666666;
- background-color: #E7E7E7;
-}
-.boxcontentcolor3 {
- font-family: Arial, Helvetica, sans-serif;
- border-left: 1px solid #A8A8A8;
- border-right: 1px solid #A8A8A8;
- padding: 5px;
- color: #666666;
- background-color: #E7E7E7;
-}
-.boxcontentcolorLeft {
- font-family: Arial, Helvetica, sans-serif;
- border-left: 1px solid #A8A8A8;
- border-bottom: 1px solid #A8A8A8;
- padding: 5px;
- color: #666666;
- background-color: #E7E7E7;
-}
-.boxcontentcolorRight {
+.boxcontent {
font-family: Arial, Helvetica, sans-serif;
- border-right: 1px solid #A8A8A8;
- border-bottom: 1px solid #A8A8A8;
padding: 5px;
color: #666666;
background-color: #E7E7E7;
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/err=
or.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/errors/error.jsp&rev=3D18713&repname=3Dja=
hia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error.jsp=
(original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error.jsp=
Mon Oct 1 15:55:30 2007
@@ -75,12 +75,12 @@
=
<br/><br/><br/>
=
-<table align=3D"center" width=3D"530" height=3D"63" border=3D"0" cellspaci=
ng=3D"0" cellpadding=3D"0">
+<table class=3D"errorbox" align=3D"center" width=3D"530" height=3D"63" bor=
der=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>
- <td class=3D"boxtitlecolor1"><jahia:engineResourceBundle resourceName=
=3D"org.jahia.bin.JahiaErrorDisplay.errorPage.label"/></td>
+ <td class=3D"boxtitle"><jahia:engineResourceBundle resourceName=3D"org=
.jahia.bin.JahiaErrorDisplay.errorPage.label"/></td>
</tr>
<tr>
- <td class=3D"boxcontentcolor2">
+ <td class=3D"boxcontent">
<p class=3D"bold">
<%
if (isWarning) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/err=
or_400.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/errors/error_400.jsp&rev=3D18713&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_400=
.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_400=
.jsp Mon Oct 1 15:55:30 2007
@@ -30,12 +30,12 @@
=
<br/><br/><br/>
=
-<table align=3D"center" width=3D"530" height=3D"63" border=3D"0" cellspaci=
ng=3D"0" cellpadding=3D"0">
+<table class=3D"errorbox" align=3D"center" width=3D"530" height=3D"63" bor=
der=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>
- <td class=3D"boxtitlecolor1"><jahia:engineResourceBundle resourceName=
=3D"org.jahia.bin.JahiaErrorDisplay.error.label"/></td>
+ <td class=3D"boxtitle"><jahia:engineResourceBundle resourceName=3D"org=
.jahia.bin.JahiaErrorDisplay.error.label"/></td>
</tr>
<tr>
- <td class=3D"boxcontentcolor2">
+ <td class=3D"boxcontent">
<jahia:engineResourceBundle resourceName=3D"org.jahia.bin.JahiaError=
Display.errorOccured.label"/><br/>
<br/>
<span class=3D"bold"><jahia:engineResourceBundle resourceName=3D"o=
rg.jahia.bin.JahiaErrorDisplay.virtualSiteError.label"/></span><br/>
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/err=
or_403.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/errors/error_403.jsp&rev=3D18713&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_403=
.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_403=
.jsp Mon Oct 1 15:55:30 2007
@@ -85,13 +85,13 @@
</p> =
<% =
} else { %>
-<table align=3D"center" width=3D"530" height=3D"63" border=3D"0" cellspaci=
ng=3D"0" cellpadding=3D"0">
+<table class=3D"errorbox" align=3D"center" width=3D"530" height=3D"63" bor=
der=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>
- <td colspan=3D"2" class=3D"boxtitlecolor1"><jahia:engineResourceBu=
ndle
+ <td colspan=3D"2" class=3D"boxtitle"><jahia:engineResourceBundle
resourceName=3D"org.jahia.bin.JahiaErrorDisplay.errorPage.=
label"/></td>
</tr>
<tr>
- <td colspan=3D"2" class=3D"boxcontentcolor3">
+ <td colspan=3D"2" class=3D"boxcontent">
<p class=3D"bold"><jahia:engineResourceBundle
resourceName=3D"org.jahia.bin.JahiaErrorDisplay.error4=
03.label"/></p>
=
@@ -111,7 +111,7 @@
</td>
</tr>
<tr >
- <td align=3D"left" class=3D"boxcontentcolorLeft">
+ <td align=3D"left" class=3D"boxcontent">
<% if (isGuest) { %>
<a href=3D"javascript:EnginePopup('login')" class=3D"bold"><ja=
hia:engineResourceBundle
resourceName=3D"org.jahia.bin.JahiaErrorDisplay.login.=
label"/></a>
@@ -120,7 +120,7 @@
resourceName=3D"org.jahia.bin.JahiaErrorDisplay.logout=
.label"/></a>
<% } %>
</td>
- <td align=3D"right" class=3D"boxcontentcolorRight">
+ <td align=3D"right" class=3D"boxcontent">
<script language=3D"Javascript" type=3D"text/JavaScript">
<!--
if (window.opener !=3D null) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/err=
or_403_forbidden.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/errors/error_403_forbidden.jsp&rev=3D1871=
3&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_403=
_forbidden.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_403=
_forbidden.jsp Mon Oct 1 15:55:30 2007
@@ -58,13 +58,13 @@
%>
<body>
<br/><br/><br/>
-<table align=3D"center" width=3D"530" height=3D"63" border=3D"0" cellspaci=
ng=3D"0" cellpadding=3D"0">
+<table class=3D"errorbox" align=3D"center" width=3D"530" height=3D"63" bor=
der=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>
- <td colspan=3D"2" class=3D"boxtitlecolor1"><jahia:engineResourceBu=
ndle
+ <td colspan=3D"2" class=3D"boxtitle"><jahia:engineResourceBundle
resourceName=3D"org.jahia.bin.JahiaErrorDisplay.errorPage.=
label"/></td>
</tr>
<tr>
- <td colspan=3D"2" class=3D"boxcontentcolor3">
+ <td colspan=3D"2" class=3D"boxcontent">
<p class=3D"bold"><jahia:engineResourceBundle
resourceName=3D"org.jahia.bin.JahiaErrorDisplay.error4=
03.label"/></p>
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/err=
or_404.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/errors/error_404.jsp&rev=3D18713&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_404=
.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_404=
.jsp Mon Oct 1 15:55:30 2007
@@ -37,12 +37,12 @@
=
<br/><br/><br/>
=
-<table align=3D"center" width=3D"530" height=3D"63" border=3D"0" cellspaci=
ng=3D"0" cellpadding=3D"0">
+<table class=3D"errorbox" align=3D"center" width=3D"530" height=3D"63" bor=
der=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>
- <td class=3D"boxtitlecolor1"><jahia:engineResourceBundle resourceName=
=3D"org.jahia.bin.JahiaErrorDisplay.errorPage.label"/></td>
+ <td class=3D"boxtitle"><jahia:engineResourceBundle resourceName=3D"org=
.jahia.bin.JahiaErrorDisplay.errorPage.label"/></td>
</tr>
<tr>
- <td class=3D"boxcontentcolor2">
+ <td class=3D"boxcontent">
<p class=3D"bold"><jahia:engineResourceBundle resourceName=3D"org.=
jahia.bin.JahiaErrorDisplay.pageNotFound.label"/></p>
<p><jahia:engineResourceBundle resourceName=3D"org.jahia.bin.Jahia=
ErrorDisplay.fileNotFound.label"/></p>
<p><jahia:engineResourceBundle resourceName=3D"org.jahia.bin.Jahia=
ErrorDisplay.clickHere1stPart.label"/> <a href=3D"javascript:history.b=
ack()"><jahia:engineResourceBundle resourceName=3D"org.jahia.bin.JahiaError=
Display.clickHere2ndPartLink.label"/></a> <jahia:engineResourceBundle =
resourceName=3D"org.jahia.bin.JahiaErrorDisplay.clickHere3rdPart.label"/>.<=
/p>
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/err=
or_503.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/errors/error_503.jsp&rev=3D18713&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_503=
.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_503=
.jsp Mon Oct 1 15:55:30 2007
@@ -69,12 +69,12 @@
<%} else { %>
<br/><br/><br/>
=
-<table align=3D"center" width=3D"530" height=3D"63" border=3D"0" cellspaci=
ng=3D"0" cellpadding=3D"0">
+<table class=3D"errorbox" align=3D"center" width=3D"530" height=3D"63" bor=
der=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>
- <td class=3D"boxtitlecolor1"><jahia:engineResourceBundle resourceName=
=3D"org.jahia.bin.JahiaErrorDisplay.errorPage.label"/></td>
+ <td class=3D"boxtitle"><jahia:engineResourceBundle resourceName=3D"org=
.jahia.bin.JahiaErrorDisplay.errorPage.label"/></td>
</tr>
<tr>
- <td class=3D"boxcontentcolor2">
+ <td class=3D"boxcontent">
<p class=3D"bold"><jahia:engineResourceBundle resourceName=3D"org.=
jahia.bin.JahiaErrorDisplay.serviceUnavailable.label"/>
<%
String retryInMessage =3D "";
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/mai=
ntenance.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/errors/maintenance.jsp&rev=3D18713&repnam=
e=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/maintenan=
ce.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/maintenan=
ce.jsp Mon Oct 1 15:55:30 2007
@@ -30,12 +30,12 @@
=
<br/><br/><br/>
=
-<table align=3D"center" width=3D"530" height=3D"63" border=3D"0" cellspaci=
ng=3D"0" cellpadding=3D"0">
+<table class=3D"errorbox" align=3D"center" width=3D"530" height=3D"63" bor=
der=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>
- <td class=3D"boxtitlecolor1"><jahia:engineResourceBundle resourceName=
=3D"org.jahia.bin.JahiaErrorDisplay.error.label"/></td>
+ <td class=3D"boxtitle"><jahia:engineResourceBundle resourceName=3D"org=
.jahia.bin.JahiaErrorDisplay.error.label"/></td>
</tr>
<tr>
- <td class=3D"boxcontentcolor2">
+ <td class=3D"boxcontent">
<br/>
<span class=3D"bold"><jahia:engineResourceBundle resourceName=3D"o=
rg.jahia.bin.Jahia.maintenance"/></span><br/>
<br/>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
