Mercurial > kallithea

changeset 278:ed7abf925696

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#4: changes proposed by feedback to annotation
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 13 Jun 2010 16:27:19 +0200
parents 7ec4463b6e53
children ba0523f440d2
files pylons_app/lib/helpers.py pylons_app/templates/files/files.html pylons_app/templates/files/files_annotate.html pylons_app/templates/files/files_source.html
diffstat 4 files changed, 16 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/pylons_app/lib/helpers.py	Sun Jun 13 15:56:47 2010 +0200
+++ b/pylons_app/lib/helpers.py	Sun Jun 13 16:27:19 2010 +0200
@@ -84,10 +84,9 @@
         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))
--- a/pylons_app/templates/files/files.html	Sun Jun 13 15:56:47 2010 +0200
+++ b/pylons_app/templates/files/files.html	Sun Jun 13 16:27:19 2010 +0200
@@ -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>
--- a/pylons_app/templates/files/files_annotate.html	Sun Jun 13 15:56:47 2010 +0200
+++ b/pylons_app/templates/files/files_annotate.html	Sun Jun 13 16:27:19 2010 +0200
@@ -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">
--- a/pylons_app/templates/files/files_source.html	Sun Jun 13 15:56:47 2010 +0200
+++ b/pylons_app/templates/files/files_source.html	Sun Jun 13 16:27:19 2010 +0200
@@ -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')}