Author: pvollenweider
Date: Tue Oct 2 11:14:01 2007
New Revision: 18722
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18722&repname=
=3Djahia
Log:
Add servletPath in the 403 error page to prevent a 404 when the login popup=
is clicked
Modified:
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_inc=
lude.js
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=3D18722&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 Tue Oct 2 11:14:01 2007
@@ -113,7 +113,7 @@
<tr >
<td align=3D"left" class=3D"boxcontent">
<% if (isGuest) { %>
- <a href=3D"javascript:EnginePopup('login')" class=3D"bold"><ja=
hia:engineResourceBundle
+ <a href=3D"javascript:EnginePopup('<%=3DJahia.getServletPath()=
%>','login')" class=3D"bold"><jahia:engineResourceBundle
resourceName=3D"org.jahia.bin.JahiaErrorDisplay.login.=
label"/></a>
<% } else { %>
<a href=3D"<%=3D request.getContextPath() + "/jsp/logout.jsp" =
%>" class=3D"bold"><jahia:engineResourceBundle
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/err=
or_include.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/errors/error_include.js&rev=3D18722&repna=
me=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_inc=
lude.js (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_inc=
lude.js Tue Oct 2 11:14:01 2007
@@ -1,5 +1,5 @@
=
- function EnginePopup( engineName )
+ function EnginePopup(contextPath, engineName )
{
var oldurl =3D location.href;
var stringA =3D "engineName/";
@@ -27,8 +27,11 @@
if (posB !=3D -1) {
oldurl =3D oldurl.substring( 0, posB ) +"/engineName/" + e=
ngineName + oldurl.substring( posB, oldurl.length );
} else {
-
+ if (oldurl.indexOf( contextPath ) !=3D -1) {
oldurl =3D oldurl + "/engineName/" + engineName;
+ } else {
+ oldurl =3D oldurl + contextPath + "/engineName/" +
engineNam=
e;
+ }
}
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
