- {%= i+1 %}. {%= addr_list[i].address_title %}{% if(addr_list[i].address_type!="Other") { %} - ({%= __(addr_list[i].address_type) %}){% } %} - {% if(addr_list[i].is_primary_address) { %} - ({%= __("Primary") %}){% } %} - {% if(addr_list[i].is_shipping_address) { %} - ({%= __("Shipping") %}){% } %} - {% if(addr_list[i].disabled) { %} - ({%= __("Disabled") %}){% } %} +{% for (const addr of addr_list) { %} +
+ {%= addr.address_title %} + {% if (addr.address_type !== "Other") { %} + · + {%= __(addr.address_type) %} + {% } %} + {% if (addr.is_primary_address) { %} + · + {%= __("Primary Address") %} + {% } %} + {% if (addr.is_shipping_address) { %} + · + {%= __("Shipping Address") %} + {% } %} + {% if (addr.disabled) { %} + · + {%= __("Disabled") %} + {% } %} +
+{%= addr.display %}
+{%= addr_list[i].display %}
- +{% if (!addr_list.length) { %} +{%= __("No address added yet.") %}
{% } %} -{% if(!addr_list.length) { %} -{%= __("No address added yet.") %}
-{% } %} - \ No newline at end of file + ++ +
diff --git a/frappe/public/js/frappe/form/templates/contact_list.html b/frappe/public/js/frappe/form/templates/contact_list.html index c4cc08a549..ef11831f3f 100644 --- a/frappe/public/js/frappe/form/templates/contact_list.html +++ b/frappe/public/js/frappe/form/templates/contact_list.html @@ -1,42 +1,74 @@ -{% for(const contact of contact_list) { %} +{% for (const contact of contact_list) { %}- {%= contact.first_name %} {%= contact.last_name %} - {% if(contact.is_primary_contact) { %} - ({%= __("Primary") %}) + + + +
+ {%= contact.first_name %} {%= contact.last_name %} + {% if (contact.is_primary_contact) { %} + · + {%= __("Primary Contact") %} {% } %} - {% if(contact.designation){ %} - – {%= contact.designation %} + {% if (contact.is_billing_contact) { %} + · + {%= __("Billing Contact") %} + {% } %} + {% if (contact.designation){ %} + · + {%= contact.designation %} {% } %} - - {%= __("Edit") %} -
{% if (contact.phone || contact.mobile_no || contact.phone_nos.length > 0) { %}
- {% if(contact.phone) { %}
- {%= frappe.utils.escape_html(contact.phone) %} · {%= __("Primary Phone") %}
+ {% if (contact.phone) { %}
+
+ {%= frappe.utils.escape_html(contact.phone) %}
+
+ ·
+ {%= __("Primary Phone") %}
+
{% endif %}
- {% if(contact.mobile_no) { %}
- {%= frappe.utils.escape_html(contact.mobile_no) %} · {%= __("Primary Mobile") %}
+ {% if (contact.mobile_no) { %}
+
+ {%= frappe.utils.escape_html(contact.mobile_no) %}
+
+ ·
+ {%= __("Primary Mobile") %}
+
{% endif %}
- {% if(contact.phone_nos) { %}
- {% for(const phone_no of contact.phone_nos) { %}
- {%= frappe.utils.escape_html(phone_no.phone) %}
+ {% if (contact.phone_nos) { %}
+ {% for (const phone_no of contact.phone_nos) { %}
+
+ {%= frappe.utils.escape_html(phone_no.phone) %}
+
+
{% } %}
{% endif %}
- {% if(contact.email_id) { %}
- {%= frappe.utils.escape_html(contact.email_id) %} · {%= __("Primary Email") %}
+ {% if (contact.email_id) { %}
+
+ {%= frappe.utils.escape_html(contact.email_id) %}
+
+ ·
+ {%= __("Primary Email") %}
+
{% endif %}
- {% if(contact.email_ids) { %}
- {% for(const email_id of contact.email_ids) { %}
- {%= frappe.utils.escape_html(email_id.email_id) %}
+ {% if (contact.email_ids) { %}
+ {% for (const email_id of contact.email_ids) { %}
+
+ {%= frappe.utils.escape_html(email_id.email_id) %}
+
+
{% } %}
{% endif %}
{%= __("No contacts added yet.") %}
+ +{% if (!contact_list.length) { %} +{%= __("No contacts added yet.") %}
{% } %} -+ +
+
diff --git a/frappe/public/scss/common/controls.scss b/frappe/public/scss/common/controls.scss index 9fe5f82a35..77e104098d 100644 --- a/frappe/public/scss/common/controls.scss +++ b/frappe/public/scss/common/controls.scss @@ -149,9 +149,19 @@ select.form-control { border-radius: var(--border-radius); font-size: var(--text-sm); word-wrap: break-word; + position: relative; p:last-child { margin-bottom: 0; } + .edit-btn { + position: absolute; + top: 5px; + right: 5px; + display: flex; + justify-content: center; + align-items: center; + padding: var(--padding-sm); + } } .action-btn { position: absolute; diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv index cf27bbe449..a6d84ba8e1 100644 --- a/frappe/translations/de.csv +++ b/frappe/translations/de.csv @@ -1384,7 +1384,7 @@ Is Globally Pinned,Wird global gepinnt, Is Home Folder,Ist Ordner für Startseite, Is Mandatory Field,Ist Pflichtfeld, Is Pinned,Ist angeheftet, -Is Primary Contact,Ist primärer Ansprechpartner, +Is Primary Contact,Ist Hauptkontakt, Is Private,Ist Privat, Is Published Field,Ist Veröffentlicht Feld, Is Published Field must be a valid fieldname,Ist Veröffentlicht Feld muss eine gültige Feldname sein, @@ -1940,6 +1940,11 @@ Preview Message,Vorschau Nachricht, Previous,Vorhergehende, Previous Hash,Vorheriger Hash, Primary Color,Primärfarbe, +Primary Address,Hauptadresse, +Primary Contact,Hauptkontakt, +Primary Email,Haupt-E-Mail, +Primary Mobile,Haupt-Mobiltelefon, +Primary Phone,Haupttelefon, Print Documents,Dokumente drucken, Print Format Builder,Programm zum Erstellen von Druckformaten, Print Format Help,Hilfe zu Druckformaten, @@ -4851,6 +4856,7 @@ Anonymous,Anonym, Author,Autor, Basic,Grundeinkommen, Billing,Abrechnung, +Billing Contact,Abrechnungskontakt, Contact Details,Kontakt-Details, Datetime,Datum und Uhrzeit, Enable,ermöglichen, @@ -4879,6 +4885,7 @@ Saved,Gespeichert, Series {0} already used in {1},Serie {0} bereits verwendet in {1}, Set as Default,Als Standard festlegen, Shipping,Versand, +Shipping Address,Lieferadresse, Standard,Standard, Test,Test, Traceback,Zurück verfolgen,