kallithea Changeset - 6776f4e569d7

Changeset - 6776f4e569d7

Parent rev.

Child rev.

[Not reviewed]

codereview

0 2 0

Marcin Kuzminski - 13 years ago 2012-06-06 01:01:33
marcin@python-works.com

Moved select widget to rhodecode.js

2 files changed with 141 insertions and 138 deletions:

rhodecode/public/js/rhodecode.js

140

rhodecode/templates/admin/users_groups/users_group_edit.html

136

0 comments (0 inline, 0 general)

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -112,193 +112,193 @@ ColorGenerator.prototype = { @@
         if (i == 4)
             return [t, p, v]
         if (i == 5)
             return [v, p, q]
     },
     generateColor:function(){
         this.CURRENT_RATIO = this.CURRENT_RATIO+this.GOLDEN_RATIO;
         this.CURRENT_RATIO = this.CURRENT_RATIO %= 1;
         HSV_tuple = [this.CURRENT_RATIO, this.HSV_1, this.HSV_2]
         RGB_tuple = this._hsvToRgb(HSV_tuple[0],HSV_tuple[1],HSV_tuple[2]);
         function toRgb(v){
         	return ""+parseInt(v*256)
+        }
         return [toRgb(RGB_tuple[0]),toRgb(RGB_tuple[1]),toRgb(RGB_tuple[2])];
+    }
+}
 /**
  * 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='ERROR';
+			YUD.get(container).innerHTML='ERROR '+o.status;
 			YUD.setStyle(container,'opacity','1.0');
 			YUD.setStyle(container,'color','red');
+		}
 	},args);
 };
 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(){
     function toolTipsId(){
         var ids = [];
         var tts = YUQ('.tooltip');
         for (var i = 0; i < tts.length; i++) {
             // if element doesn't not have and id
         	//  autogenerate one for tooltip
             if (!tts[i].id){
                 tts[i].id='tt'+((i*100)+tts.length);
+            }
             ids.push(tts[i].id);
+        }
         return ids
     };
     var myToolTips = new YAHOO.widget.Tooltip("tooltip", {
         context: [[toolTipsId()],"tl","bl",null,[0,5]],
         monitorresize:false,
         xyoffset :[0,0],
         autodismissdelay:300000,
         hidedelay:5,
         showdelay:20,
     });
 };
 /**
  * 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');
     });
 };
 /**
  * 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);
@@ @@ -1229,97 +1229,235 @@ var fromHTML = function(html){ @@
 var get_rev = function(node){
     var n = node.firstElementChild.firstElementChild;
     if (n===null){
         return -1
+    }
     else{
         out = n.firstElementChild.innerHTML.split(':')[0].replace('r','');
         return parseInt(out);
+    }
+}
 var get_name = function(node){
 	 var name = node.firstElementChild.children[2].innerHTML;
 	 return name
+}
 var get_group_name = function(node){
 	var name = node.firstElementChild.children[1].innerHTML;
 	return name
+}
 var get_date = function(node){
 	var date_ = node.firstElementChild.innerHTML;
 	return date_
+}
 var revisionSort = function(a, b, desc, field) {
 	  var a_ = fromHTML(a.getData(field));
 	  var b_ = fromHTML(b.getData(field));
 	  // extract revisions from string nodes
 	  a_ = get_rev(a_)
 	  b_ = get_rev(b_)
 	  var comp = YAHOO.util.Sort.compare;
 	  var compState = comp(a_, b_, desc);
 	  return compState;
 };
 var ageSort = function(a, b, desc, field) {
     var a_ = a.getData(field);
     var b_ = b.getData(field);
     var comp = YAHOO.util.Sort.compare;
     var compState = comp(a_, b_, desc);
     return compState;
 };
 var nameSort = function(a, b, desc, field) {
     var a_ = fromHTML(a.getData(field));
     var b_ = fromHTML(b.getData(field));
     // extract name from table
     a_ = get_name(a_)
     b_ = get_name(b_)
     var comp = YAHOO.util.Sort.compare;
     var compState = comp(a_, b_, desc);
     return compState;
 };
 var permNameSort = function(a, b, desc, field) {
     var a_ = fromHTML(a.getData(field));
     var b_ = fromHTML(b.getData(field));
     // extract name from table
     a_ = a_.children[0].innerHTML;
     b_ = b_.children[0].innerHTML;
     var comp = YAHOO.util.Sort.compare;
     var compState = comp(a_, b_, desc);
     return compState;
 };
 var groupNameSort = function(a, b, desc, field) {
     var a_ = fromHTML(a.getData(field));
     var b_ = fromHTML(b.getData(field));
     // extract name from table
     a_ = get_group_name(a_)
     b_ = get_group_name(b_)
     var comp = YAHOO.util.Sort.compare;
     var compState = comp(a_, b_, desc);
     return compState;
 };
 var dateSort = function(a, b, desc, field) {
     var a_ = fromHTML(a.getData(field));
     var b_ = fromHTML(b.getData(field));
     // extract name from table
     a_ = get_date(a_)
     b_ = get_date(b_)
     var comp = YAHOO.util.Sort.compare;
     var compState = comp(a_, b_, desc);
     return compState;
 };
@@ \ No newline at end of file @@
 };
 /* Multi selectors */
 var MultiSelectWidget = function(selected_id, available_id, form_id){
 	//definition of containers ID's
 	var selected_container = selected_id;
 	var available_container = available_id;
 	//temp container for selected storage.
 	var cache = new Array();
 	var av_cache = new Array();
 	var c =  YUD.get(selected_container);
 	var ac = YUD.get(available_container);
 	//get only selected options for further fullfilment
 	for(var i = 0;node =c.options[i];i++){
 	    if(node.selected){
 	        //push selected to my temp storage left overs :)
 	        cache.push(node);
+	    }
+	}
 	//get all available options to cache
 	for(var i = 0;node =ac.options[i];i++){
 	        //push selected to my temp storage left overs :)
 	        av_cache.push(node);
+	}
 	//fill available only with those not in choosen
 	ac.options.length=0;
 	tmp_cache = new Array();
 	for(var i = 0;node = av_cache[i];i++){
 	    var add = true;
 	    for(var i2 = 0;node_2 = cache[i2];i2++){
 	        if(node.value == node_2.value){
 	            add=false;
 	            break;
+	        }
+	    }
 	    if(add){
 	        tmp_cache.push(new Option(node.text, node.value, false, false));
+	    }
+	}
 	for(var i = 0;node = tmp_cache[i];i++){
 	    ac.options[i] = node;
+	}
 	function prompts_action_callback(e){
 	    var choosen = YUD.get(selected_container);
 	    var available = YUD.get(available_container);
 	    //get checked and unchecked options from field
 	    function get_checked(from_field){
 	        //temp container for storage.
 	        var sel_cache = new Array();
 	        var oth_cache = new Array();
 	        for(var i = 0;node = from_field.options[i];i++){
 	            if(node.selected){
 	                //push selected fields :)
 	                sel_cache.push(node);
+	            }
 	            else{
 	                oth_cache.push(node)
+	            }
+	        }
 	        return [sel_cache,oth_cache]
+	    }
 	    //fill the field with given options
 	    function fill_with(field,options){
 	        //clear firtst
 	        field.options.length=0;
 	        for(var i = 0;node = options[i];i++){
 	                field.options[i]=new Option(node.text, node.value,
 	                        false, false);
+	        }
+	    }
 	    //adds to current field
 	    function add_to(field,options){
 	        for(var i = 0;node = options[i];i++){
 	                field.appendChild(new Option(node.text, node.value,
 	                        false, false));
+	        }
+	    }
 	    // add action
 	    if (this.id=='add_element'){
 	        var c = get_checked(available);
 	        add_to(choosen,c[0]);
 	        fill_with(available,c[1]);
+	    }
 	    // remove action
 	    if (this.id=='remove_element'){
 	        var c = get_checked(choosen);
 	        add_to(available,c[0]);
 	        fill_with(choosen,c[1]);
+	    }
 	    // add all elements
 	    if(this.id=='add_all_elements'){
 	        for(var i=0; node = available.options[i];i++){
 	                choosen.appendChild(new Option(node.text,
 	                        node.value, false, false));
+	        }
 	        available.options.length = 0;
+	    }
 	    //remove all elements
 	    if(this.id=='remove_all_elements'){
 	        for(var i=0; node = choosen.options[i];i++){
 	            available.appendChild(new Option(node.text,
 	                    node.value, false, false));
+	        }
 	        choosen.options.length = 0;
+	    }
+	}
 	YUE.addListener(['add_element','remove_element',
 	               'add_all_elements','remove_all_elements'],'click',
 	               prompts_action_callback)
 	if (form_id !== undefined) {
 		YUE.addListener(form_id,'submit',function(){
 		    var choosen = YUD.get(selected_container);
 		    for (var i = 0; i < choosen.options.length; i++) {
 		        choosen.options[i].selected = 'selected';
+		    }
 		});
+	}
+}
@@ \ No newline at end of file @@

