Changeset - 52f69be09fe1
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Mads Kiilerich - 13 years ago 2013-06-12 12:23:20
madski@unity3d.com
pull requests: add mouse-over descriptions for delete buttons
2 files changed with 3 insertions and 3 deletions:
kallithea/templates/pullrequests/pullrequest.html
2
2
kallithea/templates/pullrequests/pullrequest_show.html
1
1
0 comments (0 inline, 0 general)
kallithea/templates/pullrequests/pullrequest.html
➞
Show inline comments
 
@@ -54,98 +54,98 @@ ${self.repo_context_bar('showpullrequest
 
                    <div>
 
                        <div>
 
                            <div style="padding:5px 3px 3px 3px;">
 
                            <b>${_('Origin repository')}:</b> ${c.db_repo.description}
 
                            </div>
 
                            <span style="font-size: 20px">
 
                            ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref',c.default_org_ref,c.org_refs,class_='refs')}
 
                            </span>
 
                        </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>

			




	
	
	
		
 
                            <span style="font-size: 20px">

			




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

			




	
	
	
		
 
                            </span>

			




	
	
	
		
 
                        </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']})">

			




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

			




	
	
	
		
 
                      <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>

			




	
	
	
		
 
                   <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 style="float:left;clear:both;padding:10px 10px 10px 0px;display:none">

			




	
	
	
		
 
                <a id="pull_request_overview_url" href="#">${_('Detailed compare view')}</a>

			




	
	
	
		
 
           </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

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -71,97 +71,97 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
              <div>

			




	
	
	
		
 

			




	
	
	
		
 
              ## 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.pull_request.org_ref_parts[1])}">${c.pull_request.org_ref_parts[0]}: ${c.pull_request.org_ref_parts[1]}</a></span>

			




	
	
	
		
 
              <span>

			




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

			




	
	
	
		
 
                 | ${_('Pull changes')} <span style="font-family: monospace">hg pull -r ${h.short_id(c.cs_ranges[-1].raw_id)} <a href="${h.url('summary_home', repo_name=c.pull_request.org_repo.repo_name)}">${c.pull_request.org_repo.clone_url()}</a></span>

			




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

			




	
	
	
		
 
                 | ${_('Pull changes')} <span style="font-family: monospace">git pull <a href="${h.url('summary_home', repo_name=c.pull_request.org_repo.repo_name)}">${c.pull_request.org_repo.clone_url()}</a> ${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>

			




	
	
	
		
 
    </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})">

			




	
	
	
		
 
                  <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>

			




	
	
	
		
 
               <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 id="body" class="diffblock">

			




	
	
	
		
 
              <div style="white-space:pre-wrap;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" />

			




	
	
	
		
 

			




	
	
	
		
 
              ## 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:

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-14464
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support