diff options
Diffstat (limited to 'skins')
| -rw-r--r-- | skins/classic/templates/compose.html | 6 | ||||
| -rw-r--r-- | skins/larry/templates/compose.html | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/skins/classic/templates/compose.html b/skins/classic/templates/compose.html index 1515eeb06..805032504 100644 --- a/skins/classic/templates/compose.html +++ b/skins/classic/templates/compose.html @@ -174,11 +174,13 @@ <div id="composeoptionsmenu" class="popupmenu"> <table> + <roundcube:if condition="!in_array('mdn_default', (array)config:dont_override)" /> <tr> <td><label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" />:</label></td> - <td><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /></td> + <td><roundcube:object name="mdnCheckBox" form="form" id="rcmcomposereceipt" /></td> </tr> - <roundcube:if condition="config:smtp_server != ''" /> + <roundcube:endif /> + <roundcube:if condition="config:smtp_server != '' and !in_array('dsn_default', (array)config:dont_override)" /> <tr> <td><label for="rcmcomposedsn"><roundcube:label name="dsn" />:</label></td> <td><roundcube:object name="dsnCheckBox" form="form" id="rcmcomposedsn" /></td> diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html index 04a987f89..3e2eaac6a 100644 --- a/skins/larry/templates/compose.html +++ b/skins/larry/templates/compose.html @@ -146,10 +146,12 @@ <label for="rcmcomposepriority"><roundcube:label name="priority" /> <roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" tabindex="4" /></label> </span> + <roundcube:if condition="!in_array('mdn_default', (array)config:dont_override)" /> <span class="composeoption"> - <label><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" tabindex="4" /> <roundcube:label name="returnreceipt" /></label> + <label><roundcube:object name="mdnCheckBox" form="form" id="rcmcomposereceipt" tabindex="4" /> <roundcube:label name="returnreceipt" /></label> </span> - <roundcube:if condition="config:smtp_server != ''" /> + <roundcube:endif /> + <roundcube:if condition="config:smtp_server != '' and !in_array('dsn_default', (array)config:dont_override)" /> <span class="composeoption"> <label><roundcube:object name="dsnCheckBox" form="form" id="rcmcomposedsn" tabindex="4" /> <roundcube:label name="dsn" /></label> </span> |