kallithea Changeset - 690a955ba785

Changeset - 690a955ba785

Parent rev.

Child rev.

[Not reviewed]

beta

0 10 0

Marcin Kuzminski - 13 years ago 2013-04-04 13:18:24
marcin@python-works.com

use placeholders in qfilter, not the ugly JS logic

10 files changed with 10 insertions and 22 deletions:

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

0 comments (0 inline, 0 general)

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -696,16 +696,12 @@ YAHOO.yuitip.main = { @@
 var q_filter = function(target,nodes,display_element){
 	var nodes = nodes;
 	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);
 	});
 	F.filterTimeout = null;

rhodecode/templates/admin/repos/repos.html

➞

Show inline comments

@@ @@ -3,13 +3,13 @@ @@
 <%def name="title()">
     ${_('Repositories administration')} &middot; ${c.rhodecode_name}
 </%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'))} &raquo; <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'))} &raquo; <span id="repo_count">0</span> ${_('repositories')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
@@ @@ -124,13 +124,12 @@ @@
           argument: state
       });
   };
   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');
+      }
    });
   YUE.on('q_filter','keyup',function (e) {

rhodecode/templates/admin/users/user_edit_my_account.html

➞

Show inline comments

@@ @@ -25,13 +25,13 @@ @@
 </div>
 <div class="box box-right">
     <!-- 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>
              <span><a id="show_perms" class="link-white current" href="#perms">${_('My permissions')}</a> </span>
            </li>
            <li>
@@ @@ -265,13 +265,12 @@ function table_renderer(data){ @@
               argument: state
           });
       };
       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');
+          }
        });
       YUE.on('q_filter','keyup',function (e) {

rhodecode/templates/admin/users/users.html

➞

Show inline comments

@@ @@ -3,13 +3,13 @@ @@
 <%def name="title()">
     ${_('Users administration')} &middot; ${c.rhodecode_name}
 </%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'))} &raquo; <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'))} &raquo; <span id="user_count">0</span> ${_('users')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
@@ @@ -131,15 +131,12 @@ @@
           failure : myDataTable.onDataReturnInitializeTable,
           scope   : myDataTable,
           argument: state
       });
   };
   YUE.on('q_filter','click',function(){
       YUD.get('q_filter').value = '';
    });
   YUE.on('q_filter','keyup',function (e) {
       clearTimeout(filterTimeout);
       filterTimeout = setTimeout(updateFilter,600);
   });
 </script>

rhodecode/templates/bookmarks/bookmarks.html

➞

Show inline comments

@@ @@ -3,13 +3,13 @@ @@
 <%def name="title()">
     ${_('%s Bookmarks') % c.repo_name} &middot; ${c.rhodecode_name}
 </%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>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>

rhodecode/templates/branches/branches.html

➞

Show inline comments

@@ @@ -3,13 +3,13 @@ @@
 <%def name="title()">
     ${_('%s Branches') % c.repo_name} &middot; ${c.rhodecode_name}
 </%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>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>

rhodecode/templates/index_base.html

➞

Show inline comments

 <%page args="parent" />
     <div class="box">
         <!-- 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">
                 %if h.HasPermissionAny('hg.admin','hg.create.repository')() or h.HasReposGroupPermissionAny('group.write', 'group.admin')(c.group.group_name if c.group else None):
                   <li>
                   %if c.group:
@@ @@ -323,13 +323,12 @@ @@
                 argument: state
             });
         };
         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');
+            }
          });
         YUE.on('q_filter','keyup',function (e) {

rhodecode/templates/journal/journal.html

➞

Show inline comments

@@ @@ -40,14 +40,14 @@ @@
     </div>
     <div class="box box-right">
         <!-- 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_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>
                  <span><a id="show_watched" class="link-white current" href="#watched">${_('Watched')}</a> </span>
                </li>
                <li>
@@ @@ -244,13 +244,12 @@ @@
                 argument: state
             });
         };
         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');
+            }
          });
         YUE.on('q_filter_watched','keyup',function (e) {
@@ @@ -348,13 +347,12 @@ @@
                 argument: state
             });
         };
         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');
+            }
          });
         YUE.on('q_filter','keyup',function (e) {

rhodecode/templates/repo_switcher_list.html

➞

Show inline comments

 ## -*- 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:
     <li>
       %if repo['dbrepo']['private'] and c.visual.show_private_icon:
              <img src="${h.url('/images/icons/lock.png')}" alt="${_('Private repository')}" class="repo_switcher_type"/>

rhodecode/templates/tags/tags.html

➞

Show inline comments

@@ @@ -3,13 +3,13 @@ @@
 <%def name="title()">
     ${_('%s Tags') % c.repo_name} &middot; ${c.rhodecode_name}
 </%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>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>

0 comments (0 inline, 0 general)