diff --git a/www/client/jquery.p4client.1.0.js b/www/client/jquery.p4client.1.0.js index 80cf90b93d..6374e7f872 100644 --- a/www/client/jquery.p4client.1.0.js +++ b/www/client/jquery.p4client.1.0.js @@ -779,45 +779,34 @@ function evt_print(basrec){ function evt_dwnl(lst) { - var dialog_box = $('#dialog_dwnl'); - - dialog_box = $('#dialog_dwnl'); - - dialog_box.empty().addClass('loading').dialog({ - width:800, - height:600, - modal:true, - closeOnEscape : true, - resizable : false, - zIndex:10000, - overlay: { - backgroundColor: '#000', - opacity: 0.7 - }, - beforeclose:function(){ - tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message'); - tinyMCE.execCommand('mceRemoveControl',true,'order_usage'); - } - }).dialog('open'); - - if(typeof(lst) == 'undefined') + if(typeof(lst) == 'undefined') { var datas = "&SSTTID="+$('#chutier_name')[0].options[$('#chutier_name')[0].selectedIndex].value; - else + } else { var datas = "&lst=" + lst; + } - $.post("/include/multiexports.php", datas, function(data) { + var dialog = p4.Dialog.Create({title: typeof(language) !== 'undefined' ? language['export']: ''}); - dialog_box.removeClass('loading').empty().append(data); - $('.tabs', dialog_box).tabs(); - tinyMCE.execCommand('mceAddControl',true,'sendmail_message'); - tinyMCE.execCommand('mceAddControl',true,'order_usage'); + dialog.getDomElement().bind("dialogbeforeclose", function(event, ui) { + tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message'); + tinyMCE.execCommand('mceRemoveControl',true,'order_usage'); + }); - $('.close_button', dialog_box).bind('click',function(){ - dialog_box.dialog('close').dialog('destroy'); + $.post("/prod/export/multi-export/", datas, function(data) { + + dialog.setContent(data); + + $('.tabs', dialog.getDomElement()).tabs(); + + tinyMCE.execCommand('mceAddControl',true,'sendmail_message'); + tinyMCE.execCommand('mceAddControl',true,'order_usage'); + + $('.close_button', dialog.getDomElement()).bind('click',function(){ + dialog.Close(); }); - return false; - }); + return false; + }); } function profil(value) diff --git a/www/include/jquery.common.js b/www/include/jquery.common.js index 4bccea56c9..5b1d8483e6 100644 --- a/www/include/jquery.common.js +++ b/www/include/jquery.common.js @@ -174,10 +174,9 @@ function print_notifications(page) $.ajax({ type: "POST", - url: "/prod/prodFeedBack.php", + url: "/user/notifications/", dataType : 'json', data: { - action: "NOTIFICATIONS_FULL", page:page }, error: function(data){ @@ -252,9 +251,8 @@ function read_notifications() $.ajax({ type: "POST", - url: "/prod/prodFeedBack.php", + url: "/user/notifications/read/", data: { - action: "READ_NOTIFICATIONS", notifications:notifications.join('_') }, success: function(data){ @@ -304,9 +302,8 @@ function setPref(name,value) jQuery.data['pref_'+name] = $.ajax({ type: "POST", - url: "/prod/UserPreferences/save/", + url: "/user/preferences/", data: { - action: "SAVEPREF", prop:name, value:value }, diff --git a/www/include/jquery.p4.preview.js b/www/include/jquery.p4.preview.js index e98dd55421..ec4e117c81 100644 --- a/www/include/jquery.p4.preview.js +++ b/www/include/jquery.p4.preview.js @@ -256,14 +256,12 @@ function getAnswerTrain(pos, tools, query,options_serial) $('#PREVIEWCURRENTCONT').fadeOut('fast'); $.ajax({ type: "POST", - url: "/prod/prodFeedBack.php", + url: "/prod/query/answer-train/", dataType: 'json', data: { - action: "ANSWERTRAIN", pos:pos, - options_serial:options_serial, - query:query - + options_serial:options_serial, + query:query }, success: function(data){ setCurrent(data.current); @@ -279,10 +277,9 @@ function getRegTrain(contId,pos,tools) { $.ajax({ type: "POST", - url: "./prodFeedBack.php", + url: "/prod/query/reg-train/", dataType: 'json', data: { - action: "REGTRAIN", cont:contId, pos:pos }, diff --git a/www/prod/page0.js b/www/prod/page0.js index 978c4193b4..a5a44479bc 100644 --- a/www/prod/page0.js +++ b/www/prod/page0.js @@ -2501,40 +2501,28 @@ function printThis(value) function downloadThis(datas) { - var dialog_box = $('#dialog_dwnl'); + var dialog = p4.Dialog.Create({title: language['export']}); - dialog_box = $('#dialog_dwnl'); + dialog.getDomElement().bind("dialogbeforeclose", function(event, ui) { + tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message'); + tinyMCE.execCommand('mceRemoveControl',true,'order_usage'); + }); - dialog_box.empty().addClass('loading').dialog({ - width:Math.min(bodySize.x - 30, 800), - height:Math.min(bodySize.y - 30, 600), - modal:true, - closeOnEscape : true, - resizable : false, - zIndex:1300, - overlay: { - backgroundColor: '#000', - opacity: 0.7 - }, - beforeclose:function(){ - tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message'); - tinyMCE.execCommand('mceRemoveControl',true,'order_usage'); - } - }).dialog('open'); + $.post("/prod/export/multi-export/", datas, function(data) { - $.post("/prod/multi-export/", datas, function(data) { + dialog.setContent(data); + + $('.tabs', dialog.getDomElement()).tabs(); - dialog_box.removeClass('loading').empty().append(data); - $('.tabs', dialog_box).tabs(); tinyMCE.execCommand('mceAddControl',true,'sendmail_message'); tinyMCE.execCommand('mceAddControl',true,'order_usage'); - $('.close_button', dialog_box).bind('click',function(){ - dialog_box.dialog('close').dialog('destroy'); - }); + $('.close_button', dialog.getDomElement()).bind('click',function(){ + dialog.Close(); + }); + return false; }); - } diff --git a/www/skins/lightbox/jquery.lightbox.ie6.js b/www/skins/lightbox/jquery.lightbox.ie6.js index 43c307969a..ad9424043c 100644 --- a/www/skins/lightbox/jquery.lightbox.ie6.js +++ b/www/skins/lightbox/jquery.lightbox.ie6.js @@ -477,39 +477,28 @@ function activate_notes(container) function download(value) { - var dialog_box = $('#dialog_dwnl'); + var dialog = p4.Dialog.Create({title: typeof(language) !== 'undefined' ? language['export']: ''}); - dialog_box = $('#dialog_dwnl'); + dialog.getDomElement().bind("dialogbeforeclose", function(event, ui) { + tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message'); + tinyMCE.execCommand('mceRemoveControl',true,'order_usage'); + }); - dialog_box.empty().addClass('loading').dialog({ - width:800, - height:600, - modal:true, - closeOnEscape : false, - resizable : false, - overlay: { - backgroundColor: '#000', - opacity: 0.7 - }, - beforeclose:function(){ - tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message'); - tinyMCE.execCommand('mceRemoveControl',true,'order_usage'); - } - }).dialog('open'); + $.post("/prod/export/multi-export/", "lst="+value, function(data) { - $.post("/include/multiexports.php", "lst="+value, function(data) { + dialog.setContent(data); - dialog_box.removeClass('loading').empty().append(data); - $('.tabs', dialog_box).tabs(); - tinyMCE.execCommand('mceAddControl',true,'sendmail_message'); - tinyMCE.execCommand('mceAddControl',true,'order_usage'); + $('.tabs', dialog.getDomElement()).tabs(); - $('.close_button', dialog_box).bind('click',function(){ - dialog_box.dialog('close').dialog('destroy'); + tinyMCE.execCommand('mceAddControl',true,'sendmail_message'); + tinyMCE.execCommand('mceAddControl',true,'order_usage'); + + $('.close_button', dialog.getDomElement()).bind('click',function(){ + dialog.Close(); }); - return false; - }); + return false; + }); } diff --git a/www/skins/lightbox/jquery.lightbox.js b/www/skins/lightbox/jquery.lightbox.js index f12d8dbedf..473edd978b 100644 --- a/www/skins/lightbox/jquery.lightbox.js +++ b/www/skins/lightbox/jquery.lightbox.js @@ -1076,38 +1076,27 @@ function download_basket() function download(value) { - var dialog_box = $('#dialog_dwnl'); + var dialog = p4.Dialog.Create({title: typeof(language) !== 'undefined' ? language['export']: ''}); - dialog_box = $('#dialog_dwnl'); - - dialog_box.empty().addClass('loading').dialog({ - width:800, - height:600, - modal:true, - closeOnEscape : false, - resizable : false, - overlay: { - backgroundColor: '#000', - opacity: 0.7 - }, - beforeclose:function(){ - tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message'); - tinyMCE.execCommand('mceRemoveControl',true,'order_usage'); - } - }).dialog('open'); - - $.post("/include/multiexports.php", "lst="+value, function(data) { - - dialog_box.removeClass('loading').empty().append(data); - $('.tabs', dialog_box).tabs(); - tinyMCE.execCommand('mceAddControl',true,'sendmail_message'); - tinyMCE.execCommand('mceAddControl',true,'order_usage'); - - $('.close_button', dialog_box).bind('click',function(){ - dialog_box.dialog('close').dialog('destroy'); + dialog.getDomElement().bind("dialogbeforeclose", function(event, ui) { + tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message'); + tinyMCE.execCommand('mceRemoveControl',true,'order_usage'); }); - return false; - }); + $.post("/prod/export/multi-export/", "lst="+value, function(data) { + + dialog.setContent(data); + + $('.tabs', dialog.getDomElement()).tabs(); + + tinyMCE.execCommand('mceAddControl',true,'sendmail_message'); + tinyMCE.execCommand('mceAddControl',true,'order_usage'); + + $('.close_button', dialog.getDomElement()).bind('click',function(){ + dialog.Close(); + }); + + return false; + }); }