Author: ktlili
Date: Wed Sep 19 17:24:57 2007
New Revision: 18564
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18564&repname=
=3Djahia
Log:
- fix JAHIA-2300:display of engines containing sitemaps is broken.
--> disable auto resize page body for workflow
Modified:
trunk/core/src/webapp/jsp/jahia/engines/engine.jsp
trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/cTree.css
Modified: trunk/core/src/webapp/jsp/jahia/engines/engine.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/engine.jsp&rev=3D18564&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
--- trunk/core/src/webapp/jsp/jahia/engines/engine.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/engine.jsp Wed Sep 19 17:24:57 =
2007
@@ -346,13 +346,38 @@
}
}
}
- <% if (results !=3D null) { %>
- window.onunload =3D null;
- <% } else { %>
- window.onunload =3D closeTheWindow;
- <% } %>
+ // 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 || documen=
t.body.clientHeight )) {
+ //IE 4 compatible
+ myWidth =3D document.body.clientWidth;
+ myHeight =3D document.body.clientHeight;
+ }
+
+ // resize
+ var pageBodyEle =3D document.getElementById('pagebody<%=3D(results=
!=3D null ? "ReadOnly" : "")%>');
+ var pageBodyEleHeight =3D pageBodyEle.offsetHeight;
+ var newHeight =3D (myHeight - 130);
+ if (newHeight > pageBodyEleHeight) {
+ pageBodyEle.style.height =3D (myHeight - 130) + "px";
+ }
+ }
=
Event.observe(window, 'load', handleOnLoad);
+ <%
+ // javascript method "resizePageBody" doesn't work with ajax call becau=
se we didn't know pageBodyEle size
+ if (!"advworkflow".equals(jspSource)){ %>
+ Event.observe(window, 'load', resizePagebody);
+ <% } %>
</script>
=
</head>
@@ -407,6 +432,7 @@
=
</div><!-- end pagebody -->
<div id=3D"footer<%=3D(results !=3D null ? "ReadOnly" : "")%>"><!-=
- footer -->
+ <div class=3D"clearing"></div>
<div id=3D"copyright<%=3D(results !=3D null ? "ReadOnly" : "")%>">=
<%=3DJahia.COPYRIGHT%> <jahia:engineResourceBundle
resourceName=3D"org.jahia.Jahia.copyright.label"/></div>
<span class=3D"version">Jahia <%=3DJahia.VERSION%>.<%=3DJahia.PATC=
H_NUMBER%> r<%=3DJahia.BUILD_NUMBER%></span>
Modified: trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/cTr=
ee.css
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/javascript/zimbra/complexTree/cTree.css&rev=3D18564&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
--- trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/cTree.css=
(original)
+++ trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/cTree.css=
Wed Sep 19 17:24:57 2007
@@ -76,6 +76,8 @@
margin-top: 20px;
border: 1px black solid;
text-align: left;
+ display: block;
+ overflow: hidden;
}
=
.complextreediv,
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
