Placed helpIcon & task columns in <app:taskColumn> component

This commit is contained in:
Tyler Renelle 2012-07-07 13:08:36 -04:00
parent a45cb18db2
commit 64f071a94c
2 changed files with 27 additions and 19 deletions

View file

@ -37,7 +37,7 @@ html,body,p,h1,ul,li,table,tr,th,td
.reward pre .reward pre
background-color: white background-color: white
h1.todos, h1.rewards .todos h1, .rewards h1
float:left float:left
margin-right:15px margin-right:15px

View file

@ -61,23 +61,26 @@
can't pass references as paramters. so <app:taskList newModel={_newHabit} list={_habitList}> doesn't work can't pass references as paramters. so <app:taskList newModel={_newHabit} list={_habitList}> doesn't work
and have to pass those in via {{{content}}} instead --> and have to pass those in via {{{content}}} instead -->
<div class="span3 well"> <app:taskColumn
<app:helpIcon helpTitle="Habits: Constantly Track." helpContent="Some habits only makes sense to gain points (1h of productive work). Others only lose points (swearing). For the rest, both + and - make sense (stairs=gain, elevator=lose)."/> title="Habits"
<h1>Habits</h1> helpTitle="Habits: Constantly Track."
helpContent="Some habits only makes sense to gain points (1h of productive work). Others only lose points (swearing). For the rest, both + and - make sense (stairs=gain, elevator=lose).">
<ul class='habits'>{#each _habitList as :task}<app:task />{/}</ul> <ul class='habits'>{#each _habitList as :task}<app:task />{/}</ul>
<app:newTask type=habit><input value={_newHabit} type="text" /></app:newTask> <app:newTask type=habit><input value={_newHabit} type="text" /></app:newTask>
</div> </app:taskColumn>
<div class="span3 well"> <app:taskColumn
<app:helpIcon helpTitle="Dailies: Complete Once Each Day" helpContent="At the end of each day, non-completed Dailies dock you points. They also become more valueable (worth more experience). This wil push you to focus on the reds (the goals that are doing worse)"/> title="Daily"
<h1>Dailies</h1> helpTitle="Dailies: Complete Once Each Day"
helpContent="At the end of each day, non-completed Dailies dock you points. They also become more valueable (worth more experience). This wil push you to focus on the reds (the goals that are doing worse)">
<ul class='dailys'>{#each _dailyList as :task}<app:task />{/}</ul> <ul class='dailys'>{#each _dailyList as :task}<app:task />{/}</ul>
<app:newTask type=daily><input value={_newDaily} type="text" /></app:newTask> <app:newTask type=daily><input value={_newDaily} type="text" /></app:newTask>
</div> </app:taskColumn>
<div class="span3 well"> <app:taskColumn
<app:helpIcon helpTitle="Todos: Complete Eventually" helpContent="Non-completed TODOs won't dock you points, but they will become more valuable over time."/> title="Todos" type="todo"
<h1 class='todos'>Todos</h1> helpTitle="Todos: Complete Eventually"
helpContent="Non-completed TODOs won't dock you points, but they will become more valuable over time.">
<div class="tabbable"> <!-- Only required for left/right tabs --> <div class="tabbable"> <!-- Only required for left/right tabs -->
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#tab1" data-toggle="tab">Remaining</a></li> <li class="active"><a href="#tab1" data-toggle="tab">Remaining</a></li>
@ -101,15 +104,16 @@
<a x-bind=click:toggleChart data-chart-selector="todos-chart" data-history-path="_user.history.todos"><i class=icon-signal></i></a> <a x-bind=click:toggleChart data-chart-selector="todos-chart" data-history-path="_user.history.todos"><i class=icon-signal></i></a>
<div id="todos-chart" style="display:none;"></div> <div id="todos-chart" style="display:none;"></div>
{/} {/}
</div> </app:taskColumn>
<div class="span3 well"> <app:taskColumn
<app:helpIcon helpTitle="Rewards: Treat Yourself!" helpContent="As you complete goals, you earn gold to buy rewards. Buy them liberally - rewards are integral in forming good habits."/> title="Rewards" type="reward"
<h1 class='rewards'>Rewards</h1> helpTitle="Rewards: Treat Yourself!"
helpContent="As you complete goals, you earn gold to buy rewards. Buy them liberally - rewards are integral in forming good habits.">
<div id="money">{gold(_user.money)} <img src='/img/coin_single_gold.png'/> {silver(_user.money)} <img src='/img/coin_single_silver.png'/></div> <div id="money">{gold(_user.money)} <img src='/img/coin_single_gold.png'/> {silver(_user.money)} <img src='/img/coin_single_silver.png'/></div>
<ul class='rewards'>{#each _rewardList as :task}<app:task />{/}</ul> <ul class='rewards'>{#each _rewardList as :task}<app:task />{/}</ul>
<app:newTask type=reward><input value={_newReward} type="text" /></app:newTask> <app:newTask type=reward><input value={_newReward} type="text" /></app:newTask>
</div> </app:taskColumn>
</div> </div>
@ -119,8 +123,12 @@
<%= link_to(image_tag("http://line6.com/images/connections/facebook-login-button.png", :alt => "Login with Facebook"), user_omniauth_authorize_path(:facebook)) %> <%= link_to(image_tag("http://line6.com/images/connections/facebook-login-button.png", :alt => "Login with Facebook"), user_omniauth_authorize_path(:facebook)) %>
<% else %>--> <% else %>-->
<!--<% end %>--> <!--<% end %>-->
<helpIcon:> <taskColumn: nonvoid>
<span class="help-icon" rel="popover" data-placement="bottom" data-original-title="{{{helpTitle}}}" data-content="{{{helpContent}}}"><i class="icon-question-sign"></i></span> <div class="span3 well {{{type}}}s">
<span class="help-icon" rel="popover" data-placement="bottom" data-original-title="{{{helpTitle}}}" data-content="{{{helpContent}}}"><i class="icon-question-sign"></i></span>
<h1>{{{title}}}</h1>
{{{content}}}
</div>
<newTask: nonvoid> <newTask: nonvoid>
<form class="form-inline" data-task-type={{{type}}} x-bind=submit:addTask> <form class="form-inline" data-task-type={{{type}}} x-bind=submit:addTask>