switched filters into webhelpers for easy of usage.

Rewrite of html to use predefined templates from branches shortlog tags, for DRY usage.
Added info messages about empty branches/tags etc.

pylons_app/templates/branches/branches_data.html

@@ -0,0 +1,30 b''
+% if c.repo_branches:
+    <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>${h.age(branch[1]._ctx.date())}</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>
+%else:
+	${_('There are no branches yet')}
+%endif
+

pylons_app/templates/tags/tags_data.html

@@ -0,0 +1,29 b''
+%if c.repo_tags:    
+    <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>${h.age(tag[1]._ctx.date())}</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>
+%else:
+	${_('There are no tags yet')}
+%endif    
  No newline at end of file

pylons_app/controllers/changelog.py

@@ -1,95 +1,96 b''
 #!/usr/bin/env python
 # encoding: utf-8
 # changelog controller for pylons
 # Copyright (C) 2009-2010 Marcin Kuzminski <[e-mail]>
  
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on April 21, 2010
 changelog controller for pylons
 @author: marcink
 """
 from pylons import request, session, tmpl_context as c
 from pylons_app.lib.auth import LoginRequired
 from pylons_app.lib.base import BaseController, render
 from pylons_app.model.hg_model import HgModel
 from webhelpers.paginate import Page
 import logging
 log = logging.getLogger(__name__)     
 
 class ChangelogController(BaseController):
     
     @LoginRequired()
     def __before__(self):
         super(ChangelogController, self).__before__()
                 
     def index(self):
         limit = 100
         default = 20
         if request.params.get('size'):
             try:
                 int_size = int(request.params.get('size'))
             except ValueError:
                 int_size = default
             int_size = int_size if int_size <= limit else limit 
             c.size = int_size
             session['changelog_size'] = c.size
             session.save()
         else:
-            c.size = session.get('changelog_size', default)
+            c.size = int(session.get('changelog_size', default))
 
         changesets = HgModel().get_repo(c.repo_name)
             
         p = int(request.params.get('page', 1))
-        c.pagination = Page(changesets, page=p, item_count=len(changesets),
+        c.total_cs = len(changesets)
+        c.pagination = Page(changesets, page=p, item_count=c.total_cs,
                             items_per_page=c.size)
             
         #self._graph(c.repo, c.size,p)
         
         return render('changelog/changelog.html')
 
 
     def _graph(self, repo, size, p):
         pass
 #        revcount = size
 #        if not repo.revisions:return dumps([]), 0
 #        
 #        max_rev = repo.revisions[-1]
 #        offset = 1 if p == 1 else  ((p - 1) * revcount)
 #        rev_start = repo.revisions[(-1 * offset)]
 #        c.bg_height = 120
 #        
 #        revcount = min(max_rev, revcount)
 #        rev_end = max(0, rev_start - revcount)
 #        dag = graph_rev(repo.repo, rev_start, rev_end)
 #        
 #        c.dag = tree = list(colored(dag))
 #        canvasheight = (len(tree) + 1) * c.bg_height - 27
 #        data = []
 #        for (id, type, ctx, vtx, edges) in tree:
 #            if type != CHANGESET:
 #                continue
 #            node = short(ctx.node())
 #            age = _age(ctx.date())
 #            desc = ctx.description()
 #            user = person(ctx.user())
 #            branch = ctx.branch()
 #            branch = branch, repo.repo.branchtags().get(branch) == ctx.node()
 #            data.append((node, vtx, edges, desc, user, age, branch, ctx.tags()))
 #    
 #        c.jsdata = dumps(data) 
 #        c.canvasheight = canvasheight 
 

pylons_app/controllers/graph.py

@@ -1,84 +1,84 b''
 #!/usr/bin/env python
 # encoding: utf-8
 # graph controller for pylons
 # Copyright (C) 2009-2010 Marcin Kuzminski <[e-mail]>
  
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on April 21, 2010
 graph controller for pylons
 @author: marcink
 """
 from mercurial.graphmod import revisions as graph_rev, colored, CHANGESET
 from mercurial.node import short
 from pylons import request, tmpl_context as c
+import pylons_app.lib.helpers as h
 from pylons_app.lib.auth import LoginRequired
 from pylons_app.lib.base import BaseController, render
