From dda3670d036fa3a78d7ad5ab1091bf50e9cac75e Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Mon, 11 Nov 2013 13:50:11 -0800 Subject: [PATCH] mounts: only show mount head in stable (fix later), use egg.mountText for grown mount popovers. replace pet/mount tooltips with popovers --- views/options/inventory/stable.jade | 16 ++++++++-------- views/shared/header/avatar.jade | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/views/options/inventory/stable.jade b/views/options/inventory/stable.jade index 151a60beff..b45d7ed36d 100644 --- a/views/options/inventory/stable.jade +++ b/views/options/inventory/stable.jade @@ -24,19 +24,19 @@ script(type='text/ng-template', id='partials/options.inventory.stable.mounts.htm menu.pets(type='list') li.customize-menu(ng-repeat='egg in Items.eggs') menu - div(ng-repeat='potion in Items.hatchingPotions', tooltip='{{potion.name}} {{egg.name}}', ng-init='mount = egg.name+"-"+potion.name') - button(class="pet-button Mount_Body_{{mount}}", ng-show='user.items.mounts[mount]', ng-class='{active: user.items.currentMount == mount}', ng-click='chooseMount(egg.name, potion.name)') - div(class='Mount_Head_{{mount}}') + div(ng-repeat='potion in Items.hatchingPotions', popover-trigger='mouseenter', popover='{{potion.text}} {{egg.mountText}}', ng-init='mount = egg.name+"-"+potion.name') + button(class="pet-button Mount_Head_{{mount}}", ng-show='user.items.mounts[mount]', ng-class='{active: user.items.currentMount == mount}', ng-click='chooseMount(egg.name, potion.name)') + //div(class='Mount_Head_{{mount}}') button(class="pet-button pet-not-owned", ng-hide='user.items.mounts[mount]') img(src='/bower_components/habitrpg-shared/img/PixelPaw.png') h4 Rare Mounts menu div - button(ng-if='user.items.mounts["BearCub-Polar"]', class="pet-button Mount_Body_BearCub-Polar", ng-class='{active: user.items.currentMount == "BearCub-Polar"}', ng-click='chooseMount("BearCub", "Polar")', tooltip='Polar Bear') - .Mount_Head_BearCub-Polar - button(ng-if='user.items.mounts["LionCub-Ethereal"]', class="pet-button Mount_Body_LionCub-Ethereal", ng-class='{active: user.items.currentMount == "LionCub-Ethereal"}', ng-click='chooseMount("LionCub", "Ethereal")', tooltip='Ethereal Lion') - .Mount_Head_LionCub-Ethereal + button(ng-if='user.items.mounts["BearCub-Polar"]', class="pet-button Mount_Head_BearCub-Polar", ng-class='{active: user.items.currentMount == "BearCub-Polar"}', ng-click='chooseMount("BearCub", "Polar")', tooltip='Polar Bear') + //.Mount_Head_BearCub-Polar + button(ng-if='user.items.mounts["LionCub-Ethereal"]', class="pet-button Mount_Head_LionCub-Ethereal", ng-class='{active: user.items.currentMount == "LionCub-Ethereal"}', ng-click='chooseMount("LionCub", "Ethereal")', tooltip='Ethereal Lion') + //.Mount_Head_LionCub-Ethereal script(type='text/ng-template', id='partials/options.inventory.stable.pets.html') .stable @@ -53,7 +53,7 @@ script(type='text/ng-template', id='partials/options.inventory.stable.pets.html' menu.pets(type='list') li.customize-menu(ng-repeat='egg in Items.eggs') menu - div(ng-repeat='potion in Items.hatchingPotions', tooltip='{{potion.name}} {{egg.name}}', ng-init='pet = egg.name+"-"+potion.name') + div(ng-repeat='potion in Items.hatchingPotions', popover-trigger='mouseenter', popover='{{potion.text}} {{egg.text}}', ng-init='pet = egg.name+"-"+potion.name') button(class="pet-button Pet-{{pet}}", ng-if='user.items.pets[pet]>0', ng-class='{active: user.items.currentPet == pet, selectableInventory: selectedFood}', ng-click='choosePet(egg.name, potion.name)') .progress(ng-class='{"progress-success": user.items.pets[pet]<50}') .bar(style="width: {{user.items.pets[pet]/.5}}%;") diff --git a/views/shared/header/avatar.jade b/views/shared/header/avatar.jade index 5df250fa8f..3154f5f92d 100644 --- a/views/shared/header/avatar.jade +++ b/views/shared/header/avatar.jade @@ -6,7 +6,7 @@ figure.herobox(ng-click='clickMember(profile._id)', data-name='{{profile.profile.name}}', ng-class='{isUser: user._id==profile._id && !(user.items.currentMount && user.items.currentPet), hasPet: profile.items.currentPet && profile.items.currentMount}') .character-sprites // Mount Body - span(class='Mount_Body_{{profile.items.currentMount}}') + span(ng-if='profile.items.currentMount', class='Mount_Body_{{profile.items.currentMount}}') // Avatar span(class='{{profile.preferences.gender}}_skin_{{profile.preferences.skin}}') @@ -18,7 +18,7 @@ figure.herobox(ng-click='clickMember(profile._id)', data-name='{{profile.profile span(class='{{equipped("weapon",profile.items.weapon,profile.preferences, profile.backer, profile.contributor)}}') // Mount Head - span(class='Mount_Head_{{profile.items.currentMount}}') + span(ng-if='profile.items.currentMount', class='Mount_Head_{{profile.items.currentMount}}') // Resting span(ng-class='{zzz:profile.flags.rest}')