Mercurial > kallithea

annotate kallithea/templates/changeset/changeset_range.html @ 6973:7f45efdd3f12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less: remove unnecessary .cur_cs The class is only used once on a h6, which already is bold and has top and bottom 10px margin. The 2px margin left and right are not really helpful.
author domruf <dominikruf@gmail.com>
date Wed, 25 Oct 2017 23:45:31 +0200
parents bee750d4ffff
children 73234a550e7d
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')} -
6395
c4379e4dc820 templates: fix missing / superfluous close tags
Mads Kiilerich <mads@kiilerich.com>
parents: 6369
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))}
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>
6395
c4379e4dc820 templates: fix missing / superfluous close tags
Mads Kiilerich <mads@kiilerich.com>
parents: 6369
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))}
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">
6295
33ca6d0f7058 style: introduce "clearfix" class where the Bootstrap migration will need it
Mads Kiilerich <madski@unity3d.com>
parents: 6294
diff changeset
22 <div class="panel-heading clearfix">
6671
5e3adb20839d style: replace code-body etc with Bootstrap-ish panel and panel-heading, using panel-default for headers and tweak them grey
Mads Kiilerich <mads@kiilerich.com>
parents: 6422
diff changeset
23 <div class="pull-left">
5e3adb20839d style: replace code-body etc with Bootstrap-ish panel and panel-heading, using panel-default for headers and tweak them grey
Mads Kiilerich <mads@kiilerich.com>
parents: 6422
diff changeset
24 ${self.breadcrumbs()}
5e3adb20839d style: replace code-body etc with Bootstrap-ish panel and panel-heading, using panel-default for headers and tweak them grey
Mads Kiilerich <mads@kiilerich.com>
parents: 6422
diff changeset
25 </div>
5e3adb20839d style: replace code-body etc with Bootstrap-ish panel and panel-heading, using panel-default for headers and tweak them grey
Mads Kiilerich <mads@kiilerich.com>
parents: 6422
diff changeset
26 <div class="pull-right">
5e3adb20839d style: replace code-body etc with Bootstrap-ish panel and panel-heading, using panel-default for headers and tweak them grey
Mads Kiilerich <mads@kiilerich.com>
parents: 6422
diff changeset
27 <a 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>
5e3adb20839d style: replace code-body etc with Bootstrap-ish panel and panel-heading, using panel-default for headers and tweak them grey
Mads Kiilerich <mads@kiilerich.com>
parents: 6422
diff changeset
28 </div>
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
29 </div>
6419
d99afb88579e style: rename div.table to Bootstrap .panel-body
Mads Kiilerich <mads@kiilerich.com>
parents: 6418
diff changeset
30 <div class="panel-body">
6671
5e3adb20839d style: replace code-body etc with Bootstrap-ish panel and panel-heading, using panel-default for headers and tweak them grey
Mads Kiilerich <mads@kiilerich.com>
parents: 6422
diff changeset
31 <div>
6420
1ce4e23c2207 style: apply Bootstrap-compatible table.table class, now when the conflicting div.table styling is gone
Mads Kiilerich <mads@kiilerich.com>
parents: 6419
diff changeset
32 <table class="table compare_view_commits">
6413
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
33 %for cnt,cs in enumerate(c.cs_ranges):
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
34 <tr>
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
35 %if c.visual.use_gravatar:
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
36 <td>${h.gravatar_div(h.email_or_none(cs.author), size=14)}</td>
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
37 %endif
6671
5e3adb20839d style: replace code-body etc with Bootstrap-ish panel and panel-heading, using panel-default for headers and tweak them grey
Mads Kiilerich <mads@kiilerich.com>
parents: 6422
diff changeset
38 <td>${h.link_to(h.short_id(cs.raw_id),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>
6830
387b8d551003 style: rely on css to truncate author name in tables instead of truncating to fixed length
domruf <dominikruf@gmail.com>
parents: 6816
diff changeset
39 <td class="author">${h.person(cs.author)}</td>
6413
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
40 <td><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
41 <td>
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
42 %if c.statuses:
6703
a181d4bd4c3d style: rework review status icon handling
Mads Kiilerich <mads@kiilerich.com>
parents: 6671
diff changeset
43 <i class="icon-circle changeset-status-${c.statuses[cnt]}" title="${_('Changeset status: %s') % h.changeset_status_lbl(c.statuses[cnt])}"></i>
6413
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
44 %endif
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
45 </td>
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
46 <td><div class="message">${h.urlify_text(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
47 </tr>
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
48 %endfor
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
49 </table>
6671
5e3adb20839d style: replace code-body etc with Bootstrap-ish panel and panel-heading, using panel-default for headers and tweak them grey
Mads Kiilerich <mads@kiilerich.com>
parents: 6422
diff changeset
50 <h4>${_('Files affected')}</h4>
5e3adb20839d style: replace code-body etc with Bootstrap-ish panel and panel-heading, using panel-default for headers and tweak them grey
Mads Kiilerich <mads@kiilerich.com>
parents: 6422
diff changeset
51 <div class="cs_files">
6413
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
52 %for cs in c.cs_ranges:
6973
7f45efdd3f12 less: remove unnecessary .cur_cs
domruf <dominikruf@gmail.com>
parents: 6971
diff changeset
53 <h6>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</h6>
6413
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
54 <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %>
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
55 %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:
6418
e34cf36e024a style: introduce pull-left and pull-right in more places
Mads Kiilerich <mads@kiilerich.com>
parents: 6414
diff changeset
56 <div class="cs_${op} clearfix">
e34cf36e024a style: introduce pull-left and pull-right in more places
Mads Kiilerich <mads@kiilerich.com>
parents: 6414
diff changeset
57 <div class="node pull-left">
6413
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
58 <i class="icon-diff-${op}"></i>
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
59 ${h.link_to(h.safe_unicode(path), '#%s' % fid)}
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
60 </div>
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
61 <div class="changes">${h.fancy_file_stats(stats)}</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
62 </div>
6413
bcbc1d6bcc51 style: change indentation of changeset_range.html
Mads Kiilerich <mads@kiilerich.com>
parents: 6410
diff changeset
63 %endfor
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
64 %endfor
6671
5e3adb20839d style: replace code-body etc with Bootstrap-ish panel and panel-heading, using panel-default for headers and tweak them grey
Mads Kiilerich <mads@kiilerich.com>
parents: 6422
diff changeset
65 </div>
3197
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3015
diff changeset
66 </div>
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
67 </div>
1787
d4a7b6c82efe code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents: 1777
diff changeset
68 <%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
69 <%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
70 ${diff_block.diff_block_js()}
e457b951aabe diff: option for showing images
Mads Kiilerich <madski@unity3d.com>
parents: 4388
diff changeset
71 %for cs in c.cs_ranges:
6422
1f02a239c23c style: use panel, panel-heading, panel-title, panel-body and settings
Mads Kiilerich <mads@kiilerich.com>
parents: 6420
diff changeset
72 <div class="panel-body">
1787
d4a7b6c82efe code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents: 1777
diff changeset
73 ## diff block
2926
3555c56694b5 Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents: 2732
diff changeset
74 <div class="h3">
6816
f6f6bf39ce64 changeset range: move gravatar in front of revision link
domruf <dominikruf@gmail.com>
parents: 6703
diff changeset
75 ${h.gravatar_div(h.email_or_none(cs.author), size=20)}
6294
c40e567e4b82 style: use Bootstrap compatible data-toggle="tooltip" markup
Mads Kiilerich <madski@unity3d.com>
parents: 6289
diff changeset
76 <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
77 <div class="right">
2926
3555c56694b5 Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents: 2732
diff changeset
78 <span class="logtags">
3555c56694b5 Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents: 2732
diff changeset
79 %if len(cs.parents)>1:
6971
bee750d4ffff less: unify .merge and .mergetag
domruf <dominikruf@gmail.com>
parents: 6830
diff changeset
80 <span class="mergetag">${_('Merge')}</span>
2926
3555c56694b5 Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents: 2732
diff changeset
81 %endif
4196
06e49be38d78 Rename rhodecode_repo to db_repo_scm_instance
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents: 4187
diff changeset
82 %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
83 %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
84 <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
85 ${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
86 </span>
3555c56694b5 Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents: 2732
diff changeset
87 %endfor
3555c56694b5 Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents: 2732
diff changeset
88 %endif
3555c56694b5 Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents: 2732
diff changeset
89 %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
90 <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
91 ${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
92 %endfor
3727
0cecc22285ef #818: Bookmarks Do Not Display on Changeset View
Marcin Kuzminski <marcin@python-works.com>
parents: 3707
diff changeset
93 %if cs.branch:
0cecc22285ef #818: Bookmarks Do Not Display on Changeset View
Marcin Kuzminski <marcin@python-works.com>
parents: 3707
diff changeset
94 <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
95 ${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
96 </span>
0cecc22285ef #818: Bookmarks Do Not Display on Changeset View
Marcin Kuzminski <marcin@python-works.com>
parents: 3707
diff changeset
97 %endif
2973
9937afa7f093 whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2926
diff changeset
98 </span>
9937afa7f093 whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2926
diff changeset
99 </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
100 </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
101 <% 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
102 ${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
103 c.repo_name, 'rev', cs_rev, cs_rev, file_diff_data)}
6422
1f02a239c23c style: use panel, panel-heading, panel-title, panel-body and settings
Mads Kiilerich <mads@kiilerich.com>
parents: 6420
diff changeset
104 </div>
4412
e457b951aabe diff: option for showing images
Mads Kiilerich <madski@unity3d.com>
parents: 4388
diff changeset
105 %endfor
e457b951aabe diff: option for showing images
Mads Kiilerich <madski@unity3d.com>
parents: 4388
diff changeset
106 </div>
1888
f91d3f9b7230 White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1868
diff changeset
107 </%def>