From a10e79f663518fd117e4ad379c12fb690d92c0a4 Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@pandorafms.com>
Date: Tue, 7 Mar 2023 00:15:26 +0100
Subject: [PATCH] Dashboard minor fixes and icons

---
 .../views/dashboard/formDashboard.php         | 34 +++++++--------
 pandora_console/views/dashboard/header.php    | 41 ++++++++++++-------
 pandora_console/views/dashboard/list.php      | 10 ++---
 3 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/pandora_console/views/dashboard/formDashboard.php b/pandora_console/views/dashboard/formDashboard.php
index 71b4ce906d..27d61aa4b7 100644
--- a/pandora_console/views/dashboard/formDashboard.php
+++ b/pandora_console/views/dashboard/formDashboard.php
@@ -60,7 +60,7 @@ $form = [
     'id'       => 'form-update-dashboard',
     'action'   => $url,
     'onsubmit' => 'return false;',
-    'class'    => 'modal-dashboard',
+    'class'    => 'filter-list-adv',
     'enctype'  => 'multipart/form-data',
     'method'   => 'POST',
 ];
@@ -83,22 +83,6 @@ $inputs = [
             'maxlength' => 35,
         ],
     ],
-    [
-        'block_id'      => 'private',
-        'direct'        => 1,
-        'block_content' => [
-            [
-                'label'     => __('Private'),
-                'arguments' => [
-                    'name'    => 'private',
-                    'id'      => 'private',
-                    'type'    => 'switch',
-                    'value'   => $private,
-                    'onclick' => 'showGroup()',
-                ],
-            ],
-        ],
-    ],
     [
         'block_id'      => 'group',
         'direct'        => 1,
@@ -118,6 +102,22 @@ $inputs = [
             ],
         ],
     ],
