diff options
| author | Marcin Kuzminski <marcin@python-works.com> | 2010-06-13 16:27:19 +0200 |
|---|---|---|
| committer | Marcin Kuzminski <marcin@python-works.com> | 2010-06-13 16:27:19 +0200 |
| commit | c457ef93acdb6298d50713074eeed6c4c6b56ecb (patch) | |
| tree | f6f3a8a598c3124da29df2a714f263307b879a87 | |
| parent | e55c955faaee6550c030441fae88dc4acde23697 (diff) | |
#4: changes proposed by feedback to annotation
| -rw-r--r-- | pylons_app/lib/helpers.py | 5 | ||||
| -rw-r--r-- | pylons_app/templates/files/files.html | 5 | ||||
| -rw-r--r-- | pylons_app/templates/files/files_annotate.html | 8 | ||||
| -rw-r--r-- | pylons_app/templates/files/files_source.html | 8 |
4 files changed, 16 insertions, 10 deletions
diff --git a/pylons_app/lib/helpers.py b/pylons_app/lib/helpers.py index 770778fd..d20456ca 100644 --- a/pylons_app/lib/helpers.py +++ b/pylons_app/lib/helpers.py @@ -84,10 +84,9 @@ def pygmentize_annotation(filenode, **kwargs): return "color: rgb(%s) ! important;" % (','.join(col)) def url_func(changeset): - return '%s\n' % (link_to(changeset.raw_id, + return '%s\n' % (link_to('r%s:%s' % (changeset.revision, changeset.raw_id), url('changeset_home', repo_name='test', revision=changeset.raw_id), - title=_('author') + ':%s rev:%s %s' % (changeset.author, changeset.revision, - changeset.message,), + title=_('author') + ':%s - %s' % (changeset.author, changeset.message,), style=get_color_string(changeset.raw_id))) return literal(annotate_highlight(filenode, url_func, **kwargs)) diff --git a/pylons_app/templates/files/files.html b/pylons_app/templates/files/files.html index 485e414b..7e54238f 100644 --- a/pylons_app/templates/files/files.html +++ b/pylons_app/templates/files/files.html @@ -28,7 +28,10 @@ <%include file='files_source.html'/> %endif %else: - <h2><a href="#" onClick="javascript:parent.history.back();" target="main">${_('Go back')}</a> ${_('No files at given path')}: "${c.f_path or "/"}" </h2> + <h2> + <a href="#" onClick="javascript:parent.history.back();" target="main">${_('Go back')}</a> + ${_('No files at given path')}: "${c.f_path or "/"}" + </h2> %endif </div> diff --git a/pylons_app/templates/files/files_annotate.html b/pylons_app/templates/files/files_annotate.html index a2272677..263f298c 100644 --- a/pylons_app/templates/files/files_annotate.html +++ b/pylons_app/templates/files/files_annotate.html @@ -27,9 +27,11 @@ <dt>${_('Size')}</dt> <dd>${h.format_byte_size(c.file.size,binary=True)}</dd> <dt>${_('Options')}</dt> - <dd>${h.link_to(_('source'), - h.url('files_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))} / ${h.link_to(_('raw'), - h.url('files_raw_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))}</dd> + <dd>${h.link_to(_('show source'), + h.url('files_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))} + / ${h.link_to(_('download as raw'), + h.url('files_raw_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))} + </dd> </dl> <div id="body" class="codeblock"> <div class="code-header"> diff --git a/pylons_app/templates/files/files_source.html b/pylons_app/templates/files/files_source.html index 3a729e37..8d1e923a 100644 --- a/pylons_app/templates/files/files_source.html +++ b/pylons_app/templates/files/files_source.html @@ -4,9 +4,11 @@ <dt>${_('Size')}</dt> <dd>${h.format_byte_size(c.files_list.size,binary=True)}</dd> <dt>${_('Options')}</dt> - <dd>${h.link_to(_('annotate'), - h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))} / ${h.link_to(_('raw'), - h.url('files_raw_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))}</dd> + <dd>${h.link_to(_('show annotation'), + h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))} + / ${h.link_to(_('download as raw'), + h.url('files_raw_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))} + </dd> <dt>${_('History')}</dt> <dd> ${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='GET')} |