mirror of
https://github.com/maxpozdeev/mytinytodo.git
synced 2026-03-11 08:55:27 +00:00
* inline task date another fix
This commit is contained in:
parent
456c729260
commit
60685ee1d4
3 changed files with 11 additions and 10 deletions
|
|
@ -38,9 +38,9 @@ class Lang extends DefaultLang
|
|||
'advanced_add' => "Advanced",
|
||||
'searching' => "Searching for",
|
||||
'tasks' => "Tasks",
|
||||
'taskdate_inline_created' => "Created: %s",
|
||||
'taskdate_inline_completed' => "Completed: %s",
|
||||
'taskdate_inline_duedate' => "Due: %s",
|
||||
'taskdate_inline_created' => "created at %s",
|
||||
'taskdate_inline_completed' => "Completed at %s",
|
||||
'taskdate_inline_duedate' => "Due %s",
|
||||
'taskdate_created' => "Created",
|
||||
'taskdate_completed' => "Completed",
|
||||
'go_back' => "<< Back",
|
||||
|
|
|
|||
|
|
@ -773,18 +773,19 @@ function loadTasks(opts)
|
|||
|
||||
function prepareTaskStr(item, noteExp)
|
||||
{
|
||||
// — = — = —
|
||||
var id = item.id;
|
||||
var prio = item.prio;
|
||||
return '<li id="taskrow_'+id+'" class="' + (item.compl?'task-completed ':'') + item.dueClass + (item.note!=''?' task-has-note':'') +
|
||||
((curList.showNotes && item.note != '') || noteExp ? ' task-expanded' : '') + prepareTagsClass(item.tags_ids) + '">' +
|
||||
'<div class="task-actions"><a href="#" class="taskactionbtn"></a></div>'+"\n"+
|
||||
'<div class="task-left"><div class="task-toggle"></div>'+
|
||||
'<input type="checkbox" '+(flag.readOnly?'disabled="disabled"':'')+(item.compl?'checked="checked"':'')+'/>'+
|
||||
'<span class="task-date" title="'+item.dateInlineTitle+'">'+item.dateInline+'</span></div>'+"\n"+
|
||||
'<input type="checkbox" '+(flag.readOnly?'disabled="disabled"':'')+(item.compl?'checked="checked"':'')+'/></div>'+"\n"+
|
||||
'<div class="task-middle"><div class="task-through-right">'+prepareDuedate(item)+
|
||||
'<span class="task-date-completed" title="'+item.dateCompletedInlineTitle+'">'+item.dateCompletedInline+'</span></div>'+"\n"+
|
||||
'<span class="task-date-completed"><span title="'+item.dateInlineTitle+'">'+item.dateInline+'</span>—'+
|
||||
'<span title="'+item.dateCompletedInlineTitle+'">'+item.dateCompletedInline+'</span></span></div>'+"\n"+
|
||||
'<div class="task-through">'+preparePrio(prio,id)+'<span class="task-title">'+prepareHtml(item.title)+'</span> '+"\n"+
|
||||
prepareTagsStr(item)+'</div>'+
|
||||
prepareTagsStr(item)+'<span class="task-date">'+item.dateInlineTitle+'</span></div>'+
|
||||
'<div class="task-note-block">'+
|
||||
'<div id="tasknote'+id+'" class="task-note"><span>'+prepareHtml(item.note)+'</span></div>'+
|
||||
'<div id="tasknotearea'+id+'" class="task-note-area"><textarea id="notetext'+id+'"></textarea>'+
|
||||
|
|
|
|||
|
|
@ -154,11 +154,11 @@ li.task-expanded .task-toggle { background-position:-80px -16px; }
|
|||
#tasklist li { padding:6px 2px 6px 6px; border-bottom:1px solid #DEDEDE; min-height:18px; margin-bottom:1px; background-color:#fff; }
|
||||
#tasklist li:hover { background-color:#f6f6f6; }
|
||||
.task-actions { float:right; width:20px; text-align:right; }
|
||||
.task-date { display:none; min-width:55px; color:#999999; margin-right:10px; margin-left:5px; text-align:right; }
|
||||
.task-date { color:#999999; font-size:0.8em; margin-left:4px; display:none; }
|
||||
.task-date-completed { color:#999999; display:none; margin-left:5px; }
|
||||
.show-inline-date .task-middle { margin-left:110px; }
|
||||
.show-inline-date .task-date { display:inline-block; }
|
||||
.show-inline-date .task-date { display:inline; }
|
||||
.show-inline-date li.task-completed .task-date-completed { display:inline; }
|
||||
.show-inline-date li.task-completed .task-date { display:none; }
|
||||
.task-through { overflow:hidden; }
|
||||
.task-through-right { float:right; }
|
||||
.task-title a { color:#000000; }
|
||||
|
|
|
|||
Loading…
Reference in a new issue