X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=htdocs%2Fjavascript%2Fxorg.js;h=2ce22121047bef922322100e305cec850f2f98f7;hb=8526cfe046865202710c548a3a58c7dbddeaee65;hp=f06998283c77573c908cbb1d8a643cad34c4f5ae;hpb=173ff0bdf41db90ee0995e0c3bf844bf2151d0e6;p=platal.git diff --git a/htdocs/javascript/xorg.js b/htdocs/javascript/xorg.js index f069982..2ce2212 100644 --- a/htdocs/javascript/xorg.js +++ b/htdocs/javascript/xorg.js @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2011 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * @@ -147,7 +147,7 @@ function addSearchEngine() return this.overlib({ text: text, - caption: this.attr('title') || goodies.default_title, + caption: this.attr('title') || goodies[type].default_title, close_text: 'Fermer', delay: 800, sticky: true, @@ -179,7 +179,7 @@ function auto_links() { } if ((!href.contains(fqdn) && !this.className.contains('popup')) || node.hasClass('popup')) { node.click(function () { - window.open(this.href); + window.open($.plURL(this.href)); return false; }); } @@ -816,7 +816,7 @@ function sendTestEmail(token, hruid) popWin: function(w, h) { return this.click(function() { - window.open(this.href, '_blank', + window.open($.plURL(this.href), '_blank', 'toolbar=0,location=0,directories=0,status=0,' +'menubar=0,scrollbars=1,resizable=1,' +'width='+w+',height='+h); @@ -1065,7 +1065,7 @@ function updatepromofields(egal1, egal2, promo2) { break; case 'admin': $(this).attr('href', 'admin/user/' + profile.hrpid) - .click(function() { window.open($(this).attr('href')); return false }); + .click(function() { window.open($.plURL(this.href)); return false }); break; } } @@ -1255,4 +1255,4 @@ $(function() { }); }); -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: