From 878c0ff5bc357f5741fee55dac59fe68ed994ea6 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 19 Aug 2019 13:34:28 +0200 Subject: [PATCH] =?UTF-8?q?Task=20#1735:=20D=C3=A9tail=20op=C3=A9ration=20?= =?UTF-8?q?utilisation=20icone=20poubelle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/ajax/ajax_ledger.php | 3 ++- include/lib/html_input.class.php | 4 ++-- include/template/ledger_detail_bottom.php | 11 ++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/include/ajax/ajax_ledger.php b/include/ajax/ajax_ledger.php index b475004be..8b90b6e98 100644 --- a/include/ajax/ajax_ledger.php +++ b/include/ajax/ajax_ledger.php @@ -27,6 +27,7 @@ - load a receipt document - for reconcialiation - update of analytic content +* */ if ( ! defined('ALLOWED')) die(_('Non authorisé')); @@ -283,7 +284,7 @@ case 'file': { // Not possible to remove the file thanks a modal dialog box, // because of the frameset - $x=sprintf(''.SMALLX.'', + $x=sprintf(''."x".'', $gDossier,$div,$jr_id); } diff --git a/include/lib/html_input.class.php b/include/lib/html_input.class.php index 47bf25614..15156277d 100755 --- a/include/lib/html_input.class.php +++ b/include/lib/html_input.class.php @@ -1097,9 +1097,9 @@ class HtmlInput */ static function button_action_remove_operation($p_operation) { - $rmOperation=sprintf("javascript:confirm_box(null,'"._('Voulez-vous effacer cette relation ')."',function () {remove_operation('%s','%s');});", + $rmOperation=sprintf("confirm_box(null,'"._('Voulez-vous effacer cette relation ')."',function () {remove_operation('%s','%s');});", dossier::id(), $p_operation); - $js=''.SMALLX.''; + $js=Icon_Action::trash("acop".$p_operation, $rmOperation); return $js; } diff --git a/include/template/ledger_detail_bottom.php b/include/template/ledger_detail_bottom.php index 85c93f19e..4fc312941 100644 --- a/include/template/ledger_detail_bottom.php +++ b/include/template/ledger_detail_bottom.php @@ -189,11 +189,8 @@ if ($aRap != null ) { // If write access , allow to drop Reconciles operations if ( $access=='W') { - $rmReconciliation=new IButton('rmr'); - $rmReconciliation->label=SMALLX; - $rmReconciliation->class="tinybutton"; - $rmReconciliation->javascript="return confirm_box(null,'"._("vous confirmez?")."',"; - $rmReconciliation->javascript.=sprintf('function () { dropLink(\'%s\',\'%s\',\'%s\',\'%s\');deleteRowRec(\'%s\',$(\'row%d\'));})', + $js="return confirm_box(null,'"._("vous confirmez?")."',"; + $js.=sprintf('function () { dropLink(\'%s\',\'%s\',\'%s\',\'%s\');deleteRowRec(\'%s\',$(\'row%d\'));})', $gDossier, $div, $jr_id, @@ -201,8 +198,8 @@ if ($aRap != null ) { $tableid, $e ); - - $remove=$rmReconciliation->input(); + $remove=Icon_Action::trash(uniqid(), $js); +// $remove=$rmReconciliation->input(); } else $remove='';