Indentation fix in list_detail template
This commit is contained in:
Scot Hacker
parent
f2b87979f2
commit
1fff35c613
1 changed files with 109 additions and 113 deletions
|
|
@ -4,33 +4,32 @@
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
function order_tasks(data) {
|
function order_tasks(data) {
|
||||||
// The JQuery plugin tableDnD provides a serialize() function which provides the re-ordered
|
// The JQuery plugin tableDnD provides a serialize() function which provides the re-ordered
|
||||||
// data in a list. We pass that list as an object called "data" to a Django view
|
// data in a list. We pass that list as an object called "data" to a Django view
|
||||||
// to save the re-ordered data into the database.
|
// to save the re-ordered data into the database.
|
||||||
|
$.post("{% url 'todo:reorder_tasks' %}", data, "json");
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
|
||||||
$.post("{% url 'todo:reorder_tasks' %}", data, "json");
|
$(document).ready(function() {
|
||||||
return false;
|
// Initialise the task table for drag/drop re-ordering
|
||||||
};
|
$("#tasktable").tableDnD();
|
||||||
|
|
||||||
$(document).ready(function() {
|
$('#tasktable').tableDnD({
|
||||||
// Initialise the task table for drag/drop re-ordering
|
onDrop: function(table, row) {
|
||||||
$("#tasktable").tableDnD();
|
order_tasks($.tableDnD.serialize());
|
||||||
|
}
|
||||||
$('#tasktable').tableDnD({
|
|
||||||
onDrop: function(table, row) {
|
|
||||||
order_tasks($.tableDnD.serialize());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Initially hide the Add Task form
|
|
||||||
$('#AddTask').hide();
|
|
||||||
|
|
||||||
// toggle slide to show the Add Task form when link clicked
|
|
||||||
$('#slideToggle').click(function(){
|
|
||||||
$(this).siblings('#AddTask').slideToggle();
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Initially hide the Add Task form
|
||||||
|
$('#AddTask').hide();
|
||||||
|
|
||||||
|
// toggle slide to show the Add Task form when link clicked
|
||||||
|
$('#slideToggle').click(function(){
|
||||||
|
$(this).siblings('#AddTask').slideToggle();
|
||||||
|
});
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{% if list_slug == "mine" %}
|
{% if list_slug == "mine" %}
|
||||||
|
|
@ -45,34 +44,34 @@
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{# Only show task adder if viewing a list is not "mine" #}
|
{# Only show task adder if viewing a list is not "mine" #}
|
||||||
{% if list_slug != "mine" %}
|
{% if list_slug != "mine" %}
|
||||||
<h2 style="margin-bottom:0px;" id="slideToggle" >→ Click to add task ←</h2>
|
<h2 id="slideToggle" >→ Click to add task ←</h2>
|
||||||
|
<div id="AddTask">
|
||||||
|
<table class="nocolor" border="0" cellspacing="5" cellpadding="5">
|
||||||
|
<tr>
|
||||||
|
<td>{{ form.title.errors }}</td>
|
||||||
|
<td>{{ form.due_date.errors }}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><label for="id_title">Task:</label> {{ form.title }}</td>
|
||||||
|
<td><label for="id_due_date">Due date:</label> {{ form.due_date }}</td>
|
||||||
|
<td><label for="id_assigned">Assign to:</label> {{ form.assigned_to }}</td>
|
||||||
|
<td><label for="id_notify">Notify*:</label> <input type="checkbox" checked="checked" name="notify" value="1" id="notify"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<label for="id_note">Note:</label>
|
||||||
|
{{ form.note }}
|
||||||
|
<p class="minor">*Email notifications will only be sent if task is assigned to someone besides yourself.</p>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
|
||||||
<div id="AddTask">
|
<input type="hidden" name="priority" value="999" id="id_priority">
|
||||||
<table class="nocolor" border="0" cellspacing="5" cellpadding="5">
|
<input type="hidden" name="created_by" value="{{ request.user.id }}" id="id_created_by">
|
||||||
<tr>
|
<input type="hidden" name="list" value="{{ list.id }}" id="id_list">
|
||||||
<td>{{ form.title.errors }}</td>
|
<input type="hidden" name="created_date" value="{{ created_date }}" id="id_created_date">
|
||||||
<td>{{ form.due_date.errors }}</td>
|
<p><input type="submit" name="add_task" value="Add task" class="todo-button"></p>
|
||||||
</tr>
|
</div>
|
||||||
<tr>
|
|
||||||
<td><label for="id_title">Task:</label> {{ form.title }}</td>
|
|
||||||
<td><label for="id_due_date">Due date:</label> {{ form.due_date }}</td>
|
|
||||||
<td><label for="id_assigned">Assign to:</label> {{ form.assigned_to }}</td>
|
|
||||||
<td><label for="id_notify">Notify*:</label> <input type="checkbox" checked="checked" name="notify" value="1" id="notify"></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td><label for="id_note">Note:</label>
|
|
||||||
{{ form.note }}
|
|
||||||
<p class="minor">*Email notifications will only be sent if task is assigned to someone besides yourself.</p>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
<input type="hidden" name="priority" value="999" id="id_priority">
|
|
||||||
<input type="hidden" name="created_by" value="{{ request.user.id }}" id="id_created_by">
|
|
||||||
<input type="hidden" name="list" value="{{ list.id }}" id="id_list">
|
|
||||||
<input type="hidden" name="created_date" value="{{ created_date }}" id="id_created_date">
|
|
||||||
<p><input type="submit" name="add_task" value="Add task" class="todo-button"></p>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if not view_completed %}
|
{% if not view_completed %}
|
||||||
|
|
@ -80,85 +79,82 @@
|
||||||
<h3>Incomplete tasks :: Drag rows to set priorities</h3>
|
<h3>Incomplete tasks :: Drag rows to set priorities</h3>
|
||||||
|
|
||||||
<table border="0" id="tasktable">
|
<table border="0" id="tasktable">
|
||||||
<tr>
|
<tr>
|
||||||
<th>Done</th>
|
<th>Done</th>
|
||||||
<th>Task</th>
|
<th>Task</th>
|
||||||
<th>Created</th>
|
<th>Created</th>
|
||||||
<th>Due on</th>
|
<th>Due on</th>
|
||||||
<th>Owner</th>
|
<th>Owner</th>
|
||||||
<th>Assigned</th>
|
<th>Assigned</th>
|
||||||
<th>Note</th>
|
<th>Note</th>
|
||||||
<th>Comm</th>
|
<th>Comm</th>
|
||||||
{% if list_slug == "mine" %}
|
{% if list_slug == "mine" %}
|
||||||
<th>List</th>
|
<th>List</th>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<th>Del</th>
|
<th>Del</th>
|
||||||
</tr>
|
</tr>
|
||||||
{% for task in task_list %}
|
{% for task in task_list %}
|
||||||
<tr id="{{ task.id }}">
|
<tr id="{{ task.id }}">
|
||||||
<td><input type="checkbox" name="mark_done" value="{{ task.id }}" id="mark_done_{{ task.id }}"> </td>
|
<td><input type="checkbox" name="mark_done" value="{{ task.id }}" id="mark_done_{{ task.id }}"> </td>
|
||||||
<td><a href="{% url 'todo:task_detail' task.id %}">{{ task.title|truncatewords:20 }}</a></td>
|
<td><a href="{% url 'todo:task_detail' task.id %}">{{ task.title|truncatewords:20 }}</a></td>
|
||||||
<td>{{ task.created_date|date:"m/d/Y" }}</td>
|
<td>{{ task.created_date|date:"m/d/Y" }}</td>
|
||||||
<td>
|
<td>
|
||||||
{% if task.overdue_status %}<span class="overdue">{% endif %}
|
{% if task.overdue_status %}<span class="overdue">{% endif %}
|
||||||
{{ task.due_date|date:"m/d/Y" }}
|
{{ task.due_date|date:"m/d/Y" }}
|
||||||
{% if task.overdue_status %}</span>{% endif %}
|
{% if task.overdue_status %}</span>{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td>{{ task.created_by }}</td>
|
<td>{{ task.created_by }}</td>
|
||||||
<td>{% if task.assigned_to %}{{ task.assigned_to }}{% else %}Anyone{% endif %}</td>
|
<td>{% if task.assigned_to %}{{ task.assigned_to }}{% else %}Anyone{% endif %}</td>
|
||||||
<td style="text-align:center;">{% if task.note %}≈{% endif %} </td>
|
<td style="text-align:center;">{% if task.note %}≈{% endif %} </td>
|
||||||
<td style="text-align:center;">{% if task.comment_set.all.count != 0 %}{{ task.comment_set.all.count }}{% endif %}</td>
|
<td style="text-align:center;">{% if task.comment_set.all.count != 0 %}{{ task.comment_set.all.count }}{% endif %}</td>
|
||||||
{% if list_slug == "mine" %}
|
{% if list_slug == "mine" %}
|
||||||
<td><a href="{% url 'todo:list_detail' task.list.id task.list.slug %}">{{ task.list }}</a></td>
|
<td><a href="{% url 'todo:list_detail' task.list.id task.list.slug %}">{{ task.list }}</a></td>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<td><input type="checkbox" name="del_tasks" value="{{ task.id }}" id="del_task_{{ task.id }}"> </td>
|
<td><input type="checkbox" name="del_tasks" value="{{ task.id }}" id="del_task_{{ task.id }}"></td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<p><input type="submit" name="mark_tasks_done" value="Continue..." class="todo-button"></p>
|
<p><input type="submit" name="mark_tasks_done" value="Continue..." class="todo-button"></p>
|
||||||
<p><a class="todo" href="{% url 'todo:completed_tasks' list_id list_slug %}">View completed tasks</a></p>
|
<p><a href="{% url 'todo:completed_tasks' list_id list_slug %}" class="todo">View completed tasks</a></p>
|
||||||
|
|
||||||
{% else %}
|
{% else %}
|
||||||
|
|
||||||
<h3>Completed tasks</h3>
|
<h3>Completed tasks</h3>
|
||||||
|
|
||||||
<table border="0" id="tasktable">
|
<table border="0" id="tasktable">
|
||||||
<tr>
|
<tr>
|
||||||
<th>Undo</th>
|
<th>Undo</th>
|
||||||
<th>Task</th>
|
<th>Task</th>
|
||||||
<th>Created</th>
|
<th>Created</th>
|
||||||
<th>Completed on</th>
|
<th>Completed on</th>
|
||||||
<th>Note</th>
|
<th>Note</th>
|
||||||
<th>Comm</th>
|
<th>Comm</th>
|
||||||
{% if list_slug == "mine" %}
|
{% if list_slug == "mine" %} <th>List</th> {% endif %}
|
||||||
<th>List</th>
|
<th>Del</th>
|
||||||
{% endif %}
|
</tr>
|
||||||
<th>Del</th>
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
{% for task in completed_list %}
|
{% for task in completed_list %}
|
||||||
<tr>
|
<tr>
|
||||||
<td><input type="checkbox" name="undo_completed_task" value="{{ task.id }}" id="id_undo_completed_task{{ task.id }}"> </td>
|
<td><input type="checkbox" name="undo_completed_task" value="{{ task.id }}" id="id_undo_completed_task{{ task.id }}"> </td>
|
||||||
<td><a href="{% url 'todo:task_detail' task.id %}">{{ task.title|truncatewords:20 }}</a></td>
|
<td><a href="{% url 'todo:task_detail' task.id %}">{{ task.title|truncatewords:20 }}</a></td>
|
||||||
<td>{{ task.created_date|date:"m/d/Y" }}</td>
|
<td>{{ task.created_date|date:"m/d/Y" }}</td>
|
||||||
<td>{{ task.completed_date|date:"m/d/Y" }}</td>
|
<td>{{ task.completed_date|date:"m/d/Y" }}</td>
|
||||||
<td style="text-align:center;">{% if task.note %}≈{% endif %} </td>
|
<td style="text-align:center;">{% if task.note %}≈{% endif %} </td>
|
||||||
<td style="text-align:center;">{% if task.comment_set.all.count != 0 %}{{ task.comment_set.all.count }}{% endif %}
|
<td style="text-align:center;">{% if task.comment_set.all.count != 0 %}{{ task.comment_set.all.count }}{% endif %}
|
||||||
<td><input type="checkbox" name="del_tasks" value="{{ task.id }}" id="del_task_{{ task.id }}"> </td>
|
<td><input type="checkbox" name="del_tasks" value="{{ task.id }}" id="del_task_{{ task.id }}"> </td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
<p><input type="submit" name="deldonetasks" value="Continue..." class="todo-button"></p>
|
<p><input type="submit" name="deldonetasks" value="Continue..." class="todo-button"></p>
|
||||||
</form>
|
</form>
|
||||||
<p><a class="todo" href="{% url 'todo:list_detail' list_id list_slug %}">View incomplete tasks</a></p>
|
<p><a class="todo" href="{% url 'todo:list_detail' list_id list_slug %}">View incomplete tasks</a></p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if user.is_staff %}
|
{% if user.is_staff %}
|
||||||
{% if list_slug != "mine" %}
|
{% if list_slug != "mine" %}
|
||||||
<p><a class="todo" href="{% url 'todo:del_list' list.id list_slug %}">Delete this list</a></p>
|
<p><a class="todo" href="{% url 'todo:del_list' list.id list_slug %}">Delete this list</a></p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue