diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-05-31 09:17:23 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-05-31 09:17:23 +0000 |
| commit | 00d73a873b0ca6325a235db50e67ab5ff12eab94 (patch) | |
| tree | e3125a19618f061c9e8bf554bf3c635acac2ec4b /frontends/php | |
| parent | 1c57942f5b57f9afca03b111bf8a4eef2e00fb42 (diff) | |
| download | zabbix-00d73a873b0ca6325a235db50e67ab5ff12eab94.tar.gz zabbix-00d73a873b0ca6325a235db50e67ab5ff12eab94.tar.xz zabbix-00d73a873b0ca6325a235db50e67ab5ff12eab94.zip | |
- added availability to add js scripts to header (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@4217 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php')
| -rw-r--r-- | frontends/php/include/page_header.php | 21 | ||||
| -rw-r--r-- | frontends/php/services.php | 4 | ||||
| -rw-r--r-- | frontends/php/services_form.php | 8 | ||||
| -rw-r--r-- | frontends/php/srv_status.php | 3 |
4 files changed, 25 insertions, 11 deletions
diff --git a/frontends/php/include/page_header.php b/frontends/php/include/page_header.php index 00ec9fa1..05665354 100644 --- a/frontends/php/include/page_header.php +++ b/frontends/php/include/page_header.php @@ -341,12 +341,27 @@ COpt::profiling_start("page"); <html>
<head>
<title><?php echo $page['title'] ?></title>
-<?php if(defined('ZBX_PAGE_DO_REFRESH') && $USER_DETAILS["refresh"]) { ?>
- <meta http-equiv="refresh" content="<?php echo $USER_DETAILS["refresh"]; ?>">
-<?php } ?>
+<?php
+ if(defined('ZBX_PAGE_DO_REFRESH') && $USER_DETAILS["refresh"]) {
+ echo '<meta http-equiv="refresh" content="'.$USER_DETAILS["refresh"].'">';
+ }
+ ?>
<link rel="stylesheet" href="css.css">
<meta name="Author" content="ZABBIX SIA">
<script type="text/javascript" src="js/common.js"></script>
+<?php
+ if(isset($page['scripts'])){
+ foreach($page['scripts'] as $script){
+ if(file_exists('js/'.$script)){
+ echo ' <script type="text/javascript" src="js/'.$script.'"></script>'."\n";
+ } elseif(file_exists($script)){
+ echo ' <script type="text/javascript" src="'.$script.'"></script>'."\n";
+ } else {
+ echo '<!-- js script "'.$script.'" not found-->'."\n";
+ }
+ }
+ }
+?>
</head>
<body onLoad="zbxCallPostScripts();">
<?php
diff --git a/frontends/php/services.php b/frontends/php/services.php index 9c161a77..a7bcc6ed 100644 --- a/frontends/php/services.php +++ b/frontends/php/services.php @@ -23,6 +23,7 @@ include_once "include/services.inc.php"; $page["title"] = "S_IT_SERVICES"; $page["file"] = "services.php"; +$page['scripts'] = array('services.js'); include_once "include/page_header.php"; @@ -94,9 +95,6 @@ createServiceTree($services,$treeServ); //return into $treeServ parametr //permission issue $treeServ = del_empty_nodes($treeServ); - -echo '<script src="js/services.js" type="text/javascript"></script>'; - $p = new Ctag('p','yes'); $p->AddOption('align','center'); $p->AddOption('id','message'); diff --git a/frontends/php/services_form.php b/frontends/php/services_form.php index 1d2c0438..1547df25 100644 --- a/frontends/php/services_form.php +++ b/frontends/php/services_form.php @@ -25,6 +25,7 @@ $page["title"] = "S_IT_SERVICES";
$page["file"] = "services_form.php";
+ $page['scripts'] = array('services.js');
define('ZBX_PAGE_NO_MENU', 1);
include_once "include/page_header.php";
@@ -89,8 +90,10 @@ include_once "include/page_header.php"; $denyed_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_WRITE,PERM_MODE_LT);
if(isset($_REQUEST['serviceid']) && $_REQUEST['serviceid'] > 0){
- $query = "select s.* from services s LEFT JOIN triggers t on s.triggerid=t.triggerid ".
- " LEFT JOIN functions f on t.triggerid=f.triggerid LEFT JOIN items i on f.itemid=i.itemid ".
+ $query = "select s.* from services s ".
+ " LEFT JOIN triggers t on s.triggerid=t.triggerid ".
+ " LEFT JOIN functions f on t.triggerid=f.triggerid ".
+ " LEFT JOIN items i on f.itemid=i.itemid ".
" where (i.hostid is null or i.hostid not in (".$denyed_hosts.")) ".
" and ".DBid2nodeid("s.serviceid")."=".$ZBX_CURNODEID.
" and s.serviceid=".$_REQUEST["serviceid"];
@@ -100,7 +103,6 @@ include_once "include/page_header.php"; }
}
-echo '<script type="text/javascript" src="js/services.js"></script>';
/*-------------------------------------------- ACTIONS --------------------------------------------*/
if(isset($_REQUEST['saction'])){
diff --git a/frontends/php/srv_status.php b/frontends/php/srv_status.php index 0baf5e3f..21fbfec1 100644 --- a/frontends/php/srv_status.php +++ b/frontends/php/srv_status.php @@ -24,6 +24,7 @@ $page["title"] = "S_IT_SERVICES"; $page["file"] = "srv_status.php"; + $page['scripts'] = 'services.js'; define('ZBX_PAGE_DO_REFRESH', 1); @@ -169,8 +170,6 @@ include_once "include/page_header.php"; //permission issue $treeServ = del_empty_nodes($treeServ); - echo '<script src="js/services.js" type="text/javascript"></script>'; - $tree = new CTree($treeServ,array('caption' => '<b>'.S_SERVICE.'</b>', 'status' => '<b>'.S_STATUS.'</b>', 'reason' => '<b>'.S_REASON.'</b>', |