Mercurial > kallithea
changeset 5464:dde94c758087
pull requests: inline pullrequest_show_my_data
Remove unnecessary "abstraction".
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 03 Sep 2015 21:43:20 +0200 |
| parents | 22d96f6fd2d1 |
| children | 6db421a8cd9a |
| files | kallithea/templates/pullrequests/pullrequest_show_my.html kallithea/templates/pullrequests/pullrequest_show_my_data.html |
| diffstat | 2 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/templates/pullrequests/pullrequest_show_my.html Thu Sep 03 21:43:20 2015 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show_my.html Thu Sep 03 21:43:20 2015 +0200 @@ -1,5 +1,7 @@ <%inherit file="/base/base.html"/> +<%namespace name="pullrequest_data" file="pullrequest_data.html"/> + <%block name="title"> ${_('My Pull Requests')} </%block> @@ -30,7 +32,11 @@ </div> </div> - <%include file='pullrequest_show_my_data.html'/> + <div class="pullrequests_section_head">${_('Pull Requests Created by Me')}</div> + ${pullrequest_data.pullrequest_overview(c.my_pull_requests)} + + <div class="pullrequests_section_head" style="clear:both">${_('Pull Requests I Participate In')}</div> + ${pullrequest_data.pullrequest_overview(c.participate_in_pull_requests)} </div> </%def>
--- a/kallithea/templates/pullrequests/pullrequest_show_my_data.html Thu Sep 03 21:43:20 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -<%namespace name="pullrequests" file="/pullrequests/pullrequest_data.html"/> - -<div class="pullrequests_section_head">${_('Pull Requests Created by Me')}</div> -${pullrequests.pullrequest_overview(c.my_pull_requests)} - -<div class="pullrequests_section_head" style="clear:both">${_('Pull Requests I Participate In')}</div> -${pullrequests.pullrequest_overview(c.participate_in_pull_requests)}