From 2bddd79ffd928b32bf6f45ac151e734e9a2eaf9e Mon Sep 17 00:00:00 2001 From: Mel Marley Date: Tue, 8 Sep 2015 13:59:34 +0100 Subject: [PATCH] Some things I tried --- common/locales/en/subscriber.json | 4 ++-- website/views/options/inventory/time-travelers.jade | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/common/locales/en/subscriber.json b/common/locales/en/subscriber.json index 2e37fc78c6..64db64bb2d 100644 --- a/common/locales/en/subscriber.json +++ b/common/locales/en/subscriber.json @@ -59,8 +59,8 @@ "timeTravelers": "Time Travelers", "timeTravelersTitleNoSub": "<%= linkStartTyler %>Tyler<%= linkEnd %> and <%= linkStartVicky %>Vicky<%= linkEnd %>", "timeTravelersTitle": "Mysterious Time Travelers", - "timeTravelersPopoverNoSub": "You'll need a Mystic Hourglass trinket to summon the mysterious Time Travelers! <%= linkStart %>Subscribers<%= linkEnd %> earn one Mystic Hourglass for every three months of consecutive subscribing. Come back when you have a Mystic Hourglass, and the Time Travelers will fetch you a Subscriber Item Set from the past.... or maybe even the future.", - "timeTravelersPopover": "We see you have a Mystic Hourglass thingamajig, so we will happily travel back in time for you! Please choose the Mystery Item Set you would like. You can see a list of the past item sets <%= linkStart %>here<%= linkEnd %>! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", + "timeTravelersPopoverNoSub": "You'll need a Mystic Hourglass to summon the mysterious Time Travelers! <%= linkStart %>Subscribers<%= linkEnd %> earn one Mystic Hourglass for every three months of consecutive subscribing. Come back when you have a Mystic Hourglass, and the Time Travelers will fetch you a Subscriber Item Set from the past.... or maybe even the future.", + "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the Mystery Item Set you would like. You can see a list of the past item sets <%= linkStart %>here<%= linkEnd %>! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", "timeTravelersAlreadyOwned": "Congratulations! You already own all of the Mystery Items. Thanks for supporting the site!", "mysticHourglassPopover": "Mystic Hourglass allows you to purchase previous months' subscriber sets.", "subUpdateCard": "Update Card", diff --git a/website/views/options/inventory/time-travelers.jade b/website/views/options/inventory/time-travelers.jade index ebba0b782f..9643ecfb27 100644 --- a/website/views/options/inventory/time-travelers.jade +++ b/website/views/options/inventory/time-travelers.jade @@ -20,11 +20,18 @@ .row: .col-md-12 li.customize-menu.inventory-gear - p!=env.t('timeTravelersAlreadyOwned', {linkStart: "", linkEnd: ""}) + p(ng-if='Object.keys(Content.timeTravelerStore(user.items.gear.owned)).length == 0')=env.t('timeTravelersAlreadyOwned') + b {{Object.keys(Content.timeTravelerStore(user.items.gear.owned)).length}} + b {{Object.keys(user.items.gear.owned).length}} + b {{Object.keys(user.items.gear.owned)}} + b {{Object.getOwnPropertyNames(user.items.gear.owned).length}} + b {{Object.getOwnPropertyNames(user.items.gear.owned)}} + b {{user.items.gear.owned}} + b {{Content.timeTravelerStore(user.items.gear.owned)}} menu.pets-menu(label='{{::set.text}}', ng-repeat='set in Content.timeTravelerStore(user.items.gear.owned)') div(ng-repeat='item in set.items') button.customize-option(class='shop_{{::item.key}}', popover='{{::item.notes()}}', popover-title='{{::item.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', - ng-click='user.ops.buyMysterySet({params:{key:set.key}})') + ng-click='user.ops.buyMysterySet({params:{key:set.key}})') \ No newline at end of file