coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show Sendmail settings on admin config page (#2782) 

* Show Sendmail settings on admin config page

* Remove unecessary if statement
This commit is contained in:
Jonas Bröms 2017-10-26 10:47:16 +02:00 committed by Lunny Xiao
parent 6a107e57f6
commit 4d01ecaef3
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
options/locale/locale_en-US.ini
View File

@ -1412,6 +1412,9 @@ config.mailer_disable_helo = Disable HELO
config.mailer_name = Name config.mailer_name = Name
config.mailer_host = Host config.mailer_host = Host
config.mailer_user = User config.mailer_user = User
config.mailer_use_sendmail = Use Sendmail
config.mailer_sendmail_path = Sendmail Path
config.mailer_sendmail_args = Extra arguments to Sendmail
config.send_test_mail = Send Test Email config.send_test_mail = Send Test Email
config.test_mail_failed = Failed to send test email to '%s': %v config.test_mail_failed = Failed to send test email to '%s': %v
config.test_mail_sent = Test email has been sent to '%s'. config.test_mail_sent = Test email has been sent to '%s'.

17
templates/admin/config.tmpl
View File

@ -170,10 +170,19 @@
{{if .MailerEnabled}} {{if .MailerEnabled}}
<dt>{{.i18n.Tr "admin.config.mailer_name"}}</dt> <dt>{{.i18n.Tr "admin.config.mailer_name"}}</dt>
<dd>{{.Mailer.Name}}</dd> <dd>{{.Mailer.Name}}</dd>
<dt>{{.i18n.Tr "admin.config.mailer_disable_helo"}}</dt> {{if not .Mailer.UseSendmail}}
<dd><i class="fa fa{{if .Mailer.DisableHelo}}-check{{end}}-square-o"></i></dd> <dt>{{.i18n.Tr "admin.config.mailer_disable_helo"}}</dt>
<dt>{{.i18n.Tr "admin.config.mailer_host"}}</dt> <dd><i class="fa fa{{if .Mailer.DisableHelo}}-check{{end}}-square-o"></i></dd>
<dd>{{.Mailer.Host}}</dd> <dt>{{.i18n.Tr "admin.config.mailer_host"}}</dt>
<dd>{{.Mailer.Host}}</dd>
{{else}}
<dt>{{.i18n.Tr "admin.config.mailer_use_sendmail"}}</dt>
<dd><i class="fa fa-check-square-o"></i></dd>
<dt>{{.i18n.Tr "admin.config.mailer_sendmail_path"}}</dt>
<dd>{{.Mailer.SendmailPath}}</dd>
<dt>{{.i18n.Tr "admin.config.mailer_sendmail_args"}}</dt>
<dd>{{.Mailer.SendmailArgs}}</dd>
{{end}}
<dt>{{.i18n.Tr "admin.config.mailer_user"}}</dt> <dt>{{.i18n.Tr "admin.config.mailer_user"}}</dt>
<dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd><br> <dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd><br>
<form class="ui form" action="{{AppSubUrl}}/admin/config/test_mail" method="post"> <form class="ui form" action="{{AppSubUrl}}/admin/config/test_mail" method="post">