Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site
In directory
james.mmbase.org:/tmp/cvs-serv25983/cmsc/sitemanagement/src/webapp/editors/site
Modified Files:
Tag: b1_4
pageediting.jsp portalcontrols.js.jsp
Log Message:
CMSC-764 solved, old selector back instead of new tabs
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site
See also: http://www.mmbase.org/jira/browse/CMSC-764
Index: pageediting.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/pageediting.jsp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- pageediting.jsp 15 Nov 2007 07:06:44 -0000 1.2
+++ pageediting.jsp 6 Feb 2008 16:51:27 -0000 1.2.2.1
@@ -3,6 +3,9 @@
<html>
+ <head>
+ <title><fmt:message key="site.title" /></title>
+ <script type="text/javascript"
src="portalcontrols.js.jsp"></script>
<script type="text/javascript">
function preview() {
var contentLocation = this.frames["pcontent"].location.href;
@@ -39,11 +42,20 @@
</c:if>
}
</script>
+ </head>
<c:set
var="str">${requestScope.toolbar}?number=${requestScope.nodeId}&pagepath=${requestScope.pathofpage}</c:set>
+<frameset rows="*" framespacing="0" border="0">
+ <%--
<frameset rows="35,*" framespacing="0" border="0">
+ CMSC-764, disabled this, because we do not want these tabs yet
+
<frame frameborder="0" src="${str}" name="toolbar" scrolling="no"/>
<frame frameborder="0" src="${requestScope.pathofpage}"
onload="reload()" name="pcontent"/>
+
+
+ --%>
+ <frame frameborder="0" src="${requestScope.pathofpage}"
onload="frameLoaded()" name="pcontent"/>
</frameset>
</html>
\ No newline at end of file
Index: portalcontrols.js.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/portalcontrols.js.jsp,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -b -r1.2 -r1.2.6.1
--- portalcontrols.js.jsp 7 Mar 2007 19:33:50 -0000 1.2
+++ portalcontrols.js.jsp 6 Feb 2008 16:51:27 -0000 1.2.6.1
@@ -6,16 +6,16 @@
function frameLoaded() {
if (isPortalPage()) {
- insertHTMLBeforeEnd( getBodyElement( getDocument('content') ),
getPageControls());
+ insertHTMLBeforeEnd( getBodyElement( getDocument('pcontent') ),
getPageControls());
var jslocation = document.location.href;
- jslocation = jslocation.replace('index.jsp',
'portaledit.js.jsp');
- createJavascript( getDocument('content'), jslocation);
+ jslocation = jslocation.replace('NavigatorPanel.do',
'portaledit.js.jsp');
+ createJavascript( getDocument('pcontent'), jslocation);
}
}
function isPortalPage() {
- var location = frames['content'].location.href;
+ var location = frames['pcontent'].location.href;
return (location.indexOf('/editors/') < 0 &&
location.indexOf('/mmbase/') < 0);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
