Mercurial > kallithea

changeset 280:373ddb868bd6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
html updates,mostly tables
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 13 Jun 2010 18:18:49 +0200
parents ba0523f440d2
children cd2ee462fc2c
files pylons_app/templates/branches/branches.html pylons_app/templates/changelog/changelog.html pylons_app/templates/files/files_browser.html pylons_app/templates/shortlog/shortlog_data.html pylons_app/templates/summary/summary.html pylons_app/templates/tags/tags.html
diffstat 6 files changed, 58 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/pylons_app/templates/branches/branches.html	Sun Jun 13 16:33:22 2010 +0200
+++ b/pylons_app/templates/branches/branches.html	Sun Jun 13 18:18:49 2010 +0200
@@ -17,10 +17,17 @@
 
     <h2 class="no-link no-border">${_('Branches')}</h2>
 
-    <table>
+    <table class="table_disp">
+    	<tr class="header">
+			<td>${_('date')}</td>
+			<td>${_('revision')}</td>
+			<td>${_('name')}</td>
+			<td>${_('links')}</td>
+    	</tr>
 		%for cnt,branch in enumerate(c.repo_branches.items()):
 		<tr class="parity${cnt%2}">
 			<td>${branch[1]._ctx.date()|n,filters.age}</td>
+			<td>r${branch[1].revision}:${branch[1].raw_id}</td>
 			<td>
 				<span class="logtags">
 					<span class="branchtag">${h.link_to(branch[0],
--- a/pylons_app/templates/changelog/changelog.html	Sun Jun 13 16:33:22 2010 +0200
+++ b/pylons_app/templates/changelog/changelog.html	Sun Jun 13 18:18:49 2010 +0200
@@ -19,7 +19,7 @@
 
 <%def name="main()">
 
-    <h2 class="no-link no-border">${_('Changelog')} - ${_('showing ')} ${c.size} ${_('revisions')}</h2>
+    <h2 class="no-link no-border">${_('Changelog')} - ${_('showing last ')} ${c.size} ${_('revisions')}</h2>
 	<noscript>${_('The revision graph only works with JavaScript-enabled browsers.')}</noscript>
 
 <div id="graph">
@@ -29,7 +29,7 @@
 	<div id="graph_content">
 		<div class="container_header">
 			${h.form(h.url.current(),method='get')}
-				${_('Show')}: ${h.text('size',size=5,value=c.size)} ${_('revisions')}
+				${_('Show')}: ${h.text('size',size=2,value=c.size)} ${_('revisions')}
 				${h.submit('','set')}
 			${h.end_form()}
 		</div>
--- a/pylons_app/templates/files/files_browser.html	Sun Jun 13 16:33:22 2010 +0200
+++ b/pylons_app/templates/files/files_browser.html	Sun Jun 13 18:18:49 2010 +0200
@@ -9,6 +9,7 @@
 	<div class="browser-header">
 		${h.form(h.url.current())}
 		<span>${_('view')}@rev <a style="font-size: 1.3em"  href="${c.url_prev}">&laquo;</a>${h.text('at_rev',value=c.rev_nr,size='5')}<a style="font-size: 1.3em" href="${c.url_next}">&raquo;</a></span>
+		${c.cur_rev} 
 		${h.submit('view','view')}
 		${h.end_form()}
 	</div>
--- a/pylons_app/templates/shortlog/shortlog_data.html	Sun Jun 13 16:33:22 2010 +0200
+++ b/pylons_app/templates/shortlog/shortlog_data.html	Sun Jun 13 18:18:49 2010 +0200
@@ -17,16 +17,16 @@
 	<tr class="parity${cnt%2}">
 		<td>${cs._ctx.date()|n,filters.age}</td>
 		<td title="${cs.author}">${cs.author|n,filters.person}</td>
-		<td>r${cs.revision}</td>
+		<td>r${cs.revision}:${cs.raw_id}</td>
 		<td>
 			${h.link_to(h.truncate(cs.message,60),
 			h.url('changeset_home',repo_name=c.repo_name,revision=cs._short),
 			title=cs.message)}
 		</td>
 		<td>
-				<span class="logtags">
-					<span class="branchtag">${cs.branch}</span>
-				</span>
+			<span class="logtags">
+				<span class="branchtag">${cs.branch}</span>
+			</span>
 		</td>
 		<td>
 			<span class="logtags">
--- a/pylons_app/templates/summary/summary.html	Sun Jun 13 16:33:22 2010 +0200
+++ b/pylons_app/templates/summary/summary.html	Sun Jun 13 18:18:49 2010 +0200
@@ -62,13 +62,23 @@
         </dd>
     </dl>
 
-    <h2>${h.link_to(_('Changes'),h.url('changelog_home',repo_name=c.repo_name))}</h2>
-    <table>
+    <h2>${h.link_to(_('Last ten changes'),h.url('changelog_home',repo_name=c.repo_name))}</h2>
+<table class="table_disp">
+	<tr class="header">
+		<td>${_('date')}</td>
+		<td>${_('author')}</td>
+		<td>${_('revision')}</td>
+		<td>${_('commit message')}</td>
+		<td>${_('branch')}</td>
+		<td>${_('tags')}</td>
+		<td>${_('links')}</td>
+		
+	</tr>
 	%for cnt,cs in enumerate(c.repo_changesets):
 		<tr class="parity${cnt%2}">
 			<td>${cs._ctx.date()|n,filters.age}</td>
 			<td>${cs.author|n,filters.person}</td>
-			<td>r${cs.revision}</td>
+			<td>r${cs.revision}:${cs.raw_id}</td>
 			<td>
 				${h.link_to(h.truncate(cs.message,60),
 				h.url('changeset_home',repo_name=c.repo_name,revision=cs._short),
@@ -77,6 +87,10 @@
 			<td>
 				<span class="logtags">
 					<span class="branchtag">${cs.branch}</span>
+				</span>
+			</td>
+			<td>
+				<span class="logtags">
 					%for tag in cs.tags:
 						<span class="tagtag">${tag}</span>
 					%endfor
@@ -91,11 +105,18 @@
 	%endfor
     </table>
 
-    <h2>${h.link_to(_('Tags'),h.url('tags_home',repo_name=c.repo_name))}</h2>
-    <table>
+    <h2>${h.link_to(_('Last ten tags'),h.url('tags_home',repo_name=c.repo_name))}</h2>
+    <table class="table_disp">
+    	<tr class="header">
+			<td>${_('date')}</td>
+			<td>${_('revision')}</td>
+			<td>${_('name')}</td>
+			<td>${_('links')}</td>
+    	</tr>
 		%for cnt,tag in enumerate(c.repo_tags.items()):
 		<tr class="parity${cnt%2}">
 			<td>${tag[1]._ctx.date()|n,filters.age}</td>
+			<td>r${tag[1].revision}:${tag[1].raw_id}</td>
 			<td>
 				<span class="logtags">
 					<span class="tagtag">${h.link_to(tag[0],
@@ -111,11 +132,18 @@
 		%endfor
     </table>
 
-    <h2>${h.link_to(_('Branches'),h.url('branches_home',repo_name=c.repo_name))}</h2>
-    <table>
+    <h2>${h.link_to(_('Last ten branches'),h.url('branches_home',repo_name=c.repo_name))}</h2>
+    <table class="table_disp">
+    	<tr class="header">
+			<td>${_('date')}</td>
+			<td>${_('revision')}</td>
+			<td>${_('name')}</td>
+			<td>${_('links')}</td>
+    	</tr>
 		%for cnt,branch in enumerate(c.repo_branches.items()):
 		<tr class="parity${cnt%2}">
 			<td>${branch[1]._ctx.date()|n,filters.age}</td>
+			<td>r${branch[1].revision}:${branch[1].raw_id}</td>
 			<td>
 				<span class="logtags">
 					<span class="branchtag">${h.link_to(branch[0],
--- a/pylons_app/templates/tags/tags.html	Sun Jun 13 16:33:22 2010 +0200
+++ b/pylons_app/templates/tags/tags.html	Sun Jun 13 18:18:49 2010 +0200
@@ -18,10 +18,17 @@
 <%def name="main()">
 
     <h2 class="no-link no-border">${_('Tags')}</h2>
-    <table>
+    <table class="table_disp">
+    	<tr class="header">
+			<td>${_('date')}</td>
+			<td>${_('revision')}</td>
+			<td>${_('name')}</td>
+			<td>${_('links')}</td>
+    	</tr>
 		%for cnt,tag in enumerate(c.repo_tags.items()):
 		<tr class="parity${cnt%2}">
 			<td>${tag[1]._ctx.date()|n,filters.age}</td>
+			<td>r${tag[1].revision}:${tag[1].raw_id}</td>
 			<td>
 				<span class="logtags">
 					<span class="tagtag">${h.link_to(tag[0],