svn commit: r520448 - in /lenya/trunk/src/modules: fckeditor/README.txt fckeditor/resources/javascript/fckconfig.js fckeditor/resources/javascript/fckloader.js fckeditor/usecases/fckeditor.jx xhtml/xslt/clean-xhtml.xsl

Author: andreas
Date: Tue Mar 20 08:54:02 2007
New Revision: 520448

URL: http://svn.apache.org/viewvc?view=rev&rev=520448
Log:
The patch contains what is required to get FCKeditor 2.4 to work with Lenya. 
This fixes bug 41842. Thanks to Richard Frovarp.

Modified:
    lenya/trunk/src/modules/fckeditor/README.txt
    lenya/trunk/src/modules/fckeditor/resources/javascript/fckconfig.js
    lenya/trunk/src/modules/fckeditor/resources/javascript/fckloader.js
    lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx
    lenya/trunk/src/modules/xhtml/xslt/clean-xhtml.xsl

Modified: lenya/trunk/src/modules/fckeditor/README.txt
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules/fckeditor/README.txt?view=diff&rev=520448&r1=520447&r2=520448
==============================================================================
--- lenya/trunk/src/modules/fckeditor/README.txt (original)
+++ lenya/trunk/src/modules/fckeditor/README.txt Tue Mar 20 08:54:02 2007
@@ -2,7 +2,7 @@
 1. download the latest release of fckeditor from http://www.fckeditor.net/
 
 2. unzip it into the src/modules/fckeditor/resources directory
-   (resources directory should now contain a directory named FCKeditor)
+   (resources directory should now contain a directory named fckeditor)
    
 3. register the module with your publication, so that the appropriate menu
    item can be displayed: in <yourpub>/config/publication.xconf, add the line
@@ -16,8 +16,10 @@
      <role id="admin"/>
      <role id="edit"/>
    </usecase>
+
+   or use the usecases option under the admin tab in lenya. 
     
 5. build lenya
 
 6. try to edit your document by clicking on "With FCKEditor" in the edit menu
-    
\ No newline at end of file
+    

Modified: lenya/trunk/src/modules/fckeditor/resources/javascript/fckconfig.js
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules/fckeditor/resources/javascript/fckconfig.js?view=diff&rev=520448&r1=520447&r2=520448
==============================================================================
--- lenya/trunk/src/modules/fckeditor/resources/javascript/fckconfig.js 
(original)
+++ lenya/trunk/src/modules/fckeditor/resources/javascript/fckconfig.js Tue Mar 
20 08:54:02 2007
@@ -28,7 +28,7 @@
        ['OrderedList','UnorderedList','-','Outdent','Indent'],
        ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
        ['Link','Unlink','Anchor'],
-       
['Image','Table','Rule','Smiley','SpecialChar','PageBreak','UniversalKey'],
+       ['Image','Table','Rule','Smiley','SpecialChar','PageBreak'],
        
['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField'],
        '/',
        ['Style','FontFormat','FontName','FontSize'],

