Changeset - ac91a7ba2691
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Mads Kiilerich - 11 years ago 2014-07-18 17:01:37
madski@unity3d.com
old style: set max width on pull request headers - don't make them as wide as the longest line in the description
2 files changed with 5 insertions and 1 deletions:
kallithea/public/css/style.css
4
kallithea/templates/pullrequests/pullrequest_show.html
1
1
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -4694,192 +4694,196 @@ form.comment-inline-form {
 
.notification-header .desc {
 
    font-size: 16px;
 
    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 a

			




	
	
	
		
 
 {

			




	
	
	
		
 
    color: #555;

			




	
	
	
		
 
    background: #eee;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.pr-title {

			




	
	
	
		
 
    font-size: 1.6em;

			




	
	
	
		
 
}

			




	
	
	
		
 
div.pr-details-title {

			




	
	
	
		
 
    font-size: 1.6em;

			




	
	
	
		
 
    margin: 0px 20px 0px 20px;

			




	
	
	
		
 
    padding: 5px 0px 5px 10px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.pr {

			




	
	
	
		
 
    border-bottom: 1px solid #DDD;

			




	
	
	
		
 
    margin: 0px 20px;

			




	
	
	
		
 
    padding: 10px 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;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/****

			




	
	
	
		
 
  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_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)}

			




	
	
	
		
 
    %if c.site_name:

			




	
	
	
		
 
        &middot; ${c.site_name}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('Pull request #%s') % c.pull_request.pull_request_id}

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    <div class="form" style="float: left">

			




	
	
	
		
 
    <div class="form pr-box" style="float: left">

			




	
	
	
		
 
        <div class="pr-details-title ${'closed' if c.pull_request.is_closed() else ''}">

			




	
	
	
		
 
            ${_('Title')}: ${c.pull_request.title}

			




	
	
	
		
 
            %if c.pull_request.is_closed():

			




	
	
	
		
 
                (${_('Closed')})

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
      <div id="summary" class="fields">

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




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

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
            <div class="changeset-status-container" style="float:none;clear:both">

			




	
	
	
		
 
            %if c.current_changeset_status:

			




	
	
	
		
 
              <div class="changeset-status-ico" style="padding:0px 4px 0px 0px">

			




	
	
	
		
 
                  <img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" title="${_('Pull request status calculated from votes')}"/></div>

			




	
	
	
		
 
              <div class="changeset-status-lbl tooltip" title="${_('Pull request status calculated from votes')}">

			




	
	
	
		
 
                %if c.pull_request.is_closed():

			




	
	
	
		
 
                    ${_('Closed')},

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                ${h.changeset_status_lbl(c.current_changeset_status)}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Still not reviewed by')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
            % if len(c.pull_request_pending_reviewers) > 0:

			




	
	
	
		
 
                <div class="tooltip" title="${h.tooltip(', '.join([x.username for x in c.pull_request_pending_reviewers]))}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div>

			




	
	
	
		
 
            %else:

			




	
	
	
		
 
                <div>${_('Pull request was reviewed by all reviewers')}</div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




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

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




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

			




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

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
                  %endif

			




        

    



    


    



    



      

      





    
    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.