Skip to content
Snippets Groups Projects
Commit 37a5e6e5 authored by Torsten Oppermann's avatar Torsten Oppermann
Browse files

[TASK] Adding Bootstrap modal, fixed some translations, show mail body in modal

parent 53be9903
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Resources/Private/Language/de.locallang.xlf
+ 16
− 12
View file @ 37a5e6e5
......@@ -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>
......
Resources/Private/Language/locallang.xlf
+ 9
− 6
View file @ 37a5e6e5
......@@ -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>
......
Resources/Private/Templates/Queue/Index.html
+ 35
− 1
View file @ 37a5e6e5
......@@ -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">&times;</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>
......
Resources/Public/Scripts/Backend.js
+ 6
− 0
View file @ 37a5e6e5
......@@ -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);
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment