diff --git a/src/lang/class.default.php b/src/lang/class.default.php index 83db4e0..3debe89 100644 --- a/src/lang/class.default.php +++ b/src/lang/class.default.php @@ -83,6 +83,7 @@ class DefaultLang 'list_publish' => "Publish list", 'list_showcompleted' => "Show completed tasks", 'list_clearcompleted' => "Clear completed tasks", + 'list_select' => "Select list", 'alltags' => "All tags:", 'alltags_show' => "Show all", 'alltags_hide' => "Hide all", diff --git a/src/lang/en.php b/src/lang/en.php index dc71120..516cae4 100644 --- a/src/lang/en.php +++ b/src/lang/en.php @@ -85,6 +85,7 @@ class Lang extends DefaultLang 'list_publish' => "Publish list", 'list_showcompleted' => "Show completed tasks", 'list_clearcompleted' => "Clear completed tasks", + 'list_select' => "Select list", 'alltags' => "All tags:", 'alltags_show' => "Show all", 'alltags_hide' => "Hide all", diff --git a/src/mytinytodo.js b/src/mytinytodo.js index c65192e..2f48069 100644 --- a/src/mytinytodo.js +++ b/src/mytinytodo.js @@ -12,7 +12,7 @@ var sortOrder; //save task order before dragging var searchTimer; var objPrio = {}; var selTask = 0; -var flag = { needAuth:false, isLogged:false, tagsChanged:true, windowTaskEditMoved:false, autoTag:true }; +var flag = { needAuth:false, isLogged:false, tagsChanged:true, windowTaskEditMoved:false }; var taskCnt = { total:0, past: 0, today:0, soon:0 }; var tmp = {}; var cmenu; @@ -114,6 +114,7 @@ var mytinytodo = window.mytinytodo = _mtt = { $('#search_close').click(function(){ addsearchToggle(0); + return false; }); $('#search').keyup(timerSearch); diff --git a/src/themes/default/images/bullet_plus.png b/src/themes/default/images/bullet_plus.png deleted file mode 100644 index fb47633..0000000 Binary files a/src/themes/default/images/bullet_plus.png and /dev/null differ diff --git a/src/themes/default/images/magnifier.png b/src/themes/default/images/magnifier.png new file mode 100644 index 0000000..cf3d97f Binary files /dev/null and b/src/themes/default/images/magnifier.png differ diff --git a/src/themes/default/images/page_white_edit.png b/src/themes/default/images/page_white_edit.png deleted file mode 100644 index b93e776..0000000 Binary files a/src/themes/default/images/page_white_edit.png and /dev/null differ diff --git a/src/themes/default/images/page_white_edit_bw.png b/src/themes/default/images/page_white_edit_bw.png deleted file mode 100644 index d427f0e..0000000 Binary files a/src/themes/default/images/page_white_edit_bw.png and /dev/null differ diff --git a/src/themes/default/index.php b/src/themes/default/index.php index 515403f..3f47058 100644 --- a/src/themes/default/index.php +++ b/src/themes/default/index.php @@ -1,21 +1,7 @@ -'; -?> - + <?php mttinfo('title'); ?> @@ -45,51 +31,15 @@ $().ready(function(){ mytinytodo.templateUrl = ""; mytinytodo.db = new mytinytodoStorageAjax(mytinytodo); mytinytodo.init({ + needAuth: , + isLogged: , showdate: , singletab: , - needAuth: , - isLogged: - + duedateformat: , + autotag: + }, lang).loadLists(1); }); - -/* -$().ready(function(){ - mytinytodo.mttUrl = ""; - $("#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, extraParams:{list:function(){return curList.id}}}); - $("#priopopup").mouseleave(function(){$(this).hide()}); - - $("#duedate").datepicker({dateFormat: '', firstDay: , - showOn: 'button', buttonImage: 'images/calendar.png', buttonImageOnly: true, changeMonth:true, - changeYear:true, constrainInput: false, duration:'', nextText:'>', prevText:'<', dayNamesMin:lang.daysMin, - dayNames:lang.daysLong, monthNamesShort:lang.monthsLong }); - - $("#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:220, start:function(ui,e){editFormResize(1)}, resize:function(ui,e){editFormResize(0,e)}, stop:function(ui,e){editFormResize(2,e)} }); - - flag.pda = true; - - - mytinytodo.addAction('listsLoaded', tplSingleTabLoaded); - mytinytodo.addAction('listRenamed', tplSingleTabRenamed); - mytinytodo.addAction('listAdded', tplSingleTabAdded); - - - $("#lists ul").sortable({delay:150, update:listOrderChanged}); - -}); -*/
@@ -121,9 +71,50 @@ $().ready(function(){
-
+ + +
+
+
+
+
+
+ + +
+ + +
+ + + +
+ + +
+
+ + + + +
+ +

(0) @@ -268,6 +260,11 @@ $().ready(function(){

+ + diff --git a/src/themes/default/style.css b/src/themes/default/style.css index ff707ee..1bad13b 100644 --- a/src/themes/default/style.css +++ b/src/themes/default/style.css @@ -33,6 +33,7 @@ a { color:#0000ff; cursor:pointer; text-decoration:underline; } #authform { overflow: hidden; z-index:100; background-color:#f9f9f9; border:1px solid #cccccc; padding:5px; width:160px; } #authform div { padding:2px 0px; } #authform div.h { font-weight:bold; } +#loading { float:left; padding-top:5px; background-color:#ffffff; display:none; padding-right:6px; width:16px; height:16px; background:url(images/loading1.gif) no-repeat; } #msg { float:left; } #msg .msg-text { padding:1px 4px; font-weight:bold; cursor:pointer; } @@ -57,13 +58,44 @@ a { color:#0000ff; cursor:pointer; text-decoration:underline; } #page_tasks.readonly .list-action { display:none; } #page_tasks.readonly li.mtt-tabs-selected span { margin-right:0; } -.mtt-tabs-add-button { float:left; margin-top:1px; padding:6px 2px 0px 2px; font-size:9pt; width:16px; border-left:1px solid #ededed; background:#fbfbfb url(images/tab_hover.gif) no-repeat top right; } -.mtt-tabs-add-button:hover { cursor:pointer; } -.mtt-tabs-add-button span { display:block; height:21px; background:url(images/bullet_plus.png) 0 0 no-repeat; } -.mtt-tabs-add-button:hover span { background-position:-16px 0; } -#page_tasks.readonly .mtt-tabs-add-button { display:none; } +#tabs_buttons { + float:right; + padding-top:4px; + padding-bottom:3px; + padding-left:2px; + padding-right:2px; + border:1px solid #ededed; + border-bottom:none; + -moz-border-radius-topleft:5px; -webkit-border-radius-topleft:5px; + -moz-border-radius-topright:5px; -webkit-border-radius-topright:5px; +} -.mtt-htabs { clear:both; padding:8px; border-bottom:2px solid #DEDEDE; background:url(images/corner_right.gif) no-repeat top right #ededed; } +.mtt-tabs-button { + float:left; + font-size:9pt; + cursor:pointer; + padding:1px; /* makes button bigger */ + border:1px solid transparent; /* preallocate space for :hover border */ +} + +.mtt-tabs-button span { + display:block; + width:16px; + height:16px; +} + +.mtt-tabs-button:hover, .mtt-tabs-button.mtt-menu-button-active { + border:1px solid #ccc; -moz-border-radius:3px; -webkit-border-radius:3px; +} + +.mtt-tabs-add-button>span { background:url(images/buttons.png) 0 0 no-repeat; } +.mtt-tabs-add-button:hover>span { background-position:-16px 0; } +.mtt-tabs-search-button>span { background:url(images/buttons.png) 0 -16px no-repeat; } +.mtt-tabs-search-button:hover>span { background-position:-16px -16px; } +.mtt-tabs-select-button>span { background:url(images/icons.gif) -64px 0 no-repeat; } +.mtt-tabs-select-button:hover>span, .mtt-tabs-select-button.mtt-menu-button-active>span { background-position:-80px 0; } + +.mtt-htabs { clear:both; padding:8px; border-bottom:2px solid #DEDEDE; background:#ededed; } .mtt-img-button { width:16px; height:16px; padding:2px; border:1px solid transparent; } .mtt-img-button:hover { border:1px solid #ccc; -moz-border-radius:3px; -webkit-border-radius:3px; } @@ -71,17 +103,27 @@ a { color:#0000ff; cursor:pointer; text-decoration:underline; } #newtask_adv span { position:relative; top:3px; background:url(images/buttons.png) 0 -48px no-repeat; } #newtask_adv:hover span { background-position:-16px -48px; } +#search_close { float:right; margin-left:2px; position:relative; top:1px;} +#search_close span { background:url(images/buttons.png) 0 -32px no-repeat; } +#search_close:hover span { background-position:-16px -32px; } #rss_icon { float:right;margin-top:4px; } #rss_icon img { border:none; } .arrdown { display:inline-block; height:7px; width:9px; background:url(images/arrdown.gif); } .arrdown2 { display:inline-block; height:7px; width:7px; background:url(images/arrdown2.gif); } -#page_tasks.readonly #htab_search a.htab-toggle { color:#444; } +#task { color:#444444; width:100%; max-width:350px; } +#newtask_form table { max-width:400px; } +#newtask_form .flex-cell-companion { padding-left:2px; } +#search_form table { max-width:350px; } +#search_form .flex-cell-companion { padding-left:2px; } -#htab_newtask a>img { border:none; vertical-align:text-top; } -#loading { float:left; padding-top:5px; background-color:#ffffff; display:none; padding-right:6px; width:16px; height:16px; background:url(images/loading1.gif) no-repeat; } -#task, #search { color:#444444; width:300px; } +#search { color:#444444; width:100%; max-width:300px; + background:#fff url(images/magnifier.png) no-repeat 2px 2px; + text-indent:18px; + border:1px inset #f0f0f0; + padding:2px; +} .small-bar{ font-size:8pt; color:#999999; font-weight:normal;} #searchbar { font-size:10pt; font-weight:normal; display:none; margin-top:5px; } #searchbarkeyword { font-weight:bold; } @@ -259,6 +301,9 @@ li.mtt-menu-indicator .submenu-icon { width:16px; height:16px; background:url(images/icons.gif) -32px -16px no-repeat; } +.flex-cell { width:99%; /*padding-left:3px;*/ padding-right:6px; white-space:nowrap; } +.flex-cell-companion { width:1%; white-space:nowrap; } + .mtt-settings-table { width:100%; border-collapse:collapse; } .mtt-settings-table th, .mtt-settings-table td { border-bottom:1px solid #dedede; padding:8px; vertical-align:top; } .mtt-settings-table .form-buttons { border-bottom:none; text-align:center; }