-from pylons_app.lib.filters import age as _age, person
 from pylons_app.model.hg_model import HgModel
 from simplejson import dumps
 from webhelpers.paginate import Page
 import logging
 
 log = logging.getLogger(__name__)
 
 class GraphController(BaseController):
     
     @LoginRequired()
     def __before__(self):
         super(GraphController, self).__before__()
         
     def index(self):
         # Return a rendered template
         hg_model = HgModel()
         if request.POST.get('size'):
             c.size = int(request.params.get('size', 20))
         else:
             c.size = int(request.params.get('size', 20))
         c.jsdata, c.canvasheight = self.graph(hg_model.get_repo(c.repo_name), c.size)
         
         return render('/graph.html')
 
 
     def graph(self, repo, size):
         revcount = size
         p = int(request.params.get('page', 1))
         c.pagination = Page(repo.revisions, page=p, item_count=len(repo.revisions), items_per_page=revcount)
         if not repo.revisions:return dumps([]), 0
         
         max_rev = repo.revisions[-1]
         offset = 1 if p == 1 else  ((p - 1) * revcount)
         rev_start = repo.revisions[(-1 * offset)]
         bg_height = 39
         
         revcount = min(max_rev, revcount)
         rev_end = max(0, rev_start - revcount)
         dag = graph_rev(repo.repo, rev_start, rev_end)
         tree = list(colored(dag))
         canvasheight = (len(tree) + 1) * bg_height - 27
         data = []
         for (id, type, ctx, vtx, edges) in tree:
             if type != CHANGESET:
                 continue
             node = short(ctx.node())
-            age = _age(ctx.date())
+            age = h.age(ctx.date())
             desc = ctx.description()
-            user = person(ctx.user())
+            user = h.person(ctx.user())
             branch = ctx.branch()
             branch = branch, repo.repo.branchtags().get(branch) == ctx.node()
             data.append((node, vtx, edges, desc, user, age, branch, ctx.tags()))
     
         return dumps(data), canvasheight

pylons_app/controllers/summary.py

