diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-08-01 13:07:43 -0700 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-08-01 13:20:29 -0700 |
| commit | 8150689b48716bb016d492d28cef08600a4b315e (patch) | |
| tree | a05a2539e894c79ef17698dce0da5a6af0c25bf6 /app/views/about | |
| parent | b61e3daf983d87c6d2de7e54d420c2e8f5a531e6 (diff) | |
| parent | 7ef848256871454a790a9b7cc725053c67ba3da4 (diff) | |
Merge upstream (#111)
Diffstat (limited to 'app/views/about')
| -rw-r--r-- | app/views/about/_contact.html.haml | 5 | ||||
| -rw-r--r-- | app/views/about/_registration.html.haml | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/app/views/about/_contact.html.haml b/app/views/about/_contact.html.haml index 822639962..cf21ad5a3 100644 --- a/app/views/about/_contact.html.haml +++ b/app/views/about/_contact.html.haml @@ -2,7 +2,10 @@ .panel-header = succeed ':' do = t 'about.contact' - %span{ title: contact.site_contact_email.presence }= contact.site_contact_email.presence + - if contact.site_contact_email.present? + = mail_to contact.site_contact_email, nil, title: contact.site_contact_email + - else + %span= t 'about.contact_unavailable' .panel-body - if contact.contact_account .owner diff --git a/app/views/about/_registration.html.haml b/app/views/about/_registration.html.haml index eeeb0088f..f1c6e6b9d 100644 --- a/app/views/about/_registration.html.haml +++ b/app/views/about/_registration.html.haml @@ -14,15 +14,13 @@ required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.email') } = f.input :password, - autocomplete: 'off', placeholder: t('simple_form.labels.defaults.password'), required: true, - input_html: { 'aria-label' => t('simple_form.labels.defaults.password') } + input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off' } = f.input :password_confirmation, - autocomplete: 'off', placeholder: t('simple_form.labels.defaults.confirm_password'), required: true, - input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_password') } + input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_password'), :autocomplete => 'off' } .actions = f.button :button, t('auth.register'), type: :submit, class: 'button button-alternative' |