Skip to content

Commit

Permalink
- Improve the asynchronous delivery information on the ZMI Edit tab (f…
Browse files Browse the repository at this point in the history
…ixes #24)
  • Loading branch information
dataflake committed Jan 6, 2020
1 parent 0073d25 commit e7170b9
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 6 deletions.
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ Changelog
4.8 (unreleased)
----------------

- Improve the asynchronous delivery information on the ZMI Edit tab
(`#24 <https://github.com/zopefoundation/Products.MailHost/issues/24>`_)

- Fix queued mail delivery with just a single string receiver email
(`#26 <https://github.com/zopefoundation/Products.MailHost/issues/26>`_)

Expand Down
22 changes: 16 additions & 6 deletions src/Products/MailHost/dtml/manageMailHost.dtml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@

<main class="container-fluid">

<p class="form-help">
With asynchronous delivery (recommended for larger sites) email is
stored on the file system and delivered by a separate process. The
filesystem directory you designate as <em>queue directory</em> should be a
<em>Maildir</em> folder if the path already exists, otherwise the directory
will be created for you.
</p>

<form action="manage_makeChanges" method="post">

<div class="form-group row">
Expand Down Expand Up @@ -78,9 +86,6 @@
<input id="smtp_queue" class="form-check-input" type="checkbox"
name="smtp_queue:boolean"
<dtml-if "smtp_queue">checked</dtml-if>>
<small>
Send email using a separate process and a filesystem queue
</small>
</div>
</div>

Expand All @@ -91,8 +96,6 @@
<div class="col-sm-9 col-md-10">
<input id="smtp_queue_directory" class="form-control" type="text"
name="smtp_queue_directory" value="&dtml-smtp_queue_directory;"/>
<small>Filesystem queue directory for asynchronous delivery</small>
<small class="text-warning">This must be a Maildir folder</small>
</div>
</div>

Expand All @@ -107,7 +110,14 @@

<hr />

<h4>Asynchronous mail queue</h4>
<h4>Asynchronous mail queue at <dtml-var smtp_queue_directory></h4>

<p class="form-help">
You can stop and start the delivery process here. It starts itself
automatically when you send email through this MailHost. To prevent it
from starting, set the environment variable
<em>MAILHOST_QUEUE_ONLY</em> to <em>1</em> before starting Zope.
</p>

<form action="manage_restartQueueThread" method="post">

Expand Down

0 comments on commit e7170b9

Please sign in to comment.