From 7fad6abfed24dd8b84d37045a8ccf96c53dae078 Mon Sep 17 00:00:00 2001 From: Emi Matchu Date: Fri, 11 Oct 2024 15:27:36 -0700 Subject: [PATCH] Add homepage link to Rainbow Pool, and move Modeling Hub to footer --- app/assets/images/rainbow_pool.png | Bin 0 -> 2824 bytes app/views/layouts/application.html.haml | 1 + app/views/outfits/new.html.haml | 18 ++++++++++-------- config/locales/en-MEEP.yml | 8 -------- config/locales/en.yml | 18 ++++++++++-------- config/locales/es.yml | 6 ------ config/locales/pt.yml | 6 ------ 7 files changed, 21 insertions(+), 36 deletions(-) create mode 100644 app/assets/images/rainbow_pool.png diff --git a/app/assets/images/rainbow_pool.png b/app/assets/images/rainbow_pool.png new file mode 100644 index 0000000000000000000000000000000000000000..279076eef060758863386e6282394729b91b90d7 GIT binary patch literal 2824 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 Sv6*fS0en3DJZ{m#v;Pauf98Y$ literal 0 HcmV?d00001 diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 4fca8fda..2f21b2f6 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -73,6 +73,7 @@ = link_to t('.footer.terms', date: terms_updated_timestamp), terms_path %li= link_to t('.footer.blog'), "https://blog.openneo.net/" + %li= link_to t('modeling_hub'), bulk_pets_path %div #{t('.footer.contact')}: diff --git a/app/views/outfits/new.html.haml b/app/views/outfits/new.html.haml index 830d7dd5..8b394083 100644 --- a/app/views/outfits/new.html.haml +++ b/app/views/outfits/new.html.haml @@ -72,16 +72,18 @@ = submit_tag t('.infinite_closet.item_search.submit') %li - %h3= link_to t('modeling_hub'), bulk_pets_path + %h3= link_to t('rainbow_pool'), pet_types_path = link_to bulk_pets_path do - = image_tag 'https://images.neopets.com/items/mall_ac_garland_spotlight.gif' + = image_tag 'rainbow_pool.png' .section-info - %strong= t '.modeling_hub.tagline' - %p= t '.modeling_hub.description' - = form_tag load_pet_path, method: 'POST' do - = pet_name_tag placeholder: t('.modeling_hub.load_pet.placeholder'), - required: true - = submit_tag t('.modeling_hub.load_pet.submit') + %strong= t('.rainbow_pool.tagline') + %p= t('.rainbow_pool.description') + = form_with url: pet_types_path, method: 'GET' do |form| + = form.select :color, @colors.map(&:human_name), + include_blank: t('.rainbow_pool.filters.color') + = form.select :species, @species.map(&:human_name), + include_blank: t('.rainbow_pool.filters.species') + = form.submit t('.rainbow_pool.filters.submit'), name: nil - if @latest_contribution # will be nil for a fresh copy of the site ;P #latest-contribution diff --git a/config/locales/en-MEEP.yml b/config/locales/en-MEEP.yml index f437a71f..8f09ff72 100644 --- a/config/locales/en-MEEP.yml +++ b/config/locales/en-MEEP.yml @@ -554,14 +554,6 @@ en-MEEP: item_search: placeholder: meep an item… submit: meep - modeling_hub: - tagline: Found somemeep? - description: - Meep a pet's meep here and we'll meep a meep of what it's wearing. - Thanks so meep! - load_pet: - placeholder: meep a pet… - submit: meep latest_contribution: header: Contribumeeps description_html: "%{user_link} meeped us %{contributed_description}. diff --git a/config/locales/en.yml b/config/locales/en.yml index 9d74ca47..2d314d95 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -4,6 +4,7 @@ en: your_items: Your Items infinite_closet: Infinite Closet modeling_hub: Modeling Hub + rainbow_pool: Rainbow Pool locale_name: English activerecord: @@ -32,7 +33,7 @@ en: footer: source_code: Source Code - terms: Terms of Use (updated %{date}) + terms: Terms of Use (%{date}) blog: Blog contact: Contact email: Questions, comments, bugs @@ -677,14 +678,15 @@ en: item_search: placeholder: find an item… submit: search - modeling_hub: - tagline: Found something? + rainbow_pool: + tagline: Explore your options! description: - Enter a pet's name here and we'll keep a copy of what it's wearing. - Thanks so much! - load_pet: - placeholder: model a pet… - submit: submit + Browse the colors you can paint your pets, and the "style" options + from the NC Mall! + filters: + species: Species… + color: Color… + submit: Go latest_contribution: header: Contributions description_html: "%{user_link} showed us %{contributed_description}. diff --git a/config/locales/es.yml b/config/locales/es.yml index 8d757bad..e655dbd2 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -452,12 +452,6 @@ es: item_search: placeholder: buscar un objeto... submit: buscar - modeling_hub: - tagline: ¿Has encontrado algo? - description: Si no encuentras un objeto y sabes de un pet que lo lleve ¡Escribe su nombre aquí! - load_pet: - placeholder: desfilar con un pet... - submit: enviar latest_contribution: header: Contribuciones description_html: "%{user_link} nos ha mostrado %{contributed_description}. ¡Muchas gracias, %{user_link}!" diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 381be40b..90b5331b 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -448,12 +448,6 @@ pt: item_search: placeholder: Procurar um item… submit: Vai! - modeling_hub: - tagline: Encontrou alguma coisa? - description: Digite o nome do pet aqui e nós vamos copiar o que ele está vestindo. Muito Obrigado. - load_pet: - placeholder: modele um pet… - submit: Enviar latest_contribution: header: Contribuições description_html: "%{user_link} nos mostrou %{contributed_description}. Obrigado, %{user_link}!"