Compare commits

..

No commits in common. "38474d19d788b2f8e006e1fd46f29de530d3b304" and "7f554564544f03deca03753c9c3f3437bf79f38f" have entirely different histories.

11 changed files with 178 additions and 136 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

View file

@ -1,5 +1,5 @@
module OutfitsHelper module OutfitsHelper
LAST_DAY_OF_ANNOUNCEMENT = Date.parse("2024-09-27") LAST_DAY_OF_ANNOUNCEMENT = Date.parse("2024-09-13")
def show_announcement? def show_announcement?
Date.today <= LAST_DAY_OF_ANNOUNCEMENT Date.today <= LAST_DAY_OF_ANNOUNCEMENT
end end

View file

@ -9,23 +9,24 @@
= will_paginate @items = will_paginate @items
- else - else
#search-info #search-info
#search-help - localized_cache :action_suffix => 'search_help' do
%h2= t '.search_help_header' #search-help
%dl %h2= t '.search_help_header'
%dt= t '.examples.basic.query' %dl
%dd= t '.examples.basic.description' %dt= t '.examples.basic.query'
%dt= t '.examples.user_items.query' %dd= t '.examples.basic.description'
%dd %dt= t '.examples.user_items.query'
= twl '.examples.user_items.description', %dd
:user_items_link_url => your_items_path = twl '.examples.user_items.description',
%dt= t '.examples.nc.query' :user_items_link_url => your_items_path
%dd= t '.examples.nc.description' %dt= t '.examples.nc.query'
%dt= t '.examples.pb.query' %dd= t '.examples.nc.description'
%dd= t '.examples.pb.description' %dt= t '.examples.pb.query'
%dt= t '.examples.species.query' %dd= t '.examples.pb.description'
%dd= t '.examples.species.description' %dt= t '.examples.species.query'
%dt= t '.examples.type.query' %dd= t '.examples.species.description'
%dd= t '.examples.type.description' %dt= t '.examples.type.query'
%dd= t '.examples.type.description'
#search-new-items #search-new-items
%h2= t '.newest_items.header' %h2= t '.newest_items.header'

View file

@ -16,51 +16,52 @@
= f.select :list_id, neopets_page_list_options(current_user) = f.select :list_id, neopets_page_list_options(current_user)
= f.submit t('.submit') = f.submit t('.submit')
%p - localized_cache :action_suffix => 'explanation' do
= t '.help.welcome', :name => @import_task.page.name %p
= t '.help.intro', :name => @import_task.page.name = t '.help.welcome', :name => @import_task.page.name
= t '.help.intro', :name => @import_task.page.name
%ol
%li %ol
= twl '.help.check_frame.header', :page_link_url => @import_task.page.url, %li
:name => @import_task.page.name, :index => @import_task.page.expected_index = twl '.help.check_frame.header', :page_link_url => @import_task.page.url,
%ul :name => @import_task.page.name, :index => @import_task.page.expected_index
%li %ul
%strong= t '.help.check_frame.check_login.summary' %li
= t '.help.check_frame.check_login.details' %strong= t '.help.check_frame.check_login.summary'
%li = t '.help.check_frame.check_login.details'
%strong %li
= twl '.help.check_frame.login.summary', %strong
= twl '.help.check_frame.login.summary',
:login_link_url => neopets_login_url
= twl '.help.check_frame.login.details',
:login_link_url => neopets_login_url :login_link_url => neopets_login_url
= twl '.help.check_frame.login.details', %li
:login_link_url => neopets_login_url %strong
%li = t '.help.check_frame.check_content.summary',
%strong :name => @import_task.page.name
= t '.help.check_frame.check_content.summary', = t '.help.check_frame.check_content.details'
:name => @import_task.page.name
= t '.help.check_frame.check_content.details' %li
= t '.help.view_source.header'
%li %ul
= t '.help.view_source.header' %li
%ul = t '.help.view_source.chrome_html'
%li %li
= t '.help.view_source.chrome_html' = t '.help.view_source.firefox_html'
%li %li
= t '.help.view_source.firefox_html' = t '.help.view_source.other'
%li %li
= t '.help.view_source.other' = twl '.help.view_source.troubleshooting',
%li :page_link_url => @import_task.page.url
= twl '.help.view_source.troubleshooting',
:page_link_url => @import_task.page.url %li
= t '.help.copy_source.header'
%li %ul
= t '.help.copy_source.header' %li
%ul = t '.help.copy_source.shortcuts'
%li
= t '.help.copy_source.shortcuts' %li
= t '.help.submit.header'
%li %ul
= t '.help.submit.header' %li
%ul = t '.help.submit.description', :name => @import_task.page.name
%li
= t '.help.submit.description', :name => @import_task.page.name

