diff rhodecode/templates/branches/branches_data.html @ 636:ffd07396d315 beta

Fixes for raw_id, needed for git Renamed hg controller to home css html changes
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 26 Oct 2010 03:20:32 +0200
parents fcf599cd3404
children 6d37fe113da0
line wrap: on
line diff
--- a/rhodecode/templates/branches/branches_data.html	Mon Oct 25 03:19:01 2010 +0200
+++ b/rhodecode/templates/branches/branches_data.html	Tue Oct 26 03:20:32 2010 +0200
@@ -2,24 +2,26 @@
     <table class="table_disp">
         <tr>
             <th class="left">${_('date')}</th>
+            <th class="left">${_('name')}</th>
+            <th class="left">${_('author')}</th>
             <th class="left">${_('revision')}</th>
-            <th class="left">${_('name')}</th>
             <th class="left">${_('links')}</th>
         </tr>
 		%for cnt,branch in enumerate(c.repo_branches.items()):
 		<tr class="parity${cnt%2}">
-			<td>${h.age(branch[1].date)}</td>
-			<td>r${branch[1].revision}:${branch[1].short_id}</td>
-			<td>
-				<span class="logtags">
-					<span class="branchtag">${h.link_to(branch[0],
-					h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].short_id))}</span>
-				</span>			
-			</td>
+            <td>${branch[1].date} - ${h.age(branch[1].date)}</td>
+            <td>
+                <span class="logtags">
+                    <span class="branchtag">${h.link_to(branch[0],
+                    h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))}</span>
+                </span>         
+            </td>		
+            <td title="${branch[1].author}">${h.person(branch[1].author)}</td>
+            <td>r${branch[1].revision}:${h.short_id(branch[1].raw_id)}</td>
 			<td class="nowrap">
-			${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].short_id))}
+			${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))}
 			|
-			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch[1].short_id))}
+			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id))}
 			</td>
 		</tr>	
 		%endfor