##// END OF EJS Templates
changelog: fixed accidentally added space in graph
marcink -
r3967:c40bdc08 default
parent child Browse files
Show More
@@ -1,159 +1,159 b''
1 ## small box that displays changed/added/removed details fetched by AJAX
1 ## small box that displays changed/added/removed details fetched by AJAX
2 <%namespace name="base" file="/base/base.mako"/>
2 <%namespace name="base" file="/base/base.mako"/>
3
3
4 % if c.prev_page:
4 % if c.prev_page:
5 <tr>
5 <tr>
6 <td colspan="10" class="load-more-commits">
6 <td colspan="10" class="load-more-commits">
7 <a class="prev-commits" href="#loadPrevCommits" onclick="commitsController.loadPrev(this, ${c.prev_page}, '${c.branch_name}', '${c.commit_id}', '${c.f_path}');return false">
7 <a class="prev-commits" href="#loadPrevCommits" onclick="commitsController.loadPrev(this, ${c.prev_page}, '${c.branch_name}', '${c.commit_id}', '${c.f_path}');return false">
8 ${_('load previous')}
8 ${_('load previous')}
9 </a>
9 </a>
10 </td>
10 </td>
11 </tr>
11 </tr>
12 % endif
12 % endif
13
13
14 ## to speed up lookups cache some functions before the loop
14 ## to speed up lookups cache some functions before the loop
15 <%
15 <%
16 active_patterns = h.get_active_pattern_entries(c.repo_name)
16 active_patterns = h.get_active_pattern_entries(c.repo_name)
17 urlify_commit_message = h.partial(h.urlify_commit_message, active_pattern_entries=active_patterns)
17 urlify_commit_message = h.partial(h.urlify_commit_message, active_pattern_entries=active_patterns)
18 %>
18 %>
19
19
20 % for cnt,commit in enumerate(c.pagination):
20 % for cnt,commit in enumerate(c.pagination):
21 <tr id="sha_${commit.raw_id}" class="changelogRow container ${'tablerow%s' % (cnt%2)}">
21 <tr id="sha_${commit.raw_id}" class="changelogRow container ${'tablerow%s' % (cnt%2)}">
22
22
23 <td class="td-checkbox">
23 <td class="td-checkbox">
24 ${h.checkbox(commit.raw_id,class_="commit-range", **{'data-commit-idx':commit.idx, 'data-commit-id': commit.raw_id, 'data-short-id': commit.short_id})}
24 ${h.checkbox(commit.raw_id,class_="commit-range", **{'data-commit-idx':commit.idx, 'data-commit-id': commit.raw_id, 'data-short-id': commit.short_id})}
25 </td>
25 </td>
26 ##
26 ##
27 <td class="td-graphbox">
27 <td class="td-graphbox">
28
28
29 </td>
29 </td>
30
30
31 <td class="td-status">
31 <td class="td-status">
32 %if c.statuses.get(commit.raw_id):
32 %if c.statuses.get(commit.raw_id):
33 <div class="changeset-status-ico">
33 <div class="changeset-status-ico">
34 %if c.statuses.get(commit.raw_id)[2]:
34 %if c.statuses.get(commit.raw_id)[2]:
35 <a class="tooltip" title="${_('Commit status: %s\nClick to open associated pull request #%s') % (h.commit_status_lbl(c.statuses.get(commit.raw_id)[0]), c.statuses.get(commit.raw_id)[2])}" href="${h.route_path('pullrequest_show',repo_name=c.statuses.get(commit.raw_id)[3],pull_request_id=c.statuses.get(commit.raw_id)[2])}">
35 <a class="tooltip" title="${_('Commit status: %s\nClick to open associated pull request #%s') % (h.commit_status_lbl(c.statuses.get(commit.raw_id)[0]), c.statuses.get(commit.raw_id)[2])}" href="${h.route_path('pullrequest_show',repo_name=c.statuses.get(commit.raw_id)[3],pull_request_id=c.statuses.get(commit.raw_id)[2])}">
36 <i class="icon-circle review-status-${c.statuses.get(commit.raw_id)[0]}"></i>
36 <i class="icon-circle review-status-${c.statuses.get(commit.raw_id)[0]}"></i>
37 </a>
37 </a>
38 %else:
38 %else:
39 <a class="tooltip" title="${_('Commit status: {}').format(h.commit_status_lbl(c.statuses.get(commit.raw_id)[0]))}" 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)}">
39 <a class="tooltip" title="${_('Commit status: {}').format(h.commit_status_lbl(c.statuses.get(commit.raw_id)[0]))}" 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)}">
40 <i class="icon-circle review-status-${c.statuses.get(commit.raw_id)[0]}"></i>
40 <i class="icon-circle review-status-${c.statuses.get(commit.raw_id)[0]}"></i>
41 </a>
41 </a>
42 %endif
42 %endif
43 </div>
43 </div>
44 %else:
44 %else:
45 <i class="icon-circle review-status-not_reviewed" title="${_('Commit status: Not Reviewed')}"></i>
45 <i class="icon-circle review-status-not_reviewed" title="${_('Commit status: Not Reviewed')}"></i>
46 %endif
46 %endif
47 </td>
47 </td>
48
48
49 <td class="td-hash">
49 <td class="td-hash">
50 <code>
50 <code>
51
51
52 <a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id)}">
52 <a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id)}">
53 <span class="${'commit_hash obsolete' if getattr(commit, 'obsolete', None) else 'commit_hash'}">${h.show_id(commit)}</span>
53 <span class="${'commit_hash obsolete' if getattr(commit, 'obsolete', None) else 'commit_hash'}">${h.show_id(commit)}</span>
54 </a>
54 </a>
55
55
56 <i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${commit.raw_id}" title="${_('Copy the full commit id')}"></i>
56 <i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${commit.raw_id}" title="${_('Copy the full commit id')}"></i>
57
57
58 ## COMMIT PHASES
58 ## COMMIT PHASES
59
59
60 ## Draft
60 ## Draft
61 % if hasattr(commit, 'phase'):
61 % if hasattr(commit, 'phase'):
62 % if commit.phase != 'public':
62 % if commit.phase != 'public':
63 <span class="tag phase-${commit.phase} tooltip" title="${_('{} commit phase').format(commit.phase)}">${commit.phase[0].upper()}</span>
63 <span class="tag phase-${commit.phase} tooltip" title="${_('{} commit phase').format(commit.phase)}">${commit.phase[0].upper()}</span>
64 % endif
64 % endif
65 % endif
65 % endif
66
66
67 ## obsolete commits
67 ## obsolete commits
68 % if hasattr(commit, 'obsolete') and commit.obsolete:
68 % if hasattr(commit, 'obsolete') and commit.obsolete:
69 <span class="tag obsolete-${commit.obsolete} tooltip" title="${_('Obsolete Evolve State')}">O</span>
69 <span class="tag obsolete-${commit.obsolete} tooltip" title="${_('Obsolete Evolve State')}">O</span>
70 % endif
70 % endif
71
71
72 ## hidden commits
72 ## hidden commits
73 % if hasattr(commit, 'hidden') and commit.hidden:
73 % if hasattr(commit, 'hidden') and commit.hidden:
74 <span class="tag obsolete-${commit.hidden} tooltip" title="${_('Hidden Evolve State')}">H</span>
74 <span class="tag obsolete-${commit.hidden} tooltip" title="${_('Hidden Evolve State')}">H</span>
75 % endif
75 % endif
76
76
77 </code>
77 </code>
78 </td>
78 </td>
79
79
80 <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}" onclick="commitsController.expandCommit(this, true); return false">
80 <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}" onclick="commitsController.expandCommit(this, true); return false">
81 <i class="icon-expand-linked"></i>&nbsp;
81 <i class="icon-expand-linked"></i>
82 </td>
82 </td>
83 <td class="td-description mid">
83 <td class="td-description mid">
84 <div class="log-container truncate-wrap">
84 <div class="log-container truncate-wrap">
85 <div class="message truncate" id="c-${commit.raw_id}" data-message-raw="${commit.message}">${urlify_commit_message(commit.message, c.repo_name)}</div>
85 <div class="message truncate" id="c-${commit.raw_id}" data-message-raw="${commit.message}">${urlify_commit_message(commit.message, c.repo_name)}</div>
86 </div>
86 </div>
87 </td>
87 </td>
88
88
89 <td class="td-time">
89 <td class="td-time">
90 ${h.age_component(commit.date)}
90 ${h.age_component(commit.date)}
91 </td>
91 </td>
92 <td class="td-user">
92 <td class="td-user">
93 ${base.gravatar_with_user(commit.author)}
93 ${base.gravatar_with_user(commit.author)}
94 </td>
94 </td>
95
95
96 <td class="td-tags tags-col">
96 <td class="td-tags tags-col">
97 <div id="t-${commit.raw_id}">
97 <div id="t-${commit.raw_id}">
98
98
99 ## merge
99 ## merge
100 %if commit.merge:
100 %if commit.merge:
101 <span class="tag mergetag">
101 <span class="tag mergetag">
102 <i class="icon-merge"></i>${_('merge')}
102 <i class="icon-merge"></i>${_('merge')}
103 </span>
103 </span>
104 %endif
104 %endif
105
105
106 ## branch
106 ## branch
107 %if commit.branch:
107 %if commit.branch:
108 <span class="tag branchtag" title="${h.tooltip(_('Branch %s') % commit.branch)}">
108 <span class="tag branchtag" title="${h.tooltip(_('Branch %s') % commit.branch)}">
109 <a href="${h.route_path('repo_commits',repo_name=c.repo_name,_query=dict(branch=commit.branch))}"><i class="icon-code-fork"></i>${h.shorter(commit.branch)}</a>
109 <a href="${h.route_path('repo_commits',repo_name=c.repo_name,_query=dict(branch=commit.branch))}"><i class="icon-code-fork"></i>${h.shorter(commit.branch)}</a>
110 </span>
110 </span>
111 %endif
111 %endif
112
112
113 ## bookmarks
113 ## bookmarks
114 %if h.is_hg(c.rhodecode_repo):
114 %if h.is_hg(c.rhodecode_repo):
115 %for book in commit.bookmarks:
115 %for book in commit.bookmarks:
116 <span class="tag booktag" title="${h.tooltip(_('Bookmark %s') % book)}">
116 <span class="tag booktag" title="${h.tooltip(_('Bookmark %s') % book)}">
117 <a href="${h.route_path('repo_files:default_path',repo_name=c.repo_name,commit_id=commit.raw_id, _query=dict(at=book))}"><i class="icon-bookmark"></i>${h.shorter(book)}</a>
117 <a href="${h.route_path('repo_files:default_path',repo_name=c.repo_name,commit_id=commit.raw_id, _query=dict(at=book))}"><i class="icon-bookmark"></i>${h.shorter(book)}</a>
118 </span>
118 </span>
119 %endfor
119 %endfor
120 %endif
120 %endif
121
121
122 ## tags
122 ## tags
123 %for tag in commit.tags:
123 %for tag in commit.tags:
124 <span class="tag tagtag" title="${h.tooltip(_('Tag %s') % tag)}">
124 <span class="tag tagtag" title="${h.tooltip(_('Tag %s') % tag)}">
125 <a href="${h.route_path('repo_files:default_path',repo_name=c.repo_name,commit_id=commit.raw_id, _query=dict(at=tag))}"><i class="icon-tag"></i>${h.shorter(tag)}</a>
125 <a href="${h.route_path('repo_files:default_path',repo_name=c.repo_name,commit_id=commit.raw_id, _query=dict(at=tag))}"><i class="icon-tag"></i>${h.shorter(tag)}</a>
126 </span>
126 </span>
127 %endfor
127 %endfor
128
128
129 </div>
129 </div>
130 </td>
130 </td>
131
131
132 <td class="td-comments comments-col">
132 <td class="td-comments comments-col">
133 <% cs_comments = c.comments.get(commit.raw_id,[]) %>
133 <% cs_comments = c.comments.get(commit.raw_id,[]) %>
134 % if cs_comments:
134 % if cs_comments:
135 <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)}">
135 <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)}">
136 <i class="icon-comment"></i> ${len(cs_comments)}
136 <i class="icon-comment"></i> ${len(cs_comments)}
137 </a>
137 </a>
138 % else:
138 % else:
139 <i class="icon-comment"></i> ${len(cs_comments)}
139 <i class="icon-comment"></i> ${len(cs_comments)}
140 % endif
140 % endif
141 </td>
141 </td>
142
142
143 </tr>
143 </tr>
144 % endfor
144 % endfor
145
145
146 % if c.next_page:
146 % if c.next_page:
147 <tr>
147 <tr>
148 <td colspan="10" class="load-more-commits">
148 <td colspan="10" class="load-more-commits">
149 <a class="next-commits" href="#loadNextCommits" onclick="commitsController.loadNext(this, ${c.next_page}, '${c.branch_name}', '${c.commit_id}', '${c.f_path}');return false">
149 <a class="next-commits" href="#loadNextCommits" onclick="commitsController.loadNext(this, ${c.next_page}, '${c.branch_name}', '${c.commit_id}', '${c.f_path}');return false">
150 ${_('load next')}
150 ${_('load next')}
151 </a>
151 </a>
152 </td>
152 </td>
153 </tr>
153 </tr>
154 % endif
154 % endif
155 <tr class="chunk-graph-data" style="display:none"
155 <tr class="chunk-graph-data" style="display:none"
156 data-graph='${c.graph_data|n}'
156 data-graph='${c.graph_data|n}'
157 data-node='${c.prev_page}:${c.next_page}'
157 data-node='${c.prev_page}:${c.next_page}'
158 data-commits='${c.graph_commits|n}'>
158 data-commits='${c.graph_commits|n}'>
159 </tr> No newline at end of file
159 </tr>
General Comments 0
You need to be logged in to leave comments. Login now