View file

@ -6,27 +6,33 @@
- if show_announcement? - if show_announcement?
%section.announcement %section.announcement
= image_tag "about/announcement-broom.png", width: 70, height: 70, = image_tag "about/announcement.png", width: 70, height: 70,
srcset: {"about/announcement-broom@2x.png": "2x"}, srcset: {"about/announcement@2x.png": "2x"},
class: "neopass-thumbnail" class: "neopass-thumbnail"
.content .content
%p %p
%strong %strong
= link_to "State of DTI: 2024!", = link_to "We've updated the item page!",
"https://blog.openneo.net/2024/09/20/state-of-dti-2024.html" item_path("37002-Floating-Negg-Faerie-Doll")
Here's what we've been up to this year! We talk a bit about the It should load faster, work better on phones, and be more reliable—no
cleanups, the partnerships, and the future! more "failed to fetch"! Please try it out and let us know if it does
%p anything weird!!
The themes are stability, simplicity, and sustainability. We've been
online for 15 years now, and we're gonna keep doing our best to keep %p{style: "font-style: italic; opacity: .85; font-size: 85%"}
DTI here for a long time to come! By the way, our integration work with TNT is on pause while they focus
on the
= link_to "~Void Within plot~!", "https://www.neopets.com/tvw/",
target: "_blank", style: "color: purple; font-weight: bold"
%br
We'll start it back up closer to the new year.
#outfit-forms #outfit-forms
#pet-preview - localized_cache :action_suffix => 'outfit_forms_intro' do
= image_tag 'default_preview.png', :alt => '' #pet-preview
%span = image_tag 'default_preview.png', :alt => ''
%h1= t 'app_name' %span
%h2= t '.tagline' %h1= t 'app_name'
%h2= t '.tagline'
= form_tag load_pet_path, method: 'POST', class: 'primary load-pet-to-wardrobe' do = form_tag load_pet_path, method: 'POST', class: 'primary load-pet-to-wardrobe' do
= hidden_field_tag 'destination', 'wardrobe' = hidden_field_tag 'destination', 'wardrobe'
@ -108,17 +114,19 @@
= image_tag item.thumbnail_url = image_tag item.thumbnail_url
= nc_icon_for(item) = nc_icon_for(item)
%script#pet-query-notice-template{:type => 'text/x-jquery-tmpl'}
.notice
%img.inline-image{:src => '${pet_image_url}'}
= t '.pet_query.notice_html', :pet_name => '${pet_name}'
%script#preview-pet-type-not-found-template{:type => 'text/x-jquery-tmpl'} - localized_cache :action_suffix => 'templates' do
= t '.preview.pet_type_not_found', :color_name => '${color_name}', %script#pet-query-notice-template{:type => 'text/x-jquery-tmpl'}
:species_name => '${species_name}' .notice
%img.inline-image{:src => '${pet_image_url}'}
%script#preview-pet-not-found-template{:type => 'text/x-jquery-tmpl'} = t '.pet_query.notice_html', :pet_name => '${pet_name}'
= t '.preview.pet_not_found'
%script#preview-pet-type-not-found-template{:type => 'text/x-jquery-tmpl'}
= t '.preview.pet_type_not_found', :color_name => '${color_name}',
:species_name => '${species_name}'
%script#preview-pet-not-found-template{:type => 'text/x-jquery-tmpl'}
= t '.preview.pet_not_found'
- content_for :javascripts do - content_for :javascripts do
= include_javascript_libraries :jquery, :jquery_tmpl = include_javascript_libraries :jquery, :jquery_tmpl

