Mercurial > kallithea

annotate kallithea/templates/changeset/changeset_range.html @ 6369:1855b7b29d76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changeset: fix broken revision links in title
author Mads Kiilerich <mads@kiilerich.com>
date Mon, 19 Dec 2016 04:46:48 +0100
parents 1cf51cd05e36
children c4379e4dc820
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1787
d4a7b6c82efe code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents: 1777
diff changeset
1 ## -*- coding: utf-8 -*-
977
28524453bb76 started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
2 <%inherit file="/base/base.html"/>
28524453bb76 started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
3
4811
37354e1ab283 template: use block block for page title in root.html
Mads Kiilerich <madski@unity3d.com>
parents: 4809
diff changeset
4 <%block name="title">
4334
1a659a59be4a changesets: don't show SVN style 'rXXX:' revision numbers if show_revision_number is false
Mads Kiilerich <madski@unity3d.com>
parents: 4291
diff changeset
5 ${_('%s Changesets') % c.repo_name} - ${h.show_id(c.cs_ranges[0])} &gt; ${h.show_id(c.cs_ranges[-1])}
4811
37354e1ab283 template: use block block for page title in root.html
Mads Kiilerich <madski@unity3d.com>
parents: 4809
diff changeset
6 </%block>
977
28524453bb76 started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
7
28524453bb76 started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
8 <%def name="breadcrumbs_links()">
4116
ffd45b185016 Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4051
diff changeset
9 ${_('Changesets')} -
6369
1855b7b29d76 changeset: fix broken revision links in title
Mads Kiilerich <mads@kiilerich.com>
parents: 6303
diff changeset
10 ${h.link_to(h.show_id(c.cs_ranges[0]),h.url('changeset_home',repo_name=c.repo_name,revision=c.cs_ranges[0].raw_id))}</td>
4856
e8ff151b3085 font: rename icon-arrow-right to icon-right
Sean Farley <sean.michael.farley@gmail.com>
parents: 4845
diff changeset
11 <i class="icon-right"></i>
6369
1855b7b29d76 changeset: fix broken revision links in title
Mads Kiilerich <mads@kiilerich.com>
parents: 6303
diff changeset
12 ${h.link_to(h.show_id(c.cs_ranges[-1]),h.url('changeset_home',repo_name=c.repo_name,revision=c.cs_ranges[-1].raw_id))}</td>
977
28524453bb76 started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
13 </%def>
28524453bb76 started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
14
4809
ec39e73be935 template: move header to root.html, use mako block for header menu
Mads Kiilerich <madski@unity3d.com>
parents: 4795
diff changeset
15 <%block name="header_menu">
3603
eacd33e0c5b3 use valid options for the top menu: repositories, journal, search and admin
Mads Kiilerich <madski@unity3d.com>
parents: 3602
diff changeset
16 ${self.menu('repositories')}
4809
ec39e73be935 template: move header to root.html, use mako block for header menu
Mads Kiilerich <madski@unity3d.com>
parents: 4795
diff changeset
17 </%block>
977
28524453bb76 started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
18
28524453bb76 started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
19 <%def name="main()">
3988
072a37c44f58 templates: drop context_bar, use repo_context_bar directly
Mads Kiilerich <madski@unity3d.com>
parents: 3960
diff changeset
20 ${self.repo_context_bar('changelog')}
6259
80a15e10857a style: in preparation for bootstrap, replace kallithea box with bootstrap compatible panel
domruf <dominikruf@gmail.com>
parents: 6258
diff changeset
21 <div class="panel panel-primary">
977
28524453bb76 started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
22 <!-- box / title -->
6295
33ca6d0f7058 style: introduce "clearfix" class where the Bootstrap migration will need it
Mads Kiilerich <madski@unity3d.com>
parents: 6294
diff changeset
23 <div class="panel-heading clearfix">
977
28524453bb76 started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
24 ${self.breadcrumbs()}
28524453bb76 started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
25 </div>
28524453bb76 started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
26 <div class="table">
3197
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3015
diff changeset
27 <div id="body" class="diffblock">
4152
8d1125a40973 old style: make compare header expand to content
Mads Kiilerich <madski@unity3d.com>
parents: 4116
diff changeset
28 <div class="code-header">
1688
82e604d3fc46 changeset ranges use new fileid method.
Marcin Kuzminski <marcin@python-works.com>
parents: 1602
diff changeset
29 <div>
4334
1a659a59be4a changesets: don't show SVN style 'rXXX:' revision numbers if show_revision_number is false
Mads Kiilerich <madski@unity3d.com>
parents: 4291
diff changeset
30 ${h.show_id(c.cs_ranges[0])}
4856
e8ff151b3085 font: rename icon-arrow-right to icon-right
Sean Farley <sean.michael.farley@gmail.com>
parents: 4845
diff changeset
31 <i class="icon-right"></i>
4334
1a659a59be4a changesets: don't show SVN style 'rXXX:' revision numbers if show_revision_number is false
Mads Kiilerich <madski@unity3d.com>
parents: 4291
diff changeset
32 ${h.show_id(c.cs_ranges[-1])}
6258
b7654d1675da style: in preparation for bootstrap, use bootstrap compatible button class names
domruf <dominikruf@gmail.com>
parents: 6195
diff changeset
33 <a style="font-weight: bold" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-default btn-sm"><i class="icon-git-compare"></i> Compare Revisions</a>
3197
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3015
diff changeset
34 </div>
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3015
diff changeset
35 </div>
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3015
diff changeset
36 </div>
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3015
diff changeset
37 <div id="changeset_compare_view_content">
6289
68d3315c48d4 style: whitespace fixes in templates - make indentation more consistent and reduce future churn
Mads Kiilerich <madski@unity3d.com>
parents: 6260
diff changeset
38 <div class="container">
3197
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3015
diff changeset
39 <table class="compare_view_commits noborder">
2240
87664e60bbc0 added changeset status into changeset range
Marcin Kuzminski <marcin@python-works.com>
parents: 1888
diff changeset
40 %for cnt,cs in enumerate(c.cs_ranges):
6289
68d3315c48d4 style: whitespace fixes in templates - make indentation more consistent and reduce future churn
Mads Kiilerich <madski@unity3d.com>
parents: 6260
diff changeset
41 <tr>
5896
b9688c512c63 helpers: more efficient disabling of gravatars - don't leave spacing behind
Mads Kiilerich <madski@unity3d.com>
parents: 5895
diff changeset
42 %if c.visual.use_gravatar:
5895
f287754980cc templates: use the new gravatar_div
Mads Kiilerich <madski@unity3d.com>
parents: 5284
diff changeset
43 <td>${h.gravatar_div(h.email_or_none(cs.author), size=14)}</td>
5896
b9688c512c63 helpers: more efficient disabling of gravatars - don't leave spacing behind
Mads Kiilerich <madski@unity3d.com>
parents: 5895
diff changeset
44 %endif
4368
3136811db1af compare: introduce .cs_repo as the repo for .cs_changes - sometimes it is org, sometimes other
Mads Kiilerich <madski@unity3d.com>
parents: 4334
diff changeset
45 <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>
1010
643e4a540ddd added nicer compare view
Marcin Kuzminski <marcin@python-works.com>
parents: 982
diff changeset
46 <td><div class="author">${h.person(cs.author)}</div></td>
6294
c40e567e4b82 style: use Bootstrap compatible data-toggle="tooltip" markup
Mads Kiilerich <madski@unity3d.com>
parents: 6289
diff changeset
47 <td><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
2240
87664e60bbc0 added changeset status into changeset range
Marcin Kuzminski <marcin@python-works.com>
parents: 1888
diff changeset
48 <td>
87664e60bbc0 added changeset status into changeset range
Marcin Kuzminski <marcin@python-works.com>
parents: 1888
diff changeset
49 %if c.statuses:
5284
5d161c096260 helpers: drop h.tooltip
Mads Kiilerich <madski@unity3d.com>
parents: 5126
diff changeset
50 <div title="${_('Changeset status')}" class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[cnt]}"></i></div>
2240
87664e60bbc0 added changeset status into changeset range
Marcin Kuzminski <marcin@python-works.com>
parents: 1888
diff changeset
51 %endif
87664e60bbc0 added changeset status into changeset range
Marcin Kuzminski <marcin@python-works.com>
parents: 1888
diff changeset
52 </td>
6180
c3892e3a6ba3 helpers: merge urlify_commit into urlify_text
Mads Kiilerich <madski@unity3d.com>
parents: 5896
diff changeset
53 <td><div class="message">${h.urlify_text(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>
6289
68d3315c48d4 style: whitespace fixes in templates - make indentation more consistent and reduce future churn
Mads Kiilerich <madski@unity3d.com>
parents: 6260
diff changeset
54 </tr>
1010
643e4a540ddd added nicer compare view
Marcin Kuzminski <marcin@python-works.com>
parents: 982
diff changeset
55 %endfor
643e4a540ddd added nicer compare view
Marcin Kuzminski <marcin@python-works.com>
parents: 982
diff changeset
56 </table>
6289
68d3315c48d4 style: whitespace fixes in templates - make indentation more consistent and reduce future churn
Mads Kiilerich <madski@unity3d.com>
parents: 6260
diff changeset
57 </div>
68d3315c48d4 style: whitespace fixes in templates - make indentation more consistent and reduce future churn
Mads Kiilerich <madski@unity3d.com>
parents: 6260
diff changeset
58 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
68d3315c48d4 style: whitespace fixes in templates - make indentation more consistent and reduce future churn
Mads Kiilerich <madski@unity3d.com>
parents: 6260
diff changeset
59 <div class="cs_files">
4334
1a659a59be4a changesets: don't show SVN style 'rXXX:' revision numbers if show_revision_number is false
Mads Kiilerich <madski@unity3d.com>
parents: 4291
diff changeset
60 %for cs in c.cs_ranges:
4368
3136811db1af compare: introduce .cs_repo as the repo for .cs_changes - sometimes it is org, sometimes other
Mads Kiilerich <madski@unity3d.com>
parents: 4334
diff changeset
61 <div class="cur_cs">${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</div>
6193
dc4cb1d4e084 diff: rework data structure used by diff_block.diff_block (used for changeset diffs)
Mads Kiilerich <madski@unity3d.com>
parents: 6192
diff changeset
62 <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %>
6303
1cf51cd05e36 diff: use list instead of OrderedDict - keep it simple
Mads Kiilerich <madski@unity3d.com>
parents: 6295
diff changeset
63 %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:
6192
72acb38da217 diff: minor cleanups
Mads Kiilerich <madski@unity3d.com>
parents: 6180
diff changeset
64 <div class="cs_${op}">
4334
1a659a59be4a changesets: don't show SVN style 'rXXX:' revision numbers if show_revision_number is false
Mads Kiilerich <madski@unity3d.com>
parents: 4291
diff changeset
65 <div class="node">
6192
72acb38da217 diff: minor cleanups
Mads Kiilerich <madski@unity3d.com>
parents: 6180
diff changeset
66 <i class="icon-diff-${op}"></i>
6193
dc4cb1d4e084 diff: rework data structure used by diff_block.diff_block (used for changeset diffs)
Mads Kiilerich <madski@unity3d.com>
parents: 6192
diff changeset
67 ${h.link_to(h.safe_unicode(path), '#%s' % fid)}
4334
1a659a59be4a changesets: don't show SVN style 'rXXX:' revision numbers if show_revision_number is false
Mads Kiilerich <madski@unity3d.com>
parents: 4291
diff changeset
68 </div>
1a659a59be4a changesets: don't show SVN style 'rXXX:' revision numbers if show_revision_number is false
Mads Kiilerich <madski@unity3d.com>
parents: 4291
diff changeset
69 <div class="changes">${h.fancy_file_stats(stats)}</div>
1a659a59be4a changesets: don't show SVN style 'rXXX:' revision numbers if show_revision_number is false
Mads Kiilerich <madski@unity3d.com>
parents: 4291
diff changeset
70 </div>
1a659a59be4a changesets: don't show SVN style 'rXXX:' revision numbers if show_revision_number is false
Mads Kiilerich <madski@unity3d.com>
parents: 4291
diff changeset
71 %endfor
1a659a59be4a changesets: don't show SVN style 'rXXX:' revision numbers if show_revision_number is false
Mads Kiilerich <madski@unity3d.com>
parents: 4291
diff changeset
72 %endfor
6289
68d3315c48d4 style: whitespace fixes in templates - make indentation more consistent and reduce future churn
Mads Kiilerich <madski@unity3d.com>
parents: 6260
diff changeset
73 </div>
3197
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3015
diff changeset
74 </div>
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1868
diff changeset
75
977
28524453bb76 started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
76 </div>
1787
d4a7b6c82efe code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents: 1777
diff changeset
77 <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
d4a7b6c82efe code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents: 1777
diff changeset
78 <%namespace name="diff_block" file="/changeset/diff_block.html"/>
4412
e457b951aabe diff: option for showing images
Mads Kiilerich <madski@unity3d.com>
parents: 4388
diff changeset
79 ${diff_block.diff_block_js()}
e457b951aabe diff: option for showing images
Mads Kiilerich <madski@unity3d.com>
parents: 4388
diff changeset
80 %for cs in c.cs_ranges:
1787
d4a7b6c82efe code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents: 1777
diff changeset
81 ## diff block
2926
3555c56694b5 Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents: 2732
diff changeset
82 <div class="h3">
6294
c40e567e4b82 style: use Bootstrap compatible data-toggle="tooltip" markup
Mads Kiilerich <madski@unity3d.com>
parents: 6289
diff changeset
83 <a data-toggle="tooltip" title="${cs.message}" href="${h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a>
6289
68d3315c48d4 style: whitespace fixes in templates - make indentation more consistent and reduce future churn
Mads Kiilerich <madski@unity3d.com>
parents: 6260
diff changeset
84 ${h.gravatar_div(h.email_or_none(cs.author), size=20)}
68d3315c48d4 style: whitespace fixes in templates - make indentation more consistent and reduce future churn
Mads Kiilerich <madski@unity3d.com>
parents: 6260
diff changeset
85 <div class="right">
2926
3555c56694b5 Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents: 2732
diff changeset
86 <span class="logtags">
3555c56694b5 Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents: 2732
diff changeset
87 %if len(cs.parents)>1:
5126
5c6cc20d224b spelling: fix title casing on translated template strings
Mads Kiilerich <madski@unity3d.com>
parents: 4856
diff changeset
88 <span class="merge">${_('Merge')}</span>
2926
3555c56694b5 Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents: 2732
diff changeset
89 %endif
4196
06e49be38d78 Rename rhodecode_repo to db_repo_scm_instance
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4187
diff changeset
90 %if h.is_hg(c.db_repo_scm_instance):
2926
3555c56694b5 Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents: 2732
diff changeset
91 %for book in cs.bookmarks:
3707
93de03499097 shortlog: show all refs (bookmarks,tags,branches) in one dedicated column
Marcin Kuzminski <marcin@python-works.com>
parents: 3654
diff changeset
92 <span class="booktag" title="${_('Bookmark %s') % book}">
4368
3136811db1af compare: introduce .cs_repo as the repo for .cs_changes - sometimes it is org, sometimes other
Mads Kiilerich <madski@unity3d.com>
parents: 4334
diff changeset
93 ${h.link_to(book,h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}
2926
3555c56694b5 Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents: 2732
diff changeset
94 </span>
3555c56694b5 Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents: 2732
diff changeset
95 %endfor
3555c56694b5 Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents: 2732
diff changeset
96 %endif
3555c56694b5 Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents: 2732
diff changeset
97 %for tag in cs.tags:
3654
ec6354949623 Fix a lot of casings - use standard casing in most places
Mads Kiilerich <madski@unity3d.com>
parents: 3603
diff changeset
98 <span class="tagtag" title="${_('Tag %s') % tag}">
4368
3136811db1af compare: introduce .cs_repo as the repo for .cs_changes - sometimes it is org, sometimes other
Mads Kiilerich <madski@unity3d.com>
parents: 4334
diff changeset
99 ${h.link_to(tag,h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</span>
2926
3555c56694b5 Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents: 2732
diff changeset
100 %endfor
3727
0cecc22285ef #818: Bookmarks Do Not Display on Changeset View
Marcin Kuzminski <marcin@python-works.com>
parents: 3707
diff changeset
101 %if cs.branch:
0cecc22285ef #818: Bookmarks Do Not Display on Changeset View
Marcin Kuzminski <marcin@python-works.com>
parents: 3707
diff changeset
102 <span class="branchtag" title="${_('Branch %s') % cs.branch}">
4368
3136811db1af compare: introduce .cs_repo as the repo for .cs_changes - sometimes it is org, sometimes other
Mads Kiilerich <madski@unity3d.com>
parents: 4334
diff changeset
103 ${h.link_to(cs.branch,h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}
3727
0cecc22285ef #818: Bookmarks Do Not Display on Changeset View
Marcin Kuzminski <marcin@python-works.com>
parents: 3707
diff changeset
104 </span>
0cecc22285ef #818: Bookmarks Do Not Display on Changeset View
Marcin Kuzminski <marcin@python-works.com>
parents: 3707
diff changeset
105 %endif
2973
9937afa7f093 whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2926
diff changeset
106 </span>
9937afa7f093 whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2926
diff changeset
107 </div>
6289
68d3315c48d4 style: whitespace fixes in templates - make indentation more consistent and reduce future churn
Mads Kiilerich <madski@unity3d.com>
parents: 6260
diff changeset
108 </div>
6193
dc4cb1d4e084 diff: rework data structure used by diff_block.diff_block (used for changeset diffs)
Mads Kiilerich <madski@unity3d.com>
parents: 6192
diff changeset
109 <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %>
dc4cb1d4e084 diff: rework data structure used by diff_block.diff_block (used for changeset diffs)
Mads Kiilerich <madski@unity3d.com>
parents: 6192
diff changeset
110 ${diff_block.diff_block(c.repo_name, 'rev', a_rev, a_rev,
dc4cb1d4e084 diff: rework data structure used by diff_block.diff_block (used for changeset diffs)
Mads Kiilerich <madski@unity3d.com>
parents: 6192
diff changeset
111 c.repo_name, 'rev', cs_rev, cs_rev, file_diff_data)}
4412
e457b951aabe diff: option for showing images
Mads Kiilerich <madski@unity3d.com>
parents: 4388
diff changeset
112 %endfor
e457b951aabe diff: option for showing images
Mads Kiilerich <madski@unity3d.com>
parents: 4388
diff changeset
113 </div>
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1868
diff changeset
114 </%def>