X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fam%2Fconfig.html;h=d939919c1d94553759d641fcacf0957a0767dfa4;hb=0f37ddcd492b271a6b316893eda1544931c2a0ad;hp=18af4322423d3e4b1a82161e480c63e1699b3fc9;hpb=5f68c97560deb16f78ab3331e13e692981bc2c1e;p=kivitendo-erp.git

diff --git a/templates/webpages/am/config.html b/templates/webpages/am/config.html
index 18af43224..d939919c1 100644
--- a/templates/webpages/am/config.html
+++ b/templates/webpages/am/config.html
@@ -1,11 +1,9 @@
 [%- USE T8 %]
 [%- USE LxERP %]
 [%- USE HTML %][%- USE L %]
- <div class="listtop">[% title %]</div>
-
- <form method="post" action="am.pl" name="Form">
-  <input type="hidden" name="type" value="preferences">
+<h1>[% title %]</h1>
 
+ <form method="post" action="am.pl" name="Form" id="form">
   <div class="tabwidget">
    <ul>
     <li><a href="#page_personal_settings">[% 'Personal settings' | $T8 %]</a></li>
@@ -19,7 +17,7 @@
     <table>
      <tr>
       <th align="right">[% 'Name' | $T8 %]</th>
-      <td><input name="name" size="15" value="[% HTML.escape(myconfig_name) %]"></td>
+      <td><input name="name" size="15" value="[% HTML.escape(MYCONFIG.name) %]"></td>
      </tr>
 
      <tr>
@@ -35,40 +33,55 @@
 
      <tr>
       <th align="right">[% 'E-mail' | $T8 %]</th>
-      <td><input name="email" size="30" value="[% HTML.escape(myconfig_email) %]"></td>
+      <td><input name="email" size="30" value="[% HTML.escape(MYCONFIG.email) %]"></td>
      </tr>
 
      <tr valign="top">
       <th align="right">[% 'Signature' | $T8 %]</th>
-      <td><textarea name="signature" rows="3" cols="50">[% HTML.escape(myconfig_signature) %]</textarea></td>
-     </tr>
-
+      <td><textarea id="signature" name="signature" class="toggletextarea" rows="5" cols="50">[% HTML.escape(MYCONFIG.signature) %] </textarea>
+         <span id="full_signature" class="toggletextarea"> <textarea readonly name="full_signature" rows="10" cols="50" >[% HTML.escape(full_signature) %]</textarea> </span>
+         <a href="#" class="togglelink">[% 'Check full signature' | $T8 %]</a>
+         <a href="#" id="edit_signature" class="togglelink">[% 'Edit user signature' | $T8 %]</a>
+          </td> </tr>
      <tr>
       <th align="right">[% 'Phone' | $T8 %]</th>
-      <td><input name="tel" size="14" value="[% HTML.escape(myconfig_tel) %]"></td>
+      <td><input name="tel" size="14" value="[% HTML.escape(MYCONFIG.tel) %]"></td>
      </tr>
 
      <tr>
       <th align="right">[% 'Fax' | $T8 %]</th>
-      <td><input name="fax" size="14" value="[% HTML.escape(myconfig_fax) %]"></td>
-     </tr>
-     <tr>
-      <th align="right">[% 'Company' | $T8 %]</th>
-      <td><input name="company" size="30" value="[% HTML.escape(myconfig_company) %]"></td>
-     </tr>
-     <tr valign="top">
-      <th align="right">[% 'Address' | $T8 %]</th>
-      <td><textarea name="address" rows="4" cols="50">[% HTML.escape(myconfig_address) %]</textarea></td>
-     </tr>
-     <tr>
-      <th align="right">[% 'SEPA creditor ID' | $T8 %]</th>
-      <td><input name="sepa_creditor_id" size="30" maxlength="35" value="[% HTML.escape(myconfig_sepa_creditor_id) %]"></td>
+      <td><input name="fax" size="14" value="[% HTML.escape(MYCONFIG.fax) %]"></td>
      </tr>
 
