From 15f3caf97af6b1687c2e4f2bd61aa117c86f70ea Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Wed, 2 Sep 2009 13:38:42 +0400
Subject: [PATCH 01/17] Added tag v1.2.6 for changeset 716448aa5930


From d13d93c9ce0ddce5a9ccba417c92f02e9f26947b Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Wed, 2 Sep 2009 13:39:18 +0400
Subject: [PATCH 02/17] Added tag v1.2.5 for changeset e08a150be5b8


From f59a53fa4d2ab2e4242231ce941ccf8945729151 Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Sat, 19 Sep 2009 11:47:22 +0400
Subject: [PATCH 03/17] +* v1.3 prototype

---
 src/ajax.js                 |  84 ++++++++++++++++++-
 src/class.db.sqlite.php     | 158 ------------------------------------
 src/db/config.php.default   |   3 -
 src/images/toggle_minus.gif | Bin 0 -> 83 bytes
 src/images/toggle_plus.gif  | Bin 0 -> 86 bytes
 src/index.php               |  51 +++++++++---
 src/style.css               |  39 ++++++---
 7 files changed, 147 insertions(+), 188 deletions(-)
 delete mode 100644 src/class.db.sqlite.php
 create mode 100644 src/images/toggle_minus.gif
 create mode 100644 src/images/toggle_plus.gif

diff --git a/src/ajax.js b/src/ajax.js
index a278dd9..754c804 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -17,10 +17,12 @@ var tz = 0;
 var img = {
 	'note': ['images/page_white_text_add_bw.png','images/page_white_text_add.png'],
 	'edit': ['images/page_white_edit_bw.png','images/page_white_edit.png'],
-	'del': ['images/page_cross_bw.png','images/page_cross.png']
+	'del': ['images/page_cross_bw.png','images/page_cross.png'],
+	'toggle': ['images/toggle_plus.gif','images/toggle_minus.gif']
 };
 var taskCnt = { total:0, past: 0, today:0, soon:0 };
 var tmp = {};
+var oBtnMenu = {};
 
 function loadTasks()
 {
@@ -60,11 +62,12 @@ function prepareTaskStr(item)
 		'<a href="#" onClick="return toggleTaskNote('+id+')"><img src="'+img.note[0]+'" onMouseOver="this.src=img.note[1]" onMouseOut="this.src=img.note[0]" title="'+lang.actionNote+'"></a>'+
 		'<a href="#" onClick="return editTask('+id+')"><img src="'+img.edit[0]+'" onMouseOver="this.src=img.edit[1]" onMouseOut="this.src=img.edit[0]" title="'+lang.actionEdit+'"></a>'+
 		'<a href="#" onClick="return deleteTask('+id+')"><img src="'+img.del[0]+'" onMouseOver="this.src=img.del[1]" onMouseOut="this.src=img.del[0]" title="'+lang.actionDelete+'"></a></div>'+
-		'<div class="task-left"><input type="checkbox" '+(readOnly?'disabled':'')+' onClick="completeTask('+id+',this)" '+(item.compl?'checked':'')+'></div>'+
+		'<div class="task-left"><img src="'+img.toggle[0]+'" class="mtt-toggle '+(item.note==''?'invisible':'')+'" onClick="toggleNote('+id+')">'+
+		'<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>'+
-		'<div class="task-note-block'+(item.note==''?' hidden':'')+'">'+
+		'<div class="task-note-block 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>'+
 				'<span class="task-note-actions"><a href="#" onClick="return saveTaskNote('+id+')">'+lang.actionNoteSave+
@@ -837,3 +840,78 @@ function editFormResize(startstop, event)
 	}
 	else  $('#page_taskedit textarea').height(f.height() - tmp.editformdiff);
 }
