xlawrence 2005/05/27 11:59:42 CEST
Modified files:
core/src/webapp/jsp/jahia/htmleditors/fckeditor
fckeditor_htmleditor.jsp
Log:
Corrected Firefox bug: FCK editor was not showing up in the BigText Engine
Revision Changes Path
1.2 +10 -17
jahia/core/src/webapp/jsp/jahia/htmleditors/fckeditor/fckeditor_htmleditor.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/htmleditors/fckeditor/fckeditor_htmleditor.jsp.diff?r1=1.1&r2=1.2&f=h
Index: fckeditor_htmleditor.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/htmleditors/fckeditor/fckeditor_htmleditor.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fckeditor_htmleditor.jsp 26 May 2005 14:44:55 -0000 1.1
+++ fckeditor_htmleditor.jsp 27 May 2005 09:59:41 -0000 1.2
@@ -102,7 +102,7 @@
String files = "null";
try
{
- pageContent = getSitemapToJs(jData, jahiaPath.toString());
+ //pageContent = getSitemapToJs(jData, jahiaPath.toString());
if(pageContent != null && !pageContent.equals(""))
{
pageContent = pageContent.trim();
@@ -114,7 +114,7 @@
pageContent = "null";
}
- files = getFilesToJs(jParams);
+ //files = getFilesToJs(jParams);
if(files != null && !files.equals(""))
{
files = files.trim();
@@ -127,7 +127,9 @@
}
}
catch (Exception e)
-{}
+{
+ e.printStackTrace();
+ }
%>
<script language="javascript">
@@ -186,6 +188,7 @@
}
//-->
</SCRIPT>
+
<script type="text/javascript">
function FCKeditor_OnComplete( editorInstance )
{
@@ -217,7 +220,7 @@
oFCKeditor = new FCKeditor( 'jahiaEditor', '100%', '400' ) ;
oFCKeditor.BasePath = sBasePath;
- oFCKeditor.Config['CustomConfigurationsPath'] =
'<%=urlPage%>/Global/fck_config.js' ;
+ //oFCKeditor.Config['CustomConfigurationsPath'] =
'<%=urlPage%>/Global/fck_config.js' ;
oFCKeditor.Config.basePath = "<%=fckUrl%>";
oFCKeditor.Config.webdavPath = "<%=request.getContextPath() +
"/webdav/site/" + jParams.getSiteKey()%>";
@@ -229,21 +232,11 @@
oFCKeditor.Config.LinkBrowserURL = sBasePath +
"editor/plugins/JahiaLinker/dialog.html";
oFCKeditor.Config.PagesList = pagesList;
- oFCKeditor.Config.StylesXmlPath = '<%=urlPage%>/Global/fckstyles.xml';
- oFCKeditor.Config.EditorAreaCSS = '<%=urlPage%>/Global/wysiwygpro.css';
- oFCKeditor.ReplaceTextarea() ;
+ oFCKeditor.ReplaceTextarea() ;
}
</script>
+<br />
<input type="hidden" name="_<%=theField.getID()%>"
value="<%=FormDataManager.getInstance().formEncode(theOldField)%>" >
-<table width="100%" cellspacing="0" cellpadding="0" border="0">
- <tr>
- <td>
- <img src='<%=request.getContextPath() +
"/jsp/jahia/engines/images/pix.gif"%>' width="1" height="400" border="0" alt=""
/><br />
- </td>
- <td valign="top">
- <textarea id="jahiaEditor" name="jahiaEditor" style="WIDTH: 100%;
HEIGHT:
400px"><%=FormDataManager.getInstance().formEncode(theOldField)%></textarea>
- </td>
- </tr>
-</table>
\ No newline at end of file
+ <textarea id="jahiaEditor" name="jahiaEditor" style="WIDTH: 100%;
HEIGHT:
400px"><%=FormDataManager.getInstance().formEncode(theOldField)%></textarea>
\ No newline at end of file
