Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site
In directory
james.mmbase.org:/tmp/cvs-serv11383/cmsc/sitemanagement/src/webapp/editors/site
Modified Files:
Tag: b1_6
portaledit.css portletediting.js.jsp
Log Message:
CMSC-1322 Removed any customer style from the portal edit iframe (edit defaults)
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site
See also: http://www.mmbase.org/jira/browse/CMSC-1322
Index: portaledit.css
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/portaledit.css,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -b -r1.11 -r1.11.2.1
--- portaledit.css 9 Feb 2009 15:04:49 - 1.11
+++ portaledit.css 8 Apr 2009 08:22:23 - 1.11.2.1
@@ -1,3 +1,21 @@
+...@media screen {
+
+ /***
+* Edit defaults window
+
***/
+
+body.portletedit { color: #000; font: 0.75em/1.5em Arial, Helvetica,
sans-serif; margin: 0; padding: 0; text-align: center; }
+body.portletedit .clear { clear: both; }
+body.portletedit .hidden { display: none; }
+body.portletedit a { color: #777; text-decoration: none; }
+body.portletedit a:hover { text-decoration: underline; }
+body.portletedit a img { border: 0; }
+body.portletedit .list .content { display: block; float: left; width:
415px; }
+body.portletedit .list li { list-style: none; }
+}
+
+/* Specific Portal Editing section */
+
.portalcontrols {
position:fixed;
top: 2px;
Index: portletediting.js.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/portletediting.js.jsp,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -b -r1.10 -r1.10.2.1
--- portletediting.js.jsp 27 Sep 2008 05:52:50 - 1.10
+++ portletediting.js.jsp 8 Apr 2009 08:22:23 - 1.10.2.1
@@ -121,13 +121,14 @@
function writeDocument(doc, div, parentdocument) {
var javascriptWindow = cmsc:staticurl page='/js/window.js' /;
var cssPortaledit = cmsc:staticurl page='/editors/site/portaledit.css'
/;
-html = html\n;
+ html = html = !DOCTYPE html PUBLIC \-//W3C//DTD XHTML 1.0 Strict//EN\
\http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\;\n;
+ html += html xmlns=\http://www.w3.org/1999/xhtml\;\n;
html += head\n;
html += meta http-equiv=\Content-Type\ content=\text/html;
charset=utf-8\\n;
html += script type='text/javascript' src=' + javascriptWindow +
'/script
html += link rel='stylesheet' type='text/css' href=' + cssPortaledit +
' /;
html += /head\n;
-html += body\n;
+ html += 'body class=portletedit\n';
html += div.innerHTML;
html += /body\n;
html += /html;
@@ -135,24 +136,6 @@
doc.open();
doc.write(html);
doc.close();
-
- for(count = 0; count parentdocument.styleSheets.length; count++) {
- ss = parentdocument.styleSheets[count];
- createStylesheet( doc, ss.href);
- }
-}
-
-function createStylesheet(doc, location) {
- var head = getHeadElement(doc);
- var stylesheet = doc.createElement(link);
- stylesheet.setAttribute(href, location);
- stylesheet.setAttribute(type, text/css);
- stylesheet.setAttribute(rel, stylesheet);
- head.appendChild(stylesheet);
-}
-
-function getHeadElement(doc) {
- return doc.getElementsByTagName(head)[0];
}
function showInfo(id) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
