From: Sven Schöling <s.schoeling@linet-services.de>
Date: Thu, 15 Oct 2009 09:30:36 +0000 (+0200)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~222
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/9ef2729ab627c7c13a0c9bf4d40ec2aca83e2427?hp=138ee2dba1810f6070ce2b5bac79ebffde1f3f58

Merge branch 'master' of ssh://lx-office/~/lx-office-erp
---

diff --git a/templates/webpages/amcvar/search_filter_de.html b/templates/webpages/amcvar/search_filter_de.html
index a8dbfe456..f25b428ad 100644
--- a/templates/webpages/amcvar/search_filter_de.html
+++ b/templates/webpages/amcvar/search_filter_de.html
@@ -64,7 +64,7 @@
 [% IF hidden_cvar_filters %]
    <tr><td></td><td colspan="3"><a href="#" id="cvar_filter-toggle"><i>Klicken Sie hier, um nach benutzerdefinierten Variablen zu suchen</i></a></td></tr>
    <script type='text/javascript'>
-     $('#cvar_filter-toggle').click(function() { $('[id^="cvar_filter"]').toggle() });
-     $(document).ready(function(){ $('[id^="cvar_filter_"]').hide() });
+     $('#cvar_filter-toggle').click(function() { $('[id^="cvar_filter"]').toggle(); $('[id^="l_cvartd_"]').toggle(); });
+     $(document).ready(function(){ $('[id^="cvar_filter_"]').hide(); $('[id^="l_cvartd_"]').hide(); });
    </script>
 [% END %]
diff --git a/templates/webpages/amcvar/search_filter_master.html b/templates/webpages/amcvar/search_filter_master.html
index 35274dcbf..9151d131d 100644
--- a/templates/webpages/amcvar/search_filter_master.html
+++ b/templates/webpages/amcvar/search_filter_master.html
@@ -64,7 +64,7 @@
 [% IF hidden_cvar_filters %]
    <tr><td></td><td colspan="3"><a href="#" id="cvar_filter-toggle"><i><translate>click here to edit cvars</translate></i></a></td></tr>
    <script type='text/javascript'>
-     $('#cvar_filter-toggle').click(function() { $('[id^="cvar_filter"]').toggle() });
-     $(document).ready(function(){ $('[id^="cvar_filter_"]').hide() });
+     $('#cvar_filter-toggle').click(function() { $('[id^="cvar_filter"]').toggle(); $('[id^="l_cvartd_"]').toggle(); });
+     $(document).ready(function(){ $('[id^="cvar_filter_"]').hide(); $('[id^="l_cvartd_"]').hide(); });
    </script>
 [% END %]
diff --git a/templates/webpages/amcvar/search_include_de.html b/templates/webpages/amcvar/search_include_de.html
index 4c16c51c1..3fd967fb0 100644
--- a/templates/webpages/amcvar/search_include_de.html
+++ b/templates/webpages/amcvar/search_include_de.html
@@ -8,7 +8,7 @@
    <tr>
     [%- SET start_new_row = '0' %]
     [%- END %]
-    <td>
+    <td id="[% HTML.escape(include_prefix) %]cvartd_[% HTML.escape(var.name) %]">
      <input type="checkbox"
             name="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]"
             id="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]"
diff --git a/templates/webpages/amcvar/search_include_master.html b/templates/webpages/amcvar/search_include_master.html
index 4c16c51c1..3fd967fb0 100644
--- a/templates/webpages/amcvar/search_include_master.html
+++ b/templates/webpages/amcvar/search_include_master.html
@@ -8,7 +8,7 @@
    <tr>
     [%- SET start_new_row = '0' %]
     [%- END %]
-    <td>
+    <td id="[% HTML.escape(include_prefix) %]cvartd_[% HTML.escape(var.name) %]">
      <input type="checkbox"
             name="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]"
             id="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]"