diff options
| author | Pim van den Berg | 2011-10-08 11:29:11 +0200 |
|---|---|---|
| committer | Pim van den Berg | 2011-10-08 11:29:11 +0200 |
| commit | a652177a65cc17c8dddaa739d30ce40dc20d68a9 (patch) | |
| tree | e7b7dd3b4ef84460b398ec5abc5886a78ffeeac6 /inc/html.inc.php | |
| parent | plugin/interface: fix empty instance descr. for collectd 5 (diff) | |
| download | apt-panopticon_cgp-a652177a65cc17c8dddaa739d30ce40dc20d68a9.zip apt-panopticon_cgp-a652177a65cc17c8dddaa739d30ce40dc20d68a9.tar.gz apt-panopticon_cgp-a652177a65cc17c8dddaa739d30ce40dc20d68a9.tar.bz2 apt-panopticon_cgp-a652177a65cc17c8dddaa739d30ce40dc20d68a9.tar.xz | |
include trailing slash in config weburl variable
When running CGP in the root, the header didn't link to the overview page
because the href was empty.
Reported-by: Nikoli <Nikoli@lavabit.com>
Diffstat (limited to 'inc/html.inc.php')
| -rw-r--r-- | inc/html.inc.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/inc/html.inc.php b/inc/html.inc.php index d4a31f2..2e71488 100644 --- a/inc/html.inc.php +++ b/inc/html.inc.php | |||
| @@ -18,8 +18,8 @@ function html_start() { | |||
| 18 | <head> | 18 | <head> |
| 19 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> | 19 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> |
| 20 | <title>CGP{$path}</title> | 20 | <title>CGP{$path}</title> |
| 21 | <link rel="stylesheet" href="{$CONFIG['weburl']}/layout/style.css" type="text/css"> | 21 | <link rel="stylesheet" href="{$CONFIG['weburl']}layout/style.css" type="text/css"> |
| 22 | <script type="text/javascript" src="{$CONFIG['weburl']}/ajax.js"></script> | 22 | <script type="text/javascript" src="{$CONFIG['weburl']}ajax.js"></script> |
| 23 | </head> | 23 | </head> |
| 24 | <body> | 24 | <body> |
| 25 | 25 | ||
| @@ -51,7 +51,7 @@ function html_end() { | |||
| 51 | echo <<<EOT | 51 | echo <<<EOT |
| 52 | </div> | 52 | </div> |
| 53 | <div id="footer"> | 53 | <div id="footer"> |
| 54 | <hr><span class="small"><a href="http://pommi.nethuis.nl/category/cgp/" rel="external">Collectd Graph Panel</a> ({$version}) is distributed under the <a href="{$CONFIG['weburl']}/doc/LICENSE" rel="licence">GNU General Public License (GPLv3)</a></span> | 54 | <hr><span class="small"><a href="http://pommi.nethuis.nl/category/cgp/" rel="external">Collectd Graph Panel</a> ({$version}) is distributed under the <a href="{$CONFIG['weburl']}doc/LICENSE" rel="licence">GNU General Public License (GPLv3)</a></span> |
| 55 | </div> | 55 | </div> |
| 56 | </body> | 56 | </body> |
| 57 | </html> | 57 | </html> |
| @@ -71,7 +71,7 @@ function plugin_header($host, $plugin, $status) { | |||
| 71 | $a = '-'; | 71 | $a = '-'; |
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | return printf("<h3><span class=\"point\" onclick=\"javascript:%sP('%s','%s')\"><img src=\"%s/layout/%s.gif\" alt=\"[%s]\"> %s</span></h3>\n", $f, $host, $plugin, $CONFIG['weburl'], $i, $a, $plugin); | 74 | return printf("<h3><span class=\"point\" onclick=\"javascript:%sP('%s','%s')\"><img src=\"%slayout/%s.gif\" alt=\"[%s]\"> %s</span></h3>\n", $f, $host, $plugin, $CONFIG['weburl'], $i, $a, $plugin); |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | function host_summary($hosts) { | 77 | function host_summary($hosts) { |
| @@ -88,7 +88,7 @@ function host_summary($hosts) { | |||
| 88 | $host_counter++; | 88 | $host_counter++; |
| 89 | 89 | ||
| 90 | printf('<tr class="%s">', $row_style[$host_counter % 2]); | 90 | printf('<tr class="%s">', $row_style[$host_counter % 2]); |
| 91 | printf('<th><a href="%s/host.php?h=%s">%s</a></th>', | 91 | printf('<th><a href="%shost.php?h=%s">%s</a></th>', |
| 92 | $CONFIG['weburl'],$host, $host); | 92 | $CONFIG['weburl'],$host, $host); |
| 93 | 93 | ||
| 94 | if ($CONFIG['showload']) { | 94 | if ($CONFIG['showload']) { |