Mercurial > kallithea
changeset 2979:95f03f8f5f9a beta
- add loading message on lazy loaded toolips for journals
- fixed callbacks on admin journal
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sun, 04 Nov 2012 13:28:03 +0100 |
| parents | b84a4ec93ab6 |
| children | 234435584a0d |
| files | rhodecode/public/js/rhodecode.js rhodecode/templates/admin/admin_log.html rhodecode/templates/base/root.html |
| diffstat | 3 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/public/js/rhodecode.js Sun Nov 04 13:16:11 2012 +0100 +++ b/rhodecode/public/js/rhodecode.js Sun Nov 04 13:28:03 2012 +0100 @@ -327,11 +327,13 @@ var json = JSON.parse(o.responseText); YUD.addClass(target,'tooltip') YUD.setAttribute(target, 'title',json['message']); - YAHOO.yuitip.main.set_listeners(target); YAHOO.yuitip.main.show_yuitip(e, target); } if(rid && !YUD.hasClass(target, 'tooltip')){ YUD.setAttribute(target,'id',ttid); + YUD.setAttribute(target, 'title',_TM['loading...']); + YAHOO.yuitip.main.set_listeners(target); + YAHOO.yuitip.main.show_yuitip(e, target); ajaxGET('/changeset_info/{0}/{1}'.format(repo_name,rid), success) } }); @@ -351,7 +353,7 @@ opacity: 0.9, offset: [15,15], useAnim: false, - maxWidth: 300, + maxWidth: 600, add_links: false, yuitips: [],
--- a/rhodecode/templates/admin/admin_log.html Sun Nov 04 13:16:11 2012 +0100 +++ b/rhodecode/templates/admin/admin_log.html Sun Nov 04 13:28:03 2012 +0100 @@ -34,7 +34,11 @@ <script type="text/javascript"> YUE.onDOMReady(function(){ YUE.delegate("user_log","click",function(e, matchedEl, container){ - ypjax(e.target.href,"user_log",function(){show_more_event();tooltip_activate();}); + ypjax(e.target.href,"user_log",function(){ + show_more_event(); + tooltip_activate(); + show_changeset_tooltip(); + }); YUE.preventDefault(e); },'.pager_link');
--- a/rhodecode/templates/base/root.html Sun Nov 04 13:16:11 2012 +0100 +++ b/rhodecode/templates/base/root.html Sun Nov 04 13:28:03 2012 +0100 @@ -44,12 +44,12 @@ 'Start following this repository':"${_('Start following this repository')}", 'Group':"${_('Group')}", 'members':"${_('members')}", + 'loading...':"${_('loading...')}", 'search truncated': "${_('search truncated')}", 'no matching files': "${_('no matching files')}", 'Open new pull request': "${_('Open new pull request')}", 'Open new pull request for selected changesets': "${_('Open new pull request for selected changesets')}", 'Show selected changes __S -> __E': "${_('Show selected changes __S -> __E')}", - }; var _TM = TRANSLATION_MAP; </script>