From 7b8985c4c5a54441cffd99241ffcad04be77b750 Mon Sep 17 00:00:00 2001
From: Torsten Oppermann <torsten@sgalinski.de>
Date: Wed, 2 Aug 2017 14:24:23 +0200
Subject: [PATCH] [TASK] Finishing filter layout & feedback
---
Resources/Private/Language/de.locallang.xlf | 20 +++----
Resources/Private/Language/locallang.xlf | 12 ++---
Resources/Private/Partials/Queue/Filter.html | 57 ++++++++++----------
3 files changed, 44 insertions(+), 45 deletions(-)
diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf
index 53090646..6cb559e2 100644
--- a/Resources/Private/Language/de.locallang.xlf
+++ b/Resources/Private/Language/de.locallang.xlf
@@ -46,7 +46,7 @@
<target>E-Mail</target>
</trans-unit>
<trans-unit id="backend.entry_date" approved="yes">
- <source>Queue entry date</source>
+ <source>Queue Entry Date</source>
<target>Erstellungsdatum</target>
</trans-unit>
<trans-unit id="backend.failure_mail" approved="yes">
@@ -62,16 +62,16 @@
<target>CC Adressen</target>
</trans-unit>
<trans-unit id="backend.filter.date_from" approved="yes">
- <source>From:</source>
- <target>Von:</target>
+ <source>Last sent time since:</source>
+ <target>Zuletzt gesendet von:</target>
</trans-unit>
<trans-unit id="backend.filter.date_to" approved="yes">
- <source>To:</source>
- <target>Bis:</target>
+ <source>Last sent until:</source>
+ <target>Zuletzt gesendet bis:</target>
</trans-unit>
<trans-unit id="backend.filter.fields.description" approved="yes">
- <source>Please select the fields you want to search (If none are selected all fields are considered) :</source>
- <target>Bitte wählen welche Felder Sie durchsuchen möchten möchten (Sind keine ausgewählt, werden alle berücksichtigt):</target>
+ <source>Search fields (all by default):</source>
+ <target>Suchfelder (standardmäßig alle):</target>
</trans-unit>
<trans-unit id="backend.filter.filter" approved="yes">
<source>Filter</source>
@@ -106,7 +106,7 @@
<target>Betreff</target>
</trans-unit>
<trans-unit id="backend.filter.template" approved="yes">
- <source>Template key:</source>
+ <source>Template:</source>
<target>Template:</target>
</trans-unit>
<trans-unit id="backend.filter.to" approved="yes">
@@ -130,8 +130,8 @@
<target>Absender-Name</target>
</trans-unit>
<trans-unit id="backend.last_sent" approved="yes">
- <source>Last sent</source>
- <target>Letzter Versand</target>
+ <source>Last Sent</source>
+ <target>Zuletzt gesendet</target>
</trans-unit>
<trans-unit id="backend.mail_queue" approved="yes">
<source>Mail Queue</source>
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index 767d7a02..65cb71b2 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -37,7 +37,7 @@
<source>Email</source>
</trans-unit>
<trans-unit id="backend.entry_date">
- <source>Queue entry date</source>
+ <source>Queue Entry Date</source>
</trans-unit>
<trans-unit id="backend.failure_mail">
<source>There was an error when sending the preview email. Please check your configuration.</source>
@@ -49,13 +49,13 @@
<source>CC address</source>
</trans-unit>
<trans-unit id="backend.filter.date_from">
- <source>From:</source>
+ <source>Last sent time since:</source>
</trans-unit>
<trans-unit id="backend.filter.date_to">
- <source>To:</source>
+ <source>Last sent until:</source>
</trans-unit>
<trans-unit id="backend.filter.fields.description">
- <source>Please select the fields you want to search (If none are selected all fields are considered) :</source>
+ <source>Search fields (all by default):</source>
</trans-unit>
<trans-unit id="backend.filter.filter">
<source>Filter</source>
@@ -82,7 +82,7 @@
<source>Subject</source>
</trans-unit>
<trans-unit id="backend.filter.template">
- <source>Template key:</source>
+ <source>Template:</source>
</trans-unit>
<trans-unit id="backend.filter.to">
<source>Recipient address</source>
@@ -100,7 +100,7 @@
<source>Sender Name</source>
</trans-unit>
<trans-unit id="backend.last_sent">
- <source>Last sent</source>
+ <source>Last Sent</source>
</trans-unit>
<trans-unit id="backend.mail_queue">
<source>Mail Queue</source>
diff --git a/Resources/Private/Partials/Queue/Filter.html b/Resources/Private/Partials/Queue/Filter.html
index bc49b5e3..dc63733f 100644
--- a/Resources/Private/Partials/Queue/Filter.html
+++ b/Resources/Private/Partials/Queue/Filter.html
@@ -6,20 +6,6 @@
<label for="filter-search"><f:translate key="backend.filter.search" /></label>
<f:form.textfield class="form-control" property="filterSearch" id="filter-search" />
</div>
- <div class="form-group">
- <label for="filter-fields">
- <f:translate key="backend.filters.fields" />
- <small><f:translate key="backend.filter.fields.description" /></small>
- </label>
- <f:form.select class="form-control" multiple="1" size="4" property="filterFields" optionValueField="value" options="{filterFields}" id="filter-fields" />
- </div>
- <div class="form-group">
- <br />
- <f:form.button class="btn btn-success form-group col-xs-6 col-md-6" type="submit">
- <f:translate key="backend.filter.filter" /></f:form.button>
- </div>
- </div>
- <div class="col-xs-12 col-md-4">
<div class="form-group">
<label for="filter-template"><f:translate key="backend.filter.template" /></label>
<f:form.select class="form-control" multiple="0" size="1" property="filterTemplate" optionValueField="key" options="{templatesFilter}" id="filter-template" />
@@ -28,22 +14,18 @@
<label for="filter-languages"><f:translate key="backend.filter.language" /></label>
<f:form.select class="form-control" multiple="0" size="1" property="filterLanguage" optionValueField="key" options="{languages}" id="filter-languages" />
</div>
- <div class="radio">
- <label class="radio-inline">
- <f:form.radio property="filterSent" id="filters-all" value="0" checked="{f:if(condition: '{filters.filterSent} == \'0\'', then: '1')}" />
- <f:translate key="backend.all" />
- </label>
- <label class="radio-inline">
- <f:form.radio property="filterSent" id="filters-sent" value="1" checked="{f:if(condition: '{filters.filterSent} == \'1\'', then: '1')}" />
- <f:translate key="backend.sent" />
- </label>
- <label class="radio-inline">
- <f:form.radio property="filterSent" id="filters-notsent" value="2" checked="{f:if(condition: '{filters.filterSent} == \'2\'', then: '1')}" />
- <f:translate key="backend.not_sent" />
+ </div>
+ <div class="col-xs-12 col-md-4">
+ <div class="form-group">
+ <label for="filter-fields">
+ <f:translate key="backend.filters.fields" />
+ <small><f:translate key="backend.filter.fields.description" /></small>
</label>
+ <f:form.select class="form-control" multiple="1" size="9" property="filterFields" optionValueField="value" options="{filterFields}" id="filter-fields" />
</div>
</div>
- <div class="col-xs-12 col-md-2">
+ <div class="col-xs-12 col-md-4">
+
<div class="input-group" style="width: 100%; display: block;">
<label for="filter-to-date">
<f:translate key="backend.filter.date_from" />
@@ -64,8 +46,6 @@
</label>
</span>
</div>
- </div>
- <div class="col-xs-12 col-md-2">
<div class="input-group" style="width: 100%; display: block;">
<label for="filter-to-date">
<f:translate key="backend.filter.date_to" />
@@ -86,6 +66,25 @@
</label>
</span>
</div>
+ <div class="form-group">
+ <label class="radio-inline">
+ <f:form.radio property="filterSent" id="filters-all" value="0" checked="{f:if(condition: '{filters.filterSent} == \'0\'', then: '1')}" />
+ <f:translate key="backend.all" />
+ </label>
+ <label class="radio-inline">
+ <f:form.radio property="filterSent" id="filters-sent" value="1" checked="{f:if(condition: '{filters.filterSent} == \'1\'', then: '1')}" />
+ <f:translate key="backend.sent" />
+ </label>
+ <label class="radio-inline">
+ <f:form.radio property="filterSent" id="filters-notsent" value="2" checked="{f:if(condition: '{filters.filterSent} == \'2\'', then: '1')}" />
+ <f:translate key="backend.not_sent" />
+ </label>
+ </div>
+ <div class="form-group">
+ <br />
+ <f:form.button class="btn btn-success form-group col-xs-12 col-md-12" type="submit">
+ <f:translate key="backend.filter.filter" /></f:form.button>
+ </div>
</div>
</div>
</f:form>
--
GitLab