##// END OF EJS Templates
pull-requests: make my account and repo pr table more consistent.
marcink -
r4512:91239784 stable
parent child
Show More
@@ -111,7 +111,8 class RepoPullRequestsView(RepoAppView,
111 data.append({
111 data.append({
112 'name': _render('pullrequest_name',
112 'name': _render('pullrequest_name',
113 pr.pull_request_id, pr.pull_request_state,
113 pr.pull_request_id, pr.pull_request_state,
114 pr.work_in_progress, pr.target_repo.repo_name),
114 pr.work_in_progress, pr.target_repo.repo_name,
115 short=True),
115 'name_raw': pr.pull_request_id,
116 'name_raw': pr.pull_request_id,
116 'status': _render('pullrequest_status',
117 'status': _render('pullrequest_status',
117 pr.calculated_review_status()),
118 pr.calculated_review_status()),
@@ -374,9 +374,6 ul.auth_plugins {
374 background-color: @grey6;
374 background-color: @grey6;
375 }
375 }
376
376
377 .td-status {
378 padding-left: .5em;
379 }
380 .log-container .truncate {
377 .log-container .truncate {
381 height: 2.75em;
378 height: 2.75em;
382 white-space: pre-line;
379 white-space: pre-line;
@@ -384,6 +381,10 ul.auth_plugins {
384 table.rctable .user {
381 table.rctable .user {
385 padding-left: 0;
382 padding-left: 0;
386 }
383 }
384 .td-status {
385 padding: 0 0px 0px 10px;
386 width: 15px;
387 }
387 table.rctable {
388 table.rctable {
388 td.td-description,
389 td.td-description,
389 .rc-user {
390 .rc-user {
@@ -58,16 +58,10
58
58
59 dom: 'rtp',
59 dom: 'rtp',
60 pageLength: ${c.visual.dashboard_items},
60 pageLength: ${c.visual.dashboard_items},
61 order: [[2, "desc"]],
61 order: [[1, "desc"]],
62 columns: [
62 columns: [
63 {
63 {
64 data: {
64 data: {
65 "_": "target_repo",
66 "sort": "target_repo"
67 }, title: "${_('Target Repo')}", className: "td-targetrepo", orderable: false
68 },
69 {
70 data: {
71 "_": "status",
65 "_": "status",
72 "sort": "status"
66 "sort": "status"
73 }, title: "", className: "td-status", orderable: false
67 }, title: "", className: "td-status", orderable: false
@@ -101,7 +95,13
101 "_": "updated_on",
95 "_": "updated_on",
102 "sort": "updated_on_raw"
96 "sort": "updated_on_raw"
103 }, title: "${_('Last Update')}", className: "td-time"
97 }, title: "${_('Last Update')}", className: "td-time"
104 }
98 },
99 {
100 data: {
101 "_": "target_repo",
102 "sort": "target_repo"
103 }, title: "${_('Target Repo')}", className: "td-targetrepo", orderable: false
104 },
105 ],
105 ],
106 language: {
106 language: {
107 paginate: DEFAULT_GRID_PAGINATION,
107 paginate: DEFAULT_GRID_PAGINATION,
@@ -379,22 +379,22
379 </%def>
379 </%def>
380
380
381 <%def name="pullrequest_name(pull_request_id, state, is_wip, target_repo_name, short=False)">
381 <%def name="pullrequest_name(pull_request_id, state, is_wip, target_repo_name, short=False)">
382 <code>
382 <a href="${h.route_path('pullrequest_show',repo_name=target_repo_name,pull_request_id=pull_request_id)}">
383 <a href="${h.route_path('pullrequest_show',repo_name=target_repo_name,pull_request_id=pull_request_id)}">
383
384 % if short:
384 % if short:
385 !${pull_request_id}
385 !${pull_request_id}
386 % else:
386 % else:
387 ${_('Pull request !{}').format(pull_request_id)}
387 ${_('Pull request !{}').format(pull_request_id)}
388 % endif
388 % endif
389
389 </a>
390 % if state not in ['created']:
390 </code>
391 <span class="tag tag-merge-state-${state} tooltip" title="Pull request state is changing">${state}</span>
391 % if state not in ['created']:
392 % endif
392 <span class="tag tag-merge-state-${state} tooltip" title="Pull request state is changing">${state}</span>
393 % endif
393
394
394 % if is_wip:
395 % if is_wip:
395 <span class="tag tooltip" title="${_('Work in progress')}">wip</span>
396 <span class="tag tooltip" title="${_('Work in progress')}">wip</span>
396 % endif
397 % endif
397 </a>
398 </%def>
398 </%def>
399
399
400 <%def name="pullrequest_updated_on(updated_on)">
400 <%def name="pullrequest_updated_on(updated_on)">
General Comments 0
You need to be logged in to leave comments. Login now