Changeset - cc5300a1f2ac
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Mads Kiilerich - 11 years ago 2014-07-04 14:12:06
madski@unity3d.com
pull requests: use select2 for branch and revision selection
2 files changed with 36 insertions and 14 deletions:
kallithea/public/css/style.css
8
kallithea/templates/pullrequests/pullrequest.html
28
14
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -4711,192 +4711,200 @@ form.comment-inline-form {
 
    height: 24px;
 
    float: left
 
}
 
.notification-list .container.unread {
 
    background: none repeat scroll 0 0 rgba(255, 255, 180, 0.6);
 
}
 
.notification-header .gravatar {
 
    background: none repeat scroll 0 0 transparent;
 
    padding: 0px 0px 0px 8px;
 
}
 
.notification-list .container .notification-header .desc {
 
    font-weight: bold;
 
    font-size: 17px;
 
}
 
.notification-table {
 
    border: 1px solid #ccc;
 
    -webkit-border-radius: 6px 6px 6px 6px;
 
    border-radius: 6px 6px 6px 6px;
 
    clear: both;
 
    margin: 0px 20px 0px 20px;
 
}
 
.notification-header .delete-notifications {
 
    float: right;
 
    padding-top: 8px;
 
    cursor: pointer;
 
}
 
.notification-header .read-notifications {
 
    float: right;
 
    padding-top: 8px;
 
    cursor: pointer;
 
}
 