Modified: lenya/trunk/src/modules/fckeditor/resources/javascript/fckloader.js
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules/fckeditor/resources/javascript/fckloader.js?view=diff&rev=520448&r1=520447&r2=520448
==============================================================================
--- lenya/trunk/src/modules/fckeditor/resources/javascript/fckloader.js 
(original)
+++ lenya/trunk/src/modules/fckeditor/resources/javascript/fckloader.js Tue Mar 
20 08:54:02 2007
@@ -18,7 +18,7 @@
 function fckloader(host, requesturi, contextPath)
 {
   var oFCKeditor = new FCKeditor( 'content' ) ;
-  oFCKeditor.BasePath  = contextPath + '/modules/fckeditor/FCKeditor/' ;
+  oFCKeditor.BasePath  = contextPath + '/modules/fckeditor/fckeditor/' ;
   oFCKeditor.Width="800";
   oFCKeditor.Height="700";
   oFCKeditor.Config[ "FullPage" ] = true ;

Modified: lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx?view=diff&rev=520448&r1=520447&r2=520448
==============================================================================
--- lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx (original)
+++ lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx Tue Mar 20 08:54:02 
2007
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<page:page
-  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";
-  xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0";
-  xmlns="http://www.w3.org/1999/xhtml";
-  xmlns:i18n="http://apache.org/cocoon/i18n/2.1";
-  xmlns:cinclude="http://apache.org/cocoon/include/1.0";
-  >
-  
-  <script type="text/javascript" 
src="${request.getContextPath()}/modules/fckeditor/FCKeditor/fckeditor.js">&#160;</script>
-  <script type="text/javascript" 
src="${request.getContextPath()}/modules/fckeditor/javascript/fckloader.js">&#160;</script>
-  <script type="text/javascript">
-    window.onload = function()
-    {
-      fckloader('${usecase.getParameter('host')}', 
'${usecase.getParameter('requesturi')}', '${request.getContextPath()}');
-    }
-  </script>
-  
-       <page:title>FCKeditor - Sample</page:title>
-
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<page:page
+  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";
+  xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0";
+  xmlns="http://www.w3.org/1999/xhtml";
+  xmlns:i18n="http://apache.org/cocoon/i18n/2.1";
+  xmlns:cinclude="http://apache.org/cocoon/include/1.0";
+  >
+  
+  <script type="text/javascript" 
src="${request.getContextPath()}/modules/fckeditor/fckeditor/fckeditor.js">&#160;</script>
+  <script type="text/javascript" 
src="${request.getContextPath()}/modules/fckeditor/javascript/fckloader.js">&#160;</script>
+  <script type="text/javascript">
+    window.onload = function()
+    {
+      fckloader('${usecase.getParameter('host')}', 
'${usecase.getParameter('requesturi')}', '${request.getContextPath()}');
+    }
+  </script>
+  
+       <page:title>FCKeditor - Sample</page:title>
+
         <jx:choose>
           <jx:when test="${usecase.hasErrors()}">
             <page:body>
@@ -42,49 +42,49 @@
             </page:body>
           </jx:when>
           <jx:otherwise>
-           <page:body>
-         
-                <div class="lenya-box">
-                  <div class="lenya-box-title">Information</div>
-                  <div class="lenya-box-body">
-                    <table class="lenya-table-noborder">
-                      <tr>
-                        <td class="lenya-entry-caption">Document:</td>
-                        <td><jx:out 
value="${usecase.getParameter('document').getId()}"/></td>
-                      </tr>
-                      <tr>
-                        <td class="lenya-entry-caption">Workflow Event:</td>
-                        <jx:set var="event" 
value="${request.getParameter('lenya.event')}"/>
-                        <jx:choose>
-                          <jx:when test="${event.equals('') || 
event.equals('null')}">
-                            <td>No workflow event specified</td>
-                          </jx:when>
-                          <jx:otherwise>
-                            <td><jx:out value="${event}"/></td>
-                          </jx:otherwise>
-                        </jx:choose>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-          
-              <form method="post" name="fckeditor" id="fckeditor">
-            <input type="hidden" name="lenya.continuation" 
value="${continuation.id}"/>
-            <input type="hidden" name="lenya.usecase" 
value="${usecase.getName()}"/>           
-            <input name="namespaces" type="hidden" value=" 
xmlns=&quot;http://www.w3.org/1999/xhtml&quot;"; />
-                           <div>
-                                   <textarea id="content" name="content" 
style="WIDTH: 100%; HEIGHT: 200px">
-                      <cinclude:includexml>
-                        
<cinclude:src>cocoon://modules/fckeditor/content</cinclude:src>
-                      </cinclude:includexml>           
-                                   </textarea>
-                           </div>
-                           <br />
-                           <input name="submit" type="submit" value="Save" />
-          <input type="submit" name="cancel" value="Cancel"/>
-                     </form>
-                               
-           </page:body>
+           <page:body>
+         
+                <div class="lenya-box">
+                  <div class="lenya-box-title">Information</div>
+                  <div class="lenya-box-body">
+                    <table class="lenya-table-noborder">
+                      <tr>
+                        <td class="lenya-entry-caption">Document:</td>
+                        <td><jx:out 
value="${usecase.getParameter('document').getId()}"/></td>
+                      </tr>
+                      <tr>
+                        <td class="lenya-entry-caption">Workflow Event:</td>
+                        <jx:set var="event" 
value="${request.getParameter('lenya.event')}"/>
+                        <jx:choose>
+                          <jx:when test="${event.equals('') || 
event.equals('null')}">
+                            <td>No workflow event specified</td>
+                          </jx:when>
+                          <jx:otherwise>
+                            <td><jx:out value="${event}"/></td>
+                          </jx:otherwise>
+                        </jx:choose>
+                      </tr>
+                    </table>
+                  </div>
+                </div>
+          
+              <form method="post" name="fckeditor" id="fckeditor">
+            <input type="hidden" name="lenya.continuation" 
value="${continuation.id}"/>
+            <input type="hidden" name="lenya.usecase" 
value="${usecase.getName()}"/>           
+            <input name="namespaces" type="hidden" value=" 
xmlns=&quot;http://www.w3.org/1999/xhtml&quot;"; />
+                           <div>
+                                   <textarea id="content" name="content" 
style="WIDTH: 100%; HEIGHT: 200px">
+                      <cinclude:includexml>
+                        
<cinclude:src>cocoon://modules/fckeditor/content</cinclude:src>
+                      </cinclude:includexml>           
+                                   </textarea>
+                           </div>
+                           <br />
+                           <input name="submit" type="submit" value="Save" />
+          <input type="submit" name="cancel" value="Cancel"/>
+                     </form>
+                               
+           </page:body>
           </jx:otherwise>
         </jx:choose>
-</page:page>
+</page:page>

Modified: lenya/trunk/src/modules/xhtml/xslt/clean-xhtml.xsl
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules/xhtml/xslt/clean-xhtml.xsl?view=diff&rev=520448&r1=520447&r2=520448
==============================================================================
--- lenya/trunk/src/modules/xhtml/xslt/clean-xhtml.xsl (original)
+++ lenya/trunk/src/modules/xhtml/xslt/clean-xhtml.xsl Tue Mar 20 08:54:02 2007
@@ -31,6 +31,14 @@
     </xsl:copy>
   </xsl:template>
   
+  <!-- Remove tag that disables Firefox spell check in FCK -->
+  <xsl:template match="xhtml:body[@spellcheck]" >
+    <xsl:copy>
+       <xsl:apply-templates select="@*[name()!='spellcheck']" />
+       <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+
   <!-- Unsupported by the schema -->
   <xsl:template match="@shape|@target|xhtml:u">
     <xsl:apply-templates />