View changes

pandora_console/extensions/api_checker.php

@@ -208,10 +208,21 @@ function extension_api_checker()
     html_print_table($table3);
     echo '</fieldset>';
 
-    echo "<div class='right'>";
     html_print_input_hidden('api_execute', 1);
-    html_print_submit_button(__('Call'), 'submit', false, 'class="sub next"');
+
-    echo '</div>';
+    html_print_div(
+        [
+            'class'   => 'action-buttons',
+            'content' => html_print_submit_button(
+                __('Call'),
+                'submit',
+                false,
+                [ 'icon' => 'next' ],
+                true
+            ),
+        ]
+    );
+
     echo '</form>';
 
     if ($api_execute) {

pandora_console/extensions/db_status.php

@@ -67,11 +67,20 @@ function extension_db_status()
     html_print_table($table);
     echo '</fieldset>';
 
-    echo "<div class='right'>";
+    html_print_div(
-    html_print_input_hidden('db_status_execute', 1);
+        [
-    html_print_submit_button(__('Execute Test'), 'submit', false, 'class="sub next"');
+            'class'   => 'action-buttons',
-    echo '</div>';
+            'content' => html_print_submit_button(
+                __('Execute Test'),
+                'submit',
+                false,
+                [ 'icon' => 'cog' ],
+                true
+            ),
+        ]
+    );
 
+    html_print_input_hidden('db_status_execute', 1);
     echo '</form>';
 
     if ($db_status_execute) {

pandora_console/extensions/dbmanager.php

@@ -195,15 +195,18 @@ function dbmgr_extension_main()
         );
     }
 
-    $data[4][2] = '<div class="action-buttons w100p">';
+    $data[4][2] = html_print_div(
-    $data[4][2] .= html_print_submit_button(
+        [
-        __('Execute SQL'),
+            'class'   => 'action-buttons',
-        '',
+            'content' => html_print_submit_button(
-        false,
+                __('Execute SQL'),
-        'class="sub next"',
+                '',
-        true
+                false,
+                [ 'icon' => 'cog' ],
+                true
+            ),
+        ]
     );
-    $data[4][2] .= '</div>';
 
     $table->data = $data;
     html_print_table($table);

pandora_console/extensions/insert_data.php

@@ -203,10 +203,20 @@ function mainInsertData()
 
     html_print_table($table);
 
-    echo "<div class='right' style='width: ".$table->width."'>";
     html_print_input_hidden('save', 1);
-    html_print_submit_button(__('Save'), 'submit', ($id_agent === ''), 'class="sub next"');
+
-    echo '</div>';
+    html_print_div(
+        [
+            'class'   => 'action-buttons',
+            'content' => html_print_submit_button(
+                __('Save'),
+                'submit',
+                (empty($id_agent) === true),
+                [ 'icon' => 'next' ],
+                true
+            ),
+        ]
+    );
 
     echo '</form>';
 

pandora_console/extensions/quick_shell.php

@@ -151,7 +151,7 @@ function quickShell()
                                 'name'       => 'submit',
                                 'label'      => __('Retry'),
                                 'type'       => 'submit',
-                                'attributes' => 'class="sub next"',
+                                'attributes' => ['icon' => 'next'],
                                 'return'     => true,
                             ],
                         ],

pandora_console/godmode/agentes/fields_manager.php

@@ -164,7 +164,16 @@ if ($fields) {
 }
 
 echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configure_field">';
-echo '<div class="action-buttons" style="width: '.$table->width.'">';
+html_print_div(
-html_print_submit_button(__('Create field'), 'crt', false, 'class="sub next"');
+    [
-echo '</div>';
+        'class'   => 'action-buttons',
+        'content' => html_print_submit_button(
+            __('Create field'),
+            'crt',
+            false,
+            [ 'icon' => 'next' ],
+            true
+        ),
+    ]
+);
 echo '</form>';

pandora_console/godmode/reporting/reporting_builder.php

