show tokens in character modal at all times

This commit is contained in:
Tyler Renelle 2013-03-28 08:43:13 -07:00
parent 3d36a3f531
commit 51f054e51c
5 changed files with 10 additions and 7 deletions

View file

@ -61,7 +61,7 @@ setupSortable = (model) ->
# or the item's id property
model.at("_#{type}List").pass(ignore: domId).move {id}, to
setupTooltips = (model) ->
setupTooltips = module.exports.setupTooltips = (model) ->
$('[rel=tooltip]').tooltip()
$('[rel=popover]').popover()

View file

@ -1,4 +1,5 @@
character = require './character'
browser = require './browser'
module.exports.app = (appExports, model) ->
user = model.at('_user')
@ -22,4 +23,5 @@ module.exports.app = (appExports, model) ->
model.ref '_profileActive', model.at("users.#{uid}")
model.set '_profileActiveMain', user.get('id') is uid
model.set '_profileActiveUsername', character.username model.get('_profileActive.auth')
browser.setupTooltips(model)

View file

@ -2,7 +2,7 @@
{#if equal(_user.flags.newStuff,'show')}
<div class='new-stuff'>
<p class='alert alert-success'>
<a href="https://github.com/lefnire/habitrpg/blob/develop/CHANGELOG.md#3272013" target="_blank">New Stuff!</a> <a x-bind="click:closeNewStuff"><i class='icon-remove'></i></a>
<a href="https://github.com/lefnire/habitrpg/blob/develop/CHANGELOG.md" target="_blank">New Stuff!</a> <a x-bind="click:closeNewStuff"><i class='icon-remove'></i></a>
</p>
</div>

View file

@ -1,6 +1,10 @@
<modals:>
<app:modals:modal modalId="avatar-modal">
{#if _profileActiveMain}
<span class='option-box pull-right wallet'>
<app:rewards:userTokens />
</span>
{#with _user.preferences}
<ul class="nav nav-tabs">
<li class="active"><a data-toggle='tab' href="#profileCustomize">Avatar</a></li>
@ -223,9 +227,6 @@
<!-- pets pane -->
<div class="tab-pane pet-grid" id="market-tab">
<span class='option-box pull-right wallet'>
<app:rewards:userTokens />
</span>
<h4>Welcome to the market!</h4>
<small>Dying to get that particular pet you're after, but don't want to wait for it to drop? Buy it here!</small>

View file

@ -42,8 +42,8 @@
<userTokens:>
<a class="pull-right token-wallet">
<span class="task-action-btn tile flush bright add-token-btn"></span>
<a class="pull-right token-wallet" rel='popover' data-trigger='hover' data-title='Tokens' data-content="Used for buying special items (reroll, eggs, hatching potions, etc). You'll need to unlock those features before being able to use tokens." data-placement='bottom'>
<span class="task-action-btn tile flush bright add-token-btn" x-bind="click:showStripe"></span>
<span class="task-action-btn tile flush neutral">{tokens(_user.balance)} Tokens</span>
</a>