From 69c6e128b22ad09fc0f363d3cf7e60b6bb28ea1e Mon Sep 17 00:00:00 2001 From: Max Pozdeev Date: Sun, 20 Sep 2009 14:17:48 +0400 Subject: [PATCH] * 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(/"/g,'"').replace(/</g,'<').replace(/>/g,'>').replace(/&/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();} );
-
- - My lists | - Settings | - -   +
+ + My lists | + Settings + + + + +   +
@@ -111,28 +115,18 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
-
    -
    +
      +
      +
      +  | +       - - - New task -
      - -  | Search       - -
      + +

      (0)   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; }