mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-01 07:21:15 +00:00
add charts back in, temporary style
This commit is contained in:
parent
6c14e0c325
commit
b286b95153
4 changed files with 6 additions and 9 deletions
|
|
@ -135,8 +135,7 @@ module.exports.app = (appExports, model) ->
|
|||
|
||||
options = {
|
||||
title: 'History'
|
||||
#TODO use current background color: $(el).css('background-color), but convert to hex (see http://goo.gl/ql5pR)
|
||||
backgroundColor: 'whiteSmoke'
|
||||
backgroundColor: { fill:'transparent' }
|
||||
}
|
||||
|
||||
chart = new google.visualization.LineChart(document.getElementById( chartSelector ))
|
||||
|
|
|
|||
|
|
@ -16,15 +16,12 @@
|
|||
<div class="meter experience" title="Experience">
|
||||
<div class="bar" style="width: {percent(_user.stats.exp,tnl(_user.stats.lvl))}%;"></div>
|
||||
<span class="meter-text">
|
||||
<!-- disabled chart for now, it doesn't work -->
|
||||
<!-- {#if _user.history.exp} -->
|
||||
<!-- <a x-bind=click:toggleChart data-toggle-id="exp-chart" data-history-path="_user.history.exp" rel=tooltip title="Progress"><i class=icon-signal></i></a> -->
|
||||
<!-- {/} -->
|
||||
{#if _user.history.exp}
|
||||
<a x-bind=click:toggleChart data-toggle-id="exp-chart" data-history-path="_user.history.exp" rel=tooltip title="Progress"><i class=icon-signal></i></a>
|
||||
{/}
|
||||
<i class=icon-star></i> {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)}
|
||||
</span>
|
||||
</div>
|
||||
<!-- hiding the button until we revamp stats/graphs -->
|
||||
<!-- <div id="exp-chart" style="display:none;"></div> -->
|
||||
</div>
|
||||
|
||||
<!-- party -->
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@
|
|||
<div id="notification-area"></div>
|
||||
<div id="wrap">
|
||||
<app:alerts:flash />
|
||||
<div id="exp-chart" style="display:none;"></div>
|
||||
<div id=main class="grid">
|
||||
<app:tasks:taskLists />
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@
|
|||
<!-- chart -->
|
||||
<!-- removing for now cuz it's broken -->
|
||||
{#if :task.history}
|
||||
<!-- <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress"><i class="icon-signal"></i></a> -->
|
||||
<a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress"><i class="icon-signal"></i></a>
|
||||
{/}
|
||||
<!-- notes -->
|
||||
{#if :task.notes}
|
||||
|
|
|
|||
Loading…
Reference in a new issue