# HG changeset patch # User Marcin Kuzminski # Date 1323311562 -7200 # Node ID 184557472f5ce4180cd61a08e32b6d9d2f82f1c9 # Parent 025f3333c7698c76cae2e7104aa84ce788bc15f4 Implements #304 hashes in relevant places are displayed using monospaced font. diff -r 025f3333c769 -r 184557472f5c rhodecode/templates/admin/repos/repos.html --- a/rhodecode/templates/admin/repos/repos.html Thu Dec 08 03:36:13 2011 +0200 +++ b/rhodecode/templates/admin/repos/repos.html Thu Dec 08 04:32:42 2011 +0200 @@ -19,7 +19,7 @@ ${self.breadcrumbs()} @@ -65,10 +65,7 @@ ${h.age(repo['last_change'])} %if repo['rev']>=0: - ${h.link_to('r%s:%s' % (repo['rev'],h.short_id(repo['tip'])), - h.url('changeset_home',repo_name=repo['name'],revision=repo['tip']), - class_="tooltip", - title=h.tooltip(repo['last_msg']))} +
${h.link_to('r%s:%s' % (repo['rev'],h.short_id(repo['tip'])),h.url('changeset_home',repo_name=repo['name'],revision=repo['tip']),class_="tooltip",title=h.tooltip(repo['last_msg']))}
%else: ${_('No changesets yet')} %endif diff -r 025f3333c769 -r 184557472f5c rhodecode/templates/bookmarks/bookmarks_data.html --- a/rhodecode/templates/bookmarks/bookmarks_data.html Thu Dec 08 03:36:13 2011 +0200 +++ b/rhodecode/templates/bookmarks/bookmarks_data.html Thu Dec 08 04:32:42 2011 +0200 @@ -1,31 +1,27 @@ %if c.repo_bookmarks: - +
- - - - - + + + + %for cnt,book in enumerate(c.repo_bookmarks.items()): - + + - - - + + %endfor
${_('date')}${_('name')}${_('author')}${_('revision')}${_('links')}${_('name')}${_('date')}${_('author')}${_('revision')}
- ${book[1].date} - ${h.link_to(book[0], - h.url('changeset_home',repo_name=c.repo_name,revision=book[1].raw_id))} + h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id))} - ${book[1].date} ${h.person(book[1].author)}r${book[1].revision}:${h.short_id(book[1].raw_id)} - ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=book[1].raw_id),class_="ui-btn xsmall")} - | - ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id),class_="ui-btn xsmall")} -
+ +
%else: diff -r 025f3333c769 -r 184557472f5c rhodecode/templates/branches/branches_data.html --- a/rhodecode/templates/branches/branches_data.html Thu Dec 08 03:36:13 2011 +0200 +++ b/rhodecode/templates/branches/branches_data.html Thu Dec 08 04:32:42 2011 +0200 @@ -1,52 +1,47 @@ -% if c.repo_branches: +%if c.repo_branches: + - - %for cnt,branch in enumerate(c.repo_branches.items()): - + + - - - + %endfor % if hasattr(c,'repo_closed_branches') and c.repo_closed_branches: %for cnt,branch in enumerate(c.repo_closed_branches.items()): - + + - - - + %endfor - %endif + %endif
${_('name')} ${_('date')}${_('name')} ${_('author')} ${_('revision')}${_('links')}
${branch[1].date} - ${h.link_to(branch[0], - h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))} + h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id))} - ${branch[1].date} ${h.person(branch[1].author)}r${branch[1].revision}:${h.short_id(branch[1].raw_id)} - ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-btn xsmall")} - | - ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-btn xsmall")} + +
${branch[1].date} - ${h.link_to(branch[0]+' [closed]', h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))} - ${branch[1].date} ${h.person(branch[1].author)}r${branch[1].revision}:${h.short_id(branch[1].raw_id)} - ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-btn xsmall")} - | - ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-btn xsmall")} + +
%else: ${_('There are no branches yet')} diff -r 025f3333c769 -r 184557472f5c rhodecode/templates/files/files_browser.html --- a/rhodecode/templates/files/files_browser.html Thu Dec 08 03:36:13 2011 +0200 +++ b/rhodecode/templates/files/files_browser.html Thu Dec 08 04:32:42 2011 +0200 @@ -84,8 +84,9 @@ %if node.is_file(): - - ${'r%s:%s' % (node.last_changeset.revision,node.last_changeset.short_id)} +
+
${'r%s:%s' % (node.last_changeset.revision,node.last_changeset.short_id)}
+
%endif diff -r 025f3333c769 -r 184557472f5c rhodecode/templates/files/files_source.html --- a/rhodecode/templates/files/files_source.html Thu Dec 08 03:36:13 2011 +0200 +++ b/rhodecode/templates/files/files_source.html Thu Dec 08 04:32:42 2011 +0200 @@ -17,7 +17,7 @@
-
${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}
+
${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}
${h.format_byte_size(c.file.size,binary=True)}
${c.file.mimetype}
diff -r 025f3333c769 -r 184557472f5c rhodecode/templates/index_base.html --- a/rhodecode/templates/index_base.html Thu Dec 08 03:36:13 2011 +0200 +++ b/rhodecode/templates/index_base.html Thu Dec 08 04:32:42 2011 +0200 @@ -9,7 +9,7 @@ %if h.HasPermissionAny('hg.admin','hg.create.repository')(): %endif @@ -139,11 +139,13 @@ ${h.age(repo['last_change'])} +
%if repo['rev']>=0: - ${'r%s:%s' % (repo['rev'],h.short_id(repo['tip']))} +
${'r%s:%s' % (repo['rev'],h.short_id(repo['tip']))}
%else: ${_('No changesets yet')} - %endif + %endif +
${h.person(repo['contact'])} diff -r 025f3333c769 -r 184557472f5c rhodecode/templates/journal/journal.html --- a/rhodecode/templates/journal/journal.html Thu Dec 08 03:36:13 2011 +0200 +++ b/rhodecode/templates/journal/journal.html Thu Dec 08 04:32:42 2011 +0200 @@ -29,12 +29,12 @@
- ${_('My repositories')} / ${_('Watched')} + ${_('My repos')} / ${_('Watched')}
%if h.HasPermissionAny('hg.admin','hg.create.repository')(): %endif @@ -74,7 +74,7 @@ src="${h.url('/images/icons/arrow_divide.png')}"/> %endif - ${("r%s:%s") % (repo['rev'],h.short_id(repo['tip']))} +
${("r%s:%s") % (repo['rev'],h.short_id(repo['tip']))}
${_('private')} ${h.form(url('repo_settings_delete', repo_name=repo['name']),method='delete')} diff -r 025f3333c769 -r 184557472f5c rhodecode/templates/shortlog/shortlog_data.html --- a/rhodecode/templates/shortlog/shortlog_data.html Thu Dec 08 03:36:13 2011 +0200 +++ b/rhodecode/templates/shortlog/shortlog_data.html Thu Dec 08 04:32:42 2011 +0200 @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- %if c.repo_changesets: - +
@@ -20,7 +20,7 @@ ${h.age(cs.date)} - +
${_('commit message')} ${_('age')} ${h.person(cs.author)}r${cs.revision}:${h.short_id(cs.raw_id)} ${cs.branch} diff -r 025f3333c769 -r 184557472f5c rhodecode/templates/switch_to_list.html --- a/rhodecode/templates/switch_to_list.html Thu Dec 08 03:36:13 2011 +0200 +++ b/rhodecode/templates/switch_to_list.html Thu Dec 08 04:32:42 2011 +0200 @@ -4,7 +4,7 @@
    %if c.rhodecode_repo.branches.values(): %for cnt,branch in enumerate(c.rhodecode_repo.branches.items()): -
  • ${h.link_to('%s - %s' % (branch[0],h.short_id(branch[1])),h.url('files_home',repo_name=c.repo_name,revision=branch[1]))}
  • +
  • ${h.link_to('%s - %s' % (branch[0],h.short_id(branch[1])),h.url('files_home',repo_name=c.repo_name,revision=branch[1]))}
  • %endfor %else:
  • ${h.link_to(_('There are no branches yet'),'#')}
  • @@ -16,7 +16,7 @@
      %if c.rhodecode_repo.tags.values(): %for cnt,tag in enumerate(c.rhodecode_repo.tags.items()): -
    • ${h.link_to('%s - %s' % (tag[0],h.short_id(tag[1])),h.url('files_home',repo_name=c.repo_name,revision=tag[1]))}
    • +
    • ${h.link_to('%s - %s' % (tag[0],h.short_id(tag[1])),h.url('files_home',repo_name=c.repo_name,revision=tag[1]))}
    • %endfor %else:
    • ${h.link_to(_('There are no tags yet'),'#')}
    • @@ -29,7 +29,7 @@
        %if c.rhodecode_repo.bookmarks.values(): %for cnt,book in enumerate(c.rhodecode_repo.bookmarks.items()): -
      • ${h.link_to('%s - %s' % (book[0],h.short_id(book[1])),h.url('files_home',repo_name=c.repo_name,revision=book[1]))}
      • +
      • ${h.link_to('%s - %s' % (book[0],h.short_id(book[1])),h.url('files_home',repo_name=c.repo_name,revision=book[1]))}
      • %endfor %else:
      • ${h.link_to(_('There are no bookmarks yet'),'#')}
      • diff -r 025f3333c769 -r 184557472f5c rhodecode/templates/tags/tags_data.html --- a/rhodecode/templates/tags/tags_data.html Thu Dec 08 03:36:13 2011 +0200 +++ b/rhodecode/templates/tags/tags_data.html Thu Dec 08 04:32:42 2011 +0200 @@ -1,30 +1,27 @@ %if c.repo_tags: - +
        - - - - - + + + + %for cnt,tag in enumerate(c.repo_tags.items()): - + + - - + %endfor
        ${_('date')}${_('name')}${_('author')}${_('revision')}${_('links')}${_('name')}${_('date')}${_('author')}${_('revision')}
        - ${tag[1].date} - ${h.link_to(tag[0], - h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id))} + h.url('files_home',repo_name=c.repo_name,revision=tag[1].raw_id))} + - ${tag[1].date} ${h.person(tag[1].author)}r${tag[1].revision}:${h.short_id(tag[1].raw_id)} - ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id),class_="ui-btn xsmall")} - | - ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=tag[1].raw_id),class_="ui-btn xsmall")} - + +