Hide Delivery Status Notification option when smtp_server is unset (#1489336)

Aleksander Machniak

2013-09-21 62fe7203e641696566af66d8ea447482a0398426

Hide Delivery Status Notification option when smtp_server is unset (#1489336)

Conflicts:

	CHANGELOG
	config/main.inc.php.dist

 CHANGELOG

@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================

- Hide Delivery Status Notification option when smtp_server is unset (#1489336)
- Display full attachment name using title attribute when name is too long to display (#1489320)
- Fix attachment icon issue when rare font/language is used (#1489326)
- Fix expanded thread root message styling after refreshing messages list (#1489327)

 config/main.inc.php.dist

@@ -872,6 +872,7 @@
$rcmail_config['mdn_default'] = 0;

// Delivery Status Notification checkbox default state
// Note: This can be used only if smtp_server is non-empty
$rcmail_config['dsn_default'] = 0;

// Place replies in the folder of the message being replied to

 skins/classic/templates/compose.html

@@ -178,16 +178,23 @@
    <tr>
        <td><label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" />:</label></td>
        <td><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /></td>
    </tr><tr>
    </tr>
    <roundcube:if condition="config:smtp_server != ''" />
    <tr>
        <td><label for="rcmcomposedsn"><roundcube:label name="dsn" />:</label></td>
        <td><roundcube:object name="dsnCheckBox" form="form" id="rcmcomposedsn" /></td>
    </tr><tr>
    </tr>
    <roundcube:endif />
    <tr>
        <td><label for="rcmcomposepriority"><roundcube:label name="priority" />:</label></td>
        <td><roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /></td>
    </tr><roundcube:if condition="!config:no_save_sent_messages" /><tr>
    </tr>
    <roundcube:if condition="!config:no_save_sent_messages" />
    <tr>
        <td><label><roundcube:label name="savesentmessagein" />:</label></td>
        <td><roundcube:object name="storetarget" maxlength="30" /></td>
    </tr><roundcube:endif />
    </tr>
    <roundcube:endif />
    </table>
</div>


 skins/larry/templates/compose.html

@@ -140,9 +140,11 @@
    <span class="composeoption">
        <label><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /> <roundcube:label name="returnreceipt" /></label>
    </span>
    <roundcube:if condition="config:smtp_server != ''" />
    <span class="composeoption">
        <label><roundcube:object name="dsnCheckBox" form="form" id="rcmcomposedsn" /> <roundcube:label name="dsn" /></label>
    </span>
    <roundcube:endif />
    <roundcube:if condition="!config:no_save_sent_messages" />
    <span class="composeoption">
        <label><roundcube:label name="savesentmessagein" /> <roundcube:object name="storetarget" maxlength="30" style="max-width:12em" /></label>