diff --git a/www/prod/jquery.Phraseanet.js b/www/prod/jquery.Phraseanet.js index 188d3dd8bb..8da8ac161a 100644 --- a/www/prod/jquery.Phraseanet.js +++ b/www/prod/jquery.Phraseanet.js @@ -2,6 +2,34 @@ var p4 = p4 || {}; (function(p4){ + var templates = []; + var LoadAndRender = function(TemplateName, datas, callback) { + + $.ajax({ + type: "GET", + url: "/prod/MustacheLoader/", + dataType: 'html', + data: { + template: TemplateName + }, + success: function(data){ + templates[TemplateName] = data; + + return MustacheRender(TemplateName, datas, callback); + } + }); + } + + var MustacheRender = function(TemplateName, datas, callback) { + if(templates[TemplateName]) + { + return callback(Mustache.render(templates[TemplateName], datas)); + } + else + return LoadAndRender(TemplateName, datas, callback); + }; + + p4.Mustache = MustacheRender; }(p4)); \ No newline at end of file diff --git a/www/prod/jquery.Results.js b/www/prod/jquery.Results.js index 7510b09d8b..b85a833b8c 100644 --- a/www/prod/jquery.Results.js +++ b/www/prod/jquery.Results.js @@ -3,9 +3,8 @@ var p4 = p4 || {}; (function(p4, window){ p4.Results = { - 'Selection':new Selectable({ + 'Selection':new Selectable($('#answers'), { selector : '.IMGT', - container:$('#answers'), selectStart:function(event, selection){ $('#answercontextwrap table:visible').hide(); }, diff --git a/www/prod/jquery.WorkZone.js b/www/prod/jquery.WorkZone.js index de37def992..727cb61e5b 100644 --- a/www/prod/jquery.WorkZone.js +++ b/www/prod/jquery.WorkZone.js @@ -561,7 +561,7 @@ var p4 = p4 || {}; }); p4.WorkZone = { - 'Selection':new Selectable({selector : '.CHIM', container:$('#baskets')}), + 'Selection':new Selectable($('#baskets'), {selector : '.CHIM'}), 'refresh':refreshBaskets, 'reloadCurrent':function(){ var sstt = $('#baskets .content:visible'); diff --git a/www/prod/page0.js b/www/prod/page0.js index c8cab0a19c..313892de9f 100644 --- a/www/prod/page0.js +++ b/www/prod/page0.js @@ -1866,32 +1866,30 @@ function chgStatusThis(url) function pushThis(sstt_id, lst) { - $('#MODALDL').attr('src','about:blank'); - - var $form = $('#push_form'); - - $('input[name="lst"]', $form).val(lst); - $('input[name="SSTTID"]', $form).val(sstt_id); - - $form.submit(); + $('#DIALOG').attr('title', 'Push') + .empty().addClass('loading') + .dialog({ + resizable:false, + closeOnEscape:true, + modal:true, + width:'800', + height:'500' + }) + .dialog('open'); - var w = bodySize.x - 40; - var h = bodySize.y - 40; - var t = (bodySize.y - h) / 2; - var l = (bodySize.x - w) / 2; + var options = { + lst:lst, + ssel:sstt_id + }; - $('#MODALDL').css({ - 'display': 'block', - 'opacity': 0, - 'width': w+'px', - 'position': 'absolute', - 'top': t, - 'left': l, - 'height': h+'px' - }).fadeTo(500, 1); + $.post("/prod/push/" + , options + , function(data){ + $('#DIALOG').removeClass('loading').empty().html(data); + return; + } + ); - showOverlay(2); - $('#tooltip').hide(); } function toolThis(url) @@ -2230,14 +2228,14 @@ function activeIcons() if($(this).hasClass('results_window')) { if(p4.Results.Selection.length() > 0) - value = "lst=" + p4.Results.Selection.serialize(); + value = p4.Results.Selection.serialize(); } else { if($(this).hasClass('basket_window')) { if(p4.WorkZone.Selection.length() > 0) - value = "lst=" + p4.WorkZone.Selection.serialize(); + value = p4.WorkZone.Selection.serialize(); else sstt_id = $('.SSTT.active').attr('id').split('_').slice(1,2).pop(); }