From 601f4f28b4887975c059918c3fe5f73cd3530867 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 12 Jan 2022 11:38:24 +0100 Subject: [PATCH] E-Mails als HTML verschicken: Bearbeiten Benutzer-Signatur --- bin/mozilla/am.pl | 6 +++--- locale/de/all | 5 +++-- templates/webpages/am/config.html | 35 ++++++++++++------------------- 3 files changed, 19 insertions(+), 27 deletions(-) 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 -%]

[% title %]

@@ -34,17 +34,22 @@ - [% 'E-mail' | $T8 %] + [% 'Email address' | $T8 %] - [% 'Signature' | $T8 %] - - - [% 'Check full signature' | $T8 %] - [% 'Edit user signature' | $T8 %] - + [% 'Email signature' | $T8 %] + + [% P.textarea_tag("signature", MYCONFIG.signature, class="toggletextarea texteditor", rows="5", cols="50") %] + + + + + [% "Company's email signature" | $T8 %] + [% P.restricted_html(company_signature) %] + + [% 'Phone' | $T8 %] @@ -333,17 +338,3 @@ - - -- 2.20.1