diff --git a/app/assets/images/rainbow_pool.png b/app/assets/images/rainbow_pool.png new file mode 100644 index 00000000..279076ee Binary files /dev/null and b/app/assets/images/rainbow_pool.png differ 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}!"