From c0d738b8c2fe399034b3b0b9cfbf1a5985196173 Mon Sep 17 00:00:00 2001 From: Zhang Huangbin Date: Mon, 29 Feb 2016 20:43:32 +0800 Subject: [PATCH] Support markdown extension 'admonition'. --- en_US/howto/per-account.transport.md | 14 ++++++-- en_US/upgrade/1-iredmail.releases.md | 6 ++-- html/css/markdown.css | 54 ++++++++++++++++++++++++++++ html/iredmail.releases.html | 6 ++-- html/per-account.transport.html | 18 ++++++++-- tools/markdown2html.py | 2 +- 6 files changed, 87 insertions(+), 13 deletions(-) diff --git a/en_US/howto/per-account.transport.md b/en_US/howto/per-account.transport.md index 5dc7de10..bf90496c 100644 --- a/en_US/howto/per-account.transport.md +++ b/en_US/howto/per-account.transport.md @@ -1,5 +1,12 @@ # Per-domain or per-user transport (relay) +[TOC] + +Transport mentioned in this tutorial is used to deliver received email to +local mailbox. + +## Manage relay manually + With OpenLDAP backend, per-domain transport is set in domain account with attribute `mtaTransport`, per-user transport is set in user account with the same attribute. For example: @@ -26,9 +33,10 @@ Per-user transport is set in table `vmail.mailbox`, column `transport`. Per-user transport has higher priority. If no per-user transport is set for your mail user, per-domain transport will be used. -If you have our advanced web admin panel iRedAdmin-Pro installed, you can -easily manage per-domain or per-user transport in account profile page. -Screenshots: +## Manage relay with iRedAdmin-Pro + +With iRedAdmin-Pro, you can easily manage per-domain or per-user transport in +account profile page. Screenshots attached. * Per-domain transport/relay: diff --git a/en_US/upgrade/1-iredmail.releases.md b/en_US/upgrade/1-iredmail.releases.md index 4f07fde4..01c90f2d 100644 --- a/en_US/upgrade/1-iredmail.releases.md +++ b/en_US/upgrade/1-iredmail.releases.md @@ -30,10 +30,10 @@ > We provide remote upgrade support, check [the price](../support.html) and [contact us](../contact.html). * [0.9.4](http://www.iredmail.org/forum/topic10512.html), Jan 25, 2016. [Upgrade from iRedMail-0.9.3](./upgrade.iredmail.0.9.3-0.9.4.html) -* [0.9.3](http://www.iredmail.org/forum/topic10261.html), Dec 14, 2015. [Upgrade from iRedMail-0.9.2](./upgrade.iredmail.0.9.2-0.9.3.html) +* [0.9.3](http://www.iredmail.org/forum/topic10261.html), Dec 14, 2015. [Upgrade from iRedMail-0.9.2](./upgrade.iredmail.0.9.2-0.9.3.html) (contains SQL/LDAP structure changes) * [0.9.2](http://www.iredmail.org/forum/topic9280.html), Jun 3, 2015. [Upgrade from iRedMail-0.9.1](./upgrade.iredmail.0.9.1-0.9.2.html) -* [0.9.1](http://www.iredmail.org/forum/topic9144.html), May 15, 2015. [Upgrade from iRedMail-0.9.0](./upgrade.iredmail.0.9.0-0.9.1.html) -* [0.9.0](http://www.iredmail.org/forum/topic8443.html), Dec 31, 2014. [Upgrade from iRedMail-0.8.7](./upgrade.iredmail.0.8.7-0.9.0.html) +* [0.9.1](http://www.iredmail.org/forum/topic9144.html), May 15, 2015. [Upgrade from iRedMail-0.9.0](./upgrade.iredmail.0.9.0-0.9.1.html) (contains SQL/LDAP structure changes) +* [0.9.0](http://www.iredmail.org/forum/topic8443.html), Dec 31, 2014. [Upgrade from iRedMail-0.8.7](./upgrade.iredmail.0.8.7-0.9.0.html) (contains SQL/LDAP structure changes) * [0.8.7](http://www.iredmail.org/forum/topic6872-news-announcements-bug-fixes-iredmail087-has-been-released.html), May 13, 2014. [Upgrade from iRedMail-0.8.6](./upgrade.iredmail.0.8.6-0.8.7.html) * [0.8.6](http://www.iredmail.org/forum/topic5831-iredmail086-has-been-released.html), Dec 16, 2013. [Upgrade from iRedMail-0.8.5](./upgrade.iredmail.0.8.5-0.8.6.html) * [0.8.5](http://www.iredmail.org/forum/topic5167-news-announcements-bug-fixes-iredmail085-has-been-released.html), Jul 16, 2013. [Upgrade from iRedMail-0.8.4](./upgrade.iredmail.0.8.4-0.8.5.html) diff --git a/html/css/markdown.css b/html/css/markdown.css index 45171d94..77e85048 100644 --- a/html/css/markdown.css +++ b/html/css/markdown.css @@ -312,3 +312,57 @@ code.bash { background-color: green; color: white; } pre { margin-left: 30px; } p, ul, ol { font-size: 17px; } li { line-height: 26px; } + +/* +.note { + background: #e7f2fa; + padding: 12px; + line-height: 24px; + margin-bottom: 24px; +} +.note .admonition-title { + background: #6ab0de; +} +.note p:last-child { + margin-bottom: 0; +} +*/ + +.note, .attention, .caution, .danger, .error, .hint, .important, .tip, .warning, .seealso, .admonition-todo { + padding: 12px; + line-height: 24px; + margin-bottom: 24px; + background: #e7f2fa; + /* + background: #fdf3f2; + */ +} + +.admonition-title { + font-weight: bold; + display: block; + color: #fff; + /* + background: #6ab0de; + */ + margin: -12px; + padding: 6px 12px; + margin-bottom: 12px +} + +/* +.caution .admonition-title, +.danger .admonition-title, +.error .admonition-title, +.hint .admonition-title, +.important .admonition-title, +.tip .admonition-title, +.seealso .admonition-title, +.admonition-todo .admonition-title { + color: #404040; +} +*/ + +.note .admonition-title { background: #6ab0de; } +.warning .admonition-title { background: #e7f2fa; } +.attention .admonition-title { background: #fff; } diff --git a/html/iredmail.releases.html b/html/iredmail.releases.html index 151dbcf8..6cf715df 100644 --- a/html/iredmail.releases.html +++ b/html/iredmail.releases.html @@ -52,10 +52,10 @@