Add landing strip

This commit is contained in:
Eugen Rochko 2017-03-20 03:36:29 +01:00
parent 56d998cbdb
commit 6b1db5c2b2
11 changed files with 65 additions and 58 deletions

View file

@ -285,6 +285,24 @@ button:focus {
} }
} }
.landing-strip {
background: rgba(darken($color1, 7%), 0.8);
color: $color3;
font-weight: 400;
padding: 14px;
border-radius: 4px;
margin-bottom: 20px;
strong, a {
font-weight: 500;
}
a {
color: inherit;
text-decoration: underline;
}
}
@import 'forms'; @import 'forms';
@import 'accounts'; @import 'accounts';
@import 'stream_entries'; @import 'stream_entries';

View file

@ -14,6 +14,9 @@
%meta{ property: 'og:image:height', content: '120' }/ %meta{ property: 'og:image:height', content: '120' }/
%meta{ property: 'twitter:card', content: 'summary' }/ %meta{ property: 'twitter:card', content: 'summary' }/
- if !user_signed_in? && !Rails.configuration.x.single_user_mode
= render partial: 'shared/landing_strip', locals: { account: @account }
.h-feed .h-feed
%data.p-name{ value: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/ %data.p-name{ value: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/

View file

@ -0,0 +1,2 @@
.landing-strip
= t('landing_strip_html', name: display_name(account), domain: Rails.configuration.x.local_domain, sign_up_path: new_user_registration_path)

View file

@ -20,5 +20,8 @@
%meta{ property: 'twitter:card', content: 'summary' }/ %meta{ property: 'twitter:card', content: 'summary' }/
- if !user_signed_in? && !Rails.configuration.x.single_user_mode
= render partial: 'shared/landing_strip', locals: { account: @stream_entry.account }
.activity-stream.activity-stream-headless .activity-stream.activity-stream-headless
= render partial: @type, locals: { @type.to_sym => @stream_entry.activity, include_threads: true } = render partial: @type, locals: { @type.to_sym => @stream_entry.activity, include_threads: true }

View file

@ -82,8 +82,6 @@ de:
preferences: Einstellungen preferences: Einstellungen
stream_entries: stream_entries:
click_to_show: Klicken um zu zeigen click_to_show: Klicken um zu zeigen
favourited: favorisierte einen Beitrag von
is_now_following: folgt nun
reblogged: teilte reblogged: teilte
sensitive_content: Sensible Inhalte sensitive_content: Sensible Inhalte
time: time:

View file

@ -3,7 +3,6 @@ en:
about: about:
about_instance: "<em>%{instance}</em> is a Mastodon instance." about_instance: "<em>%{instance}</em> is a Mastodon instance."
about_mastodon: Mastodon is a <em>free, open-source</em> social network server. A <em>decentralized</em> alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Anyone can run Mastodon and participate in the <em>social network</em> seamlessly. about_mastodon: Mastodon is a <em>free, open-source</em> social network server. A <em>decentralized</em> alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Anyone can run Mastodon and participate in the <em>social network</em> seamlessly.
apps: Apps
business_email: 'Business e-mail:' business_email: 'Business e-mail:'
contact: Contact contact: Contact
domain_count_after: other instances domain_count_after: other instances
@ -75,6 +74,7 @@ en:
validation_errors: validation_errors:
one: Something isn't quite right yet! Please review the error below one: Something isn't quite right yet! Please review the error below
other: Something isn't quite right yet! Please review %{count} errors below other: Something isn't quite right yet! Please review %{count} errors below
landing_strip_html: <strong>%{name}</strong> is a user on <strong>%{domain}</strong>. You can follow them or interact with them if you have an account anywhere in the fediverse. If you don't, you can <a href="%{sign_up_path}">sign up here</a>.
notification_mailer: notification_mailer:
digest: digest:
body: 'Here is a brief summary of what you missed on %{instance} since your last visit on %{since}:' body: 'Here is a brief summary of what you missed on %{instance} since your last visit on %{since}:'
@ -125,8 +125,6 @@ en:
unlisted: Public, but do not display on the public timeline unlisted: Public, but do not display on the public timeline
stream_entries: stream_entries:
click_to_show: Click to show click_to_show: Click to show
favourited: favourited a post by
is_now_following: is now following
reblogged: boosted reblogged: boosted
sensitive_content: Sensitive content sensitive_content: Sensitive content
time: time:

View file

@ -10,7 +10,7 @@ es:
follow: Seguir follow: Seguir
followers: Seguidores followers: Seguidores
following: Siguiendo following: Siguiendo
nothing_here: ¡No hay nada aquí! nothing_here: "¡No hay nada aquí!"
people_followed_by: Usuarios a quien %{name} sigue people_followed_by: Usuarios a quien %{name} sigue
people_who_follow: Usuarios que siguen a %{name} people_who_follow: Usuarios que siguen a %{name}
posts: Publicaciones posts: Publicaciones
@ -19,20 +19,20 @@ es:
signature: Notificaciones de Mastodon desde %{instance} signature: Notificaciones de Mastodon desde %{instance}
auth: auth:
change_password: Cambiar contraseña change_password: Cambiar contraseña
didnt_get_confirmation: ¿No recibió instrucciones de confirmación? didnt_get_confirmation: "¿No recibió instrucciones de confirmación?"
forgot_password: ¿Olvidó su contraseña? forgot_password: "¿Olvidó su contraseña?"
login: Iniciar sesión login: Iniciar sesión
register: Registrarse register: Registrarse
resend_confirmation: Volver a enviar las instrucciones de confirmación resend_confirmation: Volver a enviar las instrucciones de confirmación
reset_password: Restablecer contraseña reset_password: Restablecer contraseña
set_new_password: Establecer nueva contraseña set_new_password: Establecer nueva contraseña
generic: generic:
changes_saved_msg: ¡Cambios guardados con éxito! changes_saved_msg: "¡Cambios guardados con éxito!"
powered_by: powered by %{link} powered_by: powered by %{link}
save_changes: Guardar cambios save_changes: Guardar cambios
validation_errors: validation_errors:
one: ¡Algo no está todavía bien! Por favor, revise el error más abajo one: "¡Algo no está todavía bien! Por favor, revise el error más abajo"
other: ¡Algo no está todavía bien! Por favor, revise %{count} errores más abajo other: "¡Algo no está todavía bien! Por favor, revise %{count} errores más abajo"
notification_mailer: notification_mailer:
favourite: favourite:
body: 'Su estado fue marcado como favorito por %{name}:' body: 'Su estado fue marcado como favorito por %{name}:'
@ -52,8 +52,5 @@ es:
settings: settings:
edit_profile: Editar perfil edit_profile: Editar perfil
preferences: Preferencias preferences: Preferencias
stream_entries:
favourited: marcado como favorito por
is_now_following: está ahora siguiendo
will_paginate: will_paginate:
page_gap: "&hellip;" page_gap: "&hellip;"

View file

@ -2,37 +2,37 @@
fr: fr:
about: about:
about_instance: "<em>%{instance}</em> est une instance de Mastodon." about_instance: "<em>%{instance}</em> est une instance de Mastodon."
about_mastodon: "Mastodon est un serveur <em>libre</em> de réseautage social. Alternative <em>décentralisée</em> aux plateformes commerciales, la monopolisation de vos communications par une entreprise unique est évitée. Tout un chacun peut faire tourner Mastodon et participer au <em>réseau social</em> de manière transparente." about_mastodon: Mastodon est un serveur <em>libre</em> de réseautage social. Alternative <em>décentralisée</em> aux plateformes commerciales, la monopolisation de vos communications par une entreprise unique est évitée. Tout un chacun peut faire tourner Mastodon et participer au <em>réseau social</em> de manière transparente.
get_started: "Rejoindre le réseau" get_started: Rejoindre le réseau
source_code: "Code source" source_code: Code source
terms: "Conditions dutilisation" terms: Conditions dutilisation
accounts: accounts:
follow: "Suivre" follow: Suivre
followers: "Abonnés" followers: Abonnés
following: "Abonnements" following: Abonnements
nothing_here: "Rien à voir ici !" nothing_here: Rien à voir ici !
people_followed_by: "Personnes suivies par %{name}" people_followed_by: Personnes suivies par %{name}
people_who_follow: "Personnes qui suivent %{name}" people_who_follow: Personnes qui suivent %{name}
posts: "Statuts" posts: Statuts
unfollow: "Ne plus suivre" unfollow: Ne plus suivre
application_mailer: application_mailer:
signature: "Notifications de Mastodon depuis %{instance}" signature: Notifications de Mastodon depuis %{instance}
auth: auth:
change_password: "Changer de mot de passe" change_password: Changer de mot de passe
didnt_get_confirmation: "Vous navez pas reçu les consignes de confirmation ?" didnt_get_confirmation: Vous navez pas reçu les consignes de confirmation ?
forgot_password: "Mode passe oublié ?" forgot_password: Mode passe oublié ?
login: "Se connecter" login: Se connecter
register: "Sinscrire" register: Sinscrire
resend_confirmation: "Envoyer à nouveau les consignes de confirmation" resend_confirmation: Envoyer à nouveau les consignes de confirmation
reset_password: "Réinitialiser le mot de passe" reset_password: Réinitialiser le mot de passe
set_new_password: "Établir le nouveau mot de passe" set_new_password: Établir le nouveau mot de passe
generic: generic:
changes_saved_msg: "Les modifications ont été enregistrées avec succès !" changes_saved_msg: Les modifications ont été enregistrées avec succès !
powered_by: "propulsé par %{link}" powered_by: propulsé par %{link}
save_changes: "Enregistrer les modifications" save_changes: Enregistrer les modifications
validation_errors: validation_errors:
one: "Quelque chose ne va pas ! Vérifiez lerreur ci-dessous." one: Quelque chose ne va pas ! Vérifiez lerreur ci-dessous.
other: "Quelques choses ne vont pas ! Vérifiez les erreurs ci-dessous." other: Quelques choses ne vont pas ! Vérifiez les erreurs ci-dessous.
notification_mailer: notification_mailer:
favourite: favourite:
body: "%{name} a ajouté votre statut à ses favoris :" body: "%{name} a ajouté votre statut à ses favoris :"
@ -47,13 +47,10 @@ fr:
body: "%{name} a partagé votre statut :" body: "%{name} a partagé votre statut :"
subject: "%{name} a partagé votre statut" subject: "%{name} a partagé votre statut"
pagination: pagination:
next: "Suivant" next: Suivant
prev: "Précédent" prev: Précédent
settings: settings:
edit_profile: "Modifier le profil" edit_profile: Modifier le profil
preferences: "Préférences" preferences: Préférences
stream_entries:
favourited: "a ajouté à ses favoris un statut de"
is_now_following: "suit désormais"
will_paginate: will_paginate:
page_gap: "&hellip;" page_gap: "&hellip;"

View file

@ -41,7 +41,7 @@ hu:
body: "%{name} mostantól követ téged!" body: "%{name} mostantól követ téged!"
subject: "%{name} mostantól követ téged" subject: "%{name} mostantól követ téged"
mention: mention:
body: '%{name} megemlített téged:' body: "%{name} megemlített téged:"
subject: "%{name} megemlített téged" subject: "%{name} megemlített téged"
reblog: reblog:
body: 'Az állapotod reblogolta %{name}:' body: 'Az állapotod reblogolta %{name}:'
@ -52,8 +52,5 @@ hu:
settings: settings:
edit_profile: Profil szerkesztése edit_profile: Profil szerkesztése
preferences: Beállítások preferences: Beállítások
stream_entries:
favourited: kedvencnek jelölték a bejegyzésedet
is_now_following: mostantól követ
will_paginate: will_paginate:
page_gap: "&hellip;" page_gap: "&hellip;"

View file

@ -52,8 +52,5 @@ pt:
settings: settings:
edit_profile: Editar perfil edit_profile: Editar perfil
preferences: Preferências preferences: Preferências
stream_entries:
favourited: favoritou um post por
is_now_following: agora segue
will_paginate: will_paginate:
page_gap: "&hellip;" page_gap: "&hellip;"

View file

@ -36,7 +36,7 @@ uk:
notification_mailer: notification_mailer:
favourite: favourite:
body: 'Ваш статус подобається %{name}:' body: 'Ваш статус подобається %{name}:'
subject: "Користувачу %{name} сподобвся ваш статус" subject: Користувачу %{name} сподобвся ваш статус
follow: follow:
body: "%{name} тепер підписаний на вас!" body: "%{name} тепер підписаний на вас!"
subject: "%{name} тепер підписаний на вас" subject: "%{name} тепер підписаний на вас"
@ -52,8 +52,5 @@ uk:
settings: settings:
edit_profile: Редагувати профіль edit_profile: Редагувати профіль
preferences: Налаштування preferences: Налаштування
stream_entries:
favourited: сподобався допис від
is_now_following: тепер підписаний(-а) на
will_paginate: will_paginate:
page_gap: "&hellip;" page_gap: "&hellip;"