-       <tr>
-        <th align="right"q>[% 'taxincluded checked' | $T8 %]</th>
+      <tr>
+        <th align="right">[% 'taxincluded checked' | $T8 %]</th>
+        <td>
+          [% L.yes_no_tag('taxincluded_checked', MYCONFIG.taxincluded_checked) %]
+        </td>
+      </tr>
+
+      <tr>
+        <th align="right">[% 'Focus position after update' | $T8 %]</th>
+        <td>
+          [% L.select_tag(
+            'focus_position',
+            [
+              ['new_description',  LxERP.t8('New row, description')],
+              ['new_partnumber',   LxERP.t8('New row, partnumber')],
+              ['new_qty',          LxERP.t8('New row, qty')],
+              ['last_description', LxERP.t8('Last row, description')],
+              ['last_partnumber',  LxERP.t8('Last row, partnumber')],
+              ['last_qty',         LxERP.t8('Last row, qty')],
+            ],
+            default => MYCONFIG.focus_position)
+          %]
+        </td>
+      </tr>
+
+      <tr>
+        <th align="right">[% 'Item multi selection with qty' | $T8 %]</th>
         <td>
-          [% L.yes_no_tag('taxincluded_checked', myconfig_taxincluded_checked) %]
+          [% L.yes_no_tag('item_multiselect', MYCONFIG.item_multiselect) %]
         </td>
       </tr>
 
@@ -84,6 +97,12 @@
         [% L.select_tag('dateformat', DATEFORMATS, value_key = 'value', title_key = 'name') %]
       </td>
      </tr>
+     <tr>
+       <th align="right">[% 'Time Format' | $T8 %]</th>
+       <td>
+         [% L.select_tag('timeformat', TIMEFORMATS, value_key = 'value', title_key = 'name') %]
+       </td>
+     </tr>
      <tr>
       <th align="right">[% 'Output Number Format' | $T8 %]</th>
       <td>
@@ -91,11 +110,6 @@
       </td>
      </tr>
 
-     <tr>
-      <th align="right">[% 'Dropdown Limit' | $T8 %]</th>
-      <td><input name="vclimit" size="10" value="[% HTML.escape(myconfig_vclimit) %]"></td>
-     </tr>
-
      <tr>
       <th align="right">[% 'Language' | $T8 %]</th>
       <td>
@@ -114,9 +128,9 @@
       <th align="right">[% 'Setup Menu' | $T8 %]</th>
       <td>
        <select name="menustyle">
-        <option value="old"[% IF myconfig_menustyle == 'old' %] selected[% END %]>[% 'Old (on the side)' | $T8 %]</option>
-        <option value="v3"[% IF myconfig_menustyle == 'v3' %] selected[% END %]>[% 'Top (CSS)' | $T8 %]</option>
-        <option value="neu"[% IF myconfig_menustyle == 'neu' %] selected[% END %]>[% 'Top (Javascript)' | $T8 %]</option>
+        <option value="old"[% IF MYCONFIG.menustyle == 'old' %] selected[% END %]>[% 'Old (on the side)' | $T8 %]</option>
+        <option value="v3"[% IF MYCONFIG.menustyle == 'v3' %] selected[% END %]>[% 'Top (CSS)' | $T8 %]</option>
+        <option value="neu"[% IF MYCONFIG.menustyle == 'neu' %] selected[% END %]>[% 'Top (Javascript)' | $T8 %]</option>
        </select>
       </td>
      </tr>
@@ -125,8 +139,8 @@
       <th align="right">[% 'Form details (second row)' | $T8 %]</th>
       <td>
        <select name="show_form_details">
