Mercurial > kallithea

changeset 4285:bbd34de02e38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull requests: make lists of PRs more readable
author Mads Kiilerich <madski@unity3d.com>
date Tue, 10 Dec 2013 19:30:37 +0100
parents bc03f5a9f178
children 7b6da4cf5924
files kallithea/public/css/style.css kallithea/templates/pullrequests/pullrequest_data.html kallithea/templates/pullrequests/pullrequest_show_my_data.html
diffstat 3 files changed, 49 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/css/style.css	Wed Jun 12 12:23:17 2013 +0200
+++ b/kallithea/public/css/style.css	Tue Dec 10 19:30:37 2013 +0100
@@ -4746,7 +4746,7 @@
 }
 
 div.pr-details-title.closed,
-#pullrequests_container li.closed a
+#pullrequests_container li.closed div div
  {
     color: #555;
     background: #eee;
@@ -4761,9 +4761,8 @@
 }
 
 div.pr {
-    border-bottom: 1px solid #DDD;
     margin: 0px 20px;
-    padding: 10px 4px;
+    padding: 4px 4px;
 }
 div.pr-desc {
     margin: 0px 20px;
--- a/kallithea/templates/pullrequests/pullrequest_data.html	Wed Jun 12 12:23:17 2013 +0200
+++ b/kallithea/templates/pullrequests/pullrequest_data.html	Tue Dec 10 19:30:37 2013 +0100
@@ -9,14 +9,17 @@
       <img src="${h.url('/images/icons/flag_status_not_reviewed.png')}" title="${_("Nobody voted")}"/>
     %endif
       <a href="${h.url('pullrequest_show',repo_name=pr.other_repo.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>
+      ${pr.title or _("(no title)")}
        %if pr.is_closed():
          <span class="pr-closed-tag">${_('Closed')}</span>
        %endif
+      </a>
+            ${_('opened on %s from') % (h.fmt_date(pr.created_on))}
+            <% org_ref_name=pr.org_ref.rsplit(':', 2)[-2] %>
+            <a href="${h.url('summary_home', repo_name=pr.org_repo.repo_name, anchor=org_ref_name)}">
+              ${pr.org_repo.repo_name}#${org_ref_name}
+            </a>
     </div>
-    <h5 style="border:0px;padding-bottom:0px">${_('Title')}: ${pr.title}</h5>
-    <div class="pr-desc">${pr.description}</div>
   </div>
 % endfor
 
--- a/kallithea/templates/pullrequests/pullrequest_show_my_data.html	Wed Jun 12 12:23:17 2013 +0200
+++ b/kallithea/templates/pullrequests/pullrequest_show_my_data.html	Tue Dec 10 19:30:37 2013 +0100
@@ -1,12 +1,8 @@
-%if c.show_closed:
-  ${h.checkbox('show_closed',checked="checked", label=_('Show closed pull requests'))}
-%else:
-  ${h.checkbox('show_closed',label=_('Show closed pull requests'))}
-%endif
+${h.checkbox('show_closed',checked="checked" if c.show_closed else "", label=_('Show closed pull requests too'))}
 <div class="pullrequests_section_head">${_('Opened by me')}</div>
 <ul>
-    %if c.my_pull_requests:
-      %for pull_request in c.my_pull_requests:
+  %if c.my_pull_requests:
+    %for pull_request in c.my_pull_requests:
       <li class="${'closed' if pull_request.is_closed() else ''}">
         <div style="height: 12px">
           <div style="float:left">
@@ -16,11 +12,16 @@
               <img src="${h.url('/images/icons/flag_status_not_reviewed.png')}" title="${_("Nobody voted")}"/>
             %endif
             <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
+              ${pull_request.title or _("(no title)")}
             </a>
+            ${_('opened on %s from') % (h.fmt_date(pull_request.created_on))}
+            <% org_ref_name=pull_request.org_ref.rsplit(':', 2)[-2] %>
+            <a href="${h.url('summary_home', repo_name=pull_request.org_repo.repo_name, anchor=org_ref_name)}">
+              ${pull_request.org_repo.repo_name}#${org_ref_name}
+            </a>
+            %if pull_request.is_closed():
+              (${_('Closed')})
+            %endif
           </div>
           <div style="float:left">
             ${h.form(url('pullrequest_delete', repo_name=pull_request.other_repo.repo_name, pull_request_id=pull_request.pull_request_id),method='delete')}
@@ -29,33 +30,41 @@
           </div>
         </div>
       </li>
-      %endfor
-   %else:
+    %endfor
+  %else:
     <li><span class="empty_data">${_('Nothing here yet')}</span></li>
-   %endif
+  %endif
 </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:
+  %if c.participate_in_pull_requests:
+    %for pull_request in c.participate_in_pull_requests:
       <li class="${'closed' if pull_request.is_closed() else ''}">
         <div style="height: 12px">
-          %if pull_request.last_review_status:
-            <img src="${h.url('/images/icons/flag_status_%s.png' % pull_request.last_review_status)}" title="${_("Someone voted: %s") % pull_request.last_review_status}"/>
-          %else:
-            <img src="${h.url('/images/icons/flag_status_not_reviewed.png')}" title="${_("Nobody voted")}"/>
-          %endif
-          <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 style="float:left">
+            %if pull_request.last_review_status:
+              <img src="${h.url('/images/icons/flag_status_%s.png' % pull_request.last_review_status)}" title="${_("Someone voted: %s") % pull_request.last_review_status}"/>
+            %else:
+              <img src="${h.url('/images/icons/flag_status_not_reviewed.png')}" title="${_("Nobody voted")}"/>
+            %endif
+            <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">
+              ${pull_request.title or _("(no title)")}
+            </a>
+            ${_('from')}
+            <% org_ref_name=pull_request.org_ref.rsplit(':', 2)[-2] %>
+            <a href="${h.url('summary_home', repo_name=pull_request.org_repo.repo_name, anchor=org_ref_name)}">
+              ${pull_request.org_repo.repo_name}#${org_ref_name}
+            </a>
+            ${_('opened on %s') % (h.fmt_date(pull_request.created_on))}
+            %if pull_request.is_closed():
+              (${_('Closed')})
+            %endif
+          </div>
         </div>
       </li>
-      %endfor
-    %else:
-     <li><span class="empty_data">${_('Nothing here yet')}</span></li>
-    %endif
+    %endfor
+  %else:
+    <li><span class="empty_data">${_('Nothing here yet')}</span></li>
+  %endif
 </ul>