ktlili 2005/11/08 09:09:53 CET
Modified files:
core/src/webapp/jsp/clipbuilder/html/actions browseAction.jsp
editAction.jsp
previewAction.jsp
Log:
- fix/repair iframe render bug whith modzilla
Revision Changes Path
1.7 +1 -1
jahia/core/src/webapp/jsp/clipbuilder/html/actions/browseAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/clipbuilder/html/actions/browseAction.jsp.diff?r1=1.6&r2=1.7&f=h
1.5 +6 -3
jahia/core/src/webapp/jsp/clipbuilder/html/actions/editAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/clipbuilder/html/actions/editAction.jsp.diff?r1=1.4&r2=1.5&f=h
1.4 +3 -1
jahia/core/src/webapp/jsp/clipbuilder/html/actions/previewAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/clipbuilder/html/actions/previewAction.jsp.diff?r1=1.3&r2=1.4&f=h
Index: browseAction.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/html/actions/browseAction.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- browseAction.jsp 7 Nov 2005 17:02:49 -0000 1.6
+++ browseAction.jsp 8 Nov 2005 08:09:53 -0000 1.7
@@ -148,7 +148,7 @@
</tbody>
</table>
<table width="100%">
- <iframe id="clip_builder"
src="<%=response.encodeURL(request.getContextPath()+"/webBrowser.do")%>"
width="100%" height="375" frameborder="1" scrolling="auto"></iframe>
+ <iframe id="clip_builder"
src="<%=response.encodeURL(request.getContextPath()+"/webBrowser.do")%>"
width="100%" height="375" frameborder="1" scrolling="auto"></iframe>
</table>
</html:form>
</table>
Index: editAction.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/html/actions/editAction.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- editAction.jsp 7 Nov 2005 15:18:53 -0000 1.4
+++ editAction.jsp 8 Nov 2005 08:09:53 -0000 1.5
@@ -43,7 +43,7 @@
</td>
<!-- Help -->
<td class="boxtitleborder1" width="10%">
- <a
href="popitup('<%=response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/editHelp.jsp")%>')">
+ <a
href="javascript:popitup('<%=response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/editHelp.jsp")%>')">
<bean:message key="wizard.help"/>
</a>
</td>
@@ -220,7 +220,10 @@
</logic:messagesNotPresent>
</table>
-</html:form></table><!-- HTML part -->
<logic:messagesNotPresent>
- <iframe
src="<%=response.encodeURL(request.getContextPath()+"/webBrowser.do")%>"
width="100%" height="100%" frameborder="1" scrolling="auto"> </iframe>
+ <table width="100%">
+ <iframe id="clip_builder"
src="<%=response.encodeURL(request.getContextPath()+"/webBrowser.do")%>"
width="100%" height="375" frameborder="1" scrolling="auto"></iframe>
+ </table>
</logic:messagesNotPresent>
+</html:form></table><!-- HTML part -->
+
Index: previewAction.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/html/actions/previewAction.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- previewAction.jsp 7 Nov 2005 15:18:53 -0000 1.3
+++ previewAction.jsp 8 Nov 2005 08:09:53 -0000 1.4
@@ -35,7 +35,9 @@
</td>
</tr>
</table>
+ <table width="100%">
+ <iframe id="clip_builder"
src="<%=response.encodeURL(request.getContextPath()+"/webBrowser.do")%>"
width="100%" height="375" frameborder="1" scrolling="auto"></iframe>
+ </table>
</html:form>
<!-- HTML page -->
</table>
-<iframe id='webclipperbuilder'
src="<%=response.encodeURL(request.getContextPath()+"/webBrowser.do")%>"
width="100%" height="100%" frameborder="1" scrolling="auto"></iframe>
