Show More
@@ -1,145 +1,150 b'' | |||||
1 | ## -*- coding: utf-8 -*- |
|
1 | ## -*- coding: utf-8 -*- | |
2 | <%namespace name="base" file="/base/base.mako"/> |
|
2 | <%namespace name="base" file="/base/base.mako"/> | |
3 | %if c.repo_commits: |
|
3 | %if c.repo_commits: | |
4 | <table class="rctable repo_summary table_disp"> |
|
4 | <table class="rctable repo_summary table_disp"> | |
5 | <tr> |
|
5 | <tr> | |
6 |
|
6 | |||
7 | <th class="status" colspan="2"></th> |
|
7 | <th class="status" colspan="2"></th> | |
8 | <th>${_('Commit')}</th> |
|
8 | <th>${_('Commit')}</th> | |
9 | <th>${_('Commit message')}</th> |
|
9 | <th>${_('Commit message')}</th> | |
10 | <th>${_('Age')}</th> |
|
10 | <th>${_('Age')}</th> | |
11 | <th>${_('Author')}</th> |
|
11 | <th>${_('Author')}</th> | |
12 | <th>${_('Refs')}</th> |
|
12 | <th>${_('Refs')}</th> | |
13 | </tr> |
|
13 | </tr> | |
14 |
|
14 | |||
15 | ## to speed up lookups cache some functions before the loop |
|
15 | ## to speed up lookups cache some functions before the loop | |
16 | <% |
|
16 | <% | |
17 | active_patterns = h.get_active_pattern_entries(c.repo_name) |
|
17 | active_patterns = h.get_active_pattern_entries(c.repo_name) | |
18 | urlify_commit_message = h.partial(h.urlify_commit_message, active_pattern_entries=active_patterns) |
|
18 | urlify_commit_message = h.partial(h.urlify_commit_message, active_pattern_entries=active_patterns) | |
19 | %> |
|
19 | %> | |
20 | %for cnt,cs in enumerate(c.repo_commits): |
|
20 | %for cnt,cs in enumerate(c.repo_commits): | |
21 | <tr class="parity${cnt%2}"> |
|
21 | <tr class="parity${cnt%2}"> | |
22 |
|
22 | |||
23 | <td class="td-status"> |
|
23 | <td class="td-status"> | |
24 | %if c.statuses.get(cs.raw_id): |
|
24 | %if c.statuses.get(cs.raw_id): | |
25 | <div class="changeset-status-ico shortlog"> |
|
25 | <div class="changeset-status-ico shortlog"> | |
26 | %if c.statuses.get(cs.raw_id)[2]: |
|
26 | %if c.statuses.get(cs.raw_id)[2]: | |
27 | <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.route_path('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"> |
|
27 | <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.route_path('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"> | |
28 | <div class="${'flag_status {}'.format(c.statuses.get(cs.raw_id)[0])}"></div> |
|
28 | <div class="${'flag_status {}'.format(c.statuses.get(cs.raw_id)[0])}"></div> | |
29 | </a> |
|
29 | </a> | |
30 | %else: |
|
30 | %else: | |
31 | <a class="tooltip" title="${_('Commit status: {}').format(h.commit_status_lbl(c.statuses.get(cs.raw_id)[0]))}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=cs.raw_id,_anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}"> |
|
31 | <a class="tooltip" title="${_('Commit status: {}').format(h.commit_status_lbl(c.statuses.get(cs.raw_id)[0]))}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=cs.raw_id,_anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}"> | |
32 | <div class="${'flag_status {}'.format(c.statuses.get(cs.raw_id)[0])}"></div> |
|
32 | <div class="${'flag_status {}'.format(c.statuses.get(cs.raw_id)[0])}"></div> | |
33 | </a> |
|
33 | </a> | |
34 | %endif |
|
34 | %endif | |
35 | </div> |
|
35 | </div> | |
36 | %else: |
|
36 | %else: | |
37 | <div class="tooltip flag_status not_reviewed" title="${_('Commit status: Not Reviewed')}"></div> |
|
37 | <div class="tooltip flag_status not_reviewed" title="${_('Commit status: Not Reviewed')}"></div> | |
38 | %endif |
|
38 | %endif | |
39 | </td> |
|
39 | </td> | |
40 | <td class="td-comments"> |
|
40 | <td class="td-comments"> | |
41 | %if c.comments.get(cs.raw_id,[]): |
|
41 | %if c.comments.get(cs.raw_id,[]): | |
42 | <a title="${_('Commit has comments')}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=cs.raw_id,_anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}"> |
|
42 | <a title="${_('Commit has comments')}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=cs.raw_id,_anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}"> | |
43 | <i class="icon-comment"></i> ${len(c.comments[cs.raw_id])} |
|
43 | <i class="icon-comment"></i> ${len(c.comments[cs.raw_id])} | |
44 | </a> |
|
44 | </a> | |
45 | %endif |
|
45 | %endif | |
46 | </td> |
|
46 | </td> | |
47 | <td class="td-commit"> |
|
47 | <td class="td-commit"> | |
48 | <code> |
|
48 | <code> | |
49 | <a href="${h.route_path('repo_commit', repo_name=c.repo_name, commit_id=cs.raw_id)}">${h.show_id(cs)}</a> |
|
49 | <a href="${h.route_path('repo_commit', repo_name=c.repo_name, commit_id=cs.raw_id)}">${h.show_id(cs)}</a> | |
50 | <i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${cs.raw_id}" title="${_('Copy the full commit id')}"></i> |
|
50 | <i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${cs.raw_id}" title="${_('Copy the full commit id')}"></i> | |
51 | </code> |
|
51 | </code> | |
52 | </td> |
|
52 | </td> | |
53 |
|
53 | |||
54 | <td class="td-description mid"> |
|
54 | <td class="td-description mid"> | |
55 | <div class="log-container truncate-wrap"> |
|
55 | <div class="log-container truncate-wrap"> | |
56 | <div class="message truncate" id="c-${cs.raw_id}">${urlify_commit_message(cs.message, c.repo_name)}</div> |
|
56 | <div class="message truncate" id="c-${cs.raw_id}">${urlify_commit_message(cs.message, c.repo_name)}</div> | |
57 | </div> |
|
57 | </div> | |
58 | </td> |
|
58 | </td> | |
59 |
|
59 | |||
60 | <td class="td-time"> |
|
60 | <td class="td-time"> | |
61 | ${h.age_component(cs.date)} |
|
61 | ${h.age_component(cs.date)} | |
62 | </td> |
|
62 | </td> | |
63 | <td class="td-user author"> |
|
63 | <td class="td-user author"> | |
64 | ${base.gravatar_with_user(cs.author)} |
|
64 | ${base.gravatar_with_user(cs.author)} | |
65 | </td> |
|
65 | </td> | |
66 |
|
66 | |||
67 | <td class="td-tags"> |
|
67 | <td class="td-tags"> | |
68 | <div class="autoexpand"> |
|
68 | <div class="autoexpand"> | |
69 | %if h.is_hg(c.rhodecode_repo): |
|
69 | %if h.is_hg(c.rhodecode_repo): | |
70 | %for book in cs.bookmarks: |
|
70 | %for book in cs.bookmarks: | |
71 | <span class="booktag tag" title="${h.tooltip(_('Bookmark %s') % book)}"> |
|
71 | <span class="booktag tag" title="${h.tooltip(_('Bookmark %s') % book)}"> | |
72 | <a href="${h.route_path('repo_files:default_path',repo_name=c.repo_name,commit_id=cs.raw_id, _query=dict(at=book))}"><i class="icon-bookmark"></i>${h.shorter(book)}</a> |
|
72 | <a href="${h.route_path('repo_files:default_path',repo_name=c.repo_name,commit_id=cs.raw_id, _query=dict(at=book))}"><i class="icon-bookmark"></i>${h.shorter(book)}</a> | |
73 | </span> |
|
73 | </span> | |
74 | %endfor |
|
74 | %endfor | |
75 | %endif |
|
75 | %endif | |
76 | ## tags |
|
76 | ## tags | |
77 | %for tag in cs.tags: |
|
77 | %for tag in cs.tags: | |
78 | <span class="tagtag tag" title="${h.tooltip(_('Tag %s') % tag)}"> |
|
78 | <span class="tagtag tag" title="${h.tooltip(_('Tag %s') % tag)}"> | |
79 | <a href="${h.route_path('repo_files:default_path',repo_name=c.repo_name,commit_id=cs.raw_id, _query=dict(at=tag))}"><i class="icon-tag"></i>${h.shorter(tag)}</a> |
|
79 | <a href="${h.route_path('repo_files:default_path',repo_name=c.repo_name,commit_id=cs.raw_id, _query=dict(at=tag))}"><i class="icon-tag"></i>${h.shorter(tag)}</a> | |
80 | </span> |
|
80 | </span> | |
81 | %endfor |
|
81 | %endfor | |
82 |
|
82 | |||
83 | ## branch |
|
83 | ## branch | |
84 | %if cs.branch: |
|
84 | %if cs.branch: | |
85 | <span class="branchtag tag" title="${h.tooltip(_('Branch %s') % cs.branch)}"> |
|
85 | <span class="branchtag tag" title="${h.tooltip(_('Branch %s') % cs.branch)}"> | |
86 | <a href="${h.route_path('repo_changelog',repo_name=c.repo_name,_query=dict(branch=cs.branch))}"><i class="icon-code-fork"></i>${h.shorter(cs.branch)}</a> |
|
86 | <a href="${h.route_path('repo_changelog',repo_name=c.repo_name,_query=dict(branch=cs.branch))}"><i class="icon-code-fork"></i>${h.shorter(cs.branch)}</a> | |
87 | </span> |
|
87 | </span> | |
88 | %endif |
|
88 | %endif | |
89 | </div> |
|
89 | </div> | |
90 | </td> |
|
90 | </td> | |
91 | </tr> |
|
91 | </tr> | |
92 | %endfor |
|
92 | %endfor | |
93 |
|
93 | |||
94 | </table> |
|
94 | </table> | |
95 |
|
95 | |||
96 | <script type="text/javascript"> |
|
96 | <script type="text/javascript"> | |
97 |
$(document).pjax('#shortlog_data .pager_link','#shortlog_data', {timeout: |
|
97 | $(document).pjax('#shortlog_data .pager_link','#shortlog_data', {timeout: 5000, scrollTo: false, push: false}); | |
98 | $(document).on('pjax:success', function(){ timeagoActivate(); }); |
|
98 | $(document).on('pjax:success', function(){ timeagoActivate(); }); | |
|
99 | $(document).on('pjax:timeout', function(event) { | |||
|
100 | // Prevent default timeout redirection behavior | |||
|
101 | event.preventDefault() | |||
|
102 | }) | |||
|
103 | ||||
99 | </script> |
|
104 | </script> | |
100 |
|
105 | |||
101 | <div class="pagination-wh pagination-left"> |
|
106 | <div class="pagination-wh pagination-left"> | |
102 | ${c.repo_commits.pager('$link_previous ~2~ $link_next')} |
|
107 | ${c.repo_commits.pager('$link_previous ~2~ $link_next')} | |
103 | </div> |
|
108 | </div> | |
104 | %else: |
|
109 | %else: | |
105 |
|
110 | |||
106 | %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): |
|
111 | %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): | |
107 | <div class="quick_start"> |
|
112 | <div class="quick_start"> | |
108 | <div class="fieldset"> |
|
113 | <div class="fieldset"> | |
109 | <div class="left-label">${_('Add or upload files directly via RhodeCode:')}</div> |
|
114 | <div class="left-label">${_('Add or upload files directly via RhodeCode:')}</div> | |
110 | <div class="right-content"> |
|
115 | <div class="right-content"> | |
111 | <div id="add_node_id" class="add_node"> |
|
116 | <div id="add_node_id" class="add_node"> | |
112 | <a href="${h.route_path('repo_files_add_file',repo_name=c.repo_name,commit_id=0, f_path='', _anchor='edit')}" class="btn btn-default">${_('Add New File')}</a> |
|
117 | <a href="${h.route_path('repo_files_add_file',repo_name=c.repo_name,commit_id=0, f_path='', _anchor='edit')}" class="btn btn-default">${_('Add New File')}</a> | |
113 | </div> |
|
118 | </div> | |
114 | </div> |
|
119 | </div> | |
115 | %endif |
|
120 | %endif | |
116 | </div> |
|
121 | </div> | |
117 |
|
122 | |||
118 | %if not h.is_svn(c.rhodecode_repo): |
|
123 | %if not h.is_svn(c.rhodecode_repo): | |
119 | <div class="fieldset"> |
|
124 | <div class="fieldset"> | |
120 | <div class="left-label">${_('Push new repo:')}</div> |
|
125 | <div class="left-label">${_('Push new repo:')}</div> | |
121 | <div class="right-content"> |
|
126 | <div class="right-content"> | |
122 | <pre> |
|
127 | <pre> | |
123 | ${c.rhodecode_repo.alias} clone ${c.clone_repo_url} |
|
128 | ${c.rhodecode_repo.alias} clone ${c.clone_repo_url} | |
124 | ${c.rhodecode_repo.alias} add README # add first file |
|
129 | ${c.rhodecode_repo.alias} add README # add first file | |
125 | ${c.rhodecode_repo.alias} commit -m "Initial" # commit with message |
|
130 | ${c.rhodecode_repo.alias} commit -m "Initial" # commit with message | |
126 | ${c.rhodecode_repo.alias} push ${'origin master' if h.is_git(c.rhodecode_repo) else ''} # push changes back |
|
131 | ${c.rhodecode_repo.alias} push ${'origin master' if h.is_git(c.rhodecode_repo) else ''} # push changes back | |
127 | </pre> |
|
132 | </pre> | |
128 | </div> |
|
133 | </div> | |
129 | </div> |
|
134 | </div> | |
130 | <div class="fieldset"> |
|
135 | <div class="fieldset"> | |
131 | <div class="left-label">${_('Existing repository?')}</div> |
|
136 | <div class="left-label">${_('Existing repository?')}</div> | |
132 | <div class="right-content"> |
|
137 | <div class="right-content"> | |
133 | <pre> |
|
138 | <pre> | |
134 | %if h.is_git(c.rhodecode_repo): |
|
139 | %if h.is_git(c.rhodecode_repo): | |
135 | git remote add origin ${c.clone_repo_url} |
|
140 | git remote add origin ${c.clone_repo_url} | |
136 | git push -u origin master |
|
141 | git push -u origin master | |
137 | %else: |
|
142 | %else: | |
138 | hg push ${c.clone_repo_url} |
|
143 | hg push ${c.clone_repo_url} | |
139 | %endif |
|
144 | %endif | |
140 | </pre> |
|
145 | </pre> | |
141 | </div> |
|
146 | </div> | |
142 | </div> |
|
147 | </div> | |
143 | %endif |
|
148 | %endif | |
144 | </div> |
|
149 | </div> | |
145 | %endif |
|
150 | %endif |
General Comments 0
You need to be logged in to leave comments.
Login now