X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Famcvar%2Fsearch_filter.html;h=96b774418d9e65437bdc0cf1ef25e1ba137222d3;hb=b4ddf2d433ca367128cdab950d2fcc391657de38;hp=db37d08a7ec300f5d66e653786edd037fc2b30f3;hpb=8084ef359515031ec8429b49baf0ab09858f55d2;p=kivitendo-erp.git

diff --git a/templates/webpages/amcvar/search_filter.html b/templates/webpages/amcvar/search_filter.html
index db37d08a7..96b774418 100644
--- a/templates/webpages/amcvar/search_filter.html
+++ b/templates/webpages/amcvar/search_filter.html
@@ -1,4 +1,5 @@
 [%- USE T8 %]
+[%- USE L %]
 [% USE HTML %]
 
    [%- FOREACH var = variables %]
@@ -8,35 +9,20 @@
     <td valign="top">
 
      [%- IF var.type == 'bool' %]
-     <select name="cvar_[% HTML.escape(var.name) %]">
+     <select name="[% filter_prefix %]cvar_[% HTML.escape(var.name) %]">
       <option value="">---</option>
       <option value="yes">[% 'Yes' | $T8 %]</option>
       <option value="no">[% 'No' | $T8 %]</option>
      </select>
 
      [%- ELSIF var.type == 'date' %]
-     [% 'from (time)' | $T8 %]
-     <input name="cvar_[% HTML.escape(var.name) %]_from" id="cvar_[% HTML.escape(var.name) %]_from" size="12">
-     <input type="button" name="cvar_[% HTML.escape(var.name) %]_from_button" id="cvar_[% HTML.escape(var.name) %]_from_trigger" value="?">
-     [% 'to (time)' | $T8 %]
-     <input name="cvar_[% HTML.escape(var.name) %]_to" id="cvar_[% HTML.escape(var.name) %]_to" size="12">
-     <input type="button" name="cvar_[% HTML.escape(var.name) %]_to_button" id="cvar_[% HTML.escape(var.name) %]_to_trigger" value="?">
+     [% L.date_tag(filter_prefix _'cvar_'_ HTML.escape(var.name) _'_from') %]
 
-     <script type="text/javascript">
-      <!--
-          Calendar.setup({ inputField : "cvar_[% HTML.escape(var.name) %]_from",
-                           ifFormat   :"[% myconfig_jsc_dateformat %]",
-                           align      : "BR",
-                           button     : "cvar_[% HTML.escape(var.name) %]_from_trigger" });
-          Calendar.setup({ inputField : "cvar_[% HTML.escape(var.name) %]_to",
-                           ifFormat   :"[% myconfig_jsc_dateformat %]",
-                           align      : "BR",
-                           button     : "cvar_[% HTML.escape(var.name) %]_to_trigger" });
-        -->
-     </script>
+     [% 'to (time)' | $T8 %]
+     [% L.date_tag(filter_prefix _'cvar_'_ HTML.escape(var.name) _'_to') %]
 
      [%- ELSIF var.type == 'number' %]
-     <select name="cvar_[% HTML.escape(var.name) %]_qtyop">
+     <select name="[% filter_prefix %]cvar_[% HTML.escape(var.name) %]_qtyop">
       <option selected>==</option>
       <option>=/=</option>
       <option>&gt;</option>
@@ -44,13 +30,13 @@
       <option>&lt;</option>
       <option>&lt;=</option>
      </select>
-     <input name="cvar_[% HTML.escape(var.name) %]"[% IF var.maxlength %]maxlength="[% HTML.escape(var.maxlength) %]"[% END %]>
+     <input name="[% filter_prefix %]cvar_[% HTML.escape(var.name) %]"[% IF var.maxlength %]maxlength="[% HTML.escape(var.maxlength) %]"[% END %]>
 
      [%- ELSIF var.type == 'customer' %]
-     <input name="cvar_[% var.name | html %]">
+     <input name="[% filter_prefix %]cvar_[% var.name | html %]">
 
      [% ELSIF var.type == 'select' %]
-     <select name="cvar_[% HTML.escape(var.name) %]">
+     <select name="[% filter_prefix %]cvar_[% HTML.escape(var.name) %]">
       <option value="" selected>---</option>
       [%- FOREACH option = var.OPTIONS %]
       <option>[% HTML.escape(option.value) %]</option>
@@ -58,7 +44,7 @@
      </select>
 
      [%- ELSE %]
-     <input name="cvar_[% HTML.escape(var.name) %]"[% IF var.maxlength %]maxlength="[% HTML.escape(var.maxlength) %]"[% END %]>
+     <input name="[% filter_prefix %]cvar_[% HTML.escape(var.name) %]"[% IF var.maxlength %]maxlength="[% HTML.escape(var.maxlength) %]"[% END %]>
 
      [%- END %]
     </td>
@@ -66,9 +52,22 @@
    [%- END %]
    [%- END %]
 [% IF hidden_cvar_filters %]
-   <tr><td></td><td colspan="3"><a href="#" id="cvar_filter-toggle"><i>[% 'click here to edit cvars' | $T8 %]</i></a></td></tr>
-   <script type='text/javascript'>
-     $('#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>
+  <tr class="cvar_filter-toggle-wrapper">
+    <td></td>
+    <td colspan="3">
+      <a href="javascript:void(0);" class="cvar_filter-toggle"><i>[% 'click here to edit cvars' | $T8 %]</i></a>
+    </td>
+  </tr>
+  <script type='text/javascript'>
+    $(function(){
+      $('[id^="cvar_filter_"]').hide();
+      $('[id^="l_cvartd_"]').hide();
+
+      $('a.cvar_filter-toggle').click(function(){
+        $(".cvar_filter-toggle-wrapper").hide();
+        $('[id^="cvar_filter"]').show();
+        $('[id^="l_cvartd_"]').show();
+      });
+    });
+  </script>
 [% END %]