-        <option value="1"[% IF  myconfig_show_form_details %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
-        <option value="0"[% IF !myconfig_show_form_details %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
+        <option value="1"[% IF  MYCONFIG.show_form_details %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
+        <option value="0"[% IF !MYCONFIG.show_form_details %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
        </select>
       </td>
      </tr>
@@ -135,18 +149,26 @@
       <th align="right">[% 'Show custom variable search inputs' | $T8 %]</th>
       <td>
        <select name="hide_cvar_search_options">
-        <option value="0"[% IF !myconfig_hide_cvar_search_options %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
-        <option value="1"[% IF  myconfig_hide_cvar_search_options %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
+        <option value="0"[% IF !MYCONFIG.hide_cvar_search_options %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
+        <option value="1"[% IF  MYCONFIG.hide_cvar_search_options %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
        </select>
       </td>
      </tr>
+
+     <tr>
+      <th align="right">[% 'Number of columns of custom variables in form details (second row)' | $T8 %]</th>
+      <td>
+        [% L.input_tag('form_cvars_nr_cols',  MYCONFIG.form_cvars_nr_cols || 3,  size = 5) %]
+      </td>
+     </tr>
+
     </table>
    </div>
 
    <div id="page_print_options">
 
     <table>
-     <input name="printer" type="hidden" value="[% HTML.escape(myconfig_printer) %]">
+     <input name="printer" type="hidden" value="[% HTML.escape(MYCONFIG.printer) %]">
 
      <tr>
       <th align="right">[% 'Default template format' | $T8 %]</th>
@@ -165,13 +187,13 @@
      <tr>
       <th align="right">[% 'Default printer' | $T8 %]</th>
       <td>
-       [% L.select_tag('default_printer_id', PRINTERS, default = myconfig_default_printer_id, title_key = 'printer_description', with_empty = 1) %]
+       [% L.select_tag('default_printer_id', PRINTERS, default = MYCONFIG.default_printer_id, title_key = 'printer_description', with_empty = 1) %]
       </td>
      </tr>
 
      <tr>
       <th align="right">[% 'Number of copies' | $T8 %]</th>
-      <td><input name="copies" size="10" value="[% HTML.escape(myconfig_copies) %]"></td>
+      <td><input name="copies" size="10" value="[% HTML.escape(MYCONFIG.copies) %]"></td>
      </tr>
     </table>
    </div>
@@ -180,7 +202,7 @@
 
     <table>
      <tr>
-      <th align="right">[% 'Show your TODO list after loggin in' | $T8 %]</th>
+      <th align="right">[% 'Show your TODO list after logging in' | $T8 %]</th>
       <td colspan="2">
        <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_1" value="1"[% IF todo_cfg.show_after_login %] checked[% END %]>
        <label for="todo_cfg_show_after_login_1">[% 'Yes' | $T8 %]</label>
@@ -201,11 +223,11 @@
       </td>
       <td>
        <input type="checkbox" name="todo_cfg.show_follow_ups_login" id="todo_cfg_show_follow_ups_login" value="1"[% IF todo_cfg.show_follow_ups_login %] checked[% END %]>
-       <label for="todo_cfg_show_follow_ups_login">[% '...after loggin in' | $T8 %]</label>
+       <label for="todo_cfg_show_follow_ups_login">[% '...after logging in' | $T8 %]</label>
       </td>
      </tr>
 
-     [%- IF AUTH_RIGHTS_SALES_QUOTATION_EDIT %]
+     [%- IF AUTH.assert('sales_quotation_edit', 'may_fail') %]
      <tr>
       <th align="right">[% 'Show overdue sales quotations and requests for quotations...' | $T8 %]</th>
       <td>
@@ -214,13 +236,25 @@
       </td>
       <td>
        <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations_login" id="todo_cfg_show_overdue_sales_quotations_login" value="1"[% IF todo_cfg.show_overdue_sales_quotations_login %] checked[% END %]>
-       <label for="todo_cfg_show_overdue_sales_quotations_login">[% '...after loggin in' | $T8 %]</label>
+       <label for="todo_cfg_show_overdue_sales_quotations_login">[% '...after logging in' | $T8 %]</label>
       </td>
      </tr>
      [%- END %]
     </table>
    </div>
   </div>
-
-  <p><input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]"></p>
  </form>
+
+ <script type="text/javascript">
+  <!--
+$(function() {
+  $("#full_signature").toggle();
+  $("#edit_signature").toggle();
+  $('.togglelink').click(function() {
+    $('.toggletextarea').toggle();
+    $('.togglelink').toggle();
+    return false;
+  });
+});
+    -->
+ </script>

[% 'taxincluded checked' \| $T8 %]
[% 'Name' \| $T8 %]
[% 'E-mail' \| $T8 %]
[% 'Signature' \| $T8 %]	[% HTML.escape(myconfig_signature) %]
[% HTML.escape(MYCONFIG.signature) %] + [% HTML.escape(full_signature) %] + [% 'Check full signature' \| $T8 %] + [% 'Edit user signature' \| $T8 %] +
[% 'Phone' \| $T8 %]
[% 'Fax' \| $T8 %]
[% 'Company' \| $T8 %]
[% 'Address' \| $T8 %]	[% HTML.escape(myconfig_address) %]
[% 'SEPA creditor ID' \| $T8 %]
[% 'taxincluded checked' \| $T8 %]	+ [% L.yes_no_tag('taxincluded_checked', MYCONFIG.taxincluded_checked) %] +
[% 'Focus position after update' \| $T8 %]	+ [% L.select_tag( + 'focus_position', + [ + ['new_description', LxERP.t8('New row, description')], + ['new_partnumber', LxERP.t8('New row, partnumber')], + ['new_qty', LxERP.t8('New row, qty')], + ['last_description', LxERP.t8('Last row, description')], + ['last_partnumber', LxERP.t8('Last row, partnumber')], + ['last_qty', LxERP.t8('Last row, qty')], + ], + default => MYCONFIG.focus_position) + %] +
[% 'Item multi selection with qty' \| $T8 %]	- [% L.yes_no_tag('taxincluded_checked', myconfig_taxincluded_checked) %] + [% L.yes_no_tag('item_multiselect', MYCONFIG.item_multiselect) %]
[% 'Time Format' \| $T8 %]	+ [% L.select_tag('timeformat', TIMEFORMATS, value_key = 'value', title_key = 'name') %] +
[% 'Output Number Format' \| $T8 %]	@@ -91,11 +110,6 @@
[% 'Dropdown Limit' \| $T8 %]
[% 'Language' \| $T8 %]	@@ -114,9 +128,9 @@	[% 'Setup Menu' \| $T8 %]
[% 'Form details (second row)' \| $T8 %]
[% 'Show custom variable search inputs' \| $T8 %]
[% 'Number of columns of custom variables in form details (second row)' \| $T8 %]	+ [% L.input_tag('form_cvars_nr_cols', MYCONFIG.form_cvars_nr_cols \|\| 3, size = 5) %] +
[% 'Default template format' \| $T8 %]
[% 'Default printer' \| $T8 %]	- [% L.select_tag('default_printer_id', PRINTERS, default = myconfig_default_printer_id, title_key = 'printer_description', with_empty = 1) %] + [% L.select_tag('default_printer_id', PRINTERS, default = MYCONFIG.default_printer_id, title_key = 'printer_description', with_empty = 1) %]
[% 'Number of copies' \| $T8 %]
[% 'Show your TODO list after loggin in' \| $T8 %]	[% 'Show your TODO list after logging in' \| $T8 %]	[% 'Yes' \| $T8 %] @@ -201,11 +223,11 @@		- [% '...after loggin in' \| $T8 %] + [% '...after logging in' \| $T8 %]
[% 'Show overdue sales quotations and requests for quotations...' \| $T8 %]	@@ -214,13 +236,25 @@	- [% '...after loggin in' \| $T8 %] + [% '...after logging in' \| $T8 %]