Show More
@@ -110,11 +110,10 b'' | |||||
110 | <tr> |
|
110 | <tr> | |
111 | ## checkbox |
|
111 | ## checkbox | |
112 | <th></th> |
|
112 | <th></th> | |
113 |
<th |
|
113 | <th></th> | |
114 |
|
114 | |||
115 | <th>${_('Commit')}</th> |
|
115 | <th>${_('Commit')}</th> | |
116 | ## Mercurial phase/evolve state |
|
116 | ||
117 | <th></th> |
|
|||
118 | ## commit message expand arrow |
|
117 | ## commit message expand arrow | |
119 | <th></th> |
|
118 | <th></th> | |
120 | <th>${_('Commit Message')}</th> |
|
119 | <th>${_('Commit Message')}</th> | |
@@ -123,6 +122,8 b'' | |||||
123 | <th>${_('Author')}</th> |
|
122 | <th>${_('Author')}</th> | |
124 |
|
123 | |||
125 | <th>${_('Refs')}</th> |
|
124 | <th>${_('Refs')}</th> | |
|
125 | ## comments | |||
|
126 | <th></th> | |||
126 | </tr> |
|
127 | </tr> | |
127 |
|
128 | |||
128 | <tbody class="commits-range"> |
|
129 | <tbody class="commits-range"> |
@@ -23,8 +23,8 b'' | |||||
23 | <td class="td-checkbox"> |
|
23 | <td class="td-checkbox"> | |
24 | ${h.checkbox(commit.raw_id,class_="commit-range")} |
|
24 | ${h.checkbox(commit.raw_id,class_="commit-range")} | |
25 | </td> |
|
25 | </td> | |
|
26 | ||||
26 | <td class="td-status"> |
|
27 | <td class="td-status"> | |
27 |
|
||||
28 | %if c.statuses.get(commit.raw_id): |
|
28 | %if c.statuses.get(commit.raw_id): | |
29 | <div class="changeset-status-ico"> |
|
29 | <div class="changeset-status-ico"> | |
30 | %if c.statuses.get(commit.raw_id)[2]: |
|
30 | %if c.statuses.get(commit.raw_id)[2]: | |
@@ -41,44 +41,38 b'' | |||||
41 | <div class="tooltip flag_status not_reviewed" title="${_('Commit status: Not Reviewed')}"></div> |
|
41 | <div class="tooltip flag_status not_reviewed" title="${_('Commit status: Not Reviewed')}"></div> | |
42 | %endif |
|
42 | %endif | |
43 | </td> |
|
43 | </td> | |
44 | <td class="td-comments comments-col"> |
|
44 | ||
45 | %if c.comments.get(commit.raw_id): |
|
|||
46 | <a title="${_('Commit has comments')}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id,_anchor='comment-%s' % c.comments[commit.raw_id][0].comment_id)}"> |
|
|||
47 | <i class="icon-comment"></i> ${len(c.comments[commit.raw_id])} |
|
|||
48 | </a> |
|
|||
49 | %endif |
|
|||
50 | </td> |
|
|||
51 | <td class="td-hash"> |
|
45 | <td class="td-hash"> | |
52 | <code> |
|
46 | <code> | |
53 |
|
47 | |||
54 | <a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id)}"> |
|
48 | <a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id)}"> | |
55 | <span class="${'commit_hash obsolete' if getattr(commit, 'obsolete', None) else 'commit_hash'}">${h.show_id(commit)}</span> |
|
49 | <span class="${'commit_hash obsolete' if getattr(commit, 'obsolete', None) else 'commit_hash'}">${h.show_id(commit)}</span> | |
56 | </a> |
|
50 | </a> | |
|
51 | ||||
57 | <i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${commit.raw_id}" title="${_('Copy the full commit id')}"></i> |
|
52 | <i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${commit.raw_id}" title="${_('Copy the full commit id')}"></i> | |
58 | </code> |
|
53 | ||
59 | </td> |
|
54 | ## COMMIT PHASES | |
60 | <td class="td-tags tags-col"> |
|
55 | ||
61 |
## |
|
56 | ## Draft | |
62 | % if hasattr(commit, 'phase'): |
|
57 | % if hasattr(commit, 'phase'): | |
63 | % if commit.phase != 'public': |
|
58 | % if commit.phase != 'public': | |
64 |
<span class="tag phase-${commit.phase} tooltip" title="${_(' |
|
59 | <span class="tag phase-${commit.phase} tooltip" title="${_('{} commit phase').format(commit.phase)}">${commit.phase[0].upper()}</span> | |
65 | % endif |
|
60 | % endif | |
66 | % endif |
|
61 | % endif | |
67 |
|
62 | |||
68 | ## obsolete commits |
|
63 | ## obsolete commits | |
69 | % if hasattr(commit, 'obsolete'): |
|
64 | % if hasattr(commit, 'obsolete') and commit.obsolete: | |
70 | % if commit.obsolete: |
|
65 | <span class="tag obsolete-${commit.obsolete} tooltip" title="${_('Obsolete Evolve State')}">O</span> | |
71 | <span class="tag obsolete-${commit.obsolete} tooltip" title="${_('Evolve State')}">${_('obsolete')}</span> |
|
|||
72 | % endif |
|
|||
73 | % endif |
|
66 | % endif | |
74 |
|
67 | |||
75 | ## hidden commits |
|
68 | ## hidden commits | |
76 | % if hasattr(commit, 'hidden'): |
|
69 | % if hasattr(commit, 'hidden') and commit.hidden: | |
77 | % if commit.hidden: |
|
70 | <span class="tag obsolete-${commit.hidden} tooltip" title="${_('Hidden Evolve State')}">H</span> | |
78 | <span class="tag obsolete-${commit.hidden} tooltip" title="${_('Evolve State')}">${_('hidden')}</span> |
|
|||
79 | % endif |
|
|||
80 | % endif |
|
71 | % endif | |
|
72 | ||||
|
73 | </code> | |||
81 | </td> |
|
74 | </td> | |
|
75 | ||||
82 | <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}" onclick="commitsController.expandCommit(this, true); return false"> |
|
76 | <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}" onclick="commitsController.expandCommit(this, true); return false"> | |
83 | <i class="icon-expand-linked"></i> |
|
77 | <i class="icon-expand-linked"></i> | |
84 | </td> |
|
78 | </td> | |
@@ -130,6 +124,18 b'' | |||||
130 |
|
124 | |||
131 | </div> |
|
125 | </div> | |
132 | </td> |
|
126 | </td> | |
|
127 | ||||
|
128 | <td class="td-comments comments-col"> | |||
|
129 | <% cs_comments = c.comments.get(commit.raw_id,[]) %> | |||
|
130 | % if cs_comments: | |||
|
131 | <a title="${_('Commit has comments')}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id,_anchor='comment-%s' % cs_comments[0].comment_id)}"> | |||
|
132 | <i class="icon-comment"></i> ${len(cs_comments)} | |||
|
133 | </a> | |||
|
134 | % else: | |||
|
135 | <i class="icon-comment"></i> ${len(cs_comments)} | |||
|
136 | % endif | |||
|
137 | </td> | |||
|
138 | ||||
133 | </tr> |
|
139 | </tr> | |
134 | % endfor |
|
140 | % endfor | |
135 |
|
141 |
General Comments 0
You need to be logged in to leave comments.
Login now