2013-05-27 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/module_manager_editor_common.php: Fixed creation of data modules for bug #2240 * godmode/servers/plugin.php include/javascript/pandora_modules.js godmode/agentes/module_manager_editor_plugin.php: Fixed the tips of the macros help and change the input of macro help from input to a textarea * include/functions_html.php include/styles/dialog.css include/styles/menu.css include/styles/jquery-ui-1.10.0.custom.css include/styles/pandora.css include/javascript/pandora_events.js operation/users/user_edit.php operation/agentes/stat_win.php images/event_responses.png images/filter_mc.png images/sort_down.png images/tick.png images/pandora.ico images/tick_off.png images/pandora.ico.gif images/star.png images/sort_up.png godmode/setup/setup_general.php: A lot of visual improvements git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8213 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo
parent
e84a0f7d14
commit
7953e4612a
|
|
@ -1,3 +1,34 @@
|
|||
2013-05-27 Sergio Martin <sergio.martin@artica.es>
|
||||
|
||||
* godmode/agentes/module_manager_editor_common.php: Fixed
|
||||
creation of data modules for bug #2240
|
||||
|
||||
* godmode/servers/plugin.php
|
||||
include/javascript/pandora_modules.js
|
||||
godmode/agentes/module_manager_editor_plugin.php: Fixed
|
||||
the tips of the macros help and change the input of macro
|
||||
help from input to a textarea
|
||||
|
||||
* include/functions_html.php
|
||||
include/styles/dialog.css
|
||||
include/styles/menu.css
|
||||
include/styles/jquery-ui-1.10.0.custom.css
|
||||
include/styles/pandora.css
|
||||
include/javascript/pandora_events.js
|
||||
operation/users/user_edit.php
|
||||
operation/agentes/stat_win.php
|
||||
images/event_responses.png
|
||||
images/filter_mc.png
|
||||
images/sort_down.png
|
||||
images/tick.png
|
||||
images/pandora.ico
|
||||
images/tick_off.png
|
||||
images/pandora.ico.gif
|
||||
images/star.png
|
||||
images/sort_up.png
|
||||
godmode/setup/setup_general.php: A lot of visual
|
||||
improvements
|
||||
|
||||
2013-05-27 Miguel de Dios <miguel.dedios@artica.es>
|
||||
|
||||
* operation/search_main.php: change the label to show when the list
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ $table_simple->colspan[6][1] = 3;
|
|||
|
||||
$table_simple->data[0][0] = __('Name');
|
||||
$table_simple->data[0][1] = html_print_input_text_extended ('name',
|
||||
io_safe_output($name), 'text-'.$name, '', 45, 100, $disabledBecauseInPolicy, '', 'autocomplete="off"', true);
|
||||
io_safe_output($name), 'text-name', '', 45, 100, $disabledBecauseInPolicy, '', 'autocomplete="off"', true);
|
||||
//$table_simple->data[0][1] = html_print_input_text ('name',
|
||||
// io_safe_output($name), '', 45, 100, true, $disabledBecauseInPolicy);
|
||||
|
||||
|
|
|
|||
|
|
@ -102,10 +102,10 @@ function changePluginSelect() {
|
|||
},
|
||||
function (data, status) {
|
||||
$("#plugin_description").html(data);
|
||||
forced_title_callback();
|
||||
}
|
||||
);
|
||||
|
||||
load_plugin_macros_fields('simple-macro');
|
||||
forced_title_callback();
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -117,6 +117,7 @@ if (($create != "") OR ($view != "")) {
|
|||
$fields[1]= __("Nagios");
|
||||
$data[1] = html_print_select ($fields, "form_plugin_type", $form_plugin_type, '', '', 0, true);
|
||||
$table->data['plugin_type'] = $data;
|
||||
$table->colspan['plugin_type'][1] = 3;
|
||||
|
||||
$data[0] = __('Max. timeout').ui_print_help_tip (__('This value only will be applied if is minor than the server general configuration plugin timeout').'. <br><br>'.__('If you set a 0 seconds timeout, the server plugin timeout will be used'), true);
|
||||
$data[1] = html_print_extended_select_for_time ('form_max_timeout', $form_max_timeout, '', '', '0', false, true);
|
||||
|
|
@ -131,7 +132,7 @@ if (($create != "") OR ($view != "")) {
|
|||
$table->data['plugin_desc'] = $data;
|
||||
|
||||
echo '<br>';
|
||||
echo '<table class="databox" style="margin: 0 auto;"><tr><td>';
|
||||
echo '<table class="databox" style="margin: 0 auto; width: 98%;"><tr><td>';
|
||||
|
||||
echo '<fieldset style="width:96%"><legend>'.__('General').'</legend>';
|
||||
html_print_table($table);
|
||||
|
|
@ -243,7 +244,8 @@ if (($create != "") OR ($view != "")) {
|
|||
|
||||
$datam = array ();
|
||||
$datam[0] = __('Help')."<span style='font-weight: normal'> ($macro_name)</span><br><br><br>";
|
||||
$datam[1] = html_print_input_text_extended ($macro_help_name, $macro_help_value, 'text-'.$macro_help_name, '', 100, 255, $locked, '', "class='command_advanced_conf'", true);
|
||||
$datam[1] = html_print_textarea ($macro_help_name, 6, 100, $macro_help_value, 'class="command_advanced_conf" style="width: 97%;"' . $locked ? ' disabled' : '', true);
|
||||
|
||||
if($locked) {
|
||||
$datam[1] .= html_print_image('images/lock.png', true, array('class' => 'command_advanced_conf'));
|
||||
}
|
||||
|
|
@ -263,7 +265,7 @@ if (($create != "") OR ($view != "")) {
|
|||
if($i <= 2) {
|
||||
$delete_macro_style = 'display:none;';
|
||||
}
|
||||
$datam[2] = '<div id="delete_macro_button" style="'.$delete_macro_style.'">'.__('Delete macro').' <a href="javascript:delete_macro(\'table-form-plugin_\');update_preview();">'.html_print_image('images/cancel.png',true).'</a></div>';
|
||||
$datam[2] = '<div id="delete_macro_button" style="'.$delete_macro_style.'">'.__('Delete macro').' <a href="javascript:delete_macro(\'table-form-plugin_\');update_preview();">'.html_print_image('images/delete.png',true).'</a></div>';
|
||||
|
||||
$table->colspan['plugin_action'][0] = 2;
|
||||
$table->rowstyle['plugin_action'] = 'text-align:center';
|
||||
|
|
|
|||
|
|
@ -161,8 +161,8 @@ if ($config["integria_enabled"]) {
|
|||
}
|
||||
|
||||
$table->data[19][0] = __('Enable Netflow');
|
||||
$table->data[19][1] = __('Yes').' '.html_print_radio_button ('activate_netflow', 1, '', $config["activate_netflow"], true).' ';
|
||||
$table->data[19][1] .= __('No').' '.html_print_radio_button ('activate_netflow', 0, '', $config["activate_netflow"], true);
|
||||
$table->data[19][1] = __('Yes').' '.html_print_radio_button ('activate_netflow', 1, '', $config["activate_netflow"], true).' ';
|
||||
$table->data[19][1] .= __('No').' '.html_print_radio_button ('activate_netflow', 0, '', $config["activate_netflow"], true);
|
||||
|
||||
$zone_name = array('Africa' => __('Africa'), 'America' => __('America'), 'Antarctica' => __('Antarctica'), 'Arctic' => __('Arctic'), 'Asia' => __('Asia'), 'Atlantic' => __('Atlantic'), 'Australia' => __('Australia'), 'Europe' => __('Europe'), 'Indian' => __('Indian'), 'Pacific' => __('Pacific'), 'UTC' => __('UTC'));
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 318 B |
Binary file not shown.
|
Before Width: | Height: | Size: 372 B After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 187 B After Width: | Height: | Size: 1021 B |
Binary file not shown.
|
Before Width: | Height: | Size: 187 B After Width: | Height: | Size: 1017 B |
Binary file not shown.
|
Before Width: | Height: | Size: 611 B After Width: | Height: | Size: 265 B |
Binary file not shown.
|
Before Width: | Height: | Size: 537 B After Width: | Height: | Size: 294 B |
Binary file not shown.
|
Before Width: | Height: | Size: 387 B After Width: | Height: | Size: 301 B |
|
|
@ -1354,7 +1354,7 @@ function html_print_table (&$table, $return = false) {
|
|||
$tableid = empty ($table->id) ? 'table'.$table_count : $table->id;
|
||||
|
||||
if (!empty($table->width)) {
|
||||
$output .= '<table style="' . $styleTable . '" width="'.$table->width.'"'.$table->tablealign;
|
||||
$output .= '<table style="width:' . $table->width . ';' . $styleTable . '"'.$table->tablealign;
|
||||
}
|
||||
else {
|
||||
$output .= '<table style="' . $styleTable . '"'.$table->tablealign;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ function show_event_dialog(event_id, group_rep, dialog_page, result) {
|
|||
opacity: 0.5,
|
||||
background: "black"
|
||||
},
|
||||
width: 620,
|
||||
width: 700,
|
||||
height: 500
|
||||
})
|
||||
.show ();
|
||||
|
|
|
|||
|
|
@ -565,7 +565,8 @@ function new_macro(prefix) {
|
|||
|
||||
function add_macro_field(macro, row_model_id) {
|
||||
var macro_desc = macro['desc'];
|
||||
var macro_help = macro['help'];
|
||||
// Change the carriage returns by html returns <br> in help
|
||||
var macro_help = macro['help'].replace(/
/g,"<br>");
|
||||
var macro_macro = macro['macro'];
|
||||
var macro_value = macro['value'];
|
||||
|
||||
|
|
@ -597,6 +598,15 @@ function add_macro_field(macro, row_model_id) {
|
|||
var field_desc = $('#'+row_id).children().eq(0).html();
|
||||
field_desc = field_desc.replace('macro_desc',macro_desc);
|
||||
field_desc = field_desc.replace('macro_help',macro_help);
|
||||
|
||||
// Get the cloned forced title id and replace for a uniq id
|
||||
regex = /forced_title_(\w+)/;
|
||||
var forced_title_id = field_desc.match(regex)[1];
|
||||
var uniq_id = 'id' + (new Date()).getTime();
|
||||
|
||||
field_desc = field_desc.replace(forced_title_id, uniq_id);
|
||||
field_desc = field_desc.replace(forced_title_id, uniq_id);
|
||||
|
||||
$('#'+row_id).children().eq(0).html(field_desc);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,9 +22,8 @@
|
|||
}
|
||||
|
||||
.ui-dialog .ui-dialog-titlebar {
|
||||
background-color: #f3f3f3;
|
||||
height: 14px !important;
|
||||
#_height: 16px !important;
|
||||
background-color: #ECECEC;
|
||||
height: 24px !important;
|
||||
padding: 0.3em 1em !important;
|
||||
position:relative;
|
||||
margin: 0px auto 0 auto !important;
|
||||
|
|
@ -113,7 +112,7 @@
|
|||
}
|
||||
|
||||
.ui-tabs-panel {
|
||||
background: #F3F3F3 !important;
|
||||
background: #ECECEC !important;
|
||||
-moz-border-radius: 8px !important;
|
||||
-webkit-border-radius: 8px !important;
|
||||
border-radius: 8px !important;
|
||||
|
|
@ -135,7 +134,7 @@
|
|||
|
||||
.ui-state-default {
|
||||
background: #fff !important;
|
||||
border: 2px solid #f3f3f3 !important;
|
||||
border: 2px solid #ECECEC !important;
|
||||
-moz-border-top-left-radius: 10px !important;
|
||||
-webkit-top-left-border-radius: 10px !important;
|
||||
border-top-left-radius: 10px !important;
|
||||
|
|
@ -145,7 +144,7 @@
|
|||
margin-left: 2px !important;
|
||||
}
|
||||
.ui-state-active {
|
||||
background: #f3f3f3 !important;
|
||||
background: #ECECEC !important;
|
||||
}
|
||||
|
||||
.ui-dialog-content {
|
||||
|
|
|
|||
|
|
@ -1179,7 +1179,7 @@ body .ui-tooltip {
|
|||
}
|
||||
|
||||
.ui-widget-header {
|
||||
background: #B1B1B1 !important;
|
||||
background: #B1B1B1;
|
||||
color: #ffffff !important;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@
|
|||
|
||||
.menu .menu_icon, .menu li.links {
|
||||
background-color: #daedae;
|
||||
background-position: 4px 4px;
|
||||
background-position: 4px center;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -362,7 +362,7 @@ div#login_in, #login_f {
|
|||
padding: 3px;
|
||||
border-radius: 11px;
|
||||
width: 250px !important;
|
||||
margin: 50px auto;
|
||||
margin: 100px auto;
|
||||
background: transparent;
|
||||
}
|
||||
div#error_login {
|
||||
|
|
@ -428,12 +428,6 @@ input.login {
|
|||
height: 18px;
|
||||
font-weight: bold;
|
||||
}
|
||||
/* FF hack for login inputs */
|
||||
@-moz-document url-prefix() {
|
||||
input.login{
|
||||
margin: -2px 0 8px 20px !important;
|
||||
}
|
||||
}
|
||||
|
||||
input.login_user {
|
||||
/* Browser without multibackground support */
|
||||
|
|
@ -2069,7 +2063,7 @@ div#main {
|
|||
div#head {
|
||||
width: auto;
|
||||
height: auto;
|
||||
background-color: #000;
|
||||
background-color: #333;
|
||||
background-image: url(../../images/header_blackout.png);
|
||||
height: 47px;
|
||||
min-width: 882px;
|
||||
|
|
@ -2308,39 +2302,43 @@ tr.group_view_data, .group_view_data {
|
|||
}
|
||||
|
||||
/* classes for event priorities. Sits now in functions.php */
|
||||
.datos_green, .datos_greenf9, .datos_green a, .datos_greenf9 a {
|
||||
.datos_green, .datos_greenf9, .datos_green a, .datos_greenf9 a, .datos_green * {
|
||||
background-color: #6EB432;
|
||||
color: #fff;
|
||||
}
|
||||
.datos_red, .datos_redf9, .datos_red a, .datos_redf9 a{
|
||||
.datos_red, .datos_redf9, .datos_red a, .datos_redf9 a, .datos_red *{
|
||||
background-color: #FF4040;
|
||||
color: #fff !important;
|
||||
}
|
||||
|
||||
.datos_yellow, .datos_yellowf9 {
|
||||
.datos_yellow, .datos_yellowf9, .datos_yellow * {
|
||||
background-color: #F2D400;
|
||||
color: #111;
|
||||
}
|
||||
|
||||
a.datos_blue, .datos_bluef9, .datos_blue {
|
||||
a.datos_blue, .datos_bluef9, .datos_blue, .datos_blue * {
|
||||
background-color: #4CA8E0;
|
||||
color: #111;
|
||||
}
|
||||
|
||||
.datos_grey, .datos_greyf9 {
|
||||
.datos_grey, .datos_greyf9, .datos_grey * {
|
||||
background-color: #999999;
|
||||
color: #111;
|
||||
}
|
||||
|
||||
.datos_pink, .datos_pinkf9 {
|
||||
.datos_pink, .datos_pinkf9, .datos_pink * {
|
||||
background-color: #F099A2;
|
||||
color: #111;
|
||||
}
|
||||
|
||||
.datos_brown, .datos_brownf9 {
|
||||
.datos_brown, .datos_brownf9, .datos_brown * {
|
||||
background-color: #A67C52;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.datos_orange, .datos_orangef9 {
|
||||
.datos_orange, .datos_orangef9, .datos_orange * {
|
||||
background-color: #F7931E;
|
||||
color: #111;
|
||||
}
|
||||
|
||||
td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yellowf9, td.datos_pinkf9, td.datos_brownf9 ,td.datos_orangef9 {
|
||||
|
|
@ -2570,7 +2568,7 @@ input.search_input {
|
|||
color: #999;
|
||||
}
|
||||
|
||||
td input, td select {
|
||||
.vertical_fields td input, .vertical_fields td select {
|
||||
margin-top: 8px !important;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ $label = base64_decode(get_parameter('label', ''));
|
|||
///////////////////////////
|
||||
$params = array();
|
||||
// TOP TEXT
|
||||
$params['top_text'] = "<div style='color: white; width: 100%; text-align: center; font-weight: bold;'>" . html_print_image('images/config_mc.png', true) . ' ' . __('Pandora FMS Graph configuration menu') . "</div>";
|
||||
$params['top_text'] = "<div style='color: white; width: 100%; text-align: center; font-weight: bold; vertical-align: top;'>" . html_print_image('images/config_mc.png', true, array('width' => '16px')) . ' ' . __('Pandora FMS Graph configuration menu') . "</div>";
|
||||
$params['body_text'] = "<div class='menu_sidebar_outer'>";
|
||||
$params['body_text'] .=__('Please, make your changes and apply with the <i>Reload</i> button');
|
||||
|
||||
|
|
@ -235,7 +235,9 @@ $label = base64_decode(get_parameter('label', ''));
|
|||
$table->id = 'stat_win_form_div';
|
||||
$table->style[0] = 'text-align:left; padding: 7px;';
|
||||
$table->style[1] = 'text-align:left;';
|
||||
$table->size[0] = '50%';
|
||||
//$table->size[0] = '50%';
|
||||
$table->styleTable = 'border-spacing: 4px;';
|
||||
$table->class = 'alternate';
|
||||
|
||||
$data = array();
|
||||
$data[0] = __('Refresh time');
|
||||
|
|
@ -346,7 +348,7 @@ $label = base64_decode(get_parameter('label', ''));
|
|||
$table->rowclass[] = '';
|
||||
|
||||
$data = array();
|
||||
$data[0] = '<div style="width:100%; text-align:right;">' . html_print_submit_button (__('Reload'), "submit", false, 'class="sub next"', true) . "</div>";
|
||||
$data[0] = '<div style="width:100%; text-align:right;">' . html_print_submit_button (__('Reload'), "submit", false, 'class="sub upd"', true) . "</div>";
|
||||
$table->data[] = $data;
|
||||
$table->rowclass[] = '';
|
||||
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ $table->id = 'user_form';
|
|||
$table->width = '98%';
|
||||
$table->cellspacing = 4;
|
||||
$table->cellpadding = 4;
|
||||
$table->class = '';
|
||||
$table->class = 'vertical_fields';
|
||||
$table->style[2] = 'width: 175px;';
|
||||
|
||||
$data = array();
|
||||
|
|
@ -212,7 +212,7 @@ $data = array();
|
|||
$data[0] = __('E-mail');
|
||||
$data[0] .= '<br>' . html_print_input_text_extended ("email", $user_info["email"], '', '', '40', '100', $view_mode, '', 'class="input"', true);
|
||||
$data[1] = __('Phone number');
|
||||
$data[1] .= html_print_input_text_extended ("phone", $user_info["phone"], '', '', '40', '30', $view_mode, '', 'class="input"', true);
|
||||
$data[1] .= '<br>' . html_print_input_text_extended ("phone", $user_info["phone"], '', '', '40', '30', $view_mode, '', 'class="input"', true);
|
||||
$table->rowclass[] = '';
|
||||
$table->rowstyle[] = 'font-weight: bold;';
|
||||
$table->data[] = $data;
|
||||
|
|
|
|||
Loading…
Reference in New Issue