From 60685ee1d40d04531b5080ed3673b0d934d88f98 Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Wed, 8 Dec 2010 21:19:17 +0300
Subject: [PATCH] * inline task date another fix

---
 src/lang/en.php              | 6 +++---
 src/mytinytodo.js            | 9 +++++----
 src/themes/default/style.css | 6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/lang/en.php b/src/lang/en.php
index 6eae93a..87db54c 100644
--- a/src/lang/en.php
+++ b/src/lang/en.php
@@ -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' => "&lt;&lt; Back",
diff --git a/src/mytinytodo.js b/src/mytinytodo.js
index bb5c167..ece0090 100644
--- a/src/mytinytodo.js
+++ b/src/mytinytodo.js
@@ -773,18 +773,19 @@ function loadTasks(opts)
 
 function prepareTaskStr(item, noteExp)
 {
+	// &mdash; = &#8212; = —
 	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>&#8212;'+
+		'<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>'+
diff --git a/src/themes/default/style.css b/src/themes/default/style.css
index 5dec58f..99b101e 100644
--- a/src/themes/default/style.css
+++ b/src/themes/default/style.css
@@ -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; }