Mercurial > kallithea
changeset 3665:690a955ba785 beta
use placeholders in qfilter, not the ugly JS logic
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Thu, 04 Apr 2013 13:18:24 +0200 |
parents | b10976229890 |
children | fda60c2ad65f |
files | rhodecode/public/js/rhodecode.js rhodecode/templates/admin/repos/repos.html rhodecode/templates/admin/users/user_edit_my_account.html rhodecode/templates/admin/users/users.html rhodecode/templates/bookmarks/bookmarks.html rhodecode/templates/branches/branches.html rhodecode/templates/index_base.html rhodecode/templates/journal/journal.html rhodecode/templates/repo_switcher_list.html rhodecode/templates/tags/tags.html |
diffstat | 10 files changed, 10 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/public/js/rhodecode.js Thu Apr 04 02:35:32 2013 +0200 +++ b/rhodecode/public/js/rhodecode.js Thu Apr 04 13:18:24 2013 +0200 @@ -699,10 +699,6 @@ var q_filter_field = YUD.get(target); var F = YAHOO.namespace(target); - YUE.on(q_filter_field,'click',function(){ - q_filter_field.value = ''; - }); - YUE.on(q_filter_field,'keyup',function(e){ clearTimeout(F.filterTimeout); F.filterTimeout = setTimeout(F.updateFilter,600);
--- a/rhodecode/templates/admin/repos/repos.html Thu Apr 04 02:35:32 2013 +0200 +++ b/rhodecode/templates/admin/repos/repos.html Thu Apr 04 13:18:24 2013 +0200 @@ -6,7 +6,7 @@ </%def> <%def name="breadcrumbs_links()"> - <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/> ${h.link_to(_('Admin'),h.url('admin_home'))} » <span id="repo_count">0</span> ${_('repositories')} + <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/> ${h.link_to(_('Admin'),h.url('admin_home'))} » <span id="repo_count">0</span> ${_('repositories')} </%def> <%def name="page_nav()"> ${self.menu('admin')} @@ -127,7 +127,6 @@ }; YUE.on('q_filter','click',function(){ if(!YUD.hasClass('q_filter', 'loaded')){ - YUD.get('q_filter').value = ''; //TODO: load here full list later to do search within groups YUD.addClass('q_filter', 'loaded'); }
--- a/rhodecode/templates/admin/users/user_edit_my_account.html Thu Apr 04 02:35:32 2013 +0200 +++ b/rhodecode/templates/admin/users/user_edit_my_account.html Thu Apr 04 13:18:24 2013 +0200 @@ -28,7 +28,7 @@ <!-- box / title --> <div class="title"> <h5> - <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}" style="display: none"/> + <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value="" style="display: none"/> </h5> <ul class="links" style="color:#DADADA"> <li> @@ -268,7 +268,6 @@ }; YUE.on('q_filter','click',function(){ if(!YUD.hasClass('q_filter', 'loaded')){ - YUD.get('q_filter').value = ''; //TODO: load here full list later to do search within groups YUD.addClass('q_filter', 'loaded'); }
--- a/rhodecode/templates/admin/users/users.html Thu Apr 04 02:35:32 2013 +0200 +++ b/rhodecode/templates/admin/users/users.html Thu Apr 04 13:18:24 2013 +0200 @@ -6,7 +6,7 @@ </%def> <%def name="breadcrumbs_links()"> - <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/> ${h.link_to(_('Admin'),h.url('admin_home'))} » <span id="user_count">0</span> ${_('users')} + <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/> ${h.link_to(_('Admin'),h.url('admin_home'))} » <span id="user_count">0</span> ${_('users')} </%def> <%def name="page_nav()"> @@ -134,9 +134,6 @@ }); }; - YUE.on('q_filter','click',function(){ - YUD.get('q_filter').value = ''; - }); YUE.on('q_filter','keyup',function (e) { clearTimeout(filterTimeout);
--- a/rhodecode/templates/bookmarks/bookmarks.html Thu Apr 04 02:35:32 2013 +0200 +++ b/rhodecode/templates/bookmarks/bookmarks.html Thu Apr 04 13:18:24 2013 +0200 @@ -6,7 +6,7 @@ </%def> <%def name="breadcrumbs_links()"> - <input class="q_filter_box" id="q_filter_bookmarks" size="15" type="text" name="filter" value="${_('quick filter...')}"/> + <input class="q_filter_box" id="q_filter_bookmarks" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/> ${_('Bookmarks')} </%def>
--- a/rhodecode/templates/branches/branches.html Thu Apr 04 02:35:32 2013 +0200 +++ b/rhodecode/templates/branches/branches.html Thu Apr 04 13:18:24 2013 +0200 @@ -6,7 +6,7 @@ </%def> <%def name="breadcrumbs_links()"> - <input class="q_filter_box" id="q_filter_branches" size="15" type="text" name="filter" value="${_('quick filter...')}"/> + <input class="q_filter_box" id="q_filter_branches" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/> ${_('Branches')} </%def>
--- a/rhodecode/templates/index_base.html Thu Apr 04 02:35:32 2013 +0200 +++ b/rhodecode/templates/index_base.html Thu Apr 04 13:18:24 2013 +0200 @@ -3,7 +3,7 @@ <!-- box / title --> <div class="title"> <h5> - <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/> ${parent.breadcrumbs()} <span id="repo_count">0</span> ${_('repositories')} + <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/> ${parent.breadcrumbs()} <span id="repo_count">0</span> ${_('repositories')} </h5> %if c.rhodecode_user.username != 'default': <ul class="links"> @@ -326,7 +326,6 @@ }; YUE.on('q_filter','click',function(){ if(!YUD.hasClass('q_filter', 'loaded')){ - YUD.get('q_filter').value = ''; //TODO: load here full list later to do search within groups YUD.addClass('q_filter', 'loaded'); }
--- a/rhodecode/templates/journal/journal.html Thu Apr 04 02:35:32 2013 +0200 +++ b/rhodecode/templates/journal/journal.html Thu Apr 04 13:18:24 2013 +0200 @@ -43,8 +43,8 @@ <div class="title"> <h5> - <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}" style="display: none"/> - <input class="q_filter_box" id="q_filter_watched" size="15" type="text" name="filter" value="${_('quick filter...')}" style="display: none"/> + <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value="" style="display: none"/> + <input class="q_filter_box" id="q_filter_watched" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value="" style="display: none"/> </h5> <ul class="links" style="color:#DADADA"> <li> @@ -247,7 +247,6 @@ }; YUE.on('q_filter_watched','click',function(){ if(!YUD.hasClass('q_filter_watched', 'loaded')){ - YUD.get('q_filter_watched').value = ''; //TODO: load here full list later to do search within groups YUD.addClass('q_filter_watched', 'loaded'); } @@ -351,7 +350,6 @@ }; YUE.on('q_filter','click',function(){ if(!YUD.hasClass('q_filter', 'loaded')){ - YUD.get('q_filter').value = ''; //TODO: load here full list later to do search within groups YUD.addClass('q_filter', 'loaded'); }
--- a/rhodecode/templates/repo_switcher_list.html Thu Apr 04 02:35:32 2013 +0200 +++ b/rhodecode/templates/repo_switcher_list.html Thu Apr 04 13:18:24 2013 +0200 @@ -1,7 +1,7 @@ ## -*- coding: utf-8 -*- <li class="qfilter_rs"> - <input type="text" style="border:0;width:100%" value="${_('quick filter...')}" name="filter" id="q_filter_rs" /> + <input type="text" style="border:0;width:100%" placeholder="${_('quick filter...')}" value="" name="filter" id="q_filter_rs" /> </li> %for repo in c.repos_list:
--- a/rhodecode/templates/tags/tags.html Thu Apr 04 02:35:32 2013 +0200 +++ b/rhodecode/templates/tags/tags.html Thu Apr 04 13:18:24 2013 +0200 @@ -6,7 +6,7 @@ </%def> <%def name="breadcrumbs_links()"> - <input class="q_filter_box" id="q_filter_tags" size="15" type="text" name="filter" value="${_('quick filter...')}"/> + <input class="q_filter_box" id="q_filter_tags" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/> ${_('Tags')} </%def>