diff --git a/src/ajax.js b/src/ajax.js index ccbc05a..8dde109 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -71,8 +71,8 @@ function prepareTaskStr(item, noteExp) '
'+ '
'+ '
'+prepareDuedate(item.duedate, item.dueClass, item.dueStr)+ - ''+preparePrio(prio,id)+''+prepareHtml(item.title)+''+ - prepareTagsStr(item.tags)+''+lang.taskDate(item.date)+''+ + ''+preparePrio(prio,id)+''+prepareHtml(item.title)+''+ + prepareTagsStr(item.tags)+''+item.dateInline+''+ '
'+ '
'+prepareHtml(item.note)+'
'+ '
'+ diff --git a/src/ajax.php b/src/ajax.php index 7e893f9..25877c9 100644 --- a/src/ajax.php +++ b/src/ajax.php @@ -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'])), diff --git a/src/lang/class.default.php b/src/lang/class.default.php index 46a5f53..eb221d8 100644 --- a/src/lang/class.default.php +++ b/src/lang/class.default.php @@ -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", diff --git a/src/lang/en.php b/src/lang/en.php index d458c15..811db20 100644 --- a/src/lang/en.php +++ b/src/lang/en.php @@ -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", diff --git a/src/pda.css b/src/pda.css index dc6780e..b801d43 100644 --- a/src/pda.css +++ b/src/pda.css @@ -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%; }