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

@@ @@ -699,10 +699,6 @@ var q_filter = function(target,nodes,dis @@
 	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);

rhodecode/templates/admin/repos/repos.html

➞

Show inline comments

@@ @@ -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'))} &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')}
@@ @@ -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');
+      }

rhodecode/templates/admin/users/user_edit_my_account.html

➞

Show inline comments

@@ @@ -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 @@ function table_renderer(data){ @@
       };
       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');
+          }

rhodecode/templates/admin/users/users.html

➞

Show inline comments

@@ @@ -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'))} &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()">
@@ @@ -134,9 +134,6 @@ @@
       });
   };
   YUE.on('q_filter','click',function(){
       YUD.get('q_filter').value = '';
    });
   YUE.on('q_filter','keyup',function (e) {
       clearTimeout(filterTimeout);

rhodecode/templates/bookmarks/bookmarks.html

➞

Show inline comments

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

rhodecode/templates/branches/branches.html

➞

Show inline comments

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

rhodecode/templates/index_base.html

➞

Show inline comments

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

rhodecode/templates/journal/journal.html

➞

Show inline comments

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

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:

rhodecode/templates/tags/tags.html

➞

Show inline comments

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

0 comments (0 inline, 0 general)