##// END OF EJS Templates
u » pc » rhodecode-enterprise-ce-fork-pc
RSS

Fork of rhodecode-enterprise-ce

summary/changelog: unified how data is displayed for summary and changelog pages....
marcink -
r472:3d63a95d default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -97,14 +97,18 b''
97 97 <div class="table">
98 98 <table id="changesets" class="rctable">
99 99 <tr>
100 <th></th>
100 ## checkbox
101 101 <th></th>
102 <th>${_('Author')}</th>
103 <th>${_('Age')}</th>
102 <th colspan="2"></th>
103
104 <th>${_('Commit')}</th>
105 ## commit message expand arrow
104 106 <th></th>
105 107 <th>${_('Commit Message')}</th>
106 <th>${_('Commit')}</th>
107 <th></th>
108
109 <th>${_('Age')}</th>
110 <th>${_('Author')}</th>
111
108 112 <th>${_('Refs')}</th>
109 113 </tr>
110 114 <tbody>
@@ -128,26 +132,17 b''
128 132 </a>
129 133 %endif
130 134 </div>
135 %else:
136 <div class="tooltip flag_status not_reviewed" title="${_('Commit status: Not Reviewed')}"></div>
131 137 %endif
132 138 </td>
133 <td class="td-user">
134 ${self.gravatar_with_user(commit.author)}
135 </td>
136 <td class="td-time">
137 ${h.age_component(commit.date)}
139 <td class="td-comments comments-col">
140 %if c.comments.get(commit.raw_id):
141 <a title="${_('Commit has comments')}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id,anchor='comment-%s' % c.comments[commit.raw_id][0].comment_id)}">
142 <i class="icon-comment icon-comment-colored"></i> ${len(c.comments[commit.raw_id])}
143 </a>
144 %endif
138 145 </td>
139
140 <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}">
141 <div class="show_more_col">
142 <i class="show_more"></i>&nbsp;
143 </div>
144 </td>
145 <td class="mid td-description">
146 <div class="log-container truncate-wrap">
147 <div class="message truncate" id="c-${commit.raw_id}">${h.urlify_commit_message(commit.message, c.repo_name)}</div>
148 </div>
149 </td>
150
151 146 <td class="td-hash">
152 147 <code>
153 148 <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id)}">
@@ -155,13 +150,22 b''
155 150 </a>
156 151 </code>
157 152 </td>
153 <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}">
154 <div class="show_more_col">
155 <i class="show_more"></i>&nbsp;
156 </div>
157 </td>
158 <td class="td-description mid">
159 <div class="log-container truncate-wrap">
160 <div class="message truncate" id="c-${commit.raw_id}">${h.urlify_commit_message(commit.message, c.repo_name)}</div>
161 </div>
162 </td>
158 163
159 <td class="td-comments comments-col">
160 %if c.comments.get(commit.raw_id):
161 <a title="${_('Commit has comments')}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id,anchor='comment-%s' % c.comments[commit.raw_id][0].comment_id)}">
162 ${len(c.comments[commit.raw_id])} <i class="icon-comment icon-comment-colored"></i>
163 </a>
164 %endif
164 <td class="td-time">
165 ${h.age_component(commit.date)}
166 </td>
167 <td class="td-user">
168 ${self.gravatar_with_user(commit.author)}
165 169 </td>
166 170
167 171 <td class="td-tags tags-col truncate-wrap">
Show file before | Show file after | Hide comments
@@ -3,8 +3,9 b''
3 3 %if c.repo_commits:
4 4 <table class="rctable repo_summary table_disp">
5 5 <tr>
6
7 <th class="status" colspan="2"></th>
6 8 <th>${_('Commit')}</th>
7 <th class="status" colspan="2"></th>
8 9 <th>${_('Commit message')}</th>
9 10 <th>${_('Age')}</th>
10 11 <th>${_('Author')}</th>
@@ -12,39 +13,45 b''
12 13 </tr>
13 14 %for cnt,cs in enumerate(c.repo_commits):
14 15 <tr class="parity${cnt%2}">
16
17 <td class="td-status">
18 %if c.statuses.get(cs.raw_id):
19 <div class="changeset-status-ico shortlog">
20 %if c.statuses.get(cs.raw_id)[2]:
21 <a class="tooltip" title="${_('Commit status: %s\nClick to open associated pull request #%s') % (c.statuses.get(cs.raw_id)[0], c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
22 <div class="${'flag_status %s' % c.statuses.get(cs.raw_id)[0]}"></div>
23 </a>
24 %else:
25 <a class="tooltip" title="${_('Commit status: %s') % h.commit_status_lbl(c.statuses.get(cs.raw_id)[0])}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
26 <div class="${'flag_status %s' % c.statuses.get(cs.raw_id)[0]}"></div>
27 </a>
28 %endif
29 </div>
30 %else:
31 <div class="tooltip flag_status not_reviewed" title="${_('Commit status: Not Reviewed')}"></div>
32 %endif
33 </td>
34 <td class="td-comments">
35 %if c.comments.get(cs.raw_id,[]):
36 <a title="${_('Commit has comments')}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
37 <i class="icon-comment icon-comment-colored"></i> ${len(c.comments[cs.raw_id])}
38 </a>
39 %endif
40 </td>
15 41 <td class="td-commit">
16 42 <pre><a href="${h.url('changeset_home', repo_name=c.repo_name, revision=cs.raw_id)}">${h.show_id(cs)}</a></pre>
17 43 </td>
18 <td class="td-status">
19 %if c.statuses.get(cs.raw_id):
20 <div class="changeset-status-ico shortlog">
21 %if c.statuses.get(cs.raw_id)[2]:
22 <a class="tooltip" title="${_('Commit status: %s\nClick to open associated pull request #%s') % (c.statuses.get(cs.raw_id)[0], c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
23 <div class="${'flag_status %s' % c.statuses.get(cs.raw_id)[0]}"></div>
24 </a>
25 %else:
26 <div class="${'flag_status %s' % c.statuses.get(cs.raw_id)[0]}"></div>
27 %endif
28 </div>
29 %endif
30 </td>
31 <td class="td-comments">
32 %if c.comments.get(cs.raw_id,[]):
33 <a title="${_('Commit has comments')}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
34 <i class="icon-comment icon-comment-colored"></i> ${len(c.comments[cs.raw_id])}
35 </a>
36 %endif
37 </td>
38 44 <td class="td-message">
39 45 ${h.urlify_commit_message(h.truncate(cs.message, 50), c.repo_name)}
40 46 </td>
47
41 48 <td class="td-time">
42 49 ${h.age_component(cs.date)}
43 50 </td>
44
45 51 <td class="td-user author">
46 52 ${base.gravatar_with_user(cs.author)}
47 53 </td>
54
48 55 <td class="td-tags truncate-wrap">
49 56 <div class="truncate tags-truncate"><div class="autoexpand">
50 57 %if h.is_hg(c.rhodecode_repo):
General Comments 0
You need to be logged in to leave comments. Login now