+
+function mttTabSelected(el, indx)
+{
+	$(el.parentNode.parentNode).children('.mtt-tabs-selected').removeClass('mtt-tabs-selected');
+	$(el.parentNode).addClass('mtt-tabs-selected');
+
+}
+
+function btnMenu(el)
+{
+	if(!el.id) return;
+	oBtnMenu.container = el.id+'container';
+	oBtnMenu.targets = [el.id, oBtnMenu.container];
+	w = $('#'+oBtnMenu.container);
+	if(w.css('display') == 'none')
+	{
+		oBtnMenu.h = [];
+		$(w).children('.li').each( function(i,o){ 
+			if(o.onclick) {
+				oBtnMenu.h[i] = o.onclick;
+				$(o).bind("click2", o.onclick);
+				o.onclick = function(event) { $('#'+oBtnMenu.container).hide(); $(o).trigger('click2'); btnMenuClose(); }
+			} else {
+				oBtnMenu.h[i] = null;
+			}
+		} );
+		offset = $(el).offset();
+		w.css({ position: 'absolute', top: offset.top+el.offsetHeight-1, left: offset.left , 'min-width': $(el).width() }).show();
+		$(document).bind("click", btnMenuClose);
+	}
+	else {
+		el.blur();
+		btnMenuClose();
+	}
+}
+
+function btnMenuClose(e)
+{
+	if(e) {
+		if(isParentId(e.target, oBtnMenu.targets)) return;
+	}
+	$(document).unbind("click", btnMenuClose);
+	$('#'+oBtnMenu.container).hide().children('.li').each( function(i,o){ 
+		if(oBtnMenu.h[i]) {
+			o.onclick = oBtnMenu.h[i];
+			$(o).unbind('click2');
+		}
+	});
+	oBtnMenu = {};
+}
+
+function toggleNote(id)
+{
+	var o = $('#taskrow_'+id+'>div>div.task-note-block');
+	if(o.is('.hidden')) $('#taskrow_'+id+'>div>.mtt-toggle').attr('src', img.toggle[1]);
+	else $('#taskrow_'+id+'>div>.mtt-toggle').attr('src', img.toggle[0]);
+	o.toggleClass('hidden');
+}
+
+function toggleAllNotes(showhide)
+{
+	for(id in taskList)
+	{
+		if(taskList[id].note == '') continue;
+		if(showhide) {
+			$('#taskrow_'+id+'>div>.mtt-toggle').attr('src', img.toggle[1]);
+			$('#taskrow_'+id+'>div>div.task-note-block').removeClass('hidden');
+		}
+		else {
+			$('#taskrow_'+id+'>div>.mtt-toggle').attr('src', img.toggle[0]);
+			$('#taskrow_'+id+'>div>div.task-note-block').addClass('hidden');
+		}
+	}
+}
+
diff --git a/src/class.db.sqlite.php b/src/class.db.sqlite.php
deleted file mode 100644
index fcadcb1..0000000
--- a/src/class.db.sqlite.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-class DatabaseResult_Sqlite
-{
-	private  $parent;
-	private $q;
-	var $query;
-	private $rows = NULL;
-	private $affected = NULL;
-
-	function __construct($query, &$h, $resultless = 0)
-	{
-		$this->parent = $h;
-		$this->query = $query;
-
-		if($resultless) $this->q = @$this->parent->dbh->queryExec($query, $error);
-		else $this->q = @$this->parent->dbh->query($query, 0, $error);
-
-		if(!$this->q)
-		{
-			if($error) throw new Exception($error);
-			else throw new Exception(sqlite_error_string($this->parent->dbh->lastError()));
-		}
-	}
-
-	function rows()
-	{
-		if (!is_null($this->rows)) return $this->rows;
-		$this->rows = $this->q->numRows();
-		return $this->rows;
-	}
-
-	function fetch_row()
-	{
-		return $this->q->fetch(SQLITE_NUM);
-	}
-
-	function fetch_assoc()
-	{
-		return $this->q->fetch(SQLITE_ASSOC);
-	}
-
-}
-
-class Database_Sqlite
-{
-	var $dbh;
-	private $affected = null;
-
-	function __construct()
-	{
-	}
-
-	function connect($filename, $mode=0666)
-	{
-		try {
-			$this->dbh = new SQLiteDatabase($filename, 0666,  $error);
-		}
-		catch(Exception $e) {
-			throw new Exception($error);
-		}
-		return true;
-	}
-
-	function sq($query, $p = NULL)
-	{
-		$q = $this->_dq($query, $p);
-
-		if($q->rows()) $res = $q->fetch_row();
-		else return NULL;
-
-		if(sizeof($res) > 1) return $res;
-		else return $res[0];
-	}
-
-	function sqa($query, $p = NULL)
-	{
-		$q = $this->_dq($query, $p);
-
-		if($q->rows()) $res = $q->fetch_assoc();
-		else return NULL;
-
-		if(sizeof($res) > 1) return $res;
-		else return $res[0];
-	}
-	
-	function dq($query, $p = NULL)
-	{
-		return $this->_dq($query, $p);
-	}
-
-	/* 
-		for resultless queries like INSERT,UPDATE
-	*/
-	function ex($query, $p = NULL)
-	{
-		return $this->_dq($query, $p, 1);
-	}
-
-	private function _dq($query, $p = NULL, $resultless = 0)
-	{
-		if(!isset($p)) $p = array();
-		elseif(!is_array($p)) $p = array($p);
-
-		$m = explode('?', $query);
-
-		if(sizeof($p)>0)
-		{
-			if(sizeof($m)< sizeof($p)+1) {
-				throw new Exception("params to set MORE than query params");
-			}
-			if(sizeof($m)> sizeof($p)+1) {
-				throw new Exception("params to set LESS than query params");
-			}
-			$query = "";
-			for($i=0; $i<sizeof($m)-1; $i++) {
-				$query .= $m[$i]. $this->quote($p[$i]);
-			}
-			$query .= $m[$i];
-		}
-		return new DatabaseResult_Sqlite($query, $this, $resultless);
-	}
-
-	function affected()
-	{
-		if(is_null($this->affected))
-		{
-			$this->affected = $this->dbh->changes();
-		}
-		return $this->affected;
-	}
-
-	function quote($s)
-	{
-		return '\''. sqlite_escape_string($s). '\'';
-	}
-
-	function quoteForLike($format, $s)
-	{
-		$s = str_replace(array('\\','%','_'), array('\\\\','\%','\_'), $s);
-		return $this->quote(sprintf($format, $s));
-	}
-
-	function last_insert_id()
-	{
-		return $this->dbh->lastInsertRowid();
-	}
-
-	function table_exists($table)
-	{
-		$table = $this->quote($table);
-		$q = @$this->dbh->query("SELECT 1 FROM $table WHERE 1=0");
-		if($q === false) return false;
-		else return true;
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/src/db/config.php.default b/src/db/config.php.default
index 2250ccc..4027271 100644
--- a/src/db/config.php.default
+++ b/src/db/config.php.default
@@ -6,9 +6,6 @@ $config = array();
 # Uncomment this line if you want to use Mysql, in format: array("host","login","password","database");
 #$config['mysql'] = array("localhost","user","password", "mytinytodo");
 
-# To use old SQLite2 (instead of SQLite3) uncomment the line below
-#$config['sqlite'] = 2;
-
 # Language pack
 $config['lang'] = "en";
 
diff --git a/src/images/toggle_minus.gif b/src/images/toggle_minus.gif
new file mode 100644
index 0000000000000000000000000000000000000000..19d433b4c3c676030a13a41f823a2d356090ae76
GIT binary patch
literal 83
zcmZ?wbhEHb<Y(Y#n8*ME{~7Wc8XErp|F8Iyg^_`QkwFI}3X*4JQt9bmdAgTraYWJ$
i>$FujUR|&BVx5v|*7jmq9sBj2>sc(n^~$p{SOWn4{u}rJ

literal 0
HcmV?d00001

diff --git a/src/images/toggle_plus.gif b/src/images/toggle_plus.gif
new file mode 100644
index 0000000000000000000000000000000000000000..14a7ab2ee645dee35c9fcaaf40ac2fc98d23f1a8
GIT binary patch
literal 86
zcmZ?wbhEHb<Y(Y#n8*ME{~7Wc8XErp|F8Iyg^_`QkwFI}3X*4JQt#<sdAgTraYWJ$
l>$Fv3F@Iy`vC4@yESh<U_wlYy`R=o8SS){?lV@eH1^_g(983TJ

literal 0
HcmV?d00001

diff --git a/src/index.php b/src/index.php
index 83c0f52..441d524 100644
--- a/src/index.php
+++ b/src/index.php
@@ -56,7 +56,7 @@ function __($s)
 
 <script type="text/javascript">
 $().ready(function(){
-	$("#tabs").tabs({ select: tabSelected <?php echo $tabDisabled; ?>});
+//	$("#tabs").tabs({ select: tabSelected <?php echo $tabDisabled; ?>});
 	$("#tasklist").sortable({cancel:'span,input,a,textarea', delay: 150, update:orderChanged, start:sortStart, items:'> :not(.task-completed)'});
 	$("#tasklist").bind("click", tasklistClick);
 	$("#edittags").autocomplete('ajax.php?suggestTags', {scroll: false, multiple: true, selectFirst:false, max:8});
@@ -100,6 +100,10 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
 <div id="bar">
  <div style="float:left"><span id="msg" onClick="toggleMsgDetails()"></span><div id="msgdetails"></div></div>
  <div id="bar_auth" align="right">
+ 
+ <a href="#" id="mylists" class="nodecor" onClick="btnMenu(this);return false;"><u>My lists</u> <img src="images/arrdown.gif" border=0></a> |
+ <a href="settings.php">Settings</a> |
+
   <span id="bar_login"><span id="authstr">&nbsp;</span> <a href="#" class="nodecor" onClick="showAuth(this);return false;"><u><?php __('a_login');?></u> <img src="images/arrdown.gif" border=0></a></span>
   <a href="#" id="bar_logout" onClick="logout();return false"><?php __('a_logout');?></a>
  </div>
@@ -109,23 +113,38 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
 
 <div id="page_tasks">
 
-<div id="tabs">
+<div id="lists" class="mtt-tabs">
   <ul class="">
-	<li><a href="#newtask"><?php __('tab_newtask');?></a></li>
-	<li><a href="#searchtask"><?php __('tab_search');?></a></li>
-  </ul><br clear="all">
-  <div class="tab-content" id="newtask"> 
-	<form onSubmit="return submitNewTask(this)"><input type="text" name="task" value="" maxlength="250" id="task"> <input type="submit" value="<?php __('btn_add');?>"></form>
-  </div>
-  <div class="tab-content" id="searchtask">
-	<form onSubmit="return searchTasks()"><input type="text" name="search" value="" maxlength="250" id="search" onKeyUp="timerSearch()" autocomplete="off"> <input type="submit" value="<?php __('btn_search');?>"></form>
-	<div id="searchbar"><?php __('searching');?> <span id="searchbarkeyword"></span></div>
+    <li class="mtt-tabs-selected"><a href="#list1" onClick="mttTabSelected(this,0)">ToDo</a></li>
+	<li><a href="#list2" onClick="mttTabSelected(this,1)">Todo #2</a></li>
+  </ul>
+  <div class="mtt-htabs">
+
+  <span id="htab_newtask">
+
+  New task
+    <form onSubmit="return submitNewTask(this)"><input type="text" name="task" value="" maxlength="250" id="task"> <input type="submit" value="<?php __('btn_add');?>"></form>
+
+	&nbsp;| <a href="#" onClick="showhide($('#htab_search'),$('#htab_newtask')); return false;">Search</a> </span>
+
+  <span id="htab_search" style="display:none">
+
+<a href="#" onClick="showhide($('#htab_newtask'),$('#htab_search')); return false;">New task</a> |&nbsp;
+
+	Search
+	 <form onSubmit="return searchTasks()"><input type="text" name="search" value="" maxlength="250" id="search" onKeyUp="timerSearch()" autocomplete="off"> <input type="submit" value="<?php __('btn_search');?>"></form>
+	<div id="searchbar"><?php __('searching');?> <span id="searchbarkeyword"></span></div> 
+
+	</span>
+  
+
   </div>
 </div>
- 
+
 <h3><span id="taskviewcontainer" onClick="showTaskview(this);"><span class="btnstr"><?php __('tasks');?></span> (<span id="total">0</span>) &nbsp;<img src="images/arrdown.gif"></span>
 <span id="sort" onClick="showSort(this);"><span class="btnstr"></span> <img src="images/arrdown.gif"></span>
 <span id="tagcloudbtn" onClick="showTagCloud(this);" title="<?php __('tags');?>"><span class="btnstr"><?php __('tags');?></span> <img src="images/arrdown.gif"></span>
+<span class="mtt-notes-showhide">Notes: <a href="#" onClick="toggleAllNotes(1);this.blur();return false;">Show</a> / <a href="#" onClick="toggleAllNotes(0);this.blur();return false;">Hide</a></span>
 </h3>
 
 <div id="taskcontainer">
@@ -183,11 +202,17 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
  <div id="tagcloudcontent"></div>
 </div>
 
+<div id="mylistscontainer" class="mtt-btnmenu-container" style="display:none">
+ <div class="li" onClick="prompt('New list', 'To-Do')">New list</div>
+ <div class="li" onClick="prompt('Rename list', 'list name')">Rename</div>
+ <div class="li" onClick="confirm('This will delete current list with all tasks in it.\nAre you sure?')">Delete</div>
+</div>
+
 </div>
 <div id="space"></div>
 </div>
 
-<div id="footer"><div id="footer_content">Powered by <strong><a href="http://www.pozdeev.com/mytinytodo/">myTinyTodo</a></strong> v1.2.6 </div></div>
+<div id="footer"><div id="footer_content">Powered by <strong><a href="http://www.pozdeev.com/mytinytodo/">myTinyTodo</a></strong> v1.3a </div></div>
 
 </div>
 </body>
diff --git a/src/style.css b/src/style.css
index 6b38231..c985c77 100644
--- a/src/style.css
+++ b/src/style.css
@@ -22,13 +22,22 @@ a { color:#0000ff; }
 #authform div { padding:2px 0px; }
 #authform div.h { font-weight:bold; }
 
-#tabs ul { list-style: none; padding:0; margin:0; }
-#tabs ul li { margin:0; font-size: 9pt; font-weight:bold; float: left; width:90px; text-align:center; margin-right: 6px; }
-#tabs ul a { margin:0px;  text-decoration: none; color:#444444; display: block; height:24px; width: 100%; padding-top: 4px; outline:none; }
-#tabs ul li.ui-tabs-selected { background-color: #ededed; }
-#tabs ul li.ui-state-hover a { color: #888888; }
+/*
+.tabs ul { list-style: none; padding:0; margin:0; }
+.tabs ul li { margin:0; font-size: 9pt; font-weight:bold; float: left; width:90px; text-align:center; margin-right: 6px; }
+.tabs ul a { margin:0px;  text-decoration: none; color:#444444; display: block; height:24px; width: 100%; padding-top: 4px; outline:none; }
+.tabs ul li.ui-tabs-selected { background-color: #ededed; }
+.tabs ul li.ui-state-hover a { color: #888888; }
 .ui-tabs .ui-tabs-hide { display: none; }
-#tabs ul li.ui-state-disabled a { color: #cccccc; }
+.tabs ul li.ui-state-disabled a { color: #cccccc; }
+*/
+
+.mtt-tabs ul { list-style: none; padding:0; margin:0; }
+.mtt-tabs ul li { margin:0; font-size: 9pt; font-weight:bold; float: left; width:90px; text-align:center; margin-right: 6px; }
+.mtt-tabs ul a { margin:0px;  text-decoration: none; color:#444444; display: block; height:24px; width: 100%; padding-top: 4px; outline:none; }
+.mtt-tabs ul li:hover a { color: #888888; }
+.mtt-tabs ul li.mtt-tabs-selected { background-color:#ededed; }
+.mtt-htabs { clear:both; background-color:#ededed; padding:8px;  border-bottom:2px solid #DEDEDE; }
 
 .tab-content { background-color: #ededed; padding:8px; border-bottom:2px solid #DEDEDE; }
 #loading { float:left; padding-top:5px; background-color:#ffffff; display:none; padding-right:6px;}
@@ -46,8 +55,11 @@ a { color:#0000ff; }
 #sortform .li { margin:1px 0px; padding:2px; cursor:pointer; }
 #sortform .li:hover { background-color:#316AC5; color:white; }
 
-.task-left { width:25px; float:left; }
-.task-middle { margin-left:25px; margin-right:65px; }
+.mtt-notes-showhide { font-size:8pt; font-weight:normal; margin-left:5px; }
+
+.task-left { float:left; }
+.task-left .mtt-toggle { cursor:pointer; }
+.task-middle { margin-left:40px; margin-right:65px; }
 .nobr input { margin-left:0px; margin-right:4px; }
 #tasklist { list-style-type: none; margin: 0; padding: 0;}
 #tasklist li { padding:6px 2px 6px 6px; border-bottom:1px solid #DEDEDE; min-height:18px; margin-bottom:1px; background-color:#fff; }
@@ -82,16 +94,17 @@ div.task-note-area { display:none; margin-bottom:5px; }
 div.task-note-area textarea { color:#999999; width:100%; display:block; height:65px; }
 .task-note-actions { font-size:8pt; }
 .hidden { display:none; }
+.invisible { visibility:hidden; }
 .in500 { width:500px; color:#444444; }
 .in100 { width:100px; color:#444444; }
 .task-note span a { color:#777777; }
 .task-note span a:hover { color:#af0000; }
 
-.task-prio { padding-left:2px; padding-right:2px; margin-left: 2px; margin-right:3px; cursor:default; }
+.task-prio { padding-left:2px; padding-right:2px; margin-left:0px; margin-right:4px; cursor:default; }
 .prio-neg { background-color:#3377ff; color:#ffffff; }
 .prio-pos { background-color:#ff3030; color:#ffffff;  }
 .prio-o { background-color:#dedede; }
-#tasklist li .prio-o { display:none; }
+.task-prio.prio-o { display:none; } 
 
 #authstr { display: none; color:#999999; }
 #authstr.attention { color:#ff0000; }
@@ -152,7 +165,7 @@ div.task-note-area textarea { color:#999999; width:100%; display:block; height:6
 .ui-datepicker-title { text-align:center; }
 .ui-datepicker-prev, .ui-datepicker-next { cursor:pointer; padding:0px 3px; }
 
-#taskviewcontainer { border-bottom:1px dashed #ccc; padding:1px 2px; }
+#taskviewcontainer { border-bottom:1px dashed #ccc; padding:1px 2px; margin-left:4px; }
 #taskviewcontainer:hover { cursor:pointer; border-bottom:1px solid #bbb; }
 #taskview { overflow: hidden; z-index:103; background-color:#f9f9f9; border:1px solid #cccccc; padding:3px; } 
 #taskview .li { margin:1px 0px; padding:2px; cursor:pointer; }
@@ -164,3 +177,7 @@ div.task-note-area textarea { color:#999999; width:100%; display:block; height:6
 .ui-resizable-s { cursor:s-resize; height:7px; width:100%; bottom:-5px; left:0px; }
 .ui-resizable-e { cursor:e-resize; width:7px; right:-5px; top:0px; height:100%; }
 .ui-resizable-se { cursor:se-resize; width:12px; height:12px; right:1px; bottom:1px; }
+
+.mtt-btnmenu-container { overflow: hidden; z-index:103; background-color:#f9f9f9; border:1px solid #cccccc; padding:3px; } 
+.mtt-btnmenu-container .li { margin:1px 0px; padding:2px; cursor:pointer; }
+.mtt-btnmenu-container .li:hover { background-color:#316AC5; color:white; }
\ No newline at end of file

From 41bb96e2a4d8282b5c847c1edaf5fc63508630ee Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Sat, 19 Sep 2009 18:41:48 +0400
Subject: [PATCH 04/17] + can add lists and rename, view tasks and tagcloud
 according to the curently selected list (but not to add tasks, search, etc)

---
 src/ajax.js                |  99 ++++++++++++++++++++++++++++++------
 src/ajax.php               |  56 ++++++++++++++++++--
 src/index.php              |  14 ++---
 src/lang/class.default.php |   3 ++
 src/lang/en.php            |   2 +
 src/setup.php              | 101 +++++++++++++++++++++++++++++++------
 6 files changed, 230 insertions(+), 45 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 754c804..c3b0017 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -23,6 +23,8 @@ var img = {
 var taskCnt = { total:0, past: 0, today:0, soon:0 };
 var tmp = {};
 var oBtnMenu = {};
+var tabLists;
+var curList = 0;
 
 function loadTasks()
 {
@@ -31,7 +33,7 @@ function loadTasks()
 	if(filter.search) search = '&s='+encodeURIComponent(filter.search); else search = '';
 	if(filter.tag) tag = '&t='+encodeURIComponent(filter.tag); else tag = '';
 	nocache = '&rnd='+Math.random();
-	$.getJSON('ajax.php?loadTasks&compl='+filter.compl+'&sort='+sortBy+search+tag+'&tz='+tz+nocache, function(json){
+	$.getJSON('ajax.php?loadTasks&list='+curList.id+'&compl='+filter.compl+'&sort='+sortBy+search+tag+'&tz='+tz+nocache, function(json){
 		resetAjaxErrorTrigger();
 		$('#total').html(json.total);
 		taskList = new Array();
@@ -426,14 +428,14 @@ function updateAccessStatus(onInit)
 {
 	if(flag.needAuth && !flag.isLogged) $("#tasklist").sortable('disable').addClass('readonly');
 	else if(sortBy == 0) $("#tasklist").sortable('enable').removeClass('readonly');
+	else $("#tasklist").removeClass('readonly');
 
 	if(!flag.canAllRead && !flag.isLogged) {
-		$('#page_tasks > h3,#taskcontainer').hide();
-		$('#tabs').hide();
+		$('#page_tasks').hide();
+		$('#lists').hide();
 	}
 	else {
-		$('#page_tasks > h3,#taskcontainer').show();
-		$('#tabs').show();
+		$('#page_tasks').show();
 	}
 	if(flag.needAuth) {
 		$('#bar_auth').show();
@@ -449,9 +451,6 @@ function updateAccessStatus(onInit)
 
 	if(onInit == null || !onInit)
 	{
-		if(flag.isLogged) $("#tabs").tabs('enable',0).tabs('enable',1).tabs('select',0);
-		else if(flag.canAllRead) $("#tabs").tabs('enable',1).tabs('select', 1).tabs('disable',0);
-		else $("#tabs").tabs('disable',0).tabs('disable',1);
 	}
 }
 
@@ -471,7 +470,8 @@ function doAuth(form)
 				$('#searchbar').hide();
 			}
 			updateAccessStatus();
-			loadTasks();
+//			loadTasks();
+			loadLists();
 		}
 		else {
 			flashError(lang.invalidpass);
@@ -523,11 +523,11 @@ function getRecursParent(el, needle, level)
 	return getRecursParent(el.parentNode, needle, level);
 }
 
-function cancelTagFilter()
+function cancelTagFilter(dontLoadTasks)
 {
 	$('#tagcloudbtn>.btnstr').text($('#tagcloudbtn').attr('title'));
 	filter.tag = '';
-	loadTasks();
+	if(dontLoadTasks==null || !dontLoadTasks) loadTasks();
 }
 
 function addFilterTag(tag)
@@ -693,7 +693,7 @@ function showTagCloud(el)
 
 			setAjaxErrorTrigger();
 			nocache = '&rnd='+Math.random();
-			$.getJSON('ajax.php?tagCloud'+nocache, function(json){
+			$.getJSON('ajax.php?tagCloud&list='+curList.id+nocache, function(json){
 				resetAjaxErrorTrigger();
 				$('#tagcloudload').hide();
 				if(!parseInt(json.total)) return;
@@ -781,7 +781,7 @@ function taskviewClose(e)
 	$('#taskview').hide();
 }
 
-function setTaskview(v)
+function setTaskview(v, dontLoadTasks)
 {
 	if(v == 0)
 	{
@@ -795,7 +795,7 @@ function setTaskview(v)
 		if(filter.compl != 0) {
 			filter.compl = 0;
 			$('#total').text('...');
-			loadTasks();
+			if(dontLoadTasks==null || !dontLoadTasks) loadTasks();
 		}
 	}
 	else if(v == 1)
@@ -843,9 +843,18 @@ function editFormResize(startstop, event)
 
 function mttTabSelected(el, indx)
 {
+
 	$(el.parentNode.parentNode).children('.mtt-tabs-selected').removeClass('mtt-tabs-selected');
 	$(el.parentNode).addClass('mtt-tabs-selected');
-
+	if(!tabLists[indx]) return;
+	if(indx != curList.i) {
+		$('#tasklist').html('');
+	}
+	curList = tabLists[indx];
+	flag.tagsChanged = true;
+	cancelTagFilter(1);
+	setTaskview(0, 1);
+	loadTasks();
 }
 
 function btnMenu(el)
@@ -915,3 +924,63 @@ function toggleAllNotes(showhide)
 	}
 }
 
+function loadLists(onInit)
+{
+	if(flag.needAuth && !flag.isLogged) return false;
+
+	setAjaxErrorTrigger();
+	nocache = '&rnd='+Math.random();
+	$.getJSON('ajax.php?loadLists'+nocache, function(json){
+		resetAjaxErrorTrigger();
+		if(!parseInt(json.total)) {
+			$('#page_tasks').hide();
+			return;
+		}
+		tabLists = new Array();
+		var ti = '';
+		$.each(json.list, function(i,item){
+			item.i = i;
+			tabLists[i] = item;
+			ti += '<li class="'+(i==0?'mtt-tabs-selected':'')+'"><a href="#list'+item.id+'" onClick="mttTabSelected(this,'+i+');return false;">'+item.name+'</a></li>';
+		});
+		$('#lists>ul').html(ti);
+		$('#lists').show();
+		curList = tabLists[0];
+		loadTasks();
+	});
+}
+
+function addList()
+{
+	var r = prompt(lang.addList, lang.addListDefault);
+	if(r == null) return;
+	setAjaxErrorTrigger()
+	nocache = '&rnd='+Math.random();
+	$.post('ajax.php?'+nocache, { addList:1, name:r }, function(json){
+		resetAjaxErrorTrigger();
+		if(!parseInt(json.total)) return;
+		var item = json.list[0];
+		var i = tabLists.length;
+		item.i = i;
+		tabLists[i] = item;
+		$('#lists>ul').append('<li><a href="#list'+item.id+'" onClick="mttTabSelected(this,'+i+');return false;">'+item.name+'</a></li>');
+	}, 'json');
+}
+
+function renameCurList()
+{
+	if(!curList) return;
+	var r = prompt(lang.renameList, dehtml(curList.name));
+	if(r == null) return;
+	setAjaxErrorTrigger()
+	nocache = '&rnd='+Math.random();
+	$.post('ajax.php?'+nocache, { renameList:1, id:curList.id, name:r }, function(json){
+		resetAjaxErrorTrigger();
+		if(!parseInt(json.total)) return;
+		var item = json.list[0];
+		item.i = curList.i;
+		tabLists[curList.i] = item;
+		curList = item;
+		$('#lists>ul>.mtt-tabs-selected>a').html(item.name);
+	}, 'json');
+}
diff --git a/src/ajax.php b/src/ajax.php
index 7e2e32a..8f9e3cc 100644
--- a/src/ajax.php
+++ b/src/ajax.php
@@ -8,12 +8,27 @@ require_once('./lang/class.default.php');
 require_once('./lang/'.$config['lang'].'.php');
 $lang = new Lang();
 
-if(isset($_GET['loadTasks']))
+if(isset($_GET['loadLists']))
+{
+	check_read_access();
+	$t = array();
+	$t['total'] = 0;
+	$q = $db->dq("SELECT * FROM lists ORDER BY id ASC");
+	while($r = $q->fetch_assoc($q))
+	{
+		$t['total']++;
+		$t['list'][] = array('id'=>$r['id'], 'name'=>htmlarray($r['name']));
+	}
+	echo json_encode($t); 
+	exit;
+}
+elseif(isset($_GET['loadTasks']))
 {
 	check_read_access();
 	stop_gpc($_GET);
-	if(_get('compl')) $sqlWhere = '';
-	else $sqlWhere = ' AND compl=0';
+	$listId = (int)_get('list');
+	$sqlWhere = ' AND list_id='. $listId;
+	if(_get('compl') == 0) $sqlWhere .= ' AND compl=0';
 	$inner = '';
 	$tag = trim(_get('t'));
 	if($tag != '') {
@@ -272,8 +287,9 @@ elseif(isset($_GET['setPrio']))
 }
 elseif(isset($_GET['tagCloud']))
 {
+	$listId = (int)_get('list');
 	$a = array();
-	$q = $db->dq("SELECT name,tags_count FROM tags WHERE tags_count>0 ORDER BY tags_count ASC");
+	$q = $db->dq("SELECT name,tags_count FROM tags WHERE list_id=$listId AND tags_count>0 ORDER BY tags_count ASC");
 	while($r = $q->fetch_row()) {
 		$a[$r[0]] = $r[1];
 	}
@@ -296,8 +312,40 @@ elseif(isset($_GET['tagCloud']))
 	echo json_encode($t);
 	exit;
 }
+elseif(isset($_POST['addList']))
+{
+	check_write_access();
+	stop_gpc($_POST);
+	$t = array();
+	$t['total'] = 0;
+	$name = str_replace(array('"',"'",'<','>','&'),array('','','','',''),trim(_post('name')));
+	$db->dq("INSERT INTO lists (name) VALUES (?)", array($name));
+	$id = $db->last_insert_id();
+	$t['total'] = 1;
+	$r = $db->sqa("SELECT * FROM lists WHERE id=$id");
+	$t['list'][] = array('id'=>$r['id'], 'name'=>htmlarray($r['name']));
+	echo json_encode($t);
+	exit;
+}
+elseif(isset($_POST['renameList']))
+{
+	check_write_access();
+	stop_gpc($_POST);
+	$t = array();
+	$t['total'] = 0;
+	$id = (int)_post('id');
+	$name = str_replace(array('"',"'",'<','>','&'),array('','','','',''),trim(_post('name')));
+	$db->dq("UPDATE lists SET name=? WHERE id=$id", array($name));
+	$t['total'] = $db->affected();
+	$r = $db->sqa("SELECT * FROM lists WHERE id=$id");
+	$t['list'][] = array('id'=>$r['id'], 'name'=>htmlarray($r['name']));
+	echo json_encode($t);
+	exit;
+}
 
 
+###################################################################################################
+
 function prepareTaskRow($r, $tz=null)
 {
 	$dueA = prepare_duedate($r['duedate'], $tz);
diff --git a/src/index.php b/src/index.php
index 441d524..1939d84 100644
--- a/src/index.php
+++ b/src/index.php
@@ -56,7 +56,6 @@ function __($s)
 
 <script type="text/javascript">
 $().ready(function(){
-//	$("#tabs").tabs({ select: tabSelected <?php echo $tabDisabled; ?>});
 	$("#tasklist").sortable({cancel:'span,input,a,textarea', delay: 150, update:orderChanged, start:sortStart, items:'> :not(.task-completed)'});
 	$("#tasklist").bind("click", tasklistClick);
 	$("#edittags").autocomplete('ajax.php?suggestTags', {scroll: false, multiple: true, selectFirst:false, max:8});
@@ -68,11 +67,9 @@ $().ready(function(){
 		echo "\tflag.needAuth = true;\n";
 		if(!canAllRead()) echo "\tflag.canAllRead = false;\n";
 		if(is_logged()) echo "\tflag.isLogged = true;\n";
-		if(is_logged() || canAllRead()) echo "\tloadTasks();\n";
 		echo "\tupdateAccessStatus(1);\n";
-	} else {
-		echo "\tloadTasks();\n";
 	}
+	echo "\tloadLists(1)\n";
 ?>
 	preloadImg();
 	$("#duedate").datepicker({dateFormat: '<?php echo $duedateformat; ?>', firstDay: <?php echo $config['firstdayofweek']; ?>,
@@ -114,10 +111,7 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
 <div id="page_tasks">
 
 <div id="lists" class="mtt-tabs">
-  <ul class="">
-    <li class="mtt-tabs-selected"><a href="#list1" onClick="mttTabSelected(this,0)">ToDo</a></li>
-	<li><a href="#list2" onClick="mttTabSelected(this,1)">Todo #2</a></li>
-  </ul>
+  <ul class=""></ul>
   <div class="mtt-htabs">
 
   <span id="htab_newtask">
@@ -203,8 +197,8 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
 </div>
 
 <div id="mylistscontainer" class="mtt-btnmenu-container" style="display:none">
- <div class="li" onClick="prompt('New list', 'To-Do')">New list</div>
- <div class="li" onClick="prompt('Rename list', 'list name')">Rename</div>
+ <div class="li" onClick="addList()">New list</div>
+ <div class="li" onClick="renameCurList()">Rename</div>
  <div class="li" onClick="confirm('This will delete current list with all tasks in it.\nAre you sure?')">Delete</div>
 </div>
 
diff --git a/src/lang/class.default.php b/src/lang/class.default.php
index 1ef391b..9c32787 100644
--- a/src/lang/class.default.php
+++ b/src/lang/class.default.php
@@ -20,6 +20,9 @@ class DefaultLang
 		'invalidpass' => "Wrong password",
 		'readonly' => "read-only",
 		'tagfilter' => "Tag:",
+		'addList' => "Create new list",
+		'addListDefault' => "Todo",
+		'renameList' => "Rename list",
 	);
 
 	private $default_inc = array
diff --git a/src/lang/en.php b/src/lang/en.php
index fe947ad..a5e5973 100644
--- a/src/lang/en.php
+++ b/src/lang/en.php
@@ -16,6 +16,8 @@ class Lang extends DefaultLang
 		'invalidpass' => "Wrong password",
 		'readonly' => "read-only",
 		'tagfilter' => "Tag:",
+		'addList' => "Create new list",
+		'renameList' => "Rename list",
 	);
 
 	var $inc = array
diff --git a/src/setup.php b/src/setup.php
index e07aa39..d7f4125 100644
--- a/src/setup.php
+++ b/src/setup.php
@@ -14,15 +14,10 @@ if($needAuth && !is_logged())
 $dbclass = strtolower(get_class($db));
 $dbtype = ($dbclass == 'database_mysql') ? 'mysql' : 'sqlite';
 
-$lastVer = '1.2';
+$lastVer = '1.3';
 echo '<html><head><meta name="robots" content="noindex,nofollow"></head><body>'; 
 echo "<b>myTinyTodo v$lastVer Setup</b><br><br>";
 
-# exclude sqlite2
-if($dbclass == 'database_sqlite') {
-	exitMessage("Install/update is not available for sqlite2. Use sqlite v3.");
-}
-
 # determine current installed version
 $ver = get_ver($db, $dbtype);
 
@@ -41,6 +36,7 @@ if(!$ver)
 "CREATE TABLE todolist (
  `id` INT UNSIGNED NOT NULL auto_increment,
  `d` DATETIME NOT NULL,
+ `list_id` INT UNSIGNED NOT NULL default 0,
  `compl` TINYINT UNSIGNED NOT NULL default 0,
  `title` VARCHAR(250) NOT NULL,
  `note` TEXT,
@@ -48,7 +44,8 @@ if(!$ver)
  `ow` INT NOT NULL default 0,				/* order weight */
  `tags` VARCHAR(250) NOT NULL default '',	/* denormalization - for fast access to task tags */
  `duedate` DATE default NULL,
-  PRIMARY KEY(`id`)
+  PRIMARY KEY(`id`),
+  KEY(`list_id`)
 ) CHARSET=utf8 ");
 
 			$db->ex(
@@ -56,8 +53,10 @@ if(!$ver)
  `id` INT UNSIGNED NOT NULL auto_increment,
  `name` VARCHAR(50) NOT NULL,
  `tags_count` INT default 0,
+ `list_id` INT UNSIGNED NOT NULL default 0,
  PRIMARY KEY(`id`),
- UNIQUE KEY(`name`)
+ UNIQUE KEY(`name`),
+ KEY(`list_id`)
 ) CHARSET=utf8 ");
 
 			$db->ex(
@@ -68,6 +67,13 @@ if(!$ver)
  KEY(`task_id`)
 ) CHARSET=utf8 ");
 
+			$db->ex(
+"CREATE TABLE lists (
+ `id` INT UNSIGNED NOT NULL auto_increment,
+ `name` VARCHAR(50) NOT NULL default '',
+ PRIMARY KEY(`id`)
+) CHARSET=utf8 ");
+
 		} catch (Exception $e) {
 			exitMessage("<b>Error:</b> ". htmlarray($e->getMessage()));
 		}
@@ -80,6 +86,7 @@ if(!$ver)
 "CREATE TABLE todolist (
  id INTEGER PRIMARY KEY,
  d DATETIME NOT NULL default '0000-00-00',
+ list_id INTEGER UNSIGNED NOT NULL default 0,
  compl TINYINT UNSIGNED NOT NULL default 0,
  title VARCHAR(250) NOT NULL,
  note TEXT,
@@ -88,27 +95,37 @@ if(!$ver)
  tags VARCHAR(250) NOT NULL default '',
  duedate DATE default NULL
 ) ");
+			$db->ex("CREATE INDEX list_id ON todolist (list_id)");
 
 			$db->ex(
 "CREATE TABLE tags (
  id INTEGER PRIMARY KEY,
  name VARCHAR(50) NOT NULL COLLATE NOCASE UNIQUE,
- tags_count INT default 0
+ tags_count INT default 0,
+ list_id INTEGER UNSIGNED NOT NULL default 0
 ) ");
+			$db->ex("CREATE INDEX tags_list_id ON tags (list_id)");
 
 			$db->ex(
 "CREATE TABLE tag2task (
  tag_id INTEGER NOT NULL,
  task_id INTEGER NOT NULL
 ) ");
-
 			$db->ex("CREATE INDEX tag_id ON tag2task (tag_id)");
 			$db->ex("CREATE INDEX task_id ON tag2task (task_id)");
 
+			$db->ex(
+"CREATE TABLE lists (
+ id INTEGER PRIMARY KEY,
+ name VARCHAR(50) NOT NULL
+) ");
+
 		} catch (Exception $e) {
 			exitMessage("<b>Error:</b> ". htmlarray($e->getMessage()));
 		} 
 	}
+
+	createDefaultList($db);
 }
 elseif($ver == $lastVer)
 {
@@ -116,17 +133,22 @@ elseif($ver == $lastVer)
 }
 else
 {
-	if(!in_array($ver, array('1.1'))) {
-		exitMessage("Can not update database. Unsupported version ($ver).");
+	if(!in_array($ver, array('1.1','1.2'))) {
+		exitMessage("Can not update database. Unsupported version (v$ver).");
 	}
 	if(!isset($_POST['update'])) {
-		exitMessage("Update database from v$ver to v1.2 <form method=post><input type=hidden name=update value=1><input type=submit value=' Update '></form>");
+		exitMessage("Update database v$ver <form method=post><input type=hidden name=update value=1><input type=submit value=' Update '></form>");
 	}
 
 	# update process
-	if($ver == '1.1')
+	if($ver == '1.2')
+	{
+		update_12_13($db, $dbtype);
+	}
+	elseif($ver == '1.1')
 	{
 		update_11_12($db, $dbtype);
+		update_12_13($db, $dbtype);
 	}
 }
 echo "Done<br><br> <b>Attention!</b> Delete this file for security reasons.";
@@ -145,6 +167,8 @@ function get_ver($db, $dbtype)
 		if(!has_field_sqlite($db, 'todolist', 'duedate')) return $v;
 	}
 	$v = '1.2';
+	if(!$db->table_exists('lists')) return $v;
+	$v = '1.3';
 	return $v;
 }
 
@@ -182,11 +206,10 @@ function has_field_mysql($db, $table, $field)
 ### 1.1-1.2 ##########
 function update_11_12($db, $dbtype)
 {
-	echo "Changing database structure...<br>";
 	if($dbtype == 'mysql') $db->ex("ALTER TABLE todolist ADD `duedate` DATE default NULL");
 	else $db->ex("ALTER TABLE todolist ADD duedate DATE default NULL");
 
-	echo "Fixing broken tags...<br>";
+	# Fixing broken tags
 	$db->ex("BEGIN");
 	$db->ex("DELETE FROM tags");
 	$db->ex("DELETE FROM tag2task");
@@ -242,4 +265,50 @@ function update_task_tags($id, $tag_ids)
 
 ### end 1.1-1.2 #####
 
+### 1.2-1.3 ##########
+function update_12_13($db, $dbtype)
+{
+	$db->ex("BEGIN");
+	if($dbtype=='mysql')
+	{
+		$db->ex(
+"CREATE TABLE lists (
+ `id` INT UNSIGNED NOT NULL auto_increment,
+ `name` VARCHAR(50) NOT NULL default '',
+ PRIMARY KEY(`id`)
+) CHARSET=utf8 ");
+		$db->ex("ALTER TABLE todolist ADD `list_id` INT UNSIGNED NOT NULL default 0");
+		$db->ex("ALTER TABLE tags ADD `list_id` INT UNSIGNED NOT NULL default 0");
+
+		$db->ex("ALTER TABLE todolist ADD KEY(`list_id`)");
+		$db->ex("ALTER TABLE tags ADD KEY(`list_id`)");
+	}
+	else
+	{
+		$db->ex(
+"CREATE TABLE lists (
+ id INTEGER PRIMARY KEY,
+ name VARCHAR(50) NOT NULL
+) ");
+		$db->ex("ALTER TABLE todolist ADD list_id INTEGER UNSIGNED NOT NULL default 0");
+		$db->ex("ALTER TABLE tags ADD list_id INT UNSIGNED NOT NULL default 0");
+
+		$db->ex("CREATE INDEX list_id ON todolist (list_id)");
+		$db->ex("CREATE INDEX tags_list_id ON tags (list_id)");
+	}
+	$db->ex("COMMIT");
+
+	createDefaultList($db);
+}
+
+function createDefaultList($db)
+{
+	$db->ex("INSERT INTO lists (name) VALUES (?)", array('TODO'));
+
+	$db->ex("UPDATE todolist SET list_id=1");
+	$db->ex("UPDATE tags SET list_id=1");
+}
+
+### end 1.2-1.3 #####
+
 ?>
\ No newline at end of file

From 1c90205332cd4d1c41b6b3dd5e995ba12a1dd367 Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Sat, 19 Sep 2009 22:09:21 +0400
Subject: [PATCH 05/17] * setup and db indexes' structure updated

---
 src/setup.php | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/setup.php b/src/setup.php
index d7f4125..82cb3ca 100644
--- a/src/setup.php
+++ b/src/setup.php
@@ -55,8 +55,7 @@ if(!$ver)
  `tags_count` INT default 0,
  `list_id` INT UNSIGNED NOT NULL default 0,
  PRIMARY KEY(`id`),
- UNIQUE KEY(`name`),
- KEY(`list_id`)
+ UNIQUE KEY `listid_nmae` (`list_id`,`name`)
 ) CHARSET=utf8 ");
 
 			$db->ex(
@@ -100,11 +99,11 @@ if(!$ver)
 			$db->ex(
 "CREATE TABLE tags (
  id INTEGER PRIMARY KEY,
- name VARCHAR(50) NOT NULL COLLATE NOCASE UNIQUE,
+ name VARCHAR(50) NOT NULL,
  tags_count INT default 0,
  list_id INTEGER UNSIGNED NOT NULL default 0
 ) ");
-			$db->ex("CREATE INDEX tags_list_id ON tags (list_id)");
+			$db->ex("CREATE UNIQUE INDEX tags_listid_name ON tags (list_id,name COLLATE NOCASE)");
 
 			$db->ex(
 "CREATE TABLE tag2task (
@@ -281,7 +280,8 @@ function update_12_13($db, $dbtype)
 		$db->ex("ALTER TABLE tags ADD `list_id` INT UNSIGNED NOT NULL default 0");
 
 		$db->ex("ALTER TABLE todolist ADD KEY(`list_id`)");
-		$db->ex("ALTER TABLE tags ADD KEY(`list_id`)");
+		$db->ex("DROP INDEX `name` ON tags");
+		$db->ex("ALTER TABLE tags ADD UNIQUE KEY `listid_name` (`list_id`,`name`)");
 	}
 	else
 	{
@@ -291,10 +291,26 @@ function update_12_13($db, $dbtype)
  name VARCHAR(50) NOT NULL
 ) ");
 		$db->ex("ALTER TABLE todolist ADD list_id INTEGER UNSIGNED NOT NULL default 0");
-		$db->ex("ALTER TABLE tags ADD list_id INT UNSIGNED NOT NULL default 0");
-
-		$db->ex("CREATE INDEX list_id ON todolist (list_id)");
-		$db->ex("CREATE INDEX tags_list_id ON tags (list_id)");
+		$db->ex("CREATE INDEX todolist_list_id ON todolist (list_id)");
+		
+		$db->ex(
+"CREATE TEMPORARY TABLE tags_backup (
+ id INTEGER,
+ name VARCHAR(50) NOT NULL,
+ tags_count INT default 0
+) ");		
+		$db->ex("INSERT INTO tags_backup SELECT id,name,tags_count FROM tags");
+		$db->ex("DROP TABLE tags");
+		$db->ex(
+"CREATE TABLE tags (
+ id INTEGER PRIMARY KEY,
+ name VARCHAR(50) NOT NULL,
+ tags_count INT default 0,
+ list_id INTEGER UNSIGNED NOT NULL default 0
+) ");
+		$db->ex("INSERT INTO tags (id,name,tags_count) SELECT id,name,tags_count FROM tags_backup");
+		$db->ex("CREATE UNIQUE INDEX tags_listid_name ON tags (list_id,name COLLATE NOCASE) ");
+		$db->ex("DROP TABLE tags_backup");
 	}
 	$db->ex("COMMIT");
 
@@ -303,7 +319,7 @@ function update_12_13($db, $dbtype)
 
 function createDefaultList($db)
 {
-	$db->ex("INSERT INTO lists (name) VALUES (?)", array('TODO'));
+	$db->ex("INSERT INTO lists (name) VALUES (?)", array('Todo'));
 
 	$db->ex("UPDATE todolist SET list_id=1");
 	$db->ex("UPDATE tags SET list_id=1");

From dffde5e9bb1efab75a0945ef310e3a12b2d2369f Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Sat, 19 Sep 2009 22:10:26 +0400
Subject: [PATCH 06/17] * add task, edit task, tag suggestion are updated to
 multilist version

---
 src/ajax.js   |  4 ++--
 src/ajax.php  | 29 ++++++++++++++++-------------
 src/index.php |  2 +-
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index c3b0017..2250eec 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -117,7 +117,7 @@ function submitNewTask(form)
 	var tz = -1 * (new Date()).getTimezoneOffset();
 	setAjaxErrorTrigger()
 	nocache = '&rnd='+Math.random();
-	$.post('ajax.php?newTask'+nocache, { title: form.task.value, tz:tz, tag:filter.tag }, function(json){
+	$.post('ajax.php?newTask'+nocache, { list:curList.id, title: form.task.value, tz:tz, tag:filter.tag }, function(json){
 		resetAjaxErrorTrigger();
 		if(!parseInt(json.total)) return;
 		$('#total').text( parseInt($('#total').text()) + parseInt(json.total) );
@@ -312,7 +312,7 @@ function saveTask(form)
 	if(flag.needAuth && !flag.isLogged && flag.canAllRead) return false;
 	setAjaxErrorTrigger();
 	nocache = '&rnd='+Math.random();
-	$.post('ajax.php?editTask='+form.id.value+nocache, { title: form.task.value, note:form.note.value, prio:form.prio.value, tags:form.tags.value, duedate:form.duedate.value }, function(json){
+	$.post('ajax.php?editTask='+form.id.value+nocache, { list:curList.id, title: form.task.value, note:form.note.value, prio:form.prio.value, tags:form.tags.value, duedate:form.duedate.value }, function(json){
 		resetAjaxErrorTrigger();
 		if(!parseInt(json.total)) return;
 		var item = json.list[0];
diff --git a/src/ajax.php b/src/ajax.php
index 8f9e3cc..c9dbeb9 100644
--- a/src/ajax.php
+++ b/src/ajax.php
@@ -32,7 +32,7 @@ elseif(isset($_GET['loadTasks']))
 	$inner = '';
 	$tag = trim(_get('t'));
 	if($tag != '') {
-		$tag_id = get_tag_id($tag);
+		$tag_id = get_tag_id($tag, $listId);
 		$inner = "INNER JOIN tag2task ON id=tag2task.task_id";
 		$sqlWhere .= " AND tag_id=$tag_id ";
 	}
@@ -63,6 +63,7 @@ elseif(isset($_GET['newTask']))
 	stop_gpc($_POST);
 	$t = array();
 	$t['total'] = 0;
+	$listId = (int)_post('list');
 	$title = trim(_post('title'));
 	$prio = 0;
 	$tags = '';
@@ -85,13 +86,13 @@ elseif(isset($_GET['newTask']))
 	$tz = (int)_post('tz');
 	if( (isset($config['autotz']) && $config['autotz']==0) || $tz<-720 || $tz>720 || $tz%30!=0 ) $d = strftime("%Y-%m-%d %H:%M:%S");
 	else $d = gmdate("Y-m-d H:i:s", time()+$tz*60);
-	$ow = 1 + (int)$db->sq("SELECT MAX(ow) FROM todolist WHERE compl=0");
+	$ow = 1 + (int)$db->sq("SELECT MAX(ow) FROM todolist WHERE list_id=$listId AND compl=0");
 	$db->ex("BEGIN");
-	$db->dq("INSERT INTO todolist (title,d,ow,prio) VALUES (?,?,$ow,$prio)", array($title, $d));
+	$db->dq("INSERT INTO todolist (list_id,title,d,ow,prio) VALUES ($listId,?,?,$ow,$prio)", array($title, $d));
 	$id = $db->last_insert_id();
 	if($tags)
 	{
-		$tag_ids = prepare_tags($tags);
+		$tag_ids = prepare_tags($tags, $listId);
 		if($tag_ids) {
 			update_task_tags($id, $tag_ids);
 			$db->ex("UPDATE todolist SET tags=? WHERE id=$id", $tags);
@@ -171,6 +172,7 @@ elseif(isset($_GET['editTask']))
 	check_write_access();
 	$id = (int)$_GET['editTask'];
 	stop_gpc($_POST);
+	$listId = (int)_post('list');
 	$title = trim(_post('title'));
 	$note = str_replace("\r\n", "\n", trim(_post('note')));
 	$prio = (int)_post('prio');
@@ -185,7 +187,7 @@ elseif(isset($_GET['editTask']))
 	}
 	$tags = trim(_post('tags'));
 	$db->ex("BEGIN");
-	$tag_ids = prepare_tags($tags); 
+	$tag_ids = prepare_tags($tags, $listId); 
 	$cur_ids = get_task_tags($id);
 	if($cur_ids) {
 		$ids = implode(',', $cur_ids);
@@ -260,10 +262,11 @@ elseif(isset($_GET['logout']))
 elseif(isset($_GET['suggestTags']))
 {
 	check_read_access();
+	$listId = (int)_get('list');
 	$begin = trim(_get('q'));
 	$limit = (int)_get('limit');
 	if($limit<1) $limit = 8;
-	$q = $db->dq("SELECT name,id FROM tags WHERE name LIKE ". $db->quoteForLike('%s%%',$begin). " AND tags_count>0 ORDER BY name LIMIT $limit");
+	$q = $db->dq("SELECT name,id FROM tags WHERE list_id=$listId AND name LIKE ". $db->quoteForLike('%s%%',$begin). " AND tags_count>0 ORDER BY name LIMIT $limit");
 	$s = '';
 	while($r = $q->fetch_row()) {
 		$s .= "$r[0]|$r[1]\n";
@@ -382,7 +385,7 @@ function check_write_access()
 	exit;
 }
 
-function prepare_tags(&$tags_str)
+function prepare_tags(&$tags_str, $listId)
 {
 	$tag_ids = array();
 	$tag_names = array();
@@ -392,7 +395,7 @@ function prepare_tags(&$tags_str)
 		# remove duplicate tags?
 		$tag = str_replace(array('"',"'",'<','>','&'),array('','','','',''),trim($v));
 		if($tag == '') continue;
-		list($tag_id,$tag_name) = get_or_create_tag($tag);
+		list($tag_id,$tag_name) = get_or_create_tag($tag, $listId);
 		if($tag_id && !in_array($tag_id, $tag_ids)) {
 			$tag_ids[] = $tag_id;
 			$tag_names[] = $tag_name;
@@ -402,21 +405,21 @@ function prepare_tags(&$tags_str)
 	return $tag_ids;
 }
 
-function get_or_create_tag($name)
+function get_or_create_tag($name, $listId)
 {
 	global $db;
-	$tag = $db->sq("SELECT id,name FROM tags WHERE name=?", $name);
+	$tag = $db->sq("SELECT id,name FROM tags WHERE list_id=? AND name=?", array($listId, $name));
 	if($tag) return $tag;
 
 	# need to create tag
-	$db->ex("INSERT INTO tags (name) VALUES (?)", $name);
+	$db->ex("INSERT INTO tags (name,list_id) VALUES (?,?)", array($name,$listId));
 	return array($db->last_insert_id(), $name);
 }
 
-function get_tag_id($tag)
+function get_tag_id($tag, $listId)
 {
 	global $db;
-	$id = $db->sq("SELECT id FROM tags WHERE name=?", $tag);
+	$id = $db->sq("SELECT id FROM tags WHERE list_id=? AND name=?", array($listId, $tag));
 	return $id ? $id : 0;
 }
 
diff --git a/src/index.php b/src/index.php
index 1939d84..999cbdf 100644
--- a/src/index.php
+++ b/src/index.php
@@ -58,7 +58,7 @@ function __($s)
 $().ready(function(){
 	$("#tasklist").sortable({cancel:'span,input,a,textarea', delay: 150, update:orderChanged, start:sortStart, items:'> :not(.task-completed)'});
 	$("#tasklist").bind("click", tasklistClick);
-	$("#edittags").autocomplete('ajax.php?suggestTags', {scroll: false, multiple: true, selectFirst:false, max:8});
+	$("#edittags").autocomplete('ajax.php?suggestTags', {scroll: false, multiple: true, selectFirst:false, max:8, extraParams:{list:function(){return curList.id}}});
 	$("#priopopup").mouseleave(function(){$(this).hide()});
 	setSort(<?php echo $sort; ?>,1);
 <?php

From 69c6e128b22ad09fc0f363d3cf7e60b6bb28ea1e Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Sun, 20 Sep 2009 14:17:48 +0400
Subject: [PATCH 07/17] * newtask/search toggle updated * updateAccessStatus()
 updated

---
 src/ajax.js                | 89 ++++++++++++++++++++++----------------
 src/index.php              | 48 +++++++++-----------
 src/lang/class.default.php |  4 +-
 src/lang/en.php            |  4 +-
 src/style.css              |  6 +--
 5 files changed, 80 insertions(+), 71 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 2250eec..40ce578 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -403,17 +403,6 @@ function searchTasks()
 	return false;
 }
 
-function tabSelected(event, ui)
-{
-	// reload tasks when we return to task tab (from search tab)
-	if(ui.index == 0 && filter.search != '') {
-		filter.search = '';
-		$('#searchbarkeyword').text('');
-		$('#searchbar').hide();
-		loadTasks();
-	}
-}
-
 function dehtml(str)
 {
 	return str.replace(/&quot;/g,'"').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&amp;/g,'&');
@@ -424,33 +413,39 @@ function errorDenied()
 	flashError(lang.denied);
 }
 
-function updateAccessStatus(onInit)
+function updateAccessStatus()
 {
-	if(flag.needAuth && !flag.isLogged) $("#tasklist").sortable('disable').addClass('readonly');
-	else if(sortBy == 0) $("#tasklist").sortable('enable').removeClass('readonly');
-	else $("#tasklist").removeClass('readonly');
-
-	if(!flag.canAllRead && !flag.isLogged) {
-		$('#page_tasks').hide();
-		$('#lists').hide();
+	// flag.needAuth is not changed after pageload
+	if(flag.needAuth)
+	{
+		$('#bar_auth').show();
+		if(flag.isLogged) {
+			showhide($("#bar_logout"),$("#bar_login"));
+			$('#bar .menu-owner').show();
+			$('#bar .bar-delim').show();
+		}
+		else {
+			showhide($("#bar_login"),$("#bar_logout"));
+			$('#bar .menu-owner').hide();
+			$('#bar .bar-delim').hide();
+		}
+		if(!flag.canAllRead && !flag.isLogged) {
+			$('#page_tasks').hide();
+			$('#lists').hide();
+		} else {
+			$('#page_tasks').show();
+		}
+	}
+	if(flag.needAuth && flag.canAllRead && !flag.isLogged) {
+		$("#tasklist").sortable('disable');
+		$('#page_tasks').addClass('readonly')
+		$("#authstr").text(lang.readonly).show();
+		addsearchToggle(1);
 	}
 	else {
-		$('#page_tasks').show();
-	}
-	if(flag.needAuth) {
-		$('#bar_auth').show();
-		showhide($("#bar_login"),$("#bar_logout"));
-	}
-	if(!flag.needAuth) {
+		$('#page_tasks').removeClass('readonly')
+		if(sortBy == 0) $("#tasklist").sortable('enable');
 		$("#authstr").text('').hide();
-		$('#bar_auth').hide();
-	}
-	else if(flag.canAllRead && !flag.isLogged) $("#authstr").text(lang.readonly).addClass('attention').show();
-	else if(flag.isLogged) showhide($("#bar_logout"),$("#bar_login"));
-	else if(!flag.canAllRead) $("#authstr").text('').hide();
-
-	if(onInit == null || !onInit)
-	{
 	}
 }
 
@@ -470,7 +465,6 @@ function doAuth(form)
 				$('#searchbar').hide();
 			}
 			updateAccessStatus();
-//			loadTasks();
 			loadLists();
 		}
 		else {
@@ -926,8 +920,7 @@ function toggleAllNotes(showhide)
 
 function loadLists(onInit)
 {
-	if(flag.needAuth && !flag.isLogged) return false;
-
+	if(flag.needAuth && !flag.isLogged && !flag.canAllRead) return false;
 	setAjaxErrorTrigger();
 	nocache = '&rnd='+Math.random();
 	$.getJSON('ajax.php?loadLists'+nocache, function(json){
@@ -984,3 +977,25 @@ function renameCurList()
 		$('#lists>ul>.mtt-tabs-selected>a').html(item.name);
 	}, 'json');
 }
+
+function addsearchToggle(toSearch)
+{
+	if(toSearch)
+	{
+		showhide($('#htab_search'), $('#htab_newtask'));
+		$('#search').focus();
+	}
+	else
+	{
+		if(flag.needAuth && flag.canAllRead && !flag.isLogged) return false;
+		showhide($('#htab_newtask'), $('#htab_search'));
+		// reload tasks when we return to task tab (from search tab)
+		if(filter.search != '') {
+			filter.search = '';
+			$('#searchbarkeyword').text('');
+			$('#searchbar').hide();
+			loadTasks();
+		}
+		$('#task').focus();
+	}
+}
diff --git a/src/index.php b/src/index.php
index 999cbdf..76659eb 100644
--- a/src/index.php
+++ b/src/index.php
@@ -67,7 +67,7 @@ $().ready(function(){
 		echo "\tflag.needAuth = true;\n";
 		if(!canAllRead()) echo "\tflag.canAllRead = false;\n";
 		if(is_logged()) echo "\tflag.isLogged = true;\n";
-		echo "\tupdateAccessStatus(1);\n";
+		echo "\tupdateAccessStatus();\n";
 	}
 	echo "\tloadLists(1)\n";
 ?>
@@ -96,13 +96,17 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
 
 <div id="bar">
  <div style="float:left"><span id="msg" onClick="toggleMsgDetails()"></span><div id="msgdetails"></div></div>
- <div id="bar_auth" align="right">
- 
- <a href="#" id="mylists" class="nodecor" onClick="btnMenu(this);return false;"><u>My lists</u> <img src="images/arrdown.gif" border=0></a> |
- <a href="settings.php">Settings</a> |
-
-  <span id="bar_login"><span id="authstr">&nbsp;</span> <a href="#" class="nodecor" onClick="showAuth(this);return false;"><u><?php __('a_login');?></u> <img src="images/arrdown.gif" border=0></a></span>
+ <div align="right">
+ <span class="menu-owner">
+   <a href="#" id="mylists" class="nodecor" onClick="btnMenu(this);return false;"><u>My lists</u> <img src="images/arrdown.gif" border=0></a> |
+   <a href="settings.php">Settings</a>
+ </span>
+ <span class="bar-delim" style="display:none"> | </span>
+ <span id="bar_auth">
+  <span id="bar_login"><a href="#" class="nodecor" onClick="showAuth(this);return false;"><u><?php __('a_login');?></u> <img src="images/arrdown.gif" border=0></a></span>
+  <span id="authstr">&nbsp;</span>
   <a href="#" id="bar_logout" onClick="logout();return false"><?php __('a_logout');?></a>
+ </span>
  </div>
 </div>
 
@@ -111,28 +115,18 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
 <div id="page_tasks">
 
 <div id="lists" class="mtt-tabs">
-  <ul class=""></ul>
-  <div class="mtt-htabs">
+ <ul class=""></ul>
+ <div class="mtt-htabs">
+   <span id="htab_newtask"><?php __('htab_newtask');?>  <form onSubmit="return submitNewTask(this)"><input type="text" name="task" value="" maxlength="250" id="task"> <input type="submit" value="<?php __('btn_add');?>"></form>
+	&nbsp;| <a href="#" class="htab-toggle" onClick="addsearchToggle(1);this.blur();return false;"><?php __('htab_search');?></a>
+   </span>
 
-  <span id="htab_newtask">
-
-  New task
-    <form onSubmit="return submitNewTask(this)"><input type="text" name="task" value="" maxlength="250" id="task"> <input type="submit" value="<?php __('btn_add');?>"></form>
-
-	&nbsp;| <a href="#" onClick="showhide($('#htab_search'),$('#htab_newtask')); return false;">Search</a> </span>
-
-  <span id="htab_search" style="display:none">
-
-<a href="#" onClick="showhide($('#htab_newtask'),$('#htab_search')); return false;">New task</a> |&nbsp;
-
-	Search
-	 <form onSubmit="return searchTasks()"><input type="text" name="search" value="" maxlength="250" id="search" onKeyUp="timerSearch()" autocomplete="off"> <input type="submit" value="<?php __('btn_search');?>"></form>
+   <span id="htab_search" style="display:none">
+	<a href="#" class="htab-toggle" onClick="addsearchToggle(0);this.blur();return false;"><?php __('htab_newtask');?></a> |&nbsp;
+	<?php __('htab_search');?> <form onSubmit="return searchTasks()"><input type="text" name="search" value="" maxlength="250" id="search" onKeyUp="timerSearch()" autocomplete="off"> <input type="submit" value="<?php __('btn_search');?>"></form>
 	<div id="searchbar"><?php __('searching');?> <span id="searchbarkeyword"></span></div> 
-
-	</span>
-  
-
-  </div>
+   </span>
+ </div>
 </div>
 
 <h3><span id="taskviewcontainer" onClick="showTaskview(this);"><span class="btnstr"><?php __('tasks');?></span> (<span id="total">0</span>) &nbsp;<img src="images/arrdown.gif"></span>
diff --git a/src/lang/class.default.php b/src/lang/class.default.php
index 9c32787..c308645 100644
--- a/src/lang/class.default.php
+++ b/src/lang/class.default.php
@@ -28,8 +28,8 @@ class DefaultLang
 	private $default_inc = array
 	(
 		'My Tiny Todolist' => "My Tiny Todolist",
-		'tab_newtask' => "new task",
-		'tab_search' => "search",
+		'htab_newtask' => "New task",
+		'htab_search' => "Search",
 		'btn_add' => "Add",
 		'btn_search' => "Search",
 		'searching' => "Searching for",
diff --git a/src/lang/en.php b/src/lang/en.php
index a5e5973..caf8535 100644
--- a/src/lang/en.php
+++ b/src/lang/en.php
@@ -23,8 +23,8 @@ class Lang extends DefaultLang
 	var $inc = array
 	(
 		'My Tiny Todolist' => "My Tiny Todolist",
-		'tab_newtask' => "new task",
-		'tab_search' => "search",
+		'htab_newtask' => "New task",
+		'htab_search' => "Search",
 		'btn_add' => "Add",
 		'btn_search' => "Search",
 		'searching' => "Searching for",
diff --git a/src/style.css b/src/style.css
index c985c77..9d5f81d 100644
--- a/src/style.css
+++ b/src/style.css
@@ -38,6 +38,7 @@ a { color:#0000ff; }
 .mtt-tabs ul li:hover a { color: #888888; }
 .mtt-tabs ul li.mtt-tabs-selected { background-color:#ededed; }
 .mtt-htabs { clear:both; background-color:#ededed; padding:8px;  border-bottom:2px solid #DEDEDE; }
+#page_tasks.readonly #htab_search a.htab-toggle { color:#444; }
 
 .tab-content { background-color: #ededed; padding:8px; border-bottom:2px solid #DEDEDE; }
 #loading { float:left; padding-top:5px; background-color:#ffffff; display:none; padding-right:6px;}
@@ -70,7 +71,7 @@ a { color:#0000ff; }
 .task-date { color:#999999; font-size:8pt; margin-left:4px; display:none; }
 .task-title a { color:#000000; }
 .task-title a:hover { color:#af0000; }
-#tasklist.readonly li .task-actions { display:none; }
+#page_tasks.readonly #tasklist li .task-actions { display:none; }
 .task-tags { margin-left:4px; padding:0px 2px; }
 .task-tags .tag { font-size:8pt; font-weight:bold; color:#333333; text-decoration:underline;  }
 .task-tags .tag:hover {  }
@@ -106,8 +107,7 @@ div.task-note-area textarea { color:#999999; width:100%; display:block; height:6
 .prio-o { background-color:#dedede; }
 .task-prio.prio-o { display:none; } 
 
-#authstr { display: none; color:#999999; }
-#authstr.attention { color:#ff0000; }
+#authstr { display: none; color:#ff0000; }
 
 .form-row { margin-top:4px; margin-bottom:4px; }
 .form-row span.h { font-weight:bold; color:#333333; }

From 57c21c193d9e32133007b2f435e3d17c6fd9d2eb Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Sun, 20 Sep 2009 15:35:00 +0400
Subject: [PATCH 08/17] * note toggle updated after inline editor

---
 src/ajax.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 40ce578..062b23c 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -225,6 +225,7 @@ function toggleTaskNote(id)
 		$('#taskrow_'+id+'>div>div.task-note-block').removeClass('hidden');
 		$(aArea).css('display', 'block');
 		$('#tasknote'+id).css('display', 'none');
+		if(taskList[id].note != '') $('#taskrow_'+id+'>div>.mtt-toggle').attr('src', img.toggle[1]);
 		$('#notetext'+id).focus();
 	} else {
 		cancelTaskNote(id)
@@ -253,6 +254,8 @@ function saveTaskNote(id)
 		taskList[id].note = item.note;
 		taskList[id].noteText = item.noteText;
 		$('#tasknote'+item.id+'>span').html(prepareHtml(item.note));
+		if(item.note == '') $('#taskrow_'+id+'>div>.mtt-toggle').attr('src', img.toggle[0]).addClass('invisible');
+		else $('#taskrow_'+id+'>div>.mtt-toggle').attr('src', img.toggle[1]).removeClass('invisible');
 		cancelTaskNote(item.id);
 	}, 'json');
 	return false;
@@ -725,11 +728,9 @@ function tagCloudClose(e)
 function preloadImg()
 {
 	for(i in img) {
-		o = new Image();
-		o.src = img[i][0];
-		if(img[i][1] != img[i][0]) {
+		for(ii in img[i]) {
 			o = new Image();
-			o.src = img[i][1];
+			o.src = img[i][ii];
 		}
 	}
 }

From ecc023769ecbf17102d177f3986db1822a804f7f Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Sun, 20 Sep 2009 16:30:47 +0400
Subject: [PATCH 09/17] * sortings button moved to the right

---
 src/index.php | 5 +++--
 src/style.css | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/index.php b/src/index.php
index 76659eb..21ecbf5 100644
--- a/src/index.php
+++ b/src/index.php
@@ -129,8 +129,9 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
  </div>
 </div>
 
-<h3><span id="taskviewcontainer" onClick="showTaskview(this);"><span class="btnstr"><?php __('tasks');?></span> (<span id="total">0</span>) &nbsp;<img src="images/arrdown.gif"></span>
-<span id="sort" onClick="showSort(this);"><span class="btnstr"></span> <img src="images/arrdown.gif"></span>
+<h3>
+<span id="sort" onClick="showSort(this);" style="float:right"><span class="btnstr"></span> <img src="images/arrdown.gif"></span>
+<span id="taskviewcontainer" onClick="showTaskview(this);"><span class="btnstr"><?php __('tasks');?></span> (<span id="total">0</span>) &nbsp;<img src="images/arrdown.gif"></span>
 <span id="tagcloudbtn" onClick="showTagCloud(this);" title="<?php __('tags');?>"><span class="btnstr"><?php __('tags');?></span> <img src="images/arrdown.gif"></span>
 <span class="mtt-notes-showhide">Notes: <a href="#" onClick="toggleAllNotes(1);this.blur();return false;">Show</a> / <a href="#" onClick="toggleAllNotes(0);this.blur();return false;">Hide</a></span>
 </h3>
diff --git a/src/style.css b/src/style.css
index 9d5f81d..61d96ea 100644
--- a/src/style.css
+++ b/src/style.css
@@ -8,6 +8,7 @@ form { display: inline; }
 h2,h3 { margin:0; }
 h2 { font-size:15pt; float:left; padding-right:10px; background-color:#ffffff; }
 h3 { border-bottom:2px solid #B5D5FF; margin-bottom:10px; padding:6px 0; font-size:11pt; }
+#page_tasks h3 { padding-left:4px; padding-right:4px; }
 a { color:#0000ff; }
 #space { height:30px; }
 #footer { height:30px; margin-top:-30px; }
@@ -165,7 +166,7 @@ div.task-note-area textarea { color:#999999; width:100%; display:block; height:6
 .ui-datepicker-title { text-align:center; }
 .ui-datepicker-prev, .ui-datepicker-next { cursor:pointer; padding:0px 3px; }
 
-#taskviewcontainer { border-bottom:1px dashed #ccc; padding:1px 2px; margin-left:4px; }
+#taskviewcontainer { border-bottom:1px dashed #ccc; padding:1px 2px; }
 #taskviewcontainer:hover { cursor:pointer; border-bottom:1px solid #bbb; }
 #taskview { overflow: hidden; z-index:103; background-color:#f9f9f9; border:1px solid #cccccc; padding:3px; } 
 #taskview .li { margin:1px 0px; padding:2px; cursor:pointer; }

From 22e06039a9a017d885d23f5efee870cf72ef0e7d Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Sun, 20 Sep 2009 16:49:38 +0400
Subject: [PATCH 10/17] * added strings for notes toggle into translation

---
 src/index.php              | 2 +-
 src/lang/class.default.php | 3 +++
 src/lang/en.php            | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/index.php b/src/index.php
index 21ecbf5..c1c0f62 100644
--- a/src/index.php
+++ b/src/index.php
@@ -133,7 +133,7 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
 <span id="sort" onClick="showSort(this);" style="float:right"><span class="btnstr"></span> <img src="images/arrdown.gif"></span>
 <span id="taskviewcontainer" onClick="showTaskview(this);"><span class="btnstr"><?php __('tasks');?></span> (<span id="total">0</span>) &nbsp;<img src="images/arrdown.gif"></span>
 <span id="tagcloudbtn" onClick="showTagCloud(this);" title="<?php __('tags');?>"><span class="btnstr"><?php __('tags');?></span> <img src="images/arrdown.gif"></span>
-<span class="mtt-notes-showhide">Notes: <a href="#" onClick="toggleAllNotes(1);this.blur();return false;">Show</a> / <a href="#" onClick="toggleAllNotes(0);this.blur();return false;">Hide</a></span>
+<span class="mtt-notes-showhide"><?php __('notes');?> <a href="#" onClick="toggleAllNotes(1);this.blur();return false;"><?php __('notes_show');?></a> / <a href="#" onClick="toggleAllNotes(0);this.blur();return false;"><?php __('notes_hide');?></a></span>
 </h3>
 
 <div id="taskcontainer">
diff --git a/src/lang/class.default.php b/src/lang/class.default.php
index c308645..a7c22f8 100644
--- a/src/lang/class.default.php
+++ b/src/lang/class.default.php
@@ -64,6 +64,9 @@ class DefaultLang
 		'f_today' => "Today and tomorrow",
 		'f_soon' => "Soon",
 		'tasks_and_compl' => "Tasks + completed",
+		'notes' => "Notes:",
+		'notes_show' => "Show",
+		'notes_hide' => "Hide",
 	);
 
 	var $js = array();
diff --git a/src/lang/en.php b/src/lang/en.php
index caf8535..d33054e 100644
--- a/src/lang/en.php
+++ b/src/lang/en.php
@@ -59,6 +59,9 @@ class Lang extends DefaultLang
 		'f_today' => "Today and tomorrow",
 		'f_soon' => "Soon",
 		'tasks_and_compl' => "Tasks + completed",
+		'notes' => "Notes:",
+		'notes_show' => "Show",
+		'notes_hide' => "Hide",
 	);
 }
 

From 0ea71f795001cde6a45f5e3995e393a09260e5fa Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Sun, 20 Sep 2009 20:01:03 +0400
Subject: [PATCH 11/17] + can delete task list with all contents

---
 src/ajax.js                | 35 ++++++++++++++++++++++++++++-------
 src/ajax.php               | 20 ++++++++++++++++++++
 src/index.php              |  2 +-
 src/lang/class.default.php |  1 +
 src/lang/en.php            |  1 +
 5 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 062b23c..e36bb2e 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -35,7 +35,6 @@ function loadTasks()
 	nocache = '&rnd='+Math.random();
 	$.getJSON('ajax.php?loadTasks&list='+curList.id+'&compl='+filter.compl+'&sort='+sortBy+search+tag+'&tz='+tz+nocache, function(json){
 		resetAjaxErrorTrigger();
-		$('#total').html(json.total);
 		taskList = new Array();
 		taskOrder = new Array();
 		taskCnt.past = taskCnt.today = taskCnt.soon = 0;
@@ -48,6 +47,10 @@ function loadTasks()
 			if(!item.compl) changeTaskCnt(item.dueClass);
 		});
 		refreshTaskCnt();
+		if(filter.due == '') $('#total').html(taskCnt.total);
+		else if(filter.due == 'past') $('#total').html(taskCnt.past);
+		else if(filter.due == 'today') $('#total').html(taskCnt.today);
+		else if(filter.due == 'soon') $('#total').html(taskCnt.soon);
 		$('#tasklist').html(tasks);
 		if(filter.compl) showhide($('#compl_hide'),$('#compl_show'));
 		else showhide($('#compl_show'),$('#compl_hide'));
@@ -462,11 +465,6 @@ function doAuth(form)
 		if(json.logged)
 		{
 			flag.isLogged = true;
-			if(filter.search != '') {
-				filter.search = '';
-				$('#searchbarkeyword').text('');
-				$('#searchbar').hide();
-			}
 			updateAccessStatus();
 			loadLists();
 		}
@@ -844,6 +842,11 @@ function mttTabSelected(el, indx)
 	if(!tabLists[indx]) return;
 	if(indx != curList.i) {
 		$('#tasklist').html('');
+		if(filter.search != '') {
+			filter.search = '';
+			$('#searchbarkeyword').text('');
+			$('#searchbar').hide();
+		}
 	}
 	curList = tabLists[indx];
 	flag.tagsChanged = true;
@@ -922,6 +925,11 @@ function toggleAllNotes(showhide)
 function loadLists(onInit)
 {
 	if(flag.needAuth && !flag.isLogged && !flag.canAllRead) return false;
+	if(filter.search != '') {
+		filter.search = '';
+		$('#searchbarkeyword').text('');
+		$('#searchbar').hide();
+	}
 	setAjaxErrorTrigger();
 	nocache = '&rnd='+Math.random();
 	$.getJSON('ajax.php?loadLists'+nocache, function(json){
@@ -965,7 +973,7 @@ function renameCurList()
 {
 	if(!curList) return;
 	var r = prompt(lang.renameList, dehtml(curList.name));
-	if(r == null) return;
+	if(r == null || r == '') return;
 	setAjaxErrorTrigger()
 	nocache = '&rnd='+Math.random();
 	$.post('ajax.php?'+nocache, { renameList:1, id:curList.id, name:r }, function(json){
@@ -979,6 +987,19 @@ function renameCurList()
 	}, 'json');
 }
 
+function deleteCurList()
+{
+	var r = confirm(lang.deleteList);
+	if(!r) return;
+	setAjaxErrorTrigger()
+	$.post('ajax.php?'+'&rnd='+Math.random(), { deleteList:1, id:curList.id }, function(json){
+		resetAjaxErrorTrigger();
+		if(!parseInt(json.total)) return;
+		loadLists();
+	}, 'json');
+
+}
+
 function addsearchToggle(toSearch)
 {
 	if(toSearch)
diff --git a/src/ajax.php b/src/ajax.php
index c9dbeb9..895cbf4 100644
--- a/src/ajax.php
+++ b/src/ajax.php
@@ -345,6 +345,26 @@ elseif(isset($_POST['renameList']))
 	echo json_encode($t);
 	exit;
 }
+elseif(isset($_POST['deleteList']))
+{
+	check_write_access();
+	stop_gpc($_POST);
+	$t = array();
+	$t['total'] = 0;
+	$id = (int)_post('id');
+	$db->ex("BEGIN");
+	$db->ex("DELETE FROM lists WHERE id=$id");
+	$t['total'] = $db->affected();
+	if($t['total']) {
+		$db->ex("DELETE FROM tags WHERE list_id=$id");
+		# sqlite doesnt support DELETE FROM INNNER JOIN
+		$db->ex("DELETE FROM tag2task WHERE task_id IN (SELECT id FROM todolist WHERE list_id=$id)");
+		$db->ex("DELETE FROM todolist WHERE list_id=$id");
+	}
+	$db->ex("COMMIT");
+	echo json_encode($t);
+	exit;
+}
 
 
 ###################################################################################################
diff --git a/src/index.php b/src/index.php
index c1c0f62..dcbeda9 100644
--- a/src/index.php
+++ b/src/index.php
@@ -194,7 +194,7 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
 <div id="mylistscontainer" class="mtt-btnmenu-container" style="display:none">
  <div class="li" onClick="addList()">New list</div>
  <div class="li" onClick="renameCurList()">Rename</div>
- <div class="li" onClick="confirm('This will delete current list with all tasks in it.\nAre you sure?')">Delete</div>
+ <div class="li" onClick="deleteCurList()">Delete</div>
 </div>
 
 </div>
diff --git a/src/lang/class.default.php b/src/lang/class.default.php
index a7c22f8..2c61b84 100644
--- a/src/lang/class.default.php
+++ b/src/lang/class.default.php
@@ -23,6 +23,7 @@ class DefaultLang
 		'addList' => "Create new list",
 		'addListDefault' => "Todo",
 		'renameList' => "Rename list",
+		'deleteList' => "This will delete current list with all tasks in it.\\nAre you sure?",
 	);
 
 	private $default_inc = array
diff --git a/src/lang/en.php b/src/lang/en.php
index d33054e..f2f933a 100644
--- a/src/lang/en.php
+++ b/src/lang/en.php
@@ -18,6 +18,7 @@ class Lang extends DefaultLang
 		'tagfilter' => "Tag:",
 		'addList' => "Create new list",
 		'renameList' => "Rename list",
+		'deleteList' => "This will delete current list with all tasks in it.\\nAre you sure?",
 	);
 
 	var $inc = array

From 367512fc0bc5d5b46b3ce8c96ed4d5462f9aae9d Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Sun, 20 Sep 2009 20:03:59 +0400
Subject: [PATCH 12/17] * manage lists menu strings added into translation

---
 src/index.php              | 6 +++---
 src/lang/class.default.php | 3 +++
 src/lang/en.php            | 3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/index.php b/src/index.php
index dcbeda9..5a069bd 100644
--- a/src/index.php
+++ b/src/index.php
@@ -192,9 +192,9 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
 </div>
 
 <div id="mylistscontainer" class="mtt-btnmenu-container" style="display:none">
- <div class="li" onClick="addList()">New list</div>
- <div class="li" onClick="renameCurList()">Rename</div>
- <div class="li" onClick="deleteCurList()">Delete</div>
+ <div class="li" onClick="addList()"><?php __('list_new');?></div>
+ <div class="li" onClick="renameCurList()"><?php __('list_rename');?></div>
+ <div class="li" onClick="deleteCurList()"><?php __('list_delete');?></div>
 </div>
 
 </div>
diff --git a/src/lang/class.default.php b/src/lang/class.default.php
index 2c61b84..b53c52e 100644
--- a/src/lang/class.default.php
+++ b/src/lang/class.default.php
@@ -68,6 +68,9 @@ class DefaultLang
 		'notes' => "Notes:",
 		'notes_show' => "Show",
 		'notes_hide' => "Hide",
+		'list_new' => "New list",
+		'list_rename' => "Rename",
+		'list_delete' => "Delete",
 	);
 
 	var $js = array();
diff --git a/src/lang/en.php b/src/lang/en.php
index f2f933a..dfa30c5 100644
--- a/src/lang/en.php
+++ b/src/lang/en.php
@@ -63,6 +63,9 @@ class Lang extends DefaultLang
 		'notes' => "Notes:",
 		'notes_show' => "Show",
 		'notes_hide' => "Hide",
+		'list_new' => "New list",
+		'list_rename' => "Rename",
+		'list_delete' => "Delete",
 	);
 }
 

From 931ff6d64a4a16241835a021fcffa5d6af2abea6 Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Sun, 20 Sep 2009 20:15:18 +0400
Subject: [PATCH 13/17] * duedate calendar now uses full names of months

---
 src/index.php              | 2 +-
 src/lang/class.default.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/index.php b/src/index.php
index 5a069bd..7f0e30b 100644
--- a/src/index.php
+++ b/src/index.php
@@ -75,7 +75,7 @@ $().ready(function(){
 	$("#duedate").datepicker({dateFormat: '<?php echo $duedateformat; ?>', firstDay: <?php echo $config['firstdayofweek']; ?>,
 		showOn: 'button', buttonImage: 'images/calendar.png', buttonImageOnly: true, changeMonth:true,
 		changeYear:true, constrainInput: false, duration:'', nextText:'&gt;', prevText:'&lt;', dayNamesMin:lang.daysMin, 
-		monthNamesShort:lang.monthsShort });
+		monthNamesShort:lang.monthsLong });
 <?php if(!isset($_GET['pda'])): ?>
 	$("#page_taskedit").draggable({ stop: function(e,ui){ flag.windowTaskEditMoved=true; tmp.editformpos=[$(this).css('left'),$(this).css('top')]; } }); 
 	$("#page_taskedit").resizable({ minWidth:$("#page_taskedit").width(), minHeight:$("#page_taskedit").height(), start:function(ui,e){editFormResize(1)}, resize:function(ui,e){editFormResize(0,e)}, stop:function(ui,e){editFormResize(2,e)} });
diff --git a/src/lang/class.default.php b/src/lang/class.default.php
index b53c52e..f8a0b89 100644
--- a/src/lang/class.default.php
+++ b/src/lang/class.default.php
@@ -93,8 +93,8 @@ class DefaultLang
 		foreach($this->get('days_min') as $v) { $t[] = '"'.str_replace('"','\\"',$v).'"'; }
 		$a[] = "daysMin: [". implode(',', $t). "]";
 		$t = array();
-		foreach($this->get('months_short') as $v) { $t[] = '"'.str_replace('"','\\"',$v).'"'; }
-		$a[] = "monthsShort: [". implode(',', $t). "]";
+		foreach($this->get('months_long') as $v) { $t[] = '"'.str_replace('"','\\"',$v).'"'; }
+		$a[] = "monthsLong: [". implode(',', $t). "]";
 		return "lang = {\n". implode(",\n", $a). "\n};";
 	}
 

From 2b29063bf1682a75840c12ddaddd87198bd5d67d Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Mon, 21 Sep 2009 17:43:54 +0400
Subject: [PATCH 14/17] + can show all tags in task edit

---
 src/ajax.js                | 83 +++++++++++++++++++++++++++-----------
 src/index.php              | 16 ++++++--
 src/lang/class.default.php |  3 ++
 src/lang/en.php            |  3 ++
 src/style.css              |  5 ++-
 5 files changed, 81 insertions(+), 29 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index e36bb2e..751568f 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -25,6 +25,7 @@ var tmp = {};
 var oBtnMenu = {};
 var tabLists;
 var curList = 0;
+var tagsList = [];
 
 function loadTasks()
 {
@@ -310,6 +311,7 @@ function cancelEdit(e)
 	document.edittask.note.value = '';
 	document.edittask.tags.value = '';
 	document.edittask.duedate.value = '';
+	toggleEditAllTags(0);
 	return false;
 }
 
@@ -672,6 +674,23 @@ function changeTaskOrder(id)
 	}
 }
 
+function loadTags(callback)
+{
+	setAjaxErrorTrigger();
+	$.getJSON('ajax.php?tagCloud&list='+curList.id+'&rnd='+Math.random(), function(json){
+		resetAjaxErrorTrigger();
+		if(!parseInt(json.total)) tagsList = [];
+		else tagsList = json.cloud;
+		var cloud = '';
+		$.each(tagsList, function(i,item){
+			cloud += '<a href="#" onClick=\'addFilterTag("'+item.tag+'");tagCloudClose();return false;\' class="tag w'+item.w+'" >'+item.tag+'</a>';
+		});
+		$('#tagcloudcontent').html(cloud)
+		flag.tagsChanged = false;
+		callback();
+	});
+}
+
 function showTagCloud(el)
 {
 	w = $('#tagcloud');
@@ -682,29 +701,12 @@ function showTagCloud(el)
 			$('#tagcloudcontent').html('');
 			$('#tagcloudload').show();
 			offset = $(el).offset();
-			l = Math.ceil(offset.left - w.outerWidth()/2 + $(el).outerWidth()/2);
-			if(l<0) l=0;
-			w.css({ position: 'absolute', top: offset.top+el.offsetHeight-1, left: l }).show();
-
-			setAjaxErrorTrigger();
-			nocache = '&rnd='+Math.random();
-			$.getJSON('ajax.php?tagCloud&list='+curList.id+nocache, function(json){
-				resetAjaxErrorTrigger();
-				$('#tagcloudload').hide();
-				if(!parseInt(json.total)) return;
-				var cloud = '';
-				$.each(json.cloud, function(i,item){
-					cloud += '<a href="#" onClick=\'addFilterTag("'+item.tag+'");tagCloudClose();return false;\' class="tag w'+item.w+'" >'+item.tag+'</a>';
-				});
-				$('#tagcloudcontent').html(cloud)
-				flag.tagsChanged = false;
-			});
+			w.css({ position: 'absolute', top: offset.top+el.offsetHeight-1, left: offset.left }).show();
+			loadTags(function(){$('#tagcloudload').hide();});
 		}
 		else {
 			offset = $(el).offset();
-			l = Math.ceil(offset.left - w.outerWidth()/2 + $(el).outerWidth()/2);
-			if(l<0) l=0;
-			w.css({ position: 'absolute', top: offset.top+el.offsetHeight-1, left: l }).show();
+			w.css({ position: 'absolute', top: offset.top+el.offsetHeight-1, left: offset.left }).show();
 		}
 		$(document).bind("click", tagCloudClose);
 	}
@@ -828,7 +830,7 @@ function editFormResize(startstop, event)
 	else if(startstop == 2) {
 		//to avoid bug http://dev.jqueryui.com/ticket/3628
 		if(f.is('.ui-draggable')) {
-			f.css('left',tmp.editformpos[0]).css('top',tmp.editformpos[1]).css('position', 'fixed');
+			f.css( {left:tmp.editformpos[0], top:tmp.editformpos[1], height:''} ).css('position', 'fixed');
 		}
 	}
 	else  $('#page_taskedit textarea').height(f.height() - tmp.editformdiff);
@@ -906,12 +908,12 @@ function toggleNote(id)
 	o.toggleClass('hidden');
 }
 
-function toggleAllNotes(showhide)
+function toggleAllNotes(show)
 {
 	for(id in taskList)
 	{
 		if(taskList[id].note == '') continue;
-		if(showhide) {
+		if(show) {
 			$('#taskrow_'+id+'>div>.mtt-toggle').attr('src', img.toggle[1]);
 			$('#taskrow_'+id+'>div>div.task-note-block').removeClass('hidden');
 		}
@@ -1021,3 +1023,38 @@ function addsearchToggle(toSearch)
 		$('#task').focus();
 	}
 }
+
+function toggleEditAllTags(show)
+{
+	if(show)
+	{
+		if(flag.tagsChanged) loadTags(fillEditAllTags);
+		else fillEditAllTags();
+		showhide($('#alltags_hide'), $('#alltags_show'));
+	}
+	else {
+		$('#alltags').hide();
+		showhide($('#alltags_show'), $('#alltags_hide'))
+	}
+}
+
+function fillEditAllTags()
+{
+	var a = [];
+	for(var i=tagsList.length-1; i>=0; i--) { 
+		a.push('<a href="#" class="tag" onClick=\'addEditTag("'+tagsList[i].tag+'");return false\'>'+tagsList[i].tag+'</a>');
+	}
+	$('#alltags .tags-list').html(a.join(', '));
+	$('#alltags').show();
+}
+
+function addEditTag(tag)
+{
+	var v = $('#edittags').val();
+	if(v == '') { 
+		$('#edittags').val(tag);
+		return;
+	}
+	var r = v.search(new RegExp('(^|,)\\s*'+tag+'\\s*(,|$)'));
+	if(r < 0) $('#edittags').val(v+', '+tag);
+}
diff --git a/src/index.php b/src/index.php
index 7f0e30b..613ad00 100644
--- a/src/index.php
+++ b/src/index.php
@@ -77,7 +77,7 @@ $().ready(function(){
 		changeYear:true, constrainInput: false, duration:'', nextText:'&gt;', prevText:'&lt;', dayNamesMin:lang.daysMin, 
 		monthNamesShort:lang.monthsLong });
 <?php if(!isset($_GET['pda'])): ?>
-	$("#page_taskedit").draggable({ stop: function(e,ui){ flag.windowTaskEditMoved=true; tmp.editformpos=[$(this).css('left'),$(this).css('top')]; } }); 
+	$("#page_taskedit").draggable({ handle:'h3', stop: function(e,ui){ flag.windowTaskEditMoved=true; tmp.editformpos=[$(this).css('left'),$(this).css('top')]; } }); 
 	$("#page_taskedit").resizable({ minWidth:$("#page_taskedit").width(), minHeight:$("#page_taskedit").height(), start:function(ui,e){editFormResize(1)}, resize:function(ui,e){editFormResize(0,e)}, stop:function(ui,e){editFormResize(2,e)} });
 <?php endif; ?>
 
@@ -151,9 +151,17 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
 <input type="hidden" name="id" value="">
 <div class="form-row"><span class="h"><?php __('priority');?></span> <SELECT name="prio"><option value="2">+2</option><option value="1">+1</option><option value="0" selected>&plusmn;0</option><option value="-1">&minus;1</option></SELECT> 
  &nbsp; <span class="h"><?php __('due');?> </span> <input name="duedate" id="duedate" value="" class="in100" title="Y-M-D, M/D/Y, D.M.Y, M/D, D.M" autocomplete="off"></div>
-<div class="form-row"><span class="h"><?php __('task');?></span><br> <input type="text" name="task" value="" class="in500" maxlength="250"></div>
-<div class="form-row"><span class="h"><?php __('note');?></span><br> <textarea name="note" class="in500"></textarea></div>
-<div class="form-row"><span class="h"><?php __('tags');?></span><br> <input type="text" name="tags" id="edittags" value="" class="in500" maxlength="250"></div>
+<div class="form-row"><div class="h"><?php __('task');?></div> <input type="text" name="task" value="" class="in500" maxlength="250"></div>
+<div class="form-row"><div class="h"><?php __('note');?></div> <textarea name="note" class="in500"></textarea></div>
+<div class="form-row"><div class="h"><?php __('tags');?></div>
+ <table cellspacing="0" cellpadding="0" width="100%"><tr>
+  <td><input type="text" name="tags" id="edittags" value="" class="in500" maxlength="250"></td>
+  <td width="1" style="white-space:nowrap; padding-left:5px; text-align:right;">
+   <a href="#" id="alltags_show" onClick="toggleEditAllTags(1);return false;"><?php __('alltags_show');?></a>
+   <a href="#" id="alltags_hide" onClick="toggleEditAllTags(0);return false;" style="display:none"><?php __('alltags_hide');?></a></td>
+ </tr></table>
+</div>
+<div class="form-row" id="alltags" style="display:none;"><?php __('alltags');?> <span class="tags-list"></span></div>
 <div class="form-row"><input type="submit" value="<?php __('save');?>" onClick="this.blur()"> <input type="button" value="<?php __('cancel');?>" onClick="cancelEdit();this.blur();return false"></div>
 </form>
 
diff --git a/src/lang/class.default.php b/src/lang/class.default.php
index f8a0b89..abf9423 100644
--- a/src/lang/class.default.php
+++ b/src/lang/class.default.php
@@ -71,6 +71,9 @@ class DefaultLang
 		'list_new' => "New list",
 		'list_rename' => "Rename",
 		'list_delete' => "Delete",
+		'alltags' => "All tags:",
+		'alltags_show' => "Show all",
+		'alltags_hide' => "Hide all",
 	);
 
 	var $js = array();
diff --git a/src/lang/en.php b/src/lang/en.php
index dfa30c5..5b19ff6 100644
--- a/src/lang/en.php
+++ b/src/lang/en.php
@@ -66,6 +66,9 @@ class Lang extends DefaultLang
 		'list_new' => "New list",
 		'list_rename' => "Rename",
 		'list_delete' => "Delete",
+		'alltags' => "All tags:",
+		'alltags_show' => "Show all",
+		'alltags_hide' => "Hide all",
 	);
 }
 
diff --git a/src/style.css b/src/style.css
index 61d96ea..497cf71 100644
--- a/src/style.css
+++ b/src/style.css
@@ -62,7 +62,6 @@ a { color:#0000ff; }
 .task-left { float:left; }
 .task-left .mtt-toggle { cursor:pointer; }
 .task-middle { margin-left:40px; margin-right:65px; }
-.nobr input { margin-left:0px; margin-right:4px; }
 #tasklist { list-style-type: none; margin: 0; padding: 0;}
 #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; }
@@ -111,12 +110,14 @@ div.task-note-area textarea { color:#999999; width:100%; display:block; height:6
 #authstr { display: none; color:#ff0000; }
 
 .form-row { margin-top:4px; margin-bottom:4px; }
-.form-row span.h { font-weight:bold; color:#333333; }
+.form-row .h { font-weight:bold; color:#333333; }
 #overlay { position:fixed; z-index:200; background-color:#111111; display:none; top:0px; left:0px; width:100%; height:100%; }
 #page_taskedit { position:fixed; z-index:201; background-color:#fdfdfd; padding:8px; border:1px solid #cccccc; width:510px; }
 #page_taskedit .form-row .in500 { width:99%; }
 #page_taskedit .form-row textarea.in500 { height:130px; /*resize:none;*/ }
 .ui-icon-gripsmall-diagonal-se { background-image:url(images/resizegrip.gif); }
+#alltags .tag { font-weight:bold; color:#333333; }
+#alltags .tag:hover { background-color:#999988; color:white; }
 
 /* autocomplete */
 .ac_results { padding: 0px; border: 1px solid #cccccc; background-color: #f0f0f0; overflow: hidden;  z-index: 99999; }

From d1d9585f03b26bc3e94b5d5a67b1eda7e9795c8e Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Mon, 21 Sep 2009 23:21:46 +0400
Subject: [PATCH 15/17] * fixed useless global vars

---
 src/ajax.js | 118 ++++++++++++++++++++++++++--------------------------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 751568f..4a92b26 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -31,9 +31,9 @@ function loadTasks()
 {
 	tz = -1 * (new Date()).getTimezoneOffset();
 	setAjaxErrorTrigger();
-	if(filter.search) search = '&s='+encodeURIComponent(filter.search); else search = '';
-	if(filter.tag) tag = '&t='+encodeURIComponent(filter.tag); else tag = '';
-	nocache = '&rnd='+Math.random();
+	var search = filter.search ? '&s='+encodeURIComponent(filter.search) : '';
+	var tag = filter.tag ? '&t='+encodeURIComponent(filter.tag) : '';
+	var nocache = '&rnd='+Math.random();
 	$.getJSON('ajax.php?loadTasks&list='+curList.id+'&compl='+filter.compl+'&sort='+sortBy+search+tag+'&tz='+tz+nocache, function(json){
 		resetAjaxErrorTrigger();
 		taskList = new Array();
@@ -61,9 +61,9 @@ function loadTasks()
 
 function prepareTaskStr(item)
 {
-	id = parseInt(item.id);
-	prio = parseInt(item.prio);
-	readOnly = (flag.needAuth && flag.canAllRead && !flag.isLogged) ? true : false;
+	var id = parseInt(item.id);
+	var prio = parseInt(item.prio);
+	var readOnly = (flag.needAuth && flag.canAllRead && !flag.isLogged) ? true : false;
 	return '<li id="taskrow_'+id+'" class="'+(item.compl?'task-completed ':'')+item.dueClass+'" onDblClick="editTask('+id+')"><div class="task-actions">'+
 		'<a href="#" onClick="return toggleTaskNote('+id+')"><img src="'+img.note[0]+'" onMouseOver="this.src=img.note[1]" onMouseOut="this.src=img.note[0]" title="'+lang.actionNote+'"></a>'+
 		'<a href="#" onClick="return editTask('+id+')"><img src="'+img.edit[0]+'" onMouseOver="this.src=img.edit[1]" onMouseOut="this.src=img.edit[0]" title="'+lang.actionEdit+'"></a>'+
@@ -85,13 +85,13 @@ function prepareTaskStr(item)
 function prepareHtml(s)
 {
 	// make URLs clickable
-	s = s.replace(/(^|\s|>)(www\.([\w\#$%&~\/.\-\+;:=,\?\[\]@]+?))(,|\.|:|)?(?=\s|&quot;|&lt;|&gt;|\"|<|>|$)/gi, '$1<a href="http://$2" target="_blank">$2</a>$4');
+	var s = s.replace(/(^|\s|>)(www\.([\w\#$%&~\/.\-\+;:=,\?\[\]@]+?))(,|\.|:|)?(?=\s|&quot;|&lt;|&gt;|\"|<|>|$)/gi, '$1<a href="http://$2" target="_blank">$2</a>$4');
 	return s.replace(/(^|\s|>)((?:http|https|ftp):\/\/([\w\#$%&~\/.\-\+;:=,\?\[\]@]+?))(,|\.|:|)?(?=\s|&quot;|&lt;|&gt;|\"|<|>|$)/ig, '$1<a href="$2" target="_blank">$2</a>$4');
 }
 
 function preparePrio(prio,id)
 {
-	cl = v = '';
+	var cl =''; var v = '';
 	if(prio < 0) { cl = 'prio-neg'; v = '&minus;'+Math.abs(prio); }
 	else if(prio > 0) { cl = 'prio-pos'; v = '+'+prio; }
 	else { cl = 'prio-o'; v = '&plusmn;0'; }
@@ -101,9 +101,9 @@ function preparePrio(prio,id)
 function prepareTagsStr(tags)
 {
 	if(!tags || tags == '') return '';
-	a = tags.split(',');
+	var a = tags.split(',');
 	if(!a.length) return '';
-	for(i in a) {
+	for(var i in a) {
 		a[i] = '<a href="#" class="tag" onClick=\'addFilterTag("'+a[i]+'");return false\'>'+a[i]+'</a>';
 	}
 	return '<span class="task-tags">'+a.join(', ')+'</span>';
@@ -120,7 +120,7 @@ function submitNewTask(form)
 	if(form.task.value == '') return false;
 	var tz = -1 * (new Date()).getTimezoneOffset();
 	setAjaxErrorTrigger()
-	nocache = '&rnd='+Math.random();
+	var nocache = '&rnd='+Math.random();
 	$.post('ajax.php?newTask'+nocache, { list:curList.id, title: form.task.value, tz:tz, tag:filter.tag }, function(json){
 		resetAjaxErrorTrigger();
 		if(!parseInt(json.total)) return;
@@ -159,7 +159,7 @@ function flashError(str, details)
 
 function toggleMsgDetails()
 {
-	el = $("#msgdetails");
+	var el = $("#msgdetails");
 	if(!el) return;
 	if(el.css('display') == 'none') el.show();
 	else el.hide()
@@ -177,7 +177,7 @@ function deleteTask(id)
 		return false;
 	}
 	setAjaxErrorTrigger()
-	nocache = '&rnd='+Math.random();
+	var nocache = '&rnd='+Math.random();
 	$.getJSON('ajax.php?deleteTask='+id+nocache, function(json){
 		resetAjaxErrorTrigger();
 		if(!parseInt(json.total)) return;
@@ -194,7 +194,7 @@ function deleteTask(id)
 
 function completeTask(id,ch)
 {
-	compl = 0;
+	var compl = 0;
 	if(ch.checked) compl = 1;
 	setAjaxErrorTrigger();
 	$.getJSON('ajax.php?completeTask='+id+'&compl='+compl+nocache, function(json){
@@ -222,7 +222,7 @@ function completeTask(id,ch)
 
 function toggleTaskNote(id)
 {
-	aArea = '#tasknotearea'+id;
+	var aArea = '#tasknotearea'+id;
 	if($(aArea).css('display') == 'none')
 	{
 		$('#notetext'+id).val(taskList[id].noteText);
@@ -250,7 +250,7 @@ function cancelTaskNote(id)
 function saveTaskNote(id)
 {
 	setAjaxErrorTrigger()
-	nocache = '&rnd='+Math.random();
+	var nocache = '&rnd='+Math.random();
 	$.post('ajax.php?editNote='+id+nocache, {note: $('#notetext'+id).val()}, function(json){
 		resetAjaxErrorTrigger();
 		if(!parseInt(json.total)) return;
@@ -274,12 +274,12 @@ function editTask(id)
 	document.edittask.id.value = item.id;
 	document.edittask.tags.value = item.tags.split(',').join(', ');
 	document.edittask.duedate.value = item.duedate;
-	sel = document.edittask.prio;
-	for(i=0; i<sel.length; i++) {
+	var sel = document.edittask.prio;
+	for(var i=0; i<sel.length; i++) {
 		if(sel.options[i].value == item.prio) sel.options[i].selected = true;
 	}
 	$('<div id="overlay"></div>').appendTo('body').css('opacity', 0.5).show();
-	w = $('#page_taskedit');
+	var w = $('#page_taskedit');
 	if(!flag.windowTaskEditMoved)
 	{
 		var x,y;
@@ -319,7 +319,7 @@ function saveTask(form)
 {
 	if(flag.needAuth && !flag.isLogged && flag.canAllRead) return false;
 	setAjaxErrorTrigger();
-	nocache = '&rnd='+Math.random();
+	var nocache = '&rnd='+Math.random();
 	$.post('ajax.php?editTask='+form.id.value+nocache, { list:curList.id, title: form.task.value, note:form.note.value, prio:form.prio.value, tags:form.tags.value, duedate:form.duedate.value }, function(json){
 		resetAjaxErrorTrigger();
 		if(!parseInt(json.total)) return;
@@ -358,19 +358,19 @@ function orderChanged(event,ui)
 {
 	if(!ui.item[0]) return;
 	var itemId = ui.item[0].id;
-	n = $(this).sortable('toArray');
+	var n = $(this).sortable('toArray');
 	// remove possible empty id's
-	for(i=0; i<sortOrder.length; i++) {
+	for(var i=0; i<sortOrder.length; i++) {
 		if(sortOrder[i] == '') { sortOrder.splice(i,1); i--; }
 	}
 	if(n.toString() == sortOrder.toString()) return;
 	// make assoc from array for easy index
 	var h0 = new Array();
-	for(j=0; j<sortOrder.length; j++) {
+	for(var j=0; j<sortOrder.length; j++) {
 		h0[sortOrder[j]] = j;
 	}
 	var h1 = new Array();
-	for(j=0; j<n.length; j++) {
+	for(var j=0; j<n.length; j++) {
 		h1[n[j]] = j;
 		taskOrder[j] = n[j].split('_')[1];
 	}
@@ -378,18 +378,18 @@ function orderChanged(event,ui)
 	var s = '';
 	var diff;
 	var replaceOW = taskList[sortOrder[h1[itemId]].split('_')[1]].ow;
-	for(j in h0)
+	for(var j in h0)
 	{
 		diff = h1[j] - h0[j];
 		if(diff != 0) {
-			a = j.split('_');
+			var a = j.split('_');
 			if(j == itemId) diff = replaceOW - taskList[a[1]].ow;
 			s += a[1] +'='+ diff+ '&';
 			taskList[a[1]].ow += diff;
 		}
 	}
 	setAjaxErrorTrigger();
-	nocache = '&rnd='+Math.random();
+	var nocache = '&rnd='+Math.random();
 	$.post('ajax.php?changeOrder'+nocache, { order: s }, function(json){
 		resetAjaxErrorTrigger();
 	}, 'json');
@@ -460,7 +460,7 @@ function updateAccessStatus()
 function doAuth(form)
 {
 	setAjaxErrorTrigger();
-	nocache = '&rnd='+Math.random();
+	var nocache = '&rnd='+Math.random();
 	$.post('ajax.php?login'+nocache, { password: form.password.value }, function(json){
 		resetAjaxErrorTrigger();
 		form.password.value = '';
@@ -481,7 +481,7 @@ function doAuth(form)
 function logout()
 {
 	setAjaxErrorTrigger();
-	nocache = '&rnd='+Math.random();
+	var nocache = '&rnd='+Math.random();
 	$.getJSON('ajax.php?logout'+nocache, function(json){
 		resetAjaxErrorTrigger();
 	});
@@ -499,9 +499,9 @@ function logout()
 
 function tasklistClick(e)
 {
-	node = e.target.nodeName;
+	var node = e.target.nodeName;
 	if(node=='SPAN' || node=='LI' || node=='DIV') {
-		li = getRecursParent(e.target, 'LI', 10);
+		var li = getRecursParent(e.target, 'LI', 10);
 		if(li) {
 			if(selTask && li.id != selTask) $('#'+selTask).removeClass('clicked doubleclicked');
 			selTask = li.id;
@@ -536,10 +536,10 @@ function addFilterTag(tag)
 
 function showAuth(el)
 {
-	w = $('#authform');
+	var w = $('#authform');
 	if(w.css('display') == 'none')
 	{
-		offset = $(el).offset();
+		var offset = $(el).offset();
 		w.css({
 			position: 'absolute',
 			top: offset.top + el.offsetHeight + 3,
@@ -559,7 +559,7 @@ function prioPopup(act, el, id)
 		clearTimeout(objPrio.timer);
 		return;
 	}
-	offset = $(el).offset();
+	var offset = $(el).offset();
 	$('#priopopup').css({ position: 'absolute', top: offset.top + 1, left: offset.left + 1 });
 	objPrio.taskId = id;
 	objPrio.el = el;
@@ -571,7 +571,7 @@ function prioClick(prio, el)
 	el.blur();
 	prio = parseInt(prio);
 	setAjaxErrorTrigger();
-	nocache = '&rnd='+Math.random();
+	var nocache = '&rnd='+Math.random();
 	$.getJSON('ajax.php?setPrio='+objPrio.taskId+'&prio='+prio+nocache, function(json){
 		resetAjaxErrorTrigger();
 	});
@@ -584,10 +584,10 @@ function prioClick(prio, el)
 
 function showSort(el)
 {
-	w = $('#sortform');
+	var w = $('#sortform');
 	if(w.css('display') == 'none')
 	{
-		offset = $(el).offset();
+		var offset = $(el).offset();
 		w.css({ position: 'absolute', top: offset.top+el.offsetHeight-1, left: offset.left , 'min-width': $(el).width() }).show();
 		$(document).bind("click", sortClose);
 	}
@@ -609,7 +609,7 @@ function setSort(v, init)
 		else $("#tasklist").sortable('disable');
 		if(!init) {
 			changeTaskOrder();
-			exp = new Date();
+			var exp = new Date();
 			exp.setTime(exp.getTime() + 3650*86400*1000);	//+10 years
 			document.cookie = "sort="+sortBy+'; expires='+exp.toUTCString();
 		}
@@ -636,7 +636,7 @@ function changeTaskOrder(id)
 {
 	id = parseInt(id);
 	if(taskOrder.length < 2) return;
-	oldOrder = taskOrder.slice();
+	var oldOrder = taskOrder.slice();
 	if(sortBy == 0) taskOrder.sort( function(a,b){ 
 			if(taskList[a].compl != taskList[b].compl) return taskList[a].compl-taskList[b].compl;
 			return taskList[a].ow-taskList[b].ow
@@ -658,17 +658,17 @@ function changeTaskOrder(id)
 	if(id && taskList[id])
 	{
 		// optimization: determine where to insert task: top or after some task
-		indx = $.inArray(id,taskOrder);
+		var indx = $.inArray(id,taskOrder);
 		if(indx ==0) {
 			$('#tasklist').prepend($('#taskrow_'+id))
 		} else {
-			after = taskOrder[indx-1];
+			var after = taskOrder[indx-1];
 			$('#taskrow_'+after).after($('#taskrow_'+id));
 		}
 	}
 	else {
-		o = $('#tasklist');
-		for(i in taskOrder) {
+		var o = $('#tasklist');
+		for(var i in taskOrder) {
 			o.append($('#taskrow_'+taskOrder[i]));
 		}
 	}
@@ -693,19 +693,19 @@ function loadTags(callback)
 
 function showTagCloud(el)
 {
-	w = $('#tagcloud');
+	var w = $('#tagcloud');
 	if(w.css('display') == 'none')
 	{
 		if(flag.tagsChanged)
 		{
 			$('#tagcloudcontent').html('');
 			$('#tagcloudload').show();
-			offset = $(el).offset();
+			var offset = $(el).offset();
 			w.css({ position: 'absolute', top: offset.top+el.offsetHeight-1, left: offset.left }).show();
 			loadTags(function(){$('#tagcloudload').hide();});
 		}
 		else {
-			offset = $(el).offset();
+			var offset = $(el).offset();
 			w.css({ position: 'absolute', top: offset.top+el.offsetHeight-1, left: offset.left }).show();
 		}
 		$(document).bind("click", tagCloudClose);
@@ -727,9 +727,9 @@ function tagCloudClose(e)
 
 function preloadImg()
 {
-	for(i in img) {
-		for(ii in img[i]) {
-			o = new Image();
+	for(var i in img) {
+		for(var ii in img[i]) {
+			var o = new Image();
 			o.src = img[i][ii];
 		}
 	}
@@ -739,7 +739,7 @@ function changeTaskCnt(cl, dir)
 {
 	if(!dir) dir = 1;
 	else if(dir > 0) dir = 1;
-	else if(dir < 0) die = -1;
+	else if(dir < 0) dir = -1;
 	if(cl == 'soon') { taskCnt.soon += dir; return true; }
 	else if(cl == 'today') { taskCnt.today += dir; return true; }
 	else if(cl == 'past') { taskCnt.past+= dir; return true; }
@@ -754,10 +754,10 @@ function refreshTaskCnt()
 
 function showTaskview(el)
 {
-	w = $('#taskview');
+	var w = $('#taskview');
 	if(w.css('display') == 'none')
 	{
-		offset = $(el).offset();
+		var offset = $(el).offset();
 		w.css({ position: 'absolute', top: offset.top+el.offsetHeight-1, left: offset.left , 'min-width': $(el).width() }).show();
 		$(document).bind("click", taskviewClose);
 	}
@@ -823,7 +823,7 @@ function setTaskview(v, dontLoadTasks)
 
 function editFormResize(startstop, event)
 {
-	f = $('#page_taskedit');
+	var f = $('#page_taskedit');
 	if(startstop == 1) {
 		tmp.editformdiff = f.height() - $('#page_taskedit textarea').height();
 	}
@@ -862,7 +862,7 @@ function btnMenu(el)
 	if(!el.id) return;
 	oBtnMenu.container = el.id+'container';
 	oBtnMenu.targets = [el.id, oBtnMenu.container];
-	w = $('#'+oBtnMenu.container);
+	var w = $('#'+oBtnMenu.container);
 	if(w.css('display') == 'none')
 	{
 		oBtnMenu.h = [];
@@ -875,7 +875,7 @@ function btnMenu(el)
 				oBtnMenu.h[i] = null;
 			}
 		} );
-		offset = $(el).offset();
+		var offset = $(el).offset();
 		w.css({ position: 'absolute', top: offset.top+el.offsetHeight-1, left: offset.left , 'min-width': $(el).width() }).show();
 		$(document).bind("click", btnMenuClose);
 	}
@@ -910,7 +910,7 @@ function toggleNote(id)
 
 function toggleAllNotes(show)
 {
-	for(id in taskList)
+	for(var id in taskList)
 	{
 		if(taskList[id].note == '') continue;
 		if(show) {
@@ -933,7 +933,7 @@ function loadLists(onInit)
 		$('#searchbar').hide();
 	}
 	setAjaxErrorTrigger();
-	nocache = '&rnd='+Math.random();
+	var nocache = '&rnd='+Math.random();
 	$.getJSON('ajax.php?loadLists'+nocache, function(json){
 		resetAjaxErrorTrigger();
 		if(!parseInt(json.total)) {
@@ -959,7 +959,7 @@ function addList()
 	var r = prompt(lang.addList, lang.addListDefault);
 	if(r == null) return;
 	setAjaxErrorTrigger()
-	nocache = '&rnd='+Math.random();
+	var nocache = '&rnd='+Math.random();
 	$.post('ajax.php?'+nocache, { addList:1, name:r }, function(json){
 		resetAjaxErrorTrigger();
 		if(!parseInt(json.total)) return;
@@ -977,7 +977,7 @@ function renameCurList()
 	var r = prompt(lang.renameList, dehtml(curList.name));
 	if(r == null || r == '') return;
 	setAjaxErrorTrigger()
-	nocache = '&rnd='+Math.random();
+	var nocache = '&rnd='+Math.random();
 	$.post('ajax.php?'+nocache, { renameList:1, id:curList.id, name:r }, function(json){
 		resetAjaxErrorTrigger();
 		if(!parseInt(json.total)) return;

From 5340ddfeab0378b37c0847a488299f0259806998 Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Fri, 25 Sep 2009 16:42:50 +0400
Subject: [PATCH 16/17] * img.mtt-toggle converted to div.mtt-toggle

---
 src/ajax.js   | 19 +++++++++----------
 src/style.css | 13 ++-----------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 4a92b26..3a09291 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -17,8 +17,7 @@ var tz = 0;
 var img = {
 	'note': ['images/page_white_text_add_bw.png','images/page_white_text_add.png'],
 	'edit': ['images/page_white_edit_bw.png','images/page_white_edit.png'],
-	'del': ['images/page_cross_bw.png','images/page_cross.png'],
-	'toggle': ['images/toggle_plus.gif','images/toggle_minus.gif']
+	'del': ['images/page_cross_bw.png','images/page_cross.png']
 };
 var taskCnt = { total:0, past: 0, today:0, soon:0 };
 var tmp = {};
@@ -68,7 +67,7 @@ function prepareTaskStr(item)
 		'<a href="#" onClick="return toggleTaskNote('+id+')"><img src="'+img.note[0]+'" onMouseOver="this.src=img.note[1]" onMouseOut="this.src=img.note[0]" title="'+lang.actionNote+'"></a>'+
 		'<a href="#" onClick="return editTask('+id+')"><img src="'+img.edit[0]+'" onMouseOver="this.src=img.edit[1]" onMouseOut="this.src=img.edit[0]" title="'+lang.actionEdit+'"></a>'+
 		'<a href="#" onClick="return deleteTask('+id+')"><img src="'+img.del[0]+'" onMouseOver="this.src=img.del[1]" onMouseOut="this.src=img.del[0]" title="'+lang.actionDelete+'"></a></div>'+
-		'<div class="task-left"><img src="'+img.toggle[0]+'" class="mtt-toggle '+(item.note==''?'invisible':'')+'" onClick="toggleNote('+id+')">'+
+		'<div class="task-left"><div class="mtt-toggle '+(item.note==''?'invisible':'')+'" 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>'+
@@ -229,7 +228,7 @@ function toggleTaskNote(id)
 		$('#taskrow_'+id+'>div>div.task-note-block').removeClass('hidden');
 		$(aArea).css('display', 'block');
 		$('#tasknote'+id).css('display', 'none');
-		if(taskList[id].note != '') $('#taskrow_'+id+'>div>.mtt-toggle').attr('src', img.toggle[1]);
+		if(taskList[id].note != '') $('#taskrow_'+id+' .mtt-toggle').addClass('mtt-toggle-expanded');
 		$('#notetext'+id).focus();
 	} else {
 		cancelTaskNote(id)
@@ -258,8 +257,8 @@ function saveTaskNote(id)
 		taskList[id].note = item.note;
 		taskList[id].noteText = item.noteText;
 		$('#tasknote'+item.id+'>span').html(prepareHtml(item.note));
-		if(item.note == '') $('#taskrow_'+id+'>div>.mtt-toggle').attr('src', img.toggle[0]).addClass('invisible');
-		else $('#taskrow_'+id+'>div>.mtt-toggle').attr('src', img.toggle[1]).removeClass('invisible');
+		if(item.note == '') $('#taskrow_'+id+' .mtt-toggle').removeClass('mtt-toggle-expanded').addClass('invisible');
+		else $('#taskrow_'+id+' .mtt-toggle').addClass('mtt-toggle-expanded').removeClass('invisible');
 		cancelTaskNote(item.id);
 	}, 'json');
 	return false;
@@ -903,8 +902,8 @@ function btnMenuClose(e)
 function toggleNote(id)
 {
 	var o = $('#taskrow_'+id+'>div>div.task-note-block');
-	if(o.is('.hidden')) $('#taskrow_'+id+'>div>.mtt-toggle').attr('src', img.toggle[1]);
-	else $('#taskrow_'+id+'>div>.mtt-toggle').attr('src', img.toggle[0]);
+	if(o.is('.hidden')) $('#taskrow_'+id+' .mtt-toggle').addClass('mtt-toggle-expanded');
+	else $('#taskrow_'+id+' .mtt-toggle').removeClass('mtt-toggle-expanded');
 	o.toggleClass('hidden');
 }
 
@@ -914,11 +913,11 @@ function toggleAllNotes(show)
 	{
 		if(taskList[id].note == '') continue;
 		if(show) {
-			$('#taskrow_'+id+'>div>.mtt-toggle').attr('src', img.toggle[1]);
+			$('#taskrow_'+id+' .mtt-toggle').addClass('mtt-toggle-expanded');
 			$('#taskrow_'+id+'>div>div.task-note-block').removeClass('hidden');
 		}
 		else {
-			$('#taskrow_'+id+'>div>.mtt-toggle').attr('src', img.toggle[0]);
+			$('#taskrow_'+id+' .mtt-toggle').removeClass('mtt-toggle-expanded');
 			$('#taskrow_'+id+'>div>div.task-note-block').addClass('hidden');
 		}
 	}
diff --git a/src/style.css b/src/style.css
index 497cf71..dd5f83d 100644
--- a/src/style.css
+++ b/src/style.css
@@ -23,16 +23,6 @@ a { color:#0000ff; }
 #authform div { padding:2px 0px; }
 #authform div.h { font-weight:bold; }
 
-/*
-.tabs ul { list-style: none; padding:0; margin:0; }
-.tabs ul li { margin:0; font-size: 9pt; font-weight:bold; float: left; width:90px; text-align:center; margin-right: 6px; }
-.tabs ul a { margin:0px;  text-decoration: none; color:#444444; display: block; height:24px; width: 100%; padding-top: 4px; outline:none; }
-.tabs ul li.ui-tabs-selected { background-color: #ededed; }
-.tabs ul li.ui-state-hover a { color: #888888; }
-.ui-tabs .ui-tabs-hide { display: none; }
-.tabs ul li.ui-state-disabled a { color: #cccccc; }
-*/
-
 .mtt-tabs ul { list-style: none; padding:0; margin:0; }
 .mtt-tabs ul li { margin:0; font-size: 9pt; font-weight:bold; float: left; width:90px; text-align:center; margin-right: 6px; }
 .mtt-tabs ul a { margin:0px;  text-decoration: none; color:#444444; display: block; height:24px; width: 100%; padding-top: 4px; outline:none; }
@@ -60,7 +50,8 @@ a { color:#0000ff; }
 .mtt-notes-showhide { font-size:8pt; font-weight:normal; margin-left:5px; }
 
 .task-left { float:left; }
-.task-left .mtt-toggle { cursor:pointer; }
+.task-left .mtt-toggle { margin-top:2px; cursor:pointer; width:15px; height:15px; float:left; background:url(images/toggle_plus.gif) left top no-repeat; }
+.task-left .mtt-toggle.mtt-toggle-expanded { background-image:url(images/toggle_minus.gif); }
 .task-middle { margin-left:40px; margin-right:65px; }
 #tasklist { list-style-type: none; margin: 0; padding: 0;}
 #tasklist li { padding:6px 2px 6px 6px; border-bottom:1px solid #DEDEDE; min-height:18px; margin-bottom:1px; background-color:#fff; }

From d0c25e2484a4550b4c11091e7ae66e590f3de90b Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Sat, 26 Sep 2009 16:03:51 +0400
Subject: [PATCH 17/17] * opacity for completed tasks: fixed and decreased

---
 src/style.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/style.css b/src/style.css
index dd5f83d..442e282 100644
--- a/src/style.css
+++ b/src/style.css
@@ -74,7 +74,8 @@ li.task-completed span.task-through { text-decoration:line-through; color:#77777
 li.task-completed .task-title a { color:#777777; }
 li.task-completed .task-actions a { color:#7070ff; }
 #tasklist li.task-completed .duedate { color:#777777; border-color:#777777; }
-li.task-completed  { opacity:0.7; }
+li.task-completed  { opacity:0.8; }
+li.task-completed .mtt-toggle { opacity:0.8; }
 
 #tasklist.filter-past li, #tasklist.filter-today li, #tasklist.filter-soon li { display:none; }
 #tasklist.filter-past li.past, #tasklist.filter-today li.today, #tasklist.filter-soon li.soon { display:block; }