pull-requests: make my account and repo pr table more consistent.

rhodecode/apps/repository/views/repo_pull_requests.py

@@ -111,7 +111,8 @@ class RepoPullRequestsView(RepoAppView, DataGridAppView):
             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()),

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 {

rhodecode/templates/admin/my_account/my_account_pullrequests.mako

@@ -58,14 +58,8 @@
 
             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",
@@ -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,

rhodecode/templates/data_table/_dt_elements.mako

@@ -379,22 +379,22 @@ ${h.style_metatag(tag_type, tag)|n,trim}
 </%def>
 
 <%def name="pullrequest_name(pull_request_id, state, is_wip, target_repo_name, short=False)">
+    <code>
     <a href="${h.route_path('pullrequest_show',repo_name=target_repo_name,pull_request_id=pull_request_id)}">
-
       % if short:
         !${pull_request_id}
       % else:
         ${_('Pull request !{}').format(pull_request_id)}
       % endif
-
-      % if state not in ['created']:
-          <span class="tag tag-merge-state-${state} tooltip" title="Pull request state is changing">${state}</span>
-      % endif
-
-      % if is_wip:
-          <span class="tag tooltip" title="${_('Work in progress')}">wip</span>
-      % endif
     </a>
+    </code>
+    % if state not in ['created']:
+        <span class="tag tag-merge-state-${state} tooltip" title="Pull request state is changing">${state}</span>
+    % endif
+
+    % if is_wip:
+        <span class="tag tooltip" title="${_('Work in progress')}">wip</span>
+    % endif
 </%def>
 
 <%def name="pullrequest_updated_on(updated_on)">