Mercurial > kallithea

changeset 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 659bd922520e
children 4c78a0855a17
files rhodecode/public/css/style.css rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html rhodecode/templates/pullrequests/pullrequest_show.html rhodecode/templates/pullrequests/pullrequest_show_all.html
diffstat 4 files changed, 44 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/public/css/style.css	Wed Apr 03 15:56:12 2013 +0200
+++ b/rhodecode/public/css/style.css	Wed Apr 03 15:56:12 2013 +0200
@@ -4567,6 +4567,14 @@
     font-weight: bold;
 }
 
+div.closed h4 a,
+h3.closed,
+#pullrequests_container li.closed a
+ {
+    color: #555;
+    background: #eee;
+}
+
 /****
   PERMS
 *****/
--- 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:
--- a/rhodecode/templates/pullrequests/pullrequest_show.html	Wed Apr 03 15:56:12 2013 +0200
+++ b/rhodecode/templates/pullrequests/pullrequest_show.html	Wed Apr 03 15:56:12 2013 +0200
@@ -19,15 +19,14 @@
     <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">
@@ -38,7 +37,12 @@
           <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>
--- a/rhodecode/templates/pullrequests/pullrequest_show_all.html	Wed Apr 03 15:56:12 2013 +0200
+++ b/rhodecode/templates/pullrequests/pullrequest_show_all.html	Wed Apr 03 15:56:12 2013 +0200
@@ -21,15 +21,15 @@
     </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>