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

Fixed merge errors

Browse Source 
Former-commit-id: 30312c4b1ae7a3615576abbae90776f278586f27
This commit is contained in:
manuel.montes 2019-02-06 18:11:50 +01:00
parent d113bfbeb8
commit bf7e7f1e5c
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/setup/setup_general.php
View File

@ -125,8 +125,6 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
$table->data[19][1] = html_print_checkbox_toogle_switch_extended('activate_netflow', 1, $config['activate_netflow'], $rbt_disabled, '', '', true);
$table->data[19][1] = __('Yes').'   '.html_print_radio_button_extended('activate_netflow', 1, '', $config['activate_netflow'], $rbt_disabled, '', '', true).'  ';
$table->data[19][1] .= __('No').'   '.html_print_radio_button_extended('activate_netflow', 0, '', $config['activate_netflow'], $rbt_disabled, '', '', true);
$zone_name = [
'Africa' => __('Africa'),

7
pandora_console/godmode/setup/setup_visuals.php
View File

@ -550,13 +550,6 @@ $table_styles->data[$row][1] = html_print_checkbox_toogle_switch(
true
);
$table_styles->data[$row][0] = __('Visual effects and animation');
$table_styles->data[$row][1] = html_print_checkbox(
'visual_animation',
1,
$config['visual_animation'],
true
);
echo '<fieldset>';
echo '<legend>'.__('Style configuration').'</legend>';