kallithea Changeset - 780c1aab1357

Changeset - 780c1aab1357

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Thomas De Schampheleire - 11 years ago 2015-03-03 21:48:53
thomas.de.schampheleire@gmail.com

pullrequest overview: remove custom handling of 'my pullrequests'

Re-use the same displaying code for the 'my pullrequests' overview as for
the repository pullrequests overview. Remove the now unused CSS styling as
well.

This removes the 'delete' button on the author's pullrequests. One could
argue whether the pullrequest overview is the right place for this button,
while it does not appear on the pull request page itself.

3 files changed with 7 insertions and 75 deletions:

kallithea/public/css/style.css

kallithea/templates/pullrequests/pullrequest_show_my.html

kallithea/templates/pullrequests/pullrequest_show_my_data.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -4555,218 +4555,214 @@ form.comment-inline-form { @@
 .inline-comments .comment .meta .date {
     float: left;
     padding: 3px;
+}
 .inline-comments .comment .text {
     background-color: #FAFAFA;
+}
 .inline-comments .comments-number {
     padding: 0px 0px 10px 0px;
     font-weight: bold;
     color: #666;
     font-size: 16px;
+}
 .inline-comments-button .add-comment {
     margin: 2px 0px 8px 5px !important
+}
 .notification-paginator {
     padding: 0px 0px 4px 16px;
+}
 #context-pages .pull-request span,
 .menu_link_notifications {
     padding: 4px 4px !important;
     text-align: center;
     color: #888 !important;
     background-color: #DEDEDE !important;
     border-radius: 4px !important;
     -webkit-border-radius: 4px !important;
+}
 #context-pages .forks span,
 .menu_link_notifications {
     padding: 4px 4px !important;
     text-align: center;
     color: #888 !important;
     background-color: #DEDEDE !important;
     border-radius: 4px !important;
     -webkit-border-radius: 4px !important;
+}
 .notification-header {
     padding-top: 6px;
+}
 .notification-header .desc {
     font-size: 16px;
     height: 24px;
     float: left
+}
 .notification-list .container.unread {
     background: none repeat scroll 0 0 rgba(255, 255, 180, 0.6);
+}
 .notification-header .gravatar {
     background: none repeat scroll 0 0 transparent;
     padding: 0px 0px 0px 8px;
+}
 .notification-list .container .notification-header .desc {
     font-weight: bold;
     font-size: 17px;
+}
 .notification-table {
     border: 1px solid #ccc;
     -webkit-border-radius: 6px 6px 6px 6px;
     border-radius: 6px 6px 6px 6px;
     clear: both;
     margin: 0px 20px 0px 20px;
+}
 .notification-header .delete-notifications {
     float: right;
     padding-top: 8px;
     cursor: pointer;
+}
 .notification-header .read-notifications {
     float: right;
     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;
     margin: 0 20px;
     font-size: 16px;
     font-weight: bold;
+}
 div.pr-details-title.closed,
 #pullrequests_container li.closed div div
+ {
 div.pr-details-title.closed {
     color: #555;
     background: #eee;
+}
 div.pr-details-title {
     font-size: 1.6em;
     padding: 5px 0px 5px 10px;
+}
 div.pr {
     margin: 0px 20px;
     padding: 4px 4px;
+}
 div.pr-desc {
     margin: 0px 20px;
+}
 div.pr-closed {
     background-color: #eee;
+}
 tr.pr-closed td {
     background-color: #eee !important;
     color: #555 !important;
+}
 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 {
     max-width: 978px;
+}
 #s2id_org_ref,
 #s2id_other_ref,
 #s2id_org_repo,
 #s2id_other_repo {
     min-width: 150px;
     margin: 5px;
+}
 #pr-summary .msg-div {
     margin: 5px 0;
+}
 /****
   PERMS
 *****/
 #perms .perms_section_head {
     padding: 10px 10px 10px 0px;
     font-size: 16px;
     font-weight: bold;
     text-transform: capitalize;
+}
 #perms .perm_tag {
     padding: 1px 3px 1px 3px;
     font-size: 10px;
     font-weight: bold;
     text-transform: uppercase;
     white-space: nowrap;
     -webkit-border-radius: 3px;
     border-radius: 3px;
