[MMBASE CVS] applications/editwizard/templates/data/xsl list.xsl wizard.xsl

[Andre van Toly]

Update of /var/cvs/applications/editwizard/templates/data/xsl
In directory james.mmbase.org:/tmp/cvs-serv16677/templates/data/xsl

Modified Files:
        list.xsl wizard.xsl 
Log Message:
porting some from 1.8


See also: 
http://cvs.mmbase.org/viewcvs/applications/editwizard/templates/data/xsl


Index: list.xsl
===================================================================
RCS file: /var/cvs/applications/editwizard/templates/data/xsl/list.xsl,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- list.xsl    13 Feb 2008 13:21:09 -0000      1.50
+++ list.xsl    25 Apr 2008 16:55:45 -0000      1.51
@@ -7,7 +7,7 @@
     @author Kars Veling
     @author Michiel Meeuwissen
     @author Nico Klasens
-    @version $Id: list.xsl,v 1.50 2008/02/13 13:21:09 pierre Exp $
+    @version $Id: list.xsl,v 1.51 2008/04/25 16:55:45 andre Exp $
   -->
 
   <xsl:import href="xsl/baselist.xsl" />
@@ -16,7 +16,7 @@
   <xsl:param name="unlinkable">false</xsl:param>
   <xsl:param name="linkable">false</xsl:param>
   <xsl:param name="creatable">true</xsl:param>
-  <xsl:param name="relationOriginNode"><xsl:value-of select="$origin" 
/></xsl:param>
+  <xsl:param name="relationOriginNode"></xsl:param>
   <xsl:param name="relationRole"></xsl:param>
   <xsl:param name="relationCreateDir"></xsl:param>
   <xsl:param name="relationStartnodes"></xsl:param>
@@ -31,6 +31,9 @@
   <xsl:param name="deletedescription">
     <xsl:value-of select="$tooltip_delete" />
   </xsl:param>
+  <xsl:param name="unlinkdescription">
+    <xsl:value-of select="$tooltip_remove" />
+  </xsl:param>
 
   <xsl:param name="createprompt" />
 
@@ -60,7 +63,7 @@
     <script type="text/javascript" src="{$javascriptdir}list.js">
       <xsl:comment>help IE</xsl:comment>
     </script>
-    <xsl:if test="$linkable='true'">
+    <xsl:if test="$nodepath != '' and $relationOriginNode != ''">
       <script type="text/javascript" 
src="{$javascriptdir}newfromlist.jsp{$sessionid}?language={$language}&amp;country={$country}&amp;timezone={$timezone}&amp;referrer={$referrer_encoded}&amp;relationOriginNode={$relationOriginNode}&amp;relationRole={$relationRole}&amp;relationCreateDir={$relationCreateDir}&amp;relationStartnodes={$relationStartnodes}&amp;relationNodepath={$relationNodepath}&amp;objecttype={$objecttype}">
        <xsl:comment>help IE</xsl:comment>
       </script>
@@ -207,15 +210,10 @@
                   <input type="hidden" name="language" value="${language}" />
                   <input type="text" name="searchvalue" value="{$searchvalue}" 
class="search" />
 
-                    <xsl:if test="$relationOriginNode = '-1'">
-                      <a href="javascript:document.forms[0].submit();">
-                        <xsl:call-template name="prompt_search" />
-                      </a>
-                    </xsl:if>
-                    <xsl:if test="$relationOriginNode != '-1'">
                       <a href="javascript:document.forms[0].submit();">
                         <xsl:call-template name="prompt_search" />
                       </a>
+                    <xsl:if test="$relationOriginNode != ''">
                       <a href="javascript:doMySearch(this);">
                         <xsl:call-template name="prompt_search_all" />
                       </a>
@@ -381,12 +379,12 @@
         </td>
       </xsl:if>
 
-      <xsl:if test="$unlinkable='true'">
+      <xsl:if test="$unlinkable='true' and $relationOriginNode != ''"><!-- 
unlink makes only sense when related to something -->
         <td class="deletebutton">
           <xsl:if test="@maylink='true'">
             <a
               href="{$unlinkpage}&amp;wizard={$wizard}&amp;[EMAIL 
PROTECTED]&amp;relationOriginNode={$relationOriginNode}&amp;origin={$origin}"
-              title="{$deletedescription}"
+              title="{$unlinkdescription}"
               onmousedown="cancelClick=true;"
               onclick="return doUnlink('{$unlinkprompt}');">
               <xsl:call-template name="prompt_unlink" />


Index: wizard.xsl
===================================================================
RCS file: /var/cvs/applications/editwizard/templates/data/xsl/wizard.xsl,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -b -r1.181 -r1.182
--- wizard.xsl  19 Mar 2008 14:15:01 -0000      1.181
+++ wizard.xsl  25 Apr 2008 16:55:45 -0000      1.182
@@ -13,7 +13,7 @@
     @author Nico Klasens
     @author Martijn Houtman
     @author Robin van Meteren
-    @version $Id: wizard.xsl,v 1.181 2008/03/19 14:15:01 michiel Exp $
+    @version $Id: wizard.xsl,v 1.182 2008/04/25 16:55:45 andre Exp $
 
     This xsl uses Xalan functionality to call java classes
     to format dates and call functions on nodes
@@ -74,7 +74,6 @@
       if (hist) {
          hist.go(1);
       }
-
       window.onresize = function(e){ resizeEditTable(); }
       -->
       ]]></xsl:text>
@@ -642,7 +641,6 @@
     <xsl:call-template name="i18n">
       <xsl:with-param name="nodes" select="postfix"/>
     </xsl:call-template>
-
   </xsl:template>
 
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs