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

Modified Files:
      Tag: MMBase-1_8
        list.xsl 
Log Message:
disabled linkabel: makes no sence when a wizard has this tag but the config/url 
for list.jsp does not support it, made unlinkable work correctly and linking 
and searching in list.jsp as one would aspect namely looking things up in the 
whole cloud, with relnodepath in a given nodepath, or when noting is given in 
the current list


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.43.2.4
retrieving revision 1.43.2.5
diff -u -b -r1.43.2.4 -r1.43.2.5
--- list.xsl    19 Feb 2008 20:16:21 -0000      1.43.2.4
+++ list.xsl    21 Feb 2008 13:48:11 -0000      1.43.2.5
@@ -7,14 +7,15 @@
     @author Kars Veling
     @author Michiel Meeuwissen
     @author Nico Klasens
-    @version $Id: list.xsl,v 1.43.2.4 2008/02/19 20:16:21 andre Exp $
+    @version $Id: list.xsl,v 1.43.2.5 2008/02/21 13:48:11 andre Exp $
   -->
 
   <xsl:import href="xsl/baselist.xsl" />
 
   <xsl:param name="deletable">false</xsl:param>
   <xsl:param name="unlinkable">false</xsl:param>
-  <xsl:param name="linkable">false</xsl:param>
+  <!-- <xsl:param name="linkable">false</xsl:param> -->
+  <xsl:variable name="linkable">false</xsl:variable>
   <xsl:param name="creatable">true</xsl:param>
   <xsl:param name="relationOriginNode"><xsl:value-of select="$origin" 
/></xsl:param>
   <xsl:param name="relationRole"></xsl:param>
@@ -53,6 +54,7 @@
   <xsl:param name="distinct" />
   <xsl:param name="objecttype" />
 
+
   <!-- how about using event handlers? -->
   <xsl:variable name="BodyOnLoad">window.focus();</xsl:variable>
 
@@ -63,7 +65,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>
@@ -210,15 +212,10 @@
                   <input type="hidden" name="language" value="${language}" />
                   <input type="text" name="searchvalue" value="{$searchvalue}" 
class="search" />
 
-                    <xsl:if test="$linkable='false'">
-                      <a href="javascript:document.forms[0].submit();">
-                        <xsl:call-template name="prompt_search" />
-                      </a>
-                    </xsl:if>
-                    <xsl:if test="$linkable='true'">
                       <a href="javascript:document.forms[0].submit();">
                         <xsl:call-template name="prompt_search" />
                       </a>
+                    <xsl:if test="$nodepath != '' and $startnodes != '' and 
$relationOriginNode != ''">
                       <a href="javascript:doMySearch(this);">
                         <xsl:call-template name="prompt_search_all" />
                       </a>
@@ -384,7 +381,7 @@
         </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
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to