Got modal edit working

This commit is contained in:
Tyler Renelle 2012-06-24 20:51:42 -04:00
parent d0f31a62f4
commit d1ecf7d772
2 changed files with 42 additions and 21 deletions

View file

@ -22,16 +22,16 @@ newUser = (model, userId) ->
habitIds: [0]
dailys: # I know it's bad pluralization, but codes easier later
0: {id: 0, type: 'daily', text: 'Go to the gym', notes: '', score: 0, completed: false }
dailyIds: [0]
1: {id: 1, type: 'daily', text: 'Go to the gym', notes: '', score: 0, completed: false }
dailyIds: [1]
todos:
0: {id: 0, type: 'todo', text: 'Make a doctor appointment', notes: '', score: 0, completed: false }
todoIds: [0]
2: {id: 2, type: 'todo', text: 'Make a doctor appointment', notes: '', score: 0, completed: false }
todoIds: [2]
rewards:
0: {id: 0, type: 'reward', text: '1 TV episode', notes: '', price: 20 }
rewardIds: [0]
3: {id: 3, type: 'reward', text: '1 TV episode', notes: '', price: 20 }
rewardIds: [3]
get '/', (page, model) ->
# Render page if a userId is already stored in session data

View file

@ -2,7 +2,6 @@
HabitRPG
<Header:>
<body>
<ui:connectionAlert>
<taskList: nonvoid>
@ -17,33 +16,55 @@
</div>
<task:>
<li data-id={{id}} class="{taskClasses(.type, .completed)}">
<li data-id={{:task.id}} class="{taskClasses(:task.type, :task.completed)}">
<label>
<!-- Habits -->
{#if equal(.type, 'habit')}
{#if up}<a data-id={{id}} data-direction=up x-bind=click:vote><img src="img/add.png" /></a>{/}
{#if down}<a data-id={{id}} data-direction=down x-bind=click:vote><img src="img/remove.png" /></a>{/}
{#if equal(:task.type, 'habit')}
{#if :task.up}<a data-direction=up x-bind=click:vote><img src="img/add.png" /></a>{/}
{#if :task.down}<a data-direction=down x-bind=click:vote><img src="img/remove.png" /></a>{/}
<!-- Rewards -->
{else if equal(.type, 'reward')}
<a class="vote-down buy-link" href="#">{.price}<img src="img/coin_single_gold.png"/></a>
{else if equal(:task.type, 'reward')}
<a class="vote-down buy-link" href="#">{:task.price}<img src="img/coin_single_gold.png"/></a>
<!-- Daily & Todos -->
{else}
<!--TODO this was part of input below <%= done ? "class='vote-down' checked='checked'" : "class='vote-up'" %>-->
<input type="checkbox" checked={.completed} />
<input type="checkbox" checked={:task.completed} />
{/}
<i></i>
</label>
<div x-bind=keydown:shortcuts contenteditable>{unescaped .text}</div>
<div x-bind=keydown:shortcuts contenteditable>{unescaped :task.text}</div>
<a class="btn" data-toggle="modal" data-target="#{:task.id}-modal" >Launch Modal</a>
<app:editModal />
<!--<span class="habit-text"><%= name %></span>-->
<div class='habit-meta'>
<!--<a class="edit-link" href="#/<%= id %>/edit">Edit</a>-->
{#if .notes}
<a href="#" rel="popover" data-content="{notes}" title="{notes}"><i class="icon-comment"></i></a>
{#if :task.notes}
<a href="#" rel="tooltip" title="{:task.notes}"><i class="icon-comment"></i></a>
{/}
</div>
</li>
<editModal:>
<div class="modal hide" id="{{:task.id}}-modal">
<div class="modal-header">
<h3 contenteditable>{:task.text}</h3>
</div>
<div class="modal-body">
<label>Notes<input type=textarea rows=5 value={:task.notes} /></label>
{#if equal(:task.type, 'habit')}
<label><input type=checkbox checked={:task.up}><i></i>Up</label>
<label><input type=checkbox checked={:task.down}><i></i>Down</label>
{/}
</div>
<div class="modal-footer">
<a href="#" class="btn btn-primary" data-dismiss="modal">Save</a>
<a href="#" style='display:none;' class="btn btn-primary">Save changes</a>
</div>
</div>
<newTask: nonvoid>
<form data-task-type={{{type}}} x-bind=submit:addTask>
@ -94,21 +115,21 @@
<div class="span2">
<app:taskList title=Habits type=habit>
{#each _habitList}<app:task />{/}
{#each _habitList as :task}<app:task />{/}
</app:taskList>
<app:newTask type=habit><input class=new value={_newHabit}></app:newTask>
</div>
<div class="span2">
<app:taskList title=Dailies type=daily>
{#each _dailyList}<app:task />{/}
{#each _dailyList as :task}<app:task />{/}
</app:taskList>
<app:newTask type=daily><input class=new value={_newDaily}></app:newTask>
</div>
<div class="span2">
<app:taskList title=Todos type=todo>
{#each _todoList}<app:task />{/}
{#each _todoList as :task}<app:task />{/}
</app:taskList>
<app:newTask type=todo><input class=new value={_newTodo}></app:newTask>
</div>
@ -116,7 +137,7 @@
<div class="span2">
{gold(_user.money)} <img src='/img/coin_single_gold.png'/> {silver(_user.money)} <img src='/img/coin_single_silver.png'/>
<app:taskList title=Rewards type=reward>
{#each _rewardList}<app:task />{/}
{#each _rewardList as :task}<app:task />{/}
</app:taskList>
<app:newTask type=reward><input class=new value={_newReward}></app:newTask>
</div>