View file

@ -1,55 +1,57 @@
- title t('modeling_hub') - title t('modeling_hub')
= form_tag load_pet_path, :id => 'bulk-pets-form' do = form_tag load_pet_path, :id => 'bulk-pets-form' do
%p= t '.explanation' - localized_cache :action_suffix => 'bulk_pets_content' do
%p= t '.explanation'
= origin_tag bulk_pets_path
%div.noscript
%input{:name => "name", :type => "text"}/
%input{:type => "submit", :value => t('.submit')}/
%div.script-only
%textarea
%button#bulk-pets-form-add{:type => "button"}= t '.add'
%button#bulk-pets-form-clear{:type => "button"}= t '.clear'
%ul
= origin_tag bulk_pets_path - localized_cache :action_suffix => 'templates' do
%script#item-template{:type => 'text/x-jquery-tmpl'}
%div.noscript %li{:class => 'object{{if owned}} owned{{/if}}'}
%input{:name => "name", :type => "text"}/ = link_to item_path(':id').sub(':id', '${id}') do
%input{:type => "submit", :value => t('.submit')}/ %img{:src => '${thumbnail_url}', :alt => '${description}', :title => '${description}'}
%div.script-only %span.name ${name}
%textarea
%button#bulk-pets-form-add{:type => "button"}= t '.add' {{if nc}}
%button#bulk-pets-form-clear{:type => "button"}= t '.clear' = nc_icon
%ul {{/if}}
%script#item-template{:type => 'text/x-jquery-tmpl'} .closeted-icons
%li{:class => 'object{{if owned}} owned{{/if}}'} {{if owned}}
= link_to item_path(':id').sub(':id', '${id}') do = owned_icon
%img{:src => '${thumbnail_url}', :alt => '${description}', :title => '${description}'} {{/if}}
%span.name ${name}
{{if wanted}}
{{if nc}} = wanted_icon
= nc_icon {{/if}}
{{/if}}
.closeted-icons
{{if owned}} {{if owned}}
= owned_icon %span.object-owned= t '.needed_items.item_owned'
{{/if}} {{/if}}
{{if wanted}} %script#needed-items-pet-header-template{:type => 'text/x-jquery/tmpl'}
= wanted_icon = t '.needed_items.pet_header', :pet_name => '${pet_name}'
{{/if}}
%script#bulk-pets-submission-template{:type => 'text/x-jquery/tmpl'}
{{if owned}} %li.waiting
%span.object-owned= t '.needed_items.item_owned' %img{:src => '${pet_thumbnail}'}
{{/if}} %span.name ${pet_name}
%span.waiting-message= t '.waiting'
%script#needed-items-pet-header-template{:type => 'text/x-jquery/tmpl'} %span.loading-message= t '.loading'
= t '.needed_items.pet_header', :pet_name => '${pet_name}' %span.response
%script#bulk-pets-submission-template{:type => 'text/x-jquery/tmpl'} %script#bulk-pets-submission-success-template{:type => 'text/x-jquery/tmpl'}
%li.waiting = t '.submission_success', :points => '${points}'
%img{:src => '${pet_thumbnail}'}
%span.name ${pet_name}
%span.waiting-message= t '.waiting'
%span.loading-message= t '.loading'
%span.response
%script#bulk-pets-submission-success-template{:type => 'text/x-jquery/tmpl'}
= t '.submission_success', :points => '${points}'
- content_for :javascripts do - content_for :javascripts do
= include_javascript_libraries :jquery, :jquery_tmpl = include_javascript_libraries :jquery, :jquery_tmpl

