You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ra...@apache.org on 2010/11/28 16:30:57 UTC
svn commit: r1039891 - in /lenya/branches/BRANCH_2_1_X/src:
modules/tinymce/java/src/org/apache/lenya/cms/editors/tinymce/
modules/tinymce/resources/i18n/ modules/tinymce/resources/javascript/
modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins...
Author: rainer
Date: Sun Nov 28 15:30:56 2010
New Revision: 1039891
URL: http://svn.apache.org/viewvc?rev=1039891&view=rev
Log:
TinyMCE Integration:
Add TinyMCE module to the default publication,
allow a larger editing window for small documents by adding the
autoresize plugin,
grey out TinyMCE menu entry when editor is not installed, by checking
for the existence of the tiny_mce.js file,
IE8 requires a slightly different way to reset the window.beforeunload
event handler: setting it to "null",
correct allowed attributes for li tag.
Modified:
lenya/branches/BRANCH_2_1_X/src/modules/tinymce/java/src/org/apache/lenya/cms/editors/tinymce/TinyMce.java
lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/i18n/cmsui.xml
lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/i18n/cmsui_de.xml
lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/i18n/cmsui_fr.xml
lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/javascript/tiny_config.js
lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/javascript/tiny_valid_elements.js
lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/unloadhandler/langs/fr.js
lenya/branches/BRANCH_2_1_X/src/modules/tinymce/xslt/page2edit.xsl
lenya/branches/BRANCH_2_1_X/src/pubs/default/config/publication.xml
Modified: lenya/branches/BRANCH_2_1_X/src/modules/tinymce/java/src/org/apache/lenya/cms/editors/tinymce/TinyMce.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules/tinymce/java/src/org/apache/lenya/cms/editors/tinymce/TinyMce.java?rev=1039891&r1=1039890&r2=1039891&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules/tinymce/java/src/org/apache/lenya/cms/editors/tinymce/TinyMce.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules/tinymce/java/src/org/apache/lenya/cms/editors/tinymce/TinyMce.java Sun Nov 28 15:30:56 2010
@@ -52,6 +52,8 @@ import org.xml.sax.SAXException;
public class TinyMce extends DocumentUsecase {
+ private final String tinymceCodeURI = "fallback://lenya/modules/tinymce/resources/tinymce/jscripts/tiny_mce/tiny_mce.js";
+
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
@@ -76,6 +78,9 @@ public class TinyMce extends DocumentUse
*/
protected void doCheckPreconditions() throws Exception {
super.doCheckPreconditions();
+ if (!SourceUtil.exists(tinymceCodeURI, this.manager)) {
+ addErrorMessage("tinymce-not-installed");
+ }
UsecaseWorkflowHelper.checkWorkflow(this.manager, this, getEvent(), getSourceDocument(),
getLogger());
if (!ServletHelper.isUploadEnabled(this.manager)) {
Modified: lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/i18n/cmsui.xml?rev=1039891&r1=1039890&r2=1039891&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/i18n/cmsui.xml (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/i18n/cmsui.xml Sun Nov 28 15:30:56 2010
@@ -20,4 +20,5 @@
xmlns="http://apache.org/cocoon/i18n/2.1">
<message key="tinymce.edit">Edit with TinyMCE</message>
<message key="With TinyMCE">With TinyMCE</message>
+ <message key="tinymce-not-installed">TinyMCE is not installed</message>
</catalogue>
Modified: lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/i18n/cmsui_de.xml?rev=1039891&r1=1039890&r2=1039891&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/i18n/cmsui_de.xml (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/i18n/cmsui_de.xml Sun Nov 28 15:30:56 2010
@@ -20,4 +20,5 @@
xmlns="http://apache.org/cocoon/i18n/2.1">
<message key="tinymce.edit">Mit TinyMCE bearbeiten</message>
<message key="With TinyMCE">Mit TinyMCE</message>
+ <message key="tinymce-not-installed">TinyMCE ist nicht installiert</message>
</catalogue>
Modified: lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/i18n/cmsui_fr.xml
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/i18n/cmsui_fr.xml?rev=1039891&r1=1039890&r2=1039891&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/i18n/cmsui_fr.xml (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/i18n/cmsui_fr.xml Sun Nov 28 15:30:56 2010
@@ -18,6 +18,7 @@
<catalogue xml:lang="fr" xmlns:xhtml="http://www.w3.org/1999/xhtml"
xmlns="http://apache.org/cocoon/i18n/2.1">
- <message key="tinymce.edit">Rédacteur TinyMCE</message>
+ <message key="tinymce.edit">Editeur TinyMCE</message>
<message key="With TinyMCE">Avec TinyMCE</message>
+ <message key="tinymce-not-installed">TinyMCE n'est pas installé</message>
</catalogue>
Modified: lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/javascript/tiny_config.js
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/javascript/tiny_config.js?rev=1039891&r1=1039890&r2=1039891&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/javascript/tiny_config.js (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/javascript/tiny_config.js Sun Nov 28 15:30:56 2010
@@ -52,13 +52,14 @@ config = {
/* enable plugins for custom save function, fullscreen editing
and search-and-replace. */
- //plugins : "save,fullscreen,searchreplace,table,contextmenu,simplebrowser,xhtmlxtras",
- plugins : "searchreplace,table,contextmenu,simplebrowser,unloadhandler",
+ //plugins : "save,fullscreen,searchreplace,table,contextmenu,autoresize,simplebrowser,xhtmlxtras",
+ plugins : "searchreplace,table,contextmenu,autoresize,simplebrowser,unloadhandler",
/* grey out the "save" button unless there are unsaved changes: */
//save_enablewhendirty : false,
/* disable editing of attributes forbidden by lenya schema */
+ /* TyniMCE 3.x */
popup_css_add : "../modules/tinymce/css/lenya_dialog.css",
/* some special settings for fullscreen mode (they override the
Modified: lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/javascript/tiny_valid_elements.js
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/javascript/tiny_valid_elements.js?rev=1039891&r1=1039890&r2=1039891&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/javascript/tiny_valid_elements.js (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/javascript/tiny_valid_elements.js Sun Nov 28 15:30:56 2010
@@ -59,7 +59,7 @@ lenya_valid_elements = ""
+"|value],"
+"kbd[class|id|title],"
+"label[accesskey|class|for|id|title],"
-+"li[class|id|title|value],"
++"li[class|id|title],"
+"link[charset|class|href|hreflang|id|media|rel|rev|title|target|type],"
+"meta[content|http-equiv|name|scheme],"
+"object[archive|class|classid|codebase|codetype|data|declare|height|href|id|name"
Modified: lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/unloadhandler/langs/fr.js
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/unloadhandler/langs/fr.js?rev=1039891&r1=1039890&r2=1039891&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/unloadhandler/langs/fr.js (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/unloadhandler/langs/fr.js Sun Nov 28 15:30:56 2010
@@ -18,6 +18,6 @@
// FR lang variables
tinyMCE.addI18n('fr.unloadhandler',{
- unload_msg : 'Attention: si vous sortez de l'éditeur en cliquant sur OK modifications seront perdues et le document sera laissée «checked out».'
+ unload_msg : 'Attention: si vous sortez de l'éditeur en cliquant sur OK modifications seront perdues et le document restera extrait.'
});
}
Modified: lenya/branches/BRANCH_2_1_X/src/modules/tinymce/xslt/page2edit.xsl
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules/tinymce/xslt/page2edit.xsl?rev=1039891&r1=1039890&r2=1039891&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules/tinymce/xslt/page2edit.xsl (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules/tinymce/xslt/page2edit.xsl Sun Nov 28 15:30:56 2010
@@ -225,10 +225,10 @@
</textarea>
<xsl:text>
</xsl:text>
- <input i18n:attr="value" type="submit" name="submit" value="Save" onclick="javascript:window.onbeforeunload = true;"/>
+ <input i18n:attr="value" type="submit" name="submit" value="Save" onclick="tinymce.DOM.win.onbeforeunload = null;"/>
<xsl:text>
</xsl:text>
- <input i18n:attr="value" type="submit" name="cancel" value="Cancel" onclick="javascript:window.onbeforeunload = true;"/>
+ <input i18n:attr="value" type="submit" name="cancel" value="Cancel" onclick="tinymce.DOM.win.onbeforeunload = null;"/>
<xsl:text>
</xsl:text>
</form>
Modified: lenya/branches/BRANCH_2_1_X/src/pubs/default/config/publication.xml
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/pubs/default/config/publication.xml?rev=1039891&r1=1039890&r2=1039891&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/pubs/default/config/publication.xml (original)
+++ lenya/branches/BRANCH_2_1_X/src/pubs/default/config/publication.xml Sun Nov 28 15:30:56 2010
@@ -87,6 +87,7 @@
<module name="usecasedocument"/>
<module name="monitoring"/>
<module name="navigation"/>
+ <module name="tinymce"/>
</modules>
<!-- TODO: The goal is to have a blog module ;-) -->
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org