From 4115043dc7be6e5cc8a5bb2e95ef97d391111611 Mon Sep 17 00:00:00 2001 From: Ondřej Hruška Date: Wed, 26 Jul 2017 02:00:36 +0200 Subject: Added external link icons to joinmastodon navbar buttons (#4368) --- app/views/about/more.html.haml | 5 ++++- app/views/about/show.html.haml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'app/views/about') diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml index 11315fefa..6342c7248 100644 --- a/app/views/about/more.html.haml +++ b/app/views/about/more.html.haml @@ -29,7 +29,10 @@ - else = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn' %li= link_to t('about.about_this'), about_more_path - %li= link_to t('about.other_instances'), 'https://joinmastodon.org/' + %li + = link_to 'https://joinmastodon.org/' do + = "#{t('about.other_instances')}" + %i.fa.fa-external-link{ style: 'padding-left: 5px;' } .container.hero .heading diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml index a3c8e4a84..d0c9a6650 100644 --- a/app/views/about/show.html.haml +++ b/app/views/about/show.html.haml @@ -33,7 +33,10 @@ - else = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn' %li= link_to t('about.about_this'), about_more_path - %li= link_to t('about.other_instances'), 'https://joinmastodon.org/' + %li + = link_to 'https://joinmastodon.org/' do + = "#{t('about.other_instances')}" + %i.fa.fa-external-link{ style: 'padding-left: 5px;' } .container.hero .floats -- cgit From 57a794d8ebf960339a75ae0af9051b722d8fd67a Mon Sep 17 00:00:00 2001 From: Lynx Kotoura Date: Sat, 29 Jul 2017 21:20:31 +0900 Subject: Fix autocomplete option in haml files (#4438) * Fix autocomplete in two_factor.html.haml * Fix autocomplete in registrations edit.html.haml * Fix autocomplete in passwords edit.html.haml * Fix autocomplete in _registration.html.haml * Fix autocomplete in new.html.haml * Fix autocomplete in show.html.haml * Add autocomplete option to sessions new.html.haml * Add autocomplete option to 2FA new.html.haml * Add autocomplete option to 2FA show.html.haml --- app/views/about/_registration.html.haml | 6 ++---- app/views/auth/passwords/edit.html.haml | 4 ++-- app/views/auth/registrations/edit.html.haml | 6 +++--- app/views/auth/registrations/new.html.haml | 4 ++-- app/views/auth/sessions/new.html.haml | 2 +- app/views/auth/sessions/two_factor.html.haml | 2 +- app/views/settings/deletes/show.html.haml | 2 +- .../settings/two_factor_authentication/confirmations/new.html.haml | 2 +- app/views/settings/two_factor_authentications/show.html.haml | 2 +- 9 files changed, 14 insertions(+), 16 deletions(-) (limited to 'app/views/about') 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' diff --git a/app/views/auth/passwords/edit.html.haml b/app/views/auth/passwords/edit.html.haml index 5e2b4fbd6..5ef3de976 100644 --- a/app/views/auth/passwords/edit.html.haml +++ b/app/views/auth/passwords/edit.html.haml @@ -5,8 +5,8 @@ = render 'shared/error_messages', object: resource = f.input :reset_password_token, as: :hidden - = f.input :password, autofocus: true, autocomplete: 'off', placeholder: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password') } - = f.input :password_confirmation, autocomplete: 'off', placeholder: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_new_password') } + = f.input :password, autofocus: true, placeholder: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password'), :autocomplete => 'off' } + = f.input :password_confirmation, placeholder: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_new_password'), :autocomplete => 'off' } .actions = f.button :button, t('auth.set_new_password'), type: :submit diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml index fbc8d017b..f016a4883 100644 --- a/app/views/auth/registrations/edit.html.haml +++ b/app/views/auth/registrations/edit.html.haml @@ -5,9 +5,9 @@ = render 'shared/error_messages', object: resource = f.input :email, placeholder: t('simple_form.labels.defaults.email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.email') } - = f.input :password, autocomplete: 'off', placeholder: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password') } - = f.input :password_confirmation, autocomplete: 'off', placeholder: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_new_password') } - = f.input :current_password, autocomplete: 'off', placeholder: t('simple_form.labels.defaults.current_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.current_password') } + = f.input :password, placeholder: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password'), :autocomplete => 'off' } + = f.input :password_confirmation, placeholder: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_new_password'), :autocomplete => 'off' } + = f.input :current_password, placeholder: t('simple_form.labels.defaults.current_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.current_password'), :autocomplete => 'off' } .actions = f.button :button, t('generic.save_changes'), type: :submit diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml index af7ee2b28..d0529a20c 100644 --- a/app/views/auth/registrations/new.html.haml +++ b/app/views/auth/registrations/new.html.haml @@ -11,8 +11,8 @@ = "@#{site_hostname}" = f.input :email, placeholder: t('simple_form.labels.defaults.email'), 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') } - = 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') } + = f.input :password, placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off' } + = f.input :password_confirmation, placeholder: t('simple_form.labels.defaults.confirm_password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_password'), :autocomplete => 'off' } .actions = f.button :button, t('auth.register'), type: :submit diff --git a/app/views/auth/sessions/new.html.haml b/app/views/auth/sessions/new.html.haml index f613100c1..e589377bf 100644 --- a/app/views/auth/sessions/new.html.haml +++ b/app/views/auth/sessions/new.html.haml @@ -3,7 +3,7 @@ = simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| = f.input :email, autofocus: true, placeholder: t('simple_form.labels.defaults.email'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.email') } - = f.input :password, placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password') } + = f.input :password, placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off' } .actions = f.button :button, t('auth.login'), type: :submit diff --git a/app/views/auth/sessions/two_factor.html.haml b/app/views/auth/sessions/two_factor.html.haml index 0321e1ec7..cb5e32f3e 100644 --- a/app/views/auth/sessions/two_factor.html.haml +++ b/app/views/auth/sessions/two_factor.html.haml @@ -3,7 +3,7 @@ = simple_form_for(resource, as: resource_name, url: session_path(resource_name), method: :post) do |f| = f.input :otp_attempt, type: :number, placeholder: t('simple_form.labels.defaults.otp_attempt'), - input_html: { 'aria-label' => t('simple_form.labels.defaults.otp_attempt') }, required: true, autofocus: true, autocomplete: 'off', + input_html: { 'aria-label' => t('simple_form.labels.defaults.otp_attempt'), :autocomplete => 'off' }, required: true, autofocus: true, hint: t('simple_form.hints.sessions.otp') .actions diff --git a/app/views/settings/deletes/show.html.haml b/app/views/settings/deletes/show.html.haml index d49a7bd0c..b246f83a1 100644 --- a/app/views/settings/deletes/show.html.haml +++ b/app/views/settings/deletes/show.html.haml @@ -10,7 +10,7 @@ %p.hint= t('deletes.description_html') - = f.input :password, autocomplete: 'off', placeholder: t('simple_form.labels.defaults.current_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.current_password') }, hint: t('deletes.confirm_password') + = f.input :password, placeholder: t('simple_form.labels.defaults.current_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.current_password'), :autocomplete => 'off' }, hint: t('deletes.confirm_password') .actions = f.button :button, t('deletes.proceed'), type: :submit, class: 'negative' diff --git a/app/views/settings/two_factor_authentication/confirmations/new.html.haml b/app/views/settings/two_factor_authentication/confirmations/new.html.haml index b7eb0c23d..fd4a3e768 100644 --- a/app/views/settings/two_factor_authentication/confirmations/new.html.haml +++ b/app/views/settings/two_factor_authentication/confirmations/new.html.haml @@ -11,7 +11,7 @@ %p.hint= t('two_factor_authentication.manual_instructions') %samp.qr-alternative__code= current_user.otp_secret.scan(/.{4}/).join(' ') - = f.input :code, hint: t('two_factor_authentication.code_hint'), placeholder: t('simple_form.labels.defaults.otp_attempt') + = f.input :code, hint: t('two_factor_authentication.code_hint'), placeholder: t('simple_form.labels.defaults.otp_attempt'), input_html: { :autocomplete => 'off' } .actions = f.button :button, t('two_factor_authentication.enable'), type: :submit diff --git a/app/views/settings/two_factor_authentications/show.html.haml b/app/views/settings/two_factor_authentications/show.html.haml index 8ba42a101..67a64a046 100644 --- a/app/views/settings/two_factor_authentications/show.html.haml +++ b/app/views/settings/two_factor_authentications/show.html.haml @@ -10,7 +10,7 @@ %hr/ = simple_form_for @confirmation, url: settings_two_factor_authentication_path, method: :delete do |f| - = f.input :code, hint: t('two_factor_authentication.code_hint'), placeholder: t('simple_form.labels.defaults.otp_attempt') + = f.input :code, hint: t('two_factor_authentication.code_hint'), placeholder: t('simple_form.labels.defaults.otp_attempt'), input_html: { :autocomplete => 'off' } .actions = f.button :button, t('two_factor_authentication.disable'), type: :submit -- cgit From ea33cdc30bb5ddef8016ce65595af4a6087bac60 Mon Sep 17 00:00:00 2001 From: Lynx Kotoura Date: Sun, 30 Jul 2017 19:56:04 +0900 Subject: Set contact address in about/more as mailto link (#4450) * Set contact address as mailto link To be able to copy long email address * Set style for mailto link --- app/javascript/styles/about.scss | 3 ++- app/views/about/_contact.html.haml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'app/views/about') diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss index 3258f1b8d..1c5f13e32 100644 --- a/app/javascript/styles/about.scss +++ b/app/javascript/styles/about.scss @@ -147,9 +147,10 @@ white-space: nowrap; overflow: hidden; - span { + a { font-weight: 400; color: lighten($ui-base-color, 34%); + text-decoration: none; } } } diff --git a/app/views/about/_contact.html.haml b/app/views/about/_contact.html.haml index 822639962..81b7db61f 100644 --- a/app/views/about/_contact.html.haml +++ b/app/views/about/_contact.html.haml @@ -2,7 +2,7 @@ .panel-header = succeed ':' do = t 'about.contact' - %span{ title: contact.site_contact_email.presence }= contact.site_contact_email.presence + = mail_to contact.site_contact_email.presence, nil, :title => contact.site_contact_email.presence .panel-body - if contact.contact_account .owner -- cgit From f91284d230c261baa6adc1764cad08b561c5ba67 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Sun, 30 Jul 2017 23:24:18 +0900 Subject: Do not create empty a element when there is no e-mail (#4455) Empty a element is created when there is no business e-mail input. --- app/javascript/styles/about.scss | 6 +++++- app/views/about/_contact.html.haml | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'app/views/about') diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss index 1c5f13e32..d409c8214 100644 --- a/app/javascript/styles/about.scss +++ b/app/javascript/styles/about.scss @@ -147,9 +147,13 @@ white-space: nowrap; overflow: hidden; - a { + a, + span { font-weight: 400; color: lighten($ui-base-color, 34%); + } + + a { text-decoration: none; } } diff --git a/app/views/about/_contact.html.haml b/app/views/about/_contact.html.haml index 81b7db61f..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' - = mail_to contact.site_contact_email.presence, nil, :title => 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 -- cgit