Merge branch 'xorg/maint' into xorg/master

[platal.git] / templates / include / jobterms.branch.tpl

diff --git a/templates/include/jobterms.branch.tpl b/templates/include/jobterms.branch.tpl
index 71a384c..c527e8a 100644 (file)
--- a/templates/include/jobterms.branch.tpl
+++ b/templates/include/jobterms.branch.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2011 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -27,14 +27,17 @@
   {ldelim}
     "data" :
     {ldelim}
-      "title" : "{$term.name|replace:'"':'\\"'}{if $filter} ({$term.nb} {$filter}{if $term.nb > 1}s{/if}){/if}",
+      "title" : "{$term.name|replace:'"':'\\"'}{if t($filter)} ({$term.nb} {$filter}{if $term.nb > 1}s{/if}){/if}",
       "attr" : {ldelim}
-        {if $attrfunc}"href" : "javascript:{$attrfunc}('{$treeid}','{$term.jtid}',\"{$term.full_name|replace:'"':'\\\\\\"'}\")",{/if}
+        {if !$jtid}"onclick" : "return false",
+        {elseif $attrfunc}"href" : "javascript:{$attrfunc}('{$treeid}','{$term.jtid}',\"{$term.full_name|replace:'"':'\\\\\\"'}\")",{/if}
         "title" : "{$term.full_name|replace:'"':'\\"'}"
       {rdelim}
     {rdelim},
-    "attr" : {ldelim} "id" : "job_terms_tree_{$treeid}_{$term.jtid}" {rdelim},
-    "state": "closed"
+    "attr" : {ldelim} "id" : "job_terms_tree_{$treeid}_{$term.jtid}" {rdelim}
+    {if !$term.leaf}
+      ,"state": "closed"
+    {/if}
   {rdelim}
 {/iterate}
 ]