diff --git a/css/layout.css b/css/layout.css index 028eac0..4addf3d 100644 --- a/css/layout.css +++ b/css/layout.css @@ -6,6 +6,7 @@ font-family: Verdana, Arial, sans-serif; font-size: 12px; margin: 0 0 5px 0; padding: 0; +width: 100%; } /* - - - - - - - - - - - - - - - - - - - - */ @@ -92,17 +93,14 @@ float:right; padding: 0 5px 0 5px; } -#printpreviewheader { -padding: 3px; -font-size: 16px; -} - #menue { +width: 180px; padding: 0px; vertical-align: top; } .menuelinks a { +width: 180px; display: block; width: auto; margin-bottom: 2px; @@ -167,7 +165,7 @@ font-size: 10pt; } -table.zebra { border-spacing: 1px;margin-left: auto; margin-right: auto; width: 100%;} +table.zebra { border-spacing: 1px;margin-left: auto; margin-right: auto; width: 100%;} table.zebra th { } table.zebra td.footer { } table.zebra td { padding: 4px;} diff --git a/includes/polld.php b/includes/polld.php index f9beb2b..4a93eaa 100644 --- a/includes/polld.php +++ b/includes/polld.php @@ -310,7 +310,12 @@ class PollD { } // execute query and store result in mysql db if ($ignorePollFreq || !$this->checkFreq($tablename, $query["pollfreq"], $timestamp)){ - $result = $this->execute($query["tsmquery"], $server["servername"], $tablename, $timestamp); + try { + $result = $this->execute($query["tsmquery"], $server["servername"], $tablename, $timestamp); + } catch (exception $e) { + $result = ""; + print_r($e); + } if ($result != "") { if (!$this->checkHash($tablename, $result["md5"])) { if ($query["polltype"]=="update") { diff --git a/includes/tsmmonitor.php b/includes/tsmmonitor.php index 4490736..bca4af2 100644 --- a/includes/tsmmonitor.php +++ b/includes/tsmmonitor.php @@ -520,9 +520,9 @@ class TSMMonitor { if (($this->GETVars['ob'] == $name && $this->GETVars['ob']!="") || ($this->GETVars['ob']=="" && $orderby!="" && $orderby == $name)) { $link = "href='".$_SERVER['PHP_SELF']."?q=".$this->GETVars['qq']."&m=".$this->GETVars['menu']."&sort=".$name."&page=".$this->page."&so=".$sonew."&s=".$this->GETVars['server']."'"; if ($orderdir == "asc") { - $arrow = "⇑"; + $arrow = "↑"; } else if ($orderdir == "desc") { - $arrow = "⇓"; + $arrow = "↓"; } } else { $arrow = ""; diff --git a/index.php b/index.php index 0244325..2cb0194 100644 --- a/index.php +++ b/index.php @@ -164,11 +164,12 @@ if (isset($_SESSION["logindata"]["user"]) && isset($_SESSION["logindata"]["pass" } } echo ""; - echo $tsmmonitor->getTableheader(); + $thead = $tsmmonitor->getTableheader(); + echo $thead; echo $tsmmonitor->execute('table'); $nav = $tsmmonitor->showPageNavigation("40"); if ($nav!="") { - echo ""; + echo ""; } echo "
"; }