Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp

[kivitendo-erp.git] / templates / webpages / am / config_master.html

diff --git a/templates/webpages/am/config_master.html b/templates/webpages/am/config_master.html
index 43347ee..e24919e 100644 (file)
--- a/templates/webpages/am/config_master.html
+++ b/templates/webpages/am/config_master.html
@@ -101,13 +101,11 @@
      <tr>
       <th align="right"><translate>Language</translate></th>
       <td>
-       <translate>German</translate>
-       <input type="hidden" name="countrycode" value="de">
-<!--       <select name="countrycode">
+       <select name="countrycode">
         [%- FOREACH row = COUNTRYCODES %]
         <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
         [%- END %]
-       </select>-->
+       </select>
       </td>
      </tr>
 
@@ -127,8 +125,8 @@
       <td>
        <select name="menustyle">
         <option value="v3"[% IF myconfig_menustyle == 'v3' %] selected[% END %]><translate>Top (CSS)</translate></option>
+        <option value="v4"[% IF myconfig_menustyle == 'v4' %] selected[% END %]><translate>Top (CSS) new</translate></option>
         <option value="neu"[% IF myconfig_menustyle == 'neu' %] selected[% END %]><translate>Top (Javascript)</translate></option>
-        <option value="js"[% IF myconfig_menustyle == 'js' %] selected[% END %]><translate>Top (Javascript) old</translate></option>
         <option value="xml"[% IF myconfig_menustyle == 'xml' %] selected[% END %]><translate>Top (XUL; only for Mozilla Firefox)</translate></option>
         <option value="old"[% IF myconfig_menustyle == 'old' %] selected[% END %]><translate>Old (on the side)</translate></option>
        </select>
@@ -149,6 +147,16 @@
        </select>
       </td>
      </tr>
+
+     <tr>
+      <th align="right"><translate>Show custom variable search inputs</translate></th>
+      <td>
+       <select name="hide_cvar_search_options">
+        <option value="0"[% IF !myconfig_hide_cvar_search_options %] selected[% END %]><translate>Show by default</translate></option>
+        <option value="1"[% IF  myconfig_hide_cvar_search_options %] selected[% END %]><translate>Hide by default</translate></option>
+       </select>
+      </td>
+     </tr>
     </table>
 
     <br style="clear: left" />