Mercurial > kallithea
changeset 6294:c40e567e4b82
style: use Bootstrap compatible data-toggle="tooltip" markup
Based on work by Dominik Ruf and Andrew Shadura.
line wrap: on
line diff
--- a/kallithea/lib/helpers.py Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/lib/helpers.py Tue Nov 08 23:29:12 2016 +0100 @@ -321,8 +321,9 @@ url('changeset_home', repo_name=repo_name, revision=changeset.raw_id), style=get_color_string(changeset.raw_id), - class_='tooltip safe-html-title', - title=tooltip_html + class_='safe-html-title', + title=tooltip_html, + **{'data-toggle': 'tooltip'} ) uri += '\n' @@ -612,7 +613,7 @@ _rev = '%s...%s' % (_name1, _name2) compare_view = ( - ' <div class="compare_view tooltip" title="%s">' + ' <div class="compare_view" data-toggle="tooltip" title="%s">' '<a href="%s">%s</a> </div>' % ( _('Show all combined changesets %s->%s') % ( revs_ids[0][:12], revs_ids[-1][:12]
--- a/kallithea/public/js/base.js Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/public/js/base.js Tue Nov 08 23:29:12 2016 +0100 @@ -499,7 +499,7 @@ $tipBox.css('position', 'absolute'); $tipBox.css('max-width', '600px'); - _activate_tooltip($('.tooltip')); + _activate_tooltip($('[data-toggle="tooltip"]')); }; var _show_tooltip = function(e, tipText, safe){ @@ -1313,7 +1313,7 @@ var element = ( ' <li id="reviewer_{2}">\n'+ ' <div class="reviewers_member">\n'+ - ' <div class="reviewer_status tooltip" title="not_reviewed">\n'+ + ' <div class="reviewer_status" data-toggle="tooltip" title="not_reviewed">\n'+ ' <i class="icon-circle changeset-status-not_reviewed"></i>\n'+ ' </div>\n'+ (gravatarelm ?
--- a/kallithea/templates/admin/admin.html Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/admin/admin.html Tue Nov 08 23:29:12 2016 +0100 @@ -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.journal_filter_help()}">?</span> + <span data-toggle="tooltip" title="${h.journal_filter_help()}">?</span> <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs"/> ${_('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 Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/admin/permissions/permissions_globals.html Tue Nov 08 23:29:12 2016 +0100 @@ -17,8 +17,8 @@ ${h.select('default_repo_perm','',c.repo_perms_choices)} ${h.checkbox('overwrite_default_repo','true')} <label for="overwrite_default_repo"> - <span class="tooltip" - title="${_('All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost')}"> + <span data-toggle="tooltip" + 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> @@ -29,8 +29,8 @@ ${h.select('default_group_perm','',c.group_perms_choices)} ${h.checkbox('overwrite_default_group','true')} <label for="overwrite_default_group"> - <span class="tooltip" - 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')}"> + <span data-toggle="tooltip" + 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> @@ -41,8 +41,8 @@ ${h.select('default_user_group_perm','',c.user_group_perms_choices)} ${h.checkbox('overwrite_default_user_group','true')} <label for="overwrite_default_user_group"> - <span class="tooltip" - 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')}"> + <span data-toggle="tooltip" + 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 Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_vcs.html Tue Nov 08 23:29:12 2016 +0100 @@ -46,7 +46,7 @@ <label class="control-label" for="paths_root_path">${_('Location of repositories')}:</label> <div class="input"> ${h.text('paths_root_path',size=60,readonly="readonly")} - <span id="path_unlock" class="tooltip" style="cursor: pointer" + <span id="path_unlock" data-toggle="tooltip" style="cursor: pointer" title="${_('Click to unlock. You must restart Kallithea in order to make this setting take effect.')}"> <div class="btn btn-default btn-sm"><i id="path_unlock_icon" class="icon-lock"></i></div> </span>
--- a/kallithea/templates/changelog/changelog.html Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/changelog/changelog.html Tue Nov 08 23:29:12 2016 +0100 @@ -89,11 +89,11 @@ %if c.statuses.get(cs.raw_id): <div class="changeset-status-ico"> %if c.statuses.get(cs.raw_id)[2]: - <a class="tooltip" title="${_('Changeset status: %s by %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username, c.statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"> + <a data-toggle="tooltip" title="${_('Changeset status: %s by %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username, c.statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"> <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i> </a> %else: - <a class="tooltip" title="${_('Changeset status: %s by %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username)}" + <a data-toggle="tooltip" title="${_('Changeset status: %s by %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username)}" href="${c.comments[cs.raw_id][0].url()}"> <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i> </a> @@ -103,13 +103,13 @@ </td> <td class="author"> ${h.gravatar(h.email_or_none(cs.author), size=16)} - <span title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span> + <span data-toggle="tooltip" title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span> </td> <td class="hash" style="width:${len(h.show_id(cs))*6.5}px"> ${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id), class_='changeset_hash')} </td> <td class="date"> - <div class="date tooltip" title="${h.fmt_date(cs.date)}">${h.age(cs.date,True)}</div> + <div class="date" data-toggle="tooltip" title="${h.fmt_date(cs.date)}">${h.age(cs.date,True)}</div> </td> <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}"> <i class="icon-align-left" style="color:#999"></i> @@ -120,7 +120,7 @@ <div class="extra-container"> %if c.comments.get(cs.raw_id): <div class="comments-container"> - <div class="comments-cnt" title="${_('Changeset has comments')}"> + <div class="comments-cnt" data-toggle="tooltip" title="${_('Changeset has comments')}"> <a href="${c.comments[cs.raw_id][0].url()}"> ${len(c.comments[cs.raw_id])} <i class="icon-comment-discussion"></i>
--- a/kallithea/templates/changelog/changelog_details.html Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/changelog/changelog_details.html Tue Nov 08 23:29:12 2016 +0100 @@ -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>${_('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> +<span class="removed" data-toggle="tooltip" title="<b>${_('Removed')}</b>${h.changed_tooltip(c.cs.removed)}">${len(c.cs.removed)}</span> +<span class="changed" data-toggle="tooltip" title="<b>${_('Changed')}</b>${h.changed_tooltip(c.cs.changed)}">${len(c.cs.changed)}</span> +<span class="added" data-toggle="tooltip" title="<b>${_('Added')}</b>${h.changed_tooltip(c.cs.added)}">${len(c.cs.added)}</span> % else: - <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> + <span class="removed" data-toggle="tooltip" title="${_('Affected %s files') % len(c.cs.affected_files)}">!</span> + <span class="changed" data-toggle="tooltip" title="${_('Affected %s files') % len(c.cs.affected_files)}">!</span> + <span class="added" data-toggle="tooltip" title="${_('Affected %s files') % len(c.cs.affected_files)}">!</span> % endif
--- a/kallithea/templates/changelog/changelog_summary_data.html Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/changelog/changelog_summary_data.html Tue Nov 08 23:29:12 2016 +0100 @@ -17,11 +17,11 @@ %if c.statuses.get(cs.raw_id): <span class="changeset-status-ico shortlog"> %if c.statuses.get(cs.raw_id)[2]: - <a class="tooltip" title="${_('Changeset status: %s by %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username, c.statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"> + <a data-toggle="tooltip" title="${_('Changeset status: %s by %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username, c.statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"> <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i> </a> %else: - <a class="tooltip" title="${_('Changeset status: %s by %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username)}" + <a data-toggle="tooltip" title="${_('Changeset status: %s by %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username)}" href="${c.comments[cs.raw_id][0].url()}"> <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i> </a> @@ -47,7 +47,7 @@ <td> ${h.urlify_text(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.fmt_date(cs.date)}"> + <td><span data-toggle="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 Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/changeset/changeset.html Tue Nov 08 23:29:12 2016 +0100 @@ -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="${_('Raw diff')}"> + <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" data-toggle="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="${_('Patch diff')}"> + <a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" data-toggle="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="${_('Download diff')}"> + <a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" data-toggle="tooltip" title="${_('Download diff')}"> <i class="icon-floppy"></i> </a> ${c.ignorews_url(request.GET)}
--- a/kallithea/templates/changeset/changeset_file_comment.html Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/changeset/changeset_file_comment.html Tue Nov 08 23:29:12 2016 +0100 @@ -55,7 +55,7 @@ ${h.form('#', class_='inline-form')} <div class="clearfix"> <div class="comment-help">${_('Commenting on line.')} - <span style="color:#577632" class="tooltip">${_('Comments are in plain text. Use @username inside this text to notify another user.')|n}</span> + <span style="color:#577632">${_('Comments are in plain text. Use @username inside this text to notify another user.')|n}</span> </div> <div class="mentions-container"></div> <textarea name="text" class="comment-block-ta yui-ac-input"></textarea>
--- a/kallithea/templates/changeset/changeset_range.html Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/changeset/changeset_range.html Tue Nov 08 23:29:12 2016 +0100 @@ -44,7 +44,7 @@ %endif <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td> <td><div class="author">${h.person(cs.author)}</div></td> - <td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td> + <td><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td> <td> %if c.statuses: <div title="${_('Changeset status')}" class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[cnt]}"></i></div> @@ -80,7 +80,7 @@ %for cs in c.cs_ranges: ## diff block <div class="h3"> - <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> + <a data-toggle="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> ${h.gravatar_div(h.email_or_none(cs.author), size=20)} <div class="right"> <span class="logtags">
--- a/kallithea/templates/changeset/diff_block.html Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/changeset/diff_block.html Tue Nov 08 23:29:12 2016 +0100 @@ -29,43 +29,43 @@ <div class="diff-actions"> <span style="margin: 0 10px"> %if op == 'A': - <span class="no-file tooltip" title="${_("No file before")}"> + <span class="no-file" data-toggle="tooltip" title="${_("No file before")}"> <i class="icon-minus-circled"></i></span> %else: - <a href="${h.url('files_home', repo_name=a_repo_name, f_path=a_filename, revision=a_rev)}" class="tooltip" title="${_("File before")}"> + <a href="${h.url('files_home', repo_name=a_repo_name, f_path=a_filename, revision=a_rev)}" data-toggle="tooltip" title="${_("File before")}"> <i class="icon-doc"></i></a> %endif %if op == 'A': - <span class="arrow tooltip" title="${_("Added")}">➞</span> + <span class="arrow" data-toggle="tooltip" title="${_("Added")}">➞</span> %elif op == 'M': - <span class="arrow tooltip" title="${_("Modified")}">➞</span> + <span class="arrow" data-toggle="tooltip" title="${_("Modified")}">➞</span> %elif op == 'D': - <span class="arrow tooltip" title="${_("Deleted")}">➞</span> + <span class="arrow" data-toggle="tooltip" title="${_("Deleted")}">➞</span> %elif op == 'R': - <span class="arrow tooltip" title="${_("Renamed")}">➞</span> + <span class="arrow" data-toggle="tooltip" title="${_("Renamed")}">➞</span> %elif op is None: - <span class="arrow tooltip" title="${_("No change")}">➞</span> + <span class="arrow" data-toggle="tooltip" title="${_("No change")}">➞</span> %else: - <span class="arrow tooltip" title="${_("Unknown operation: %r") % op}">➞</span> + <span class="arrow" data-toggle="tooltip" title="${_("Unknown operation: %r") % op}">➞</span> %endif %if op == 'D': - <span class="no-file tooltip" title="${_("No file after")}"> + <span class="no-file" data-toggle="tooltip" title="${_("No file after")}"> <i class="icon-minus-circled"></i></span> %else: - <a href="${h.url('files_home', repo_name=cs_repo_name, f_path=cs_filename, revision=cs_rev)}" class="tooltip" title="${_("File after")}"> + <a href="${h.url('files_home', repo_name=cs_repo_name, f_path=cs_filename, revision=cs_rev)}" data-toggle="tooltip" title="${_("File after")}"> <i class="icon-doc"></i></a> %endif </span> - <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=h.safe_unicode(cs_filename),diff2=cs_rev,diff1=a_rev,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full diff for this file')}"> + <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=h.safe_unicode(cs_filename),diff2=cs_rev,diff1=a_rev,diff='diff',fulldiff=1)}" data-toggle="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=cs_repo_name,f_path=h.safe_unicode(cs_filename),diff2=cs_rev,diff1=a_rev,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full side-by-side diff for this file')}"> + <a href="${h.url('files_diff_2way_home',repo_name=cs_repo_name,f_path=h.safe_unicode(cs_filename),diff2=cs_rev,diff1=a_rev,diff='diff',fulldiff=1)}" data-toggle="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=cs_repo_name,f_path=h.safe_unicode(cs_filename),diff2=cs_rev,diff1=a_rev,diff='raw')}" class="tooltip" title="${_('Raw diff')}"> + <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=h.safe_unicode(cs_filename),diff2=cs_rev,diff1=a_rev,diff='raw')}" data-toggle="tooltip" title="${_('Raw diff')}"> <i class="icon-diff"></i></a> - <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=h.safe_unicode(cs_filename),diff2=cs_rev,diff1=a_rev,diff='download')}" class="tooltip" title="${_('Download diff')}"> + <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=h.safe_unicode(cs_filename),diff2=cs_rev,diff1=a_rev,diff='download')}" data-toggle="tooltip" title="${_('Download diff')}"> <i class="icon-floppy"></i></a> ${c.ignorews_url(request.GET, url_fid)} ${c.context_url(request.GET, url_fid)}
--- a/kallithea/templates/compare/compare_cs.html Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/compare/compare_cs.html Tue Nov 08 23:29:12 2016 +0100 @@ -47,11 +47,11 @@ else: title = _('Position in this list of changesets') %> - <span class="tooltip" title="${title}"> + <span data-toggle="tooltip" title="${title}"> ${index} </span> </td> - <td style="width: 140px"><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td> + <td style="width: 140px"><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td> %if c.visual.use_gravatar: <td>${h.gravatar_div(h.email_or_none(cs.author), size=14, div_commit_id="${cs.raw_id}")}</td> %endif
--- a/kallithea/templates/data_table/_dt_elements.html Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/data_table/_dt_elements.html Tue Nov 08 23:29:12 2016 +0100 @@ -87,13 +87,13 @@ </%def> <%def name="last_change(last_change)"> - <span class="tooltip" date="${last_change}" title="${h.fmt_date(last_change)}">${h.age(last_change)}</span> + <span data-toggle="tooltip" title="${h.fmt_date(last_change)}" date="${last_change}">${h.age(last_change)}</span> </%def> <%def name="revision(name,rev,tip,author,last_msg)"> <div> %if rev >= 0: - <a title="${'%s:\n\n%s' % (h.escape(author), h.escape(last_msg))}" class="tooltip revision-link safe-html-title" href="${h.url('changeset_home',repo_name=name,revision=tip)}">${'r%s:%s' % (rev,h.short_id(tip))}</a> + <a data-toggle="tooltip" title="${'%s:\n\n%s' % (h.escape(author), h.escape(last_msg))}" class="revision-link safe-html-title" href="${h.url('changeset_home',repo_name=name,revision=tip)}">${'r%s:%s' % (rev,h.short_id(tip))}</a> %else: ${_('No changesets yet')} %endif
--- a/kallithea/templates/files/diff_2way.html Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/files/diff_2way.html Tue Nov 08 23:29:12 2016 +0100 @@ -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="${_('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)}" data-toggle="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="${_('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)}" data-toggle="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="${_('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')}" data-toggle="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="${_('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')}" data-toggle="tooltip" title="${_('Download diff')}"> <i class="icon-floppy"></i> </a> ${h.checkbox('ignorews', label=_('Ignore whitespace'))}
--- a/kallithea/templates/files/files_browser.html Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/files/files_browser.html Tue Nov 08 23:29:12 2016 +0100 @@ -90,12 +90,12 @@ </td> <td> %if node.is_file(): - <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> + <a data-toggle="tooltip" title="${node.last_changeset.message}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=node.last_changeset.raw_id)}" class="revision-link">${h.show_id(node.last_changeset)}</a> %endif </td> <td> %if node.is_file(): - <span class="tooltip" title="${h.fmt_date(node.last_changeset.date)}"> + <span data-toggle="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 Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/files/files_history_box.html Tue Nov 08 23:29:12 2016 +0100 @@ -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="${user}"> + <div class="contributor" style="float:left" data-toggle="tooltip" title="${user}"> ${h.gravatar_div(email, size=20, div_style="margin:1px")} </div> %endfor
--- a/kallithea/templates/files/files_source.html Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/files/files_source.html Tue Nov 08 23:29:12 2016 +0100 @@ -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.fmt_date(c.changeset.date)}">${h.link_to(h.show_id(c.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</pre></div> + <div class="left item"><pre data-toggle="tooltip" title="${h.fmt_date(c.changeset.date)}">${h.link_to(h.show_id(c.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.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 Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/followers/followers_data.html Tue Nov 08 23:29:12 2016 +0100 @@ -8,7 +8,7 @@ </div> <div style="clear:both;padding-top: 10px"></div> <div class="follower_date">${_('Started following -')} - <span class="tooltip" title="${f.follows_from}"> ${h.age(f.follows_from)}</span></div> + <span data-toggle="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 Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/forks/forks_data.html Tue Nov 08 23:29:12 2016 +0100 @@ -13,7 +13,7 @@ </div> <div style="clear:both;padding-top: 10px"></div> <div class="follower_date">${_('Forked')} - - <span class="tooltip" title="${h.fmt_date(f.created_on)}"> ${h.age(f.created_on)}</span> + <span data-toggle="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-default btn-sm"><i class="icon-git-compare"></i> ${_('Compare Fork')}</a>
--- a/kallithea/templates/journal/journal.html Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/journal/journal.html Tue Nov 08 23:29:12 2016 +0100 @@ -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.journal_filter_help()}">?</span> + <span data-toggle="tooltip" title="${h.journal_filter_help()}">?</span> <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs"/> ${_('Journal')} - ${ungettext('%s Entry', '%s Entries', c.journal_pager.item_count) % (c.journal_pager.item_count)} </form>
--- a/kallithea/templates/journal/journal_data.html Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/journal/journal_data.html Tue Nov 08 23:29:12 2016 +0100 @@ -26,7 +26,7 @@ </span> </div> <div class="journal_action_params">${h.literal(h.action_parser(entry)[1]())}</div> - <div class="date"><span class="tooltip" title="${h.fmt_date(entry.action_date)}">${h.age(entry.action_date)}</span></div> + <div class="date"><span data-toggle="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 Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_data.html Tue Nov 08 23:29:12 2016 +0100 @@ -42,7 +42,7 @@ ${pr.owner.full_name_and_username} </td> <td> - <span class="tooltip" title="${h.fmt_date(pr.created_on)}"> + <span data-toggle="tooltip" title="${h.fmt_date(pr.created_on)}"> ${h.age(pr.created_on)} </span> </td>
--- a/kallithea/templates/pullrequests/pullrequest_show.html Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Tue Nov 08 23:29:12 2016 +0100 @@ -70,7 +70,7 @@ %if c.current_voting_result: <span class="changeset-status-ico" style="padding:0px 4px 0px 0px"> <i class="icon-circle changeset-status-${c.current_voting_result}" title="${_('Pull request status calculated from votes')}"></i></span> - <span class="changeset-status-lbl tooltip" title="${_('Pull request status calculated from votes')}"> + <span class="changeset-status-lbl" data-toggle="tooltip" title="${_('Pull request status calculated from votes')}"> %if c.pull_request.is_closed(): ${_('Closed')}, %endif @@ -84,7 +84,7 @@ <label>${_('Still not reviewed by')}:</label> <div class="input"> % if len(c.pull_request_pending_reviewers) > 0: - <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> + <div data-toggle="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: @@ -173,7 +173,7 @@ ${h.radio(name='updaterev', value=cs.raw_id)} %endif </td> - <td style="width: 120px"><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td> + <td style="width: 120px"><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td> <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id), class_='changeset_hash')}</td> <td> <div style="float: right; margin-top: -4px;"> @@ -213,7 +213,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.changeset_status_lbl(status)}"> + <div class="reviewer_status" data-toggle="tooltip" title="${h.changeset_status_lbl(status)}"> <i class="icon-circle changeset-status-${status}"></i> </div> ${h.gravatar_div(member.email, size=14, div_class="reviewer_gravatar gravatar")}
--- a/kallithea/templates/summary/summary.html Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/templates/summary/summary.html Tue Nov 08 23:29:12 2016 +0100 @@ -10,9 +10,9 @@ ## locking icon %if c.db_repo.enable_locking: %if c.db_repo.locked[0]: - <span class="locking_locked tooltip icon-block" title="${_('Repository locked by %s') % h.person_by_id(c.db_repo.locked[0])}"></span> + <span class="locking_locked icon-block" data-toggle="tooltip" title="${_('Repository locked by %s') % h.person_by_id(c.db_repo.locked[0])}"></span> %else: - <span class="locking_unlocked tooltip icon-ok" title="${_('Repository unlocked')}"></span> + <span class="locking_unlocked icon-ok" data-toggle="tooltip" title="${_('Repository unlocked')}"></span> %endif %endif @@ -114,7 +114,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="${_('Check this to download archive with subrepos')}" >${_('With subrepos')}</label> + <label for="archive_subrepos" data-toggle="tooltip" title="${_('Check this to download archive with subrepos')}" >${_('With subrepos')}</label> </span> %endif </div>
--- a/kallithea/tests/functional/test_changelog.py Tue Sep 20 21:12:56 2016 +0200 +++ b/kallithea/tests/functional/test_changelog.py Tue Nov 08 23:29:12 2016 +0100 @@ -74,7 +74,7 @@ # response.mustcontain( # """<div id="changed_total_5e204e7583b9c8e7b93a020bd036564b1e731dae" """ -# """style="float:right;" class="changed_total tooltip" """ +# """style="float:right;" class="changed_total" data-toggle="tooltip" """ # """title="Affected number of files, click to show """ # """more details">3</div>""" # )