Show due_date on tasks list rather than type, as it's more used

This commit is contained in:
2016-11-07 17:17:23 +01:00
parent df0ca31687
commit 506844a342
5 changed files with 16 additions and 7 deletions

View File

@@ -153,7 +153,7 @@ function task_add(shot_id, task_id, task_type)
id="task-' + task_id + '">\
<span class="status-indicator"></span>\
<span class="name">-save your task first-</span>\
<span class="type">-</span>\
<span class="due_date">-</span>\
</a>\
');
} else if (context == 'shot') {
@@ -275,7 +275,7 @@ function task_save(task_id, task_url) {
// NOTE: this is tightly linked to the HTML of the task list in for_project.jade.
$('.task-name-' + saved_task._id).text(saved_task.name).flashOnce();
$task.find('span.name').text(saved_task.name);
$task.find('span.type').text(saved_task.properties.task_type);
$task.find('span.due_date').text(moment().to(saved_task.properties.due_date));
$task.find('span.status').text(saved_task.properties.status.replace('_', ' '));
$task

View File

@@ -127,7 +127,7 @@
.status-indicator
transform: scale(1.2)
.status, .type
.status, .type, .due_date
display: inline-block
margin-right: 10px
text-transform: uppercase
@@ -139,6 +139,15 @@
color: $color-text-dark-secondary
+text-overflow-ellipsis
.due_date
margin-left: auto
color: $color-text-dark-primary
+text-overflow-ellipsis
&.late
color: $color-danger
.name
padding: 10px
+text-overflow-ellipsis

View File

@@ -190,8 +190,8 @@ html(lang="en")
.modal-body
script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.select2.min.js') }}", async=true)
script(src="{{ url_for('static_attract', filename='assets/js/vendor/moment-2.15.2.min.js') }}", async=true)
script(src="{{ url_for('static_attract', filename='assets/js/vendor/pikaday.js') }}", async=true)
script(src="{{ url_for('static_attract', filename='assets/js/vendor/moment-2.15.2.min.js') }}")
script(src="{{ url_for('static_attract', filename='assets/js/vendor/pikaday.js') }}")
script.
{% if project %}

View File

@@ -23,7 +23,7 @@
span.shotname(title="Shot {{ task._parent_info.name }}") {{ task._parent_info.name }}
| {% endif %}
span.name {{ task.name }}
span.type {{ task.properties.task_type }}
span.due_date {{ task.properties.due_date | hide_none }}
| {% endfor %}
.col-splitter

View File

@@ -14,7 +14,7 @@
span.shotname {{ task._parent_info.name }}
| {% endif %}
span.name {{ task.name }}
span.type {{ task.properties.task_type }}
span.due_date {{ task.properties.due_date }}
| {% else %}
.col-list-item.empty
span.no-tasks