[Noalyss-commit] [noalyss] 89/107: Task #1735: Détail opération utilisation icone poubelle

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 878c0ff5bc357f5741fee55dac59fe68ed994ea6
Author: Dany De Bontridder <address@hidden>
Date:   Mon Aug 19 13:34:28 2019 +0200

    Task #1735: Détail opération utilisation icone poubelle
---
 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 b475004..8b90b6e 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('<a class="smallbutton" 
style="margin-left:12;margin-right:12" 
href="ajax_misc.php?op=ledger&gDossier=%d&div=%s&jr_id=%s&act=rmf" 
onclick="return confirm(\'Effacer le document ?\')">'.SMALLX.'</a>',
+            $x=sprintf('<a class="smallbutton icon" 
style="margin-left:12;margin-right:12" 
href="ajax_misc.php?op=ledger&gDossier=%d&div=%s&jr_id=%s&act=rmf" 
onclick="return confirm(\'Effacer le document ?\')">'."x".'</a>',
                        $gDossier,$div,$jr_id);
             
         }  
diff --git a/include/lib/html_input.class.php b/include/lib/html_input.class.php
index 47bf256..1515627 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='<a class="tinybutton" id="acop'.$p_operation.'" 
href="javascript:void(0)" onclick="'.$rmOperation.'">'.SMALLX.'</a>';
+        $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 85c93f1..4fc3129 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='';