diff --git a/src/lang/class.default.php b/src/lang/class.default.php
index 2c2e862..e7b5ccf 100644
--- a/src/lang/class.default.php
+++ b/src/lang/class.default.php
@@ -18,7 +18,6 @@ class DefaultLang
'error' => "Some error occurred (click for details)",
'denied' => "Access denied",
'invalidpass' => "Wrong password",
- 'tagfilter' => "Tag:",
'addList' => "Create new list",
'addListDefault' => "Todo",
'renameList' => "Rename list",
diff --git a/src/lang/en.php b/src/lang/en.php
index d840aae..604dc57 100644
--- a/src/lang/en.php
+++ b/src/lang/en.php
@@ -21,7 +21,6 @@ class Lang extends DefaultLang
'error' => "Some error occurred (click for details)",
'denied' => "Access denied",
'invalidpass' => "Wrong password",
- 'tagfilter' => "Tag:",
'addList' => "Create new list",
'renameList' => "Rename list",
'deleteList' => "This will delete current list with all tasks in it.\\nAre you sure?",
diff --git a/src/lang/ru.php b/src/lang/ru.php
index 92fe399..888b949 100644
--- a/src/lang/ru.php
+++ b/src/lang/ru.php
@@ -21,7 +21,6 @@ class Lang extends DefaultLang
'error' => 'Ошибка',
'denied' => 'Доступ запрещен',
'invalidpass' => 'Неверный пароль',
- 'tagfilter' => 'Тег:',
'addList' => 'Новый список',
'renameList' => 'Переименовать список',
'deleteList' => 'Вы действительно хотите удалить этот список со всеми задачами?',
diff --git a/src/mytinytodo.js b/src/mytinytodo.js
index fea0f3c..4c86dbe 100644
--- a/src/mytinytodo.js
+++ b/src/mytinytodo.js
@@ -188,9 +188,13 @@ var mytinytodo = window.mytinytodo = _mtt = {
_mtt.menus.taskview.show(this);
});
- $('#mtt_filters').on('click', '.tag-filter .mtt-filter-close', function(){
+ $('#mtt-tag-filters').on('click', '.tag-filter .mtt-filter-close', function(){
cancelTagFilter($(this).attr('tagid'));
});
+
+ $('#mtt-tag-toolbar-close').click(function(){
+ cancelTagFilter(0);
+ });
$('#tagcloudbtn').click(function(){
if(!_mtt.menus.tagcloud) _mtt.menus.tagcloud = new mttMenu('tagcloud', {
@@ -682,7 +686,8 @@ var mytinytodo = window.mytinytodo = _mtt = {
_filters: [],
clear: function() {
this._filters = [];
- $('#mtt_filters').html('');
+ $('#mtt-tag-toolbar').hide();
+ $('#mtt-tag-filters').html('');
},
addTag: function(tagId, tag, exclude)
{
@@ -690,9 +695,9 @@ var mytinytodo = window.mytinytodo = _mtt = {
if(this._filters[i].tagId && this._filters[i].tagId == tagId) return false;
}
this._filters.push({tagId:tagId, tag:tag, exclude:exclude});
- $('#mtt_filters').append(''+tag+'');
+ $('#mtt-tag-filters').append(''+tag+'');
+ $('#mtt-tag-toolbar').show();
return true;
},
cancelTag: function(tagId)
@@ -700,7 +705,10 @@ var mytinytodo = window.mytinytodo = _mtt = {
for(var i in this._filters) {
if(this._filters[i].tagId && this._filters[i].tagId == tagId) {
this._filters.splice(i,1);
- $('#mtt_filters .tag-filter.tag-id-'+tagId).remove();
+ $('#mtt-tag-filters .tag-filter.tag-id-'+tagId).remove();
+ if (this._filters.length == 0) {
+ $('#mtt-tag-toolbar').hide();
+ }
return true;
}
}
diff --git a/src/themes/default/images/tagcloud-close.svg b/src/themes/default/images/close.svg
similarity index 100%
rename from src/themes/default/images/tagcloud-close.svg
rename to src/themes/default/images/close.svg
diff --git a/src/themes/default/images/closetag.svg b/src/themes/default/images/closetag.svg
index 7777551..f7e7bd2 100644
--- a/src/themes/default/images/closetag.svg
+++ b/src/themes/default/images/closetag.svg
@@ -1,6 +1,6 @@
-