Changeset - 8a8a559eaf95
Parent rev.
Child rev.
[Not reviewed]
beta
0 4 0
Mads Kiilerich - 13 years ago 2013-04-03 15:56:12
madski@unity3d.com
Grafted from: 68ccc1ae2082
pullrequests: state "closed" explicitly

A closed-as-in-locked icon did not communicate the closed-as-in-inactive state
clearly.

Instead we say "Closed" and make the text greyed out. Not pretty but more
efficient.
4 files changed with 44 insertions and 32 deletions:
rhodecode/public/css/style.css
8
rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html
17
17
rhodecode/templates/pullrequests/pullrequest_show.html
14
10
rhodecode/templates/pullrequests/pullrequest_show_all.html
5
5
0 comments (0 inline, 0 general)
rhodecode/public/css/style.css
➞
Show inline comments
 
@@ -4564,12 +4564,20 @@ PULL REQUESTS
 
.pullrequests_section_head {
 
    padding: 10px 10px 10px 0px;
 
    font-size: 16px;
 
    font-weight: bold;
 
}
 

			




	
	
	
		
 
div.closed h4 a,

			




	
	
	
		
 
h3.closed,

			




	
	
	
		
 
#pullrequests_container li.closed a

			




	
	
	
		
 
 {

			




	
	
	
		
 
    color: #555;

			




	
	
	
		
 
    background: #eee;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/****

			




	
	
	
		
 
  PERMS

			




	
	
	
		
 
*****/

			




	
	
	
		
 
#perms .perms_section_head {

			




	
	
	
		
 
    padding: 10px 10px 10px 0px;

			




	
	
	
		
 
    font-size: 16px;

			




        

    


    
    

    

        

                

                    rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -4,22 +4,22 @@

			




	
	
	
		
 
  ${h.checkbox('show_closed',label=_('Show closed pull requests'))}

			




	
	
	
		
 
%endif

			




	
	
	
		
 
<div class="pullrequests_section_head">${_('Opened by me')}</div>

			




	
	
	
		
 
<ul>

			




	
	
	
		
 
    %if c.my_pull_requests:

			




	
	
	
		
 
      %for pull_request in c.my_pull_requests:

			




	
	
	
		
 
      <li>

			




	
	
	
		
 
      <li class="${'closed' if pull_request.is_closed() else ''}">

			




	
	
	
		
 
        <div style="height: 12px">

			




	
	
	
		
 
          <div style="float:left">

			




	
	
	
		
 
          %if pull_request.is_closed():

			




	
	
	
		
 
              <img src="${h.url('/images/icons/lock_go.png')}" title="${_('Closed')}"/>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
          <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />

			




	
	
	
		
 
          <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">

			




	
	
	
		
 
          ${_('Pull request #%s opened on %s') % (pull_request.pull_request_id, h.fmt_date(pull_request.created_on))}

			




	
	
	
		
 
          </a>

			




	
	
	
		
 
            <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />

			




	
	
	
		
 
            <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">

			




	
	
	
		
 
              ${_('Pull request #%s opened on %s') % (pull_request.pull_request_id, h.fmt_date(pull_request.created_on))}

			




	
	
	
		
 
              %if pull_request.is_closed():

			




	
	
	
		
 
                (${_('Closed')})

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
            </a>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div style="float:left;margin-top: -5px">

			




	
	
	
		
 
            ${h.form(url('pullrequest_delete', repo_name=pull_request.other_repo.repo_name, pull_request_id=pull_request.pull_request_id),method='delete')}

			




	
	
	
		
 
              ${h.submit('remove_%s' % pull_request.pull_request_id,'',class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")}

			




	
	
	
		
 
            ${h.end_form()}

			




	
	
	
		
 
          </div>

			




	
	
		
 
@@ -32,22 +32,22 @@

			




	
	
	
		
 
</ul>

			




	
	
	
		
 

			




	
	
	
		
 
<div class="pullrequests_section_head" style="clear:both">${_('I participate in')}</div>

			




	
	
	
		
 
<ul>

			




	
	
	
		
 
    %if c.participate_in_pull_requests:

			




	
	
	
		
 
      %for pull_request in c.participate_in_pull_requests:

			




	
	
	
		
 
      <li>

			




	
	
	
		
 
      <li class="${'closed' if pull_request.is_closed() else ''}">

			




	
	
	
		
 
        <div style="height: 12px">

			




	
	
	
		
 
        %if pull_request.is_closed():

			




	
	
	
		
 
            <img src="${h.url('/images/icons/lock_go.png')}" title="${_('Closed')}"/>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />

			




	
	
	
		
 
        <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">

			




	
	
	
		
 
        ${_('Pull request #%s opened by %s on %s') % (pull_request.pull_request_id, pull_request.author.full_name, h.fmt_date(pull_request.created_on))}

			




	
	
	
		
 
        </a>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
          <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />

			




	
	
	
		
 
          <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">

			




	
	
	
		
 
            ${_('Pull request #%s opened by %s on %s') % (pull_request.pull_request_id, pull_request.author.full_name, h.fmt_date(pull_request.created_on))}

			




	
	
	
		
 
          </a>

			




	
	
	
		
 
          %if pull_request.is_closed():

			




	
	
	
		
 
            (${_('Closed')})

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
      </li>

			




	
	
	
		
 
      %endfor

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
     <li><span class="empty_data">${_('Nothing here yet')}</span></li>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</ul>

			




        

    


    
    

    

        

                

                    rhodecode/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -16,32 +16,36 @@

			




	
	
	
		
 
${self.context_bar('showpullrequest')}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
        %if c.pull_request.is_closed():

			




	
	
	
		
 
        <div style="padding:10px; font-size:22px;width:100%;text-align: center; color:#88D882">${_('Closed %s') % (h.age(c.pull_request.updated_on))} ${_('with status %s') % h.changeset_status_lbl(c.current_changeset_status)}</div>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
    <h3>

			




	
	
	
		
 
    %if c.pull_request.is_closed():

			




	
	
	
		
 
        <img src="${h.url('/images/icons/lock_go.png')}" title="${_('Closed')}"/>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    <img src="${h.url('/images/icons/flag_status_%s.png' % str(c.pull_request.last_review_status))}" />

			




	
	
	
		
 
    ${_('Title')}: ${c.pull_request.title}</h3>

			




	
	
	
		
 

			




	
	
	
		
 
    <h3 class="${'closed' if c.pull_request.is_closed() else ''}">

			




	
	
	
		
 
	    <img src="${h.url('/images/icons/flag_status_%s.png' % str(c.pull_request.last_review_status))}" />

			




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

			




	
	
	
		
 
	    %if c.pull_request.is_closed():

			




	
	
	
		
 
	        (${_('Closed')})

			




	
	
	
		
 
	    %endif

			




	
	
	
		
 
    </h3>

			




	
	
	
		
 

			




	
	
	
		
 
    <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 title="${_('Pull request status')}" class="changeset-status-lbl">${h.changeset_status_lbl(c.current_changeset_status)}</div>

			




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

			




	
	
	
		
 
			    %if c.pull_request.is_closed():

			




	
	
	
		
 
			        ${_('Closed')},

			




	
	
	
		
 
			    %endif

			




	
	
	
		
 
                ${h.changeset_status_lbl(c.current_changeset_status)}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="changeset-status-ico" style="padding:1px 4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
         <div class="field">

			




        

    


    
    

    

        

                

                    rhodecode/templates/pullrequests/pullrequest_show_all.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -18,21 +18,21 @@ ${self.context_bar('showpullrequest')}

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    %for pr in c.pull_requests:

			




	
	
	
		
 
        <div>

			




	
	
	
		
 
          <h4  style="border:0px;padding:0px">

			




	
	
	
		
 
            %if pr.is_closed():

			




	
	
	
		
 
                <img src="${h.url('/images/icons/lock_go.png')}" title="${_('Closed')}"/>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        <div class="${'closed' if pr.is_closed() else ''}">

			




	
	
	
		
 
          <h4 style="border:0px;padding:0px">

			




	
	
	
		
 
            <img src="${h.url('/images/icons/flag_status_%s.png' % str(pr.last_review_status))}" />

			




	
	
	
		
 
            <a href="${h.url('pullrequest_show',repo_name=c.repo_name,pull_request_id=pr.pull_request_id)}">

			




	
	
	
		
 
            ${_('Pull request #%s opened by %s on %s') % (pr.pull_request_id, pr.author.full_name, h.fmt_date(pr.created_on))}

			




	
	
	
		
 
            </a>

			




	
	
	
		
 
            %if pr.is_closed():

			




	
	
	
		
 
              (${_('Closed')})

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </h4>

			




	
	
	
		
 
          <h5 style="border:0px;padding-bottom:0px">${_('Title')}: ${pr.title}</h5>

			




	
	
	
		
 
          <div style="padding:0px 24px">${pr.description}</div>

			




	
	
	
		
 
          <div style="border-bottom: 1px solid #DDD;margin:10px 20px;padding-bottom:10px"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    %endfor

			




        

    



    


    



    



      

      





    
    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.