diff --git a/www/include/jquery.common.js b/www/include/jquery.common.js index 0324842e42..a501b5858b 100644 --- a/www/include/jquery.common.js +++ b/www/include/jquery.common.js @@ -1,15 +1,21 @@ +var p4 = p4 || {}; + $(document).ready(function(){ - $('input.input-button').hover( function(){$(this).addClass('hover');}, function(){$(this).removeClass('hover');} ); var locale = $.cookie('locale'); - p4.lng = locale !== null ? locale.split('_').reverse().pop() : 'en'; + var jq_date = p4.lng = locale !== null ? locale.split('_').reverse().pop() : 'en'; + + if(jq_date == 'en') + { + jq_date = 'en-GB'; + } $.datepicker.setDefaults({showMonthAfterYear: false}); - $.datepicker.setDefaults($.datepicker.regional[p4.lng]); + $.datepicker.setDefaults($.datepicker.regional[jq_date]); $('a.infoDialog,div.infoDialog').live('click',function(event){ infoDialog($(this)); diff --git a/www/prod/page0.js b/www/prod/page0.js index 1cca969b0a..96ad4d2e2c 100644 --- a/www/prod/page0.js +++ b/www/prod/page0.js @@ -1,6 +1,6 @@ document.getElementById('loader_bar').style.width = '30%'; -var p4 = {}; +var p4 = p4 || {}; var baskAjax,baskAjaxrunning; baskAjaxrunning = false; @@ -1398,24 +1398,21 @@ $(document).ready(function(){ $('#loader_bar').stop().animate({ width:'70%' },450); - p4 = { - preview :{ + p4.preview = { open:false, current:false - }, - currentViewMode:'classic', - nbNoview:0, - reg_delete:true, - lng:'', - sel:[], - baskSel:[], - edit:{}, - thesau:{ + }; + p4.currentViewMode = 'classic'; + p4.nbNoview = 0; + p4.reg_delete = true; + p4.sel = []; + p4.baskSel = []; + p4.edit = {}; + p4.thesau = { tabs:null - }, - active_zone:false, - next_bask_scroll: false - }; + }; + p4.active_zone = false; + p4.next_bask_scroll = false; $('#backcolorpickerHolder').ColorPicker({