+    [
+        'block_id'      => 'private',
+        'direct'        => 1,
+        'block_content' => [
+            [
+                'label'     => __('Private'),
+                'arguments' => [
+                    'name'    => 'private',
+                    'id'      => 'private',
+                    'type'    => 'switch',
+                    'value'   => $private,
+                    'onclick' => 'showGroup()',
+                ],
+            ],
+        ],
+    ],
     [
         'label'     => __('Favourite'),
         'arguments' => [
diff --git a/pandora_console/views/dashboard/header.php b/pandora_console/views/dashboard/header.php
index 257b71b96f..bfe6b3b242 100644
--- a/pandora_console/views/dashboard/header.php
+++ b/pandora_console/views/dashboard/header.php
@@ -37,11 +37,12 @@ $queryFull = [
 $urlFull = $url.'&'.http_build_query($queryFull);
 $fullscreen['text'] = '<a id="full_screen_link" href="'.$urlFull.'">';
 $fullscreen['text'] .= html_print_image(
-    'images/full_screen.png',
+    'images/fullscreen@svg.svg',
     true,
     [
         'title' => __('Full screen mode'),
-        'class' => 'invert_filter',
+        'style' => 'margin-top: 5px',
+        'class' => 'main_menu_icon invert_filter',
     ]
 );
 $fullscreen['text'] .= '</a>';
@@ -51,11 +52,11 @@ $queryNormal = ['dashboardId' => $dashboardId];
 $urlNormal = $url.'&'.http_build_query($queryNormal);
 $normalscreen['text'] = '<a href="'.$urlNormal.'">';
 $normalscreen['text'] .= html_print_image(
-    'images/normal_screen.png',
+    'images/exit_fullscreen@svg.svg',
     true,
     [
         'title' => __('Back to normal mode'),
-        'class' => 'invert_filter',
+        'class' => 'main_menu_icon invert_filter',
     ]
 );
 $normalscreen['text'] .= '</a>';
@@ -74,11 +75,12 @@ $options['text'] .= 'show_option_dialog('.json_encode(
 );
 $options['text'] .= ')\'>';
 $options['text'] .= html_print_image(
-    'images/setup.png',
+    'images/configuration@svg.svg',
     true,
     [
         'title' => __('Options'),
-        'class' => 'invert_filter',
+        'style' => 'margin-top: 5px',
+        'class' => 'main_menu_icon invert_filter',
     ]
 );
 $options['text'] .= '</a>';
@@ -86,11 +88,12 @@ $options['text'] .= '</a>';
 // Button for back to list dashboards.
 $back_to_dashboard_list['text'] = '<a href="'.$url.'">';
 $back_to_dashboard_list['text'] .= html_print_image(
-    'images/list.png',
+    'images/logs@svg.svg',
     true,
     [
         'title' => __('Back to dashboards list'),
-        'class' => 'invert_filter',
+        'style' => 'margin-top: 5px',
+        'class' => 'main_menu_icon invert_filter',
     ]
 );
 $back_to_dashboard_list['text'] .= '</a>';
@@ -113,7 +116,8 @@ $slides['text'] .= html_print_image(
     true,
     [
         'title' => __('Slides mode'),
-        'class' => 'invert_filter',
+        'style' => 'margin-top: 5px',
+        'class' => 'main_menu_icon invert_filter',
     ]
 );
 $slides['text'] .= '</a>';
@@ -130,11 +134,12 @@ $publicUrl = ui_get_full_url(
 );
 $publiclink['text'] = '<a id="public_link" href="'.$publicUrl.'" target="_blank">';
 $publiclink['text'] .= html_print_image(
-    'images/camera_mc.png',
+    'images/item-icon.svg',
     true,
     [
         'title' => __('Show link to public dashboard'),
-        'class' => 'invert_filter',
+        'style' => 'margin-top: 5px',
+        'class' => 'main_menu_icon invert_filter',
     ]
 );
 $publiclink['text'] .= '</a>';
@@ -195,10 +200,16 @@ $combo_dashboard['text'] .= html_print_select(
 $combo_dashboard['text'] .= '</form>';
 
 // Edit mode.
-$enable_disable['text'] = html_print_checkbox_switch(
-    'edit-mode',
-    1,
-    false,
+$enable_disable['text'] = html_print_div(
+    [
+        'style'   => 'margin-top: 10px;',
+        'content' => html_print_checkbox_switch(
+            'edit-mode',
+            1,
+            false,
+            true
+        ),
+    ],
     true
 );
 
diff --git a/pandora_console/views/dashboard/list.php b/pandora_console/views/dashboard/list.php
index 325a15e370..0eaafd98b5 100644
--- a/pandora_console/views/dashboard/list.php
+++ b/pandora_console/views/dashboard/list.php
@@ -157,9 +157,9 @@ if (empty($dashboards) === true) {
         $urlFull .= '&'.\http_build_query($dataQueryFull);
         $data['full_screen'] = '<a href="'.$urlFull.'">';
         $data['full_screen'] .= \html_print_image(
-            'images/fullscreen.png',
+            'images/fullscreen@svg.svg',
             true,
-            ['class' => 'invert_filter']
+            ['class' => 'main_menu_icon invert_filter']
         );
         $data['full_screen'] .= '</a>';
 
@@ -175,7 +175,7 @@ if (empty($dashboards) === true) {
             ];
             $urlCopy = $urlDashboard.'&'.\http_build_query($dataQueryCopy);
             $data['copy'] = '<a href="'.$urlCopy.'">';
-            $data['copy'] .= html_print_image('images/copy.png', true, ['class' => 'invert_filter']);
+            $data['copy'] .= html_print_image('images/copy.svg', true, ['class' => 'main_menu_icon invert_filter']);
             $data['copy'] .= '</a>';
 
             $dataQueryDelete = [
@@ -187,9 +187,9 @@ if (empty($dashboards) === true) {
             $data['delete'] = '<a href="'.$urlDelete;
             $data['delete'] .= '" onclick="javascript: if (!confirm(\''.__('Are you sure?').'\')) return false;">';
             $data['delete'] .= \html_print_image(
-                'images/cross.png',
+                'images/delete.svg',
                 true,
-                ['class' => 'invert_filter']
+                ['class' => 'main_menu_icon invert_filter']
             );
             $data['delete'] .= '</a>';
         }