Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site
In directory james.mmbase.org:/tmp/cvs-serv15541/src/webapp/editors/site
Modified Files:
pageediting.jsp
Log Message:
CMSC-752 make the page iframe could show corretly in each kinds of screen.
make the site create turn to the new editpage too.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site
See also: http://www.mmbase.org/jira/browse/CMSC-752
Index: pageediting.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/pageediting.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- pageediting.jsp 27 May 2008 08:21:31 -0000 1.5
+++ pageediting.jsp 28 May 2008 09:02:30 -0000 1.6
@@ -3,7 +3,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ page
import="net.sf.mmapps.modules.cloudprovider.*,org.mmbase.bridge.Cloud,org.mmbase.bridge.Node,java.util.*,net.sf.mmapps.commons.util.StringUtil;"
%>
<mm:content type="text/html" encoding="UTF-8" expires="0">
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+
<html:html xhtml="true">
<cmscedit:head title="toolbar.title">
<link href="../css/toolbar.css" rel="stylesheet" type="text/css"/>
@@ -51,7 +51,7 @@
if (window.top.bottompane.oldChannelsCols) {
var oldChannelsCols = window.top.bottompane.oldChannelsCols;
var channelsCols = window.top.bottompane.document.body.cols;
- element.value = "<fmt:message key="toolbar.hidetree" />";
+ element.value = "<fmt:message key="toolbar.showtree" />";
window.top.bottompane.oldChannelsCols = channelsCols;
window.top.bottompane.document.body.cols = oldChannelsCols;
}
@@ -109,6 +109,7 @@
vertical-align:middle;
font:14px bold;
float:left;
+ text-align:left;
}
#alertRt{
width:12px;
@@ -119,7 +120,10 @@
-->
</style>
<body onLoad="refreshTreeTab();">
- <div class="tabs" style="width:70%">
+ <table style="width:100%; height:100%;" cellpadding="0"
cellspacing="0" border="0">
+ <tr style="height:35px;">
+ <td style="width:60%;">
+ <div class="tabs" style="width:100%;">
<div ${'edit' eq sessionScope.pageMode ? 'class="tab_active"' :
'class="tab"'} >
<div class="body">
<div>
@@ -139,29 +143,37 @@
</div>
</div>
</div>
-
- <div style="width:30%;float:right;height:35px; background:
url(<cmsc:staticurl page='/editors/gfx/edit_shadow.gif'/>) repeat-x;">
- <input type="checkbox" name="treevisable" id="treevisable"
value="<fmt:message key='toolbar.showtree'/>" checked onChange="return
switchChannelPanel(this);">
+ </td>
+ <td style="width:40%; vertical-align:middle; text-align:right;
background:url(<cmsc:staticurl page='/editors/gfx/edit_shadow.gif'/>)
repeat-x;">
+ <input type="checkbox" name="treevisable" id="treevisable"
value="<fmt:message key='toolbar.showtree'/>" checked onClick="return
switchChannelPanel(this);">
<fmt:message key="toolbar.showtree" />
</input>
<mm:cloud jspvar="cloud" loginpage="../../editors/login.jsp">
<mm:hasrank minvalue="administrator">
<mm:haspage page="/editors/workflow/">
<fmt:bundle basename="cmsc-workflow">
- <input name="finish" type="button" value="<fmt:message
key='workflow.action.finish'/>" onClick="setPublishAction('finish')" />
- <input name="accept" type="button" value="<fmt:message
key='workflow.action.accept'/>" onClick="setPublishAction('accept');" />
- <input name="publish" type="button" value="<fmt:message
key='workflow.action.publish'/>" onClick="setPublishAction('publish');" />
+ <input name="finish" type="button"
value="<fmt:message key='workflow.action.finish'/>"
onClick="setPublishAction('finish')" style="margin-top:5px; display:inline; "/>
+ <input name="accept" type="button"
value="<fmt:message key='workflow.action.accept'/>"
onClick="setPublishAction('accept');" style="margin-top:5px; display:inline; "/>
+ <input name="publish" type="button"
value="<fmt:message key='workflow.action.publish'/>"
onClick="setPublishAction('publish');" style="margin-top:5px; display:inline;
"/>
</fmt:bundle>
</mm:haspage>
</mm:hasrank>
</mm:cloud>
- </div>
+
<div id="alertMain" style="visibility:hidden;">
<div id="alertLf" onClick="closeAlert();"> </div>
<div id="divResult" onClick="closeAlert();"> </div>
<div id="alertRt" onClick="closeAlert();"> </div>
</div>
- <iframe src="${requestScope.pathofpage}" onload="loadPreview()"
name="pcontent" frameborder="0" width="100%" height="445px"></iframe>
+ </td>
+ </tr>
+
+ <tr>
+ <td style="width:100%;" colspan="2">
+ <iframe src="${requestScope.pathofpage}"
onload="loadPreview()" name="pcontent" id="pcontent" frameborder="0"
style="width:100%;height:100%;"/>
+ </td>
+ </tr>
+ </table>
</body>
</html:html>
</mm:content>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
