Mercurial > kallithea

diff rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html @ 3652:8a8a559eaf95 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Mads Kiilerich <madski@unity3d.com>
date Wed, 03 Apr 2013 15:56:12 +0200
parents 7854097b189c
children
line wrap: on
line diff
--- a/rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html	Wed Apr 03 15:56:12 2013 +0200
+++ b/rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html	Wed Apr 03 15:56:12 2013 +0200
@@ -7,16 +7,16 @@
 <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')}
@@ -35,16 +35,16 @@
 <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: