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

@@ @@ -318,772 +318,768 @@ var pyroutes = (function() { @@
+    		}
     		//fix escape
     		route_tmpl = unescape(route_tmpl);
     		keys = [];
     		for (o in req_params){
     			keys.push(req_params[o])
+    		}
     		matchlist[route_name] = [
     		    route_tmpl,
     		    keys
+    		]
     	},
     	'_routes': function(){
     		return matchlist;
+    	}
+    }
 })();
 /**
  * GLOBAL YUI Shortcuts
  */
 var YUC = YAHOO.util.Connect;
 var YUD = YAHOO.util.Dom;
 var YUE = YAHOO.util.Event;
 var YUQ = YAHOO.util.Selector.query;
 // defines if push state is enabled for this browser ?
 var push_state_enabled = Boolean(
 		window.history && window.history.pushState && window.history.replaceState
 		&& !(   /* disable for versions of iOS before version 4.3 (8F190) */
 				(/ Mobile\/([1-7][a-z]|(8([abcde]|f(1[0-8]))))/i).test(navigator.userAgent)
 				/* disable for the mercury iOS browser, or at least older versions of the webkit engine */
 				|| (/AppleWebKit\/5([0-2]|3[0-2])/i).test(navigator.userAgent)
+		)
 );
 var _run_callbacks = function(callbacks){
 	if (callbacks !== undefined){
 		var _l = callbacks.length;
 	    for (var i=0;i<_l;i++){
 	    	var func = callbacks[i];
 	    	if(typeof(func)=='function'){
 	            try{
 	          	    func();
 	            }catch (err){};
+	    	}
+	    }
+	}
+}
 /**
  * Partial Ajax Implementation
+ *
  * @param url: defines url to make partial request
  * @param container: defines id of container to input partial result
  * @param s_call: success callback function that takes o as arg
  *  o.tId
  *  o.status
  *  o.statusText
  *  o.getResponseHeader[ ]
  *  o.getAllResponseHeaders
  *  o.responseText
  *  o.responseXML
  *  o.argument
  * @param f_call: failure callback
  * @param args arguments
  */
 function ypjax(url,container,s_call,f_call,args){
 	var method='GET';
 	if(args===undefined){
 		args=null;
+	}
 	// Set special header for partial ajax == HTTP_X_PARTIAL_XHR
 	YUC.initHeader('X-PARTIAL-XHR',true);
 	// wrapper of passed callback
 	var s_wrapper = (function(o){
 		return function(o){
 			YUD.get(container).innerHTML=o.responseText;
 			YUD.setStyle(container,'opacity','1.0');
     		//execute the given original callback
     		if (s_call !== undefined){
     			s_call(o);
+    		}
+		}
 	})()
 	YUD.setStyle(container,'opacity','0.3');
 	YUC.asyncRequest(method,url,{
 		success:s_wrapper,
 		failure:function(o){
 			console.log(o);
 			YUD.get(container).innerHTML='<span class="error_red">ERROR: {0}</span>'.format(o.status);
 			YUD.setStyle(container,'opacity','1.0');
 		},
 		cache:false
 	},args);
 };
 var ajaxGET = function(url,success) {
 	// Set special header for ajax == HTTP_X_PARTIAL_XHR
 	YUC.initHeader('X-PARTIAL-XHR',true);
     var sUrl = url;
     var callback = {
         success: success,
         failure: function (o) {
             if (o.status != 0) {
                 alert("error: " + o.statusText);
             };
         },
     };
     var request = YAHOO.util.Connect.asyncRequest('GET', sUrl, callback);
     return request;
 };
 var ajaxPOST = function(url,postData,success) {
 	// Set special header for ajax == HTTP_X_PARTIAL_XHR
 	YUC.initHeader('X-PARTIAL-XHR',true);
 	var toQueryString = function(o) {
 	    if(typeof o !== 'object') {
 	        return false;
+	    }
 	    var _p, _qs = [];
 	    for(_p in o) {
 	        _qs.push(encodeURIComponent(_p) + '=' + encodeURIComponent(o[_p]));
+	    }
 	    return _qs.join('&');
 	};
     var sUrl = url;
     var callback = {
         success: success,
         failure: function (o) {
             alert("error");
         },
     };
     var postData = toQueryString(postData);
     var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData);
     return request;
 };
 /**
  * tooltip activate
  */
 var tooltip_activate = function(){
 	yt = YAHOO.yuitip.main;
 	YUE.onDOMReady(yt.init);
 };
 /**
  * show more
  */
 var show_more_event = function(){
     YUE.on(YUD.getElementsByClassName('show_more'),'click',function(e){
         var el = e.target;
         YUD.setStyle(YUD.get(el.id.substring(1)),'display','');
         YUD.setStyle(el.parentNode,'display','none');
     });
 };
 /**
  * show changeset tooltip
  */
 var show_changeset_tooltip = function(){
 	YUE.on(YUD.getElementsByClassName('lazy-cs'), 'mouseover', function(e){
 		var target = e.currentTarget;
 		var rid = YUD.getAttribute(target,'raw_id');
 		var repo_name = YUD.getAttribute(target,'repo_name');
 		var ttid = 'tt-'+rid;
 		var success = function(o){
 			var json = JSON.parse(o.responseText);
 			YUD.addClass(target,'tooltip')
 			YUD.setAttribute(target, 'title',json['message']);
 			YAHOO.yuitip.main.show_yuitip(e, target);
+		}
 		if(rid && !YUD.hasClass(target, 'tooltip')){
 			YUD.setAttribute(target,'id',ttid);
 			YUD.setAttribute(target, 'title',_TM['loading...']);
 			YAHOO.yuitip.main.set_listeners(target);
 			YAHOO.yuitip.main.show_yuitip(e, target);
 			var url = pyroutes.url('changeset_info', {"repo_name":repo_name, "revision": rid});
 			ajaxGET(url, success)
+		}
 	});
 };
 var onSuccessFollow = function(target){
     var f = YUD.get(target);
     var f_cnt = YUD.get('current_followers_count');
     if(YUD.hasClass(f, 'follow')){
         f.setAttribute('class','following');
         f.setAttribute('title',_TM['Stop following this repository']);
         if(f_cnt){
             var cnt = Number(f_cnt.innerHTML)+1;
             f_cnt.innerHTML = cnt;
+        }
+    }
     else{
         f.setAttribute('class','follow');
         f.setAttribute('title',_TM['Start following this repository']);
         if(f_cnt){
             var cnt = Number(f_cnt.innerHTML)-1;
             f_cnt.innerHTML = cnt;
+        }
+    }
+}
 var toggleFollowingUser = function(target,fallows_user_id,token,user_id){
     args = 'follows_user_id='+fallows_user_id;
     args+= '&amp;auth_token='+token;
     if(user_id != undefined){
         args+="&amp;user_id="+user_id;
+    }
     YUC.asyncRequest('POST',TOGGLE_FOLLOW_URL,{
         success:function(o){
         	onSuccessFollow(target);
+        }
     },args);
     return false;
+}
 var toggleFollowingRepo = function(target,fallows_repo_id,token,user_id){
     args = 'follows_repo_id='+fallows_repo_id;
     args+= '&amp;auth_token='+token;
     if(user_id != undefined){
         args+="&amp;user_id="+user_id;
+    }
     YUC.asyncRequest('POST',TOGGLE_FOLLOW_URL,{
         success:function(o){
         	onSuccessFollow(target);
+        }
     },args);
     return false;
+}
 var showRepoSize = function(target, repo_name, token){
     var args= 'auth_token='+token;
     if(!YUD.hasClass(target, 'loaded')){
         YUD.get(target).innerHTML = _TM['Loading ...'];
         var url = pyroutes.url('repo_size', {"repo_name":repo_name});
         YUC.asyncRequest('POST',url,{
             success:function(o){
             	YUD.get(target).innerHTML = JSON.parse(o.responseText);
             	YUD.addClass(target, 'loaded');
+            }
         },args);
+    }
     return false;
+}
 /**
  * TOOLTIP IMPL.
  */
 YAHOO.namespace('yuitip');
 YAHOO.yuitip.main = {
 	$:			YAHOO.util.Dom.get,
 	bgColor:	'#000',
 	speed:		0.3,
 	opacity:	0.9,
 	offset:		[15,15],
 	useAnim:	false,
 	maxWidth:	600,
 	add_links:	false,
 	yuitips:    [],
 	set_listeners: function(tt){
 		YUE.on(tt, 'mouseover', yt.show_yuitip,  tt);
 		YUE.on(tt, 'mousemove', yt.move_yuitip,  tt);
 		YUE.on(tt, 'mouseout',  yt.close_yuitip, tt);
 	},
 	init: function(){
 		yt.tipBox = yt.$('tip-box');
 		if(!yt.tipBox){
 			yt.tipBox = document.createElement('div');
 			document.body.appendChild(yt.tipBox);
 			yt.tipBox.id = 'tip-box';
+		}
 		YUD.setStyle(yt.tipBox, 'display', 'none');
 		YUD.setStyle(yt.tipBox, 'position', 'absolute');
 		if(yt.maxWidth !== null){
 			YUD.setStyle(yt.tipBox, 'max-width', yt.maxWidth+'px');
+		}
 		var yuitips = YUD.getElementsByClassName('tooltip');
 		if(yt.add_links === true){
 			var links = document.getElementsByTagName('a');
 			var linkLen = links.length;
 			for(i=0;i<linkLen;i++){
 				yuitips.push(links[i]);
+			}
+		}
 		var yuiLen = yuitips.length;
 		for(i=0;i<yuiLen;i++){
 			yt.set_listeners(yuitips[i]);
+		}
 	},
 	show_yuitip: function(e, el){
 		YUE.stopEvent(e);
 		if(el.tagName.toLowerCase() === 'img'){
 			yt.tipText = el.alt ? el.alt : '';
 		} else {
 			yt.tipText = el.title ? el.title : '';
+		}
 		if(yt.tipText !== ''){
 			// save org title
 			YUD.setAttribute(el, 'tt_title', yt.tipText);
 			// reset title to not show org tooltips
 			YUD.setAttribute(el, 'title', '');
 			yt.tipBox.innerHTML = yt.tipText;
 			YUD.setStyle(yt.tipBox, 'display', 'block');
 			if(yt.useAnim === true){
 				YUD.setStyle(yt.tipBox, 'opacity', '0');
 				var newAnim = new YAHOO.util.Anim(yt.tipBox,
+					{
 						opacity: { to: yt.opacity }
 					}, yt.speed, YAHOO.util.Easing.easeOut
 				);
 				newAnim.animate();
+			}
+		}
 	},
 	move_yuitip: function(e, el){
 		YUE.stopEvent(e);
 		var movePos = YUE.getXY(e);
 		YUD.setStyle(yt.tipBox, 'top', (movePos[1] + yt.offset[1]) + 'px');
 		YUD.setStyle(yt.tipBox, 'left', (movePos[0] + yt.offset[0]) + 'px');
 	},
 	close_yuitip: function(e, el){
 		YUE.stopEvent(e);
 		if(yt.useAnim === true){
 			var newAnim = new YAHOO.util.Anim(yt.tipBox,
+				{
 					opacity: { to: 0 }
 				}, yt.speed, YAHOO.util.Easing.easeOut
 			);
 			newAnim.animate();
 		} else {
 			YUD.setStyle(yt.tipBox, 'display', 'none');
+		}
 		YUD.setAttribute(el,'title', YUD.getAttribute(el, 'tt_title'));
+	}
+}
 /**
  * Quick filter widget
+ *
  * @param target: filter input target
  * @param nodes: list of nodes in html we want to filter.
  * @param display_element function that takes current node from nodes and
  *    does hide or show based on the node
+ *
  */
 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;
 	var show_node = function(node){
 		YUD.setStyle(node,'display','')
+	}
 	var hide_node = function(node){
 		YUD.setStyle(node,'display','none');
+	}
 	F.updateFilter  = function() {
 	   // Reset timeout
 	   F.filterTimeout = null;
 	   var obsolete = [];
 	   var req = q_filter_field.value.toLowerCase();
 	   var l = nodes.length;
 	   var i;
 	   var showing = 0;
        for (i=0;i<l;i++ ){
     	   var n = nodes[i];
     	   var target_element = display_element(n)
     	   if(req && n.innerHTML.toLowerCase().indexOf(req) == -1){
     		   hide_node(target_element);
+    	   }
     	   else{
     		   show_node(target_element);
     		   showing+=1;
+    	   }
+       }
 	   // if repo_count is set update the number
 	   var cnt = YUD.get('repo_count');
 	   if(cnt){
 		   YUD.get('repo_count').innerHTML = showing;
+	   }
+	}
 };
 var tableTr = function(cls, body){
 	var _el = document.createElement('div');
 	var cont = new YAHOO.util.Element(body);
 	var comment_id = fromHTML(body).children[0].id.split('comment-')[1];
 	var id = 'comment-tr-{0}'.format(comment_id);
 	var _html = ('<table><tbody><tr id="{0}" class="{1}">'+
 	              '<td class="lineno-inline new-inline"></td>'+
     			  '<td class="lineno-inline old-inline"></td>'+
                   '<td>{2}</td>'+
                  '</tr></tbody></table>').format(id, cls, body);
 	_el.innerHTML = _html;
 	return _el.children[0].children[0].children[0];
 };
 /** comments **/
 var removeInlineForm = function(form) {
 	form.parentNode.removeChild(form);
 };
 var createInlineForm = function(parent_tr, f_path, line) {
 	var tmpl = YUD.get('comment-inline-form-template').innerHTML;
 	tmpl = tmpl.format(f_path, line);
 	var form = tableTr('comment-form-inline',tmpl)
 	// create event for hide button
 	form = new YAHOO.util.Element(form);
 	var form_hide_button = new YAHOO.util.Element(YUD.getElementsByClassName('hide-inline-form',null,form)[0]);
 	form_hide_button.on('click', function(e) {
 		var newtr = e.currentTarget.parentNode.parentNode.parentNode.parentNode.parentNode;
 		if(YUD.hasClass(newtr.nextElementSibling,'inline-comments-button')){
 			YUD.setStyle(newtr.nextElementSibling,'display','');
+		}
 		removeInlineForm(newtr);
 		YUD.removeClass(parent_tr, 'form-open');
 		YUD.removeClass(parent_tr, 'hl-comment');
 	});
 	return form
 };
 /**
  * Inject inline comment for on given TR this tr should be always an .line
  * tr containing the line. Code will detect comment, and always put the comment
  * block at the very bottom
  */
 var injectInlineForm = function(tr){
 	  if(!YUD.hasClass(tr, 'line')){
 		  return
+	  }
 	  var submit_url = AJAX_COMMENT_URL;
 	  var _td = YUD.getElementsByClassName('code',null,tr)[0];
 	  if(YUD.hasClass(tr,'form-open') || YUD.hasClass(tr,'context') || YUD.hasClass(_td,'no-comment')){
 		  return
+	  }
 	  YUD.addClass(tr,'form-open');
 	  YUD.addClass(tr,'hl-comment');
 	  var node = YUD.getElementsByClassName('full_f_path',null,tr.parentNode.parentNode.parentNode)[0];
 	  var f_path = YUD.getAttribute(node,'path');
 	  var lineno = getLineNo(tr);
 	  var form = createInlineForm(tr, f_path, lineno, submit_url);
 	  var parent = tr;
 	  while (1){
 		  var n = parent.nextElementSibling;
 		  // next element are comments !
 		  if(YUD.hasClass(n,'inline-comments')){
 			  parent = n;
+		  }
 		  else{
 			  break;
+		  }
+	  }
 	  YUD.insertAfter(form,parent);
 	  var f = YUD.get(form);
 	  var overlay = YUD.getElementsByClassName('overlay',null,f)[0];
 	  var _form = YUD.getElementsByClassName('inline-form',null,f)[0];
 	  YUE.on(YUD.get(_form), 'submit',function(e){
 		  YUE.preventDefault(e);
 		  //ajax submit
 		  var text = YUD.get('text_'+lineno).value;
 		  var postData = {
 	            'text':text,
 	            'f_path':f_path,
 	            'line':lineno
 		  };
 		  if(lineno === undefined){
 			  alert('missing line !');
 			  return
+		  }
 		  if(f_path === undefined){
 			  alert('missing file path !');
 			  return
+		  }
 		  if(text == ""){
 			  return
+		  }
 		  var success = function(o){
 			  YUD.removeClass(tr, 'form-open');
 			  removeInlineForm(f);
 			  var json_data = JSON.parse(o.responseText);
 	          renderInlineComment(json_data);
 		  };
 		  if (YUD.hasClass(overlay,'overlay')){
 			  var w = _form.offsetWidth;
 			  var h = _form.offsetHeight;
 			  YUD.setStyle(overlay,'width',w+'px');
 			  YUD.setStyle(overlay,'height',h+'px');
+		  }
 		  YUD.addClass(overlay, 'submitting');
 		  ajaxPOST(submit_url, postData, success);
 	  });
 	  setTimeout(function(){
 		  // callbacks
 		  tooltip_activate();
 		  MentionsAutoComplete('text_'+lineno, 'mentions_container_'+lineno,
 	                         _USERS_AC_DATA, _GROUPS_AC_DATA);
 		  var _e = YUD.get('text_'+lineno);
 		  if(_e){
 			  _e.focus();
+		  }
 	  },10)
 };
 var deleteComment = function(comment_id){
 	var url = AJAX_COMMENT_DELETE_URL.replace('__COMMENT_ID__',comment_id);
     var postData = {'_method':'delete'};
     var success = function(o){
         var n = YUD.get('comment-tr-'+comment_id);
         var root = prevElementSibling(prevElementSibling(n));
         n.parentNode.removeChild(n);
         // scann nodes, and attach add button to last one
         placeAddButton(root);
+    }
     ajaxPOST(url,postData,success);
+}
 var createInlineAddButton = function(tr){
 	var label = TRANSLATION_MAP['Add another comment'];
 	var html_el = document.createElement('div');
 	YUD.addClass(html_el, 'add-comment');
 	html_el.innerHTML = '<span class="ui-btn">{0}</span>'.format(label);
 	var add = new YAHOO.util.Element(html_el);
 	add.on('click', function(e) {
 		injectInlineForm(tr);
 	});
 	return add;
 };
 var getLineNo = function(tr) {
 	var line;
 	var o = tr.children[0].id.split('_');
 	var n = tr.children[1].id.split('_');
 	if (n.length >= 2) {
 		line = n[n.length-1];
 	} else if (o.length >= 2) {
 		line = o[o.length-1];
+	}
 	return line
 };
 var placeAddButton = function(target_tr){
 	if(!target_tr){
 		return
+	}
 	var last_node = target_tr;
     //scann
 	  while (1){
 		  var n = last_node.nextElementSibling;
 		  // next element are comments !
 		  if(YUD.hasClass(n,'inline-comments')){
 			  last_node = n;
 			  //also remove the comment button from previous
 			  var comment_add_buttons = YUD.getElementsByClassName('add-comment',null,last_node);
 			  for(var i=0;i<comment_add_buttons.length;i++){
 				  var b = comment_add_buttons[i];
 				  b.parentNode.removeChild(b);
+			  }
+		  }
 		  else{
 			  break;
+		  }
+	  }
     var add = createInlineAddButton(target_tr);
     // get the comment div
     var comment_block = YUD.getElementsByClassName('comment',null,last_node)[0];
     // attach add button
     YUD.insertAfter(add,comment_block);
+}
 /**
  * Places the inline comment into the changeset block in proper line position
  */
 var placeInline = function(target_container,lineno,html){
 	  var lineid = "{0}_{1}".format(target_container,lineno);
 	  var target_line = YUD.get(lineid);
 	  var comment = new YAHOO.util.Element(tableTr('inline-comments',html))
 	  // check if there are comments already !
 	  var parent = target_line.parentNode;
 	  var root_parent = parent;
 	  while (1){
 		  var n = parent.nextElementSibling;
 		  // next element are comments !
 		  if(YUD.hasClass(n,'inline-comments')){
 			  parent = n;
+		  }
 		  else{
 			  break;
+		  }
+	  }
 	  // put in the comment at the bottom
 	  YUD.insertAfter(comment,parent);
 	  // scann nodes, and attach add button to last one
       placeAddButton(root_parent);
 	  return target_line;
+}
 /**
  * make a single inline comment and place it inside
  */
 var renderInlineComment = function(json_data){
     try{
 	  var html =  json_data['rendered_text'];
 	  var lineno = json_data['line_no'];
 	  var target_id = json_data['target_id'];
 	  placeInline(target_id, lineno, html);
     }catch(e){
   	  console.log(e);
+    }
+}
 /**
  * Iterates over all the inlines, and places them inside proper blocks of data
  */
 var renderInlineComments = function(file_comments){
 	for (f in file_comments){
         // holding all comments for a FILE
 		var box = file_comments[f];
 		var target_id = YUD.getAttribute(box,'target_id');
 		// actually comments with line numbers
         var comments = box.children;
         for(var i=0; i<comments.length; i++){
         	var data = {
         		'rendered_text': comments[i].outerHTML,
         		'line_no': YUD.getAttribute(comments[i],'line'),
         		'target_id': target_id
+        	}
         	renderInlineComment(data);
+        }
+    }
+}
 var fileBrowserListeners = function(current_url, node_list_url, url_base){
 	var current_url_branch = +"?branch=__BRANCH__";
 	YUE.on('stay_at_branch','click',function(e){
 	    if(e.target.checked){
 	        var uri = current_url_branch;
 	        uri = uri.replace('__BRANCH__',e.target.value);
 	        window.location = uri;
+	    }
 	    else{
 	        window.location = current_url;
+	    }
 	})
 	var n_filter = YUD.get('node_filter');
 	var F = YAHOO.namespace('node_filter');
 	F.filterTimeout = null;
 	var nodes = null;
 	F.initFilter = function(){
 	  YUD.setStyle('node_filter_box_loading','display','');
 	  YUD.setStyle('search_activate_id','display','none');
 	  YUD.setStyle('add_node_id','display','none');
 	  YUC.initHeader('X-PARTIAL-XHR',true);
 	  YUC.asyncRequest('GET', node_list_url, {
 	      success:function(o){
 	        nodes = JSON.parse(o.responseText).nodes;
 	        YUD.setStyle('node_filter_box_loading','display','none');
 	        YUD.setStyle('node_filter_box','display','');
 	        n_filter.focus();
 			if(YUD.hasClass(n_filter,'init')){
 				n_filter.value = '';
 				YUD.removeClass(n_filter,'init');
+			}
 	      },
 	      failure:function(o){
 	          console.log('failed to load');
+	      }
 	  },null);
+	}
 	F.updateFilter  = function(e) {
 	    return function(){
 	        // Reset timeout
 	        F.filterTimeout = null;
 	        var query = e.target.value.toLowerCase();
 	        var match = [];
 	        var matches = 0;
 	        var matches_max = 20;
 	        if (query != ""){
 	            for(var i=0;i<nodes.length;i++){
 	                var pos = nodes[i].name.toLowerCase().indexOf(query)
 	                if(query && pos != -1){
 	                    matches++
 	                    //show only certain amount to not kill browser
 	                    if (matches > matches_max){
 	                        break;
+	                    }
 	                    var n = nodes[i].name;
 	                    var t = nodes[i].type;

rhodecode/templates/admin/repos/repos.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%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">
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
           <li>
             <span>${h.link_to(_(u'Add repository'),h.url('new_repo'))}</span>
           </li>
         </ul>
     </div>
     <div class="table yui-skin-sam" id="repos_list_wrap"></div>
     <div id="user-paginator" style="padding: 0px 0px 0px 20px"></div>
 </div>
 <script>
   var url = "${h.url('formatted_users', format='json')}";
   var data = ${c.data|n};
   var myDataSource = new YAHOO.util.DataSource(data);
   myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
   myDataSource.responseSchema = {
       resultsList: "records",
       fields: [
          {key:"menu"},
          {key:"raw_name"},
          {key:"name"},
          {key:"desc"},
          {key:"last_changeset"},
          {key:"owner"},
          {key:"action"},
+      ]
    };
   myDataSource.doBeforeCallback = function(req,raw,res,cb) {
       // This is the filter function
       var data     = res.results || [],
           filtered = [],
           i,l;
       if (req) {
           req = req.toLowerCase();
           for (i = 0; i<data.length; i++) {
               var pos = data[i].raw_name.toLowerCase().indexOf(req)
               if (pos != -1) {
                   filtered.push(data[i]);
+              }
+          }
           res.results = filtered;
+      }
       YUD.get('repo_count').innerHTML = res.results.length;
       return res;
+  }
   // main table sorting
   var myColumnDefs = [
       {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
       {key:"name",label:"${_('Name')}",sortable:true,
           sortOptions: { sortFunction: nameSort }},
       {key:"desc",label:"${_('Description')}",sortable:true},
       {key:"last_changeset",label:"${_('Tip')}",sortable:true,
           sortOptions: { sortFunction: revisionSort }},
       {key:"owner",label:"${_('Owner')}",sortable:true},
       {key:"action",label:"${_('Action')}",sortable:false},
   ];
   var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,{
     sortedBy:{key:"name",dir:"asc"},
     paginator: new YAHOO.widget.Paginator({
         rowsPerPage: 25,
         alwaysVisible: false,
         template : "{PreviousPageLink} {FirstPageLink} {PageLinks} {LastPageLink} {NextPageLink}",
         pageLinks: 5,
         containerClass: 'pagination-wh',
         currentPageClass: 'pager_curpage',
         pageLinkClass: 'pager_link',
         nextPageLinkLabel: '&gt;',
         previousPageLinkLabel: '&lt;',
         firstPageLinkLabel: '&lt;&lt;',
         lastPageLinkLabel: '&gt;&gt;',
         containers:['user-paginator']
     }),
     MSG_SORTASC:"${_('Click to sort ascending')}",
     MSG_SORTDESC:"${_('Click to sort descending')}",
     MSG_EMPTY:"${_('No records found.')}",
     MSG_ERROR:"${_('Data error.')}",
     MSG_LOADING:"${_('Loading...')}",
+  }
   );
   myDataTable.subscribe('postRenderEvent',function(oArgs) {
       tooltip_activate();
       quick_repo_menu();
   });
   var filterTimeout = null;
   updateFilter  = function () {
       // Reset timeout
       filterTimeout = null;
       // Reset sort
       var state = myDataTable.getState();
       state.sortedBy = {key:'name', dir:YAHOO.widget.DataTable.CLASS_ASC};
       // Get filtered data
       myDataSource.sendRequest(YUD.get('q_filter').value,{
           success : myDataTable.onDataReturnInitializeTable,
           failure : myDataTable.onDataReturnInitializeTable,
           scope   : myDataTable,
           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) {
       clearTimeout(filterTimeout);
       filterTimeout = setTimeout(updateFilter,600);
   });
 </script>
 </%def>

rhodecode/templates/admin/users/user_edit_my_account.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('My account')} ${c.rhodecode_user.username} &middot; ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('My Account')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box box-left">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     ${c.form|n}
 </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>
              <span><a id="show_my" class="link-white" href="#my">${_('My repos')}</a> </span>
            </li>
            <li>
              <span><a id="show_pullrequests" class="link-white" href="#pullrequests">${_('My pull requests')}</a> </span>
            </li>
          </ul>
     </div>
     <!-- end box / title -->
     <div id="perms_container">
         <div id="perms" class="table">
            %for section in sorted(c.rhodecode_user.permissions.keys()):
             <div class="perms_section_head">${section.replace("_"," ").capitalize()}</div>
             <div id='tbl_list_wrap_${section}' class="yui-skin-sam">
             <table id="tbl_list_${section}">
               <thead>
                   <tr>
                   <th class="left">${_('Name')}</th>
                   <th class="left">${_('Permission')}</th>
               </thead>
               <tbody>
             %for k in sorted(c.rhodecode_user.permissions[section], key=lambda s: s.lower):
            <%
            if section != 'global':
                section_perm = c.rhodecode_user.permissions[section].get(k)
                _perm = section_perm.split('.')[-1]
            else:
                _perm = section_perm = None
            %>
             %if _perm not in ['none']:
                 <tr>
                     <td>
                         %if section == 'repositories':
                             <a href="${h.url('summary_home',repo_name=k)}">${k}</a>
                         %elif section == 'repositories_groups':
                             <a href="${h.url('repos_group_home',group_name=k)}">${k}</a>
                         %else:
                             ${k}
                         %endif
                     </td>
                     <td>
                         %if section == 'global':
                          ${h.boolicon(True)}
                         %else:
                         <span class="perm_tag ${_perm}">${section_perm}</span>
                         %endif
                      </td>
                 </tr>
              %endif
             %endfor
             </tbody>
             </table>
             </div>
            %endfor
         </div>
     </div>
     <div id="my_container" style="display:none">
         <div class="table yui-skin-sam" id="repos_list_wrap"></div>
         <div id="user-paginator" style="padding: 0px 0px 0px 20px"></div>
     </div>
     <div id="pullrequests_container" class="table" style="display:none">
         ## loaded via AJAX
         ${_('Loading...')}
     </div>
 </div>
 <script type="text/javascript">
 pyroutes.register('admin_settings_my_pullrequests', "${url('admin_settings_my_pullrequests')}", []);
 var show_perms = function(e){
     YUD.addClass('show_perms', 'current');
     YUD.removeClass('show_my','current');
     YUD.removeClass('show_pullrequests','current');
     YUD.setStyle('my_container','display','none');
     YUD.setStyle('pullrequests_container','display','none');
     YUD.setStyle('perms_container','display','');
     YUD.setStyle('q_filter','display','none');
+}
 YUE.on('show_perms','click',function(e){
     show_perms();
 })
 var show_my = function(e){
     YUD.addClass('show_my', 'current');
     YUD.removeClass('show_perms','current');
     YUD.removeClass('show_pullrequests','current');
     YUD.setStyle('perms_container','display','none');
     YUD.setStyle('pullrequests_container','display','none');
     YUD.setStyle('my_container','display','');
     YUD.setStyle('q_filter','display','');
     if(!YUD.hasClass('show_my', 'loaded')){
         table_renderer(${c.data |n});
         YUD.addClass('show_my', 'loaded');
+    }
+}
 YUE.on('show_my','click',function(e){
     show_my(e);
 })
 var show_pullrequests = function(e){
     YUD.addClass('show_pullrequests', 'current');
     YUD.removeClass('show_my','current');
     YUD.removeClass('show_perms','current');
     YUD.setStyle('my_container','display','none');
     YUD.setStyle('perms_container','display','none');
     YUD.setStyle('pullrequests_container','display','');
     YUD.setStyle('q_filter','display','none');
     var url = pyroutes.url('admin_settings_my_pullrequests');
     if(YUD.get('show_closed') && YUD.get('show_closed').checked) {
         var url = pyroutes.url('admin_settings_my_pullrequests', {'pr_show_closed': '1'});
+    }
     ypjax(url, 'pullrequests_container', function(){
         YUE.on('show_closed','change',function (e) {
             show_pullrequests(e);
         });
     });
+}
 YUE.on('show_pullrequests','click',function(e){
     show_pullrequests(e)
 })
 var tabs = {
     'perms': show_perms,
     'my': show_my,
     'pullrequests': show_pullrequests
+}
 var url = location.href.split('#');
 if (url[1]) {
     //We have a hash
     var tabHash = url[1];
     var func = tabs[tabHash]
     if (func){
         func();
+    }
+}
 function table_renderer(data){
     var myDataSource = new YAHOO.util.DataSource(data);
     myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
     myDataSource.responseSchema = {
         resultsList: "records",
         fields: [
             {key:"menu"},
             {key:"raw_name"},
             {key:"name"},
             {key:"last_changeset"},
             {key:"action"},
+            ]
         };
     myDataSource.doBeforeCallback = function(req,raw,res,cb) {
         // This is the filter function
         var data     = res.results || [],
             filtered = [],
             i,l;
         if (req) {
             req = req.toLowerCase();
             for (i = 0; i<data.length; i++) {
                 var pos = data[i].raw_name.toLowerCase().indexOf(req)
                 if (pos != -1) {
                     filtered.push(data[i]);
+                }
+            }
             res.results = filtered;
+        }
         return res;
+    }
       // main table sorting
       var myColumnDefs = [
           {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
           {key:"name",label:"${_('Name')}",sortable:true,
               sortOptions: { sortFunction: nameSort }},
           {key:"last_changeset",label:"${_('Tip')}",sortable:true,
               sortOptions: { sortFunction: revisionSort }},
           {key:"action",label:"${_('Action')}",sortable:false},
       ];
       var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,{
         sortedBy:{key:"name",dir:"asc"},
         paginator: new YAHOO.widget.Paginator({
             rowsPerPage: 50,
             alwaysVisible: false,
             template : "{PreviousPageLink} {FirstPageLink} {PageLinks} {LastPageLink} {NextPageLink}",
             pageLinks: 5,
             containerClass: 'pagination-wh',
             currentPageClass: 'pager_curpage',
             pageLinkClass: 'pager_link',
             nextPageLinkLabel: '&gt;',
             previousPageLinkLabel: '&lt;',
             firstPageLinkLabel: '&lt;&lt;',
             lastPageLinkLabel: '&gt;&gt;',
             containers:['user-paginator']
         }),
         MSG_SORTASC:"${_('Click to sort ascending')}",
         MSG_SORTDESC:"${_('Click to sort descending')}",
         MSG_EMPTY:"${_('No records found.')}",
         MSG_ERROR:"${_('Data error.')}",
         MSG_LOADING:"${_('Loading...')}",
+      }
       );
       myDataTable.subscribe('postRenderEvent',function(oArgs) {
           tooltip_activate();
           quick_repo_menu();
       });
       var filterTimeout = null;
       updateFilter = function() {
           // Reset timeout
           filterTimeout = null;
           // Reset sort
           var state = myDataTable.getState();
           state.sortedBy = {key:'name', dir:YAHOO.widget.DataTable.CLASS_ASC};
           // Get filtered data
           myDataSource.sendRequest(YUD.get('q_filter').value,{
               success : myDataTable.onDataReturnInitializeTable,
               failure : myDataTable.onDataReturnInitializeTable,
               scope   : myDataTable,
               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) {
           clearTimeout(filterTimeout);
           filterTimeout = setTimeout(updateFilter,600);
       });
+    }
 </script>
 </%def>

rhodecode/templates/admin/users/users.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%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>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
           <li>
             <span>${h.link_to(_(u'Add new user'),h.url('new_user'))}</span>
           </li>
         </ul>
     </div>
     <!-- end box / title -->
     <div class="table yui-skin-sam" id="users_list_wrap"></div>
     <div id="user-paginator" style="padding: 0px 0px 0px 20px"></div>
 </div>
 <script>
   var url = "${h.url('formatted_users', format='json')}";
   var data = ${c.data|n};
   var myDataSource = new YAHOO.util.DataSource(data);
   myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
   myDataSource.responseSchema = {
       resultsList: "records",
       fields: [
           {key: "gravatar"},
           {key: "raw_username"},
           {key: "username"},
           {key: "firstname"},
           {key: "lastname"},
           {key: "last_login"},
           {key: "last_login_raw"},
           {key: "active"},
           {key: "admin"},
           {key: "ldap"},
           {key: "action"},
+      ]
    };
   myDataSource.doBeforeCallback = function(req,raw,res,cb) {
       // This is the filter function
       var data     = res.results || [],
           filtered = [],
           i,l;
       if (req) {
           req = req.toLowerCase();
           for (i = 0; i<data.length; i++) {
               var pos = data[i].raw_username.toLowerCase().indexOf(req)
               if (pos != -1) {
                   filtered.push(data[i]);
+              }
+          }
           res.results = filtered;
+      }
       YUD.get('user_count').innerHTML = res.results.length;
       return res;
+  }
   // main table sorting
   var myColumnDefs = [
       {key:"gravatar",label:"",sortable:false,},
       {key:"username",label:"${_('Username')}",sortable:true,
           sortOptions: { sortFunction: usernamelinkSort }
       },
       {key:"firstname",label:"${_('Firstname')}",sortable:true,},
       {key:"lastname",label:"${_('Lastname')}",sortable:true,},
       {key:"last_login",label:"${_('Last login')}",sortable:true,
           sortOptions: { sortFunction: lastLoginSort }},
       {key:"active",label:"${_('Active')}",sortable:true,},
       {key:"admin",label:"${_('Admin')}",sortable:true,},
       {key:"ldap",label:"${_('LDAP')}",sortable:true,},
       {key:"action",label:"${_('Action')}",sortable:false},
   ];
   var myDataTable = new YAHOO.widget.DataTable("users_list_wrap", myColumnDefs, myDataSource,{
     sortedBy:{key:"username",dir:"asc"},
     paginator: new YAHOO.widget.Paginator({
         rowsPerPage: 15,
         alwaysVisible: false,
         template : "{PreviousPageLink} {FirstPageLink} {PageLinks} {LastPageLink} {NextPageLink}",
         pageLinks: 5,
         containerClass: 'pagination-wh',
         currentPageClass: 'pager_curpage',
         pageLinkClass: 'pager_link',
         nextPageLinkLabel: '&gt;',
         previousPageLinkLabel: '&lt;',
         firstPageLinkLabel: '&lt;&lt;',
         lastPageLinkLabel: '&gt;&gt;',
         containers:['user-paginator']
     }),
     MSG_SORTASC:"${_('Click to sort ascending')}",
     MSG_SORTDESC:"${_('Click to sort descending')}",
     MSG_EMPTY:"${_('No records found.')}",
     MSG_ERROR:"${_('Data error.')}",
     MSG_LOADING:"${_('Loading...')}",
+  }
   );
   myDataTable.subscribe('postRenderEvent',function(oArgs) {
   });
   var filterTimeout = null;
   updateFilter  = function () {
       // Reset timeout
       filterTimeout = null;
       // Reset sort
       var state = myDataTable.getState();
           state.sortedBy = {key:'username', dir:YAHOO.widget.DataTable.CLASS_ASC};
       // Get filtered data
       myDataSource.sendRequest(YUD.get('q_filter').value,{
           success : myDataTable.onDataReturnInitializeTable,
           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>
 </%def>

rhodecode/templates/bookmarks/bookmarks.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%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>
 <%def name="main()">
 ${self.context_bar('switch-to')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     <div class="table">
         <%include file='bookmarks_data.html'/>
     </div>
 </div>
 <script type="text/javascript">
 // main table sorting
 var myColumnDefs = [
     {key:"name",label:"${_('Name')}",sortable:true},
     {key:"date",label:"${_('Date')}",sortable:true,
         sortOptions: { sortFunction: dateSort }},
     {key:"author",label:"${_('Author')}",sortable:true},
     {key:"revision",label:"${_('Revision')}",sortable:true,
         sortOptions: { sortFunction: revisionSort }},
 ];
 var myDataSource = new YAHOO.util.DataSource(YUD.get("bookmarks_data"));
 myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
 myDataSource.responseSchema = {
     fields: [
         {key:"name"},
         {key:"date"},
         {key:"author"},
         {key:"revision"},
+    ]
 };
 var myDataTable = new YAHOO.widget.DataTable("table_wrap", myColumnDefs, myDataSource,
+        {
          sortedBy:{key:"name",dir:"asc"},
          MSG_SORTASC:"${_('Click to sort ascending')}",
          MSG_SORTDESC:"${_('Click to sort descending')}",
          MSG_EMPTY:"${_('No records found.')}",
          MSG_ERROR:"${_('Data error.')}",
          MSG_LOADING:"${_('Loading...')}",
+        }
 );
 myDataTable.subscribe('postRenderEvent',function(oArgs) {
     tooltip_activate();
     var func = function(node){
         return node.parentNode.parentNode.parentNode.parentNode.parentNode;
+    }
     q_filter('q_filter_bookmarks',YUQ('div.table tr td .logbooks .bookbook a'),func);
 });
 </script>
 </%def>

rhodecode/templates/branches/branches.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%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>
 <%def name="main()">
 ${self.context_bar('switch-to')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     %if c.repo_branches:
     <div class="info_box" id="compare_branches" style="clear: both;padding: 10px 19px;text-align: right;"><a href="#" class="ui-btn small">${_('Compare branches')}</a></div>
     %endif
     <div class="table">
         <%include file='branches_data.html'/>
     </div>
 </div>
 <script type="text/javascript">
 YUE.on('compare_branches','click',function(e){
     YUE.preventDefault(e);
     var org = YUQ('input[name=compare_org]:checked')[0];
     var other = YUQ('input[name=compare_other]:checked')[0];
     if(org && other){
         var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='branch',org_ref='__ORG__',other_ref_type='branch',other_ref='__OTHER__')}";
         var u = compare_url.replace('__ORG__',org.value)
                            .replace('__OTHER__',other.value);
         window.location=u;
+    }
 });
 // main table sorting
 var myColumnDefs = [
     {key:"name",label:"${_('Name')}",sortable:true},
     {key:"date",label:"${_('Date')}",sortable:true,
         sortOptions: { sortFunction: dateSort }},
     {key:"author",label:"${_('Author')}",sortable:true},
     {key:"revision",label:"${_('Revision')}",sortable:true,
         sortOptions: { sortFunction: revisionSort }},
     {key:"compare",label:"${_('Compare')}",sortable:false,},
 ];
 var myDataSource = new YAHOO.util.DataSource(YUD.get("branches_data"));
 myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
 myDataSource.responseSchema = {
     fields: [
         {key:"name"},
         {key:"date"},
         {key:"author"},
         {key:"revision"},
         {key:"compare"},
+    ]
 };
 var myDataTable = new YAHOO.widget.DataTable("table_wrap", myColumnDefs, myDataSource,
+        {
          sortedBy:{key:"name",dir:"asc"},
          MSG_SORTASC:"${_('Click to sort ascending')}",
          MSG_SORTDESC:"${_('Click to sort descending')}",
          MSG_EMPTY:"${_('No records found.')}",
          MSG_ERROR:"${_('Data error.')}",
          MSG_LOADING:"${_('Loading...')}",
+        }
 );
 myDataTable.subscribe('postRenderEvent',function(oArgs) {
     tooltip_activate();
     var func = function(node){
         return node.parentNode.parentNode.parentNode.parentNode.parentNode;
+    }
     q_filter('q_filter_branches',YUQ('div.table tr td .logtags .branchtag a'),func);
 });
 </script>
 </%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:
                         <span>${h.link_to(_('Add repository'),h.url('new_repo',parent_group=c.group.group_id))}</span>
                         %if h.HasPermissionAny('hg.admin')() or h.HasReposGroupPermissionAny('group.admin')(c.group.group_name):
                          <span>${h.link_to(_(u'Add group'),h.url('new_repos_group', parent_group=c.group.group_id))}</span>
                         %endif
                   %else:
                     <span>${h.link_to(_('Add repository'),h.url('new_repo'))}</span>
                     %if h.HasPermissionAny('hg.admin')():
                      <span>${h.link_to(_(u'Add group'),h.url('new_repos_group'))}</span>
                     %endif
                   %endif
                   </li>
                 %endif
                 %if c.group and h.HasReposGroupPermissionAny('group.admin')(c.group.group_name):
                 <li>
                     <span>${h.link_to(_('Edit group'),h.url('edit_repos_group',group_name=c.group.group_name), title=_('You have admin right to this group, and can edit it'))}</span>
                 </li>
                 %endif
               </ul>
             %endif
         </div>
         <!-- end box / title -->
         <div class="table">
            % if c.groups:
             <div id='groups_list_wrap' class="yui-skin-sam">
               <table id="groups_list">
                   <thead>
                       <tr>
                           <th class="left"><a href="#">${_('Group name')}</a></th>
                           <th class="left"><a href="#">${_('Description')}</a></th>
                           ##<th class="left"><a href="#">${_('Number of repositories')}</a></th>
                       </tr>
                   </thead>
                   ## REPO GROUPS
                   % for gr in c.groups:
                     <tr>
                         <td>
                             <div style="white-space: nowrap">
                             <img class="icon" alt="${_('Repository group')}" src="${h.url('/images/icons/database_link.png')}"/>
                             ${h.link_to(gr.name,url('repos_group_home',group_name=gr.group_name))}
                             </div>
                         </td>
                         %if c.visual.stylify_metatags:
                             <td>${h.urlify_text(h.desc_stylize(gr.group_description))}</td>
                         %else:
                             <td>${gr.group_description}</td>
                         %endif
                         ## this is commented out since for multi nested repos can be HEAVY!
                         ## in number of executed queries during traversing uncomment at will
                         ##<td><b>${gr.repositories_recursive_count}</b></td>
                     </tr>
                   % endfor
               </table>
             </div>
             <div id="group-user-paginator" style="padding: 0px 0px 0px 0px"></div>
             <div style="height: 20px"></div>
             % endif
             <div id="welcome" style="display:none;text-align:center">
                 <h1><a href="${h.url('home')}">${c.rhodecode_name} ${c.rhodecode_version}</a></h1>
             </div>
              <%cnt=0%>
              <%namespace name="dt" file="/data_table/_dt_elements.html"/>
             % if not c.visual.lightweight_dashboard:
               ## old full detailed version
             <div id='repos_list_wrap' class="yui-skin-sam">
             <table id="repos_list">
             <thead>
                 <tr>
                     <th class="left"></th>
                     <th class="left">${_('Name')}</th>
                     <th class="left">${_('Description')}</th>
                     <th class="left">${_('Last change')}</th>
                     <th class="left">${_('Tip')}</th>
                     <th class="left">${_('Owner')}</th>
                     <th class="left">${_('Atom')}</th>
                 </tr>
             </thead>
             <tbody>
             %for cnt,repo in enumerate(c.repos_list):
                 <tr class="parity${(cnt+1)%2}">
                     ##QUICK MENU
                     <td class="quick_repo_menu">
                       ${dt.quick_menu(repo['name'])}
                     </td>
                     ##REPO NAME AND ICONS
                     <td class="reponame">
                       ${dt.repo_name(repo['name'],repo['dbrepo']['repo_type'],repo['dbrepo']['private'],h.AttributeDict(repo['dbrepo_fork']),pageargs.get('short_repo_names'))}
                     </td>
                     ##DESCRIPTION
                     <td><span class="tooltip" title="${h.tooltip(repo['description'])}">
                        %if c.visual.stylify_metatags:
                        ${h.urlify_text(h.desc_stylize(h.truncate(repo['description'],60)))}</span>
                        %else:
                        ${h.truncate(repo['description'],60)}</span>
                        %endif
                     </td>
                     ##LAST CHANGE DATE
                     <td>
                       ${dt.last_change(repo['last_change'])}
                     </td>
                     ##LAST REVISION
                     <td>
                         ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])}
                     </td>
                     ##
                     <td title="${repo['contact']}">${h.person(repo['contact'])}</td>
                     <td>
                       ${dt.atom(repo['name'])}
                     </td>
                 </tr>
             %endfor
             </tbody>
             </table>
             </div>
             % else:
               ## lightweight version
                 <div class="yui-skin-sam" id="repos_list_wrap"></div>
                 <div id="user-paginator" style="padding: 0px 0px 0px 0px"></div>
             % endif
         </div>
     </div>
     % if not c.visual.lightweight_dashboard:
     <script>
       YUD.get('repo_count').innerHTML = ${cnt+1 if cnt else 0};
       // groups table sorting
       var myColumnDefs = [
           {key:"name",label:"${_('Group name')}",sortable:true,
               sortOptions: { sortFunction: groupNameSort }},
           {key:"desc",label:"${_('Description')}",sortable:true},
       ];
       var myDataSource = new YAHOO.util.DataSource(YUD.get("groups_list"));
       myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
       myDataSource.responseSchema = {
           fields: [
               {key:"name"},
               {key:"desc"},
+          ]
       };
       var myDataTable = new YAHOO.widget.DataTable("groups_list_wrap", myColumnDefs, myDataSource,{
           sortedBy:{key:"name",dir:"asc"},
           paginator: new YAHOO.widget.Paginator({
               rowsPerPage: 50,
               alwaysVisible: false,
               template : "{PreviousPageLink} {FirstPageLink} {PageLinks} {LastPageLink} {NextPageLink}",
               pageLinks: 5,
               containerClass: 'pagination-wh',
               currentPageClass: 'pager_curpage',
               pageLinkClass: 'pager_link',
               nextPageLinkLabel: '&gt;',
               previousPageLinkLabel: '&lt;',
               firstPageLinkLabel: '&lt;&lt;',
               lastPageLinkLabel: '&gt;&gt;',
               containers:['group-user-paginator']
           }),
           MSG_SORTASC:"${_('Click to sort ascending')}",
           MSG_SORTDESC:"${_('Click to sort descending')}"
       });
       // main table sorting
       var myColumnDefs = [
           {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
           {key:"name",label:"${_('Name')}",sortable:true,
               sortOptions: { sortFunction: nameSort }},
           {key:"desc",label:"${_('Description')}",sortable:true},
           {key:"last_change",label:"${_('Last Change')}",sortable:true,
               sortOptions: { sortFunction: ageSort }},
           {key:"tip",label:"${_('Tip')}",sortable:true,
               sortOptions: { sortFunction: revisionSort }},
           {key:"owner",label:"${_('Owner')}",sortable:true},
           {key:"atom",label:"",sortable:false},
       ];
       var myDataSource = new YAHOO.util.DataSource(YUD.get("repos_list"));
       myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
       myDataSource.responseSchema = {
           fields: [
               {key:"menu"},
               //{key:"raw_name"},
               {key:"name"},
               {key:"desc"},
               {key:"last_change"},
               {key:"tip"},
               {key:"owner"},
               {key:"atom"},
+          ]
       };
       var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,
+              {
                sortedBy:{key:"name",dir:"asc"},
                MSG_SORTASC:"${_('Click to sort ascending')}",
                MSG_SORTDESC:"${_('Click to sort descending')}",
                MSG_EMPTY:"${_('No records found.')}",
                MSG_ERROR:"${_('Data error.')}",
                MSG_LOADING:"${_('Loading...')}",
+              }
       );
       myDataTable.subscribe('postRenderEvent',function(oArgs) {
           tooltip_activate();
           quick_repo_menu();
           var func = function(node){
               return node.parentNode.parentNode.parentNode.parentNode;
+          }
           q_filter('q_filter',YUQ('div.table tr td a.repo_name'),func);
       });
     </script>
     % else:
       <script>
         var data = ${c.data|n};
         var myDataSource = new YAHOO.util.DataSource(data);
         myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
         myDataSource.responseSchema = {
             resultsList: "records",
             fields: [
                {key:"menu"},
                {key:"raw_name"},
                {key:"name"},
                {key:"desc"},
                {key:"last_change"},
                {key:"last_changeset"},
                {key:"owner"},
                {key:"atom"},
+            ]
          };
         myDataSource.doBeforeCallback = function(req,raw,res,cb) {
             // This is the filter function
             var data     = res.results || [],
                 filtered = [],
                 i,l;
             if (req) {
                 req = req.toLowerCase();
                 for (i = 0; i<data.length; i++) {
                     var pos = data[i].raw_name.toLowerCase().indexOf(req)
                     if (pos != -1) {
                         filtered.push(data[i]);
+                    }
+                }
                 res.results = filtered;
+            }
             YUD.get('repo_count').innerHTML = res.results.length;
             return res;
+        }
         // main table sorting
         var myColumnDefs = [
             {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
             {key:"name",label:"${_('Name')}",sortable:true,
                 sortOptions: { sortFunction: nameSort }},
             {key:"desc",label:"${_('Description')}",sortable:true},
             {key:"last_change",label:"${_('Last Change')}",sortable:true,
                 sortOptions: { sortFunction: ageSort }},
             {key:"last_changeset",label:"${_('Tip')}",sortable:true,
                 sortOptions: { sortFunction: revisionSort }},
             {key:"owner",label:"${_('Owner')}",sortable:true},
             {key:"atom",label:"",sortable:false},
         ];
         var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,{
           sortedBy:{key:"name",dir:"asc"},
           paginator: new YAHOO.widget.Paginator({
               rowsPerPage: ${c.visual.lightweight_dashboard_items},
               alwaysVisible: false,
               template : "{PreviousPageLink} {FirstPageLink} {PageLinks} {LastPageLink} {NextPageLink}",
               pageLinks: 5,
               containerClass: 'pagination-wh',
               currentPageClass: 'pager_curpage',
               pageLinkClass: 'pager_link',
               nextPageLinkLabel: '&gt;',
               previousPageLinkLabel: '&lt;',
               firstPageLinkLabel: '&lt;&lt;',
               lastPageLinkLabel: '&gt;&gt;',
               containers:['user-paginator']
           }),
           MSG_SORTASC:"${_('Click to sort ascending')}",
           MSG_SORTDESC:"${_('Click to sort descending')}",
           MSG_EMPTY:"${_('No repositories found.')}",
           MSG_ERROR:"${_('Data error.')}",
           MSG_LOADING:"${_('Loading...')}",
+        }
         );
         myDataTable.subscribe('postRenderEvent',function(oArgs) {
             tooltip_activate();
             quick_repo_menu();
         });
         var filterTimeout = null;
         updateFilter  = function () {
             // Reset timeout
             filterTimeout = null;
             // Reset sort
             var state = myDataTable.getState();
             state.sortedBy = {key:'name', dir:YAHOO.widget.DataTable.CLASS_ASC};
             // Get filtered data
             myDataSource.sendRequest(YUD.get('q_filter').value,{
                 success : myDataTable.onDataReturnInitializeTable,
                 failure : myDataTable.onDataReturnInitializeTable,
                 scope   : myDataTable,
                 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) {
             clearTimeout(filterTimeout);
             filterTimeout = setTimeout(updateFilter,600);
         });
       </script>
     % endif

rhodecode/templates/journal/journal.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Journal')} &middot; ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs()">
     <h5>
     <form id="filter_form">
     <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('quick filter...')}"/>
     <span class="tooltip" title="${h.tooltip(h.journal_filter_help())}">?</span>
     <input type='submit' value="${_('filter')}" class="ui-btn" style="padding:0px 2px 0px 2px;margin:0px"/>
     ${_('journal')} - ${ungettext('%s entry', '%s entries', c.journal_pager.item_count) % (c.journal_pager.item_count)}
     </form>
     ${h.end_form()}
     </h5>
 </%def>
 <%def name="page_nav()">
     ${self.menu('journal')}
 </%def>
 <%def name="head_extra()">
 <link href="${h.url('journal_atom', api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('ATOM journal feed')}" type="application/atom+xml" />
 <link href="${h.url('journal_rss', api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('RSS journal feed')}" type="application/rss+xml" />
 </%def>
 <%def name="main()">
     <div class="box box-left">
         <!-- box / title -->
         <div class="title">
          ${self.breadcrumbs()}
          <ul class="links">
            <li>
              <span><a id="refresh" href="${h.url('journal')}"><img class="icon" title="${_('Refresh')}" alt="${_('Refresh')}" src="${h.url('/images/icons/arrow_refresh.png')}"/></a></span>
            </li>
            <li>
              <span><a href="${h.url('journal_atom', api_key=c.rhodecode_user.api_key)}"><img class="icon" title="${_('ATOM feed')}" alt="${_('ATOM feed')}" src="${h.url('/images/icons/rss_16.png')}"/></a></span>
            </li>
          </ul>
         </div>
         <div id="journal">${c.journal_data}</div>
     </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>
                  <span><a id="show_my" class="link-white" href="#my">${_('My repos')}</a> </span>
                </li>
              </ul>
         </div>
         <!-- end box / title -->
         <div id="my_container" style="display:none">
             <div class="table yui-skin-sam" id="repos_list_wrap"></div>
             <div id="user-paginator" style="padding: 0px 0px 0px 20px"></div>
         </div>
         <div id="watched_container">
             <div class="table yui-skin-sam" id="watched_repos_list_wrap"></div>
             <div id="watched-user-paginator" style="padding: 0px 0px 0px 20px"></div>
         </div>
     </div>
     <script type="text/javascript">
     YUE.on('j_filter','click',function(){
         var jfilter = YUD.get('j_filter');
         if(YUD.hasClass(jfilter, 'initial')){
             jfilter.value = '';
+        }
     });
     var fix_j_filter_width = function(len){
         YUD.setStyle(YUD.get('j_filter'),'width',Math.max(80, len*6.50)+'px');
+    }
     YUE.on('j_filter','keyup',function(){
         fix_j_filter_width(YUD.get('j_filter').value.length);
     });
     YUE.on('filter_form','submit',function(e){
         YUE.preventDefault(e)
         var val = YUD.get('j_filter').value;
         window.location = "${url.current(filter='__FILTER__')}".replace('__FILTER__',val);
     });
     fix_j_filter_width(YUD.get('j_filter').value.length);
     YUE.on('refresh','click',function(e){
         ypjax("${h.url.current(filter=c.search_term)}","journal",function(){
             show_more_event();
             tooltip_activate();
             show_changeset_tooltip();
             });
         YUE.preventDefault(e);
     });
     var show_my = function(e){
         YUD.setStyle('watched_container','display','none');
         YUD.setStyle('my_container','display','');
         YUD.setStyle('q_filter','display','');
         YUD.setStyle('q_filter_watched','display','none');
         YUD.addClass('show_my', 'current');
         YUD.removeClass('show_watched','current');
         if(!YUD.hasClass('show_my', 'loaded')){
             table_renderer(${c.data |n});
             YUD.addClass('show_my', 'loaded');
+        }
+    }
     YUE.on('show_my','click',function(e){
         show_my(e);
     })
     var show_watched = function(e){
         YUD.setStyle('my_container','display','none');
         YUD.setStyle('watched_container','display','');
         YUD.setStyle('q_filter_watched','display','');
         YUD.setStyle('q_filter','display','none');
         YUD.addClass('show_watched', 'current');
         YUD.removeClass('show_my','current');
         if(!YUD.hasClass('show_watched', 'loaded')){
             watched_renderer(${c.watched_data |n});
             YUD.addClass('show_watched', 'loaded');
+        }
         return
         var nodes = YUQ('#watched_container .watched_repo a');
         var target = 'q_filter';
         var func = function(node){
             return node.parentNode.parentNode;
+        }
         q_filter(target,nodes,func);
+    }
     YUE.on('show_watched','click',function(e){
         show_watched(e);
     })
     //init watched
     show_watched();
     var tabs = {
         'watched': show_watched,
         'my': show_my,
+    }
     var url = location.href.split('#');
     if (url[1]) {
         //We have a hash
         var tabHash = url[1];
         var func = tabs[tabHash]
         if (func){
             func();
+        }
+    }
     function watched_renderer(data){
         var myDataSource = new YAHOO.util.DataSource(data);
         myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
         myDataSource.responseSchema = {
             resultsList: "records",
             fields: [
                {key:"menu"},
                {key:"raw_name"},
                {key:"name"},
                {key:"last_changeset"},
                {key:"action"},
+            ]
          };
         myDataSource.doBeforeCallback = function(req,raw,res,cb) {
             // This is the filter function
             var data     = res.results || [],
                 filtered = [],
                 i,l;
             if (req) {
                 req = req.toLowerCase();
                 for (i = 0; i<data.length; i++) {
                     var pos = data[i].raw_name.toLowerCase().indexOf(req)
                     if (pos != -1) {
                         filtered.push(data[i]);
+                    }
+                }
                 res.results = filtered;
+            }
             return res;
+        }
         // main table sorting
         var myColumnDefs = [
             {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
             {key:"name",label:"${_('Name')}",sortable:true,
                 sortOptions: { sortFunction: nameSort }},
             {key:"last_changeset",label:"${_('Tip')}",sortable:true,
                 sortOptions: { sortFunction: revisionSort }},
             {key:"action",label:"${_('Action')}",sortable:false},
         ];
         var myDataTable = new YAHOO.widget.DataTable("watched_repos_list_wrap", myColumnDefs, myDataSource,{
           sortedBy:{key:"name",dir:"asc"},
           paginator: new YAHOO.widget.Paginator({
               rowsPerPage: 25,
               alwaysVisible: false,
               template : "{PreviousPageLink} {FirstPageLink} {PageLinks} {LastPageLink} {NextPageLink}",
               pageLinks: 5,
               containerClass: 'pagination-wh',
               currentPageClass: 'pager_curpage',
               pageLinkClass: 'pager_link',
               nextPageLinkLabel: '&gt;',
               previousPageLinkLabel: '&lt;',
               firstPageLinkLabel: '&lt;&lt;',
               lastPageLinkLabel: '&gt;&gt;',
               containers:['watched-user-paginator']
           }),
           MSG_SORTASC:"${_('Click to sort ascending')}",
           MSG_SORTDESC:"${_('Click to sort descending')}",
           MSG_EMPTY:"${_('No records found.')}",
           MSG_ERROR:"${_('Data error.')}",
           MSG_LOADING:"${_('Loading...')}",
+        }
         );
         myDataTable.subscribe('postRenderEvent',function(oArgs) {
             tooltip_activate();
             quick_repo_menu();
         });
         var filterTimeout = null;
         updateFilter  = function () {
             // Reset timeout
             filterTimeout = null;
             // Reset sort
             var state = myDataTable.getState();
             state.sortedBy = {key:'name', dir:YAHOO.widget.DataTable.CLASS_ASC};
             // Get filtered data
             myDataSource.sendRequest(YUD.get('q_filter_watched').value,{
                 success : myDataTable.onDataReturnInitializeTable,
                 failure : myDataTable.onDataReturnInitializeTable,
                 scope   : myDataTable,
                 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) {
             clearTimeout(filterTimeout);
             filterTimeout = setTimeout(updateFilter,600);
         });
+      }
     function table_renderer(data){
         var myDataSource = new YAHOO.util.DataSource(data);
         myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
         myDataSource.responseSchema = {
             resultsList: "records",
             fields: [
                {key:"menu"},
                {key:"raw_name"},
                {key:"name"},
                {key:"last_changeset"},
                {key:"action"},
+            ]
          };
         myDataSource.doBeforeCallback = function(req,raw,res,cb) {
             // This is the filter function
             var data     = res.results || [],
                 filtered = [],
                 i,l;
             if (req) {
                 req = req.toLowerCase();
                 for (i = 0; i<data.length; i++) {
                     var pos = data[i].raw_name.toLowerCase().indexOf(req)
                     if (pos != -1) {
                         filtered.push(data[i]);
+                    }
+                }
                 res.results = filtered;
+            }
             return res;
+        }
         // main table sorting
         var myColumnDefs = [
             {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
             {key:"name",label:"${_('Name')}",sortable:true,
                 sortOptions: { sortFunction: nameSort }},
             {key:"last_changeset",label:"${_('Tip')}",sortable:true,
                 sortOptions: { sortFunction: revisionSort }},
             {key:"action",label:"${_('Action')}",sortable:false},
         ];
         var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,{
           sortedBy:{key:"name",dir:"asc"},
           paginator: new YAHOO.widget.Paginator({
               rowsPerPage: 25,
               alwaysVisible: false,
               template : "{PreviousPageLink} {FirstPageLink} {PageLinks} {LastPageLink} {NextPageLink}",
               pageLinks: 5,
               containerClass: 'pagination-wh',
               currentPageClass: 'pager_curpage',
               pageLinkClass: 'pager_link',
               nextPageLinkLabel: '&gt;',
               previousPageLinkLabel: '&lt;',
               firstPageLinkLabel: '&lt;&lt;',
               lastPageLinkLabel: '&gt;&gt;',
               containers:['user-paginator']
           }),
           MSG_SORTASC:"${_('Click to sort ascending')}",
           MSG_SORTDESC:"${_('Click to sort descending')}",
           MSG_EMPTY:"${_('No records found.')}",
           MSG_ERROR:"${_('Data error.')}",
           MSG_LOADING:"${_('Loading...')}",
+        }
         );
         myDataTable.subscribe('postRenderEvent',function(oArgs) {
             tooltip_activate();
             quick_repo_menu();
         });
         var filterTimeout = null;
         updateFilter  = function () {
             // Reset timeout
             filterTimeout = null;
             // Reset sort
             var state = myDataTable.getState();
             state.sortedBy = {key:'name', dir:YAHOO.widget.DataTable.CLASS_ASC};
             // Get filtered data
             myDataSource.sendRequest(YUD.get('q_filter').value,{
                 success : myDataTable.onDataReturnInitializeTable,
                 failure : myDataTable.onDataReturnInitializeTable,
                 scope   : myDataTable,
                 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) {
             clearTimeout(filterTimeout);
             filterTimeout = setTimeout(updateFilter,600);
         });
+      }
     </script>
 </%def>

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"/>
       %elif not repo['dbrepo']['private'] and c.visual.show_public_icon:
              <img src="${h.url('/images/icons/lock_open.png')}" alt="${_('Public repository')}" class="repo_switcher_type" />
       %endif
       ${h.link_to(repo['name'],h.url('summary_home',repo_name=repo['name']),class_="repo_name thin %s" % repo['dbrepo']['repo_type'])}
     </li>
 %endfor

rhodecode/templates/tags/tags.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%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>
 <%def name="main()">
 ${self.context_bar('switch-to')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     %if c.repo_tags:
     <div class="info_box" id="compare_tags" style="clear: both;padding: 10px 19px;text-align: right;"><a href="#" class="ui-btn small">${_('Compare tags')}</a></div>
     %endif
     <div class="table">
         <%include file='tags_data.html'/>
     </div>
 </div>
 <script type="text/javascript">
 YUE.on('compare_tags','click',function(e){
     YUE.preventDefault(e);
     var org = YUQ('input[name=compare_org]:checked')[0];
     var other = YUQ('input[name=compare_other]:checked')[0];
     if(org && other){
         var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='tag',org_ref='__ORG__',other_ref_type='tag',other_ref='__OTHER__')}";
         var u = compare_url.replace('__ORG__',org.value)
                            .replace('__OTHER__',other.value);
         window.location=u;
+    }
 });
 // main table sorting
 var myColumnDefs = [
     {key:"name",label:"${_('Name')}",sortable:true},
     {key:"date",label:"${_('Date')}",sortable:true,
         sortOptions: { sortFunction: dateSort }},
     {key:"author",label:"${_('Author')}",sortable:true},
     {key:"revision",label:"${_('Revision')}",sortable:true,
         sortOptions: { sortFunction: revisionSort }},
     {key:"compare",label:"${_('Compare')}",sortable:false,},
 ];
 var myDataSource = new YAHOO.util.DataSource(YUD.get("tags_data"));
 myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
 myDataSource.responseSchema = {
     fields: [
         {key:"name"},
         {key:"date"},
         {key:"author"},
         {key:"revision"},
         {key:"compare"},
+    ]
 };
 var myDataTable = new YAHOO.widget.DataTable("table_wrap", myColumnDefs, myDataSource,
+        {
          sortedBy:{key:"name",dir:"asc"},
          MSG_SORTASC:"${_('Click to sort ascending')}",
          MSG_SORTDESC:"${_('Click to sort descending')}",
          MSG_EMPTY:"${_('No records found.')}",
          MSG_ERROR:"${_('Data error.')}",
          MSG_LOADING:"${_('Loading...')}",
+        }
 );
 myDataTable.subscribe('postRenderEvent',function(oArgs) {
     tooltip_activate();
     var func = function(node){
         return node.parentNode.parentNode.parentNode.parentNode.parentNode;
+    }
     q_filter('q_filter_tags',YUQ('div.table tr td .logtags .tagtag a'),func);
 });
 </script>
 </%def>

0 comments (0 inline, 0 general)