Merge branch 'master' into gh-pages

Conflicts:
	javascripts/app.js
This commit is contained in:
2016-01-31 15:36:33 +08:00
13 changed files with 443 additions and 238 deletions
+27 -24
View File
@@ -1,25 +1,28 @@
<div class="task-wrappper">
<div class="task">
<div class="link">
<div class="options">
<div class="options-left">
<div class="mouse-tip"></div>
<% if(model.isCompleted){%>
<a class="uncomplete">Uncomplete<hr></a>
<%}else {%>
<a class="complete">Complete<hr></a>
<%}%>
<a class="note">
<span class="note">Add Note</span>
</a>
</div>
</div>
</div>
<li>
<div class="task-wrappper">
<div class="task">
<div class="link">
<div class="options">
<div class="options-left">
<div class="mouse-tip"></div>
<% if(isCompleted){ %>
<a class="uncomplete">Uncomplete<hr></a>
<% }else { %>
<a class="complete">Complete<hr></a>
<% } %>
<a class="note">
<span class="note">Add Note</span>
</a>
</div>
</div>
</div>
<% if(model.isCompleted){%>
<input value="<%= model.content %>" data-id="<%= model.id %>" class="edit task-completed">
<%}else {%>
<input value="<%= model.content %>" data-id="<%= model.id %>" class="edit">
<%}%>
</div>
</div>
<% if(isCompleted) { %>
<input value="<%= obj.content %>" data-id="<%= obj.id %>" data-parent-id="<%= parentId %>" data-priority="<%= priority %>" class="edit task-completed">
<% }else { %>
<input value="<%= obj.content %>" data-id="<%= obj.id %>" data-parent-id="<%= parentId %>" data-priority="<%= priority %>" class="edit">
<% } %>
</div>
</div>
</li>
<div class="children"></div>