** Show inline task date in second line

This commit is contained in:
maxpozdeev 2022-08-01 12:31:44 +03:00
parent 67ccee18c5
commit 485bef2c94
5 changed files with 36 additions and 27 deletions

View file

@ -1090,14 +1090,18 @@ function prepareTaskBlocks(item)
"</div>\n" +
'<div class="task-middle">' +
'<div class="task-through">' +
preparePrio(item.prio,id) +
'<span class="task-title">' + prepareTaskTitleInlineHtml(item.title) + '</span> ' +
(curList.id == -1 ? '<span class="task-listname">'+ tabLists.get(item.listId).name +'</span>' : '') +
prepareTagsStr(item) +
'<span class="task-date">'+item.dateInlineTitle+'</span>' +
'<div class="task-middle-top">' +
'<div class="task-through">' +
preparePrio(item.prio,id) +
'<span class="task-title">' + prepareTaskTitleInlineHtml(item.title) + '</span> ' +
(curList.id == -1 ? '<span class="task-listname">'+ tabLists.get(item.listId).name +'</span>' : '') +
prepareTagsStr(item) +
'</div>' +
'<div class="task-through-right">' + prepareDueDate(item) + "</div>" +
'</div>' +
'<div class="task-date">' +
prepareInlineDate(item) +
'</div>' +
'<div class="task-through-right">' + prepareDueDate(item) + prepareCompletedDate(item) + "</div>" +
"</div>" +
'<div class="task-actions"><div class="taskactionbtn"></div></div>' +
@ -1169,16 +1173,11 @@ function prepareDueDate(item)
};
_mtt.prepareDueDate = prepareDueDate;
function prepareCompletedDate(item)
function prepareInlineDate(item)
{
// &mdash; = &#8212; = —
return '<span class="task-date-completed">' +
'<span title="' + item.dateInlineTitle + '">' + item.dateInline + '</span>&#8212;' +
'<span title="' + item.dateCompletedInlineTitle + '">' + item.dateCompletedInline + '</span>' +
'</span>';
};
_mtt.prepareCompletedDate = prepareCompletedDate;
return '<span class="task-id">#' + item.id + '</span> ' + (item.compl ? item.dateCompletedInlineTitle : item.dateInlineTitle) ;
}
_mtt.prepareInlineDate = prepareInlineDate;
function submitNewTask(form)
{

View file

@ -482,19 +482,26 @@ li.task-row.task-expanded .task-toggle { transform:rotate(90deg); }
.task-middle {
flex-grow:1;
margin-left: 5px;
min-width:0; /*for long text*/
display: flex;
align-items: baseline;
line-height: 1.2rem;
min-width: 0; /*for long text*/
}
.task-middle-top {
display: flex;
}
.task-actions { flex:0 0 1rem; margin-left:5px; }
.task-left label { min-width:18px; text-align:center; } /* Safari has small checkboxes */
.task-date { color:var(--color-text-reduced3); font-size:0.8rem; margin-left:4px; display:none; }
.task-date-completed { color:var(--color-text-reduced3); display:none; margin-left:5px; }
#mtt.show-inline-date .task-date { display:inline; }
#mtt.show-inline-date li.task-row.task-completed .task-date-completed { display:inline; }
#mtt.show-inline-date li.task-row.task-completed .task-date { display:none; }
.task-date {
color: var(--color-text-reduced3);
font-size: 0.8rem;
margin-top: 0.2rem;
display: none;
}
.task-id {
/*display: none;*/
}
#mtt.show-inline-date .task-date { display: block; }
.task-through { overflow:hidden; flex-grow:1; }
.task-title a { color: var(--color-text-default); }
.task-title a:hover { color: var(--color-tasklist-link-hover); }
@ -953,7 +960,11 @@ li.mtt-item-hidden { display:none; }
#toolbar.mtt-insearch .searchbox-c { width:100%; max-width:100%; }
#search { padding:5px 20px; border-radius:15px; }
.task-date { display:none; }
.task-date {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.task-note-actions { display:block; padding-top:8px; }
.task-note-block {
padding-left: 0.625rem;

View file

@ -25,7 +25,6 @@ h2 { padding-left:10px; padding-right:0px; }
.duedate { margin-left:0; margin-right:5px; }
.duedate-arrow { display:none; }
.duedate:before { content:'\20\2190\20'; }
.task-date-completed { margin-left:0; margin-right:5px; }
#tagcloud { box-shadow:-1px 2px 5px rgba(0,0,0,0.5); }
#tagcloudcancel { float:left; }

View file

@ -17,7 +17,7 @@
"searching": "Searching for",
"tasks": "Tasks",
"taskdate_inline_created": "created at %s",
"taskdate_inline_completed": "Completed at %s",
"taskdate_inline_completed": "completed at %s",
"taskdate_inline_duedate": "Due %s",
"taskdate_created": "Created",
"taskdate_completed": "Completed",

View file

@ -17,7 +17,7 @@
"searching": "Поиск",
"tasks": "Задачи",
"taskdate_inline_created": "добавлена %s",
"taskdate_inline_completed": "Завершена %s",
"taskdate_inline_completed": "завершена %s",
"taskdate_inline_duedate": "В срок %s",
"taskdate_created": "Дата создания",
"taskdate_completed": "Дата завершения",