Merge the email explanation

This commit is contained in:
Girish Ramakrishnan
2019-09-19 11:30:30 -07:00
parent aa65b2b97c
commit 1fe3e60468

View File

@@ -441,7 +441,7 @@
<div class="form-group">
<input type="checkbox" id="emailMailboxNameEnabled" ng-model="email.mailboxNameEnabled">
<label class="control-label" for="emailMailboxNameEnabled">Custom Mail FROM</label>
<p class="text-small">Addresses ending with '.app' are reserved.</p>
<p class="text-small">This sets the address from which this app sends email. This app is already configured to send mail using {{app.domain}}'s <a ng-href="/#/email/{{ app.domain }}">Outbound Email</a> settings.</p>
<div class="has-error" ng-show="email.error.mailboxName">{{ email.error.mailboxName }}</div>
<div class="input-group form-inline" ng-class="{ 'has-error': !emailForm.mailboxName.$dirty && email.error.mailboxName }">
@@ -455,8 +455,6 @@
</div>
<br/>
<p class="text-small">This app is configured to send mail using <a ng-href="/#/email/{{ app.domain }}">{{app.domain}}'s Outbound Email</a> settings.</p>
</div>
<input class="ng-hide" type="submit" ng-disabled="emailForm.$invalid || email.busy"/>