diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -108,7 +108,7 @@ class _GetError(object): def __call__(self, field_name, form_errors): tmpl = """%s""" - if form_errors and form_errors.has_key(field_name): + if form_errors and field_name in form_errors: return literal(tmpl % form_errors.get(field_name)) get_error = _GetError() @@ -117,12 +117,15 @@ get_error = _GetError() class _ToolTip(object): def __call__(self, tooltip_title, trim_at=50): - """Special function just to wrap our text into nice formatted + """ + Special function just to wrap our text into nice formatted autowrapped text :param tooltip_title: """ - return escape(tooltip_title) + tooltip_title = escape(tooltip_title) + tooltip_title = tooltip_title.replace('<', '<').replace('>', '>') + return tooltip_title tooltip = _ToolTip() @@ -349,7 +352,7 @@ def fmt_date(date): if date: return (date.strftime(_(u"%a, %d %b %Y %H:%M:%S").encode('utf8')) .decode('utf8')) - + return "" diff --git a/rhodecode/templates/admin/repos/repos.html b/rhodecode/templates/admin/repos/repos.html --- a/rhodecode/templates/admin/repos/repos.html +++ b/rhodecode/templates/admin/repos/repos.html @@ -56,7 +56,7 @@ ##LAST CHANGE - ${h.age(repo['last_change'])} + ${h.age(repo['last_change'])} ##LAST REVISION diff --git a/rhodecode/templates/admin/users_groups/users_groups.html b/rhodecode/templates/admin/users_groups/users_groups.html --- a/rhodecode/templates/admin/users_groups/users_groups.html +++ b/rhodecode/templates/admin/users_groups/users_groups.html @@ -37,7 +37,7 @@ %for cnt,u_group in enumerate(c.users_groups_list): ${h.link_to(u_group.users_group_name,h.url('edit_users_group', id=u_group.users_group_id))} - ${len(u_group.members)} + ${len(u_group.members)} ${h.bool2icon(u_group.users_group_active)} ${h.form(url('users_group', id=u_group.users_group_id),method='delete')} diff --git a/rhodecode/templates/bookmarks/bookmarks_data.html b/rhodecode/templates/bookmarks/bookmarks_data.html --- a/rhodecode/templates/bookmarks/bookmarks_data.html +++ b/rhodecode/templates/bookmarks/bookmarks_data.html @@ -17,7 +17,7 @@ h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id))} - ${h.fmt_date(book[1].date)} + ${h.fmt_date(book[1].date)} ${h.person(book[1].author)}
diff --git a/rhodecode/templates/branches/branches_data.html b/rhodecode/templates/branches/branches_data.html --- a/rhodecode/templates/branches/branches_data.html +++ b/rhodecode/templates/branches/branches_data.html @@ -17,7 +17,7 @@ h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id))} - ${h.fmt_date(branch[1].date)} + ${h.fmt_date(branch[1].date)} ${h.person(branch[1].author)}
@@ -35,7 +35,7 @@ h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))} - ${h.fmt_date(branch[1].date)} + ${h.fmt_date(branch[1].date)} ${h.person(branch[1].author)}
diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html --- a/rhodecode/templates/changelog/changelog.html +++ b/rhodecode/templates/changelog/changelog.html @@ -49,7 +49,7 @@ ${_('%s Changelog') % c.repo_name} - ${c
${h.checkbox(cs.short_id,class_="changeset_range")} - ${cs.revision}:${h.short_id(cs.raw_id)} + ${cs.revision}:${h.short_id(cs.raw_id)}
@@ -65,7 +65,7 @@ ${_('%s Changelog') % c.repo_name} - ${c
-
${len(cs.affected_files)}
+
${len(cs.affected_files)}
%if len(c.comments.get(cs.raw_id,[])) > 0:
diff --git a/rhodecode/templates/changelog/changelog_details.html b/rhodecode/templates/changelog/changelog_details.html --- a/rhodecode/templates/changelog/changelog_details.html +++ b/rhodecode/templates/changelog/changelog_details.html @@ -1,9 +1,9 @@ % if len(c.cs.affected_files) <= c.affected_files_cut_off: -${len(c.cs.removed)} -${len(c.cs.changed)} -${len(c.cs.added)} +${len(c.cs.removed)} +${len(c.cs.changed)} +${len(c.cs.added)} % else: - ! - ! - ! + ! + ! + ! % endif diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html --- a/rhodecode/templates/changeset/changeset.html +++ b/rhodecode/templates/changeset/changeset.html @@ -34,8 +34,8 @@ ${h.fmt_date(c.changeset.date)}
- - + + ${c.ignorews_url(request.GET)} ${c.context_url(request.GET)}
diff --git a/rhodecode/templates/changeset/changeset_file_comment.html b/rhodecode/templates/changeset/changeset_file_comment.html --- a/rhodecode/templates/changeset/changeset_file_comment.html +++ b/rhodecode/templates/changeset/changeset_file_comment.html @@ -36,9 +36,12 @@ ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=changeset.raw_id),class_='inline-form')}
${_('Commenting on line {1}.')} - ${(_('Comments parsed using %s syntax with %s support.') % (('RST' % h.url('rst_help')), - '@mention' % - _('Use @username inside this text to send notification to this RhodeCode user')))|n} + ${(_('Comments parsed using %s syntax with %s support.') % ( + ('RST' % h.url('rst_help')), + ('@mention' % _('Use @username inside this text to send notification to this RhodeCode user')) + ) + )|n + }
diff --git a/rhodecode/templates/changeset/changeset_range.html b/rhodecode/templates/changeset/changeset_range.html --- a/rhodecode/templates/changeset/changeset_range.html +++ b/rhodecode/templates/changeset/changeset_range.html @@ -40,7 +40,7 @@
gravatar
${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
${h.person(cs.author)}
- ${h.fmt_date(cs.date)} + ${h.fmt_date(cs.date)}
${h.urlify_commit(cs.message, c.repo_name)}
%endfor diff --git a/rhodecode/templates/changeset/diff_block.html b/rhodecode/templates/changeset/diff_block.html --- a/rhodecode/templates/changeset/diff_block.html +++ b/rhodecode/templates/changeset/diff_block.html @@ -16,9 +16,9 @@ revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))}
- - - + + + ${c.ignorews_url(request.GET, h.FID(filenode.changeset.raw_id,filenode.path))} ${c.context_url(request.GET, h.FID(filenode.changeset.raw_id,filenode.path))}
diff --git a/rhodecode/templates/files/files_browser.html b/rhodecode/templates/files/files_browser.html --- a/rhodecode/templates/files/files_browser.html +++ b/rhodecode/templates/files/files_browser.html @@ -88,14 +88,14 @@ %if node.is_file(): -
+ 
${'r%s:%s' % (node.last_changeset.revision,node.last_changeset.short_id)}
%endif %if node.is_file(): - + ${h.age(node.last_changeset.date)} %endif diff --git a/rhodecode/templates/files/files_source.html b/rhodecode/templates/files/files_source.html --- a/rhodecode/templates/files/files_source.html +++ b/rhodecode/templates/files/files_source.html @@ -16,7 +16,7 @@
- 
${h.link_to("r%s:%s" % (c.file.changeset.revision,h.short_id(c.file.changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}
+ 
${h.link_to("r%s:%s" % (c.file.changeset.revision,h.short_id(c.file.changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}
${h.format_byte_size(c.file.size,binary=True)}
${c.file.mimetype}
diff --git a/rhodecode/templates/followers/followers_data.html b/rhodecode/templates/followers/followers_data.html --- a/rhodecode/templates/followers/followers_data.html +++ b/rhodecode/templates/followers/followers_data.html @@ -10,7 +10,7 @@
${_('Started following -')} - ${h.age(f.follows_from)}
+ ${h.age(f.follows_from)}
% endfor diff --git a/rhodecode/templates/forks/forks_data.html b/rhodecode/templates/forks/forks_data.html --- a/rhodecode/templates/forks/forks_data.html +++ b/rhodecode/templates/forks/forks_data.html @@ -15,7 +15,7 @@
${_('forked')} - - ${h.age(f.created_on)}
+ ${h.age(f.created_on)}
% endfor diff --git a/rhodecode/templates/index_base.html b/rhodecode/templates/index_base.html --- a/rhodecode/templates/index_base.html +++ b/rhodecode/templates/index_base.html @@ -89,7 +89,7 @@ ##LAST CHANGE DATE - ${h.age(repo['last_change'])} + ${h.age(repo['last_change'])} ##LAST REVISION diff --git a/rhodecode/templates/journal/journal_data.html b/rhodecode/templates/journal/journal_data.html --- a/rhodecode/templates/journal/journal_data.html +++ b/rhodecode/templates/journal/journal_data.html @@ -24,7 +24,7 @@
${h.literal(h.action_parser(entry)[1]())}
-
${h.age(entry.action_date)}
+
${h.age(entry.action_date)}
%endfor
diff --git a/rhodecode/templates/shortlog/shortlog_data.html b/rhodecode/templates/shortlog/shortlog_data.html --- a/rhodecode/templates/shortlog/shortlog_data.html +++ b/rhodecode/templates/shortlog/shortlog_data.html @@ -19,7 +19,7 @@ h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id), title=cs.message)} - + ${h.age(cs.date)} ${h.person(cs.author)} diff --git a/rhodecode/templates/summary/summary.html b/rhodecode/templates/summary/summary.html --- a/rhodecode/templates/summary/summary.html +++ b/rhodecode/templates/summary/summary.html @@ -166,7 +166,7 @@ ${h.link_to(_('Download as zip'), h.url('files_archive_home',repo_name=c.dbrepo.repo_name,fname='tip.zip'),class_="archive_icon ui-btn")} - + %endif
diff --git a/rhodecode/templates/tags/tags_data.html b/rhodecode/templates/tags/tags_data.html --- a/rhodecode/templates/tags/tags_data.html +++ b/rhodecode/templates/tags/tags_data.html @@ -18,7 +18,7 @@ - ${h.fmt_date(tag[1].date)} + ${h.fmt_date(tag[1].date)} ${h.person(tag[1].author)}
diff --git a/rhodecode/tests/functional/test_home.py b/rhodecode/tests/functional/test_home.py --- a/rhodecode/tests/functional/test_home.py +++ b/rhodecode/tests/functional/test_home.py @@ -18,5 +18,7 @@ class TestHomeController(TestController) """open.png"/>""") response.mustcontain( -"""r173:27cd5cce30c9""") +"""r173:27cd5cce30c9""" +)