# HG changeset patch # User Thomas De Schampheleire # Date 1425415733 -3600 # Node ID 780c1aab1357dcf8085af204db17aacb9e5a505a # Parent 7eea0a7fbc7dc35412353779f3b2be4f071c0eaf 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. diff -r 7eea0a7fbc7d -r 780c1aab1357 kallithea/public/css/style.css --- a/kallithea/public/css/style.css Tue Mar 03 22:26:19 2015 +0100 +++ b/kallithea/public/css/style.css Tue Mar 03 21:48:53 2015 +0100 @@ -4648,13 +4648,12 @@ *****/ .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; } @@ -4671,9 +4670,6 @@ div.pr-desc { margin: 0px 20px; } -div.pr-closed { - background-color: #eee; -} tr.pr-closed td { background-color: #eee !important; color: #555 !important; diff -r 7eea0a7fbc7d -r 780c1aab1357 kallithea/templates/pullrequests/pullrequest_show_my.html --- a/kallithea/templates/pullrequests/pullrequest_show_my.html Tue Mar 03 22:26:19 2015 +0100 +++ b/kallithea/templates/pullrequests/pullrequest_show_my.html Tue Mar 03 21:48:53 2015 +0100 @@ -30,9 +30,7 @@ -
- <%include file='pullrequest_show_my_data.html'/> -
+ <%include file='pullrequest_show_my_data.html'/> diff -r 7eea0a7fbc7d -r 780c1aab1357 kallithea/templates/pullrequests/pullrequest_show_my_data.html --- a/kallithea/templates/pullrequests/pullrequest_show_my_data.html Tue Mar 03 22:26:19 2015 +0100 +++ b/kallithea/templates/pullrequests/pullrequest_show_my_data.html Tue Mar 03 21:48:53 2015 +0100 @@ -1,69 +1,7 @@ +<%namespace name="pullrequests" file="/pullrequests/pullrequest_data.html"/> +
${_('Pull Requests Created by Me')}
- +${pullrequests.pullrequest_overview(c.my_pull_requests)}
${_('Pull Requests I Participate In')}
- +${pullrequests.pullrequest_overview(c.participate_in_pull_requests)}