autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge tag 'v1.0.5+3.2.0' into hometown-v1.0.5+3.3.0

Browse Source
This commit is contained in:
Darius Kazemi
2021-04-22 16:37:11 -07:00
parent b43c50afa8 799bf57e68
commit 4fe7cfc4be
126 changed files with 2708 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/about/_registration.html.haml
View File

@ -1,6 +1,6 @@
.simple_form__overlay-area{ class: (closed_registrations? && @instance_presenter.closed_registrations_message.present?) ? '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))
%p.lead= t('about.federation_hint_html', instance: content_tag(:strong, site_title))
.fields-group
= f.simple_fields_for :account do |account_fields|

18
app/views/about/more.html.haml
View File

@ -9,7 +9,14 @@
.column-0
.public-account-header.public-account-header--no-bar
.public-account-header__image
= image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.jpg'), alt: @instance_presenter.site_title, class: 'parallax'
- if @instance_presenter.hero.present? || @instance_presenter.thumbnail.present?
= image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url, alt: @instance_presenter.site_title, class: 'parallax'
- else
%div{:class => ("originalheader")}
= svg_logo
%h1
= link_to root_url, class: 'brand' do
= site_title
.column-1
.landing-page__call-to-action{ dir: 'ltr' }
@ -24,8 +31,13 @@
%strong= number_to_human @instance_presenter.status_count, strip_insignificant_zeros: true
%span= t 'about.status_count_after', count: @instance_presenter.status_count
.row__mascot
.landing-page__mascot
= image_tag @instance_presenter.mascot&.file&.url || asset_pack_path('media/images/elephant_ui_plane.svg'), alt: ''
- if @instance_presenter.mascot&.file&.url
.landing-page__mascot
= image_tag @instance_presenter.mascot&.file&.url
- else
.landing-page__mascot{:class => ("originalmascot")}
%div{:class => ("originalmascotimg")}
= svg_logo
.column-2
.contact-widget

21
app/views/about/show.html.haml
View File

@ -7,9 +7,9 @@
.landing
.landing__brand
= link_to root_url, class: 'brand' do
= svg_logo_full
%span.brand__tagline=t 'about.tagline'
%h1
= link_to root_url, class: 'brand' do
= site_title
.landing__grid
.landing__grid__column.landing__grid__column-registration
@ -35,22 +35,29 @@
%h4
= fa_icon 'globe fw'
= t('about.see_whats_happening')
%small= t('about.browse_public_posts')
%small= t('about.browse_public_posts', title: site_title)
.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')
%small= t('about.apps_platforms', title: site_title)
.landing__grid__column.landing__grid__column-login
.box-widget
= 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.jpg'), alt: @instance_presenter.site_title
- if @instance_presenter.hero.present? || @instance_presenter.thumbnail.present?
.hero-widget__img
= image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url, alt: @instance_presenter.site_title
- else
%div{:class => ("originalhero")}
= svg_logo
%h1
= link_to root_url, class: 'brand' do
= site_title
.hero-widget__text
%p

2
app/views/admin/dashboard/index.html.haml
View File

@ -77,7 +77,7 @@
%h4= t 'admin.dashboard.software'
%ul
%li
Mastodon
Hometown
%span.pull-right= @version
%li
Ruby

5
app/views/application/_sidebar.html.haml
View File

@ -1,6 +1,7 @@
.hero-widget
.hero-widget__img
= image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.jpg'), alt: @instance_presenter.site_title
- if @instance_presenter.hero.present? || @instance_presenter.thumbnail.present?
.hero-widget__img
= image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url, alt: @instance_presenter.site_title
.hero-widget__text
%p= @instance_presenter.site_short_description.html_safe.presence || t('about.about_mastodon_html')

2
app/views/auth/registrations/_sessions.html.haml
View File

@ -1,5 +1,5 @@
%h3= t 'sessions.title'
%p.muted-hint= t 'sessions.explanation'
%p.muted-hint= t('sessions.explanation', title: site_title)
%hr.spacer/

4
app/views/home/index.html.haml
View File

@ -10,7 +10,7 @@
.app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
%noscript
= image_pack_tag 'logo.svg', alt: 'Mastodon'
= image_pack_tag 'logo.svg', alt: site_title
%div
= t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps')
= t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps', title: site_title)

11
app/views/layouts/admin.html.haml
View File

@ -7,13 +7,16 @@
.sidebar-wrapper
.sidebar-wrapper__inner
.sidebar
= link_to root_path do
= image_pack_tag 'logo.svg', class: 'logo', alt: 'Mastodon'
.logo
%h2
= link_to root_url, class: 'brand' do
= site_title
.sidebar__toggle
.sidebar__toggle__logo
= link_to root_path do
= svg_logo_full
%h2
= link_to root_path, class: 'brand' do
= site_title
= link_to '#', class: 'sidebar__toggle__icon' do
= fa_icon 'bars'

3
app/views/layouts/application.html.haml
View File

@ -39,5 +39,4 @@
= content_for?(:content) ? yield(:content) : yield
.logo-resources
= render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')
= render file: Rails.root.join('app', 'javascript', 'images', 'logo_full.svg')
= render file: Rails.root.join('app', 'javascript', 'images', 'hometown.svg')

4
app/views/layouts/auth.html.haml
View File

@ -5,8 +5,8 @@
.container-alt
.logo-container
%h1
= link_to root_path do
= svg_logo_full
= link_to root_path, class: 'brand' do
= site_title
.form-container
= render 'flashes'

4
app/views/layouts/error.html.haml
View File

@ -12,6 +12,8 @@
%body.error
.dialog
.dialog__illustration
%img{ alt: Setting.default_settings['site_title'], src: '/oops.png' }/
%h1
= link_to root_url, class: 'brand' do
= Setting.default_settings['site_title']
.dialog__message
%h1= yield :content

6
app/views/layouts/mailer.html.haml
View File

@ -24,7 +24,8 @@
%tr
%td.column-cell
= link_to root_url do
= image_tag full_pack_url('media/images/mailer/logo_full.png'), alt: 'Mastodon', height: 34, class: 'logo'
%h1
= site_title
= yield
@ -49,4 +50,5 @@
%p= link_to t('application_mailer.notification_preferences'), settings_preferences_notifications_url
%td.column-cell.text-right
= link_to root_url do
= image_tag full_pack_url('media/images/mailer/logo_transparent.png'), alt: 'Mastodon', height: 24
%h4
= site_title

2
app/views/layouts/public.html.haml
View File

@ -9,7 +9,7 @@
%nav.header
.nav-left
= link_to root_url, class: 'brand' do
= svg_logo_full
= site_title
- unless whitelist_mode?
= link_to t('directories.directory'), explore_path, class: 'nav-link optional' if Setting.profile_directory

5
app/views/public_timelines/show.html.haml
View File

@ -7,11 +7,10 @@
.page-header
%h1= t('about.see_whats_happening')
- if Setting.show_known_fediverse_at_about_page
%p= t('about.browse_public_posts')
%p= t('about.browse_public_posts', title: site_title)
- else
%p= t('about.browse_local_posts')
%p= t('about.browse_local_posts', title: site_title)
#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(local: !Setting.show_known_fediverse_at_about_page)) }}
#modal-container

2
app/views/settings/profiles/show.html.haml
View File

@ -48,7 +48,7 @@
.fields-row__column.fields-group.fields-row__column-6
%h6= t('verification.verification')
%p.hint= t('verification.explanation_html')
%p.hint= t('verification.explanation_html', instance: site_hostname)
.input-copy
.input-copy__wrapper

2
app/views/user_mailer/backup_ready.html.haml
View File

@ -36,7 +36,7 @@
%tbody
%tr
%td.column-cell.text-center
%p= t 'user_mailer.backup_ready.explanation'
%p= t('user_mailer.backup_ready.explanation', title: site_title)
%table.email-table{ cellspacing: 0, cellpadding: 0 }
%tbody

2
app/views/user_mailer/reconfirmation_instructions.html.haml
View File

@ -57,4 +57,4 @@
%tbody
%tr
%td.column-cell.text-center.padded
%p= t 'devise.mailer.reconfirmation_instructions.extra'
%p= t 'devise.mailer.reconfirmation_instructions.extra', title: site_title

2
app/views/user_mailer/welcome.html.haml
View File

@ -135,7 +135,7 @@
%h5= t 'user_mailer.welcome.tips'
%ul
%li
%span= t 'user_mailer.welcome.tip_mobile_webapp'
%span= t 'user_mailer.welcome.tip_mobile_webapp', instance: @instance
%li
%span= t 'user_mailer.welcome.tip_following'
%li