Changeset - 486cd40776c2
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Mads Kiilerich - 11 years ago 2014-07-18 18:44:54
madski@unity3d.com
pull requests: use html placeholders for hints in input fields
3 files changed with 5 insertions and 8 deletions:
kallithea/public/css/style.css
1
1
kallithea/templates/pullrequests/pullrequest.html
3
5
kallithea/templates/pullrequests/pullrequest_show.html
1
2
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -1309,193 +1309,193 @@ tbody .yui-dt-editable { cursor: pointer
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.input.summary {

			




	
	
	
		
 
    margin: 0 0 0 110px;

			




	
	
	
		
 
}

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.input.summary-short {

			




	
	
	
		
 
    margin: 0 0 0 110px;

			




	
	
	
		
 
}

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.file {

			




	
	
	
		
 
    margin: 0 0 0 200px;

			




	
	
	
		
 
}

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.editor {

			




	
	
	
		
 
    margin: 0 0 0 200px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box-left div.form div.fields div.field div.input, #content div.box-right div.form div.fields div.field div.input {

			




	
	
	
		
 
    margin: 0 0 0 0px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.input input,

			




	
	
	
		
 
.reviewer_ac input {

			




	
	
	
		
 
    background: #FFF;

			




	
	
	
		
 
    border-top: 1px solid #b3b3b3;

			




	
	
	
		
 
    border-left: 1px solid #b3b3b3;

			




	
	
	
		
 
    border-right: 1px solid #eaeaea;

			




	
	
	
		
 
    border-bottom: 1px solid #eaeaea;

			




	
	
	
		
 
    color: #000;

			




	
	
	
		
 
    font-size: 12px;

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
    padding: 7px 7px 6px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.input input#clone_url,

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.input input#clone_url_id

			




	
	
	
		
 
{

			




	
	
	
		
 
    font-size: 16px;

			




	
	
	
		
 
    padding: 2px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.file input {

			




	
	
	
		
 
    background: none repeat scroll 0 0 #FFFFFF;

			




	
	
	
		
 
    border-color: #B3B3B3 #EAEAEA #EAEAEA #B3B3B3;

			




	
	
	
		
 
    border-style: solid;

			




	
	
	
		
 
    border-width: 1px;

			




	
	
	
		
 
    color: #000000;

			




	
	
	
		
 
    font-size: 12px;

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
    padding: 7px 7px 6px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
input.disabled {

			




	
	
	
		
 
    background-color: #F5F5F5 !important;

			




	
	
	
		
 
}

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.input input.small {

			




	
	
	
		
 
    width: 30%;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.input input.medium {

			




	
	
	
		
 
    width: 55%;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.input input.large {

			




	
	
	
		
 
    width: 85%;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.input input.date {

			




	
	
	
		
 
    width: 177px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.input input.button {

			




	
	
	
		
 
    background: #D4D0C8;

			




	
	
	
		
 
    border-top: 1px solid #FFF;

			




	
	
	
		
 
    border-left: 1px solid #FFF;

			




	
	
	
		
 
    border-right: 1px solid #404040;

			




	
	
	
		
 
    border-bottom: 1px solid #404040;

			




	
	
	
		
 
    color: #000;

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
    padding: 4px 8px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.textarea {

			




	
	
	
		
 
    border-top: 1px solid #b3b3b3;

			




	
	
	
		
 
    border-left: 1px solid #b3b3b3;

			




	
	
	
		
 
    border-right: 1px solid #eaeaea;

			




	
	
	
		
 
    border-bottom: 1px solid #eaeaea;

			




	
	
	
		
 
    margin: 0 0 0 200px;

			




	
	
	
		
 
    padding: 7px 7px 6px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.textarea-editor {

			




	
	
	
		
 
    border: 1px solid #ddd;

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.textarea textarea {

			




	
	
	
		
 
    width: 100%;

			




	
	
	
		
 
    height: 220px;

			




	
	
	
		
 
    overflow: hidden;

			




	
	
	
		
 
    overflow-y: auto;

			




	
	
	
		
 
    background: #FFF;

			




	
	
	
		
 
    color: #000;

			




	
	
	
		
 
    font-size: 12px;

			




	
	
	
		
 
    outline: none;

			




	
	
	
		
 
    border-width: 0;

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box-left div.form div.fields div.field div.textarea textarea, #content div.box-right div.form div.fields div.field div.textarea textarea {

			




	
	
	
		
 
    width: 100%;

			




	
	
	
		
 
    height: 100px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.textarea table {

			




	
	
	
		
 
    width: 100%;

			




	
	
	
		
 
    border: none;

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.textarea table td {

			




	
	
	
		
 
    background: #DDD;

			




	
	
	
		
 
    border: none;

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.textarea table td table {

			




	
	
	
		
 
    width: auto;

			




	
	
	
		
 
    border: none;

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.textarea table td table td {

			




	
	
	
		
 
    font-size: 11px;

			




	
	
	
		
 
    padding: 5px 5px 5px 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field input[type=text]:focus,

			




	
	
	
		
 
#content div.box div.form div.fields div.field input[type=password]:focus,

			




	
	
	
		
 
#content div.box div.form div.fields div.field input[type=file]:focus,

			




	
	
	
		
 
#content div.box div.form div.fields div.field textarea:focus,

			




	
	
	
		
 
#content div.box div.form div.fields div.field select:focus,

			




	
	
	
		
 
.reviewer_ac input:focus {

			




	
	
	
		
 
    background: #f6f6f6;

			




	
	
	
		
 
    border-color: #666;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.reviewer_ac {

			




	
	
	
		
 
    padding: 10px

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.form div.fields div.field div.button {

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
    padding: 0 0 0 8px;

			




	
	
	
		
 
}

			




	
	
	
		
 
#content div.box table.noborder {

			




	
	
	
		
 
    border: 1px solid transparent;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box table {

			




	
	
	
		
 
    width: 100%;

			




	
	
	
		
 
    border-collapse: separate;

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
    border: 1px solid #eee;

			




	
	
	
		
 
    -webkit-border-radius: 4px;

			




	
	
	
		
 
    border-radius: 4px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box table th {

			




	
	
	
		
 
    background: #eee;

			




	
	
	
		
 
    border-bottom: 1px solid #ddd;

			




	
	
	
		
 
    padding: 5px 0px 5px 5px;

			




	
	
	
		
 
    text-align: left;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box table th.left {

			




	
	
	
		
 
    text-align: left;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box table th.right {

			




	
	
	
		
 
    text-align: right;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box table th.center {

			




	
	
	
		
 
    text-align: center;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box table th.selected {

			




	
	
	
		
 
    vertical-align: middle;

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box table td {

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
<%inherit file="/base/base.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    ${c.repo_name} ${_('New pull request')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('New pull request')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('showpullrequest')}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')}

			




	
	
	
		
 
    <div class="form">

			




	
	
	
		
 
        <!-- fields -->

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="fields" style="float:left;width:50%;padding-right:30px;">

			




	
	
	
		
 

			




	
	
	
		
 
             <div class="field">

			




	
	
	
		
 
                <div class="label">

			




	
	
	
		
 
                    <label for="pullrequest_title">${_('Title')}:</label>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="input">

			




	
	
	
		
 
                    ${h.text('pullrequest_title', class_="large")}

			




	
	
	
		
 
                    ${h.text('pullrequest_title',class_="large",placeholder=_('Summarize the changes - or leave empty'))}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
             </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="field">

			




	
	
	
		
 
                <div class="label label-textarea">

			




	
	
	
		
 
                    <label for="pullrequest_desc">${_('Description')}:</label>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="textarea text-area editor">

			




	
	
	
		
 
                    ${h.textarea('pullrequest_desc',size=30, style="height:100px")}

			




	
	
	
		
 
                    <span class="help-block">${_('Write a short description on this pull request')}</span>

			




	
	
	
		
 
                    ${h.textarea('pullrequest_desc',size=30,placeholder=_('Write a short description on this pull request'))}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="field">

			




	
	
	
		
 
                <div class="label label-textarea">

			




	
	
	
		
 
                    <label for="pullrequest_desc">${_('Changeset flow')}:</label>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="input">

			




	
	
	
		
 
                    ##ORG

			




	
	
	
		
 
                    <div>

			




	
	
	
		
 
                        <div>

			




	
	
	
		
 
                            <div style="padding:5px 3px 3px 3px;">

			




	
	
	
		
 
                            <b>${_('Origin repository')}:</b> ${c.db_repo.description}

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                            <div>

			




	
	
	
		
 
                            ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref',c.default_org_ref,c.org_refs,class_='refs')}

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                            <div style="padding:5px 3px 3px 3px;">

			




	
	
	
		
 
                            <b>${_('Revision')}:</b> <span id="org_rev_span">-</span>

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 

			




	
	
	
		
 
                    ##OTHER, most Probably the PARENT OF THIS FORK

			




	
	
	
		
 
                    <div style="border-top: 1px solid #EEE; margin: 5px 0px 0px 0px">

			




	
	
	
		
 
                        <div>

			




	
	
	
		
 
                            ## filled with JS

			




	
	
	
		
 
                            <div id="other_repo_desc" style="padding:5px 3px 3px 3px;">

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                            <div>

			




	
	
	
		
 
                            ${h.select('other_repo',c.default_other_repo,c.other_repos,class_='refs')}:${c.default_other_repo_info['revs']}

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                            <div style="padding:5px 3px 3px 3px;">

			




	
	
	
		
 
                            <b>${_('Revision')}:</b> <span id="other_rev_span">-</span>

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                    </div>

			




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

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="field">

			




	
	
	
		
 
                <div class="buttons">

			




	
	
	
		
 
                    ${h.submit('save',_('Create Pull Request'),class_="btn")}

			




	
	
	
		
 
                    ${h.reset('reset',_('Reset'),class_="btn")}

			




	
	
	
		
 
               </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        ## Reviewers

			




	
	
	
		
 
        <div style="float:left; border-left:1px dashed #eee">

			




	
	
	
		
 
            <div class="pr-details-title">${_('Pull request reviewers')}</div>

			




	
	
	
		
 
            <div id="reviewers" style="padding:0px 0px 0px 15px">

			




	
	
	
		
 
              ## members goes here !

			




	
	
	
		
 
              <div>

			




	
	
	
		
 
                <ul id="review_members" class="group_members">

			




	
	
	
		
 
                %for member in [c.default_other_repo_info['user']]:

			




	
	
	
		
 
                  <li id="reviewer_${member['user_id']}">

			




	
	
	
		
 
                    <div class="reviewers_member">

			




	
	
	
		
 
                      <div class="gravatar"><img alt="gravatar" src="${member['gravatar_link']}"/> </div>

			




	
	
	
		
 
                      <div style="float:left">${member['firstname']} ${member['lastname']} (${_('owner')})</div>

			




	
	
	
		
 
                      <input type="hidden" value="${member['user_id']}" name="review_members" />

			




	
	
	
		
 
                      <span class="action_button" style="padding: 3px" onclick="removeReviewMember(${member['user_id']})" title="${_('Remove reviewer')}>

			




	
	
	
		
 
                          <i class="icon-remove-sign" style="color: #FF4444;"></i>

			




	
	
	
		
 
                      </span>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                  </li>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                </ul>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 

			




	
	
	
		
 
              <div class='ac'>

			




	
	
	
		
 
                <div class="reviewer_ac">

			




	
	
	
		
 
                   ${h.text('user', class_='yui-ac-input')}

			




	
	
	
		
 
                   <span class="help-block">${_('Add reviewer to this pull request.')}</span>

			




	
	
	
		
 
                   ${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">

			




	
	
	
		
 
  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');

			




	
	
	
		
 
  }

			




	
	
	
		
 

			




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

			




	
	
	
		
 

			




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

			




	
	
	
		
 
     loadPreview();

			




	
	
	
		
 
  });

			




	
	
	
		
 

			




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

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -72,194 +72,193 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
              <span><a href="${h.url('summary_home', repo_name=c.pull_request.org_repo.repo_name)}">${c.pull_request.org_repo.clone_url()}</a></span>

			




	
	
	
		
 

			




	
	
	
		
 
              ## branch link is only valid if it is a branch

			




	
	
	
		
 
              <span class="spantag"><a href="${h.url('summary_home', repo_name=c.pull_request.org_repo.repo_name, anchor=c.org_ref_name)}">${c.org_ref_type}: ${c.org_ref_name}</a></span>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Target repository')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
              <div>

			




	
	
	
		
 
              <span><a href="${h.url('summary_home', repo_name=c.pull_request.other_repo.repo_name)}">${c.pull_request.other_repo.clone_url()}</a></span>

			




	
	
	
		
 
              ## branch link is only valid if it is a branch

			




	
	
	
		
 
              <span class="spantag"><a href="${h.url('summary_home', repo_name=c.pull_request.other_repo.repo_name, anchor=c.other_ref_name)}">${c.other_ref_type}: ${c.other_ref_name}</a></span>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Pull changes')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
              <div>

			




	
	
	
		
 
               ## TODO: use cs_ranges[-1] or org_ref_parts[1] in both cases?

			




	
	
	
		
 
               %if h.is_hg(c.pull_request.org_repo):

			




	
	
	
		
 
                 <span style="font-family: monospace">hg pull ${c.pull_request.org_repo.clone_url()} -r ${h.short_id(c.cs_ranges[-1].raw_id)}</span>

			




	
	
	
		
 
               %elif h.is_git(c.pull_request.org_repo):

			




	
	
	
		
 
                 <span style="font-family: monospace">git pull ${c.pull_request.org_repo.clone_url()} ${c.pull_request.org_ref_parts[1]}</span>

			




	
	
	
		
 
               %endif

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Description')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
              <div style="white-space:pre-wrap">${h.urlify_commit(c.pull_request.description, c.repo_name)}</div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Created on')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
              <div>${h.fmt_date(c.pull_request.created_on)}</div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Created by')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
              <div class="author">

			




	
	
	
		
 
                  <div class="gravatar">

			




	
	
	
		
 
                      <img alt="gravatar" src="${h.gravatar_url(c.pull_request.author.email,20)}"/>

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
                  <span>${c.pull_request.author.username_and_name}</span><br/>

			




	
	
	
		
 
                  <span><a href="mailto:${c.pull_request.author.email}">${c.pull_request.author.email}</a></span><br/>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    ## REVIEWERS

			




	
	
	
		
 
    <div style="float:left; border-left:1px dashed #eee">

			




	
	
	
		
 
       <div class="pr-details-title">${_('Pull request reviewers')}</div>

			




	
	
	
		
 
        <div id="reviewers" style="padding:0px 0px 5px 10px">

			




	
	
	
		
 
          ## members goes here !

			




	
	
	
		
 
          <div>

			




	
	
	
		
 
            <ul id="review_members" class="group_members">

			




	
	
	
		
 
            %for member,status in c.pull_request_reviewers:

			




	
	
	
		
 
              <li id="reviewer_${member.user_id}">

			




	
	
	
		
 
                <div class="reviewers_member">

			




	
	
	
		
 
                    <div class="reviewer_status tooltip" title="${h.tooltip(h.changeset_status_lbl(status[0][1].status if status else 'not_reviewed'))}">

			




	
	
	
		
 
                      <img src="${h.url(str('/images/icons/flag_status_%s.png' % (status[0][1].status if status else 'not_reviewed')))}"/>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                  <div class="reviewer_gravatar gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div>

			




	
	
	
		
 
                  <div style="float:left;">${member.full_name} (${_('owner') if c.pull_request.user_id == member.user_id else _('reviewer')})</div>

			




	
	
	
		
 
                  <input type="hidden" value="${member.user_id}" name="review_members" />

			




	
	
	
		
 
                  %if not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.user_id == c.authuser.user_id):

			




	
	
	
		
 
                  <div class="reviewer_member_remove action_button" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}">

			




	
	
	
		
 
                      <i class="icon-remove-sign" style="color: #FF4444;"></i>

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
              </li>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            </ul>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          %if not c.pull_request.is_closed():

			




	
	
	
		
 
          <div class='ac'>

			




	
	
	
		
 
            %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.author.user_id == c.authuser.user_id:

			




	
	
	
		
 
            <div class="reviewer_ac">

			




	
	
	
		
 
               ${h.text('user', class_='yui-ac-input')}

			




	
	
	
		
 
               <span class="help-block">${_('Add or remove reviewer to this pull request.')}</span>

			




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

			




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

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="padding:0px 10px">

			




	
	
	
		
 
             <span id="update_pull_request" class="btn btn-mini">${_('Save Changes')}</span>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
       </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div style="overflow: auto; clear: both">

			




	
	
	
		
 
      ##DIFF

			




	
	
	
		
 
      <div class="table" style="float:left;clear:none">

			




	
	
	
		
 
          <div class="diffblock">

			




	
	
	
		
 
              <div style="padding:5px">

			




	
	
	
		
 
                ${_('Compare view')}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div id="changeset_compare_view_content">

			




	
	
	
		
 
              ##CS

			




	
	
	
		
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div>

			




	
	
	
		
 
              <%include file="/compare/compare_cs.html" />

			




	
	
	
		
 

			




	
	
	
		
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 
              ${_('Common ancestor')}:

			




	
	
	
		
 
              ${h.link_to(h.short_id(c.other_rev),h.url('changeset_home',repo_name=c.other_repo.repo_name,revision=c.other_rev))}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 

			




	
	
	
		
 
              ## FILES

			




	
	
	
		
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 

			




	
	
	
		
 
              % if c.limited_diff:

			




	
	
	
		
 
                  ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}

			




	
	
	
		
 
              % else:

			




	
	
	
		
 
                  ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:

			




	
	
	
		
 
              %endif

			




	
	
	
		
 

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="cs_files">

			




	
	
	
		
 
                %if not c.files:

			




	
	
	
		
 
                   <span class="empty_data">${_('No files')}</span>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                %for fid, change, f, stat in c.files:

			




	
	
	
		
 
                    <div class="cs_${change}">

			




	
	
	
		
 
                      <div class="node">${h.link_to(h.safe_unicode(f),h.url.current(anchor=fid))}</div>

			




	
	
	
		
 
                      <div class="changes">${h.fancy_file_stats(stat)}</div>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              % if c.limited_diff:

			




	
	
	
		
 
                <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>

			




	
	
	
		
 
              % endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <script>

			




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

			




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

			




	
	
	
		
 
    // TODO: switch this to pyroutes

			




	
	
	
		
 
    AJAX_COMMENT_URL = "${url('pullrequest_comment',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id)}";

			




	
	
	
		
 
    AJAX_COMMENT_DELETE_URL = "${url('pullrequest_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";

			




	
	
	
		
 

			




	
	
	
		
 
    pyroutes.register('pullrequest_comment', "${url('pullrequest_comment',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);

			




	
	
	
		
 
    pyroutes.register('pullrequest_comment_delete', "${url('pullrequest_comment_delete',repo_name='%(repo_name)s',comment_id='%(comment_id)s')}", ['repo_name', 'comment_id']);

			




	
	
	
		
 
    pyroutes.register('pullrequest_update', "${url('pullrequest_update',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);

			




	
	
	
		
 

			




	
	
	
		
 
    </script>

			




	
	
	
		
 

			




	
	
	
		
 
    ## diff block

			




	
	
	
		
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
    %for fid, change, f, stat in c.files:

			




	
	
	
		
 
      ${diff_block.diff_block_simple([c.changes[fid]])}

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
    % if c.limited_diff:

			




	
	
	
		
 
      <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h4>

			




	
	
	
		
 
    % endif

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    ## template for inline comment form

			




	
	
	
		
 
    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>

			




	
	
	
		
 
    ${comment.comment_inline_form()}

			




	
	
	
		
 

			




	
	
	
		
 
    ## render comments and inlines

			




	
	
	
		
 
    ${comment.generate_comments()}

			




	
	
	
		
 

			




	
	
	
		
 
    % if not c.pull_request.is_closed():

			




	
	
	
		
 
      ## main comment form and it status

			




	
	
	
		
 
      ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,

			




	
	
	
		
 
                                pull_request_id=c.pull_request.pull_request_id),

			




	
	
	
		
 
                         c.current_changeset_status,

			




	
	
	
		
 
                         is_pr=True, change_status=c.allowed_to_change_status)}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 

			




	
	
	
		
 
    <script type="text/javascript">

			




	
	
	
		
 
      YUE.onDOMReady(function(){

			




        

    



    


    



    



      

      





    
    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.