* taskdate_inline

This commit is contained in:
Max Pozdeev 2009-11-13 20:55:51 +03:00
parent 4623e12be7
commit 94d3764b02
5 changed files with 11 additions and 8 deletions

View file

@ -71,8 +71,8 @@ function prepareTaskStr(item, noteExp)
'<div class="task-left"><div class="mtt-toggle '+(item.note==''?'invisible':(noteExp?'mtt-toggle-expanded':''))+'" onClick="toggleNote('+id+')"></div>'+
'<input type="checkbox" '+(readOnly?'disabled':'')+' onClick="completeTask('+id+',this)" '+(item.compl?'checked':'')+'></div>'+
'<div class="task-middle">'+prepareDuedate(item.duedate, item.dueClass, item.dueStr)+
'<span class="nobr"><span class="task-through">'+preparePrio(prio,id)+'<span class="task-title">'+prepareHtml(item.title)+'</span>'+
prepareTagsStr(item.tags)+'<span class="task-date">'+lang.taskDate(item.date)+'</span></span></span>'+
'<span class="task-through">'+preparePrio(prio,id)+'<span class="task-title">'+prepareHtml(item.title)+'</span>'+
prepareTagsStr(item.tags)+'<span class="task-date">'+item.dateInline+'</span></span>'+
'<div class="task-note-block '+(item.note!=''&&noteExp?'':'hidden')+'">'+
'<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>'+

View file

@ -405,11 +405,14 @@ elseif(isset($_POST['deleteList']))
function prepareTaskRow($r, $tz)
{
global $lang;
$dueA = prepare_duedate($r['duedate'], $tz);
$dCreated = timestampToDatetime($r['d_created'], $tz);
return array(
'id' => $r['id'],
'title' => htmlarray($r['title']),
'date' => htmlarray(timestampToDatetime($r['d_created'], $tz)),
'date' => htmlarray($dCreated),
'dateInline' => htmlarray(sprintf($lang->get('taskdate_inline'), $dCreated)),
'compl' => (int)$r['compl'],
'prio' => $r['prio'],
'note' => nl2br(htmlarray($r['note'])),

View file

@ -11,7 +11,6 @@ class DefaultLang
'actionNote' => "note",
'actionEdit' => "modify",
'actionDelete' => "delete",
'taskDate' => array("function(date) { return 'added at '+date; }"),
'confirmDelete' => "Are you sure?",
'actionNoteSave' => "save",
'actionNoteCancel' => "cancel",
@ -37,6 +36,7 @@ class DefaultLang
'advanced_add' => "Advanced",
'searching' => "Searching for",
'tasks' => "Tasks",
'taskdate_inline' => "added at %s",
'edit_task' => "Edit Task",
'add_task' => "New Task",
'priority' => "Priority",

View file

@ -17,7 +17,6 @@ class Lang extends DefaultLang
'actionNote' => "note",
'actionEdit' => "modify",
'actionDelete' => "delete",
'taskDate' => array("function(date) { return 'added at '+date; }"),
'confirmDelete' => "Are you sure?",
'actionNoteSave' => "save",
'actionNoteCancel' => "cancel",
@ -42,6 +41,7 @@ class Lang extends DefaultLang
'advanced_add' => "Advanced",
'searching' => "Searching for",
'tasks' => "Tasks",
'taskdate_inline' => "added at %s",
'edit_task' => "Edit Task",
'add_task' => "New Task",
'priority' => "Priority",

View file

@ -19,19 +19,19 @@ h3 { margin-bottom:4px; padding:4px 0; }
.task-note-actions { display:block; padding-top:8px; }
div.task-note-block { margin-left:12px; border-left:1px solid #777777; background:none; padding-left:4px; margin-top:1px; padding-top:0px; display:none; }
div.task-note-area textarea { width:95%; }
.nobr { white-space:nowrap; }
.task-middle { margin-right:0px; }
#tasklist li .task-through { white-space:nowrap; }
#tasklist li:hover { background-color:#ffffff; }
#tasklist li.clicked { background-color:#f6f6f6; }
#tasklist li.clicked .task-date { display:none; }
#tasklist li.clicked .task-actions { display:block; }
#tasklist li.clicked div.task-note-block { display:block; }
#tasklist li.clicked div.task-note-block.hidden { display:none; }
#tasklist li.clicked .nobr { white-space:normal; }
#tasklist li.clicked .task-through { white-space:normal; }
#tasklist li.clicked.doubleclicked .task-actions { display:none; }
#tasklist li.clicked.doubleclicked div.task-note-block { display:none; }
#tasklist li.clicked.doubleclicked .nobr { white-space:nowrap; }
#tasklist li.clicked.doubleclicked .task-through { white-space:nowrap; }
#page_taskedit { max-width:100%; padding:0px; }
.form-table { width:100%; }