Updated summary page

pylons_app/config/routing.py

@@ -1,44 +1,44 b''
 """Routes configuration
 
 The more specific and detailed routes should be defined first so they
 may take precedent over the more generic routes. For more information
 refer to the routes manual at http://routes.groovie.org/docs/
 """
 from routes import Mapper
 
 def make_map(config):
     """Create, configure and return the routes Mapper"""
     map = Mapper(directory=config['pylons.paths']['controllers'],
                  always_scan=config['debug'])
     map.minimization = False
     map.explicit = False
 
     # The ErrorController route (handles 404/500 error pages); it should
     # likely stay at the top, ensuring it can always be resolved
     map.connect('/error/{action}', controller='error')
     map.connect('/error/{action}/{id}', controller='error')
 
     # CUSTOM ROUTES HERE
     map.connect('hg_home', '/', controller='hg', action='index')
     
     
     #REST controllers
     map.resource('repo', 'repos', path_prefix='/_admin')
     map.resource('user', 'users', path_prefix='/_admin')
     
     #ADMIN
     with map.submapper(path_prefix='/_admin', controller='admin') as m:
         m.connect('admin_home', '/', action='index')#main page
         m.connect('admin_add_repo', '/add_repo/{new_repo:[a-z0-9\. _-]*}', action='add_repo')
     
     
     map.connect('changeset_home', '/{repo_name}/changeset/{revision}', controller='changeset', revision='tip')
     map.connect('summary_home', '/{repo_name}/summary', controller='summary')
-    map.connect('changelog_home', '/{repo_name}/changelog', controller='changelog')
+    map.connect('changelog_home', '/{repo_name}/changelog/{revision}', controller='changelog', revision='tip')
     map.connect('branches_home', '/{repo_name}/branches', controller='branches')
     map.connect('tags_home', '/{repo_name}/tags', controller='tags')
     map.connect('graph_home', '/{repo_name}/graph/{revision}', controller='graph', revision='tip')    
     map.connect('files_home', '/{repo_name}/files/{revision}/{f_path:.*}', controller='files', revision='tip', f_path='')
     
 
     return map

pylons_app/controllers/summary.py

@@ -1,32 +1,32 b''
 import logging
 
 from pylons import tmpl_context as c, app_globals as g, session, request, config, url
 from pylons.controllers.util import abort, redirect
 
 from pylons_app.lib.base import BaseController, render
 from pylons_app.lib.utils import get_repo_slug
 from pylons_app.model.hg_model import HgModel
 log = logging.getLogger(__name__)
 
 class SummaryController(BaseController):
     def __before__(self):
         c.repos_prefix = config['repos_name']
         
         c.repo_name = get_repo_slug(request)
         
     def index(self):
         hg_model = HgModel()
         c.repo_info = hg_model.get_repo(c.repo_name)
         c.repo_changesets = c.repo_info.get_changesets(10)
         
         e = request.environ
         uri = r'%(protocol)s://%(user)s@%(host)s/%(repo_name)s' % {
                                                 'protocol': e.get('wsgi.url_scheme'),
                                                 'user':e.get('REMOTE_USER'),
                                                 'host':e.get('HTTP_HOST'),
                                                 'repo_name':c.repo_name,
                                                 }
         c.clone_repo_url = url(uri)
-        c.repo_tags = []#c.repo_info.get_tags(limit=10)
-        c.repo_branches = []#c.repo_info.get_branches(limit=10)
+        c.repo_tags = c.repo_info.tags[:10]
+        c.repo_branches = c.repo_info.branches[:10]
         return render('/summary.html')

pylons_app/templates/summary.html

@@ -1,89 +1,115 b''
 <%inherit file="base/base.html"/>
 <%!
 from pylons_app.lib import filters
 %>
 <%def name="title()">
     ${_('Repository managment')}
 </%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))}
     /
     ${_('summary')}
 </%def>
 <%def name="page_nav()">
         <form action="log">
             <dl class="search">
                 <dt><label>Search: </label></dt>
                 <dd><input type="text" name="rev" /></dd>
             </dl>
         </form>
 
 		${self.menu('summary')}    
 </%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.rfc822date} - ${c.repo_info.last_change|n,filters.age}</dd>
         <dt>${_('url')}</dt>
-        <dd><pre>$ hg clone <a href="${c.clone_repo_url}">${c.clone_repo_url}</a></pre></dd>
+        <dd><pre>hg clone <a href="${c.clone_repo_url}">${c.clone_repo_url}</a></pre></dd>
         <dt>${_('Download')}</dt>
         <dd>
        	%for archive in c.repo_info._get_archives():
 				| <a href="/${c.repo_info.name}/archive/${archive['node']}${archive['extension']}">
 				${c.repo_info.name}.${archive['type']}
 				</a>
 		%endfor
 		| 
         </dd>
     </dl>
 
     <h2>${h.link_to(_('Changes'),h.url('changelog_home',repo_name=c.repo_name))}</h2>
     <table>
 	%for cnt,cs in enumerate(c.repo_changesets):
 		<tr class="parity${cnt%2}">
 			<td>${cs._ctx.date()|n,filters.age}</td>
 			<td>${cs.author}</td>
 			<td>
 				
 				${h.link_to(cs.message,h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))}
 				<span class="logtags">
 					<span class="branchtag">${cs.branch}</span>
 					%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>
-		%for tag in c.repo_tags:
-			${tag}
+		%for cnt,tag in enumerate(c.repo_tags):
+		<tr class="parity${cnt%2}">
+			<td>${tag._ctx.date()|n,filters.age}</td>
+			<td></td>
+			<td>
+				<span class="logtags">
+					<span class="tagtag">${h.link_to(tag.tags[-1],h.url('changeset_home',repo_name=c.repo_name,revision=tag._short))}</span>
+				</span>
+			</td>
+			<td class="nowrap">
+			${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=tag._short))}
+			|
+			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=tag._short))}
+			</td>
+		</tr>	
 		%endfor
     </table>
 
     <h2>${h.link_to(_('Branches'),h.url('branches_home',repo_name=c.repo_name))}</h2>
     <table>
-		%for branch in c.repo_branches:
-			${branch}
+		%for cnt,branch in enumerate(c.repo_branches):
+		<tr class="parity${cnt%2}">
+			<td>${branch._ctx.date()|n,filters.age}</td>
+			<td></td>
+			<td>
+				<span class="logtags">
+					<span class="branchtag">${h.link_to(branch.branch,h.url('changeset_home',repo_name=c.repo_name,revision=branch._short))}</span>
+				</span>			
+			</td>
+			<td class="nowrap">
+			${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch._short))}
+			|
+			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch._short))}
+			</td>
+		</tr>	
 		%endfor
     </table>
 
 </%def>    
  No newline at end of file