From 6e17a9271134b0778168e18b5f2ac9169b6f8d3f Mon Sep 17 00:00:00 2001 From: f Date: Wed, 19 Feb 2020 18:48:22 -0300 Subject: [PATCH] arreglos varios --- app/assets/stylesheets/application.scss | 3 ++- app/views/sites/_form.haml | 12 ++++++------ config/locales/en.yml | 2 +- config/locales/es.yml | 2 +- db/seeds/designs.yml | 12 ++++++------ 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index f6db8fe..90e5290 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -160,7 +160,7 @@ ol.breadcrumb { &[type=text] { @extend .form-control; display: inline-block; - width: calc(100% - 90px); + width: calc(100% - 93px); } &[type=checkbox] { @@ -186,6 +186,7 @@ svg { border: none; border-radius: 0; margin-right: 0.3rem; + margin-bottom: 0.3rem; &:hover { color: var(--background); diff --git a/app/views/sites/_form.haml b/app/views/sites/_form.haml index 18814dc..30e72bc 100644 --- a/app/views/sites/_form.haml +++ b/app/views/sites/_form.haml @@ -86,12 +86,7 @@ %hr/ - - unless site.persisted? - = f.fields_for :deploys do |deploy| - - next unless deploy.object.kind_of? DeployLocal - = deploy.hidden_field :type - - - else + - if site.persisted? .form-group %h2= t('.deploys.title') %p.lead= t('.help.deploys') @@ -100,6 +95,11 @@ = render "deploys/#{deploy.object.type.underscore}", deploy: deploy, site: site %hr/ + - else + = f.fields_for :deploys do |deploy| + - next unless deploy.object.is_a? DeployLocal + + = deploy.hidden_field :type .form-group = f.submit submit, class: 'btn btn-lg btn-block' diff --git a/config/locales/en.yml b/config/locales/en.yml index a6a6370..cacb923 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -148,7 +148,6 @@ en: anexo: 'Appendix' simple: 'Simple' sites: - static_file_migration: 'File migration' index: 'This is the list of sites you can edit.' edit_translations: "You can edit texts from your site other than posts', and you can also translate them to other languages." @@ -247,6 +246,7 @@ en: average: 'Average building time' maximum: 'Maximum building time' sites: + static_file_migration: 'File migration' index: title: 'Sites' pull: 'Upgrade' diff --git a/config/locales/es.yml b/config/locales/es.yml index 832d8fa..de3ad2a 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -149,7 +149,6 @@ es: anexo: 'Anexo' simple: 'Simple' sites: - static_file_migration: 'Migración de archivos' index: 'Este es el listado de sitios que puedes editar.' edit_translations: 'Puedes editar los textos que salen en tu sitio que no corresponden a artículos aquí, además de traducirlos a @@ -252,6 +251,7 @@ es: average: 'Tiempo promedio de generación' maximum: 'Tiempo máximo de generación' sites: + static_file_migration: 'Migración de archivos' index: title: 'Sitios' pull: 'Actualizar' diff --git a/db/seeds/designs.yml b/db/seeds/designs.yml index 873ceb4..328265f 100644 --- a/db/seeds/designs.yml +++ b/db/seeds/designs.yml @@ -4,15 +4,15 @@ gem: 'sutty-theme-none' url: 'https://sutty.nl' disabled: true - description_en: "Upload your own theme. [This feature is in development, help us!](https://sutty.neocities.org/en/#contact)" - description_es: "Subir tu propio diseño. [Esta posibilidad está en desarrollo, ¡ayudanos!](https://sutty.neocities.org/es/#contacto)" + description_en: "Upload your own theme. [This feature is in development, help us!](https://sutty.nl/en/#contact)" + description_es: "Subir tu propio diseño. [Esta posibilidad está en desarrollo, ¡ayudanos!](https://sutty.nl/#contacto)" - name_en: 'I want you to create a site for me' name_es: 'Quiero que desarrollen mi sitio' gem: 'sutty-theme-custom' url: 'https://sutty.nl' disabled: true - description_en: "If you want us to create your site, you're welcome to [contact us!](https://sutty.neocities.org/en/#contact) :)" - description_es: "Si querés que desarrollemos tu sitio, [escribinos](https://sutty.neocities.org/es/#contacto) :)" + description_en: "If you want us to create your site, you're welcome to [contact us!](https://sutty.nl/en/#contact) :)" + description_es: "Si querés que desarrollemos tu sitio, [escribinos](https://sutty.nl/#contacto) :)" - name_en: 'Minima' name_es: 'Mínima' gem: 'minima' @@ -25,5 +25,5 @@ gem: 'sutty-theme-own' url: 'https://jekyllthemes.org' disabled: true - description_en: "We're working to add more themes for you to use. [Contact us!](https://sutty.neocities.org/en/#contact)" - description_es: "Estamos trabajando para que puedas tener más diseños. [¡Escribinos!](https://sutty.neocities.org/es/#contacto)" + description_en: "We're working to add more themes for you to use. [Contact us!](https://sutty.nl/en/#contact)" + description_es: "Estamos trabajando para que puedas tener más diseños. [¡Escribinos!](https://sutty.nl/#contacto)"