@@ -1,58 +1,59 b''
 #!/usr/bin/env python
 # encoding: utf-8
 # summary controller for pylons
 # Copyright (C) 2009-2010 Marcin Kuzminski <[e-mail]>
  
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on April 18, 2010
 summary controller for pylons
 @author: marcink
 """
 from pylons import tmpl_context as c, request
 from pylons_app.lib.auth import LoginRequired
 from pylons_app.lib.base import BaseController, render
-from pylons_app.model.hg_model import HgModel, _full_changelog_cached
+from pylons_app.model.hg_model import HgModel
+from webhelpers.paginate import Page
 import logging
 
 log = logging.getLogger(__name__)
 
 class SummaryController(BaseController):
     
     @LoginRequired()
     def __before__(self):
         super(SummaryController, self).__before__()
         
     def index(self):
         hg_model = HgModel()
         c.repo_info = hg_model.get_repo(c.repo_name)
-        c.repo_changesets = _full_changelog_cached(c.repo_name)[:10]
+        c.repo_changesets = Page(list(c.repo_info[:10]), page=1, items_per_page=20)
         e = request.environ
         uri = u'%(protocol)s://%(user)s@%(host)s/%(repo_name)s' % {
                                         'protocol': e.get('wsgi.url_scheme'),
                                         'user':str(c.hg_app_user.username),
                                         'host':e.get('HTTP_HOST'),
                                         'repo_name':c.repo_name, }
         c.clone_repo_url = uri
         c.repo_tags = {}
         for name, hash in c.repo_info.tags.items()[:10]:
             c.repo_tags[name] = c.repo_info.get_changeset(hash)
         
         c.repo_branches = {}
         for name, hash in c.repo_info.branches.items()[:10]:
             c.repo_branches[name] = c.repo_info.get_changeset(hash)
                     
         return render('summary/summary.html')

pylons_app/lib/helpers.py

@@ -1,205 +1,231 b''
 """Helper functions
 
 Consists of functions to typically be used within templates, but also
 available to Controllers. This module is available to both as 'h'.
 """
 from pygments.formatters import HtmlFormatter
 from pygments import highlight as code_highlight
 from pylons import url, app_globals as g
 from pylons.i18n.translation import _, ungettext
 from vcs.utils.annotate import annotate_highlight
 from webhelpers.html import literal, HTML, escape
 from webhelpers.html.tools import *
 from webhelpers.html.builder import make_tag
 from webhelpers.html.tags import auto_discovery_link, checkbox, css_classes, \
     end_form, file, form, hidden, image, javascript_link, link_to, link_to_if, \
     link_to_unless, ol, required_legend, select, stylesheet_link, submit, text, \
     password, textarea, title, ul, xml_declaration, radio
 from webhelpers.html.tools import auto_link, button_to, highlight, js_obfuscate, \
     mail_to, strip_links, strip_tags, tag_re
 from webhelpers.number import format_byte_size, format_bit_size
 from webhelpers.pylonslib import Flash as _Flash
 from webhelpers.pylonslib.secure_form import secure_form
 from webhelpers.text import chop_at, collapse, convert_accented_entities, \
     convert_misc_entities, lchop, plural, rchop, remove_formatting, \
     replace_whitespace, urlify, truncate, wrap_paragraphs
 
 
 #Custom helpers here :)
 class _Link(object):
     '''
     Make a url based on label and url with help of url_for
     @param label:name of link    if not defined url is used
     @param url: the url for link
     '''
 
     def __call__(self, label='', *url_, **urlargs):
         if label is None or '':
             label = url
         link_fn = link_to(label, url(*url_, **urlargs))
         return link_fn
 
 link = _Link()
 
 class _GetError(object):
 
     def __call__(self, field_name, form_errors):
         tmpl = """<span class="error_msg">%s</span>"""
         if form_errors and form_errors.has_key(field_name):
             return literal(tmpl % form_errors.get(field_name))
 
 get_error = _GetError()
 
 def recursive_replace(str, replace=' '):
     """
     Recursive replace of given sign to just one instance
     @param str: given string
     @param replace:char to find and replace multiple instances
         
     Examples::
     >>> recursive_replace("Mighty---Mighty-Bo--sstones",'-')
     'Mighty-Mighty-Bo-sstones'
     """
 
     if str.find(replace * 2) == -1:
         return str
     else:
         str = str.replace(replace * 2, replace)
         return recursive_replace(str, replace)  
 
 class _ToolTip(object):
     
     def __call__(self, tooltip_title, trim_at=50):
         """
         Special function just to wrap our text into nice formatted autowrapped
         text
         @param tooltip_title:
         """
         
         return literal(wrap_paragraphs(tooltip_title, trim_at)\
                        .replace('\n', '<br/>')) 
     
     def activate(self):
         """
         Adds tooltip mechanism to the given Html all tooltips have to have 
         set class tooltip and set attribute tooltip_title.
         Then a tooltip will be generated based on that
         All with yui js tooltip
         """
         
         js = '''
         YAHOO.util.Event.onDOMReady(function(){
             function toolTipsId(){
                 var ids = [];
                 var tts = YAHOO.util.Dom.getElementsByClassName('tooltip');
                 
                 for (var i = 0; i < tts.length; i++) {
                     //if element doesn not have and id autgenerate one for tooltip
                     
                     if (!tts[i].id){
                         tts[i].id='tt'+i*100;
                     }
                     ids.push(tts[i].id);
                 }
                 return ids        
             };
             var myToolTips = new YAHOO.widget.Tooltip("tooltip", { 
                 context: toolTipsId(),
                 monitorresize:false,
                 xyoffset :[0,0],
                 autodismissdelay:300000,
                 hidedelay:5,
                 showdelay:20,
             });
             
             //Mouse subscribe optional arguments
             myToolTips.contextMouseOverEvent.subscribe(
                 function(type, args) {
                     var context = args[0];
                     return true;
                 });
             
             // Set the text for the tooltip just before we display it. Lazy method
             myToolTips.contextTriggerEvent.subscribe( 
                  function(type, args) { 
                         var context = args[0]; 
                         var txt = context.getAttribute('tooltip_title');
                         this.cfg.setProperty("text", txt);                     
                   });
         });
         '''         
         return literal(js)
 
 tooltip = _ToolTip()
 
 class _FilesBreadCrumbs(object):
     
     def __call__(self, repo_name, rev, paths):
         url_l = [link_to(repo_name, url('files_home', repo_name=repo_name, revision=rev, f_path=''))]
         paths_l = paths.split(' / ')
         
         for cnt, p in enumerate(paths_l, 1):
             if p != '':
                 url_l.append(link_to(p, url('files_home', repo_name=repo_name, revision=rev, f_path=' / '.join(paths_l[:cnt]))))
 
         return literal(' / '.join(url_l))
 
 files_breadcrumbs = _FilesBreadCrumbs()
 
 def pygmentize(filenode, **kwargs):
     """
     pygmentize function using pygments
     @param filenode:
     """
     return literal(code_highlight(filenode.content, filenode.lexer, HtmlFormatter(**kwargs)))
 
 def pygmentize_annotation(filenode, **kwargs):
     """
     pygmentize function for annotation
     @param filenode:
     """
     
     color_dict = g.changeset_annotation_colors
     def gen_color():
         import random
         return [str(random.randrange(10, 235)) for _ in xrange(3)]
     def get_color_string(cs):
         if color_dict.has_key(cs):
             col = color_dict[cs]
         else:
             color_dict[cs] = gen_color()
             col = color_dict[cs]
         return "color: rgb(%s) ! important;" % (', '.join(col))
         
     def url_func(changeset):
         tooltip_html = "<div style='font-size:0.8em'><b>Author:</b> %s<br/><b>Date:</b> %s</b><br/><b>Message:</b> %s<br/></div>" 
         
         tooltip_html = tooltip_html % (changeset.author,
                                                changeset.date,
                                                tooltip(changeset.message))
         lnk_format = 'r%s:%s' % (changeset.revision,
                                  changeset.raw_id)
         uri = link_to(
                 lnk_format,
                 url('changeset_home', repo_name='test',
                     revision=changeset.raw_id),
                 style=get_color_string(changeset.raw_id),
                 class_='tooltip',
                 tooltip_title=tooltip_html
               )
         
         uri += '\n'
         return uri   
     return literal(annotate_highlight(filenode, url_func, **kwargs))
       
 def repo_name_slug(value):
     """
     Return slug of name of repository
     """
     slug = urlify(value)
     for c in """=[]\;'"<>,/~!@#$%^&*()+{}|:""":
         slug = slug.replace(c, '-')
     slug = recursive_replace(slug, '-')
     return slug
 
 flash = _Flash()
+
+
+#===============================================================================
+# MERCURIAL FILTERS available via h.
+#===============================================================================
+
+
+from mercurial import util
+from mercurial.templatefilters import age as _age, person as _person
+
+age = lambda  x:_age(x)
+capitalize = lambda x: x.capitalize()
+date = lambda x: util.datestr(x)
+email = util.email
+person = lambda x: _person(x)
+hgdate = lambda  x: "%d %d" % x
+isodate = lambda  x: util.datestr(x, '%Y-%m-%d %H:%M %1%2')
+isodatesec = lambda  x: util.datestr(x, '%Y-%m-%d %H:%M:%S %1%2')
+localdate = lambda  x: (x[0], util.makedate()[1])
+rfc822date = lambda  x: util.datestr(x, "%a, %d %b %Y %H:%M:%S %1%2")
+rfc3339date = lambda  x: util.datestr(x, "%Y-%m-%dT%H:%M:%S%1:%2")
+time_ago = lambda x: util.datestr(_age(x), "%a, %d %b %Y %H:%M:%S %1%2")
+
+
+
+

pylons_app/templates/branches/branches.html

@@ -1,46 +1,18 b''
 <%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 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>
-
+	<%include file='branches_data.html'/>
 </%def>    
  No newline at end of file

pylons_app/templates/changelog/changelog.html

@@ -1,92 +1,96 b''
-<%!
-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 last ')} ${c.size} ${_('revisions')}</h2>
+    <h2 class="no-link no-border">${_('Changelog')} - ${_('showing ')} 
+    	${c.size if c.size <= c.total_cs else c.total_cs}
+    	${_('out of')} ${c.total_cs} ${_('revisions')}
+    </h2>
 	<noscript>${_('The revision graph only works with JavaScript-enabled browsers.')}</noscript>
+% if c.pagination:
 
 <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=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
 ##
 ##var jsdata = ${c.jsdata|n};
 ##var r = new BranchRenderer();
 ##r.render(jsdata); 
 
 ##// stop hiding script -->
 ##</script>
 
 <div>
 	<h2>${c.pagination.pager('$link_previous ~2~ $link_next')}</h2>
 </div>	
+%else:
+	${_('There are no changes yet')}
+%endif
 </%def>    
  No newline at end of file

pylons_app/templates/changeset/changeset.html

