diff --git a/src/ajax.js b/src/ajax.js index 1b9cff7..b4a0e87 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -810,10 +810,10 @@ function editFormResize(startstop, event) else $('#page_taskedit textarea').height(f.height() - tmp.editformdiff); } -function mttTabSelected(el, indx) +function mttTabSelected(id, indx) { - $(el.parentNode.parentNode).children('.mtt-tabs-selected').removeClass('mtt-tabs-selected'); - $(el.parentNode).addClass('mtt-tabs-selected'); + $('#lists .mtt-tabs-selected').removeClass('mtt-tabs-selected'); + $('#lists li.list-id-'+tabLists[indx].id).addClass('mtt-tabs-selected'); if(!tabLists[indx]) return; if(indx != curList.i) { $('#tasklist').html(''); @@ -843,7 +843,7 @@ function btnMenu(el) if(w.css('display') == 'none') { oBtnMenu.h = []; - $(w).find('li').each( function(i,o){ + $(w).find('li').each( function(i,o){ if(o.onclick) { oBtnMenu.h[i] = o.onclick; $(o).bind("click2", o.onclick); @@ -853,7 +853,7 @@ function btnMenu(el) } } ); var offset = $(el).offset(); - w.css({ position: 'absolute', top: offset.top+el.offsetHeight-1, left: offset.left , 'min-width': $(el).width() }).show(); + w.css({ position: 'absolute', top: offset.top+el.offsetHeight-1, left: offset.left , 'min-width': $(el).width(), 'width':w.width() }).show(); $(document).bind("click", btnMenuClose); } else { @@ -910,7 +910,7 @@ function loadLists(onInit, updAccess) $.each(json.list, function(i,item){ item.i = i; tabLists[i] = item; - ti += '
  • '+item.name+'
  • '; + ti += '
  • '+item.name+'
  • '; }); if(!curList) { $('#toolbar').children().removeClass('invisible'); @@ -935,8 +935,8 @@ function loadLists(onInit, updAccess) ti += ''; $('#lists>ul').html(ti); $('#lists').show(); - if(!flag.needAuth || flag.isLogged || curList) $('#page_tasks').show(); mytinytodo.doAction('listsLoaded'); + if(!flag.needAuth || flag.isLogged || curList) $('#page_tasks').show(); }); $('#page_tasks').hide(); if(updAccess) updateAccessStatus(); @@ -956,7 +956,7 @@ function addList() item.i = i; tabLists[i] = item; if(i > 0) { - $('#lists>ul>li.mtt-tabs-button').before('
  • '+item.name+'
  • ') ; + $('#lists>ul>li.mtt-tabs-button').before('
  • '+item.name+'
  • ') ; mytinytodo.doAction('listAdded', {i:i, list:item}); } else loadLists(); @@ -1315,3 +1315,30 @@ function moveTaskToList(taskId, listId) $("#edittags").flushCache(); flag.tagsChanged = true; } + +function cmenuListsLoaded(opts) +{ + if(cmenu) cmenu.destroy(); + cmenu = null; + var s = ''; + for(var i in tabLists) { + s += '
  • '+tabLists[i].name+'
  • '; + } + $('#listsmenucontainer ul').html(s); +} + +function cmenuListAdded(opts) +{ + if(cmenu) cmenu.destroy(); + cmenu = null; + $('#listsmenucontainer ul').append('
  • '+opts.list.name+'
  • '); +} + +function cmenuListRenamed(opts) +{ + $('#cmenu_list\\:'+opts.list.id).text(opts.list.name); +} + +mytinytodo.addAction('listsLoaded', cmenuListsLoaded); +mytinytodo.addAction('listAdded', cmenuListAdded); +mytinytodo.addAction('listRenamed', cmenuListRenamed); \ No newline at end of file diff --git a/src/lang/en.php b/src/lang/en.php index fa56584..5305e0b 100644 --- a/src/lang/en.php +++ b/src/lang/en.php @@ -3,7 +3,7 @@ /* myTinyTodo language pack Language: English - Translated: English + Original name: English Author: Max Pozdeev Author Url: http://www.mytinytodo.net AppVersion: v1.3.2 diff --git a/src/themes/default/functions.js b/src/themes/default/functions.js index e48fbee..d2d4a25 100644 --- a/src/themes/default/functions.js +++ b/src/themes/default/functions.js @@ -1,29 +1,34 @@ /* Default template */ -mytinytodo.addAction('listsLoaded', listsLoaded); -mytinytodo.addAction('listAdded', listAdded); -mytinytodo.addAction('listRenamed', listRenamed); - -function listsLoaded(opts) +function tplSingleTabLoaded() { - if(cmenu) cmenu.destroy(); - cmenu = null; - - var s = ''; - for(var i in tabLists) { - s += '
  • '+tabLists[i].name+'
  • '; + var $lc = $('#mylistscontainer'); + if($lc.find('.mtt-btnmenu-delimiter').length == 0) { + $lc.find('ul').append('
  • '); + } else { + $lc.find('.list-ref').remove(); } - $('#listsmenucontainer ul').html(s); + var ti = ''; + for(var i in tabLists) { + ti += '
  • '+tabLists[i].name+'
  • '; + } + $lc.find('.mtt-btnmenu-delimiter').after(ti); } -function listAdded(opts) +function tplSingleTabRenamed(opts) { - if(cmenu) cmenu.destroy(); - cmenu = null; - $('#listsmenucontainer ul').append('
  • '+opts.list.name+'
  • '); + $('#mylistscontainer li.list-id-'+opts.list.id).find('a').html(opts.list.name); } -function listRenamed(opts) +function tplSingleTabAdded(opts) { - $('#cmenu_list\\:'+opts.list.id).text(opts.list.name); + $('#mylistscontainer ul').append('
  • '+opts.list.name+'
  • '); +} + +function tplTabMenuSelect(id, indx) +{ + mttTabSelected(id, indx); + $('#mylistscontainer li.list-ref').removeClass('mtt-item-checked'); + $('#mylistscontainer li.list-id-'+id).addClass('mtt-item-checked'); + return false; } \ No newline at end of file diff --git a/src/themes/default/index.php b/src/themes/default/index.php index c5ec411..887de6f 100644 --- a/src/themes/default/index.php +++ b/src/themes/default/index.php @@ -60,6 +60,11 @@ $().ready(function(){ flag.pda = true; + + mytinytodo.addAction('listsLoaded', tplSingleTabLoaded); + mytinytodo.addAction('listRenamed', tplSingleTabRenamed); + mytinytodo.addAction('listAdded', tplSingleTabAdded); + }); $().ajaxSend( function(r,s) {$("#loading").show();} ); @@ -94,7 +99,7 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );