From 51f054e51c1f17fa50f7f06225ea99a4d2b576d1 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Thu, 28 Mar 2013 08:43:13 -0700
Subject: [PATCH] show tokens in character modal at all times

---
 src/app/browser.coffee | 2 +-
 src/app/profile.coffee | 2 ++
 views/app/alerts.html  | 2 +-
 views/app/avatar.html  | 7 ++++---
 views/app/rewards.html | 4 ++--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index ed88fb03e1..a2bd6f7194 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -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()
 
diff --git a/src/app/profile.coffee b/src/app/profile.coffee
index 1a84de042e..b578ac2529 100644
--- a/src/app/profile.coffee
+++ b/src/app/profile.coffee
@@ -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)
 
diff --git a/views/app/alerts.html b/views/app/alerts.html
index 372871f308..d2270f2d05 100644
--- a/views/app/alerts.html
+++ b/views/app/alerts.html
@@ -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>
diff --git a/views/app/avatar.html b/views/app/avatar.html
index 82a98b407a..ec1d6f8c71 100644
--- a/views/app/avatar.html
+++ b/views/app/avatar.html
@@ -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>
diff --git a/views/app/rewards.html b/views/app/rewards.html
index a5c906adf0..01a5e68ac9 100644
--- a/views/app/rewards.html
+++ b/views/app/rewards.html
@@ -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>