diff --git a/rhodecode/apps/repository/views/repo_pull_requests.py b/rhodecode/apps/repository/views/repo_pull_requests.py
--- a/rhodecode/apps/repository/views/repo_pull_requests.py
+++ b/rhodecode/apps/repository/views/repo_pull_requests.py
@@ -111,7 +111,8 @@ class RepoPullRequestsView(RepoAppView,
data.append({
'name': _render('pullrequest_name',
pr.pull_request_id, pr.pull_request_state,
- pr.work_in_progress, pr.target_repo.repo_name),
+ pr.work_in_progress, pr.target_repo.repo_name,
+ short=True),
'name_raw': pr.pull_request_id,
'status': _render('pullrequest_status',
pr.calculated_review_status()),
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
@@ -374,9 +374,6 @@ ul.auth_plugins {
background-color: @grey6;
}
- .td-status {
- padding-left: .5em;
- }
.log-container .truncate {
height: 2.75em;
white-space: pre-line;
@@ -384,6 +381,10 @@ ul.auth_plugins {
table.rctable .user {
padding-left: 0;
}
+ .td-status {
+ padding: 0 0px 0px 10px;
+ width: 15px;
+ }
table.rctable {
td.td-description,
.rc-user {
diff --git a/rhodecode/templates/admin/my_account/my_account_pullrequests.mako b/rhodecode/templates/admin/my_account/my_account_pullrequests.mako
--- a/rhodecode/templates/admin/my_account/my_account_pullrequests.mako
+++ b/rhodecode/templates/admin/my_account/my_account_pullrequests.mako
@@ -58,16 +58,10 @@
dom: 'rtp',
pageLength: ${c.visual.dashboard_items},
- order: [[2, "desc"]],
+ order: [[1, "desc"]],
columns: [
{
data: {
- "_": "target_repo",
- "sort": "target_repo"
- }, title: "${_('Target Repo')}", className: "td-targetrepo", orderable: false
- },
- {
- data: {
"_": "status",
"sort": "status"
}, title: "", className: "td-status", orderable: false
@@ -101,7 +95,13 @@
"_": "updated_on",
"sort": "updated_on_raw"
}, title: "${_('Last Update')}", className: "td-time"
- }
+ },
+ {
+ data: {
+ "_": "target_repo",
+ "sort": "target_repo"
+ }, title: "${_('Target Repo')}", className: "td-targetrepo", orderable: false
+ },
],
language: {
paginate: DEFAULT_GRID_PAGINATION,
diff --git a/rhodecode/templates/data_table/_dt_elements.mako b/rhodecode/templates/data_table/_dt_elements.mako
--- a/rhodecode/templates/data_table/_dt_elements.mako
+++ b/rhodecode/templates/data_table/_dt_elements.mako
@@ -379,22 +379,22 @@
%def>
<%def name="pullrequest_name(pull_request_id, state, is_wip, target_repo_name, short=False)">
+
-
% if short:
!${pull_request_id}
% else:
${_('Pull request !{}').format(pull_request_id)}
% endif
-
- % if state not in ['created']:
- ${state}
- % endif
+
+
+ % if state not in ['created']:
+ ${state}
+ % endif
- % if is_wip:
- wip
- % endif
-
+ % if is_wip:
+ wip
+ % endif
%def>
<%def name="pullrequest_updated_on(updated_on)">