From 0e9f7331db0fc7ff1c71b3399e190bac3fa6f07e Mon Sep 17 00:00:00 2001
From: Pablo Aragon <pablo.aragon@pandorafms.com>
Date: Thu, 2 Mar 2023 17:08:47 +0100
Subject: [PATCH] Ipam

---
 .../include/class/NetworkMap.class.php        |  2 +-
 pandora_console/include/functions_html.php    | 14 ++++----
 pandora_console/include/styles/pandora.css    | 21 ++++++++----
 pandora_console/include/styles/tables.css     | 32 +++++++++++++++++++
 pandora_console/include/styles/wizard.css     | 15 +++++++++
 5 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/pandora_console/include/class/NetworkMap.class.php b/pandora_console/include/class/NetworkMap.class.php
index b513c5e4b1..596f4e7451 100644
--- a/pandora_console/include/class/NetworkMap.class.php
+++ b/pandora_console/include/class/NetworkMap.class.php
@@ -3657,7 +3657,7 @@ class NetworkMap
             $output .= '" charset="utf-8"></script>';
 
             $output .= '<div id="simple_map" data-id="'.$this->idMap.'" ';
-            $output .= 'class="border_1px_dd" style="';
+            $output .= 'class="border_1px_dd" style="background-color: #fff; ';
 
             if ($this->fullSize) {
                 $output .= ' width:100%';
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 0d2018ede2..eb907d1da1 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -2476,7 +2476,8 @@ function html_print_input_text_extended(
     $password=false,
     $function='',
     $autocomplete='off',
-    $disabled=false
+    $disabled=false,
+    $hide_div_eye=false,
 ) {
     global $config;
     static $idcounter = 0;
@@ -2551,7 +2552,7 @@ function html_print_input_text_extended(
             }
 
             // Only for password inputs.
-            if (($attribute === 'class') && ($password === true)) {
+            if (($attribute === 'class') && ($password === true) && ($hide_div_eye === false)) {
                 $attr_value .= ' show-hide-pass-background';
                 $hasClass = true;
             }
@@ -2563,7 +2564,7 @@ function html_print_input_text_extended(
         $attributes = [];
     }
 
-    if (($hasClass === false) && ($password === true)) {
+    if (($hasClass === false) && ($password === true) && ($hide_div_eye === false)) {
         $output .= 'class="show-hide-pass-background" ';
     }
 
@@ -2615,7 +2616,7 @@ function html_print_input_text_extended(
 
     $output .= $function.'/>';
 
-    if ($password === true) {
+    if ($password === true && $hide_div_eye === false) {
         $output .= html_print_div(
             [
                 'id'      => 'show-hide-'.$id,
@@ -2800,7 +2801,8 @@ function html_print_input_password(
     $disabled=false,
     $required=false,
     $class='',
-    $autocomplete='off'
+    $autocomplete='off',
+    $hide_div_eye=false,
 ) {
     if ($maxlength == 0) {
         $maxlength = 255;
@@ -2831,7 +2833,7 @@ function html_print_input_password(
         }
     }
 
-    return '<div class="relative container-div-input-password">'.html_print_input_text_extended($name, $value, 'password-'.$name, $alt, $size, $maxlength, $disabled, '', $attr, $return, true, '', $autocomplete).'</div>';
+    return '<div class="relative container-div-input-password">'.html_print_input_text_extended($name, $value, 'password-'.$name, $alt, $size, $maxlength, $disabled, '', $attr, $return, true, '', $autocomplete, false, $hide_div_eye).'</div>';
 }
 
 
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index c8e6cd38df..f4f422788f 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -312,15 +312,17 @@ table pre {
   white-space: pre-wrap;
 }
 
-tr:first-child > th {
+/* tr:first-child > th {
   background-color: #373737;
-}
+} */
 
 th {
-  color: #fff;
-  background-color: #666;
+  /* color: #fff; */
+  /* background-color: #666; */
+  color: #000;
   font-size: 7.5pt;
   letter-spacing: 0.3pt;
+  border-bottom: 1px solid #e2e2e2;
 }
 
 pre .color_333 {
@@ -2021,8 +2023,11 @@ table.databox {
 .databox > tbody > tr > th,
 .databox > thead > tr > th a {
   padding: 9px 7px;
-  font-weight: normal;
-  color: #fff;
+  /* font-weight: normal; */
+  font-weight: bold;
+  font-size: 9pt;
+  line-height: 16pt;
+  /* color: #fff; */
   text-align: center;
 }
 
@@ -10005,6 +10010,10 @@ select:disabled,
   color: #8a96a6;
 }
 
+/* input[type="password"] {
+  background-color: #f6f7fb;
+} */
+
 input:not([type="image"]):focus,
 textarea:focus,
 select:focus {
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index e97a937067..aa4aa05ca2 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -735,6 +735,12 @@ tr.datos2 > td.datos2 > div > div > label {
   margin-bottom: 10px;
 }
 
+.label-ipam-calculator {
+  font-size: 13px;
+  line-height: 20px;
+  font-weight: bold;
+}
+
 #text-vrf_name {
   width: 100%;
 }
@@ -758,3 +764,29 @@ table.filter-table-adv td div.inline-radio-button input[type="radio"] {
   padding-left: 12px;
   margin-right: 10px;
 }
+
+.select2-w100p > span.select2 {
+  width: 100% !important;
+}
+
+form#create_site > ul {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.select-ips-ipam > select {
+  min-height: 19.8em !important;
+}
+
+div.margin-top-50p {
+  margin-top: 50% !important;
+}
+
+.line-height-normal {
+  line-height: normal;
+}
+
+div[id^="auto-os-"] > img {
+  width: 20px;
+  height: 20px;
+}
diff --git a/pandora_console/include/styles/wizard.css b/pandora_console/include/styles/wizard.css
index 9d01aa42aa..7d0004c05a 100644
--- a/pandora_console/include/styles/wizard.css
+++ b/pandora_console/include/styles/wizard.css
@@ -195,3 +195,18 @@ ul.wizard li.mrgn_0px {
 ul.wizard li.pdd_0px {
   padding: 0;
 }
+
+li#textarea-create-site > textarea {
+  width: 100%;
+}
+
+form#create_site > ul.wizard > li > label {
+  font-size: 13px;
+  line-height: 16px;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+
+select[multiple] {
+  min-height: 20em;
+}