X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fam%2Fconfig.html;h=bbc111300168d8219b49fbc29402136e4ecfd2fb;hb=24007946755885adbed25cb4203ce3e79bc19839;hp=c32e1789395dfa5c9cdb3eb366c5f6a7f89bab0d;hpb=841d44c00aae1166a0721e40dc2f9ffb7b9ac5b5;p=kivitendo-erp.git

diff --git a/templates/webpages/am/config.html b/templates/webpages/am/config.html
index c32e17893..bbc111300 100644
--- a/templates/webpages/am/config.html
+++ b/templates/webpages/am/config.html
@@ -37,12 +37,14 @@
       <th align="right">[% 'E-mail' | $T8 %]</th>
       <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>
@@ -53,8 +55,8 @@
       <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>
@@ -72,6 +74,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>
@@ -168,7 +176,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>
@@ -189,7 +197,7 @@
       </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>
 
@@ -202,7 +210,7 @@
       </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 %]
@@ -212,3 +220,17 @@
 
   <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>