use heart & star icons instead of HP / Exp

Conflicts:

	lib/app/index.js
This commit is contained in:
Tyler Renelle 2012-09-04 16:06:10 -04:00
parent 9146f2f3fe
commit 91711aad07
3 changed files with 6 additions and 4 deletions

View file

@ -73,6 +73,7 @@ get('/:uidParam?', function(page, model, _arg, next) {
ready(function(model) {
var poormanscron, setupSortable, step, tour, type, _i, _j, _len, _len1, _ref1, _ref2;
$('#purl-link').val(window.location.toString() + model.get('_userId'));
$('[rel=tooltip]').tooltip();
$('[rel=popover]').popover();
model.on('set', '*', function() {
return $('[rel=popover]').popover();

View file

@ -68,6 +68,7 @@ ready (model) ->
# FIXME weirdest thing: doing model.set('_purl',...) and binding {_purl} in the view does not work
$('#purl-link').val(window.location.toString() + model.get('_userId'))
$('[rel=tooltip]').tooltip()
$('[rel=popover]').popover()
# FIXME: this isn't very efficient, do model.on set for specific attrs for popover
model.on 'set', '*', ->

View file

@ -34,18 +34,18 @@
<div id="lvl"><span class="badge badge-info">Lvl: {_user.stats.lvl}</span></div>
</td>
<td id="bars">
<div class="progress progress-danger">
<div class="progress progress-danger" rel=tooltip data-placement=bottom title="Health">
<div class="bar" style="width: {percent(_user.stats.hp, 50)}%;"></div>
<span class="progress-text">HP: {round(_user.stats.hp)} / 50</span>
<span class="progress-text"><i class=icon-heart></i> {round(_user.stats.hp)} / 50</span>
</div>
<div class="progress progress-warning">
<div class="progress progress-warning" rel=tooltip data-placement=bottom title="Experience">
<div class="bar" style="width: {percent(_user.stats.exp,_user._tnl)}%;"></div>
<span class="progress-text">
{#if _user.history.exp}
<a x-bind=click:toggleChart data-toggle-id="exp-chart" data-history-path="_user.history.exp"><i class=icon-signal></i></a>&nbsp;
{/}
Exp: {round(_user.stats.exp)} / {_user._tnl}
<i class=icon-star></i> {round(_user.stats.exp)} / {_user._tnl}
</span>
</div>
</td>