Mercurial > kallithea
changeset 5284:5d161c096260
helpers: drop h.tooltip
h.tooltip did more magic in the past - now it just did a douple (or triple?)
escape of html.
c9cfaeb1cdfe removed most of the need for double escaping - and the places
where it is used, it must be 'tagged' with the safe-html-title class. Thus,
none of the remaining uses of h.tooltip are relevant (and might even be wrong);
normal automatic template escaping is just fine.
This is mostly:
sed -i 's,title="\${h.tooltip(\([^}]*\))}",title="${\1}",g' `hg mani`
line wrap: on
line diff
--- a/kallithea/lib/helpers.py Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/lib/helpers.py Thu Jul 23 00:52:29 2015 +0200 @@ -148,21 +148,6 @@ get_error = _GetError() -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: - """ - tooltip_title = escape(tooltip_title) - tooltip_title = tooltip_title.replace('<', '<').replace('>', '>') - return tooltip_title -tooltip = _ToolTip() - - class _FilesBreadCrumbs(object): def __call__(self, repo_name, rev, paths):
--- a/kallithea/templates/admin/admin.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/admin/admin.html Thu Jul 23 00:52:29 2015 +0200 @@ -8,7 +8,7 @@ <%def name="breadcrumbs_links()"> <form id="filter_form"> <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('journal filter...')}"/> - <span class="tooltip" title="${h.tooltip(h.journal_filter_help())}">?</span> + <span class="tooltip" title="${h.journal_filter_help()}">?</span> <input type='submit' value="${_('Filter')}" class="btn btn-mini" style="padding:0px 2px 0px 2px;margin:0px"/> ${_('Admin Journal')} - ${ungettext('%s Entry', '%s Entries', c.users_log.item_count) % (c.users_log.item_count)} </form>
--- a/kallithea/templates/admin/permissions/permissions_globals.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/admin/permissions/permissions_globals.html Thu Jul 23 00:52:29 2015 +0200 @@ -22,7 +22,7 @@ ${h.checkbox('overwrite_default_repo','true')} <label for="overwrite_default_repo"> <span class="tooltip" - title="${h.tooltip(_('All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost'))}"> + title="${_('All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost')}"> ${_('Apply to all existing repositories')}</span> </label> <span class="help-block">${_('Permissions for the Default user on new repositories.')}</span> </div> @@ -36,7 +36,7 @@ ${h.checkbox('overwrite_default_group','true')} <label for="overwrite_default_group"> <span class="tooltip" - title="${h.tooltip(_('All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost'))}"> + title="${_('All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost')}"> ${_('Apply to all existing repository groups')}</span> </label> <span class="help-block">${_('Permissions for the Default user on new repository groups.')}</span> </div> @@ -50,7 +50,7 @@ ${h.checkbox('overwrite_default_user_group','true')} <label for="overwrite_default_user_group"> <span class="tooltip" - title="${h.tooltip(_('All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost'))}"> + title="${_('All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost')}"> ${_('Apply to all existing user groups')}</span></label> <span class="help-block">${_('Permissions for the Default user on new user groups.')}</span> </div>
--- a/kallithea/templates/admin/settings/settings_vcs.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/admin/settings/settings_vcs.html Thu Jul 23 00:52:29 2015 +0200 @@ -66,7 +66,7 @@ <div class="input"> ${h.text('paths_root_path',size=60,readonly="readonly", class_="disabled")} <span id="path_unlock" class="tooltip" style="cursor: pointer" - title="${h.tooltip(_('Click to unlock. You must restart Kallithea in order to make this setting take effect.'))}"> + title="${_('Click to unlock. You must restart Kallithea in order to make this setting take effect.')}"> <div class="btn btn-small"><i id="path_unlock_icon" class="icon-lock"></i></div> </span> <span class="help-block">${_('Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required.')}</span>
--- a/kallithea/templates/bookmarks/bookmarks_data.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/bookmarks/bookmarks_data.html Thu Jul 23 00:52:29 2015 +0200 @@ -23,7 +23,7 @@ </span> </td> <td>${book[1]._timestamp}</td> - <td><span class="tooltip" title="${h.tooltip(h.age(book[1].date))}">${h.fmt_date(book[1].date)}</span></td> + <td><span class="tooltip" title="${h.age(book[1].date)}">${h.fmt_date(book[1].date)}</span></td> <td title="${book[1].author}">${h.person(book[1].author)}</td> <td>${book[1].revision}</td> <td>
--- a/kallithea/templates/branches/branches_data.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/branches/branches_data.html Thu Jul 23 00:52:29 2015 +0200 @@ -24,7 +24,7 @@ </span> </td> <td>${branch[1]._timestamp}</td> - <td><span class="tooltip" title="${h.tooltip(h.age(branch[1].date))}">${h.fmt_date(branch[1].date)}</span></td> + <td><span class="tooltip" title="${h.age(branch[1].date)}">${h.fmt_date(branch[1].date)}</span></td> <td title="${branch[1].author}">${h.person(branch[1].author)}</td> <td>${branch[1].revision}</td> <td> @@ -51,7 +51,7 @@ </span> </td> <td>${branch[1]._timestamp}</td> - <td><span class="tooltip" title="${h.tooltip(h.age(branch[1].date))}">${h.fmt_date(branch[1].date)}</span></td> + <td><span class="tooltip" title="${h.age(branch[1].date)}">${h.fmt_date(branch[1].date)}</span></td> <td title="${branch[1].author}">${h.person(branch[1].author)}</td> <td>${branch[1].revision}</td> <td>
--- a/kallithea/templates/changelog/changelog_details.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/changelog/changelog_details.html Thu Jul 23 00:52:29 2015 +0200 @@ -1,11 +1,11 @@ ## small box that displays changed/added/removed details fetched by AJAX % if len(c.cs.affected_files) <= c.affected_files_cut_off: -<span class="removed tooltip" title="<b>${h.tooltip(_('Removed'))}</b>${h.changed_tooltip(c.cs.removed)}">${len(c.cs.removed)}</span> -<span class="changed tooltip" title="<b>${h.tooltip(_('Changed'))}</b>${h.changed_tooltip(c.cs.changed)}">${len(c.cs.changed)}</span> -<span class="added tooltip" title="<b>${h.tooltip(_('Added'))}</b>${h.changed_tooltip(c.cs.added)}">${len(c.cs.added)}</span> +<span class="removed tooltip" title="<b>${_('Removed')}</b>${h.changed_tooltip(c.cs.removed)}">${len(c.cs.removed)}</span> +<span class="changed tooltip" title="<b>${_('Changed')}</b>${h.changed_tooltip(c.cs.changed)}">${len(c.cs.changed)}</span> +<span class="added tooltip" title="<b>${_('Added')}</b>${h.changed_tooltip(c.cs.added)}">${len(c.cs.added)}</span> % else: - <span class="removed tooltip" title="${h.tooltip(_('Affected %s files') % len(c.cs.affected_files))}">!</span> - <span class="changed tooltip" title="${h.tooltip(_('Affected %s files') % len(c.cs.affected_files))}">!</span> - <span class="added tooltip" title="${h.tooltip(_('Affected %s files') % len(c.cs.affected_files))}">!</span> + <span class="removed tooltip" title="${_('Affected %s files') % len(c.cs.affected_files)}">!</span> + <span class="changed tooltip" title="${_('Affected %s files') % len(c.cs.affected_files)}">!</span> + <span class="added tooltip" title="${_('Affected %s files') % len(c.cs.affected_files)}">!</span> % endif
--- a/kallithea/templates/changelog/changelog_summary_data.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/changelog/changelog_summary_data.html Thu Jul 23 00:52:29 2015 +0200 @@ -44,7 +44,7 @@ <td> ${h.urlify_commit(h.chop_at(cs.message,'\n'),c.repo_name, h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))} </td> - <td><span class="tooltip" title="${h.tooltip(h.fmt_date(cs.date))}"> + <td><span class="tooltip" title="${h.fmt_date(cs.date)}"> ${h.age(cs.date)}</span> </td> <td title="${cs.author}">${h.person(cs.author)}</td>
--- a/kallithea/templates/changeset/changeset.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/changeset/changeset.html Thu Jul 23 00:52:29 2015 +0200 @@ -51,13 +51,13 @@ %endif </div> <div class="diff-actions"> - <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" class="tooltip" title="${h.tooltip(_('Raw diff'))}"> + <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" class="tooltip" title="${_('Raw diff')}"> <i class="icon-diff"></i> </a> - <a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" class="tooltip" title="${h.tooltip(_('Patch diff'))}"> + <a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" class="tooltip" title="${_('Patch diff')}"> <i class="icon-file-powerpoint"></i> </a> - <a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}"> + <a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" class="tooltip" title="${_('Download diff')}"> <i class="icon-floppy"></i> </a> ${c.ignorews_url(request.GET)}
--- a/kallithea/templates/changeset/changeset_range.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/changeset/changeset_range.html Thu Jul 23 00:52:29 2015 +0200 @@ -45,7 +45,7 @@ <td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td> <td> %if c.statuses: - <div title="${h.tooltip(_('Changeset status'))}" class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[cnt]}"></i></div> + <div title="${_('Changeset status')}" class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[cnt]}"></i></div> %endif </td> <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td> @@ -78,7 +78,7 @@ ##${comment.comment_inline_form(cs)} ## diff block <div class="h3"> - <a class="tooltip" title="${h.tooltip(cs.message)}" href="${h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a> + <a class="tooltip" title="${cs.message}" href="${h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a> <div class="gravatar"> ${h.gravatar(h.email_or_none(cs.author), size=20)} </div>
--- a/kallithea/templates/changeset/diff_block.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/changeset/diff_block.html Thu Jul 23 00:52:29 2015 +0200 @@ -18,16 +18,16 @@ revision=cs2,f_path=h.safe_unicode(path)))} </div> <div class="diff-actions"> - <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full diff for this file'))}"> + <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full diff for this file')}"> <i class="icon-file-code"></i> </a> - <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full side-by-side diff for this file'))}"> + <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full side-by-side diff for this file')}"> <i class="icon-docs"></i> </a> - <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='raw')}" class="tooltip" title="${h.tooltip(_('Raw diff'))}"> + <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='raw')}" class="tooltip" title="${_('Raw diff')}"> <i class="icon-diff"></i> </a> - <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}"> + <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='download')}" class="tooltip" title="${_('Download diff')}"> <i class="icon-floppy"></i> </a> ${c.ignorews_url(request.GET, h.FID(cs2,path))} @@ -96,7 +96,7 @@ %endif </div> <div class="diff-actions"> - <a href="${h.url('files_diff_2way_home',repo_name=c.cs_repo.repo_name,f_path=h.safe_unicode(filenode_path),diff1=c.a_rev,diff2=c.cs_rev,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full side-by-side diff for this file'))}"> + <a href="${h.url('files_diff_2way_home',repo_name=c.cs_repo.repo_name,f_path=h.safe_unicode(filenode_path),diff1=c.a_rev,diff2=c.cs_rev,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full side-by-side diff for this file')}"> <i class="icon-docs"></i> </a> ${c.ignorews_url(request.GET)}
--- a/kallithea/templates/compare/compare_cs.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/compare/compare_cs.html Thu Jul 23 00:52:29 2015 +0200 @@ -51,7 +51,7 @@ ${index} </span> </td> - <td style="width: 140px"><span class="tooltip" title="${h.tooltip(h.age(cs.date))}">${cs.date}</span></td> + <td style="width: 140px"><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td> <td><div class="gravatar" commit_id="${cs.raw_id}">${h.gravatar(h.email_or_none(cs.author), size=14)}</div></td> <td><div class="author">${h.person(cs.author)}</div></td> <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>
--- a/kallithea/templates/data_table/_dt_elements.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/data_table/_dt_elements.html Thu Jul 23 00:52:29 2015 +0200 @@ -87,7 +87,7 @@ </%def> <%def name="last_change(last_change)"> - <span class="tooltip" date="${last_change}" title="${h.tooltip(h.fmt_date(last_change))}">${h.age(last_change)}</span> + <span class="tooltip" date="${last_change}" title="${h.fmt_date(last_change)}">${h.age(last_change)}</span> </%def> <%def name="revision(name,rev,tip,author,last_msg)">
--- a/kallithea/templates/files/diff_2way.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/files/diff_2way.html Thu Jul 23 00:52:29 2015 +0200 @@ -40,16 +40,16 @@ revision=c.cs2.raw_id,f_path=h.safe_unicode(c.node1.path)))} </div> <div class="diff-actions"> - <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full diff for this file'))}"> + <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full diff for this file')}"> <i class="icon-file-code"></i> </a> - <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full side-by-side diff for this file'))}"> + <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full side-by-side diff for this file')}"> <i class="icon-docs"></i> </a> - <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='raw')}" class="tooltip" title="${h.tooltip(_('Raw diff'))}"> + <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='raw')}" class="tooltip" title="${_('Raw diff')}"> <i class="icon-diff"></i> </a> - <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}"> + <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='download')}" class="tooltip" title="${_('Download diff')}"> <i class="icon-floppy"></i> </a> ${h.checkbox('ignorews', label=_('Ignore whitespace'))}
--- a/kallithea/templates/files/files_browser.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/files/files_browser.html Thu Jul 23 00:52:29 2015 +0200 @@ -90,12 +90,12 @@ </td> <td> %if node.is_file(): - <a title="${h.tooltip(node.last_changeset.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=node.last_changeset.raw_id)}" class="tooltip revision-link">${h.show_id(node.last_changeset)}</a> + <a title="${node.last_changeset.message}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=node.last_changeset.raw_id)}" class="tooltip revision-link">${h.show_id(node.last_changeset)}</a> %endif </td> <td> %if node.is_file(): - <span class="tooltip" title="${h.tooltip(h.fmt_date(node.last_changeset.date))}"> + <span class="tooltip" title="${h.fmt_date(node.last_changeset.date)}"> ${h.age(node.last_changeset.date)}</span> %endif </td>
--- a/kallithea/templates/files/files_history_box.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/files/files_history_box.html Thu Jul 23 00:52:29 2015 +0200 @@ -1,7 +1,7 @@ <div class="file_author" style="clear:both"> <div class="item">${h.literal(ungettext(u'%s author',u'%s authors',len(c.authors)) % ('<b>%s</b>' % len(c.authors))) }</div> %for email, user in c.authors: - <div class="contributor tooltip" style="float:left" title="${h.tooltip(user)}"> + <div class="contributor tooltip" style="float:left" title="${user}"> <div class="gravatar" style="margin:1px"> ${h.gravatar(email, size=20)} </div>
--- a/kallithea/templates/files/files_source.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/files/files_source.html Thu Jul 23 00:52:29 2015 +0200 @@ -22,7 +22,7 @@ <div class="code-header"> <div class="stats"> <div class="left img"><i class="icon-doc-inv"></i></div> - <div class="left item"><pre class="tooltip" title="${h.tooltip(h.fmt_date(c.file_changeset.date))}">${h.link_to(h.show_id(c.file_changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id))}</pre></div> + <div class="left item"><pre class="tooltip" title="${h.fmt_date(c.file_changeset.date)}">${h.link_to(h.show_id(c.file_changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id))}</pre></div> <div class="left item"><pre>${h.format_byte_size(c.file.size,binary=True)}</pre></div> <div class="left item last"><pre>${c.file.mimetype}</pre></div> <div class="buttons">
--- a/kallithea/templates/followers/followers_data.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/followers/followers_data.html Thu Jul 23 00:52:29 2015 +0200 @@ -10,7 +10,7 @@ </div> <div style="clear:both;padding-top: 10px"></div> <div class="follower_date">${_('Started following -')} - <span class="tooltip" title="${h.tooltip(f.follows_from)}"> ${h.age(f.follows_from)}</span></div> + <span class="tooltip" title="${f.follows_from}"> ${h.age(f.follows_from)}</span></div> <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div> </div> % endfor
--- a/kallithea/templates/forks/forks_data.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/forks/forks_data.html Thu Jul 23 00:52:29 2015 +0200 @@ -15,7 +15,7 @@ </div> <div style="clear:both;padding-top: 10px"></div> <div class="follower_date">${_('Forked')} - - <span class="tooltip" title="${h.tooltip(h.fmt_date(f.created_on))}"> ${h.age(f.created_on)}</span> + <span class="tooltip" title="${h.fmt_date(f.created_on)}"> ${h.age(f.created_on)}</span> <a title="${_('Compare fork with %s' % c.repo_name)}" href="${h.url('compare_url',repo_name=c.repo_name, org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=f.repo_name,other_ref_type=c.db_repo.landing_rev[0],other_ref_name=c.db_repo.landing_rev[1], merge=1)}" class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare Fork')}</a>
--- a/kallithea/templates/journal/journal.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/journal/journal.html Thu Jul 23 00:52:29 2015 +0200 @@ -7,7 +7,7 @@ <h5> <form id="filter_form"> <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('quick filter...')}"/> - <span class="tooltip" title="${h.tooltip(h.journal_filter_help())}">?</span> + <span class="tooltip" title="${h.journal_filter_help()}">?</span> <input type='submit' value="${_('Filter')}" class="btn btn-small" style="padding:0px 2px 0px 2px;margin:0px"/> ${_('Journal')} - ${ungettext('%s Entry', '%s Entries', c.journal_pager.item_count) % (c.journal_pager.item_count)} </form>
--- a/kallithea/templates/journal/journal_data.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/journal/journal_data.html Thu Jul 23 00:52:29 2015 +0200 @@ -28,7 +28,7 @@ </span> </div> <div class="journal_action_params">${h.literal(h.action_parser(entry)[1]())}</div> - <div class="date"><span class="tooltip" title="${h.tooltip(h.fmt_date(entry.action_date))}">${h.age(entry.action_date)}</span></div> + <div class="date"><span class="tooltip" title="${h.fmt_date(entry.action_date)}">${h.age(entry.action_date)}</span></div> %endfor </div> </div>
--- a/kallithea/templates/pullrequests/pullrequest_data.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_data.html Thu Jul 23 00:52:29 2015 +0200 @@ -61,7 +61,7 @@ ${pr.author.full_name_and_username} </td> <td> - <span class="tooltip" title="${h.tooltip(h.fmt_date(pr.created_on))}"> + <span class="tooltip" title="${h.fmt_date(pr.created_on)}"> ${h.age(pr.created_on)} </span> </td>
--- a/kallithea/templates/pullrequests/pullrequest_show.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Thu Jul 23 00:52:29 2015 +0200 @@ -94,7 +94,7 @@ </div> <div class="input"> % if len(c.pull_request_pending_reviewers) > 0: - <div class="tooltip" title="${h.tooltip(', '.join([x.username for x in c.pull_request_pending_reviewers]))}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div> + <div class="tooltip" title="${', '.join([x.username for x in c.pull_request_pending_reviewers])}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div> % elif len(c.pull_request_reviewers) > 0: <div>${_('Pull request was reviewed by all reviewers')}</div> %else: @@ -217,7 +217,7 @@ ## If you change something here it should be reflected in the template too. <li id="reviewer_${member.user_id}"> <div class="reviewers_member"> - <div class="reviewer_status tooltip" title="${h.tooltip(h.changeset_status_lbl(status.status if status else 'not_reviewed'))}"> + <div class="reviewer_status tooltip" title="${h.changeset_status_lbl(status.status if status else 'not_reviewed')}"> <i class="icon-circle changeset-status-${status.status if status else 'not_reviewed'}"></i> </div> <div class="reviewer_gravatar gravatar">
--- a/kallithea/templates/summary/summary.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/summary/summary.html Thu Jul 23 00:52:29 2015 +0200 @@ -122,7 +122,7 @@ ${h.hidden('download_options')} <span style="vertical-align: bottom"> <input id="archive_subrepos" type="checkbox" name="subrepos" /> - <label for="archive_subrepos" class="tooltip" title="${h.tooltip(_('Check this to download archive with subrepos'))}" >${_('With subrepos')}</label> + <label for="archive_subrepos" class="tooltip" title="${_('Check this to download archive with subrepos')}" >${_('With subrepos')}</label> </span> %endif </div>
--- a/kallithea/templates/tags/tags_data.html Thu Jul 23 00:52:29 2015 +0200 +++ b/kallithea/templates/tags/tags_data.html Thu Jul 23 00:52:29 2015 +0200 @@ -24,7 +24,7 @@ </span> </td> <td>${tag[1]._timestamp}</td> - <td><span class="tooltip" title="${h.tooltip(h.age(tag[1].date))}">${h.fmt_date(tag[1].date)}</span></td> + <td><span class="tooltip" title="${h.age(tag[1].date)}">${h.fmt_date(tag[1].date)}</span></td> <td title="${tag[1].author}">${h.person(tag[1].author)}</td> <td>${tag[1].revision}</td> <td>