From: Moritz Bunkus <m.bunkus@linet.de>
Date: Wed, 12 Jan 2022 10:38:24 +0000 (+0100)
Subject: E-Mails als HTML verschicken: Bearbeiten Benutzer-Signatur
X-Git-Tag: kivitendo-mebil_0.1-0~10^2~2^2~220^2~8
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=601f4f28b4887975c059918c3fe5f73cd3530867;p=kivitendo-erp.git

E-Mails als HTML verschicken: Bearbeiten Benutzer-Signatur
---

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 0b35fc7d9..e24fae6c5 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -669,14 +669,14 @@ sub config {
   $myconfig{show_form_details} = 1 unless (defined($myconfig{show_form_details}));
   $form->{CAN_CHANGE_PASSWORD} = $main::auth->can_change_password();
   $form->{todo_cfg}            = { TODO->get_user_config('login' => $::myconfig{login}) };
-
-  $::request->{layout}->use_javascript("jquery.multiselect2side.js");
   $form->{title}               = $locale->text('Edit Preferences for #1', $::myconfig{login});
 
+  $::request->{layout}->use_javascript("${_}.js") for qw(jquery.multiselect2side ckeditor/ckeditor ckeditor/adapters/jquery);
+
   setup_am_config_action_bar();
   $form->header();
 
-  $form->{full_signature} = $form->create_email_signature();
+  $form->{company_signature} = SL::DB::Default->get->signature;
 
   print $form->parse_html_template('am/config');
 
diff --git a/locale/de/all b/locale/de/all
index 79188448f..671d9c3dd 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -649,7 +649,6 @@ $self->{texts} = {
   'Check Details'               => 'Bitte Angaben überprüfen',
   'Check connectivity'          => 'Verbindungstest',
   'Check for duplicates'        => 'Dublettencheck',
-  'Check full signature'        => 'Volle Signatur prüfen',
   'Check on ap transaction'     => 'Prüfen bei Kreditorenbuchung',
   'Check on ar transaction'     => 'Prüfen bei Debitorenbuchung',
   'Check on gl transaction'     => 'Prüfen bei Dialogbuchung',
@@ -698,6 +697,7 @@ $self->{texts} = {
   'Company name'                => 'Firmenname',
   'Company name and address'    => 'Firmenname und -adresse',
   'Company settings'            => 'Firmeneinstellungen',
+  'Company\'s email signature'  => 'Firmen-E-Mail-Signatur',
   'Compare to'                  => 'Gegenüberstellen zu',
   'Complexities'                => 'Komplexitätsgrade',
   'Complexity'                  => 'Komplexität',
@@ -1325,14 +1325,15 @@ $self->{texts} = {
   'Edit time recordings of all staff members' => 'Zeiterfassungseinträge aller Mitarbeiter bearbeiten',
   'Edit title'                  => 'Titiel bearbeiten',
   'Edit units'                  => 'Einheiten bearbeiten',
-  'Edit user signature'         => 'Benutzersignatur bearbeiten',
   'Editable'                    => 'Bearbeitbar',
   'Either there are no open invoices, or you have already initiated bank transfers with the open amounts for those that are still open.' => 'Entweder gibt es keine offenen Rechnungen, oder es wurden bereits Überweisungen über die offenen Beträge aller offenen Rechnungen erstellt.',
   'Element disabled'            => 'Element deaktiviert',
   'Email'                       => 'E-Mail',
+  'Email address'               => 'E-Mail-Adresse',
   'Email journal'               => 'E-Mail-Journal',
   'Email of the delivery order recipient' => 'E-Mail des Lieferscheinempfängers',
   'Email of the invoice recipient' => 'E-Mail des Rechnungsempfängers',
+  'Email signature'             => 'E-Mail-Signatur',
   'Employee'                    => 'Bearbeiter',
   'Employee #1 saved!'          => 'Benutzer #1 gespeichert!',
   'Employee (database ID)'      => 'Bearbeiter (Datenbank-ID)',
diff --git a/templates/webpages/am/config.html b/templates/webpages/am/config.html
index 6901cba8c..a1094aab6 100644
--- a/templates/webpages/am/config.html
+++ b/templates/webpages/am/config.html
@@ -1,7 +1,7 @@
 [%- USE T8 %]
 [%- USE LxERP %]
 [%- USE HTML %]
-[%- USE L %]
+[%- USE L %][%- USE P -%]
 
 <h1>[% title %]</h1>
 
@@ -34,17 +34,22 @@
      </tr>
 
      <tr>
-      <th align="right">[% 'E-mail' | $T8 %]</th>
+      <th align="right">[% 'Email address' | $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 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>
+      <th align="right">[% 'Email signature' | $T8 %]</th>
+      <td>
+       [% P.textarea_tag("signature", MYCONFIG.signature, class="toggletextarea texteditor", rows="5", cols="50") %]
+      </td>
+     </tr>
+
+     <tr valign="top">
+      <th align="right">[% "Company's email signature" | $T8 %]</th>
+      <td>[% P.restricted_html(company_signature) %]</td>
+     </tr>
+
      <tr>
       <th align="right">[% 'Phone' | $T8 %]</th>
       <td><input name="tel" size="14" value="[% HTML.escape(MYCONFIG.tel) %]"></td>
@@ -333,17 +338,3 @@
    </div>
   </div>
  </form>
-
- <script type="text/javascript">
-  <!--
-$(function() {
-  $("#full_signature").toggle();
-  $("#edit_signature").toggle();
-  $('.togglelink').click(function() {
-    $('.toggletextarea').toggle();
-    $('.togglelink').toggle();
-    return false;
-  });
-});
-    -->
- </script>