Show More
@@ -466,7 +466,7 b' class FilesController(BaseRepoController' | |||||
466 | tags_group = ([], _("Tags")) |
|
466 | tags_group = ([], _("Tags")) | |
467 |
|
467 | |||
468 | for chs in changesets: |
|
468 | for chs in changesets: | |
469 | n_desc = 'r%s:%s' % (chs.revision, chs.short_id) |
|
469 | n_desc = 'r%s:%s (%s)' % (chs.revision, chs.short_id, chs.branch) | |
470 | changesets_group[0].append((chs.raw_id, n_desc,)) |
|
470 | changesets_group[0].append((chs.raw_id, n_desc,)) | |
471 |
|
471 | |||
472 | hist_l.append(changesets_group) |
|
472 | hist_l.append(changesets_group) |
@@ -20,21 +20,21 b'' | |||||
20 | <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div> |
|
20 | <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div> | |
21 | <div class="left item last">${c.file.mimetype}</div> |
|
21 | <div class="left item last">${c.file.mimetype}</div> | |
22 | <div class="buttons"> |
|
22 | <div class="buttons"> | |
23 | ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} |
|
23 | ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id,f_path=c.f_path),class_="ui-btn")} | |
24 | ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} |
|
24 | ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id,f_path=c.f_path),class_="ui-btn")} | |
25 | ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} |
|
25 | ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id,f_path=c.f_path),class_="ui-btn")} | |
26 | % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): |
|
26 | % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): | |
27 | % if not c.file.is_binary: |
|
27 | % if not c.file.is_binary: | |
28 | ${h.link_to(_('edit'),h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} |
|
28 | ${h.link_to(_('edit'),h.url('files_edit_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id,f_path=c.f_path),class_="ui-btn")} | |
29 | % endif |
|
29 | % endif | |
30 | % endif |
|
30 | % endif | |
31 | </div> |
|
31 | </div> | |
32 | </div> |
|
32 | </div> | |
33 | <div class="author"> |
|
33 | <div class="author"> | |
34 | <div class="gravatar"> |
|
34 | <div class="gravatar"> | |
35 | <img alt="gravatar" src="${h.gravatar_url(h.email(c.changeset.author),16)}"/> |
|
35 | <img alt="gravatar" src="${h.gravatar_url(h.email(c.file.last_changeset.author),16)}"/> | |
36 | </div> |
|
36 | </div> | |
37 | <div title="${c.changeset.author}" class="user">${h.person(c.changeset.author)}</div> |
|
37 | <div title="${c.file.last_changeset.author}" class="user">${h.person(c.file.last_changeset.author)}</div> | |
38 | </div> |
|
38 | </div> | |
39 | <div class="commit">${c.file.last_changeset.message}</div> |
|
39 | <div class="commit">${c.file.last_changeset.message}</div> | |
40 | </div> |
|
40 | </div> | |
@@ -46,7 +46,7 b'' | |||||
46 | ${h.pygmentize(c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")} |
|
46 | ${h.pygmentize(c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")} | |
47 | %else: |
|
47 | %else: | |
48 | ${_('File is too big to display')} ${h.link_to(_('show as raw'), |
|
48 | ${_('File is too big to display')} ${h.link_to(_('show as raw'), | |
49 | h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))} |
|
49 | h.url('files_raw_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id,f_path=c.f_path))} | |
50 | %endif |
|
50 | %endif | |
51 | <script type="text/javascript"> |
|
51 | <script type="text/javascript"> | |
52 | function highlight_lines(lines){ |
|
52 | function highlight_lines(lines){ |
General Comments 0
You need to be logged in to leave comments.
Login now