@@ -1,95 +1,92 b''
-<%!
-from pylons_app.lib import filters
-%>
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('Changeset')}
 </%def>
 <%def name="breadcrumbs()">
     ${h.link_to(u'Home',h.url('/'))}
     / 
     ${h.link_to(c.repo_name,h.url('changeset_home',repo_name=c.repo_name))}
     /
     ${_('changeset')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('changelog')}     
 </%def>
 <%def name="css()">
 <link rel="stylesheet" href="/css/monoblue_custom.css" type="text/css" />
 <link rel="stylesheet" href="/css/diff.css" type="text/css" />
 </%def>
 <%def name="main()">
     <h2 class="no-link no-border">${_('Changeset')} - r${c.changeset.revision}:${c.changeset.raw_id}</h2>
     
     <div id="changeset_content">
 		<div class="container">
 			<div class="left">
 				<div class="date">${_('Date')}: ${c.changeset.date}</div>
 				<div class="author">${_('Author')}: ${c.changeset.author}</div>
 				<div class="message">
 					${c.changeset.message}
 				</div>
 			</div>	
 			<div class="right">
 				<span class="logtags">
 					<span class="branchtag">${c.changeset.branch}</span>
 					%for tag in c.changeset.tags:
 						<span class="tagtag">${tag}</span>
 					%endfor
 				</span>					
 				%if len(c.changeset.parents)>1:
 				<div class="merge">		
 				${_('merge')}
 				<img alt="merge" src="/images/icons/arrow_join.png">
 				</div>
 				%endif						
 				%for p_cs in reversed(c.changeset.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>    
     </div>
     
     <div style="clear:both;height:10px"></div>
     <div class="cs_files">
 			%for change,filenode,diff,cs1,cs2 in c.changes:
 				<div class="cs_${change}">${h.link_to(filenode.path,h.url.current(anchor='CHANGE-%s'%filenode.path))}</div>
 			%endfor
 	</div>
 	
 	%for change,filenode,diff,cs1,cs2 in c.changes:
 		%if change !='removed':
 		<div style="clear:both;height:10px"></div>
 		<div id="body" class="diffblock">
 			<div id="${'CHANGE-%s'%filenode.path}" class="code-header">
 				<div>
 					<span>
 						${h.link_to_if(change!='removed',filenode.path,h.url('files_home',repo_name=c.repo_name,
 						revision=filenode.changeset.raw_id,f_path=filenode.path))}
 					</span>
 					%if 1:
 					&raquo; <span style="font-size:77%">${h.link_to(_('diff'),
 					h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='diff'))}</span>
 					&raquo; <span style="font-size:77%">${h.link_to(_('raw diff'),
 					h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='raw'))}</span>
 					&raquo; <span style="font-size:77%">${h.link_to(_('download diff'),
 					h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='download'))}</span>
 					%endif
 				</div>
 			</div>
 			<div class="code-body">        
 					%if diff:
 						${diff|n}
 					%else:
 						${_('No changes in this file')}
 					%endif
 			</div>
 		</div>
 		%endif
 	%endfor
 			
 </%def>    
  No newline at end of file

pylons_app/templates/errors/error_404.html

@@ -1,35 +1,32 b''
 ## -*- coding: utf-8 -*-
-<%!
-from pylons_app.lib import filters
-%>
 <%inherit file="./../base/base.html"/>
             
 <%def name="title()">
     ${_('Repository not found')}
 </%def>
 
 <%def name="breadcrumbs()">
 	${h.link_to(u'Home',h.url('hg_home'))}
 	 / 
 	${h.link_to(u'Admin',h.url('admin_home'))}
 </%def>
 
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="js()">
 
 </%def>
 <%def name="main()">
 
     <h2 class="no-link no-border">${_('Not Found')}</h2>
     <p class="normal">${_('The specified repository "%s" is unknown, sorry.') % c.repo_name}</p>
     <p class="normal">
     <a href="${h.url('new_repo',repo=c.repo_name_cleaned)}">
     ${_('Create "%s" repository as %s' % (c.repo_name,c.repo_name_cleaned))}</a>
 
     </p>
     <p class="normal">${h.link_to(_('Go back to the main repository list page'),h.url('hg_home'))}</p>
     <div class="page-footer">
     </div>
 </%def>
  No newline at end of file

pylons_app/templates/index.html

@@ -1,56 +1,53 b''
 ## -*- coding: utf-8 -*-
