sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-02 04:00:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add charts back in, temporary style

Browse source
This commit is contained in:
Tyler Renelle 2013-03-21 16:31:23 -06:00
parent 6c14e0c325
commit b286b95153
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/app/tasks.coffee
View file

@ -135,8 +135,7 @@ module.exports.app = (appExports, model) ->
options = { options = {
title: 'History' title: 'History'
#TODO use current background color: $(el).css('background-color), but convert to hex (see http://goo.gl/ql5pR) backgroundColor: { fill:'transparent' }
backgroundColor: 'whiteSmoke'
} }
chart = new google.visualization.LineChart(document.getElementById( chartSelector )) chart = new google.visualization.LineChart(document.getElementById( chartSelector ))

9
views/app/header.html
View file

@ -16,15 +16,12 @@
<div class="meter experience" title="Experience"> <div class="meter experience" title="Experience">
<div class="bar" style="width: {percent(_user.stats.exp,tnl(_user.stats.lvl))}%;"></div> <div class="bar" style="width: {percent(_user.stats.exp,tnl(_user.stats.lvl))}%;"></div>
<span class="meter-text"> <span class="meter-text">
<!-- disabled chart for now, it doesn't work --> {#if _user.history.exp}
<!-- {#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>&nbsp;
<!-- <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>&nbsp; --> {/}
<!-- {/} -->
<i class=icon-star></i> {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)} <i class=icon-star></i> {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)}
</span> </span>
</div> </div>
<!-- hiding the button until we revamp stats/graphs -->
<!-- <div id="exp-chart" style="display:none;"></div> -->
</div> </div>
<!-- party --> <!-- party -->

1
views/app/index.html
View file

@ -41,6 +41,7 @@
<div id="notification-area"></div> <div id="notification-area"></div>
<div id="wrap"> <div id="wrap">
<app:alerts:flash /> <app:alerts:flash />
<div id="exp-chart" style="display:none;"></div>
<div id=main class="grid"> <div id=main class="grid">
<app:tasks:taskLists /> <app:tasks:taskLists />
</div> </div>

2
views/app/tasks.html
View file

@ -78,7 +78,7 @@
<!-- chart --> <!-- chart -->
<!-- removing for now cuz it's broken --> <!-- removing for now cuz it's broken -->
{#if :task.history} {#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 --> <!-- notes -->
{#if :task.notes} {#if :task.notes}