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

[TASK] Style reviews

parent adaefc17
No related branches found
Tags 2.0.9
1 merge request!3New version 4 1
Hide whitespace changes
Inline Side-by-side
Resources/Private/Language/de.locallang.xlf
+ 10
− 2
View file @ 11132498
......@@ -25,6 +25,10 @@
<source>Reset template</source>
<target>Template zurücksetzen</target>
</trans-unit>
<trans-unit id="backend.button_reset_filter" approved="yes">
<source>Reset</source>
<target>Zurücksetzen</target>
</trans-unit>
<trans-unit id="backend.cc" approved="yes">
<source>CC (Carbon Copy Receiver, comma separated)</source>
<target>CC (Kopieempfänger, komma-separiert)</target>
......@@ -77,6 +81,10 @@
<source>Last sent until:</source>
<target>Zuletzt gesendet bis:</target>
</trans-unit>
<trans-unit id="backend.filter.extension" approved="yes">
<source>Extension</source>
<target>Extension</target>
</trans-unit>
<trans-unit id="backend.filter.fields.description" approved="yes">
<source>Search fields (all by default):</source>
<target>Suchfelder (standardmäßig alle):</target>
......@@ -114,8 +122,8 @@
<target>Betreff</target>
</trans-unit>
<trans-unit id="backend.filter.template" approved="yes">
<source>Template:</source>
<target>Template:</target>
<source>Template</source>
<target>Template</target>
</trans-unit>
<trans-unit id="backend.filter.to" approved="yes">
<source>Recipient address</source>
......
Resources/Private/Language/locallang.xlf
+ 7
− 1
View file @ 11132498
......@@ -21,6 +21,9 @@
<trans-unit id="backend.button_reset_all">
<source>Reset template</source>
</trans-unit>
<trans-unit id="backend.button_reset_filter">
<source>Reset</source>
</trans-unit>
<trans-unit id="backend.cc">
<source>CC (Carbon Copy Receiver, comma separated)</source>
</trans-unit>
......@@ -60,6 +63,9 @@
<trans-unit id="backend.filter.date_to">
<source>Last sent until:</source>
</trans-unit>
<trans-unit id="backend.filter.extension">
<source>Extension</source>
</trans-unit>
<trans-unit id="backend.filter.fields.description">
<source>Search fields (all by default):</source>
</trans-unit>
......@@ -88,7 +94,7 @@
<source>Subject</source>
</trans-unit>
<trans-unit id="backend.filter.template">
<source>Template:</source>
<source>Template</source>
</trans-unit>
<trans-unit id="backend.filter.to">
<source>Recipient address</source>
......
Resources/Private/Partials/Queue/Filter.html
+ 25
− 16
View file @ 11132498
......@@ -18,19 +18,19 @@
<f:then>
<sgm:be.menus.actionMenuOptionGroup label="{extensionKey}">
<f:for each="{extension}" as="template">
<sgm:extendedIf condition="{selectedTemplateFilter} == {template}"
and="{selectedExtensionFilter} == {extensionKey}">
<f:then>
<option value="{extensionKey}###{template}" selected="selected">
{template}
</option>
</f:then>
<f:else>
<option value="{extensionKey}###{template}">
{template}
</option>
</f:else>
</sgm:extendedIf>
<sgm:extendedIf condition="{selectedTemplateFilter} == {template}"
and="{selectedExtensionFilter} == {extensionKey}">
<f:then>
<option value="{extensionKey}###{template}" selected="selected">
{template}
</option>
</f:then>
<f:else>
<option value="{extensionKey}###{template}">
{template}
</option>
</f:else>
</sgm:extendedIf>
</f:for>
</sgm:be.menus.actionMenuOptionGroup>
</f:then>
......@@ -112,9 +112,18 @@
<f:translate key="backend.not_sent" />
</label>
</div>
<div class="form-group">
<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 class="form-group row">
<div class="col-md-6">
<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 class="col-md-6">
<f:form.button class="btn btn-danger form-group col-xs-12 col-md-12" type="reset">
<f:translate key="backend.button_reset_filter" />
</f:form.button>
</div>
</div>
</div>
</div>
......
Resources/Private/Templates/Queue/Index.html
+ 23
− 6
View file @ 11132498
......@@ -18,7 +18,9 @@
<tr>
<th></th>
<th><f:translate key="backend.from" /> <br> <f:translate key="backend.to" /></th>
<th><f:translate key="backend.subject" /></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>
......@@ -33,7 +35,7 @@
<tr data-uid="{mail.uid}">
</f:then>
<f:else>
<tr data-uid="{mail.uid}" style="background-color: #C8C8C8;">
<tr data-uid="{mail.uid}" style="background-color: #7C7C7C;">
</f:else>
</f:if>
<td nowrap="nowrap" class="col-icon">
......@@ -43,17 +45,32 @@
</td>
<td>
<span>{mail.from_address}</span>
<br>
<hr>
<span>{mail.to_address}</span>
</td>
<td>
<span><f:format.crop maxCharacters="40" append="...">{mail.mail_subject}</f:format.crop></span>
<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>
&nbsp;
</f:else>
</f:if>
</td>
<td>
<span><f:format.date format="d.m.Y h:i">{mail.crdate}</f:format.date></span>
<br>
<hr>
<f:if condition="{mail.last_sending_time} != 0">
<span><f:format.date format="d.m.Y h:i">{mail.last_sending_time}</f:format.date></span>
<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">
......
Resources/Public/StyleSheets/backend.css
+ 5
− 0
View file @ 11132498
......@@ -64,4 +64,9 @@
.template-col:nth-of-type(odd) {
/*background-color: #AAA;*/
/*background-clip: content-box;*/
}
hr {
margin: 5px 0;
border-top: 1px solid #CCC;
}
\ No newline at end of file
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