kallithea Changeset - cc5300a1f2ac

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 26 insertions and 4 deletions:

kallithea/public/css/style.css

kallithea/templates/pullrequests/pullrequest.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -4759,96 +4759,104 @@ PULL REQUESTS @@
     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;

kallithea/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -165,70 +165,84 @@ ${self.repo_context_bar('showpullrequest @@
       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)
   YUE.on('org_ref', 'change', function(e){
       $("#org_ref").select2({
           dropdownAutoWidth: true,
       });
       $("#org_ref").on("change", function(e){
      loadPreview();
   });
   YUE.on('other_repo', 'change', function(e){
       $("#other_repo").select2({
           dropdownAutoWidth: true,
       });
       $("#other_repo").on("change", function(e){
       otherrepoChanged();
       loadPreview();
   });
   YUE.on('other_ref', 'change', function(e){
       $("#other_ref").select2({
           dropdownAutoWidth: true,
       });
       $("#other_ref").on("change", function(e){
      loadPreview();
   });
   otherrepoChanged();
   //lazy load overview after 0.5s
   setTimeout(loadPreview, 500);
   });
 </script>
 </%def>

0 comments (0 inline, 0 general)