diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx index bf1ba54fcaa6a2ea9d08f89337ed35d1954a2b13..35746524804df8a2d19cc7b65ae1142af55d4bc0 100644 --- a/app/assets/javascripts/components/components/status_content.jsx +++ b/app/assets/javascripts/components/components/status_content.jsx @@ -22,11 +22,11 @@ const StatusContent = React.createClass({ let mention = this.props.status.get('mentions').find(item => link.href === item.get('url')); if (mention) { - link.addEventListener('click', this.onMentionClick.bind(this, mention)); + link.addEventListener('click', this.onMentionClick.bind(this, mention), false); } else { link.setAttribute('target', '_blank'); link.setAttribute('rel', 'noopener'); - link.addEventListener('click', this.onNormalClick); + link.addEventListener('click', this.onNormalClick, false); } } }, diff --git a/app/views/about/index.html.haml b/app/views/about/index.html.haml index 8e014760ef2d3ef342b7b4090f14017322da13c4..831e7f854a589519490d58a480191e3ca76b4551 100644 --- a/app/views/about/index.html.haml +++ b/app/views/about/index.html.haml @@ -1,3 +1,6 @@ +- content_for :page_title do + = Rails.configuration.x.local_domain + .wrapper %h1 = image_tag 'logo.png' @@ -16,4 +19,5 @@ is a Mastodon instance. .actions - = link_to 'Get started', new_user_session_path, class: 'button' + = link_to 'Get started', new_user_registration_path, class: 'button' + = link_to 'Log in', new_user_session_path, class: 'button' diff --git a/app/views/auth/confirmations/new.html.haml b/app/views/auth/confirmations/new.html.haml index 5c1cf5734fc074f3c632b50aa50887ccb865c0f4..e287f152830ae248e490183f50adc8b98f2019ba 100644 --- a/app/views/auth/confirmations/new.html.haml +++ b/app/views/auth/confirmations/new.html.haml @@ -1,3 +1,6 @@ +- content_for :page_title do + Confirmation instructions + = form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| = devise_error_messages! diff --git a/app/views/auth/passwords/edit.html.haml b/app/views/auth/passwords/edit.html.haml index 0d5f0fe10cbce25c817496cd68cac8180f3d6961..79a044acff5cba904ada500774b04d1a240d03a5 100644 --- a/app/views/auth/passwords/edit.html.haml +++ b/app/views/auth/passwords/edit.html.haml @@ -1,3 +1,6 @@ +- content_for :page_title do + Set new password + = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| = devise_error_messages! = f.hidden_field :reset_password_token diff --git a/app/views/auth/passwords/new.html.haml b/app/views/auth/passwords/new.html.haml index 2677feea09dce71b9136e0027fbdbdacc0f539b7..416870de82bea7a4722fc22e88391ce3781a5e87 100644 --- a/app/views/auth/passwords/new.html.haml +++ b/app/views/auth/passwords/new.html.haml @@ -1,3 +1,6 @@ +- content_for :page_title do + Reset password + = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| = devise_error_messages! diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml index 943230b34c25c78629aa46c17e8881cd16245a17..9a52af35c66d8a94ae8364ee52a5f94dd219377c 100644 --- a/app/views/auth/registrations/edit.html.haml +++ b/app/views/auth/registrations/edit.html.haml @@ -1,3 +1,6 @@ +- content_for :page_title do + Change password + = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| = devise_error_messages! diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml index c8532ec38a51e13da76ddd19c5997748a06aa645..97ab5498eb894194a76665c440df8fea3a9bc410 100644 --- a/app/views/auth/registrations/new.html.haml +++ b/app/views/auth/registrations/new.html.haml @@ -1,3 +1,6 @@ +- content_for :page_title do + Sign up + = form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| = devise_error_messages! diff --git a/app/views/auth/sessions/new.html.haml b/app/views/auth/sessions/new.html.haml index 220d0ec79b7b6f7b1d22b552dfdc77db04998183..7cfd1cb68be9ccf1d9f0762f2c1be7509cae4065 100644 --- a/app/views/auth/sessions/new.html.haml +++ b/app/views/auth/sessions/new.html.haml @@ -1,3 +1,6 @@ +- content_for :page_title do + Log in + = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| .field = f.email_field :email, autofocus: true, placeholder: 'E-mail address', required: true