tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed errors css jqueryui

This commit is contained in:
daniel 2018-11-07 17:09:42 +01:00
parent 218bf81fa1
commit 1c1df4b5f7
15 changed files with 45 additions and 1309 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/general/login_page.php
View File

@ -484,8 +484,8 @@ if($login_screen == 'error_authconfig' || $login_screen == 'error_emptyconfig' |
}
ui_require_css_file ('dialog');
ui_require_css_file ('jquery-ui-1.10.0.custom');
ui_require_jquery_file('jquery-ui-1.10.0.custom');
ui_require_css_file ('jquery-ui.min');
ui_require_jquery_file('jquery-ui.min');
?>
<?php

4
pandora_console/include/chart_generator.php
View File

@ -74,11 +74,11 @@ if (file_exists ('languages/'.$user_language.'.mo')) {
<title>Pandora FMS Graph (<?php echo agents_get_alias($agent_id) . ' - ' . $interface_name; ?>)</title>
<link rel="stylesheet" href="styles/pandora.css" type="text/css" />
<link rel="stylesheet" href="styles/pandora_minimal.css" type="text/css" />
<link rel="stylesheet" href="styles/jquery-ui-1.10.0.custom.css" type="text/css" />
<link rel="stylesheet" href="styles/jquery-ui.min.css" type="text/css" />
<script language="javascript" type='text/javascript' src='javascript/pandora.js'></script>
<script language="javascript" type='text/javascript' src='javascript/jquery-3.3.1.min.js'></script>
<script language="javascript" type='text/javascript' src='javascript/jquery.pandora.js'></script>
<script language="javascript" type='text/javascript' src='javascript/jquery.jquery-ui-1.10.0.custom.js'></script>
<script language="javascript" type='text/javascript' src='javascript/jquery-ui.min.js'></script>
<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.js"></script>
<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.min.js"></script>
<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.time.js"></script>

41
pandora_console/include/functions_ui.php
View File

@ -1456,6 +1456,14 @@ function ui_process_page_head ($string, $bitfield) {
$exists_css = !empty($skin_styles);
}
}
// Add the jquery UI styles CSS
$config['css']['jquery-UI'] = "include/styles/jquery-ui.min.css";
// Add the dialog styles CSS
$config['css']['dialog'] = "include/styles/dialog.css";
// Add the dialog styles CSS
$config['css']['dialog'] = "include/javascript/introjs.css";
//If skin's css files exists then add them
if ($exists_css) {
foreach ($skin_styles as $filename => $name) {
@ -1472,18 +1480,7 @@ function ui_process_page_head ($string, $bitfield) {
$config['style'] => "include/styles/" . $config['style'] . ".css"),
$config['css']);
}
// Add the jquery UI styles CSS
$config['css']['jquery-UI'] = "include/styles/jquery-ui-1.10.0.custom.css";
// Add the dialog styles CSS
$config['css']['dialog'] = "include/styles/dialog.css";
// Add the dialog styles CSS
$config['css']['dialog'] = "include/javascript/introjs.css";
//We can't load empty and we loaded (conditionally) ie
$loaded = array ('', 'ie');
@ -1500,18 +1497,14 @@ function ui_process_page_head ($string, $bitfield) {
////////////////////////////////////////////////////////////////////
//End load CSS
////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////
//Load JS
////////////////////////////////////////////////////////////////////
if (empty ($config['js'])) {
$config['js'] = array (); //If it's empty, false or not init set array to empty just in case
}
//Pandora specific JavaScript should go first
$config['js'] = array_merge (array ("pandora" => "include/javascript/pandora.js"), $config['js']);
//Load base64 javascript library
@ -1525,26 +1518,22 @@ function ui_process_page_head ($string, $bitfield) {
$config['js']['clippy'] = "include/javascript/clippy.js";
//Load Underscore.js library
$config['js']['underscore'] = "include/javascript/underscore-min.js";
//Load other javascript
//We can't load empty
$loaded = array ('');
foreach ($config['js'] as $name => $filename) {
if (in_array ($name, $loaded))
continue;
array_push ($loaded, $name);
$url_js = ui_get_full_url($filename);
$output .= '<script type="text/javascript" src="' . $url_js . '"></script>'."\n\t";
}
////////////////////////////////////////////////////////////////////
//End load JS
////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////
//Load jQuery
////////////////////////////////////////////////////////////////////
@ -1566,7 +1555,7 @@ function ui_process_page_head ($string, $bitfield) {
$config['jquery'] = array_merge(
array ("jquery" => "include/javascript/jquery-3.3.1.min.js",
"pandora" => "include/javascript/jquery.pandora.js",
'jquery-ui' => 'include/javascript/jquery.jquery-ui-1.10.0.custom.js'),
'jquery-ui' => 'include/javascript/jquery-ui.min.js'),
$config['jquery']);
}

13
pandora_console/include/javascript/jquery-ui.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

BIN
pandora_console/include/styles/images/ui-icons_444444_256x240.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
pandora_console/include/styles/images/ui-icons_555555_256x240.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
pandora_console/include/styles/images/ui-icons_777620_256x240.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
pandora_console/include/styles/images/ui-icons_777777_256x240.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
pandora_console/include/styles/images/ui-icons_cc0000_256x240.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
pandora_console/include/styles/images/ui-icons_ffffff_256x240.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

1273
pandora_console/include/styles/jquery-ui-1.10.0.custom.css vendored
View File

File diff suppressed because it is too large Load Diff

7
pandora_console/include/styles/jquery-ui.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
pandora_console/operation/agentes/interface_traffic_graph_win.php
View File

@ -83,11 +83,11 @@ $interface_traffic_modules = array(
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo __('%s Interface Graph', get_product_name()) . ' (' .agents_get_alias($agent_id) . ' - ' . $interface_name; ?>)</title>
<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
<link rel="stylesheet" href="../../include/styles/jquery-ui-1.10.0.custom.css" type="text/css" />
<link rel="stylesheet" href="../../include/styles/jquery-ui.min.css" type="text/css" />
<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery-3.3.1.min.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery.jquery-ui-1.10.0.custom.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery-ui.min.js'></script>
<?php
include_once($config["homedir"] . '/include/graphs/functions_flot.php');
echo include_javascript_dependencies_flot_graph(true, "../");

4
pandora_console/operation/agentes/realtime_win.php
View File

@ -70,11 +70,11 @@ echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo __("%s Realtime Module Graph", get_product_name());?></title>
<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
<link rel="stylesheet" href="../../include/styles/jquery-ui-1.10.0.custom.css" type="text/css" />
<link rel="stylesheet" href="../../include/styles/jquery-ui.min.css" type="text/css" />
<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery-3.3.1.min.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery.jquery-ui-1.10.0.custom.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery-ui.min.js'></script>
<?php
//Include the javascript for the js charts library
include_once($config["homedir"] . '/include/graphs/functions_flot.php');

4
pandora_console/operation/agentes/stat_win.php
View File

@ -78,11 +78,11 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo __("%s Graph", get_product_name()) . ' (' . $alias . ' - ' . $label; ?>)</title>
<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
<link rel="stylesheet" href="../../include/styles/jquery-ui-1.10.0.custom.css" type="text/css" />
<link rel="stylesheet" href="../../include/styles/jquery-ui.min.css" type="text/css" />
<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery-3.3.1.min.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery.jquery-ui-1.10.0.custom.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery-ui.min.js'></script>
<?php
include_once($config["homedir"] . '/include/graphs/functions_flot.php');
echo include_javascript_dependencies_flot_graph(true, "../");