-<%!
-from pylons_app.lib import filters
-%>
 <%inherit file="base/base.html"/>
 <%def name="title()">
     ${c.repos_prefix} Mercurial Repositories
 </%def>
 <%def name="breadcrumbs()">
 	${c.repos_prefix} Mercurial Repositories
 </%def>
 <%def name="page_nav()">
 	${self.menu('home')}
 </%def>
 <%def name="main()">
 	<%def name="get_sort(name)">
 		<%name_slug = name.lower().replace(' ','_') %>
 		%if name_slug == c.cs_slug:
 			<span style="font-weight: bold;text-decoration: underline;">${name}</span>
 		%else:
 			<span style="font-weight: bold">${name}</span>
 		%endif
 		<a style="color:#FFF" href="?sort=${name_slug}">&darr;</a>
 		<a style="color:#FFF" href="?sort=-${name_slug}">&uarr;</a>
 	</%def>
 	<table class="table_disp">
 	  <tr class="header">
 	    <td>${get_sort(_('Name'))}</td>
 	    <td>${get_sort(_('Description'))}</td>
 	    <td>${get_sort(_('Last change'))}</td>
 	    <td>${get_sort(_('Tip'))}</td>
 	    <td>${get_sort(_('Contact'))}</td>
 	    <td>${_('RSS')}</td>
 	    <td>${_('Atom')}</td>
 	  </tr>	
 	%for cnt,repo in enumerate(c.repos_list):
  		<tr class="parity${cnt%2}">
 		    <td>${h.link_to(repo['name'],
 		    	h.url('summary_home',repo_name=repo['name']))}</td>
 		    <td title="${repo['description']}">${h.truncate(repo['description'],60)}</td>
-	        <td>${repo['last_change']|n,filters.age}</td>
+	        <td>${h.age(repo['last_change'])}</td>
 	        <td>${h.link_to('r%s:%s' % (repo['rev'],repo['tip']),
 		        h.url('changeset_home',repo_name=repo['name'],revision=repo['tip']),
 	        	class_="tooltip",
 		    	tooltip_title=h.tooltip(repo['last_msg']))}</td>
-	        <td title="${repo['contact']}">${repo['contact']|n,filters.person}</td>
+	        <td title="${repo['contact']}">${h.person(repo['contact'])}</td>
 			<td>
 				<a title="${_('Subscribe to %s rss feed')%repo['name']}" class="rss_logo"  href="${h.url('rss_feed_home',repo_name=repo['name'])}"></a>
 			</td>        
 			<td>
 				<a title="${_('Subscribe to %s atom feed')%repo['name']}"  class="atom_logo" href="${h.url('atom_feed_home',repo_name=repo['name'])}"></a>
 			</td>
 		</tr>
 	%endfor
 	</table>
 </%def>    

pylons_app/templates/login.html

@@ -1,40 +1,37 b''
 ## -*- coding: utf-8 -*-
-<%!
-from pylons_app.lib import filters
-%>
 <%inherit file="base/base.html"/>
 <%def name="title()">
     ${c.repos_prefix} Mercurial Repositories
 </%def>
 <%def name="breadcrumbs()">
 	${c.repos_prefix} Mercurial Repositories
 </%def>
 <%def name="page_nav()">
 	${self.menu('home')}
 </%def>
 <%def name="main()">
         <div>
         <br />
         <h2>${_('Login')}</h2>
         ${h.form(h.url.current())}
         <table>
             <tr>
                 <td>${_('Username')}</td>
                 <td>${h.text('username')}</td>
                 <td>${self.get_form_error('username')}</td>
             </tr>
             <tr>
                 <td>${_('Password')}</td>
                 <td>${h.password('password')}</td>
                 <td>${self.get_form_error('password')}</td> 
             </tr>
             <tr>
                 <td></td>
                 <td>${h.submit('login','login')}</td>
             </tr>            
         </table>
         ${h.end_form()}
         </div>
 </%def>    
 
 

pylons_app/templates/shortlog/shortlog_data.html

@@ -1,62 +1,64 b''
 ## -*- coding: utf-8 -*-
-<%!
-from pylons_app.lib import filters
-%>
+% if c.repo_changesets:
+
 <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>${h.age(cs._ctx.date())}</td>
+		<td title="${cs.author}">${h.person(cs.author)}</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.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
+	</div>	
+%else:
+	${_('There are no commits yet')}
+%endif
  No newline at end of file

pylons_app/templates/summary/summary.html

@@ -1,162 +1,71 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()">
 	${self.menu('summary')}    
 </%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>
+        <dd>${h.age(c.repo_info.last_change)} - ${h.rfc822date(c.repo_info.last_change)}</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(_('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}:${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>
+	<%include file='../shortlog/shortlog_data.html'/>
 
     <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>
+	<%include file='../tags/tags_data.html'/>
 
     <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>
+	<%include file='../branches/branches_data.html'/>
 
 </%def>    
  No newline at end of file

pylons_app/templates/tags/tags.html

@@ -1,47 +1,20 b''
 <%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 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>
+	<%include file='tags_data.html'/>
 
 </%def>    
  No newline at end of file