You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by rf...@apache.org on 2007/05/29 19:54:22 UTC
svn commit: r542601 - in /lenya/trunk/src/modules/fckeditor: sitemap.xmap
xslt/link.xsl
Author: rfrovarp
Date: Tue May 29 10:54:21 2007
New Revision: 542601
URL: http://svn.apache.org/viewvc?view=rev&rev=542601
Log:
Fixes insertion of foreign language links (see bug 41870)
Modified:
lenya/trunk/src/modules/fckeditor/sitemap.xmap
lenya/trunk/src/modules/fckeditor/xslt/link.xsl
Modified: lenya/trunk/src/modules/fckeditor/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/fckeditor/sitemap.xmap?view=diff&rev=542601&r1=542600&r2=542601
==============================================================================
--- lenya/trunk/src/modules/fckeditor/sitemap.xmap (original)
+++ lenya/trunk/src/modules/fckeditor/sitemap.xmap Tue May 29 10:54:21 2007
@@ -64,7 +64,7 @@
<map:parameter name="area" value="authoring"/>
<map:parameter name="tab" value="en"/>
<map:parameter name="chosenlanguage" value="{page-envelope:document-language}"/>
- <map:parameter name="documentid" value="{page-envelope:document-id}"/>
+ <map:parameter name="path" value="{page-envelope:document-path}"/>
<map:parameter name="documenturl" value="/{page-envelope:document-url}"/>
<map:parameter name="documentextension" value="{page-envelope:document-extension}"/>
<map:parameter name="defaultlanguage" value="{page-envelope:default-language}"/>
Modified: lenya/trunk/src/modules/fckeditor/xslt/link.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/fckeditor/xslt/link.xsl?view=diff&rev=542601&r1=542600&r2=542601
==============================================================================
--- lenya/trunk/src/modules/fckeditor/xslt/link.xsl (original)
+++ lenya/trunk/src/modules/fckeditor/xslt/link.xsl Tue May 29 10:54:21 2007
@@ -6,9 +6,9 @@
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
-
+
+ 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.
@@ -16,39 +16,43 @@
limitations under the License.
-->
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:xhtml="http://www.w3.org/1999/xhtml"
- xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0"
- xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
- xmlns:usecase="http://apache.org/cocoon/lenya/usecase/1.0"
- >
-
-<xsl:param name="contextprefix"/>
-<xsl:param name="publicationid"/>
-<xsl:param name="area"/>
-<xsl:param name="tab"/>
-<xsl:param name="documentid"/>
-<xsl:param name="documentextension"/>
-<xsl:param name="documenturl"/>
-<xsl:param name="languages"/>
-<xsl:param name="chosenlanguage"/>
-<xsl:param name="defaultlanguage"/>
+<!--
+ $Id: link.xsl 519931 2007-03-19 12:46:07Z andreas $
+-->
-<xsl:variable name="extension"><xsl:if test="$documentextension != ''">.</xsl:if><xsl:value-of select="$documentextension"/></xsl:variable>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:xhtml="http://www.w3.org/1999/xhtml"
+ xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0"
+ xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+ xmlns:usecase="http://apache.org/cocoon/lenya/usecase/1.0"
+ >
-<xsl:template match="/">
+ <xsl:param name="contextprefix"/>
+ <xsl:param name="publicationid"/>
+ <xsl:param name="area"/>
+ <xsl:param name="tab"/>
+ <xsl:param name="path"/>
+ <xsl:param name="documentextension"/>
+ <xsl:param name="documenturl"/>
+ <xsl:param name="languages"/>
+ <xsl:param name="chosenlanguage"/>
+ <xsl:param name="defaultlanguage"/>
+
+ <xsl:variable name="extension"><xsl:if test="$documentextension != ''">.</xsl:if><xsl:value-of select="$documentextension"/></xsl:variable>
+
+ <xsl:template match="/">
<page:page>
<page:title>Insert Link</page:title>
<page:body>
- <script type="text/javascript" src="{$contextprefix}/modules/sitetree/javascript/tree.js"> </script>
- <script type="text/javascript" src="{$contextprefix}/modules/sitetree/javascript/lenyatree.js"> </script>
- <script type="text/javascript" src="{$contextprefix}/modules/sitetree/javascript/navtree.js"> </script>
- <script type="text/javascript" src="{$contextprefix}/modules/fckeditor/javascript/insertLink.js"> </script>
- <script type="text/javascript" >
+ <script type="text/javascript" src="{$contextprefix}/modules/sitetree/javascript/tree.js"> </script>
+ <script type="text/javascript" src="{$contextprefix}/modules/sitetree/javascript/lenyatree.js"> </script>
+ <script type="text/javascript" src="{$contextprefix}/modules/sitetree/javascript/navtree.js"> </script>
+ <script type="text/javascript" src="{$contextprefix}/modules/fckeditor/javascript/insertLink.js"> </script>
+ <script type="text/javascript" >
AREA = "<xsl:value-of select="$area"/>";
- DOCUMENT_ID = "<xsl:value-of select="$documentid"/>";
+ DOCUMENT_ID = "<xsl:value-of select="$path"/>";
CONTEXT_PREFIX = "<xsl:value-of select="$contextprefix"/>";
PUBLICATION_ID = "<xsl:value-of select="$publicationid"/>";
CHOSEN_LANGUAGE = "<xsl:value-of select="$chosenlanguage"/>";
@@ -57,122 +61,108 @@
CUT_DOCUMENT_ID = '';
ALL_AREAS = "authoring"
PIPELINE_PATH = '/authoring/sitetree-fragment.xml'
- </script>
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr>
-<td valign="top" width="20%">
- <div id="lenya-info-treecanvas">
-<!-- Build the tree. -->
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <xsl:call-template name="languagetabs">
- <xsl:with-param name="tablanguages">
- <xsl:value-of select="$languages"/>
- </xsl:with-param>
- </xsl:call-template>
- </tr>
- </table>
-
- <div id="lenya-info-tree">
- <div id="tree">
- <script type="text/javascript">
- buildTree();
- </script>
- </div>
- </div>
-</div>
-</td>
-<td>
- <form action="" name="link" id="link" onsubmit="insertLink()">
- <table class="lenya-table-noborder">
- <tr>
- <td colspan="2" class="lenya-form-caption">You can either click on a node in the tree for an internal link or enter a link in the URL field. </td>
- </tr>
- <tr>
- <td colspan="2"> </td>
- </tr>
- <tr>
- <td class="lenya-form-caption">URL:</td>
- <td>
- <input class="lenya-form-element"
- type="text"
- name="url"/>
- </td>
- </tr>
- <tr>
- <td class="lenya-form-caption">Title:</td>
- <td>
- <input class="lenya-form-element"
- type="text"
- name="title"/>
- </td>
- </tr>
- <tr>
- <td colspan="2"> </td>
- </tr>
- <tr>
- <td/>
- <td> <input type="submit"
- value="Insert" name="input-insert"/>
- </td>
- </tr>
- </table>
- </form>
-</td>
-</tr></table>
+ </script>
+
+ <div id="lenya-info-treecanvas" style="width: 30%">
+ <div class="lenya-tabs">
+ <xsl:call-template name="languagetabs">
+ <xsl:with-param name="tablanguages" select="$languages"/>
+ </xsl:call-template>
+ </div>
+ <div id="lenya-info-tree">
+ <div id="tree">
+ <script type="text/javascript">
+ buildTree();
+ </script>
+ </div>
+ </div>
+ </div>
+
+ <form action="" name="link" id="link" onsubmit="insertLink()">
+ <table class="lenya-table-noborder">
+ <tr>
+ <td colspan="2" class="lenya-form-caption">You can either click on a node in the tree for an internal link or enter a link in the URL field. </td>
+ </tr>
+ <tr>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td class="lenya-form-caption"><i18n:text>URL</i18n:text>:</td>
+ <td>
+ <input class="lenya-form-element" type="text" name="url"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="lenya-form-caption"><i18n:text>Title</i18n:text>:</td>
+ <td>
+ <input class="lenya-form-element" type="text" name="title"/>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td/>
+ <td> <input type="submit"
+ value="Insert" name="input-insert"/>
+ </td>
+ </tr>
+ </table>
+ </form>
+
</page:body>
</page:page>
-</xsl:template>
-
-
-<xsl:template name="selecttab">
- <xsl:text>?lenya.usecase=</xsl:text>
- <xsl:choose>
- <xsl:when test="$tab"><xsl:value-of select="$tab"/></xsl:when>
- <xsl:otherwise>bxe</xsl:otherwise>
- </xsl:choose>
- <xsl:text>&lenya.step=link-show</xsl:text>
-</xsl:template>
-
-
-<xsl:template name="languagetabs">
- <xsl:param name="tablanguages"/>
- <xsl:choose>
- <xsl:when test="not(contains($tablanguages,','))">
- <xsl:call-template name="languagetab">
- <xsl:with-param name="tablanguage">
- <xsl:value-of select="$tablanguages"/>
- </xsl:with-param>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:variable name="head" select="substring-before($tablanguages,',')" />
- <xsl:variable name="tail" select="substring-after($tablanguages,',')" />
- <xsl:call-template name="languagetab">
- <xsl:with-param name="tablanguage" select="$head"/>
- </xsl:call-template>
- <xsl:call-template name="languagetabs">
- <xsl:with-param name="tablanguages" select="$tail"/>
- </xsl:call-template>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-
-<xsl:template name="languagetab">
- <xsl:param name="tablanguage"/>
- <td><a id="{$tablanguage}">
- <xsl:call-template name="activate">
- <xsl:with-param name="tablanguage" select="$tablanguage"/>
- </xsl:call-template>
- </a></td>
-</xsl:template>
-
-
-<xsl:template name="activate">
- <xsl:param name="tablanguage"/>
- <xsl:attribute name="href"><xsl:value-of select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of select="$area"/><xsl:value-of select="$documentid"/>_<xsl:value-of select="$tablanguage"/><xsl:value-of select="$extension"/>?lenya.module=bxe&lenya.step=link-show</xsl:attribute>
- <xsl:attribute name="class">lenya-tablink<xsl:choose><xsl:when test="$chosenlanguage = $tablanguage">-active</xsl:when><xsl:otherwise/></xsl:choose></xsl:attribute><xsl:value-of select="$tablanguage"/>
-</xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
+ </xsl:template>
+
+
+ <xsl:template name="selecttab">
+ <xsl:text>?lenya.usecase=</xsl:text>
+ <xsl:choose>
+ <xsl:when test="$tab"><xsl:value-of select="$tab"/></xsl:when>
+ <xsl:otherwise>fckeditor</xsl:otherwise>
+ </xsl:choose>
+ <xsl:text>&lenya.step=link-show</xsl:text>
+ </xsl:template>
+
+
+ <xsl:template name="languagetabs">
+ <xsl:param name="tablanguages"/>
+ <xsl:choose>
+ <xsl:when test="not(contains($tablanguages,','))">
+ <xsl:call-template name="languagetab">
+ <xsl:with-param name="tablanguage">
+ <xsl:value-of select="$tablanguages"/>
+ </xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable name="head" select="substring-before($tablanguages,',')" />
+ <xsl:variable name="tail" select="substring-after($tablanguages,',')" />
+ <xsl:call-template name="languagetab">
+ <xsl:with-param name="tablanguage" select="$head"/>
+ </xsl:call-template>
+ <xsl:call-template name="languagetabs">
+ <xsl:with-param name="tablanguages" select="$tail"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+
+ <xsl:template name="languagetab">
+ <xsl:param name="tablanguage"/>
+ <a id="{$tablanguage}">
+ <xsl:call-template name="activate">
+ <xsl:with-param name="tablanguage" select="$tablanguage"/>
+ </xsl:call-template>
+ </a>
+ </xsl:template>
+
+
+ <xsl:template name="activate">
+ <xsl:param name="tablanguage"/>
+ <xsl:attribute name="href"><xsl:value-of select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of select="$area"/><xsl:value-of select="$path"/>_<xsl:value-of select="$tablanguage"/><xsl:value-of select="$extension"/>?lenya.module=fckeditor&lenya.step=link-show</xsl:attribute>
+ <xsl:attribute name="class">lenya-tablink<xsl:choose><xsl:when test="$chosenlanguage = $tablanguage">-active</xsl:when><xsl:otherwise/></xsl:choose></xsl:attribute><xsl:value-of select="$tablanguage"/>
+ </xsl:template>
+
+</xsl:stylesheet>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org