rhodecode/templates/admin/users_groups/users_group_edit.html

➞

Show inline comments

@@ @@ -47,234 +47,99 @@ @@
 	             </div>
 	            <div class="field">
                     <div class="label">
                         <label for="users_group_active">${_('Members')}:</label>
                     </div>
                     <div class="select">
 	                    <table>
 	                            <tr>
 	                                <td>
 	                                    <div>
 	                                        <div style="float:left">
 	                                            <div class="text" style="padding: 0px 0px 6px;">${_('Choosen group members')}</div>
 	                                            ${h.select('users_group_members',[x[0] for x in c.group_members],c.group_members,multiple=True,size=8,style="min-width:210px")}
 	                                           <div  id="remove_all_elements" style="cursor:pointer;text-align:center">
 	                                               ${_('Remove all elements')}
 	                                               <img alt="remove" style="vertical-align:text-bottom" src="${h.url('/images/icons/arrow_right.png')}"/>
 	                                           </div>
 	                                        </div>
 	                                        <div style="float:left;width:20px;padding-top:50px">
 	                                            <img alt="add" id="add_element"
 	                                                style="padding:2px;cursor:pointer"
 	                                                src="${h.url('/images/icons/arrow_left.png')}"/>
 	                                            <br />
 	                                            <img alt="remove" id="remove_element"
 	                                                style="padding:2px;cursor:pointer"
 	                                                src="${h.url('/images/icons/arrow_right.png')}"/>
 	                                        </div>
 	                                        <div style="float:left">
 	                                             <div class="text" style="padding: 0px 0px 6px;">${_('Available members')}</div>
 	                                             ${h.select('available_members',[],c.available_members,multiple=True,size=8,style="min-width:210px")}
 	                                             <div id="add_all_elements" style="cursor:pointer;text-align:center">
 	                                                   <img alt="add" style="vertical-align:text-bottom" src="${h.url('/images/icons/arrow_left.png')}"/>
 	                                                    ${_('Add all elements')}
 	                                             </div>
 	                                        </div>
 	                                    </div>
 	                                </td>
 	                            </tr>
 	                    </table>
                     </div>
                 </div>
                 <div class="buttons">
                   ${h.submit('save',_('save'),class_="ui-button")}
                 </div>
             </div>
     </div>
 ${h.end_form()}
 </div>
 <div class="box box-right">
     <!-- box / title -->
     <div class="title">
         <h5>${_('Permissions')}</h5>
     </div>
     ${h.form(url('users_group_perm', id=c.users_group.users_group_id), method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="create_repo_perm">${_('Create repositories')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('create_repo_perm',value=True)}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="ui-button")}
               ${h.reset('reset',_('Reset'),class_="ui-button")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <div class="box box-right">
     <!-- box / title -->
     <div class="title">
         <h5>${_('Group members')}</h5>
     </div>
     <div class="group_members_wrap">
       <ul class="group_members">
       %for user in c.group_members_obj:
         <li>
           <div class="group_member">
             <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email,24)}"/> </div>
             <div>${user.username}</div>
             <div>${user.full_name}</div>
           </div>
         </li>
       %endfor
       </ul>
     </div>
 </div>
 <script type="text/javascript">
 YAHOO.util.Event.onDOMReady(function(){
   var D = YAHOO.util.Dom;
   var E = YAHOO.util.Event;
   //definition of containers ID's
   var available_container = 'available_members';
   var selected_container = 'users_group_members';
   //form containing containers id
   var form_id = 'edit_users_group';
   //temp container for selected storage.
   var cache = new Array();
   var av_cache = new Array();
   var c =  D.get(selected_container);
   var ac = D.get(available_container);
   //get only selected options for further fullfilment
   for(var i = 0;node =c.options[i];i++){
       if(node.selected){
           //push selected to my temp storage left overs :)
           cache.push(node);
+      }
+  }
   //get all available options to cache
   for(var i = 0;node =ac.options[i];i++){
           //push selected to my temp storage left overs :)
           av_cache.push(node);
+  }
   //fill available only with those not in choosen
   ac.options.length=0;
   tmp_cache = new Array();
   for(var i = 0;node = av_cache[i];i++){
       var add = true;
       for(var i2 = 0;node_2 = cache[i2];i2++){
           if(node.value == node_2.value){
               add=false;
               break;
+          }
+      }
       if(add){
           tmp_cache.push(new Option(node.text, node.value, false, false));
+      }
+  }
   for(var i = 0;node = tmp_cache[i];i++){
       ac.options[i] = node;
+  }
   function prompts_action_callback(e){
       var choosen = D.get(selected_container);
       var available = D.get(available_container);
       //get checked and unchecked options from field
       function get_checked(from_field){
           //temp container for storage.
           var sel_cache = new Array();
           var oth_cache = new Array();
           for(var i = 0;node = from_field.options[i];i++){
               if(node.selected){
                   //push selected fields :)
                   sel_cache.push(node);
+              }
               else{
                   oth_cache.push(node)
+              }
+          }
           return [sel_cache,oth_cache]
+      }
       //fill the field with given options
       function fill_with(field,options){
           //clear firtst
           field.options.length=0;
           for(var i = 0;node = options[i];i++){
                   field.options[i]=new Option(node.text, node.value,
                           false, false);
+          }
+      }
       //adds to current field
       function add_to(field,options){
           for(var i = 0;node = options[i];i++){
                   field.appendChild(new Option(node.text, node.value,
                           false, false));
+          }
+      }
       // add action
       if (this.id=='add_element'){
           var c = get_checked(available);
           add_to(choosen,c[0]);
           fill_with(available,c[1]);
+      }
       // remove action
       if (this.id=='remove_element'){
           var c = get_checked(choosen);
           add_to(available,c[0]);
           fill_with(choosen,c[1]);
+      }
       // add all elements
       if(this.id=='add_all_elements'){
           for(var i=0; node = available.options[i];i++){
                   choosen.appendChild(new Option(node.text,
                           node.value, false, false));
+          }
           available.options.length = 0;
+      }
       //remove all elements
       if(this.id=='remove_all_elements'){
           for(var i=0; node = choosen.options[i];i++){
               available.appendChild(new Option(node.text,
                       node.value, false, false));
+          }
           choosen.options.length = 0;
+      }
+  }
   E.addListener(['add_element','remove_element',
                  'add_all_elements','remove_all_elements'],'click',
                  prompts_action_callback)
   E.addListener(form_id,'submit',function(){
       var choosen = D.get(selected_container);
       for (var i = 0; i < choosen.options.length; i++) {
           choosen.options[i].selected = 'selected';
+      }
   });
 });
   MultiSelectWidget('users_group_members','available_members','edit_users_group');
 </script>
 </%def>

0 comments (0 inline, 0 general)