tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-4004-Estilos-Discovery' into 'develop'

Browse Source 
Unify the styles of Discovery with Pandora - #4004

See merge request artica/pandorafms!2411

Former-commit-id: 463116b12ece33846a8d86514145e2d97e7eaec1
This commit is contained in:
Alejandro Fraguas 2019-05-13 13:05:34 +02:00
commit 20f77f5393
4 changed files with 24 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/wizards/HostDevices.class.php
View File

@ -742,7 +742,7 @@ class HostDevices extends Wizard
echo '<div class="white_box"> echo '<div class="white_box">
<div class="edit_discovery_info" style="margin-bottom: 15px;"> <div class="edit_discovery_info" style="margin-bottom: 15px;">
<div style="width: 25%; padding: 9px;">'.'<div style="height: 50%; margin-bottom: 35px;">'.html_print_image('images/wizard/netscan_green.png', true, ['title' => __('Close'), 'style' => 'width: 60%;'], false).'</div>'.'<div class="edit_discovery_input"><div style="display: flex;">'.$interval_input_label.'<div style="margin-left: 15 px; width: 50%;">'.$interval_input.'</div></div>'.$interval_input_extra.'</div>'.'</div> <div style="width: 25%; padding: 9px;">'.'<div style="height: 50%; margin-bottom: 35px;">'.html_print_image('images/wizard/netscan_green.png', true, ['title' => __('Close')], false).'</div>'.'<div class="edit_discovery_input"><div style="display: flex;">'.$interval_input_label.'<div style="margin-left: 15 px; width: 50%;">'.$interval_input.'</div></div>'.$interval_input_extra.'</div>'.'</div>
<div style="width: 40%; padding-left: 5%; padding-right: 12%;"> <div style="width: 40%; padding-left: 5%; padding-right: 12%;">
<div class="edit_discovery_input">'.$taskname_input_label.'<div class="discovery_text_input">'.$taskname_input.'</div></div>'.'<div class="edit_discovery_input discovery_select_input">'.$discovery_server_select_label.$discovery_server_select.'<div class="discovery_hint"></div></div>'.'<div class="edit_discovery_input">'.$network_input_label.'<div class="discovery_text_input">'.$network_input.'</div></div>'.'</div>'.'<div style="width: 35%;">'.$group_select.'</div>'.'</div>'.'<div class="edit_discovery_info"> <div class="edit_discovery_input">'.$taskname_input_label.'<div class="discovery_text_input">'.$taskname_input.'</div></div>'.'<div class="edit_discovery_input discovery_select_input">'.$discovery_server_select_label.$discovery_server_select.'<div class="discovery_hint"></div></div>'.'<div class="edit_discovery_input">'.$network_input_label.'<div class="discovery_text_input">'.$network_input.'</div></div>'.'</div>'.'<div style="width: 35%;">'.$group_select.'</div>'.'</div>'.'<div class="edit_discovery_info">

6
pandora_console/include/class/CustomNetScan.class.php
View File

@ -443,7 +443,7 @@ class CustomNetScan extends Wizard
'name' => 'taskname', 'name' => 'taskname',
'value' => $this->task['name'], 'value' => $this->task['name'],
'type' => 'text', 'type' => 'text',
'size' => 25, 'size' => 50,
], ],
]; ];
@ -465,7 +465,7 @@ class CustomNetScan extends Wizard
'name' => 'comment', 'name' => 'comment',
'value' => $this->task['description'], 'value' => $this->task['description'],
'type' => 'text', 'type' => 'text',
'size' => 25, 'size' => 50,
], ],
]; ];
@ -652,7 +652,7 @@ class CustomNetScan extends Wizard
'value' => $explanation, 'value' => $explanation,
'return' => true, 'return' => true,
'attributes' => 'style="width: 388px;"', 'attributes' => 'style="width: 388px;"',
'class' => 'discovery_textarea_input' 'class' => 'discovery_textarea_input',
], ],
]; ];

58
pandora_console/include/styles/discovery.css
View File

@ -162,7 +162,7 @@ span.breadcrumb_link {
.edit_discovery_info { .edit_discovery_info {
display: flex; display: flex;
align-items: center; align-items: flex-start;
padding-top: 25px; padding-top: 25px;
} }
@ -181,63 +181,41 @@ span.breadcrumb_link {
label { label {
color: #343434 !important; color: #343434 !important;
font-size: 1.5em;
font-family: "lato-bolder", "Open Sans", sans-serif !important;
font-weight: bold; font-weight: bold;
margin: 0px 0px 5px 0px;
} }
.discovery_full_width_input { .discovery_full_width_input {
width: 100%; width: 100%;
} }
select { li > input[type="text"],
font-family: "lato-bolder", "Open Sans", sans-serif !important; li > input[type="password"],
font-size: 1.6em !important; .discovery_text_input > input[type="password"],
color: #686868; .discovery_text_input > input[type="text"],
#interval_manual > input[type="text"] {
background-color: transparent !important;
border: none;
border-radius: 0 !important;
border-bottom: 1px solid #343434;
padding: 0px 0px 2px 0px;
box-sizing: border-box;
margin-bottom: 4px;
} }
select > option { #interval_manual > input[type="text"] {
font-family: "lato-bolder", "Open Sans", sans-serif !important;
font-size: 1em !important;
}
li > input[type=text], li > input[type=password], .discovery_text_input > input[type=password], .discovery_text_input > input[type=text], #interval_manual > input[type=text] {
background-color: transparent !important;
border: none;
border-radius: 0 !important;
border-bottom: 1px solid #343434;
padding: 0px 0px 2px 0px;
box-sizing: border-box;
margin-bottom: 4px;
font-family: "lato-bolder", "Open Sans", sans-serif !important;
font-size: 1.6em;
}
li > input[type=text]:focus, li > input[type=password]:focus, .discovery_text_input > input[type=password]:focus, .discovery_text_input > input[type=text]:focus, #interval_manual > input[type=text]:focus {
font-weight: bold;
}
#interval_manual > input[type=text] {
width: 50px; width: 50px;
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
} }
.discovery_list_input { .discovery_list_input {
font-family: "lato-bolder", "Open Sans", sans-serif !important;
font-size: 1.6em !important;
color: #686868;
width: 100%; width: 100%;
height: 240px; border: 1px solid #cbcbcb;
border: 1px solid #CBCBCB;
overflow-y: auto; overflow-y: auto;
} }
.discovery_list_input option { .discovery_list_input option {
font-family: "lato-bolder", "Open Sans", sans-serif !important; text-align: center;
font-size: 1.1em !important;
padding-left: 30%;
} }
.discovery_list_input option:checked { .discovery_list_input option:checked {
@ -253,11 +231,9 @@ li > input[type=text]:focus, li > input[type=password]:focus, .discovery_text_in
max-height: 100px; max-height: 100px;
max-width: 100%; max-width: 100%;
-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */ -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
-moz-box-sizing: border-box; /* Firefox, other Gecko */ -moz-box-sizing: border-box; /* Firefox, other Gecko */
box-sizing: border-box; box-sizing: border-box;
resize: none; resize: none;
font-family: "lato-bolder", "Open Sans", sans-serif !important;
font-size: 1.4em !important;
} }
a.tip { a.tip {

3
pandora_console/include/styles/wizard.css
View File

@ -6,7 +6,8 @@ ul.wizard {
} }
ul.wizard li { ul.wizard li {
padding: 10px; padding-bottom: 10px;
padding-top: 10px;
} }
ul.wizard li > label:not(.p-switch) { ul.wizard li > label:not(.p-switch) {