+}
 #perms .perm_tag.admin {
     background-color: #B94A48;
     color: #ffffff;
+}
 #perms .perm_tag.write {
     background-color: #DB7525;
     color: #ffffff;
+}
 #perms .perm_tag.read {
     background-color: #468847;
     color: #ffffff;
+}
 #perms .perm_tag.none {
     background-color: #bfbfbf;
     color: #ffffff;
+}
 .perm-gravatar {
     vertical-align: middle;
     padding: 2px;
+}
 .perm-gravatar-ac {
     vertical-align: middle;
     padding: 2px;
     width: 14px;
     height: 14px;
+}
 /*****************************************************************************
                                   DIFFS CSS
 ******************************************************************************/
 .diff-collapse {
     text-align: center;
     margin-bottom: -15px;
+}
 .diff-collapse-button {
     cursor: pointer;

kallithea/templates/pullrequests/pullrequest_show_my.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('My Pull Requests')}
 </%block>
 <%def name="breadcrumbs_links()">
     ${_('My Pull Requests')}
 </%def>
 <%block name="header_menu">
     ${self.menu('my_pullrequests')}
 </%block>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="normal-indent">
         <div>
         %if c.closed:
             ${h.link_to(_('Hide closed pull requests (only show open pull requests)'), h.url('my_pullrequests'))}
         %else:
             ${h.link_to(_('Show closed pull requests (in addition to open pull requests)'), h.url('my_pullrequests',closed=1))}
         %endif
         </div>
     </div>
     <div id="pullrequests_container" class="table">
         <%include file='pullrequest_show_my_data.html'/>
     </div>
     <%include file='pullrequest_show_my_data.html'/>
 </div>
 </%def>

kallithea/templates/pullrequests/pullrequest_show_my_data.html

➞

Show inline comments

 <%namespace name="pullrequests" file="/pullrequests/pullrequest_data.html"/>
 <div class="pullrequests_section_head">${_('Pull Requests Created 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">
             %if pull_request.last_review_status:
               <i class="icon-circle changeset-status-${pull_request.last_review_status}" title="${_("Someone voted: %s") % pull_request.last_review_status}"></i>
             %else:
               <i class="icon-circle changeset-status-not_reviewed" title="${_("Nobody voted")}"></i>
             %endif
             <a href="${pull_request.url()}">
               ${pull_request.title or _("(no title)")}
             </a>
             ${_('created 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
             ${h.form(url('pullrequest_delete', repo_name=pull_request.other_repo.repo_name, pull_request_id=pull_request.pull_request_id),method='delete', style="display:inline-block")}
             <button class="action_button"
                     id="remove_${pull_request.pull_request_id}"
                     name="remove_${pull_request.pull_request_id}"
                     title="${_('Delete Pull Request')}"
                     onclick="return confirm('${_('Confirm to delete this pull request')}');">
               <i class="icon-minus-circled"></i>
             </button>
             ${h.end_form()}
         </div>
       </li>
     %endfor
   %else:
     <li><span class="empty_data">${_('Nothing here yet')}</span></li>
   %endif
 </ul>
 ${pullrequests.pullrequest_overview(c.my_pull_requests)}
 <div class="pullrequests_section_head" style="clear:both">${_('Pull Requests 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">
             %if pull_request.last_review_status:
               <i class="icon-circle changeset-status-${pull_request.last_review_status}" title="${_("Someone voted: %s") % pull_request.last_review_status}"></i>
             %else:
               <i class="icon-circle changeset-status-not_reviewed" title="${_("Nobody voted")}"></i>
             %endif
             <a href="${pull_request.url()}">
               ${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>
             ${_('created on %s') % (h.fmt_date(pull_request.created_on))}
             %if pull_request.is_closed():
               (${_('Closed')})
             %endif
         </div>
       </li>
     %endfor
   %else:
     <li><span class="empty_data">${_('Nothing here yet')}</span></li>
   %endif
 </ul>
 ${pullrequests.pullrequest_overview(c.participate_in_pull_requests)}

0 comments (0 inline, 0 general)