mirror of
https://0xacab.org/sutty/sutty
synced 2024-11-15 18:11:42 +00:00
Merge branch 'issue-13260' into 'rails'
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
fix: temporalmente deshabilitar el cambio de plantillas #13260 See merge request sutty/sutty!180
This commit is contained in:
commit
7f181712a5
3 changed files with 32 additions and 31 deletions
|
@ -46,36 +46,37 @@
|
||||||
.invalid-feedback= site.errors.messages[:description].join(', ')
|
.invalid-feedback= site.errors.messages[:description].join(', ')
|
||||||
%hr/
|
%hr/
|
||||||
|
|
||||||
.form-group#design_id
|
- unless site.persisted?
|
||||||
%h2= t('.design.title')
|
.form-group#design_id
|
||||||
%p.lead= t('.help.design')
|
%h2= t('.design.title')
|
||||||
- if invalid? site, :design_id
|
%p.lead= t('.help.design')
|
||||||
= render 'bootstrap/alert' do
|
- if invalid? site, :design_id
|
||||||
= t('activerecord.errors.models.site.attributes.design_id.layout_incompatible.help',
|
= render 'bootstrap/alert' do
|
||||||
layouts: site.incompatible_layouts.to_sentence)
|
= t('activerecord.errors.models.site.attributes.design_id.layout_incompatible.help',
|
||||||
.row.row-cols-1.row-cols-md-2.designs
|
layouts: site.incompatible_layouts.to_sentence)
|
||||||
-# Demasiado complejo para un f.collection_radio_buttons
|
.row.row-cols-1.row-cols-md-2.designs
|
||||||
- Design.all.order(priority: :desc).each do |design|
|
-# Demasiado complejo para un f.collection_radio_buttons
|
||||||
.design.col.d-flex.flex-column
|
- Design.all.order(priority: :desc).each do |design|
|
||||||
.custom-control.custom-radio
|
.design.col.d-flex.flex-column
|
||||||
= f.radio_button :design_id, design.id,
|
.custom-control.custom-radio
|
||||||
checked: design.id == site.design_id,
|
= f.radio_button :design_id, design.id,
|
||||||
disabled: design.disabled,
|
checked: design.id == site.design_id,
|
||||||
required: true, class: 'custom-control-input'
|
disabled: design.disabled,
|
||||||
= f.label "design_id_#{design.id}", design.name,
|
required: true, class: 'custom-control-input'
|
||||||
class: 'custom-control-label'
|
= f.label "design_id_#{design.id}", design.name,
|
||||||
.flex-fill
|
class: 'custom-control-label'
|
||||||
= sanitize_markdown design.description,
|
.flex-fill
|
||||||
tags: %w[p a strong em]
|
= sanitize_markdown design.description,
|
||||||
|
tags: %w[p a strong em]
|
||||||
|
|
||||||
.btn-group{ role: 'group', 'aria-label': t('.design.actions') }
|
.btn-group{ role: 'group', 'aria-label': t('.design.actions') }
|
||||||
- if design.url
|
- if design.url
|
||||||
= link_to t('.design.url'), design.url,
|
= link_to t('.design.url'), design.url,
|
||||||
target: '_blank', class: 'btn'
|
target: '_blank', class: 'btn'
|
||||||
- if design.license
|
- if design.license
|
||||||
= link_to t('.design.license'), design.license,
|
= link_to t('.design.license'), design.license,
|
||||||
target: '_blank', class: 'btn'
|
target: '_blank', class: 'btn'
|
||||||
%hr/
|
%hr/
|
||||||
|
|
||||||
.form-group.licenses#license_id
|
.form-group.licenses#license_id
|
||||||
%h2= t('.licencia.title')
|
%h2= t('.licencia.title')
|
||||||
|
|
|
@ -434,7 +434,7 @@ en:
|
||||||
name: "This will be the host name for your site, ie. **example**.sutty.nl. Choose an expression up to 63 characters. It can contain only lowercase letters, numbers and dashes, **and no spaces**. It can't start or end with a dash, or be entirely composed of numbers."
|
name: "This will be the host name for your site, ie. **example**.sutty.nl. Choose an expression up to 63 characters. It can contain only lowercase letters, numbers and dashes, **and no spaces**. It can't start or end with a dash, or be entirely composed of numbers."
|
||||||
title: 'The title can be anything you want'
|
title: 'The title can be anything you want'
|
||||||
description: 'You site description that appears in search engines. Between 50 and 160 characters.'
|
description: 'You site description that appears in search engines. Between 50 and 160 characters.'
|
||||||
design: 'Select the design for your site. You can change it later. We add more designs from time to time!'
|
design: 'Select the design for your site. We add more designs from time to time!'
|
||||||
licencia: 'Everything we publish has automatic copyright. This
|
licencia: 'Everything we publish has automatic copyright. This
|
||||||
means nobody can use our works without explicit permission. By
|
means nobody can use our works without explicit permission. By
|
||||||
using licenses, we stablish conditions by which we want to share
|
using licenses, we stablish conditions by which we want to share
|
||||||
|
|
|
@ -440,7 +440,7 @@ es:
|
||||||
name: 'El nombre de tu sitio que formará parte de la dirección (**ejemplo**.sutty.nl). Solo puede contener hasta 63 letras minúsculas, números y guiones, pero **sin espacios**. No puede empezar ni terminar con guión, ni estar compuesto enteramente por números.'
|
name: 'El nombre de tu sitio que formará parte de la dirección (**ejemplo**.sutty.nl). Solo puede contener hasta 63 letras minúsculas, números y guiones, pero **sin espacios**. No puede empezar ni terminar con guión, ni estar compuesto enteramente por números.'
|
||||||
title: 'El título de tu sitio puede ser lo que quieras.'
|
title: 'El título de tu sitio puede ser lo que quieras.'
|
||||||
description: 'La descripción del sitio, que saldrá en buscadores. Entre 50 y 160 caracteres.'
|
description: 'La descripción del sitio, que saldrá en buscadores. Entre 50 y 160 caracteres.'
|
||||||
design: 'Elegí el diseño que va a tener tu sitio aquí. Podés cambiarlo luego. De tanto en tanto vamos sumando diseños nuevos.'
|
design: 'Elegí el diseño que va a tener tu sitio aquí. De tanto en tanto vamos sumando diseños nuevos.'
|
||||||
licencia: 'Todo lo que publicamos posee automáticamente derechos
|
licencia: 'Todo lo que publicamos posee automáticamente derechos
|
||||||
de autore. Esto significa que nadie puede hacer uso de nuestras
|
de autore. Esto significa que nadie puede hacer uso de nuestras
|
||||||
obras sin permiso explícito. Con las licencias establecemos
|
obras sin permiso explícito. Con las licencias establecemos
|
||||||
|
|
Loading…
Reference in a new issue