kallithea Changeset - 373ddb868bd6

Changeset - 373ddb868bd6

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Marcin Kuzminski - 15 years ago 2010-06-13 18:18:49
marcin@python-works.com

html updates,mostly tables

6 files changed with 58 insertions and 15 deletions:

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

0 comments (0 inline, 0 general)

pylons_app/templates/branches/branches.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%! from pylons_app.lib import filters %>
 <%def name="title()">
     ${_('Branches')}
 </%def>
 <%def name="breadcrumbs()">
     ${h.link_to(u'Home',h.url('/'))}
+    /
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
+    /
     ${_('branches')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('branches')}
 </%def>
 <%def name="main()">
     <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],
 					h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))}</span>
 				</span>
 			</td>
 			<td class="nowrap">
 			${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].raw_id))}
 			</td>
 		</tr>
 		%endfor
     </table>
 </%def>
@@ \ No newline at end of file @@

pylons_app/templates/changelog/changelog.html

➞

Show inline comments

 <%!
 from pylons_app.lib import filters
 %>
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Changelog - %s') % c.repo_name}
 </%def>
 <%def name="breadcrumbs()">
     ${h.link_to(u'Home',h.url('/'))}
+    /
     ${h.link_to(c.repo_name,h.url('changelog_home',repo_name=c.repo_name))}
+    /
     ${_('changelog')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('changelog')}
 </%def>
 <%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">
 	##<div id="graph_nodes" style="height:1000px">
 	##	<canvas id="graph" width="160"></canvas>
 	##</div>
 	<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>
 	%for cnt,cs in enumerate(c.pagination):
 		<div class="container">
 			<div class="left">
 				<div class="date">${_('commit')} ${cs.revision}: ${cs.raw_id}@${cs.date}</div>
 				<div class="author">${cs.author}</div>
 				<div id="chg_${cnt}" class="message">
 					${h.link_to(cs.message,
 					h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id),
 					title=cs.message)}
 				</div>
 					<span class="logtags">
 						<span class="branchtag">${cs.branch}</span>
 						%for tag in cs.tags:
 							<span class="tagtag">${tag}</span>
 						%endfor
 					</span>
 			</div>
 			<div class="right">
 						<div class="changes">
 							<span class="removed" title="${_('removed')}">${len(cs.removed)}</span>
 							<span class="changed" title="${_('changed')}">${len(cs.changed)}</span>
 							<span class="added" title="${_('added')}">${len(cs.added)}</span>
 						</div>
 							%if len(cs.parents)>1:
 							<div class="merge">
 								${_('merge')}<img alt="merge" src="/images/icons/arrow_join.png">
 							</div>
 							%endif
 						%for p_cs in reversed(cs.parents):
 							<div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(p_cs.raw_id,
 								h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}
 							</div>
 						%endfor
 			</div>
 		</div>
 	%endfor
 	</div>
 </div>
 ##<script type="text/javascript" src="/js/graph2.js"></script>
 ##<script type="text/javascript" src="http://bitbucket-assets.s3.amazonaws.com/js/lib/bundle.160310Mar.js"></script>
 ##
 ##<script>
 ##<!-- hide script content

pylons_app/templates/files/files_browser.html

➞

