diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less --- a/rhodecode/public/css/main.less +++ b/rhodecode/public/css/main.less @@ -296,30 +296,30 @@ ul.auth_plugins { } } -// Pull Requests + +// My Account PR list + +#show_closed { + margin: 0 1em 0 0; +} .pullrequestlist { - max-width: @pullrequest-width; - margin-bottom: @space; - - // Tweaks for "My Account" / "Pull requests" - .prwrapper { - clear: left; + .closed { + background-color: @grey6; + } + .td-status { + padding-left: .5em; + } + .truncate { + height: 2.75em; + white-space: pre-line; + } + table.rctable .user { + padding-left: 0; + } +} - .pr { - margin: 0; - padding: 0; - border-bottom: none; - } - - // TODO: johbo: Replace with something that makes up an inline form or - // similar. - .repolist_actions { - display: inline-block; - } - } - -} +// Pull Requests .pullrequests_section_head { display: block; @@ -1086,6 +1086,7 @@ table.issuetracker { } } + //Permissions Settings #add_perm { margin: 0 0 @padding; diff --git a/rhodecode/templates/admin/my_account/my_account_pullrequests.html b/rhodecode/templates/admin/my_account/my_account_pullrequests.html --- a/rhodecode/templates/admin/my_account/my_account_pullrequests.html +++ b/rhodecode/templates/admin/my_account/my_account_pullrequests.html @@ -1,13 +1,12 @@ +<%namespace name="base" file="/base/base.html"/>
+ | ${_('Target Repo')} | +${_('Author')} | ++ | ${_('Title')} | +${_('Opened On')} | ++ %for pull_request in c.my_pull_requests: - |
---|---|---|---|---|---|
-
- ${_('Pull request #%s opened on %s') % (pull_request.pull_request_id, h.format_date(pull_request.created_on))}
- %if pull_request.is_closed():
- (${_('Closed')})
- %endif
-
-
- ${h.secure_form(url('pullrequest_delete', repo_name=pull_request.target_repo.repo_name, pull_request_id=pull_request.pull_request_id),method='delete')}
- ${h.submit('remove_%s' % pull_request.pull_request_id, _('Delete'),
- class_="btn btn-link btn-danger",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")}
- ${h.end_form()}
+ |
+ + ${h.link_to(pull_request.target_repo.repo_name,h.url('summary_home',repo_name=pull_request.target_repo.repo_name))} + | ++ ${base.gravatar_with_user(pull_request.author.email, 16)} + | + +
+
+
+
+ |
+
+ + ${h.age_component(pull_request.created_on)} + | ++ ${h.secure_form(url('pullrequest_delete', repo_name=pull_request.target_repo.repo_name, pull_request_id=pull_request.pull_request_id),method='delete')} + ${h.submit('remove_%s' % pull_request.pull_request_id, _('Delete'), + class_="btn btn-link btn-danger",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")} + ${h.end_form()} + | +
+ | ${_('Target Repo')} | +${_('Author')} | ++ | ${_('Title')} | +${_('Opened On')} | + %for pull_request in c.participate_in_pull_requests: -
---|---|---|---|---|
+ + | ++ ${h.link_to(pull_request.target_repo.repo_name,h.url('summary_home',repo_name=pull_request.target_repo.repo_name))} + | ++ ${base.gravatar_with_user(pull_request.author.email, 16)} + | + +
+
+
+
+ |
+
+ + ${h.age_component(pull_request.created_on)} + | +