@@ -1265,36 +1265,47 @@ switch ($action) {
         if (check_acl($config['id_user'], 0, 'RW')
             || check_acl($config['id_user'], 0, 'RM')
         ) {
-            echo '<form method="post" action="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=main&action=new&pure='.$pure.'">';
+            $output = '<form method="post" action="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=main&action=new&pure='.$pure.'">';
-            if (is_metaconsole() === true) {
+            $buttonsOutput .= html_print_submit_button(
-                echo '<div class="action-buttons w100p">';
-            } else {
-                echo '<div class="action-buttons w100p">';
-            }
-
-            html_print_submit_button(
                 __('Create report'),
                 'create',
                 false,
-                'class="sub next"'
+                [ 'icon' => 'next' ],
+                true
             );
+            $output .= '</form>';
 
-            echo '</form>';
+            $output .= '<form class="inline_line" id="massive_report_form" method="post" action="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=main&action=delete">';
-            echo '<form class="inline_line" id="massive_report_form" method="post" action="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=main&action=delete">';
 
             foreach ($reports as $report) {
-                echo '<input class="massive_report_form_elements" id="hidden-id_report_'.$report['id_report'].'" name="id_report[]" type="hidden" disabled value="'.$report['id_report'].'">';
+                $output .= '<input class="massive_report_form_elements" id="hidden-id_report_'.$report['id_report'].'" name="id_report[]" type="hidden" disabled value="'.$report['id_report'].'">';
             }
 
-            echo '<input id="hidden-action" name="action" type="hidden" value="delete_report">';
+            if (empty($report) === false) {
-            html_print_submit_button(
+                $output .= '<input id="hidden-action" name="action" type="hidden" value="delete_report">';
-                __('Delete'),
+                $buttonsOutput .= html_print_submit_button(
-                'delete_btn',
+                    __('Delete'),
-                false,
+                    'delete_btn',
-                'class="sub delete" class="mrgn_lft_5px"'
+                    false,
+                    [
+                        'icon' => 'delete',
+                        'mode' => 'secondary',
+                    ],
+                    true
+                );
+            }
+
+            $output .= html_print_div(
+                [
+                    'class'   => 'action-buttons',
+                    'content' => $buttonsOutput,
+                ],
+                true
             );
-            echo '</form>';
+
-            echo '</div>';
+            $output .= '</form>';
+
+            echo $output;
         }
 
         enterprise_hook('close_meta_frame');

pandora_console/operation/messages/message_edit.php

@@ -14,7 +14,7 @@
  * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
  *
  * ============================================================================
- * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Copyright (c) 2005-2022 Artica Soluciones Tecnologicas
  * Please see http://pandorafms.org for full contribution list
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -198,24 +198,37 @@ if ($read_message) {
         html_print_input_hidden('orig_user', $message['id_usuario_destino']);
     echo '</form>';
 
-    echo "<div class= 'action-buttons' style=' width:".$table->width."'>";
-    html_print_submit_button(
-        __('Delete conversation'),
-        'delete_btn',
-        false,
-        'form="delete_message" class="sub delete"'
-    );
-    echo '&nbsp';
     if (empty($message['id_usuario_origen']) !== true) {
-        html_print_submit_button(
+        $outputButtons .= html_print_submit_button(
             __('Reply'),
             'reply',
             false,
-            'form="reply_message" class="sub next"'
+            [
+                'icon' => 'next',
+                'form' => 'reply_message',
+            ],
+            true
         );
     }
 
-    echo '</div>';
+    $outputButtons .= html_print_submit_button(
+        __('Delete conversation'),
+        'delete_btn',
+        false,
+        [
+            'icon' => 'delete',
+            'mode' => 'secondary',
+            'form' => 'delete_message',
+        ],
+        true
+    );
+
+    html_print_div(
+        [
+            'class'   => 'action-buttons',
+            'content' => $outputButtons,
+        ],
+    );
 
     return;
 }
@@ -391,12 +404,11 @@ html_print_table($table);
 html_print_div(
     [
         'class'   => 'action-buttons',
-        'style'   => 'width: '.$table->width,
         'content' => html_print_submit_button(
             __('Send message'),
             'send_mes',
             false,
-            'class="sub wand"',
+            [ 'icon' => 'wand' ],
             true
         ),
     ]

pandora_console/operation/messages/message_list.php

@@ -14,7 +14,7 @@
  * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
  *
  * ============================================================================
- * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Copyright (c) 2005-2022 Artica Soluciones Tecnologicas
  * Please see http://pandorafms.org for full contribution list
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -279,36 +279,55 @@ if (empty($messages) === true) {
     }
 }
 
+$outputButton = html_print_submit_button(
+    __('Create message'),
+    'create',
+    false,
+    [
+        'icon' => 'next',
+        'form' => 'create_message_form',
+    ],
+    true
+);
+
 if (empty($messages) === false) {
     if ($show_sent === true) {
-        echo '<form method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_list&show_sent=1">';
+        echo '<form id="message_form" method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_list&show_sent=1">';
     } else {
-        echo '<form method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_list">';
+        echo '<form id="message_form" method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_list">';
     }
 
     html_print_input_hidden('multiple_delete', 1);
     html_print_table($table);
-        echo "<div class='float-right'>";
-            html_print_submit_button(
-                __('Delete'),
-                'delete_btn',
-                false,
-                'class="sub delete"'
-            );
-        echo '</div>';
     echo '</form>';
+
+    $outputButton .= html_print_submit_button(
+        __('Delete'),
+        'delete_btn',
+        false,
+        [
+            'icon' => 'delete',
+            'mode' => 'secondary',
+            'form' => 'message_form',
+        ],
+        true
+    );
 }
 
-echo "<div class='float-right'>";
+    echo '<form id="create_message_form" method="post" class="float-right" action="index.php?sec=message_list&sec2=operation/messages/message_edit"></form>';
-    echo '<form method="post" class="float-right" action="index.php?sec=message_list&sec2=operation/messages/message_edit">';
-        html_print_submit_button(__('Create message'), 'create', false, 'class="sub next mrgn_right_5px"');
-    echo '</form>';
-echo '</div>';
 
-if (is_ajax() !== true && is_metaconsole() === true) {
+    html_print_div(
-    enterprise_hook('close_meta_frame');
+        [
-}
+            'class'   => 'action-buttons',
-?>
+            'content' => $outputButton,
+        ]
+    );
+
+    if (is_ajax() !== true && is_metaconsole() === true) {
+        enterprise_hook('close_meta_frame');
+    }
+
+    ?>
 
 <script type="text/javascript">