vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #23520 from niraj2477/feat/subject-in-timeline-mail

Browse source
This commit is contained in:
Shariq Ansari 2023-12-01 20:01:30 +05:30 • committed by GitHub
commit 856beca884
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
frappe/public/js/frappe/form/templates/timeline_message_box.html
View file

@ -30,8 +30,9 @@
<span>
{{ frappe.avatar(doc.owner, "avatar-medium") }}
<span class="ml-2" style="font-size: var(--text-base);">{{ doc.user_full_name || frappe.user.full_name(doc.owner) }}</span>
<span style="color: var(--text-muted);">{{ __("commented") }}</span>
<span class="margin-left" style="color: var(--text-muted);">
<span class="text-muted">{{ __("commented") }}</span>
<span> . </span>
<span class="margin-left text-muted">
{{ comment_when(doc.creation) }}
</span>
</span>
@ -39,15 +40,19 @@
<span class="margin-right">
{{ frappe.avatar(doc.owner, "avatar-medium") }}
</span>
<span>
<div>
{{ doc.user_full_name || frappe.user.full_name(doc.owner) }}
<div class="text-muted">
<span> . </span>
<span class="text-muted">
{{ comment_when(doc.creation) }}
</div>
</span>
</span>
{% if (doc.subject) { %}
<div class="text-muted my-1">{{doc.subject}}</div>
{% } %}
</div>
{% } %}
</span>
<span class="actions">
<span class="actions" style="flex-shrink: 0">
{% if (doc._doc_status && doc._doc_status_indicator) { %}
<span class="indicator-pill {%= doc._doc_status_indicator %}"
title="{%= __(doc._doc_status) %}"