diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -102,11 +102,9 @@ class _ToolTip(object): .replace('\n', '
') 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 + """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 = ''' @@ -116,7 +114,7 @@ class _ToolTip(object): var tts = YAHOO.util.Dom.getElementsByClassName('tooltip'); for (var i = 0; i < tts.length; i++) { - //if element doesn't not have and id autgenerate one for tooltip + //if element doesn't not have and id autogenerate one for tooltip if (!tts[i].id){ tts[i].id='tt'+i*100; @@ -134,35 +132,15 @@ class _ToolTip(object): showdelay:20, }); - //Mouse Over event disabled for new repositories since they don't - //have last commit message - myToolTips.contextMouseOverEvent.subscribe( - function(type, args) { - var context = args[0]; - var txt = context.getAttribute('tooltip_title'); - if(txt){ - return true; - } - else{ - return false; - } - }); - - // 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); - - - // positioning of tooltip - var tt_w = this.element.clientWidth; - var tt_h = this.element.clientHeight; + //positioning of tooltip + var tt_w = this.element.clientWidth;//tooltip width + var tt_h = this.element.clientHeight;//tooltip height var context_w = context.offsetWidth; var context_h = context.offsetHeight; @@ -170,13 +148,13 @@ class _ToolTip(object): var pos_x = YAHOO.util.Dom.getX(context); var pos_y = YAHOO.util.Dom.getY(context); - var display_strategy = 'top'; + var display_strategy = 'right'; var xy_pos = [0,0]; switch (display_strategy){ case 'top': var cur_x = (pos_x+context_w/2)-(tt_w/2); - var cur_y = pos_y-tt_h-4; + var cur_y = (pos_y-tt_h-4); xy_pos = [cur_x,cur_y]; break; case 'bottom': @@ -303,7 +281,7 @@ def pygmentize_annotation(filenode, **kw revision=changeset.raw_id), style=get_color_string(changeset.raw_id), class_='tooltip', - tooltip_title=tooltip_html + title=tooltip_html ) uri += '\n' @@ -428,7 +406,7 @@ def action_parser(user_log): cs_links = " " + ', '.join ([link_to(rev, url('changeset_home', repo_name=repo_name, - revision=rev), tooltip_title=message(rev), + revision=rev), title=message(rev), class_='tooltip') for rev in revs[:revs_limit] ]) if len(revs) > revs_limit: uniq_id = revs[0] @@ -443,7 +421,7 @@ def action_parser(user_log): cs_links += html_tmpl % (uniq_id, ', '.join([link_to(rev, url('changeset_home', repo_name=repo_name, revision=rev), - tooltip_title=message(rev), class_='tooltip') + title=message(rev), class_='tooltip') for rev in revs[revs_limit:revs_top_limit]])) return cs_links diff --git a/rhodecode/templates/admin/permissions/permissions.html b/rhodecode/templates/admin/permissions/permissions.html --- a/rhodecode/templates/admin/permissions/permissions.html +++ b/rhodecode/templates/admin/permissions/permissions.html @@ -46,7 +46,7 @@ ${h.checkbox('overwrite_default','true')} 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 @@ -68,7 +68,7 @@ ${h.link_to('r%s:%s' % (repo['rev'],h.short_id(repo['tip'])), h.url('changeset_home',repo_name=repo['name'],revision=repo['tip']), class_="tooltip", - tooltip_title=h.tooltip(repo['last_msg']))} + title=h.tooltip(repo['last_msg']))} %else: ${_('No changesets yet')} %endif diff --git a/rhodecode/templates/admin/settings/settings.html b/rhodecode/templates/admin/settings/settings.html --- a/rhodecode/templates/admin/settings/settings.html +++ b/rhodecode/templates/admin/settings/settings.html @@ -35,7 +35,7 @@
${h.checkbox('destroy',True)}
@@ -165,7 +165,7 @@
${h.text('paths_root_path',size=30,readonly="readonly")} + title="${h.tooltip(_('This a crucial application setting. If You really sure you need to change this, you must restart application in order to make this settings take effect. Click this label to unlock.'))}"> ${_('unlock')}
diff --git a/rhodecode/templates/admin/users/user_edit_my_account.html b/rhodecode/templates/admin/users/user_edit_my_account.html --- a/rhodecode/templates/admin/users/user_edit_my_account.html +++ b/rhodecode/templates/admin/users/user_edit_my_account.html @@ -140,7 +140,7 @@ src="/images/icons/arrow_divide.png"/> %endif - ${("r%s:%s") % (h.get_changeset_safe(repo['repo'],'tip').revision,h.short_id(h.get_changeset_safe(repo['repo'],'tip').raw_id))} + ${("r%s:%s") % (h.get_changeset_safe(repo['repo'],'tip').revision,h.short_id(h.get_changeset_safe(repo['repo'],'tip').raw_id))} ${_('private')} ${h.form(url('repo_settings_delete', repo_name=repo['repo'].name),method='delete')} 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 @@ -9,7 +9,7 @@ %for cnt,branch in enumerate(c.repo_branches.items()): - + ${branch[1].date} 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 @@ -71,9 +71,9 @@ return ': '+_('No Files') %> - ${len(cs.removed)} - ${len(cs.changed)} - ${len(cs.added)} + ${len(cs.removed)} + ${len(cs.changed)} + ${len(cs.added)} %if len(cs.parents)>1:
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 @@ -78,13 +78,13 @@ %if node.is_file(): - + ${node.last_changeset.revision} %endif %if node.is_file(): - + ${h.age(node.last_changeset.date)} %endif diff --git a/rhodecode/templates/index.html b/rhodecode/templates/index.html --- a/rhodecode/templates/index.html +++ b/rhodecode/templates/index.html @@ -87,12 +87,12 @@
##DESCRIPTION - + ${h.truncate(repo['description'],60)} ##LAST CHANGE - + ${h.age(repo['last_change'])} @@ -100,7 +100,7 @@ ${h.link_to('r%s:%s' % (repo['rev'],h.short_id(repo['tip'])), h.url('changeset_home',repo_name=repo['name'],revision=repo['tip']), class_="tooltip", - tooltip_title=h.tooltip(repo['last_msg']))} + title=h.tooltip(repo['last_msg']))} %else: ${_('No changesets yet')} %endif 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 @@ -18,7 +18,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/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 @@ -9,7 +9,7 @@ %for cnt,tag in enumerate(c.repo_tags.items()): - + ${tag[1].date} diff --git a/rhodecode/tests/functional/test_changelog.py b/rhodecode/tests/functional/test_changelog.py --- a/rhodecode/tests/functional/test_changelog.py +++ b/rhodecode/tests/functional/test_changelog.py @@ -9,9 +9,9 @@ class TestChangelogController(TestContro assert """
""" in response.body, 'wrong info about number of changes' assert """
commit 154: 5e204e7583b9@2010-08-10 01:18:46
""" in response.body , 'no info on this commit' assert """Small update at simplevcs app""" in response.body, 'missing info about commit message' - assert """0""" in response.body, 'wrong info about removed nodes' - assert """2""" in response.body, 'wrong info about changed nodes' - assert """1""" in response.body, 'wrong info about added nodes' + assert """0""" in response.body, 'wrong info about removed nodes' + assert """2""" in response.body, 'wrong info about changed nodes' + assert """1""" in response.body, 'wrong info about added nodes' #pagination @@ -24,9 +24,9 @@ class TestChangelogController(TestContro # Test response after pagination... assert """
commit 64: 46ad32a4f974@2010-04-20 00:33:21
"""in response.body, 'wrong info about commit 64' - assert """1"""in response.body, 'wrong info about number of removed' - assert """13"""in response.body, 'wrong info about number of changes' - assert """20"""in response.body, 'wrong info about number of added' + assert """1"""in response.body, 'wrong info about number of removed' + assert """13"""in response.body, 'wrong info about number of changes' + assert """20"""in response.body, 'wrong info about number of added' assert """
Merge with 2e6a2bf9356ca56df08807f4ad86d480da72a8f4
""" % HG_REPO in response.body, 'wrong info about commit 64 is a merge' 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 @@ -12,4 +12,4 @@ class TestHomeController(TestController) assert """Mercurial repository""" in response.body, 'wrong info about type of repositry' assert """public repository""" in response.body, 'wrong info about repository availabilty' - assert """r173:27cd5cce30c9""" in response.body, 'no info about tooltip' + assert """r173:27cd5cce30c9""" in response.body, 'no info about tooltip'