Author: ktlili
Date: Tue Aug 28 18:03:39 2007
New Revision: 18286
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18286&repname=
=3Djahia
Log:
- undo fix (engine.jsp) due to jsp-uncoding
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/engine.j=
sp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/en=
gine.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/engine.jsp&rev=3D18286&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/engine.j=
sp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/engine.j=
sp Tue Aug 28 18:03:39 2007
@@ -1,4 +1,4 @@
-=C3=AF=C2=BB=C2=BF<%--
+<%--
Copyright 2002-2006 Jahia Ltd
=
Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
@@ -14,7 +14,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
---%><%@ page language=3D"java" contentType=3D"text/html;charset=3DUTF-8"
+--%><%@ page language=3D"java" contentType=3D"text/html;charset=3DUTF-8" =
%><?xml version=3D"1.0" encoding=3D"utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
@@ -43,7 +43,7 @@
=
// include pages
private static final Properties includes =3D new Properties();
-
+ =
static {
// shared jsp
includes.setProperty("close", "/jsp/jahi=
a/engines/shared/close.jsp");
@@ -300,7 +300,7 @@
window.close();
setTimeout("checkParent()", checkParentTimeOut);
}
-
+ =
var sendKeepAliveTimeOut =3D <%=3D session.getMaxInactiveInterval() * =
1000 / 2 %>;
function sendKeepAlive() {
new Ajax.Request('<%=3D request.getContextPath() + "/jsp/keepAlive=
.jsp" %>', {
@@ -316,14 +316,14 @@
setTimeout("sendKeepAlive()", sendKeepAliveTimeOut);
=
function handleOnLoad() {
- if (workInProgress && !workInProgress.closed) workInProgress.clo=
se();
+ if (workInProgress && !workInProgress.closed) workInProgress.clo=
se(); =
setTimeout("checkParent()", checkParentTimeOut);
engineCustomHandleOnLoad();
}
-
-
+ =
+ =
function engineCustomHandleOnLoad(){
- // should be overriden by sub engine for specific onload code
+ // should be overriden by sub engine for specific onload code =
}
=
function closeTheWindow() {
@@ -346,29 +346,6 @@
}
}
}
-
- // resize pageBody
- function resizePagebody() {
- var myWidth =3D 0, myHeight =3D 0;
- if (typeof( window.innerWidth ) =3D=3D 'number') {
- //Non-IE
- myWidth =3D window.innerWidth;
- myHeight =3D window.innerHeight;
- } else if (document.documentElement && ( document.documentElement.=
clientWidth || document.documentElement.clientHeight )) {
- //IE 6+ in 'standards compliant mode'
- myWidth =3D document.documentElement.clientWidth;
- myHeight =3D document.documentElement.clientHeight;
- } else if (document.body && ( document.body.clientWidth || document.b=
ody.clientHeight )) {
- //IE 4 compatible
- myWidth =3D document.body.clientWidth;
- myHeight =3D document.body.clientHeight;
- }
-
- // resize
- document.getElementById('pagebody<%=3D(results !=3D null ? "ReadOn=
ly" : "")%>').style.height =3D (myHeight-120)+"px";
-
- }
-
<% if (results !=3D null) { %>
window.onunload =3D null;
<% } else { %>
@@ -416,9 +393,6 @@
</span>
</div><!-- end header -->
<div id=3D"pagebody<%=3D(results !=3D null ? "ReadOnly" : "")%>"><=
!-- pagebody -->
- <script type=3D"text/javascript">
- resizePagebody();
- </script>
<input type=3D"hidden" name=3D"screen" value=3D"save"/> <!-- =
Default value in case of a form.submit() -->
<input type=3D"hidden" name=3D"lastscreen" value=3D"<%=3DtheSc=
reen%>"/>
<!-- include page starts -->
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