.notification-subject {
 
    clear: both;
 
    border-bottom: 1px solid #eee;
 
    padding: 5px 0px 5px 38px;
 
}
 

			




	
	
	
		
 
.notification-body {

			




	
	
	
		
 
    clear: both;

			




	
	
	
		
 
    margin: 34px 2px 2px 8px

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/****

			




	
	
	
		
 
PULL REQUESTS

			




	
	
	
		
 
*****/

			




	
	
	
		
 
.pullrequests_section_head {

			




	
	
	
		
 
    padding: 10px 10px 10px 0px;

			




	
	
	
		
 
    font-size: 16px;

			




	
	
	
		
 
    font-weight: bold;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.pr-details-title.closed,

			




	
	
	
		
 
#pullrequests_container li.closed div div

			




	
	
	
		
 
 {

			




	
	
	
		
 
    color: #555;

			




	
	
	
		
 
    background: #eee;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.pr-title {

			




	
	
	
		
 
    font-size: 1.6em;

			




	
	
	
		
 
}

			




	
	
	
		
 
div.pr-details-title {

			




	
	
	
		
 
    font-size: 1.6em;

			




	
	
	
		
 
    padding: 5px 0px 5px 10px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.pr {

			




	
	
	
		
 
    margin: 0px 20px;

			




	
	
	
		
 
    padding: 4px 4px;

			




	
	
	
		
 
}

			




	
	
	
		
 
div.pr-desc {

			




	
	
	
		
 
    margin: 0px 20px;

			




	
	
	
		
 
}

			




	
	
	
		
 
div.pr-closed {

			




	
	
	
		
 
    background-color: #eee;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
span.pr-closed-tag {

			




	
	
	
		
 
    margin-bottom: 1px;

			




	
	
	
		
 
    margin-right: 1px;

			




	
	
	
		
 
    padding: 1px 3px;

			




	
	
	
		
 
    font-size: 10px;

			




	
	
	
		
 
    padding: 1px 3px 1px 3px;

			




	
	
	
		
 
    font-size: 10px;

			




	
	
	
		
 
    color: #577632;

			




	
	
	
		
 
    white-space: nowrap;

			




	
	
	
		
 
    -webkit-border-radius: 4px;

			




	
	
	
		
 
    border-radius: 4px;

			




	
	
	
		
 
    border: 1px solid #d9e8f8;

			




	
	
	
		
 
    line-height: 1.5em;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.pr-box {

			




	
	
	
		
 
    max-width: 978px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#s2id_org_ref,

			




	
	
	
		
 
#s2id_other_ref,

			




	
	
	
		
 
#s2id_org_repo,

			




	
	
	
		
 
#s2id_other_repo {

			




	
	
	
		
 
    min-width: 150px;

			




	
	
	
		
 
    margin: 5px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/****

			




	
	
	
		
 
  PERMS

			




	
	
	
		
 
*****/

			




	
	
	
		
 
#perms .perms_section_head {

			




	
	
	
		
 
    padding: 10px 10px 10px 0px;

			




	
	
	
		
 
    font-size: 16px;

			




	
	
	
		
 
    font-weight: bold;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#perms .perm_tag {

			




	
	
	
		
 
    padding: 1px 3px 1px 3px;

			




	
	
	
		
 
    font-size: 10px;

			




	
	
	
		
 
    font-weight: bold;

			




	
	
	
		
 
    text-transform: uppercase;

			




	
	
	
		
 
    white-space: nowrap;

			




	
	
	
		
 
    -webkit-border-radius: 3px;

			




	
	
	
		
 
    border-radius: 3px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#perms .perm_tag.admin {

			




	
	
	
		
 
    background-color: #B94A48;

			




	
	
	
		
 
    color: #ffffff;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#perms .perm_tag.write {

			




	
	
	
		
 
    background-color: #DB7525;

			




	
	
	
		
 
    color: #ffffff;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#perms .perm_tag.read {

			




	
	
	
		
 
    background-color: #468847;

			




	
	
	
		
 
    color: #ffffff;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#perms .perm_tag.none {

			




	
	
	
		
 
    background-color: #bfbfbf;

			




	
	
	
		
 
    color: #ffffff;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.perm-gravatar {

			




	
	
	
		
 
    vertical-align: middle;

			




	
	
	
		
 
    padding: 2px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.perm-gravatar-ac {

			




	
	
	
		
 
    vertical-align: middle;

			




	
	
	
		
 
    padding: 2px;

			




	
	
	
		
 
    width: 14px;

			




	
	
	
		
 
    height: 14px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/*****************************************************************************

			




	
	
	
		
 
                                  DIFFS CSS

			




	
	
	
		
 
******************************************************************************/

			




	
	
	
		
 
.diff-collapse {

			




	
	
	
		
 
    text-align: center;

			




	
	
	
		
 
    margin-bottom: -15px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.diff-collapse-button {

			




	
	
	
		
 
    cursor: pointer;

			




	
	
	
		
 
    color: #666;

			




	
	
	
		
 
    font-size: 16px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.diff-container {

			




	
	
	
		
 

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.diff-container.hidden {

			




	
	
	
		
 
    display: none;

			




	
	
	
		
 
    overflow: hidden;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
div.diffblock {

			




	
	
	
		
 
    overflow: auto;

			




	
	
	
		
 
    padding: 0px;

			




	
	
	
		
 
    border: 1px solid #ccc;

			




	
	
	
		
 
    background: #f8f8f8;

			




	
	
	
		
 
    font-size: 100%;

			




	
	
	
		
 
    line-height: 100%;

			




	
	
	
		
 
    /* new */

			




	
	
	
		
 
    line-height: 125%;

			




	
	
	
		
 
    -webkit-border-radius: 6px 6px 0px 0px;

			




	
	
	
		
 
    border-radius: 6px 6px 0px 0px;

			




	
	
	
		
 
}

			




	
	
	
		
 
div.diffblock.margined {

			




	
	
	
		
 
    margin: 0px 20px 0px 20px;

			




	
	
	
		
 
}

			




	
	
	
		
 
div.diffblock .code-header {

			




	
	
	
		
 
    border-bottom: 1px solid #CCCCCC;

			




	
	
	
		
 
    background: #EEEEEE;

			




	
	
	
		
 
    padding: 10px 0 10px 0;

			




	
	
	
		
 
    min-height: 14px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.diffblock .code-header.banner {

			




	
	
	
		
 
    border-bottom: 1px solid #CCCCCC;

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -117,118 +117,132 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
                <div class="reviewer_ac">

			




	
	
	
		
 
                   ${h.text('user', class_='yui-ac-input',placeholder=_('Type name of reviewer to add'))}

			




	
	
	
		
 
                   <div id="reviewers_container"></div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div style="clear:both;padding: 0 0 30px 0;"></div>

			




	
	
	
		
 

			




	
	
	
		
 
        <h4>${_('Changesets')}</h4>

			




	
	
	
		
 
        <div style="float:left;padding:0px 30px 30px 30px">

			




	
	
	
		
 
           ## overview pulled by ajax

			




	
	
	
		
 
           <div style="float:left" id="pull_request_overview"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div style="clear:both;"></div>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ${h.end_form()}

			




	
	
	
		
 

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<script type="text/javascript" src="${h.url('/js/graph.js')}"></script>

			




	
	
	
		
 
<script type="text/javascript">

			




	
	
	
		
 
  var _USERS_AC_DATA = ${c.users_array|n};

			




	
	
	
		
 
  var _GROUPS_AC_DATA = ${c.user_groups_array|n};

			




	
	
	
		
 
  PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA);

			




	
	
	
		
 

			




	
	
	
		
 
  var other_repos_info = ${c.other_repos_info|n};

			




	
	
	
		
 

			




	
	
	
		
 
  var otherrepoChanged = function(){

			




	
	
	
		
 
      var sel_box = YUQ('#pull_request_form #other_repo')[0];

			




	
	
	
		
 
      var repo_name = sel_box.options[sel_box.selectedIndex].value;

			




	
	
	
		
 
      var _tmpl = "<b>${_('Destination repository')}</b>: {0}".format(other_repos_info[repo_name]['description']);

			




	
	
	
		
 
      YUD.get('other_repo_desc').innerHTML = _tmpl

			




	
	
	
		
 
      // replace options of other_ref with the ones for the current other_repo

			




	
	
	
		
 
      var other_ref_selector = YUD.get('other_ref');

			




	
	
	
		
 
      var new_select = YUD.createElementFromMarkup(other_repos_info[repo_name]['revs']);

			




	
	
	
		
 
      var new_selectedIndex = new_select.selectedIndex;

			




	
	
	
		
 
      other_ref_selector.innerHTML = ""; // clear old options

			




	
	
	
		
 
      while (new_select.length > 0){ // children will be popped when appened to other_ref_selector

			




	
	
	
		
 
          other_ref_selector.appendChild(new_select.children[0]);

			




	
	
	
		
 
      }

			




	
	
	
		
 
      // browsers lost track of selected when appendChild was used

			




	
	
	
		
 
      other_ref_selector.selectedIndex = new_selectedIndex;

			




	
	
	
		
 

			




	
	
	
		
 
      // reset && add the reviewer based on selected repo

			




	
	
	
		
 
      var _data = other_repos_info[repo_name];

			




	
	
	
		
 
      YUD.get('review_members').innerHTML = '';

			




	
	
	
		
 
      addReviewMember(_data.user.user_id, _data.user.firstname,

			




	
	
	
		
 
                      _data.user.lastname, _data.user.username,

			




	
	
	
		
 
                      _data.user.gravatar_link);

			




	
	
	
		
 
  }

			




	
	
	
		
 

			




	
	
	
		
 
  var loadPreview = function(){

			




	
	
	
		
 
      //url template

			




	
	
	
		
 
      var url = "${h.url('compare_url',

			




	
	
	
		
 
                         repo_name='__other_repo__',

			




	
	
	
		
 
                         org_ref_type='rev',

			




	
	
	
		
 
                         org_ref_name='__other_ref_name__',

			




	
	
	
		
 
                         other_repo='__org_repo__',

			




	
	
	
		
 
                         other_ref_type='rev',

			




	
	
	
		
 
                         other_ref_name='__org_ref_name__',

			




	
	
	
		
 
                         as_form=True,

			




	
	
	
		
 
                         merge=True,

			




	
	
	
		
 
                         )}";

			




	
	
	
		
 
      var org_repo = YUQ('#pull_request_form #org_repo')[0].value;

			




	
	
	
		
 
      var org_ref = YUQ('#pull_request_form #org_ref')[0].value.split(':');

			




	
	
	
		
 
      ## TODO: make nice link like link_to_ref() do

			




	
	
	
		
 
      YUD.get('org_rev_span').innerHTML = org_ref[2].substr(0,12);

			




	
	
	
		
 

			




	
	
	
		
 
      var other_repo = YUQ('#pull_request_form #other_repo')[0].value;

			




	
	
	
		
 
      var other_ref = YUQ('#pull_request_form #other_ref')[0].value.split(':');

			




	
	
	
		
 
      YUD.get('other_rev_span').innerHTML = other_ref[2].substr(0,12);

			




	
	
	
		
 

			




	
	
	
		
 
      var select_refs = YUQ('#pull_request_form select.refs')

			




	
	
	
		
 
      var rev_data = {

			




	
	
	
		
 
          '__org_repo__': org_repo,

			




	
	
	
		
 
          '__org_ref_name__': org_ref[2],

			




	
	
	
		
 
          '__other_repo__': other_repo,

			




	
	
	
		
 
          '__other_ref_name__': other_ref[2],

			




	
	
	
		
 
      }; // gather the org/other ref and repo here

			




	
	
	
		
 

			




	
	
	
		
 
      for (k in rev_data){

			




	
	
	
		
 
          url = url.replace(k,rev_data[k]);

			




	
	
	
		
 
      }

			




	
	
	
		
 

			




	
	
	
		
 
      YUD.get('pull_request_overview').innerHTML = "${_('Loading ...')}";

			




	
	
	
		
 
      ypjax(url,'pull_request_overview', function(o){

			




	
	
	
		
 
          var jsdata = eval('('+YUD.get('jsdata').innerHTML+')');

			




	
	
	
		
 
          var r = new BranchRenderer('graph_canvas', 'graph_content_pr');

			




	
	
	
		
 
          r.render(jsdata,100);

			




	
	
	
		
 
      });

			




	
	
	
		
 
  }

			




	
	
	
		
 

			




	
	
	
		
 
  ## refresh automatically when something changes (org_repo can't change)

			




	
	
	
		
 
  YAHOO.util.Event.onDOMReady(function(){

			




	
	
	
		
 
      $("#org_repo").select2({

			




	
	
	
		
 
          dropdownAutoWidth: true,

			




	
	
	
		
 
      });

			




	
	
	
		
 
      ## (org_repo can't change)

			




	
	
	
		
 

			




	
	
	
		
 
      $("#org_ref").select2({

			




	
	
	
		
 
          dropdownAutoWidth: true,

			




	
	
	
		
 
      });

			




	
	
	
		
 
      $("#org_ref").on("change", function(e){

			




	
	
	
		
 
          loadPreview();

			




	
	
	
		
 
      });

			




	
	
	
		
 

			




	
	
	
		
 
  YUE.on('org_ref', 'change', function(e){

			




	
	
	
		
 
     loadPreview();

			




	
	
	
		
 
  });

			




	
	
	
		
 
      $("#other_repo").select2({

			




	
	
	
		
 
          dropdownAutoWidth: true,

			




	
	
	
		
 
      });

			




	
	
	
		
 
      $("#other_repo").on("change", function(e){

			




	
	
	
		
 
          otherrepoChanged();

			




	
	
	
		
 
          loadPreview();

			




	
	
	
		
 
      });

			




	
	
	
		
 

			




	
	
	
		
 
  YUE.on('other_repo', 'change', function(e){

			




	
	
	
		
 
      $("#other_ref").select2({

			




	
	
	
		
 
          dropdownAutoWidth: true,

			




	
	
	
		
 
      });

			




	
	
	
		
 
      $("#other_ref").on("change", function(e){

			




	
	
	
		
 
          loadPreview();

			




	
	
	
		
 
      });

			




	
	
	
		
 

			




	
	
	
		
 
      otherrepoChanged();

			




	
	
	
		
 
      loadPreview();

			




	
	
	
		
 
      //lazy load overview after 0.5s

			




	
	
	
		
 
      setTimeout(loadPreview, 500);

			




	
	
	
		
 
  });

			




	
	
	
		
 

			




	
	
	
		
 
  YUE.on('other_ref', 'change', function(e){

			




	
	
	
		
 
     loadPreview();

			




	
	
	
		
 
  });

			




	
	
	
		
 

			




	
	
	
		
 
  otherrepoChanged();

			




	
	
	
		
 
  //lazy load overview after 0.5s

			




	
	
	
		
 
  setTimeout(loadPreview, 500);

			




	
	
	
		
 

			




	
	
	
		
 
</script>

			




	
	
	
		
 

			




	
	
	
		
 
</%def>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.