Show inline comments

 <%def name="file_class(node)">
 	%if node.is_file():
 		<%return "browser-file" %>
 	%else:
 		<%return "browser-dir"%>
 	%endif
 </%def>
 <div id="body" class="browserblock">
 	<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>
 	<div class="browser-body">
 		<table class="code-browser">
 		         <thead>
 		             <tr>
 		                 <th>${_('Name')}</th>
 		                 <th>${_('Size')}</th>
 		                 <th>${_('Revision')}</th>
 		                 <th>${_('Last modified')}</th>
 		                 <th>${_('Last commiter')}</th>
 		             </tr>
 		         </thead>
 		         	<tr class="parity0">
 		          		<td>
 		          		% if c.files_list.parent:
 		          			${h.link_to('..',h.url('files_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.files_list.parent.path),class_="browser-dir")}
 		          		%endif
 		          		</td>
 		          		<td></td>
 		          		<td></td>
 		          		<td></td>
 		          		<td></td>
 		         	</tr>
 		    %for cnt,node in enumerate(c.files_list,1):
 				<tr class="parity${cnt%2}">
 		             <td>
 						${h.link_to(node.name,h.url('files_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=node.path),class_=file_class(node))}
 		             </td>
 		             <td>
 		                %if node.is_file():
 		             		${h.format_byte_size(node.size,binary=True)}
 		             	%endif
 		             </td>
 		             <td>
 		             	%if node.is_file():
 		             		${node.last_changeset.revision}
 		             	%endif
 		             </td>
 		             <td>
 		             	%if node.is_file():
 		             		${node.last_changeset.date}
 		             	%endif
 		             </td>
 		             <td>
 		             	%if node.is_file():
 		             		${node.last_changeset.author}

pylons_app/templates/shortlog/shortlog_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%!
 from pylons_app.lib import filters
 %>
 <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 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">
 				%for tag in cs.tags:
 					<span class="tagtag">${tag}</span>
 				%endfor
 			</span>
 		</td>
 		<td class="nowrap">
 		${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
+		|
 		${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
 		</td>
 	</tr>
 %endfor
 </table>
 	<div>
 		<script type="text/javascript">
 		var data_div = 'shortlog_data';
 		YAHOO.util.Event.onDOMReady(function(){
 			YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){
 					YAHOO.util.Dom.setStyle('shortlog_data','opacity','0.3');});});
 		</script>
 		<h2>
 		${c.repo_changesets.pager('$link_previous ~2~ $link_next',
 		onclick="""YAHOO.util.Connect.asyncRequest('GET','$partial_url',{
 		success:function(o){YAHOO.util.Dom.get(data_div).innerHTML=o.responseText;
 		YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){
 				YAHOO.util.Dom.setStyle(data_div,'opacity','0.3');});
 		YAHOO.util.Dom.setStyle(data_div,'opacity','1');}},null); return false;""")}
 		</h2>
 	</div>
@@ \ No newline at end of file @@

pylons_app/templates/summary/summary.html

➞

Show inline comments

@@ @@ -17,118 +17,146 @@ from pylons_app.lib import filters @@
 </%def>
 <%def name="js()">
 <script type="text/javascript" src="/js/yui/utilities/utilities.js"></script>
 <script type="text/javascript">
 var E = YAHOO.util.Event;
 var D = YAHOO.util.Dom;
 E.onDOMReady(function(e){
     id = 'clone_url';
 	E.addListener(id,'click',function(e){
 	    D.get('clone_url').select();
 	})
 })
 </script>
 </%def>
 <%def name="main()">
     <h2 class="no-link no-border">${_('Mercurial Repository Overview')}</h2>
     <dl class="overview">
         <dt>${_('name')}</dt>
         <dd>${c.repo_info.name}</dd>
         <dt>${_('description')}</dt>
         <dd>${c.repo_info.description}</dd>
         <dt>${_('contact')}</dt>
         <dd>${c.repo_info.contact}</dd>
         <dt>${_('last change')}</dt>
         <dd>${c.repo_info.last_change|n,filters.age} - ${c.repo_info.last_change|n,filters.rfc822date}</dd>
         <dt>${_('clone url')}</dt>
         <dd><input type="text" id="clone_url"  readonly="readonly" value="hg clone ${c.clone_repo_url}" size="70"/></dd>
         <dt>${_('download')}</dt>
         <dd>
        	%for cnt,archive in enumerate(c.repo_info._get_archives()):
        		 %if cnt >=1:
+       		 |
        		 %endif
        		 ${h.link_to(c.repo_info.name+'.'+archive['type'],
        			h.url('files_archive_home',repo_name=c.repo_info.name,
        			revision='tip',fileformat=archive['extension']),class_="archive_logo")}
 		%endfor
         </dd>
         <dt>${_('feeds')}</dt>
         <dd>
         	${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.repo_info.name),class_='rss_logo')}
 			${h.link_to(_('Atom'),h.url('atom_feed_home',repo_name=c.repo_info.name),class_='atom_logo')}
         </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),
 				title=cs.message)}
 			</td>
 			<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
 				</span>
 			</td>
 			<td class="nowrap">
 			${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))}
+			|
 			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=cs._short))}
 			</td>
 		</tr>
 	%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],
 					h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id))}</span>
 				</span>
 			</td>
 			<td class="nowrap">
 			${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id))}
+			|
 			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=tag[1].raw_id))}
 			</td>
 		</tr>
 		%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],
 					h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))}</span>
 				</span>
 			</td>
 			<td class="nowrap">
 			${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].raw_id))}
 			</td>
 		</tr>
 		%endfor
     </table>
 </%def>
@@ \ No newline at end of file @@

pylons_app/templates/tags/tags.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%!
 from pylons_app.lib import filters
 %>
 <%def name="title()">
     ${_('Tags')}
 </%def>
 <%def name="breadcrumbs()">
     ${h.link_to(u'Home',h.url('/'))}
+    /
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
+    /
     ${_('tags')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('tags')}
 </%def>
 <%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],
 					h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id))}</span>
 				</span>
 			</td>
 			<td class="nowrap">
 			${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id))}
+			|
 			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=tag[1].raw_id))}
 			</td>
 		</tr>
 		%endfor
     </table>
 </%def>
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)