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 @@ ...@@ -10,8 +10,8 @@
</header> </header>
<body> <body>
<trans-unit id="backend.bcc" approved="yes"> <trans-unit id="backend.bcc" approved="yes">
<source>Bcc (Comma separated if multiple):</source> <source>Bcc (Comma separated if multiple)</source>
<target>Bcc (Komma separiert wenn mehrere):</target> <target>Bcc (Komma separiert wenn mehrere)</target>
</trans-unit> </trans-unit>
<trans-unit id="backend.button_reset" approved="yes"> <trans-unit id="backend.button_reset" approved="yes">
<source>Reset Template</source> <source>Reset Template</source>
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<target>Alles Zurücksetzen</target> <target>Alles Zurücksetzen</target>
</trans-unit> </trans-unit>
<trans-unit id="backend.cc" approved="yes" xml:space="preserve"> <trans-unit id="backend.cc" approved="yes" xml:space="preserve">
<source>cc (Comma separated if multiple):</source> <source>cc (Comma separated if multiple)</source>
<target>cc (Komma separiert wenn mehrere):</target> <target>cc (Komma separiert wenn mehrere)</target>
</trans-unit> </trans-unit>
<trans-unit id="backend.content" approved="yes"> <trans-unit id="backend.content" approved="yes">
<source>Text</source> <source>Text</source>
...@@ -50,12 +50,12 @@ ...@@ -50,12 +50,12 @@
<target>Absender</target> <target>Absender</target>
</trans-unit> </trans-unit>
<trans-unit id="backend.fromMail" approved="yes"> <trans-unit id="backend.fromMail" approved="yes">
<source>From E-Mail Address:</source> <source>From E-Mail Address</source>
<target>Absender Email Adresse:</target> <target>Absender Email Adresse</target>
</trans-unit> </trans-unit>
<trans-unit id="backend.fromName" approved="yes"> <trans-unit id="backend.fromName" approved="yes">
<source>From Name:</source> <source>From Name</source>
<target>Absender Name:</target> <target>Absender Name</target>
</trans-unit> </trans-unit>
<trans-unit id="backend.mail_queue" approved="yes"> <trans-unit id="backend.mail_queue" approved="yes">
<source>Mail Queue</source> <source>Mail Queue</source>
...@@ -90,8 +90,8 @@ ...@@ -90,8 +90,8 @@
<target>Priorität</target> <target>Priorität</target>
</trans-unit> </trans-unit>
<trans-unit id="backend.replyTo" approved="yes"> <trans-unit id="backend.replyTo" approved="yes">
<source>Reply to:</source> <source>Reply to</source>
<target>Antwort Adresse:</target> <target>Antwort Adresse</target>
</trans-unit> </trans-unit>
<trans-unit id="backend.save" approved="yes"> <trans-unit id="backend.save" approved="yes">
<source>Save</source> <source>Save</source>
...@@ -121,9 +121,13 @@ ...@@ -121,9 +121,13 @@
<source>Sent</source> <source>Sent</source>
<target>Versendet</target> <target>Versendet</target>
</trans-unit> </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"> <trans-unit id="backend.subject" approved="yes">
<source>Subject:</source> <source>Subject</source>
<target>Betreff:</target> <target>Betreff</target>
</trans-unit> </trans-unit>
<trans-unit id="backend.success" approved="yes"> <trans-unit id="backend.success" approved="yes">
<source>Successfully saved !</source> <source>Successfully saved !</source>
......
Resources/Private/Language/locallang.xlf
+ 9
− 6
View file @ 37a5e6e5
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</header> </header>
<body> <body>
<trans-unit id="backend.bcc"> <trans-unit id="backend.bcc">
<source>Bcc (Comma separated if multiple):</source> <source>Bcc (Comma separated if multiple)</source>
</trans-unit> </trans-unit>
<trans-unit id="backend.button_reset"> <trans-unit id="backend.button_reset">
<source>Reset Template</source> <source>Reset Template</source>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<source>Reset all</source> <source>Reset all</source>
</trans-unit> </trans-unit>
<trans-unit id="backend.cc"> <trans-unit id="backend.cc">
<source>cc (Comma separated if multiple):</source> <source>cc (Comma separated if multiple)</source>
</trans-unit> </trans-unit>
<trans-unit id="backend.content"> <trans-unit id="backend.content">
<source>Text</source> <source>Text</source>
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
<source>From</source> <source>From</source>
</trans-unit> </trans-unit>
<trans-unit id="backend.fromMail"> <trans-unit id="backend.fromMail">
<source>From E-Mail Address:</source> <source>From E-Mail Address</source>
</trans-unit> </trans-unit>
<trans-unit id="backend.fromName"> <trans-unit id="backend.fromName">
<source>From Name:</source> <source>From Name</source>
</trans-unit> </trans-unit>
<trans-unit id="backend.mail_queue"> <trans-unit id="backend.mail_queue">
<source>Mail Queue</source> <source>Mail Queue</source>
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<source>Priority</source> <source>Priority</source>
</trans-unit> </trans-unit>
<trans-unit id="backend.replyTo"> <trans-unit id="backend.replyTo">
<source>Reply to:</source> <source>Reply to</source>
</trans-unit> </trans-unit>
<trans-unit id="backend.save"> <trans-unit id="backend.save">
<source>Save</source> <source>Save</source>
...@@ -93,8 +93,11 @@ ...@@ -93,8 +93,11 @@
<trans-unit id="backend.sent"> <trans-unit id="backend.sent">
<source>Sent</source> <source>Sent</source>
</trans-unit> </trans-unit>
<trans-unit id="backend.showBody">
<source>Show Mail</source>
</trans-unit>
<trans-unit id="backend.subject"> <trans-unit id="backend.subject">
<source>Subject:</source> <source>Subject</source>
</trans-unit> </trans-unit>
<trans-unit id="backend.success"> <trans-unit id="backend.success">
<source>Successfully saved !</source> <source>Successfully saved !</source>
......
Resources/Private/Templates/Queue/Index.html
+ 35
− 1
View file @ 37a5e6e5
...@@ -13,10 +13,15 @@ ...@@ -13,10 +13,15 @@
<tr> <tr>
<th><f:translate key="backend.toAddress" /></th> <th><f:translate key="backend.toAddress" /></th>
<th><f:translate key="backend.fromAddress" /></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.sent" /></th>
<th><f:translate key="backend.sending_time" /></th> <th><f:translate key="backend.sending_time" /></th>
<th>cc</th> <th>cc</th>
<th>bcc</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> <th></th>
</tr> </tr>
</thead> </thead>
...@@ -25,6 +30,7 @@ ...@@ -25,6 +30,7 @@
<tr class="accordion"> <tr class="accordion">
<td>{mail.toAddress}</td> <td>{mail.toAddress}</td>
<td>{mail.fromAddress}</td> <td>{mail.fromAddress}</td>
<td>{mail.fromName}</td>
<td> <td>
<f:if condition="{mail.sent} == '0'"> <f:if condition="{mail.sent} == '0'">
<f:then> <f:then>
...@@ -44,6 +50,15 @@ ...@@ -44,6 +50,15 @@
<td> <td>
{mail.bccAddresses} {mail.bccAddresses}
</td> </td>
<td>
{mail.replyTo}
</td>
<td>
{mail.priority}
</td>
<td>
{mail.mailSubject}
</td>
<td> <td>
<f:if condition="{mail.sent} == '0'"> <f:if condition="{mail.sent} == '0'">
<f:then> <f:then>
...@@ -55,9 +70,28 @@ ...@@ -55,9 +70,28 @@
</f:if> </f:if>
</td> </td>
<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> </td>
</tr> </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> </f:for>
</table> </table>
</f:widget.paginate> </f:widget.paginate>
......
Resources/Public/Scripts/Backend.js
+ 6
− 0
View file @ 37a5e6e5
...@@ -26,10 +26,16 @@ ...@@ -26,10 +26,16 @@
} }
} }
function toggleMailBody(_event) {
var uid = $(_event.currentTarget).data('uid');
$('#toggle-' + uid).detach().appendTo('body').modal('show');;
}
$(document).ready(function() { $(document).ready(function() {
$('.reset-btn').on('click', resetTemplateListener); $('.reset-btn').on('click', resetTemplateListener);
$('.btn-send-now').on('click', sendMailListener); $('.btn-send-now').on('click', sendMailListener);
$('.btn-resend').on('click', resendMailListener); $('.btn-resend').on('click', resendMailListener);
$('.btn-toggle').on('click', toggleMailBody);
}); });
}) })
(TYPO3.jQuery); (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