Index: plugins/SitesManager/templates/SitesManager.js =================================================================== --- plugins/SitesManager/templates/SitesManager.js (revision 453) +++ plugins/SitesManager/templates/SitesManager.js (working copy) @@ -108,7 +108,7 @@ var idRow = $(this).attr('id'); var nameToDelete = $(this).parent().parent().find('#siteName').html(); var idsiteToDelete = $(this).parent().parent().find('#idSite').html(); - if(confirm(sprintf(_pk_translate('SitesManager_DeleteConfirm','Are you sure you want to delete the website %s'),'"'+nameToDelete+'" (idSite = '+idsiteToDelete+')')) ) + if(confirm(sprintf(_pk_translate('SitesManager_DeleteConfirm'),'"'+nameToDelete+'" (idSite = '+idsiteToDelete+')')) ) { $.ajax( getDeleteSiteAJAX( idsiteToDelete ) ); } Index: plugins/Feedback/index.tpl =================================================================== --- plugins/Feedback/index.tpl (revision 453) +++ plugins/Feedback/index.tpl (working copy) @@ -1,23 +1,19 @@ +{literal} + +{/literal} +
-

Your name: -

-

Your e-mail: -

+

-

Choose category: -
-

- -

Topic: -

-

Body: -

+

Index: plugins/Feedback/sent.tpl =================================================================== --- plugins/Feedback/sent.tpl (revision 453) +++ plugins/Feedback/sent.tpl (working copy) @@ -1,3 +1,8 @@ -

A mail was sent to Piwik developers

- -

Thank you for your feedback.
- Piwik Team

+{if $ErrorString} + {'General_Error'|translate}: {$ErrorString}
+ Please contact team at hello@piwik.org +{else} +

A mail was sent to Piwik developers

+

Thank you for your feedback.
- Piwik Team

