mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-30 00:30:40 +00:00
221580a3af
Conflicts: - `app/controllers/home_controller.rb`: Upstream made it so `/web` is available to non-logged-in users and `/` redirects to `/web` instead of `/about`. Kept our version since glitch-soc's WebUI doesn't have what's needed yet and I think /about is still a much better landing page anyway. - `app/models/form/admin_settings.rb`: Upstream added new settings, and glitch-soc had an extra setting. Not really a conflict. Added upstream's new settings. - `app/serializers/initial_state_serializer.rb`: Upstream added a new `server` initial state object. Not really a conflict. Merged upstream's changes. - `app/views/admin/settings/edit.html.haml`: Upstream added new settings. Not really a conflict. Merged upstream's changes. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Upstream refactored that part and removed the file. Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb` - `config/settings.yml`: Upstream added new settings. Not a real conflict. Added upstream's new settings.
61 lines
2.3 KiB
Plaintext
61 lines
2.3 KiB
Plaintext
- content_for :header_tags do
|
|
= render_initial_state
|
|
|
|
- content_for :content do
|
|
.public-layout
|
|
- unless @hide_navbar
|
|
.container
|
|
%nav.header
|
|
.nav-left
|
|
= link_to root_url, class: 'brand' do
|
|
= logo_as_symbol(:wordmark)
|
|
|
|
- unless whitelist_mode?
|
|
= link_to t('directories.directory'), explore_path, class: 'nav-link optional' if Setting.profile_directory
|
|
= link_to t('about.about_this'), about_more_path, class: 'nav-link optional'
|
|
= link_to t('about.apps'), 'https://joinmastodon.org/apps', class: 'nav-link optional'
|
|
|
|
.nav-center
|
|
|
|
.nav-right
|
|
- if user_signed_in?
|
|
= link_to t('settings.back'), root_url, class: 'nav-link nav-button webapp-btn'
|
|
- else
|
|
= link_to_login t('auth.login'), class: 'webapp-btn nav-link nav-button'
|
|
= link_to t('auth.register'), available_sign_up_path, class: 'webapp-btn nav-link nav-button'
|
|
|
|
.container= yield
|
|
|
|
.container
|
|
.footer
|
|
.grid
|
|
.column-0
|
|
%h4= t 'footer.resources'
|
|
%ul
|
|
%li= link_to t('about.privacy_policy'), privacy_policy_path
|
|
.column-1
|
|
%h4= t 'footer.developers'
|
|
%ul
|
|
%li= link_to t('about.documentation'), 'https://docs.joinmastodon.org/'
|
|
%li= link_to t('about.api'), 'https://docs.joinmastodon.org/client/intro/'
|
|
.column-2
|
|
%h4= link_to t('about.what_is_mastodon'), 'https://joinmastodon.org/'
|
|
= link_to logo_as_symbol, root_url, class: 'brand'
|
|
.column-3
|
|
%h4= site_hostname
|
|
%ul
|
|
- unless whitelist_mode?
|
|
%li= link_to t('about.about_this'), about_more_path
|
|
%li= "v#{Mastodon::Version.to_s}"
|
|
.column-4
|
|
%h4= t 'footer.more'
|
|
%ul
|
|
%li= link_to t('about.source_code'), Mastodon::Version.source_url
|
|
%li= link_to t('about.apps'), 'https://joinmastodon.org/apps'
|
|
.legal-xs
|
|
= link_to "v#{Mastodon::Version.to_s}", Mastodon::Version.source_url
|
|
·
|
|
= link_to t('about.privacy_policy'), privacy_policy_path
|
|
|
|
= render template: 'layouts/application'
|