Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2024-05-30 09:08:58 +02:00
commit f5b14a95b4
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 11 additions and 11 deletions

View file

@ -34,7 +34,9 @@
{% for recipient in to_recipient %} {% for recipient in to_recipient %}
<li> <li>
{% if not S_EDIT_POST %} {% if not S_EDIT_POST %}
<input type="submit" name="remove_{{ recipient.TYPE }}[{{ recipient.UG_ID }}]" value="x" class="button1 button button-form-bold"> <button type="submit" name="remove_{{ recipient.TYPE }}[{{ recipient.UG_ID }}]">
{{ Icon('font', 'xmark', lang('REMOVE'), true, 'c-warning-icon') }}
</button>
{% endif %} {% endif %}
{% if recipient.IS_GROUP %} {% if recipient.IS_GROUP %}
<a href="{{ recipient.U_VIEW }}" style="color: {{ recipient.COLOUR }}"><strong>{{ recipient.NAME }}</strong></a> <a href="{{ recipient.U_VIEW }}" style="color: {{ recipient.COLOUR }}"><strong>{{ recipient.NAME }}</strong></a>
@ -57,7 +59,9 @@
{% for recipient in bcc_recipient %} {% for recipient in bcc_recipient %}
<li> <li>
{% if not S_EDIT_POST %} {% if not S_EDIT_POST %}
<input type="submit" name="remove_{{ recipient.TYPE }}[{{ recipient.UG_ID }}]" value="x" class="button1 button button-form-bold"> <button type="submit" name="remove_{{ recipient.TYPE }}[{{ recipient.UG_ID }}]">
{{ Icon('font', 'xmark', lang('REMOVE'), true, 'c-warning-icon') }}
</button>
{% endif %} {% endif %}
{% if recipient.IS_GROUP %} {% if recipient.IS_GROUP %}
<a href="{{ recipient.U_VIEW }}" style="color: {{ recipient.COLOUR }}"><strong>{{ recipient.NAME }}</strong></a> <a href="{{ recipient.U_VIEW }}" style="color: {{ recipient.COLOUR }}"><strong>{{ recipient.NAME }}</strong></a>
@ -90,14 +94,16 @@
<ul class="recipients"> <ul class="recipients">
{% for recipient in to_recipient %} {% for recipient in to_recipient %}
<li> <li>
{% if not S_EDIT_POST %}
<button type="submit" name="remove_{{ recipient.TYPE }}[{{ recipient.UG_ID }}]">
{{ Icon('font', 'xmark', lang('REMOVE'), true, 'c-warning-icon') }}
</button>
{% endif %}
{% if recipient.IS_GROUP %} {% if recipient.IS_GROUP %}
<a href="{{ recipient.U_VIEW }}"><strong>{{ recipient.NAME }}</strong></a> <a href="{{ recipient.U_VIEW }}"><strong>{{ recipient.NAME }}</strong></a>
{% else %} {% else %}
{{ recipient.NAME_FULL }} {{ recipient.NAME_FULL }}
{% endif %} {% endif %}
{% if not S_EDIT_POST %}
&nbsp;<input type="submit" name="remove_{{ recipient.TYPE }}[{{ recipient.UG_ID }}]" value="x" class="button1 button button-form-bold">
{% endif %}
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>

View file

@ -867,12 +867,6 @@ fieldset.fields1 dd.recipients {
margin-left: 11px; margin-left: 11px;
} }
fieldset.fields1 ul.recipients input.button2 {
font-size: 12px;
margin-right: 0;
padding: 0;
}
fieldset.fields1 dl.pmlist > dt { fieldset.fields1 dl.pmlist > dt {
width: auto !important; width: auto !important;
} }