forked from berserker/microblog
Remove previous landing page (#19300)
parent
5fd46dddd7
commit
58d5b28cb0
10 changed files with 8 additions and 210 deletions
@ -1,10 +0,0 @@ |
||||
.simple_form |
||||
%p.lead= t('about.logged_in_as_html', username: content_tag(:strong, current_account.username)) |
||||
|
||||
.actions |
||||
= link_to t('about.continue_to_web'), root_url, class: 'button button-primary' |
||||
|
||||
.form-footer |
||||
%ul.no-list |
||||
%li= link_to t('about.get_apps'), 'https://joinmastodon.org/apps', target: '_blank', rel: 'noopener noreferrer' |
||||
%li= link_to t('auth.logout'), destroy_user_session_path, data: { method: :delete } |
@ -1,22 +0,0 @@ |
||||
- unless omniauth_only? |
||||
= simple_form_for(new_user, url: user_session_path, namespace: 'login') do |f| |
||||
.fields-group |
||||
- if use_seamless_external_login? |
||||
= f.input :email, placeholder: t('simple_form.labels.defaults.username_or_email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.username_or_email') }, hint: false |
||||
- else |
||||
= f.input :email, placeholder: t('simple_form.labels.defaults.email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }, hint: false |
||||
|
||||
= f.input :password, placeholder: t('simple_form.labels.defaults.password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.password') }, hint: false |
||||
|
||||
.actions |
||||
= f.button :button, t('auth.login'), type: :submit, class: 'button button-primary' |
||||
|
||||
%p.hint.subtle-hint= link_to t('auth.trouble_logging_in'), new_user_password_path |
||||
|
||||
- if Devise.mappings[:user].omniauthable? and User.omniauth_providers.any? |
||||
.simple_form.alternative-login |
||||
%h4= omniauth_only? ? t('auth.log_in_with') : t('auth.or_log_in_with') |
||||
|
||||
.actions |
||||
- User.omniauth_providers.each do |provider| |
||||
= provider_sign_in_link(provider) |
@ -1,37 +0,0 @@ |
||||
- disabled = closed_registrations? || omniauth_only? || current_account.present? |
||||
- show_message = disabled && (current_user.present? || @instance_presenter.closed_registrations_message.present?) |
||||
|
||||
.simple_form__overlay-area{ class: show_message ? 'simple_form__overlay-area__blurred' : '' } |
||||
= simple_form_for(new_user, url: user_registration_path, namespace: 'registration', html: { novalidate: false }) do |f| |
||||
%p.lead= t('about.federation_hint_html', instance: content_tag(:strong, site_hostname)) |
||||
|
||||
.fields-group |
||||
= f.simple_fields_for :account do |account_fields| |
||||
= account_fields.input :username, wrapper: :with_label, label: false, required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username'), :autocomplete => 'off', placeholder: t('simple_form.labels.defaults.username'), pattern: '[a-zA-Z0-9_]+', maxlength: 30 }, append: "@#{site_hostname}", hint: false, disabled: disabled |
||||
|
||||
= f.input :email, placeholder: t('simple_form.labels.defaults.email'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.email'), :autocomplete => 'off' }, hint: false, disabled: disabled |
||||
= f.input :password, placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'new-password', :minlength => User.password_length.first, :maxlength => User.password_length.last }, hint: false, disabled: disabled |
||||
= 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 => 'new-password' }, hint: false, disabled: disabled |
||||
|
||||
= f.input :confirm_password, as: :string, placeholder: t('simple_form.labels.defaults.honeypot', label: t('simple_form.labels.defaults.password')), required: false, input_html: { 'aria-label' => t('simple_form.labels.defaults.honeypot', label: t('simple_form.labels.defaults.password')), :autocomplete => 'off' }, hint: false, disabled: disabled |
||||
= f.input :website, as: :url, placeholder: t('simple_form.labels.defaults.honeypot', label: 'Website'), required: false, input_html: { 'aria-label' => t('simple_form.labels.defaults.honeypot', label: 'Website'), :autocomplete => 'off' }, hint: false, disabled: disabled |
||||
|
||||
- if approved_registrations? |
||||
.fields-group |
||||
= f.simple_fields_for :invite_request do |invite_request_fields| |
||||
= invite_request_fields.input :text, as: :text, wrapper: :with_block_label, required: Setting.require_invite_text |
||||
|
||||
.fields-group |
||||
= f.input :agreement, as: :boolean, wrapper: :with_label, label: t('auth.checkbox_agreement_html', rules_path: about_more_path, terms_path: terms_path), required: true, disabled: disabled |
||||
|
||||
.actions |
||||
= f.button :button, sign_up_message, type: :submit, class: 'button button-primary', disabled: disabled |
||||
|
||||
- if show_message |
||||
.simple_form__overlay-area__overlay |
||||
.simple_form__overlay-area__overlay__content.rich-formatting |
||||
.block-icon= fa_icon 'warning' |
||||
- if current_account.present? |
||||
= t('about.logout_before_registering') |
||||
- else |
||||
= @instance_presenter.closed_registrations_message.html_safe |
@ -1,69 +0,0 @@ |
||||
- content_for :page_title do |
||||
= site_hostname |
||||
|
||||
- content_for :header_tags do |
||||
%link{ rel: 'canonical', href: about_url }/ |
||||
= render partial: 'shared/og' |
||||
|
||||
.landing |
||||
.landing__brand |
||||
= link_to root_url, class: 'brand' do |
||||
= logo_as_symbol(:wordmark) |
||||
%span.brand__tagline=t 'about.tagline' |
||||
|
||||
.landing__grid |
||||
.landing__grid__column.landing__grid__column-registration |
||||
.box-widget |
||||
= render 'registration' |
||||
|
||||
.directory |
||||
.directory__tag |
||||
= link_to web_path do |
||||
%h4 |
||||
= fa_icon 'globe fw' |
||||
= t('about.see_whats_happening') |
||||
%small= t('about.browse_public_posts') |
||||
|
||||
.directory__tag |
||||
= link_to 'https://joinmastodon.org/apps', target: '_blank', rel: 'noopener noreferrer' do |
||||
%h4 |
||||
= fa_icon 'tablet fw' |
||||
= t('about.get_apps') |
||||
%small= t('about.apps_platforms') |
||||
|
||||
.landing__grid__column.landing__grid__column-login |
||||
.box-widget |
||||
- if current_user.present? |
||||
= render 'logged_in' |
||||
- else |
||||
= render 'login' |
||||
|
||||
.hero-widget |
||||
.hero-widget__img |
||||
= image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.png'), alt: @instance_presenter.title |
||||
|
||||
.hero-widget__text |
||||
%p |
||||
= @instance_presenter.description.html_safe.presence || t('about.about_mastodon_html') |
||||
= link_to about_more_path do |
||||
= t('about.learn_more') |
||||
= fa_icon 'angle-double-right' |
||||
|
||||
.hero-widget__footer |
||||
.hero-widget__footer__column |
||||
%h4= t 'about.administered_by' |
||||
|
||||
= account_link_to @instance_presenter.contact.account |
||||
|
||||
.hero-widget__footer__column |
||||
%h4= t 'about.server_stats' |
||||
|
||||
.hero-widget__counters__wrapper |
||||
.hero-widget__counter |
||||
%strong= friendly_number_to_human @instance_presenter.user_count |
||||
%span= t 'about.user_count_after', count: @instance_presenter.user_count |
||||
.hero-widget__counter |
||||
%strong= friendly_number_to_human @instance_presenter.active_user_count |
||||
%span |
||||
= t 'about.active_count_after' |
||||
%abbr{ title: t('about.active_footnote') } * |
@ -1,25 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
require 'rails_helper' |
||||
|
||||
describe 'about/show.html.haml', without_verify_partial_doubles: true do |
||||
before do |
||||
allow(view).to receive(:site_hostname).and_return('example.com') |
||||
allow(view).to receive(:site_title).and_return('example site') |
||||
allow(view).to receive(:new_user).and_return(User.new) |
||||
allow(view).to receive(:use_seamless_external_login?).and_return(false) |
||||
allow(view).to receive(:current_account).and_return(nil) |
||||
end |
||||
|
||||
it 'has valid open graph tags' do |
||||
assign(:instance_presenter, InstancePresenter.new) |
||||
render |
||||
|
||||
header_tags = view.content_for(:header_tags) |
||||
|
||||
expect(header_tags).to match(%r{<meta content=".+" property="og:title" />}) |
||||
expect(header_tags).to match(%r{<meta content="website" property="og:type" />}) |
||||
expect(header_tags).to match(%r{<meta content=".+" property="og:image" />}) |
||||
expect(header_tags).to match(%r{<meta content="http://.+" property="og:url" />}) |
||||
end |
||||
end |
Loading…
Reference in new issue