Show due_date on tasks list rather than type, as it's more used
This commit is contained in:
@@ -153,7 +153,7 @@ function task_add(shot_id, task_id, task_type)
|
|||||||
id="task-' + task_id + '">\
|
id="task-' + task_id + '">\
|
||||||
<span class="status-indicator"></span>\
|
<span class="status-indicator"></span>\
|
||||||
<span class="name">-save your task first-</span>\
|
<span class="name">-save your task first-</span>\
|
||||||
<span class="type">-</span>\
|
<span class="due_date">-</span>\
|
||||||
</a>\
|
</a>\
|
||||||
');
|
');
|
||||||
} else if (context == 'shot') {
|
} 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.
|
// 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-name-' + saved_task._id).text(saved_task.name).flashOnce();
|
||||||
$task.find('span.name').text(saved_task.name);
|
$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.find('span.status').text(saved_task.properties.status.replace('_', ' '));
|
||||||
|
|
||||||
$task
|
$task
|
||||||
|
@@ -127,7 +127,7 @@
|
|||||||
.status-indicator
|
.status-indicator
|
||||||
transform: scale(1.2)
|
transform: scale(1.2)
|
||||||
|
|
||||||
.status, .type
|
.status, .type, .due_date
|
||||||
display: inline-block
|
display: inline-block
|
||||||
margin-right: 10px
|
margin-right: 10px
|
||||||
text-transform: uppercase
|
text-transform: uppercase
|
||||||
@@ -139,6 +139,15 @@
|
|||||||
color: $color-text-dark-secondary
|
color: $color-text-dark-secondary
|
||||||
+text-overflow-ellipsis
|
+text-overflow-ellipsis
|
||||||
|
|
||||||
|
.due_date
|
||||||
|
margin-left: auto
|
||||||
|
color: $color-text-dark-primary
|
||||||
|
+text-overflow-ellipsis
|
||||||
|
|
||||||
|
&.late
|
||||||
|
color: $color-danger
|
||||||
|
|
||||||
|
|
||||||
.name
|
.name
|
||||||
padding: 10px
|
padding: 10px
|
||||||
+text-overflow-ellipsis
|
+text-overflow-ellipsis
|
||||||
|
@@ -190,8 +190,8 @@ html(lang="en")
|
|||||||
.modal-body
|
.modal-body
|
||||||
|
|
||||||
script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.select2.min.js') }}", async=true)
|
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/moment-2.15.2.min.js') }}")
|
||||||
script(src="{{ url_for('static_attract', filename='assets/js/vendor/pikaday.js') }}", async=true)
|
script(src="{{ url_for('static_attract', filename='assets/js/vendor/pikaday.js') }}")
|
||||||
|
|
||||||
script.
|
script.
|
||||||
{% if project %}
|
{% if project %}
|
||||||
|
@@ -23,7 +23,7 @@
|
|||||||
span.shotname(title="Shot {{ task._parent_info.name }}") {{ task._parent_info.name }}
|
span.shotname(title="Shot {{ task._parent_info.name }}") {{ task._parent_info.name }}
|
||||||
| {% endif %}
|
| {% endif %}
|
||||||
span.name {{ task.name }}
|
span.name {{ task.name }}
|
||||||
span.type {{ task.properties.task_type }}
|
span.due_date {{ task.properties.due_date | hide_none }}
|
||||||
| {% endfor %}
|
| {% endfor %}
|
||||||
|
|
||||||
.col-splitter
|
.col-splitter
|
||||||
|
@@ -14,7 +14,7 @@
|
|||||||
span.shotname {{ task._parent_info.name }}
|
span.shotname {{ task._parent_info.name }}
|
||||||
| {% endif %}
|
| {% endif %}
|
||||||
span.name {{ task.name }}
|
span.name {{ task.name }}
|
||||||
span.type {{ task.properties.task_type }}
|
span.due_date {{ task.properties.due_date }}
|
||||||
| {% else %}
|
| {% else %}
|
||||||
.col-list-item.empty
|
.col-list-item.empty
|
||||||
span.no-tasks
|
span.no-tasks
|
||||||
|
Reference in New Issue
Block a user