Author: andreas
Date: Mon Feb 9 10:54:50 2009
New Revision: 742389
URL: http://svn.apache.org/viewvc?rev=742389&view=rev
Log:
Use JX template for insertLink usecase view, use CodeMirror API to manipulate editor content.
Added:
lenya/branches/BRANCH_2_0_X/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertLink.java
lenya/branches/BRANCH_2_0_X/src/modules/editors/usecases/insertLink.jx
Removed:
lenya/branches/BRANCH_2_0_X/src/modules/editors/xslt/insertLink.xsl
Modified:
lenya/branches/BRANCH_2_0_X/src/modules/editors/config/cocoon-xconf/usecase-insertLink.xconf
lenya/branches/BRANCH_2_0_X/src/modules/editors/resources/javascript/sourceEditor/lenya_glue.js
Modified: lenya/branches/BRANCH_2_0_X/src/modules/editors/config/cocoon-xconf/usecase-insertLink.xconf
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_0_X/src/modules/editors/config/cocoon-xconf/usecase-insertLink.xconf?rev=742389&r1=742388&r2=742389&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_0_X/src/modules/editors/config/cocoon-xconf/usecase-insertLink.xconf (original)
+++ lenya/branches/BRANCH_2_0_X/src/modules/editors/config/cocoon-xconf/usecase-insertLink.xconf Mon Feb 9 10:54:50 2009
@@ -3,10 +3,10 @@
<component-instance
name="editors.insertLink"
logger="lenya.publication"
- class="org.apache.lenya.cms.usecase.DummyUsecase"
+ class="org.apache.lenya.cms.editors.InsertLink"
>
<view
- uri="cocoon://modules/editors/editors.insertLink"
+ template="modules/editors/usecases/insertLink.jx"
menu="false"
createContinuation="false"
/>
Added: lenya/branches/BRANCH_2_0_X/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertLink.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_0_X/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertLink.java?rev=742389&view=auto
==============================================================================
--- lenya/branches/BRANCH_2_0_X/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertLink.java (added)
+++ lenya/branches/BRANCH_2_0_X/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertLink.java Mon Feb 9 10:54:50 2009
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.lenya.cms.editors;
+
+import org.apache.lenya.cms.usecase.DocumentUsecase;
+
+/**
+ * Insert a link using an editor.
+ */
+public class InsertLink extends DocumentUsecase {
+
+ protected static final String PARAM_DOCUMENT = "document";
+
+ protected void prepareView() throws Exception {
+ super.prepareView();
+ setParameter(PARAM_DOCUMENT, getSourceDocument());
+ }
+
+}
Modified: lenya/branches/BRANCH_2_0_X/src/modules/editors/resources/javascript/sourceEditor/lenya_glue.js
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_0_X/src/modules/editors/resources/javascript/sourceEditor/lenya_glue.js?rev=742389&r1=742388&r2=742389&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_0_X/src/modules/editors/resources/javascript/sourceEditor/lenya_glue.js (original)
+++ lenya/branches/BRANCH_2_0_X/src/modules/editors/resources/javascript/sourceEditor/lenya_glue.js Mon Feb 9 10:54:50 2009
@@ -1,10 +1,8 @@
org.apache.lenya.editors.setObjectData = function(objectData, windowName) {
var currentUsecase = usecaseMap[windowName];
var snippet = org.apache.lenya.editors.generateContentSnippet(currentUsecase, objectData);
- org.apache.lenya.editors.insertContent(
- document.forms['oneform'].elements['content'],
- snippet
- );
+ var newText = snippet.beforeSelection + snippet.replaceSelection + snippet.afterSelection;
+ editor.replaceSelection(newText);
usecaseMap[windowName] = undefined; // we're done!
objectData[windowName] = undefined; // we're done!
}
@@ -15,7 +13,7 @@
function triggerUsecase(usecase) {
var windowName = org.apache.lenya.editors.generateUniqueWindowName();
- var selectedText = org.apache.lenya.editors.getSelectedText(document.forms[0].elements['content']);
+ var selectedText = editor.selection();
switch (usecase) {
case org.apache.lenya.editors.USECASE_INSERTLINK:
Added: lenya/branches/BRANCH_2_0_X/src/modules/editors/usecases/insertLink.jx
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_0_X/src/modules/editors/usecases/insertLink.jx?rev=742389&view=auto
==============================================================================
--- lenya/branches/BRANCH_2_0_X/src/modules/editors/usecases/insertLink.jx (added)
+++ lenya/branches/BRANCH_2_0_X/src/modules/editors/usecases/insertLink.jx Mon Feb 9 10:54:50 2009
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<!--
+ $Id: link.xsl 555656 2007-07-12 15:17:47Z nettings $
+-->
+
+<page:page xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+ xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0"
+ xmlns:proxy="http://apache.org/lenya/proxy/1.0"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:i18n="http://apache.org/cocoon/i18n/2.1" >
+
+ <jx:set var="doc" value="${usecase.getParameter('document')}"/>
+
+ <page:title><i18n:text>insertLink.heading</i18n:text></page:title>
+ <page:body style="width:auto;">
+
+ <script type="text/javascript" src="/modules/sitetree/javascript/tree.js"> </script>
+ <script type="text/javascript" src="/modules/sitetree/javascript/lenyatree.js"> </script>
+ <script type="text/javascript" src="/modules/sitetree/javascript/navtree.js"> </script>
+ <script type="text/javascript" src="/modules/editors/javascript/org.apache.lenya.editors.js"> </script>
+ <script type="text/javascript" src="/modules/editors/javascript/insertLink.js"> </script>
+ <script type="text/javascript">
+ AREA = "${doc.getArea()}";
+ DOCUMENT_ID = "${doc.getPath()}";
+ PUBLICATION_ID = "${doc.getPublication().getId()}";
+ CHOSEN_LANGUAGE = "${doc.getLanguage()}";
+ DEFAULT_LANGUAGE = "${doc.getPublication().getDefaultLanguage()}";
+ IMAGE_PATH = "/lenya/images/tree/";
+ CUT_DOCUMENT_ID = '';
+ ALL_AREAS = "authoring";
+ PIPELINE_PATH = 'modules/sitetree/sitetree-fragment.xml';
+ WEBAPP_BASE_PATH = '<proxy:url href="/"/>';
+ </script>
+
+ <div id="lenya-info-treecanvas" style="width: 250px;">
+ <div class="lenya-tabs">
+ <jx:forEach var="language" items="${doc.getPublication().getLanguages()}">
+ <jx:choose>
+ <jx:when test="${doc.getLanguage().equals(language)}">
+ <a id="${language}" class="lenya-tablink-active"><jx:out value="${language}"/></a>
+ </jx:when>
+ <jx:otherwise>
+ <a id="${language}" class="lenya-tablink" href="${usecase.getSourceURL()}?lenya.usecase=editors.insertLink">
+ <jx:out value="${language}"/>
+ </a>
+ </jx:otherwise>
+ </jx:choose>
+ </jx:forEach>
+ </div>
+ <div id="lenya-info-tree">
+ <div id="tree"> 
+ </div>
+ </div>
+ </div>
+ <div class="lenya-box" style="margin-left: 260px;">
+ <div class="lenya-box-title"><i18n:text>insertLink.heading</i18n:text></div>
+ <div class="lenya-box-body">
+
+ <form name="insertLink">
+
+ <table class="lenya-table-noborder">
+ <tr>
+ <td colspan="2" class="lenya-form-caption">
+ <i18n:text>insertLink.clickTreeOrType</i18n:text>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td class="lenya-form-caption">
+ <i18n:text>insertLink.URL</i18n:text>:
+ </td>
+ <td>
+ <input class="lenya-form-element" type="text" name="url"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="lenya-form-caption">
+ <i18n:text>insertLink.title</i18n:text>:
+ </td>
+ <td>
+ <input class="lenya-form-element" type="text" name="title"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="lenya-form-caption">
+ <i18n:text>insertLink.text</i18n:text>:</td>
+ <td>
+ <input class="lenya-form-element" type="text" name="text"/>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <input
+ i18n:attr="value"
+ type="submit"
+ value="insertLink.submit"
+ onclick="org.apache.lenya.editors.handleFormSubmit('insertLink')"
+ />
+  
+ <input
+ i18n:attr="value"
+ type="submit"
+ value="Cancel"
+ name="cancel"
+ onclick="window.close()"
+ />
+  
+ <input
+ i18n:attr="value"
+ type="button"
+ value="insertAsset.createResource"
+ onclick="location.href='?lenya.usecase=editors.createResource&doctype=resource&lenya.exitUsecase=editors.insertLink'"
+ />
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+ </div>
+ </page:body>
+
+</page:page>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.