1
0
Fork 0
forked from OpenNeo/impress

Compare commits

...

2 commits

8 changed files with 9 additions and 14 deletions

View file

@ -66,6 +66,10 @@ var DEBUG = document.location.search.substr(0, 6) == "?debug";
} }
function petThumbnailUrl(pet_name) { function petThumbnailUrl(pet_name) {
if (pet_name[0] == "@") {
// if first character is "@", use the hash url
return "https://pets.neopets.com/cp/" + pet_name.substr(1) + "/1/1.png";
}
return "https://pets.neopets.com/cpn/" + pet_name + "/1/1.png"; return "https://pets.neopets.com/cpn/" + pet_name + "/1/1.png";
} }

View file

@ -113,13 +113,6 @@ module ItemsHelper
SHOP_WIZARD_URL_TEMPLATE.expand(string: item_or_name).to_s SHOP_WIZARD_URL_TEMPLATE.expand(string: item_or_name).to_s
end end
SUPER_SHOP_WIZARD_URL_TEMPLATE = Addressable::Template.new(
"https://www.neopets.com/portal/supershopwiz.phtml{?string}"
)
def super_shop_wizard_url_for(item)
SUPER_SHOP_WIZARD_URL_TEMPLATE.expand(string: item.name).to_s
end
TRADING_POST_URL_TEMPLATE = Addressable::Template.new( TRADING_POST_URL_TEMPLATE = Addressable::Template.new(
"https://www.neopets.com/island/tradingpost.phtml?type=browse&criteria=item_exact{&search_string}" "https://www.neopets.com/island/tradingpost.phtml?type=browse&criteria=item_exact{&search_string}"
) )

View file

@ -38,7 +38,6 @@
title: nc_trade_value_updated_at_text(item.nc_trade_value) title: nc_trade_value_updated_at_text(item.nc_trade_value)
- unless item.nc? - unless item.nc?
= link_to t('items.show.resources.shop_wizard'), shop_wizard_url_for(item) = link_to t('items.show.resources.shop_wizard'), shop_wizard_url_for(item)
= link_to t('items.show.resources.super_shop_wizard'), super_shop_wizard_url_for(item)
= link_to t('items.show.resources.trading_post'), trading_post_url_for(item) = link_to t('items.show.resources.trading_post'), trading_post_url_for(item)
= link_to t('items.show.resources.auction_genie'), auction_genie_url_for(item) = link_to t('items.show.resources.auction_genie'), auction_genie_url_for(item)

View file

@ -68,6 +68,9 @@
%script#bulk-pets-submission-template{:type => 'text/x-jquery/tmpl'} %script#bulk-pets-submission-template{:type => 'text/x-jquery/tmpl'}
%li.waiting %li.waiting
- if pet_name.starts_with?('@')
%img{:src => 'https://pets.neopets.com/cp/${pet_name[1..-1]}/1/1.png'}
- else
%img{:src => 'https://pets.neopets.com/cpn/${pet_name}/1/1.png'} %img{:src => 'https://pets.neopets.com/cpn/${pet_name}/1/1.png'}
%span.name ${pet_name} %span.name ${pet_name}
%span.waiting-message= t '.bulk_pets.waiting' %span.waiting-message= t '.bulk_pets.waiting'

View file

@ -267,7 +267,6 @@ en-MEEP:
resources: resources:
jn_items: JN Meepits jn_items: JN Meepits
shop_wizard: Meep Wizard shop_wizard: Meep Wizard
super_shop_wizard: Meeper Wizard
trading_post: Treeps trading_post: Treeps
auction_genie: Aucteeps auction_genie: Aucteeps
closet_hangers: closet_hangers:

View file

@ -311,7 +311,6 @@ en:
impress_2020: DTI 2020 impress_2020: DTI 2020
owls: "Owls: %{value}" owls: "Owls: %{value}"
shop_wizard: Shop Wizard shop_wizard: Shop Wizard
super_shop_wizard: Super Wizard
trading_post: Trades trading_post: Trades
auction_genie: Auctions auction_genie: Auctions
closet_hangers: closet_hangers:

View file

@ -211,7 +211,6 @@ es:
resources: resources:
jn_items: Objetos de JN jn_items: Objetos de JN
shop_wizard: Asistente de Tiendas shop_wizard: Asistente de Tiendas
super_shop_wizard: Super Asistente de Tiendas
trading_post: Quiosco del trueque trading_post: Quiosco del trueque
auction_genie: Subastas auction_genie: Subastas
closet_hangers: closet_hangers:

View file

@ -209,7 +209,6 @@ pt:
resources: resources:
jn_items: JN Itens jn_items: JN Itens
shop_wizard: Mágico Pecincheiro shop_wizard: Mágico Pecincheiro
super_shop_wizard: Super Mágico Pecincheiro
trading_post: Trocas trading_post: Trocas
auction_genie: Leilões auction_genie: Leilões
closet_hangers: closet_hangers: