mirror of
https://0xacab.org/sutty/sutty
synced 2024-11-15 07:01:42 +00:00
Merge branch 'rails' into anonymous
This commit is contained in:
f
commit
1b0cec9005
14 changed files with 64 additions and 27 deletions
|
|
@ -185,6 +185,7 @@ svg {
|
|||
color: var(--background);
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
margin-right: 0.3rem;
|
||||
|
||||
&:hover {
|
||||
color: var(--background);
|
||||
|
|
|
|||
|
|
@ -5,9 +5,8 @@
|
|||
|
||||
.row.align-items-center.justify-content-center.full-height
|
||||
.col-md-5.align-self-center
|
||||
.sr-only
|
||||
%h2= t('.sign_up')
|
||||
%p= t('.help')
|
||||
%h2= t('.sign_up')
|
||||
%p= t('.help')
|
||||
|
||||
= form_for(resource,
|
||||
as: resource_name,
|
||||
|
|
|
|||
|
|
@ -5,7 +5,8 @@
|
|||
%br/
|
||||
|
||||
- if devise_mapping.registerable? && controller_name != 'registrations'
|
||||
= link_to t('.sign_up'), new_registration_path(resource_name)
|
||||
= link_to t('.sign_up'), new_registration_path(resource_name),
|
||||
class: 'btn btn-lg btn-block btn-success'
|
||||
%br/
|
||||
|
||||
- if devise_mapping.recoverable?
|
||||
|
|
|
|||
|
|
@ -21,9 +21,6 @@
|
|||
|
||||
- if current_usuarie
|
||||
%ul.navbar-nav
|
||||
%li.nav-item
|
||||
= link_to t('.mutual_aid'), mutual_aid_url(local_channel),
|
||||
class: 'btn'
|
||||
%li.nav-item
|
||||
= link_to t('.logout'), destroy_usuarie_session_path,
|
||||
method: :delete, role: 'button', class: 'btn'
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
link: nil
|
||||
- else
|
||||
= form_tag site_enqueue_path(site),
|
||||
method: :post, class: 'form-inline' do
|
||||
method: :post, class: 'form-inline inline' do
|
||||
= button_tag type: 'submit',
|
||||
class: 'btn no-border-radius',
|
||||
title: t('help.sites.enqueue'),
|
||||
|
|
|
|||
|
|
@ -86,14 +86,20 @@
|
|||
|
||||
%hr/
|
||||
|
||||
.form-group
|
||||
%h2= t('.deploys.title')
|
||||
%p.lead= t('.help.deploys')
|
||||
|
||||
- unless site.persisted?
|
||||
= f.fields_for :deploys do |deploy|
|
||||
= render "deploys/#{deploy.object.type.underscore}",
|
||||
deploy: deploy, site: site
|
||||
%hr/
|
||||
- next unless deploy.object.kind_of? DeployLocal
|
||||
= deploy.hidden_field :type
|
||||
|
||||
- else
|
||||
.form-group
|
||||
%h2= t('.deploys.title')
|
||||
%p.lead= t('.help.deploys')
|
||||
|
||||
= f.fields_for :deploys do |deploy|
|
||||
= render "deploys/#{deploy.object.type.underscore}",
|
||||
deploy: deploy, site: site
|
||||
%hr/
|
||||
|
||||
.form-group
|
||||
= f.submit submit, class: 'btn btn-lg btn-block'
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
= render 'layouts/breadcrumb',
|
||||
crumbs: [link_to(t('sites.index.title'), sites_path),
|
||||
t('.title', site: @site.name)]
|
||||
.row
|
||||
.col
|
||||
.row.justify-content-center
|
||||
.col-md-8
|
||||
%h1= t('.title', site: @site.name)
|
||||
|
||||
= render 'form', site: @site, submit: t('.submit')
|
||||
|
|
|
|||
|
|
@ -9,6 +9,9 @@
|
|||
class: 'btn'
|
||||
|
||||
%section.col
|
||||
- if @sites.empty?
|
||||
:markdown
|
||||
#{t('.welcome')}
|
||||
%table.table.table-condensed
|
||||
%tbody
|
||||
- @sites.each do |site|
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
= render 'layouts/breadcrumb',
|
||||
crumbs: [link_to(t('sites.index.title'), sites_path), t('.title')]
|
||||
|
||||
.row
|
||||
.col
|
||||
.row.justify-content-center
|
||||
.col-md-8
|
||||
%h1= t('.title')
|
||||
%p.lead= t('.help')
|
||||
|
||||
= render 'form', site: @site, submit: t('.submit')
|
||||
|
|
|
|||
|
|
@ -197,7 +197,7 @@ Devise.setup do |config|
|
|||
# website without confirming their account.
|
||||
# Default is 0.days, meaning the user cannot access the website
|
||||
# without confirming their account.
|
||||
# config.allow_unconfirmed_access_for = 2.days
|
||||
config.allow_unconfirmed_access_for = 2.days
|
||||
|
||||
# A period that the user is allowed to confirm their account before
|
||||
# their token becomes invalid. For example, if set to 3.days, the user
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ en:
|
|||
locked: Your account is locked.
|
||||
not_found_in_database: Invalid %{authentication_keys} or password.
|
||||
timeout: Your session expired. Please sign in again to continue.
|
||||
unauthenticated: You need to sign in or sign up before continuing.
|
||||
unauthenticated: Hi! You need to sign in or sign up before managing your sites.
|
||||
unconfirmed: You have to confirm your email address before continuing.
|
||||
mailer:
|
||||
confirmation_instructions:
|
||||
|
|
@ -103,6 +103,7 @@ en:
|
|||
we_need_your_current_password_to_confirm_your_changes: We need your current password to confirm your changes
|
||||
new:
|
||||
sign_up: Sign up
|
||||
help: We only ask for an e-mail address and a password. The password is safely stored, no one else besides you knows it! You'll also receive an e-mail to confirm your account.
|
||||
signed_up: Welcome! You have signed up successfully.
|
||||
signed_up_but_inactive: You have signed up successfully. However, we could not sign you in because your account is not yet activated.
|
||||
signed_up_but_locked: You have signed up successfully. However, we could not sign you in because your account is locked.
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ es:
|
|||
last_sign_in_ip: IP del último inicio
|
||||
locked_at: Fecha de bloqueo
|
||||
password: Contraseña
|
||||
password_confirmation: Confirmación de la contraseña
|
||||
password_confirmation: Confirma tu contraseña
|
||||
remember_created_at: Fecha de 'Recordarme'
|
||||
remember_me: Recordarme
|
||||
reset_password_sent_at: Fecha de envío de código para contraseña
|
||||
|
|
@ -44,7 +44,7 @@ es:
|
|||
locked: Tu cuenta está bloqueada.
|
||||
not_found_in_database: "%{authentication_keys} o contraseña inválidos."
|
||||
timeout: Tu sesión expiró. Por favor, inicia sesión nuevamente para continuar.
|
||||
unauthenticated: Tienes que iniciar sesión o registrarte para poder continuar.
|
||||
unauthenticated: "¡Hola! Tienes que iniciar sesión o registrarte para poder gestionar tus sitios."
|
||||
unconfirmed: Te enviamos un correo electrónico para confirmar tu cuenta, por favor acéptalo para poder continuar.
|
||||
mailer:
|
||||
confirmation_instructions:
|
||||
|
|
@ -80,7 +80,7 @@ es:
|
|||
edit:
|
||||
change_my_password: Cambiar mi contraseña
|
||||
change_your_password: Cambia tu contraseña
|
||||
confirm_new_password: Confirme la nueva contraseña
|
||||
confirm_new_password: Confirma la nueva contraseña
|
||||
new_password: Nueva contraseña
|
||||
new:
|
||||
forgot_your_password: "¿Has olvidado tu contraseña?"
|
||||
|
|
@ -103,7 +103,7 @@ es:
|
|||
we_need_your_current_password_to_confirm_your_changes: Necesitamos tu contraseña actual para confirmar los cambios.
|
||||
new:
|
||||
sign_up: Registrarme por primera vez
|
||||
email: O simplemente continuar con tu dirección de correo y contraseña
|
||||
help: Para registrarte solo pedimos una dirección de correo y una contraseña. La contraseña se almacena de forma segura, ¡nadie más que vos la sabe! Recibirás un correo de confirmación de cuenta.
|
||||
signed_up: Bienvenide. Tu cuenta fue creada.
|
||||
signed_up_but_inactive: Tu cuenta ha sido creada correctamente. Sin embargo, no hemos podido iniciar la sesión porque tu cuenta aún no está activada.
|
||||
signed_up_but_locked: Tu cuenta ha sido creada correctamente. Sin embargo, no hemos podido iniciar la sesión porque que tu cuenta está bloqueada.
|
||||
|
|
|
|||
|
|
@ -251,7 +251,22 @@ en:
|
|||
title: 'Sites'
|
||||
pull: 'Upgrade'
|
||||
help: 'This is the list of sites you can edit'
|
||||
visit: 'Visitar el sitio'
|
||||
visit: 'Visit the site'
|
||||
welcome: |
|
||||
# Welcome!
|
||||
|
||||
You have no sites yet. You can generate all the sites you want
|
||||
with the **Create site** button.
|
||||
|
||||
Para ver los cambios, usa el botón **Publicar cambios** en cada
|
||||
sitio y espera unos segundos. También recibirás un correo de
|
||||
notificación.
|
||||
|
||||
To see your changes, use the **Publish changes** button on each
|
||||
site and wait a few seconds. You'll also receive an e-mail
|
||||
notification.
|
||||
|
||||
[Create my first site](/sites/new)
|
||||
repository:
|
||||
config: 'Changes in config'
|
||||
actions: 'Actions'
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ es:
|
|||
usuarie:
|
||||
email: 'Correo electrónico'
|
||||
password: 'Contraseña'
|
||||
password_confirmation: 'Confirmación de contraseña'
|
||||
password_confirmation: 'Confirma tu contraseña'
|
||||
current_password: 'Contraseña actual'
|
||||
lang: Idioma principal
|
||||
remember_me: Recordarme
|
||||
|
|
@ -257,6 +257,18 @@ es:
|
|||
pull: 'Actualizar'
|
||||
help: 'Este es el listado de sitios que puedes editar'
|
||||
visit: 'Visitar el sitio'
|
||||
welcome: |
|
||||
# ¡Bienvenide!
|
||||
|
||||
Todavía no tienes ningún sitio. Puedes crear todos los sitios
|
||||
que quieras usando el botón **Crear sitio**.
|
||||
|
||||
Para ver los cambios, usa el botón **Publicar cambios** en cada
|
||||
sitio y espera unos segundos. También recibirás un correo de
|
||||
notificación.
|
||||
|
||||
[Crear mi primer sitio](/sites/new)
|
||||
|
||||
repository:
|
||||
config: 'Cambios en la configuración'
|
||||
actions: 'Acciones'
|
||||
|
|
@ -272,6 +284,7 @@ es:
|
|||
new:
|
||||
title: 'Crear un sitio'
|
||||
submit: 'Crear sitio'
|
||||
help: 'Podrás editar estas opciones más adelante en la configuración del sitio.'
|
||||
edit:
|
||||
title: 'Editar %{site}'
|
||||
submit: 'Guardar cambios'
|
||||
|
|
|
|||
Loading…
Reference in a new issue