prehistoric-systems/mytinytodo
1
0
Fork 0
mirror of https://github.com/maxpozdeev/mytinytodo.git synced 2026-03-11 08:55:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* newtask/search toggle updated

Browse source 
* updateAccessStatus() updated
This commit is contained in:
Max Pozdeev 2009-09-20 14:17:48 +04:00
parent dffde5e9bb
commit 69c6e128b2
5 changed files with 80 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
src/ajax.js
View file

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

48
src/index.php
View file

@ -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>

4
src/lang/class.default.php
View file

@ -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",

4
src/lang/en.php
View file

@ -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",

6
src/style.css
View file

@ -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; }