From 37a5e6e5b2d76e6775f673f6635377fb230136d5 Mon Sep 17 00:00:00 2001
From: Torsten Oppermann <torsten@sgalinski.de>
Date: Mon, 27 Feb 2017 10:47:18 +0100
Subject: [PATCH] [TASK] Adding Bootstrap modal, fixed some translations, show
mail body in modal
---
Resources/Private/Language/de.locallang.xlf | 28 ++++++++-------
Resources/Private/Language/locallang.xlf | 15 ++++----
Resources/Private/Templates/Queue/Index.html | 36 +++++++++++++++++++-
Resources/Public/Scripts/Backend.js | 6 ++++
4 files changed, 66 insertions(+), 19 deletions(-)
diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf
index 15337cd7..b005face 100644
--- a/Resources/Private/Language/de.locallang.xlf
+++ b/Resources/Private/Language/de.locallang.xlf
@@ -10,8 +10,8 @@
</header>
<body>
<trans-unit id="backend.bcc" approved="yes">
- <source>Bcc (Comma separated if multiple):</source>
- <target>Bcc (Komma separiert wenn mehrere):</target>
+ <source>Bcc (Comma separated if multiple)</source>
+ <target>Bcc (Komma separiert wenn mehrere)</target>
</trans-unit>
<trans-unit id="backend.button_reset" approved="yes">
<source>Reset Template</source>
@@ -22,8 +22,8 @@
<target>Alles Zurücksetzen</target>
</trans-unit>
<trans-unit id="backend.cc" approved="yes" xml:space="preserve">
- <source>cc (Comma separated if multiple):</source>
- <target>cc (Komma separiert wenn mehrere):</target>
+ <source>cc (Comma separated if multiple)</source>
+ <target>cc (Komma separiert wenn mehrere)</target>
</trans-unit>
<trans-unit id="backend.content" approved="yes">
<source>Text</source>
@@ -50,12 +50,12 @@
<target>Absender</target>
</trans-unit>
<trans-unit id="backend.fromMail" approved="yes">
- <source>From E-Mail Address:</source>
- <target>Absender Email Adresse:</target>
+ <source>From E-Mail Address</source>
+ <target>Absender Email Adresse</target>
</trans-unit>
<trans-unit id="backend.fromName" approved="yes">
- <source>From Name:</source>
- <target>Absender Name:</target>
+ <source>From Name</source>
+ <target>Absender Name</target>
</trans-unit>
<trans-unit id="backend.mail_queue" approved="yes">
<source>Mail Queue</source>
@@ -90,8 +90,8 @@
<target>Priorität</target>
</trans-unit>
<trans-unit id="backend.replyTo" approved="yes">
- <source>Reply to:</source>
- <target>Antwort Adresse:</target>
+ <source>Reply to</source>
+ <target>Antwort Adresse</target>
</trans-unit>
<trans-unit id="backend.save" approved="yes">
<source>Save</source>
@@ -121,9 +121,13 @@
<source>Sent</source>
<target>Versendet</target>
</trans-unit>
+ <trans-unit id="backend.showBody" approved="yes">
+ <source>Show Mail</source>
+ <target>Mail anzeigen</target>
+ </trans-unit>
<trans-unit id="backend.subject" approved="yes">
- <source>Subject:</source>
- <target>Betreff:</target>
+ <source>Subject</source>
+ <target>Betreff</target>
</trans-unit>
<trans-unit id="backend.success" approved="yes">
<source>Successfully saved !</source>
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index fb554869..6fea59b4 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -10,7 +10,7 @@
</header>
<body>
<trans-unit id="backend.bcc">
- <source>Bcc (Comma separated if multiple):</source>
+ <source>Bcc (Comma separated if multiple)</source>
</trans-unit>
<trans-unit id="backend.button_reset">
<source>Reset Template</source>
@@ -19,7 +19,7 @@
<source>Reset all</source>
</trans-unit>
<trans-unit id="backend.cc">
- <source>cc (Comma separated if multiple):</source>
+ <source>cc (Comma separated if multiple)</source>
</trans-unit>
<trans-unit id="backend.content">
<source>Text</source>
@@ -40,10 +40,10 @@
<source>From</source>
</trans-unit>
<trans-unit id="backend.fromMail">
- <source>From E-Mail Address:</source>
+ <source>From E-Mail Address</source>
</trans-unit>
<trans-unit id="backend.fromName">
- <source>From Name:</source>
+ <source>From Name</source>
</trans-unit>
<trans-unit id="backend.mail_queue">
<source>Mail Queue</source>
@@ -70,7 +70,7 @@
<source>Priority</source>
</trans-unit>
<trans-unit id="backend.replyTo">
- <source>Reply to:</source>
+ <source>Reply to</source>
</trans-unit>
<trans-unit id="backend.save">
<source>Save</source>
@@ -93,8 +93,11 @@
<trans-unit id="backend.sent">
<source>Sent</source>
</trans-unit>
+ <trans-unit id="backend.showBody">
+ <source>Show Mail</source>
+ </trans-unit>
<trans-unit id="backend.subject">
- <source>Subject:</source>
+ <source>Subject</source>
</trans-unit>
<trans-unit id="backend.success">
<source>Successfully saved !</source>
diff --git a/Resources/Private/Templates/Queue/Index.html b/Resources/Private/Templates/Queue/Index.html
index a5180f01..6da59377 100644
--- a/Resources/Private/Templates/Queue/Index.html
+++ b/Resources/Private/Templates/Queue/Index.html
@@ -13,10 +13,15 @@
<tr>
<th><f:translate key="backend.toAddress" /></th>
<th><f:translate key="backend.fromAddress" /></th>
+ <th><f:translate key="backend.fromName" /></th>
<th><f:translate key="backend.sent" /></th>
<th><f:translate key="backend.sending_time" /></th>
<th>cc</th>
<th>bcc</th>
+ <th><f:translate key="backend.replyTo" /></th>
+ <th><f:translate key="backend.priority" /></th>
+ <th><f:translate key="backend.subject" /></th>
+ <th></th>
<th></th>
</tr>
</thead>
@@ -25,6 +30,7 @@
<tr class="accordion">
<td>{mail.toAddress}</td>
<td>{mail.fromAddress}</td>
+ <td>{mail.fromName}</td>
<td>
<f:if condition="{mail.sent} == '0'">
<f:then>
@@ -44,6 +50,15 @@
<td>
{mail.bccAddresses}
</td>
+ <td>
+ {mail.replyTo}
+ </td>
+ <td>
+ {mail.priority}
+ </td>
+ <td>
+ {mail.mailSubject}
+ </td>
<td>
<f:if condition="{mail.sent} == '0'">
<f:then>
@@ -55,9 +70,28 @@
</f:if>
</td>
<td>
- <button class="btn-toggle">SHOW MAIL</button>
+ <button class="btn-toggle btn btn-primary" data-uid="{mail.uid}"><f:translate key="backend.showBody" /></button>
</td>
</tr>
+ <!-- Modal -->
+ <div class="modal fade" id="toggle-{mail.uid}" tabindex="-1" role="dialog" aria-labelledby="login-modal-label">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+ <span aria-hidden="true">×</span></button>
+ <h4 class="modal-title" id="login-modal-label">{mail.mailSubject}</h4>
+ </div>
+ <div class="modal-body" id="login-modal-body">
+ <div class="modalcol modalcol-left">
+ <f:format.html>
+ {mail.mailBody}
+ </f:format.html>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
</f:for>
</table>
</f:widget.paginate>
diff --git a/Resources/Public/Scripts/Backend.js b/Resources/Public/Scripts/Backend.js
index 268a5778..5cbcd2bd 100644
--- a/Resources/Public/Scripts/Backend.js
+++ b/Resources/Public/Scripts/Backend.js
@@ -26,10 +26,16 @@
}
}
+ function toggleMailBody(_event) {
+ var uid = $(_event.currentTarget).data('uid');
+ $('#toggle-' + uid).detach().appendTo('body').modal('show');;
+ }
+
$(document).ready(function() {
$('.reset-btn').on('click', resetTemplateListener);
$('.btn-send-now').on('click', sendMailListener);
$('.btn-resend').on('click', resendMailListener);
+ $('.btn-toggle').on('click', toggleMailBody);
});
})
(TYPO3.jQuery);
--
GitLab