+{/if} + Index: plugins/Feedback/Controller.php =================================================================== --- plugins/Feedback/Controller.php (revision 453) +++ plugins/Feedback/Controller.php (working copy) @@ -31,20 +31,26 @@ { // TODO: require user login or captcha if anonymous - $name = Piwik_Common::getRequestVar('name', '', 'string'); - $topic = Piwik_Common::getRequestVar('topic', '', 'string'); $body = Piwik_Common::getRequestVar('body', '', 'string'); - $email = Piwik_Common::getRequestVar('email', '', 'string'); - $category = Piwik_Common::getRequestVar('category', '', 'string'); + $email = Piwik_Common::getRequestVar('email', '', 'string'); + + + $view = new Piwik_View('Feedback/sent.tpl'); + + try + { + $mail = new Piwik_Mail(); + $mail->setFrom($email); + $mail->addTo('hello@piwik.org','Piwik Team'); + $mail->setSubject('[feedback form]'); + $mail->setBodyText($body); + $mail->send(); + } + catch(Exception $e) + { + $view->ErrorString = $e->getMessage(); + } - $mail = new Piwik_Mail(); - $mail->setFrom($email, $name); - $mail->addTo('hello@piwik.org','Piwik Team'); - $mail->setSubject('[feedback:'.$category.'] '.$topic); - $mail->setBodyText($body); - $mail->send(); - - $view = new Piwik_View('Feedback/sent.tpl'); echo $view->render(); } } Index: plugins/Dashboard/templates/Dashboard.js =================================================================== --- plugins/Dashboard/templates/Dashboard.js (revision 453) +++ plugins/Dashboard/templates/Dashboard.js (working copy) @@ -143,7 +143,7 @@ //format the div for upcomming ajax loading and set a temporary content $(this) .attr('plugin', plugin) .attr('id', action) - .html('
'+ _pk_translate('Dashboard_LoadingPreview','Loading preview, please wait...') +'
').show(); + .html('
'+ _pk_translate('Dashboard_LoadingPreview') +'
').show(); self.dashboard.ajaxLoading(plugin, action); } }); @@ -193,12 +193,12 @@ if(contains(widgets, plugin+'.'+action)) { $(this).addClass('menuDisabled'); - $(this).attr('title', _pk_translate('Dashboard_TitleWidgetInDashboard','Widget already in dashboard')); + $(this).attr('title', _pk_translate('Dashboard_TitleWidgetInDashboard')); } else { $(this).removeClass('menuDisabled'); - $(this).attr('title', _pk_translate('Dashboard_TitleClickToAdd','Click to add to dashboard')); + $(this).attr('title', _pk_translate('Dashboard_TitleClickToAdd')); } }); }, @@ -328,7 +328,7 @@ if(typeof onTop == "undefined") onTop = false; - var item = '
'+ _pk_translate('Dashboard_LoadingWidget','Loading widget, please wait...') +'
'; + var item = '
'+ _pk_translate('Dashboard_LoadingWidget') +'
'; if(onTop) { @@ -375,7 +375,7 @@ { var self = this; - var title = _pk_translate('Dashboard_WidgetNotFound','Widget not found'); + var title = _pk_translate('Dashboard_WidgetNotFound'); var widgets = piwik.availableWidgets[plugin]; for(var i in widgets) { Index: plugins/Home/templates/links_misc_modules.tpl =================================================================== --- plugins/Home/templates/links_misc_modules.tpl (revision 453) +++ plugins/Home/templates/links_misc_modules.tpl (working copy) @@ -4,5 +4,5 @@ Admin | API | Widgets | -Send us feedback - \ No newline at end of file +Send us feedback + Index: plugins/Home/templates/datatable.js =================================================================== --- plugins/Home/templates/datatable.js (revision 453) +++ plugins/Home/templates/datatable.js (working copy) @@ -268,11 +268,11 @@ { if(Number(self.param.filter_excludelowpop) != 0) { - string = _pk_translate('Home_IncludeAllPopulation','Include all population'); + string = _pk_translate('Home_IncludeAllPopulation'); } else { - string = _pk_translate('Home_ExcludeLowPopulation','Exclude low population'); + string = _pk_translate('Home_ExcludeLowPopulation'); } $(this).html(string); } @@ -410,7 +410,7 @@ // only show this string if there is some rows in the datatable if(totalRows != 0) { - var str = sprintf(_pk_translate('Home_PageOf','%s of %s'),offset + '-' + offsetEndDisp,totalRows); + var str = sprintf(_pk_translate('Home_PageOf'),offset + '-' + offsetEndDisp,totalRows); $(this).text(str); } } @@ -618,7 +618,7 @@ \ \
\ - '+ _pk_translate('Home_Loading','Loading...') +'\ + '+ _pk_translate('Home_Loading') +'\
\ \ \ Index: plugins/UsersManager/templates/UsersManager.js =================================================================== --- plugins/UsersManager/templates/UsersManager.js (revision 453) +++ plugins/UsersManager/templates/UsersManager.js (working copy) @@ -222,7 +222,7 @@ ajaxHideError(); var idRow = $(this).attr('id'); var loginToDelete = $(this).parent().parent().find('#userLogin').html(); - if( confirm(sprintf(_pk_translate('UsersManager_DeleteConfirm','Are you sure you want to delete the user %s'),'"'+loginToDelete+'"')) ) + if( confirm(sprintf(_pk_translate('UsersManager_DeleteConfirm'),'"'+loginToDelete+'"')) ) { $.ajax( getDeleteUserAJAX( loginToDelete ) ); } Index: plugins/VisitsSummary/sparklines.tpl =================================================================== --- plugins/VisitsSummary/sparklines.tpl (revision 453) +++ plugins/VisitsSummary/sparklines.tpl (working copy) @@ -1,8 +1,8 @@
- {'VisitsSummary_NbVisits'|translate:"$nbVisits"}

- {'VisitsSummary_NbUniqueVisitors'|translate:"$nbUniqVisitors"}

- {'VisitsSummary_NbActions'|translate:"$nbActions"}

- {assign var=sumtimeVisitLength value=$sumVisitLength|sumtime} {'VisitsSummary_TotalTime'|translate:"$sumtimeVisitLength"}

- {'VisitsSummary_MaxNbActions'|translate:"$maxActions"}

- {'VisitsSummary_NbBounced'|translate:"$bounceCount"}

-
\ No newline at end of file +

{'VisitsSummary_NbVisits'|translate:"$nbVisits"}

+

{'VisitsSummary_NbUniqueVisitors'|translate:"$nbUniqVisitors"}

+

{'VisitsSummary_NbActions'|translate:"$nbActions"}

+

{assign var=sumtimeVisitLength value=$sumVisitLength|sumtime} {'VisitsSummary_TotalTime'|translate:"$sumtimeVisitLength"}

+

{'VisitsSummary_MaxNbActions'|translate:"$maxActions"}

+

{'VisitsSummary_NbBounced'|translate:"$bounceCount"}

+ Index: plugins/Login/lang/en.php =================================================================== --- plugins/Login/lang/en.php (revision 453) +++ plugins/Login/lang/en.php (working copy) @@ -14,5 +14,6 @@ 'Login_MailTopicPasswordRecovery' => 'Password recovery', 'Login_MailBodyPasswordRecovery' => "Hi %1s,\n\nYour new password is: %2s\n\nYou can login now at: %3s", - 'Login_PasswordSent' => 'Password has been just sent. Check your e-mail.' + 'Login_PasswordSent' => 'Password has been just sent. Check your e-mail.', + 'Login_ContactAdmin' => 'Please contact with site administrator.' ); Index: plugins/Login/Controller.php =================================================================== --- plugins/Login/Controller.php (revision 453) +++ plugins/Login/Controller.php (working copy) @@ -107,7 +107,9 @@ // if user exists if( $user != null ) - { + { + $view = new Piwik_View('Login/templates/passwordsent.tpl'); + $login = $user['login']; $email = $user['email']; @@ -116,14 +118,20 @@ Piwik_UsersManager_API::updateUser($login, $randomPassword); // send email with new password - $mail = new Piwik_Mail(); - $mail->addTo($email, $login); - $mail->setSubject(Piwik_Translate('Login_MailTopicPasswordRecovery')); - $mail->setBodyText(sprintf(Piwik_Translate('Login_MailBodyPasswordRecovery'), - $login, $randomPassword, Piwik_Url::getCurrentUrlWithoutQueryString())); - $mail->send(); - - $view = new Piwik_View('Login/templates/passwordsent.tpl'); + try + { + $mail = new Piwik_Mail(); + $mail->addTo($email, $login); + $mail->setSubject(Piwik_Translate('Login_MailTopicPasswordRecovery')); + $mail->setBodyText(sprintf(Piwik_Translate('Login_MailBodyPasswordRecovery'), + $login, $randomPassword, Piwik_Url::getCurrentUrlWithoutQueryString())); + $mail->send(); + } + catch(Exception $e) + { + $view->ErrorString = $e->getMessage(); + } + $view->linkTitle = Piwik::getRandomTitle(); $view->urlToRedirect = $urlToRedirect; echo $view->render(); Index: plugins/Login/templates/lostpassword.tpl =================================================================== --- plugins/Login/templates/lostpassword.tpl (revision 453) +++ plugins/Login/templates/lostpassword.tpl (working copy) @@ -1,27 +1,5 @@ - - - - Piwik › Lost password - - - {literal} - - {/literal} - - +{include file="Login/templates/header.tpl"} - - - - -
{if $form_data.errors} Index: plugins/Login/templates/login.tpl =================================================================== --- plugins/Login/templates/login.tpl (revision 453) +++ plugins/Login/templates/login.tpl (working copy) @@ -1,27 +1,5 @@ - - - - Piwik › Login - - - {literal} - - {/literal} - - +{include file="Login/templates/header.tpl"} - - - - -
{if $form_data.errors} Index: plugins/Login/templates/passwordsent.tpl =================================================================== --- plugins/Login/templates/passwordsent.tpl (revision 453) +++ plugins/Login/templates/passwordsent.tpl (working copy) @@ -1,24 +1,17 @@ - - - - Piwik › Lost password - - - +{include file="Login/templates/header.tpl"} - - - - -
+ +{if $ErrorString} +
{'General_Error'|translate}: {$ErrorString}
+ {'Login_ContactAdmin'|translate} +
+{else} +