View file

@ -396,6 +396,15 @@ en-MEEP:
to Impress meepit list. I meep that it's all safe, but, if you're to Impress meepit list. I meep that it's all safe, but, if you're
concerned, find a meepit and meep out the source code to be sure. concerned, find a meepit and meep out the source code to be sure.
new:
title: Meemport from pets
your_items_link: Back to Your Meeps
explanation:
Meep your Neopets username below, and we'll meemport all the wearables
from all your pets. It's meepy!
username_label: Meopets Username
submit: Meemport all pets
outfits: outfits:
destroy: destroy:
success: Outfit "%{outfit_name}" succeessfully demeeped. success: Outfit "%{outfit_name}" succeessfully demeeped.

View file

@ -503,6 +503,15 @@ en:
concerned, find a programmer buddy and check out the source code to concerned, find a programmer buddy and check out the source code to
be sure. be sure.
new:
title: Import from pets
your_items_link: Back to Your Items
explanation:
Enter your Neopets username below, and we'll import all the wearables
from all your pets. It's easy!
username_label: Neopets Username
submit: Import all pets
outfits: outfits:
destroy: destroy:
success: Outfit "%{outfit_name}" successfully deleted. success: Outfit "%{outfit_name}" successfully deleted.

View file

@ -320,6 +320,12 @@ es:
submit: submit:
header: ¡Envíalo! header: ¡Envíalo!
description: El código será analizado y obtendrá sólo la información de la cantidad de objetos y qué objetos hay en tu %{name}. Estos objetos los podrás añadir a tus listas de Dress to Impress. Este proceso es totalmente seguro pero si no te fías contacta con algún programador para que revise el código y estar seguro. description: El código será analizado y obtendrá sólo la información de la cantidad de objetos y qué objetos hay en tu %{name}. Estos objetos los podrás añadir a tus listas de Dress to Impress. Este proceso es totalmente seguro pero si no te fías contacta con algún programador para que revise el código y estar seguro.
new:
title: Importar de pets
your_items_link: Volver a Tus Objetos
explanation: Escribe tu nombre de usuario en Neopets, y nosotros importaremos toda la ropa Apta Para Usar de tus pets. ¡Es fácil!
username_label: Nombre en Neopets
submit: Importar todos los pets
outfits: outfits:
destroy: destroy:
success: El atuendo %{outfit_name}" se ha eliminado correctamente. success: El atuendo %{outfit_name}" se ha eliminado correctamente.

View file

@ -318,6 +318,12 @@ pt:
submit: submit:
header: Enviar header: Enviar
description: Vamos analisar o código que você nos enviou, agarre exclusivamente a identidade e quantidade de itens em seu %{name}, e acrescentar a sua lista de itens do Dress to Impress. Eu prometo que é tudo seguro, mas, se você estiver preocupado, encontre um amigo programador e verifique o código fonte para ter certeza. description: Vamos analisar o código que você nos enviou, agarre exclusivamente a identidade e quantidade de itens em seu %{name}, e acrescentar a sua lista de itens do Dress to Impress. Eu prometo que é tudo seguro, mas, se você estiver preocupado, encontre um amigo programador e verifique o código fonte para ter certeza.
new:
title: "Importar dos pets "
your_items_link: Voltar para "Seus Items"
explanation: "Digite seu nome de usuário de Neopets abaixo e nós importaremos todos os aplicáveis de todos seus pets. É fácil! "
username_label: Nome de Usuário de Neopets
submit: Importar todos os Pets
outfits: outfits:
destroy: destroy:
success: Roupa "%{outfit_name}" excluída com sucesso. success: Roupa "%{outfit_name}" excluída com sucesso.