kallithea Changeset - bbd34de02e38

Changeset - bbd34de02e38

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 12 years ago 2013-12-10 19:30:37
madski@unity3d.com

pull requests: make lists of PRs more readable

3 files changed with 26 insertions and 15 deletions:

kallithea/public/css/style.css

kallithea/templates/pullrequests/pullrequest_data.html

kallithea/templates/pullrequests/pullrequest_show_my_data.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -4725,66 +4725,65 @@ form.comment-inline-form { @@
     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
+#pullrequests_container li.closed div div
+ {
     color: #555;
     background: #eee;
+}
 div.pr-title {
     font-size: 1.6em;
+}
 div.pr-details-title {
     font-size: 1.6em;
     padding: 5px 0px 5px 10px;
+}
 div.pr {
     border-bottom: 1px solid #DDD;
     margin: 0px 20px;
-    padding: 10px 4px;
+    padding: 4px 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: #577632;
     white-space: nowrap;
     -webkit-border-radius: 4px;
     border-radius: 4px;
     border: 1px solid #d9e8f8;
     line-height: 1.5em;
+}
 .pr-box {

kallithea/templates/pullrequests/pullrequest_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 % for pr in c.pullrequests_pager:
   <div class="pr ${'pr-closed' if pr.is_closed() else ''}">
     <div class="pr-title">
     %if pr.last_review_status:
       <img src="${h.url('/images/icons/flag_status_%s.png' % pr.last_review_status)}" title="${_("Someone voted: %s") % pr.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=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
 <div class="notification-paginator">
   <div class="pagination-wh pagination-left">
   ${c.pullrequests_pager.pager('$link_previous ~2~ $link_next')}
   </div>
 </div>

kallithea/templates/pullrequests/pullrequest_show_my_data.html

➞

Show inline comments

 %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:
       <li class="${'closed' if pull_request.is_closed() else ''}">
         <div style="height: 12px">
           <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 #%s opened on %s') % (pull_request.pull_request_id, h.fmt_date(pull_request.created_on))}
               ${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
             </a>
           </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')}
               ${h.submit('remove_%s' % pull_request.pull_request_id, '', title=_('Delete Pull Request'),class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")}
             ${h.end_form()}
           </div>
         </div>
       </li>
       %endfor
    %else:
     <li><span class="empty_data">${_('Nothing here yet')}</span></li>
    %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:
       <li class="${'closed' if pull_request.is_closed() else ''}">
         <div style="height: 12px">
           <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 #%s opened by %s on %s') % (pull_request.pull_request_id, pull_request.author.full_name, h.fmt_date(pull_request.created_on))}
+              ${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
 </ul>

0 comments (0 inline, 0 general)