+ {'Login_PasswordSent'|translate} +

+{/if} -

-{'Login_PasswordSent'|translate} -

- Index: themes/default/common-admin.css =================================================================== --- themes/default/common-admin.css (revision 453) +++ themes/default/common-admin.css (working copy) @@ -168,4 +168,4 @@ .access_error { font-size: .7em; padding: 15px; -} \ No newline at end of file +} Index: libs/jquery/thickbox.js =================================================================== --- libs/jquery/thickbox.js (revision 453) +++ libs/jquery/thickbox.js (working copy) @@ -1,10 +1,319 @@ /* - * Thickbox 3 - One Box To Rule Them All. + * Thickbox 3.1 - One Box To Rule Them All. * By Cody Lindley (http://www.codylindley.com) * Copyright (c) 2007 cody lindley * Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php */ + +var tb_pathToImage = "images/loadingAnimation.gif"; -var tb_pathToImage = "libs/jquery/loadingAnimation.gif"; +/*!!!!!!!!!!!!!!!!! edit below this line at your own risk !!!!!!!!!!!!!!!!!!!!!!!*/ -eval(function(p,a,c,k,e,r){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('$(o).2S(9(){1u(\'a.18, 3n.18, 3i.18\');1w=1p 1t();1w.L=2H});9 1u(b){$(b).s(9(){6 t=X.Q||X.1v||M;6 a=X.u||X.23;6 g=X.1N||P;19(t,a,g);X.2E();H P})}9 19(d,f,g){3m{3(2t o.v.J.2i==="2g"){$("v","11").r({A:"28%",z:"28%"});$("11").r("22","2Z");3(o.1Y("1F")===M){$("v").q("<4 5=\'B\'><4 5=\'8\'>");$("#B").s(G)}}n{3(o.1Y("B")===M){$("v").q("<4 5=\'B\'><4 5=\'8\'>");$("#B").s(G)}}3(1K()){$("#B").1J("2B")}n{$("#B").1J("2z")}3(d===M){d=""}$("v").q("<4 5=\'K\'><1I L=\'"+1w.L+"\' />");$(\'#K\').2y();6 h;3(f.O("?")!==-1){h=f.3l(0,f.O("?"))}n{h=f}6 i=/\\.2s$|\\.2q$|\\.2m$|\\.2l$|\\.2k$/;6 j=h.1C().2h(i);3(j==\'.2s\'||j==\'.2q\'||j==\'.2m\'||j==\'.2l\'||j==\'.2k\'){1D="";1G="";14="";1z="";1x="";R="";1n="";1r=P;3(g){E=$("a[@1N="+g+"]").36();25(D=0;((D&1d;&1d;2T &2R;"}n{1D=E[D].Q;1G=E[D].u;14="<1e 5=\'1U\'>&1d;&1d;&2O; 2N"}}n{1r=1b;1n="1t "+(D+1)+" 2L "+(E.1c)}}}S=1p 1t();S.1g=9(){S.1g=M;6 a=2x();6 x=a[0]-1M;6 y=a[1]-1M;6 b=S.z;6 c=S.A;3(b>x){c=c*(x/b);b=x;3(c>y){b=b*(y/c);c=y}}n 3(c>y){b=b*(y/c);c=y;3(b>x){c=c*(x/b);b=x}}13=b+30;1a=c+2G;$("#8").q("<1I 5=\'2F\' L=\'"+f+"\' z=\'"+b+"\' A=\'"+c+"\' 23=\'"+d+"\'/>"+"<4 5=\'2D\'>"+d+"<4 5=\'2C\'>"+1n+14+R+"<4 5=\'2A\'>1l 1k 1j 1s");$("#Z").s(G);3(!(14==="")){9 12(){3($(o).N("s",12)){$(o).N("s",12)}$("#8").C();$("v").q("<4 5=\'8\'>");19(1D,1G,g);H P}$("#1U").s(12)}3(!(R==="")){9 1i(){$("#8").C();$("v").q("<4 5=\'8\'>");19(1z,1x,g);H P}$("#1X").s(1i)}o.1h=9(e){3(e==M){I=2w.2v}n{I=e.2u}3(I==27){G()}n 3(I==3k){3(!(R=="")){o.1h="";1i()}}n 3(I==3j){3(!(14=="")){o.1h="";12()}}};16();$("#K").C();$("#1L").s(G);$("#8").r({Y:"T"})};S.L=f}n{6 l=f.2r(/^[^\\?]+\\??/,\'\');6 m=2p(l);13=(m[\'z\']*1)+30||3h;1a=(m[\'A\']*1)+3g||3f;W=13-30;V=1a-3e;3(f.O(\'2j\')!=-1){1E=f.1B(\'3d\');$("#15").C();3(m[\'1A\']!="1b"){$("#8").q("<4 5=\'2f\'><4 5=\'1H\'>"+d+"<4 5=\'2e\'>1l 1k 1j 1s ")}n{$("#B").N();$("#8").q(" ")}}n{3($("#8").r("Y")!="T"){3(m[\'1A\']!="1b"){$("#8").q("<4 5=\'2f\'><4 5=\'1H\'>"+d+"<4 5=\'2e\'>1l 1k 1j 1s<4 5=\'F\' J=\'z:"+W+"p;A:"+V+"p\'>")}n{$("#B").N();$("#8").q("<4 5=\'F\' 3c=\'3b\' J=\'z:"+W+"p;A:"+V+"p;\'>")}}n{$("#F")[0].J.z=W+"p";$("#F")[0].J.A=V+"p";$("#F")[0].3a=0;$("#1H").11(d)}}$("#Z").s(G);3(f.O(\'37\')!=-1){$("#F").q($(\'#\'+m[\'26\']).1T());$("#8").24(9(){$(\'#\'+m[\'26\']).q($("#F").1T())});16();$("#K").C();$("#8").r({Y:"T"})}n 3(f.O(\'2j\')!=-1){16();3($.1q.35){$("#K").C();$("#8").r({Y:"T"})}}n{$("#F").34(f+="&1y="+(1p 33().32()),9(){16();$("#K").C();1u("#F a.18");$("#8").r({Y:"T"})})}}3(!m[\'1A\']){o.21=9(e){3(e==M){I=2w.2v}n{I=e.2u}3(I==27){G()}}}}31(e){}}9 1m(){$("#K").C();$("#8").r({Y:"T"})}9 G(){$("#2Y").N("s");$("#Z").N("s");$("#8").2X("2W",9(){$(\'#8,#B,#1F\').2V("24").N().C()});$("#K").C();3(2t o.v.J.2i=="2g"){$("v","11").r({A:"1Z",z:"1Z"});$("11").r("22","")}o.1h="";o.21="";H P}9 16(){$("#8").r({2U:\'-\'+20((13/2),10)+\'p\',z:13+\'p\'});3(!(1V.1q.2Q&&1V.1q.2P<7)){$("#8").r({38:\'-\'+20((1a/2),10)+\'p\'})}}9 2p(a){6 b={};3(!a){H b}6 c=a.1B(/[;&]/);25(6 i=0;i
"); + $("#TB_overlay").click(tb_remove); + } + }else{//all others + if(document.getElementById("TB_overlay") === null){ + $("body").append("
"); + $("#TB_overlay").click(tb_remove); + } + } + + if(tb_detectMacXFF()){ + $("#TB_overlay").addClass("TB_overlayMacFFBGHack");//use png overlay so hide flash + }else{ + $("#TB_overlay").addClass("TB_overlayBG");//use background and opacity + } + + if(caption===null){caption="";} + $("body").append("
");//add loader to the page + $('#TB_load').show();//show loader + + var baseURL; + if(url.indexOf("?")!==-1){ //ff there is a query string involved + baseURL = url.substr(0, url.indexOf("?")); + }else{ + baseURL = url; + } + + var urlString = /\.jpg$|\.jpeg$|\.png$|\.gif$|\.bmp$/; + var urlType = baseURL.toLowerCase().match(urlString); + + if(urlType == '.jpg' || urlType == '.jpeg' || urlType == '.png' || urlType == '.gif' || urlType == '.bmp'){//code to show images + + TB_PrevCaption = ""; + TB_PrevURL = ""; + TB_PrevHTML = ""; + TB_NextCaption = ""; + TB_NextURL = ""; + TB_NextHTML = ""; + TB_imageCount = ""; + TB_FoundURL = false; + if(imageGroup){ + TB_TempArray = $("a[@rel="+imageGroup+"]").get(); + for (TB_Counter = 0; ((TB_Counter < TB_TempArray.length) && (TB_NextHTML === "")); TB_Counter++) { + var urlTypeTemp = TB_TempArray[TB_Counter].href.toLowerCase().match(urlString); + if (!(TB_TempArray[TB_Counter].href == url)) { + if (TB_FoundURL) { + TB_NextCaption = TB_TempArray[TB_Counter].title; + TB_NextURL = TB_TempArray[TB_Counter].href; + TB_NextHTML = "  Next >"; + } else { + TB_PrevCaption = TB_TempArray[TB_Counter].title; + TB_PrevURL = TB_TempArray[TB_Counter].href; + TB_PrevHTML = "  < Prev"; + } + } else { + TB_FoundURL = true; + TB_imageCount = "Image " + (TB_Counter + 1) +" of "+ (TB_TempArray.length); + } + } + } + + imgPreloader = new Image(); + imgPreloader.onload = function(){ + imgPreloader.onload = null; + + // Resizing large images - orginal by Christian Montoya edited by me. + var pagesize = tb_getPageSize(); + var x = pagesize[0] - 150; + var y = pagesize[1] - 150; + var imageWidth = imgPreloader.width; + var imageHeight = imgPreloader.height; + if (imageWidth > x) { + imageHeight = imageHeight * (x / imageWidth); + imageWidth = x; + if (imageHeight > y) { + imageWidth = imageWidth * (y / imageHeight); + imageHeight = y; + } + } else if (imageHeight > y) { + imageWidth = imageWidth * (y / imageHeight); + imageHeight = y; + if (imageWidth > x) { + imageHeight = imageHeight * (x / imageWidth); + imageWidth = x; + } + } + // End Resizing + + TB_WIDTH = imageWidth + 30; + TB_HEIGHT = imageHeight + 60; + $("#TB_window").append(""+caption+"" + "
"+caption+"
" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "
close
"); + + $("#TB_closeWindowButton").click(tb_remove); + + if (!(TB_PrevHTML === "")) { + function goPrev(){ + if($(document).unbind("click",goPrev)){$(document).unbind("click",goPrev);} + $("#TB_window").remove(); + $("body").append("
"); + tb_show(TB_PrevCaption, TB_PrevURL, imageGroup); + return false; + } + $("#TB_prev").click(goPrev); + } + + if (!(TB_NextHTML === "")) { + function goNext(){ + $("#TB_window").remove(); + $("body").append("
"); + tb_show(TB_NextCaption, TB_NextURL, imageGroup); + return false; + } + $("#TB_next").click(goNext); + + } + + document.onkeydown = function(e){ + if (e == null) { // ie + keycode = event.keyCode; + } else { // mozilla + keycode = e.which; + } + if(keycode == 27){ // close + tb_remove(); + } else if(keycode == 190){ // display previous image + if(!(TB_NextHTML == "")){ + document.onkeydown = ""; + goNext(); + } + } else if(keycode == 188){ // display next image + if(!(TB_PrevHTML == "")){ + document.onkeydown = ""; + goPrev(); + } + } + }; + + tb_position(); + $("#TB_load").remove(); + $("#TB_ImageOff").click(tb_remove); + $("#TB_window").css({display:"block"}); //for safari using css instead of show + }; + + imgPreloader.src = url; + }else{//code to show html + + var queryString = url.replace(/^[^\?]+\??/,''); + var params = tb_parseQuery( queryString ); + + TB_WIDTH = (params['width']*1) + 30 || 630; //defaults to 630 if no paramaters were added to URL + TB_HEIGHT = (params['height']*1) + 40 || 440; //defaults to 440 if no paramaters were added to URL + ajaxContentW = TB_WIDTH - 30; + ajaxContentH = TB_HEIGHT - 45; + + if(url.indexOf('TB_iframe') != -1){// either iframe or ajax window + urlNoQuery = url.split('TB_'); + $("#TB_iframeContent").remove(); + if(params['modal'] != "true"){//iframe no modal + $("#TB_window").append("
"+caption+"
close
"); + }else{//iframe modal + $("#TB_overlay").unbind(); + $("#TB_window").append(""); + } + }else{// not an iframe, ajax + if($("#TB_window").css("display") != "block"){ + if(params['modal'] != "true"){//ajax no modal + $("#TB_window").append("
"+caption+"
close
"); + }else{//ajax modal + $("#TB_overlay").unbind(); + $("#TB_window").append("
"); + } + }else{//this means the window is already up, we are just loading new content via ajax + $("#TB_ajaxContent")[0].style.width = ajaxContentW +"px"; + $("#TB_ajaxContent")[0].style.height = ajaxContentH +"px"; + $("#TB_ajaxContent")[0].scrollTop = 0; + $("#TB_ajaxWindowTitle").html(caption); + } + } + + $("#TB_closeWindowButton").click(tb_remove); + + if(url.indexOf('TB_inline') != -1){ + $("#TB_ajaxContent").append($('#' + params['inlineId']).children()); + $("#TB_window").unload(function () { + $('#' + params['inlineId']).append( $("#TB_ajaxContent").children() ); // move elements back when you're finished + }); + tb_position(); + $("#TB_load").remove(); + $("#TB_window").css({display:"block"}); + }else if(url.indexOf('TB_iframe') != -1){ + tb_position(); + if($.browser.safari){//safari needs help because it will not fire iframe onload + $("#TB_load").remove(); + $("#TB_window").css({display:"block"}); + } + }else{ + $("#TB_ajaxContent").load(url += "&random=" + (new Date().getTime()),function(){//to do a post change this load method + tb_position(); + $("#TB_load").remove(); + tb_init("#TB_ajaxContent a.thickbox"); + $("#TB_window").css({display:"block"}); + }); + } + + } + + if(!params['modal']){ + document.onkeyup = function(e){ + if (e == null) { // ie + keycode = event.keyCode; + } else { // mozilla + keycode = e.which; + } + if(keycode == 27){ // close + tb_remove(); + } + }; + } + + } catch(e) { + //nothing here + } +} + +//helper functions below +function tb_showIframe(){ + $("#TB_load").remove(); + $("#TB_window").css({display:"block"}); +} + +function tb_remove() { + $("#TB_imageOff").unbind("click"); + $("#TB_closeWindowButton").unbind("click"); + $("#TB_window").fadeOut("fast",function(){$('#TB_window,#TB_overlay,#TB_HideSelect').trigger("unload").unbind().remove();}); + $("#TB_load").remove(); + if (typeof document.body.style.maxHeight == "undefined") {//if IE 6 + $("body","html").css({height: "auto", width: "auto"}); + $("html").css("overflow",""); + } + document.onkeydown = ""; + document.onkeyup = ""; + return false; +} + +function tb_position() { +$("#TB_window").css({marginLeft: '-' + parseInt((TB_WIDTH / 2),10) + 'px', width: TB_WIDTH + 'px'}); + if ( !(jQuery.browser.msie && jQuery.browser.version < 7)) { // take away IE6 + $("#TB_window").css({marginTop: '-' + parseInt((TB_HEIGHT / 2),10) + 'px'}); + } +} + +function tb_parseQuery ( query ) { + var Params = {}; + if ( ! query ) {return Params;}// return empty object + var Pairs = query.split(/[;&]/); + for ( var i = 0; i < Pairs.length; i++ ) { + var KeyVal = Pairs[i].split('='); + if ( ! KeyVal || KeyVal.length != 2 ) {continue;} + var key = unescape( KeyVal[0] ); + var val = unescape( KeyVal[1] ); + val = val.replace(/\+/g, ' '); + Params[key] = val; + } + return Params; +} + +function tb_getPageSize(){ + var de = document.documentElement; + var w = window.innerWidth || self.innerWidth || (de&&de.clientWidth) || document.body.clientWidth; + var h = window.innerHeight || self.innerHeight || (de&&de.clientHeight) || document.body.clientHeight; + arrayPageSize = [w,h]; + return arrayPageSize; +} + +function tb_detectMacXFF() { + var userAgent = navigator.userAgent.toLowerCase(); + if (userAgent.indexOf('mac') != -1 && userAgent.indexOf('firefox')!=-1) { + return true; + } +} + + Index: libs/jquery/thickbox.css =================================================================== --- libs/jquery/thickbox.css (revision 453) +++ libs/jquery/thickbox.css (working copy) @@ -191,4 +191,4 @@ margin-bottom: -1px; margin-top: 1px; _margin-bottom: 1px; -} \ No newline at end of file +} Index: libs/jquery/stop.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: libs/jquery/stop.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/SmartyPlugins/function.loadJavascriptTranslations.php =================================================================== --- modules/SmartyPlugins/function.loadJavascriptTranslations.php (revision 453) +++ modules/SmartyPlugins/function.loadJavascriptTranslations.php (working copy) @@ -20,15 +20,16 @@ * (it is always loaded with translations): * * * * Note: Use translation string from your translation file WITHOUT '_js' suffix. * * _pk_translate DOES NOT support printf() arguments, but you can call: * - * sprintf(_pk_translate('_NB_OF_EGGS','There is %s eggs on the table'),'ten') - * + * sprintf(_pk_translate('_NB_OF_EGGS'),'ten') + * (where _NB_OF_EGGS is defined in translation file as i.e. 'There is %s eggs on the table') + * * sprintf() function is by default included when loading translations */ Index: modules/Translate.php =================================================================== --- modules/Translate.php (revision 453) +++ modules/Translate.php (working copy) @@ -108,8 +108,8 @@ } $js = substr($js,0,-1); $js .= '};'; - $js .= 'function _pk_translate(tvar, str) { '. - 'var s = str; if( typeof(translations[tvar]) != \'undefined\' ) s = translations[tvar];'. + $js .= 'function _pk_translate(k) { '. + 'var s = k; if( typeof(translations[k]) != \'undefined\' ) s = translations[k];'. 'return s;}'; return $js;