Changeset - 6eaee7e2829e
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Marcin Kuzminski - 12 years ago 2013-06-27 23:54:22
marcin@python-works.com
Grafted from: c9cb654c8480
pull requests: link to origin branch
2 files changed with 4 insertions and 2 deletions:
rhodecode/public/css/style.css
1
1
rhodecode/templates/pullrequests/pullrequest_show.html
3
1
0 comments (0 inline, 0 general)
rhodecode/public/css/style.css
➞
Show inline comments
 
@@ -4574,193 +4574,193 @@ form.comment-inline-form {
 
}
 
.inline-comments-button .add-comment {
 
    margin: 2px 0px 8px 5px !important
 
}
 

			




	
	
	
		
 
.notification-paginator {

			




	
	
	
		
 
    padding: 0px 0px 4px 16px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#context-pages .pull-request span,

			




	
	
	
		
 
.menu_link_notifications {

			




	
	
	
		
 
    padding: 4px 4px !important;

			




	
	
	
		
 
    text-align: center;

			




	
	
	
		
 
    color: #888 !important;

			




	
	
	
		
 
    background-color: #DEDEDE !important;

			




	
	
	
		
 
    border-radius: 4px !important;

			




	
	
	
		
 
    -webkit-border-radius: 4px !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#context-pages .forks span,

			




	
	
	
		
 
.menu_link_notifications {

			




	
	
	
		
 
    padding: 4px 4px !important;

			




	
	
	
		
 
    text-align: center;

			




	
	
	
		
 
    color: #888 !important;

			




	
	
	
		
 
    background-color: #DEDEDE !important;

			




	
	
	
		
 
    border-radius: 4px !important;

			




	
	
	
		
 
    -webkit-border-radius: 4px !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
.notification-header {

			




	
	
	
		
 
    padding-top: 6px;

			




	
	
	
		
 
}

			




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

			




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

			




	
	
	
		
 
    white-space: nowrap;

			




	
	
	
		
 
    -webkit-border-radius: 4px;

			




	
	
	
		
 
    border-radius: 4px;

			




	
	
	
		
 
    border: 1px solid #d9e8f8;

			




	
	
	
		
 
    line-height: 1.5em;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/****

			




	
	
	
		
 
  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 {

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    rhodecode/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)} &middot; ${c.rhodecode_name}

			




	
	
	
		
 
</%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="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 class="form">

			




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

			




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

			




	
	
	
		
 
             ##  <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url('/images/icons/hgicon.png')}"/>

			




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

			




	
	
	
		
 
             ##  <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url('/images/icons/giticon.png')}"/>

			




	
	
	
		
 
             ##%endif

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    <div style="overflow: auto;">

			




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

			




	
	
	
		
 
                   <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())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h5>

			




	
	
	
		
 
              % endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      ## REVIEWERS

			




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

			




	
	
	
		
 
       <h4>${_('Pull request reviewers')}</h4>

			




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

			




	
	
	
		
 
          ## members goes here !

			




	
	
	
		
 
          <div class="group_members_wrap" style="min-height:45px">

			




	
	
	
		
 
            <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 style="float:left;padding:0px 3px 0px 0px" class="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="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', 'repository.admin')() or c.pull_request.user_id == c.rhodecode_user.user_id):

			




	
	
	
		
 
                  <span class="delete_icon action_button" onclick="removeReviewMember(${member.user_id})"></span>

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
              </li>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            </ul>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          %if not c.pull_request.is_closed():

			




	
	
	
		
 
          <div class='ac'>

			




	
	
	
		
 
            %if h.HasPermissionAny('hg.admin', 'repository.admin')() or c.pull_request.author.user_id == c.rhodecode_user.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>

			




        

    



    


    



    



      

      





    
    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.