From 879a6eb6104d0493907e6f82112ec13db12ab45b Mon Sep 17 00:00:00 2001
From: Torsten Oppermann <torsten@sgalinski.de>
Date: Fri, 5 Jan 2018 15:26:44 +0100
Subject: [PATCH] [TASk] feedback from review - filters, ui, blacklist
---
Resources/Private/Templates/Mail/Index.html | 2 +-
Resources/Private/Templates/Queue/Index.html | 196 ++++++++++---------
Resources/Public/StyleSheets/backend.css | 4 +
3 files changed, 105 insertions(+), 97 deletions(-)
diff --git a/Resources/Private/Templates/Mail/Index.html b/Resources/Private/Templates/Mail/Index.html
index 8041ed59..6057c407 100644
--- a/Resources/Private/Templates/Mail/Index.html
+++ b/Resources/Private/Templates/Mail/Index.html
@@ -9,7 +9,7 @@
<f:if condition="{selectedTemplate}">
<f:then>
<div class="row form-group col-md-12">
- <div class=" col-md-9">
+ <div class="editor-description col-md-9">
<p>{templateDescription}</p>
</div>
<div class=" col-md-3">
diff --git a/Resources/Private/Templates/Queue/Index.html b/Resources/Private/Templates/Queue/Index.html
index 4a60eb79..1d3c191e 100644
--- a/Resources/Private/Templates/Queue/Index.html
+++ b/Resources/Private/Templates/Queue/Index.html
@@ -6,120 +6,124 @@
<f:section name="content">
<f:flashMessages />
- <f:render partial="Queue/Filter" arguments="{filterFields: filterFields, filters: filters, languages: languages, templatesFilter: templatesFilter, selectedTemplateFilter: selectedTemplateFilter, selectedExtensionFilter: selectedExtensionFilter}" />
+ <f:if condition="!{pages}">
+ <f:render partial="Queue/Filter" arguments="{filterFields: filterFields, filters: filters, languages: languages, templatesFilter: templatesFilter, selectedTemplateFilter: selectedTemplateFilter, selectedExtensionFilter: selectedExtensionFilter}" />
+ <f:if condition="{queue -> f:count()} > 0">
+ <f:then>
+ <div class="panel panel-default recordlist">
+ <div class="table-fit">
+ <table data-table="tx_sgmail_domain_model_mail" class="table table-striped table-hover">
+ <sgm:backend.widget.paginate objects="{queue}" as="paginatedMails" configuration="{insertAbove: 1, itemsPerPage: 20}">
+ <thead>
+ <tr>
+ <th></th>
+ <th><f:translate key="backend.from" /> <br> <f:translate key="backend.to" />
+ </th>
+ <th><f:translate key="backend.filter.extension" />:
+ <f:translate key="backend.filter.template" /> <br>
+ <f:translate key="backend.subject" /></th>
+ <th><f:translate key="backend.entry_date" /> <br>
+ <f:translate key="backend.last_sent" /></th>
+ <th></th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{paginatedMails}" as="mail">
+ {sgm:backend.editOnClick(table: 'tx_sgmail_domain_model_mail', uid: mail.uid) -> sgm:set(name: 'editOnClick')}
+ <tr data-uid="{mail.uid}">
+ <td nowrap="nowrap" class="col-icon">
+ <sgm:backend.icon table="tx_sgmail_domain_model_mail" row="{mail}" />
+ </td>
+ <td>
+ <span>{mail.from_address}</span>
+ <hr>
+ <span>{mail.to_address}</span>
+ </td>
+ <td>
+ <span>{mail.extension_key}: {mail.template_name}</span>
+ <hr>
+ <f:if condition="{mail.mail_subject}">
+ <f:then>
+ <span><f:format.crop maxCharacters="40" append="...">{mail.mail_subject}</f:format.crop></span>
+ </f:then>
+ <f:else>
+
+ </f:else>
+ </f:if>
- <f:if condition="{queue -> f:count()} > 0">
- <f:then>
- <div class="panel panel-default recordlist">
- <div class="table-fit">
- <table data-table="tx_sgmail_domain_model_mail" class="table table-striped table-hover">
- <sgm:backend.widget.paginate objects="{queue}" as="paginatedMails" configuration="{insertAbove: 1, itemsPerPage: 20}">
- <thead>
- <tr>
- <th></th>
- <th><f:translate key="backend.from" /> <br> <f:translate key="backend.to" /></th>
- <th><f:translate key="backend.filter.extension" />:
- <f:translate key="backend.filter.template" /> <br>
- <f:translate key="backend.subject" /></th>
- <th><f:translate key="backend.entry_date" /> <br>
- <f:translate key="backend.last_sent" /></th>
- <th></th>
- <th></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{paginatedMails}" as="mail">
- {sgm:backend.editOnClick(table: 'tx_sgmail_domain_model_mail', uid: mail.uid) -> sgm:set(name: 'editOnClick')}
- <tr data-uid="{mail.uid}">
- <td nowrap="nowrap" class="col-icon">
- <sgm:backend.icon table="tx_sgmail_domain_model_mail" row="{mail}" />
- </td>
- <td>
- <span>{mail.from_address}</span>
- <hr>
- <span>{mail.to_address}</span>
- </td>
- <td>
- <span>{mail.extension_key}: {mail.template_name}</span>
- <hr>
- <f:if condition="{mail.mail_subject}">
- <f:then>
- <span><f:format.crop maxCharacters="40" append="...">{mail.mail_subject}</f:format.crop></span>
- </f:then>
- <f:else>
-
- </f:else>
- </f:if>
-
- </td>
- <td>
- <span><f:format.date format="d.m.Y H:i">{mail.crdate}</f:format.date></span>
- <hr>
- <f:if condition="{mail.last_sending_time} != 0">
- <f:then>
- <span><f:format.date format="d.m.Y H:i">{mail.last_sending_time}</f:format.date></span>
- </f:then>
- <f:else>
- <f:translate key="backend.not_sent" />
- </f:else>
- </f:if>
- </td>
- <td nowrap="nowrap" class="col-control">
- <sgm:backend.control table="tx_sgmail_domain_model_mail" row="{mail}" />
- </td>
- <td>
- <f:if condition="{mail.blacklisted}">
- <f:then>
- <b><f:translate key="backend.queue.blacklisted" /></b>
- </f:then>
- <f:else>
- <f:link.action class="btn btn-default btn-send-now" controller="Queue" action="sendMail" arguments="{uid: mail.uid, selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}">
+ </td>
+ <td>
+ <span><f:format.date format="d.m.Y H:i">{mail.crdate}</f:format.date></span>
+ <hr>
+ <f:if condition="{mail.last_sending_time} != 0">
+ <f:then>
+ <span><f:format.date format="d.m.Y H:i">{mail.last_sending_time}</f:format.date></span>
+ </f:then>
+ <f:else>
+ <f:translate key="backend.not_sent" />
+ </f:else>
+ </f:if>
+ </td>
+ <td nowrap="nowrap" class="col-control">
+ <sgm:backend.control table="tx_sgmail_domain_model_mail" row="{mail}" />
+ </td>
+ <td>
+ <f:if condition="{mail.blacklisted}">
+ <f:then>
+ <b><f:translate key="backend.queue.blacklisted" /></b>
+ </f:then>
+ <f:else>
+ <f:link.action class="btn btn-default btn-send-now" controller="Queue" action="sendMail" arguments="{uid: mail.uid, selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}">
<span class="t3js-icon icon icon-size-small icon-state-default actions-document-import-t3d">
<span class="icon-markup">
<img src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-document-import-t3d.svg" width="16" height="16">
</span>
</span>
- <f:translate key="backend.send_now" />
- </f:link.action>
- <a class="btn btn-default btn-toggle" data-uid="{mail.uid}">
+ <f:translate key="backend.send_now" />
+ </f:link.action>
+ <a class="btn btn-default btn-toggle" data-uid="{mail.uid}">
<span class="t3js-icon icon icon-size-small icon-state-default actions-document-view">
<span class="icon-markup">
<img src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-document-view.svg" width="16" height="16">
</span>
</span>
- <f:translate key="backend.showBody" />
- </a>
- </f:else>
- </f:if>
- </td>
- <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.mail_subject}</h4>
- </div>
- <div class="modal-body" id="login-modal-body">
- <div class="modalcol modalcol-left">
- <f:format.html>{mail.mail_body}</f:format.html>
+ <f:translate key="backend.showBody" />
+ </a>
+ </f:else>
+ </f:if>
+ </td>
+ <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.mail_subject}</h4>
+ </div>
+ <div class="modal-body" id="login-modal-body">
+ <div class="modalcol modalcol-left">
+ <f:format.html>{mail.mail_body}</f:format.html>
+ </div>
</div>
</div>
</div>
</div>
- </div>
- </f:for>
- </tbody>
- </sgm:backend.widget.paginate>
- </table>
+ </f:for>
+ </tbody>
+ </sgm:backend.widget.paginate>
+ </table>
+ </div>
</div>
- </div>
- </f:then>
- <f:else>
- <f:render partial="Queue/Empty" />
- </f:else>
+ </f:then>
+ <f:else>
+ <f:render partial="Queue/Empty" />
+ </f:else>
+ </f:if>
</f:if>
+
<f:if condition="{pages}">
+ <f:render partial="Mail/Empty" />
<div class="panel panel-default recordlist">
<div class="table-fit">
<table data-table="pages" class="table table-striped table-hover">
diff --git a/Resources/Public/StyleSheets/backend.css b/Resources/Public/StyleSheets/backend.css
index cd2d7c15..a59f4193 100644
--- a/Resources/Public/StyleSheets/backend.css
+++ b/Resources/Public/StyleSheets/backend.css
@@ -6,6 +6,10 @@
margin-top: 10px;
}
+.editor-description {
+ padding: 10px;
+}
+
.email-input {
padding: 5px 6px;
vertical-align: top;
--
GitLab