diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/1.php bartlby-ui/1.php --- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/1.php 2008-04-03 11:21:13.000000000 +0200 +++ bartlby-ui/1.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ - \ No newline at end of file diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/bartlby_action.php bartlby-ui/bartlby_action.php --- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/bartlby_action.php 2008-04-03 11:21:13.000000000 +0200 +++ bartlby-ui/bartlby_action.php 2008-05-24 12:44:33.000000000 +0200 @@ -7,9 +7,10 @@ if($_POST[action]) { $act=$_POST[action]; } +$btl=new BartlbyUi($Bartlby_CONF); $layout= new Layout(); $layout->setTitle("Bartlby Action ($act)"); -$btl=new BartlbyUi($Bartlby_CONF); + $layout->Table("100%"); @@ -551,10 +552,18 @@ if($df == false) { $exec_plan=""; } - $ads=bartlby_add_service($btl->CFG, $_GET[service_server], $_GET[service_plugin],$_GET[service_name],$_GET[service_args],$_GET[notify_enabled], $exec_plan,$_GET[service_interval],$_GET[service_type],$_GET[service_var], $_GET[service_passive_timeout], $_GET[service_check_timeout], $_GET[service_ack], $_GET[service_retain], $_GET[service_snmp_community], $_GET[service_snmp_objid], $_GET[service_snmp_version], $_GET[service_snmp_warning], $_GET[service_snmp_critical], $_GET[service_snmp_type],$_GET[service_active], $_GET[flap_seconds],$_GET[renotify_interval], $_GET[escalate_divisor]); - $global_msg=bartlby_get_server_by_id($btl->CFG, $_GET[service_server]); - $global_msg[exec_plan]=$btl->resolveServicePlan($exec_plan); + for($x = 0; $xCFG, $server_id, $_GET[service_plugin],$_GET[service_name],$_GET[service_args],$_GET[notify_enabled], $exec_plan,$_GET[service_interval],$_GET[service_type],$_GET[service_var], $_GET[service_passive_timeout], $_GET[service_check_timeout], $_GET[service_ack], $_GET[service_retain], $_GET[service_snmp_community], $_GET[service_snmp_objid], $_GET[service_snmp_version], $_GET[service_snmp_warning], $_GET[service_snmp_critical], $_GET[service_snmp_type],$_GET[service_active], $_GET[flap_seconds],$_GET[renotify_interval], $_GET[escalate_divisor]); + $tmp=bartlby_get_server_by_id($btl->CFG, $server_id); + + $global_msg[server_name] .= $tmp[server_name] . ","; + + + } + + $global_msg[exec_plan]=$btl->resolveServicePlan($exec_plan); $act="service_" . $_GET[service_type]; if($_GET[service_type] == 3) { $global_msg[group_out] = $btl->resolveGroupString($_GET[service_var]); @@ -677,11 +686,11 @@ ); $content = "" . $ov . "
"; -$layout->push_outside($layout->create_box($layout->BoxTitle, $content)); +$layout->create_box($layout->BoxTitle, $content, "Message"); $btl->getExtensionsReturn("_POST_" . $act, $layout); $layout->BoxTitle=""; $layout->TableEnd(); -$layout->display(); +$layout->display("bartlby_action"); diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/bartlby-ui.class.php bartlby-ui/bartlby-ui.class.php --- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/bartlby-ui.class.php 2008-04-06 22:57:23.000000000 +0200 +++ bartlby-ui/bartlby-ui.class.php 2008-09-07 14:49:37.000000000 +0200 @@ -1,11 +1,34 @@ , + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139, + * USA; either version 2 of the License, or (at your option) any later + * version; incorporated herein by reference. + * + * visit: www.bartlby.org for support + * ----------------------------------------------------------------------- */ +/* +$Revision: 16 $ +$HeadURL: http://bartlby.svn.sourceforge.net/svnroot/bartlby/trunk/bartlby-core/src/ack.c $ +$Date: 2008-04-07 21:20:34 +0200 (Mo, 07 Apr 2008) $ +$Author: hjanuschka $ +*/ + include_once("bartlbystorage.class.php"); session_start(); set_time_limit(0); set_magic_quotes_runtime(0); -define("BARTLBY_UI_VERSION", "1.42"); +define("BARTLBY_UI_VERSION", "2.1"); +define("BARTLBY_RELNOT", ""); $wdays[0]="Sunday"; $wdays[1]="Monday"; $wdays[2]="Tuesday"; @@ -629,6 +652,12 @@ } + + if(bartlby_config("ui-extra.conf", "theme") != "") { + $this->theme=bartlby_config("ui-extra.conf", "theme"); + } else { + $this->theme="classic"; + } $this->BASE_URL=substr($_SERVER[SCRIPT_URI], 0, strrpos($_SERVER[SCRIPT_URI], "/")+1); @@ -1104,9 +1133,9 @@ function is_gone($state) { switch($state) { case 1: - return "Object changed you should reload"; + return "Object changed you should reload"; case 2: - return "Object deleted you should reload"; + return "Object deleted you should reload"; default: return ""; } @@ -1184,6 +1213,11 @@ ); return $i; } + function setTheme($name="classic") { + if($name=="") $name="classic"; + $this->theme=$name; + } + function getExtensionsReturn($method, $layout, $ign=false) { $r=array(); $dhl = opendir("extensions"); @@ -1206,9 +1240,9 @@ array_push($r, $ex); if(!file_exists("extensions/" . $file . ".disabled")) { - $endis=""; + $endis=""; } else { - $endis=""; + $endis=""; } @@ -1225,7 +1259,7 @@ "; - @$layout->push_outside($layout->create_box($info_box_title, $core_content)); + $layout->create_box($info_box_title, $core_content, "extension_" . $ex[ex_name]); } @@ -1818,19 +1852,19 @@ return $re; } function getserveroptions($defaults, $layout) { - $modify = ""; - $copy = ""; - $logview= ""; + $modify = ""; + $copy = ""; + $logview= ""; if($defaults[server_enabled] == 1) { - $check = ""; + $check = ""; } else { - $check = ""; + $check = ""; } if($defaults[server_notify] == 1) { - $notifys = ""; + $notifys = ""; } else { - $notifys = ""; + $notifys = ""; } $is_gone=$this->is_gone($defaults[server_gone]); @@ -1839,33 +1873,33 @@ function getserviceOptions($defaults, $layout) { if($defaults[service_active] == 1) { - $check = ""; + $check = ""; } else { - $check = ""; + $check = ""; } if($defaults[notify_enabled] == 1) { - $notifys = ""; + $notifys = ""; } else { - $notifys = ""; + $notifys = ""; } if($defaults[is_downtime] == 1) { - $downtime=""; + $downtime=""; } else { $downtime=" "; } - $modify = ""; - $force = ""; - $comments=""; - $logview= ""; - $reports = ""; + $modify = ""; + $force = ""; + $comments=""; + $logview= ""; + $reports = ""; if(file_exists($this->PERFDIR . "/" . $defaults[plugin])) { - $stat = ""; + $stat = ""; } else { $stat = ""; } - $copy = ""; + $copy = ""; $is_gone=$this->is_gone($defaults[is_gone]); diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/bulk_actions.php bartlby-ui/bulk_actions.php --- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/bulk_actions.php 1970-01-01 01:00:00.000000000 +0100 +++ bartlby-ui/bulk_actions.php 2008-09-07 14:09:01.000000000 +0200 @@ -0,0 +1,32 @@ +set_menu("main"); +$layout->setTitle(""); + + +$servers=$btl->GetSVCMap(); + +$servcs = array(); +while(list($k, $v) = @each($servers)) { + for($y=0; $ycreate_box($title, $content, "core_info", array( + 'services' => $servcs, +), "bulk_services"); + + + +$layout->display("bulk_actions"); diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/cli.php bartlby-ui/cli.php --- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/cli.php 2008-04-06 18:23:17.000000000 +0200 +++ bartlby-ui/cli.php 2008-05-30 13:54:16.000000000 +0200 @@ -44,6 +44,8 @@ $reopen_server=false; $running_only=0; $ticker="|"; +$hide_warns=0; +$hide_infos=0; $ncurses_session = ncurses_init(); $main = ncurses_newwin(0, 0, 0, 0); // main window @@ -99,7 +101,28 @@ if($k == 115 || $reopen_server == true) { btl_disp_server(); } - + if($k == 119) { + if($hide_warns == 0) { + $hide_warns = 1; + } else { + $hide_warns = 0; + } + } + if($k == 82) { + //reset view :-) + $hide_warns=0; + $hide_infos=0; + $alerts_only=1; + + } + if($k == 105) { + if($hide_infos == 0) { + $hide_infos = 1; + } else { + $hide_infos = 0; + } + } + if($k == 258) { if($selected_pos > $lines/2) { $start_from=$start_from+1; @@ -195,6 +218,16 @@ ncurses_color_set(4); break; } + if($hide_warns == 1) { + if($servs[$x][current_state] == 1) { + continue; + } + } + if($hide_infos == 1) { + if($servs[$x][current_state] == 4) { + continue; + } + } if($alerts_only == 1) { if($servs[$x][current_state] == 0) { @@ -796,6 +829,9 @@ array(1, "a" , "Only disable service wich arent OK"), array(1, "d", "also show downtimed services"), array(1, "r", "only show checks wich are currently running"), + array(1, "w", "hide services wich are in state:warning"), + array(1, "i", "hide services wich are in state:info"), + array(1, "R", "Reset filter's"), array(0, "Service Detail:"), array(1, "f", "Force Check"), array(1, "c", "Check enable/disable"), diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/config.php bartlby-ui/config.php --- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/config.php 2008-04-03 11:21:13.000000000 +0200 +++ bartlby-ui/config.php 2008-09-07 14:09:01.000000000 +0200 @@ -1,4 +1,26 @@ , + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139, + * USA; either version 2 of the License, or (at your option) any later + * version; incorporated herein by reference. + * + * visit: www.bartlby.org for support + * ----------------------------------------------------------------------- */ +/* +$Revision: 16 $ +$HeadURL: http://bartlby.svn.sourceforge.net/svnroot/bartlby/trunk/bartlby-core/src/ack.c $ +$Date: 2008-04-07 21:20:34 +0200 (Mo, 07 Apr 2008) $ +$Author: hjanuschka $ +*/ + $Bartlby_CONF="/opt/bartlby-dev/etc/bartlby.cfg"; if(file_exists("setup.php")) { include("setup.php"); diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/create_map.php bartlby-ui/create_map.php --- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/create_map.php 2008-04-03 11:21:13.000000000 +0200 +++ bartlby-ui/create_map.php 2008-09-07 14:09:01.000000000 +0200 @@ -1,3 +1,13 @@ +getInfo(); + $layout= new Layout(); + $layout->setTemplate("nonav.html"); +?> + + + - - - - \ No newline at end of file diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/overview.php bartlby-ui/overview.php --- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/overview.php 2008-04-08 16:42:58.000000000 +0200 +++ bartlby-ui/overview.php 2008-09-07 14:49:37.000000000 +0200 @@ -1,12 +1,37 @@ , + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139, + * USA; either version 2 of the License, or (at your option) any later + * version; incorporated herein by reference. + * + * visit: www.bartlby.org for support + * ----------------------------------------------------------------------- */ +/* +$Revision: 16 $ +$HeadURL: http://bartlby.svn.sourceforge.net/svnroot/bartlby/trunk/bartlby-core/src/ack.c $ +$Date: 2008-04-07 21:20:34 +0200 (Mo, 07 Apr 2008) $ +$Author: hjanuschka $ +*/ + include "config.php"; include "layout.class.php"; include "bartlby-ui.class.php"; $btl=new BartlbyUi($Bartlby_CONF); - $btl->hasRight("main.overview"); $layout= new Layout(); + + + $btl->hasRight("main.overview"); + $layout->set_menu("main"); $layout->MetaRefresh(30); $layout->Table("100%"); @@ -16,26 +41,19 @@ $reload_status="data is up-to-date"; if ($info[sirene_mode] == 0) { - $sir=""; + $sir=""; } else { $sirene_intv=bartlby_config($btl->CFG, "sirene_interval"); if(!$sirene_intv) { $sirene_intv=600; } - $sir="Notify Every: $sirene_intv Seconds "; + $sir="Notify Every: $sirene_intv Seconds "; } $quickview_disabled=bartlby_config("ui-extra.conf", "quickview_enabled"); - /* - $mode=bartlby_config($btl->CFG, "i_am_a_slave"); - if(!$mode) { - $vmode="MASTER"; - } else { - $vmode="SLAVE
dont change anything"; - } - */ + if($info[round_time_count] > 0 && $info[round_time_sum] > 0 ) { $rndMS=round($info[round_time_sum] / $info[round_time_count], 2); } else { @@ -44,40 +62,9 @@ - /* - $is_repl_on=bartlby_config($btl->CFG, "replication"); - if(!$is_repl_on) { - $is_repl_on="false"; - } - $repl = "Replication enabled: $is_repl_on
"; - if($is_repl_on == "true") { - $repl_cnt=bartlby_config($btl->CFG, "replicate_cnt"); - $repl .="Replicating to $repl_cnt Servers every " . bartlby_config($btl->CFG, "replication_intervall") . "
"; - for($x=1; $x<=$repl_cnt; $x++) { - $repl .= str_repeat(" ", 20) . " Server:" . bartlby_config($btl->CFG, "replicate[" . $x . "]") . "
"; - } - $repl .= "Last Replication was on:" . date("d.m.Y H:i:s", $btl->info[last_replication]) . "
"; - } - */ + $servers=$btl->GetSVCMap(); - $mode=bartlby_config("ui-extra.conf", "xml_remote_count"); - if($mode) { - $remote_xml=array(); - for($xml_X=1; $xml_X<=$mode; $xml_X++) { - $xml_cur=bartlby_config("ui-extra.conf", "xml_remote[" . $xml_X . "]"); - $xml_cur_alias=bartlby_config("ui-extra.conf", "xml_alias[" . $xml_X . "]"); - if($xml_cur) { - $xml_return = $btl->getRemoteStatus($xml_cur, $xml_cur_alias); - if($xml_return) { - array_push($remote_xml, $xml_return); - } - } - } - - - - } $hosts_sum=count($servers); @@ -200,81 +187,7 @@ } $bar=$prozent_float . "% Ok - $prozent_crit_float % Critical"; - - /* - for($x=0; $x<$service_sum; $x++) { - - $svc=bartlby_get_service($btl->CFG, $x); - - $qck[$svc[server_name]][$svc[last_state]]++; - $qck[$svc[server_name]][10]=$svc[server_id]; - } - - */ - - $quick_view = ""; - while(list($k, $v)=@each($qck)) { - if($k != $last_qck) { - $cl=""; - $STATE="UP"; - if ($hosts_a_down[$qck[$k][10]] == 1) { - $cl=""; - $STATE="DOWN"; - } - $quick_view .= ""; - $quick_view .= ""; - $quick_view .= ""; - $quick_view .= ""; - $quick_view .= ""; - $quick_view .= ""; - } - - $last_qck=$k; - $qo=""; - $qw=""; - $qc=""; - $qk=""; - } - - if($gdelay_count>0 && $gdelay_sum > 0) { $avgDEL = round($gdelay_sum/$gdelay_count,2); @@ -282,6 +195,8 @@ $avgDEL = 0; } + + $max_running = bartlby_config($btl->CFG, "max_concurent_checks"); $max_load = bartlby_config($btl->CFG, "max_load"); $curr_load = my_sys_getloadavg(); @@ -302,206 +217,67 @@ } else { $load_bar = "" . $info[current_running] . " Load: " . $curr_load[0] . " / " . $max_load . " "; } - $info_box_title='Core Information
Time: ' . date("d.m.Y H:i:s") . '
'; - // (Logged in as:' . $btl->user . ') Uptime: ' . $btl->intervall(time()-$btl->info[startup_time]) . '' - $core_content = "
" . $qck[$k][server_name] . "$STATE"; - - $sf=false; - if($qck[$k][0]) { - $sf=true; - $qo=""; - } - if($qck[$k][1]) { - $sf=true; - $qw=""; - } - - if($qck[$k][2]) { - $sf=true; - $qc=""; - } - - if($qck[$k][3]) { - $sf=true; - $qk=""; - } - if($qck[$k][4]) { - $sf=true; - $qk=""; - } - if($qck[$k][downtime]) { - //$qk=""; - $qk=""; - } - if($qck[$k][acks]) { - $qk=""; - } - - $quick_view .= "$qo"; - $quick_view .= "$qw"; - $quick_view .= "$qc"; - $quick_view .= "$qk"; - $quick_view .= "
" . $qck[$k][0] . " OK's
" . $qck[$k][1] . " Warnings
" . $qck[$k][2] . " Criticals
" . $qck[$k][3] . " Unkown
" . $qck[$k][4] . " Info
" . $qck[$k][downtime] . " Downtime
" . $qck[$k][downtime] . " Downtime
" . $qck[$k][acks] . " Ack Wait
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
(Logged in as: " . $btl->user . ")Uptime:" . $btl->intervall(time()-$btl->info[startup_time]) . "
Services: " . $info[services] . "    Workers: " . $info[workers] . "    Downtimes: " . $info[downtimes]. "    Datalib:" . $lib[Name] . "-" . $lib[Version] . "
- Running: $load_bar - Avg Round Time:" . $rndMS . " ms / avg service delay: " . $avgDEL . " sec.
Version: " . $btl->getRelease() . "
Reload: " . $reload_status . "
 $sir
"; - $layout->push_outside($layout->create_box($info_box_title, $core_content)); + $info_box_title='Core Information'; + $core_content = ""; + $layout->create_box($info_box_title, $core_content, "core_info", array( + 'user' => $btl->user, + 'time' => date("d.m.Y H:i:s"), + 'uptime' => $btl->intervall(time()-$btl->info[startup_time]), + 'services' => $info[services], + 'workers' => $info[workers], + 'downtimes' => $info[downtimes], + 'datalib' => $lib[Name], + 'datalib_version' => $lib[Version], + 'running' => $load_bar, + 'round_ms_time' => $rndMS, + 'average_delay' => $avgDEL, + 'release_name' => $btl->getRelease(), + 'reload_state' => $reload_status, + 'sirene' => $sir + + ), "core_info"); - $quick_view .= ""; - $tac_title='Tactical Overview
'; - // (Logged in as:' . $btl->user . ') Uptime: ' . $btl->intervall(time()-$btl->info[startup_time]) . '' - $tac_content = " - - - - - - - - - - - - - - - - - - -
Hosts:" . $hosts_sum . "Services:" . $service_sum . "
Up:" . $hosts_up. "Down:" . $hosts_down. "OK:" . $services_ok. "Warning:" . $services_warning. "Critical:" . $services_critical. "Downtime:" . $services_downtime. "Acks outstanding:" . $acks_outstanding. "all failures
$repl
"; - $layout->push_outside($layout->create_box($tac_title, $tac_content)); - - $health_title='System Health
'; - $silverbar = " - - - - - - - - -
  " . $prozent_float . "% OK
"; - - // (Logged in as:' . $btl->user . ') Uptime: ' . $btl->intervall(time()-$btl->info[startup_time]) . '' - $health_content = "
- - - - - - - - -
   
$silverbar
"; - $layout->push_outside($layout->create_box($health_title, $health_content)); - //Generate external boxes ;-) - - for($bx=0; $bxXMLBoxHealth($remote_xml[$bx][info],$remote_xml[$bx][services]); - $remote_xml[$bx][qck]=$xml_box_content[qck]; - $xml_box_title=$remote_xml[$bx][alias]; - - $silverbar = " - - - - - - - - -
  " . $xml_box_content[prozent_float] . "% OK
"; - - $xml_box_output = "
- - - - - - - - - -
   
$silverbar
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Uptime: " . $btl->intervall(time()-$remote_xml[$bx][info][0][startup_time]) . "
Home: " . $xml_base_url . "
Version:" . $remote_xml[$bx][info][0][version] . "
Hosts:" . $xml_box_content[hosts_sum] . "Services:" . $xml_box_content[service_sum] . "
Up:" . $xml_box_content[hosts_up]. "Down:" . $xml_box_content[hosts_down] . "OK:" . $xml_box_content[services_ok]. "Warning:" . $xml_box_content[services_warning]. "Critical:" . $xml_box_content[services_critical]. "Downtime:" . $xml_box_content[services_downtime]. "Acks outstanding:" . $xml_box_content[acks_outstanding]. "
- - "; - $layout->push_outside($layout->create_box($xml_box_title, $xml_box_output)); - - - - - } - //Generate external quick views ;-) - - for($bx=0; $bxXMLQuickView($remote_xml[$bx][info],$remote_xml[$bx][qck], $bx+1); - $xml_box_title=$remote_xml[$bx][alias] . " --> QuickView"; - - - $layout->push_outside($layout->create_box($xml_box_title, $xml_box_content)); - - - - - } + $tac_title='Tactical Overview'; + $layout->create_box($tac_title, $tac_content, "tactical_overview",array( + 'host_sum' => $hosts_sum, + 'hosts_up' => $hosts_up, + 'hosts_down' => $hosts_down, + 'services_ok' => $services_ok, + 'services_warning' => $services_warning, + 'services_critical' => $services_critical, + 'services_downtime' => $services_downtime, + 'acks_outstanding' => $acks_outstanding, + 'services_sum' => $service_sum + + ), "tactical_overview"); + + $health_title='System Health'; + $layout->create_box($health_title, $health_content,"system_health", array( + 'prozent_float' => $prozent_float, + 'color' => $color + ), "system_health"); $layout->setTitle("QuickView"); - $r=$btl->getExtensionsReturn("_overview", $layout); if($quickview_disabled != "false") { - $layout->Tr( - $layout->Td( - array(0=>$quick_view) - ) - - ); + $qv_title='Quick View'; + $layout->create_box($qv_title, $qv_content,"quick_view", array( + 'quick_view' => $qck + ), "quick_view"); - } else { - $layout->Tr( - $layout->Td( - array(0=>"Disabled") - ) - - ); - } - + } + $layout->boxes_placed[MAIN]=false; $layout->TableEnd(); - $layout->display(); + $layout->display("overview"); function my_sys_getloadavg() { diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/permission_worker.php bartlby-ui/permission_worker.php --- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/permission_worker.php 2008-04-03 11:21:13.000000000 +0200 +++ bartlby-ui/permission_worker.php 2008-11-26 16:49:02.000000000 +0100 @@ -167,6 +167,8 @@ $title="UI privileges"; + $ov .= $layout->Field("worker_id", "hidden", $_GET[worker_id]) . ""; + $ov .= ""; $content = "" . $ov . "
"; $layout->push_outside($layout->create_box($title, $content)); @@ -174,10 +176,10 @@ $title=""; - $content = $layout->Field("worker_id", "hidden", $_GET[worker_id]) . ""; - $layout->push_outside($layout->create_box($title, $content)); + + //$layout->push_outside($layout->create_box($title, $content)); + -$ov .= ""; -$layout->display(); \ No newline at end of file +$layout->display(); diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/server_detail.php bartlby-ui/server_detail.php --- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/server_detail.php 2008-04-03 11:21:13.000000000 +0200 +++ bartlby-ui/server_detail.php 2008-10-13 22:04:01.000000000 +0200 @@ -24,12 +24,9 @@ $layout= new Layout(); $layout->set_menu("main"); $layout->setTitle("Services"); -if(preg_match("/^XML:(.*):(.*)$/i", $_GET[server_id], $match)) { - $defaults=$btl->remoteServerByID($match[1], $match[2]); -} else { - $defaults=bartlby_get_server_by_id($btl->CFG, $_GET[server_id]); - $btl->hasServerRight($_GET[server_id]); -} + +$defaults=bartlby_get_server_by_id($btl->CFG, $_GET[server_id]); +$btl->hasServerRight($_GET[server_id]); if(!$defaults) { $btl->redirectError("BARTLBY::OBJECT::MISSING"); @@ -37,25 +34,8 @@ } $map=$btl->getSVCMap($btl->CFG, NULL, NULL); -$mode=bartlby_config("ui-extra.conf", "xml_remote_count"); -if($mode) { - $remote_xml=array(); - for($xml_X=1; $xml_X<=$mode; $xml_X++) { - $xml_cur=bartlby_config("ui-extra.conf", "xml_remote[" . $xml_X . "]"); - $xml_cur_alias=bartlby_config("ui-extra.conf", "xml_alias[" . $xml_X . "]"); - if($xml_cur) { - $xml_return = $btl->getRemoteStatus($xml_cur, $xml_cur_alias); - $btl->appendXML_to_svc_map($xml_return[services], $xml_cur_alias, $map, $xml_X); - } - } - - - -} - - $server_map=$map[$_GET[server_id]]; -$layout->Table("100%"); + if($btl->isServerUp($_GET[server_id], $map)) { $isup="UP"; @@ -66,7 +46,6 @@ $services_assigned=""; for($x=0; $x" . $server_map[$x][service_name] . "
"; $dmp_info[$server_map[$x][current_state]] += 1; } @@ -75,12 +54,6 @@ $services_assigned .= "" . $btl->getState($k) . ":" . $v . ","; } - -//echo $defaults[last_notify_send] . "
"; - - - - if($defaults["server_notify"]==1) { $noti_en="true"; } else { @@ -95,91 +68,23 @@ $info_box_title='Server Info'; -// (Logged in as:' . $btl->user . ') Uptime: ' . $btl->intervall(time()-$btl->info[startup_time]) . '' -$core_content = " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Name:" . $defaults[server_name] . " 
Status:" . $isup . " 
Ip:" . $defaults[server_ip] . "/" . gethostbyname($defaults[server_ip]) . " 
Port:" . $defaults[server_port] . " 
Notifications?:" . $noti_en . " 
Enabled ?:" . $server_en . " 
Last notify sent:" . date("d.m.Y H:i:s", $defaults[last_notify_send]) . " 
Flap Seconds:" . $defaults[server_flap_seconds] . " 
Icon: 
Location:" . getGeoip(gethostbyname($defaults[server_ip])) . " 
Server Life indicator:" . $btl->resolveDeadMarker($defaults[server_dead], $map) . " 
"; - - -$layout->push_outside($layout->create_box($info_box_title, $core_content)); +$layout->create_box($info_box_title, $core_content, "server_detail_server_info", array( + "service" => $defaults, + "isup" => $isup, + "notify_enabled" => $noti_en, + "server_enabled" => $server_en, + "map" => $map + ), + "server_detail_server_info"); $info_box_title='Services'; -// (Logged in as:' . $btl->user . ') Uptime: ' . $btl->intervall(time()-$btl->info[startup_time]) . '' -$core_content = " - - - - - - - - - - -
Number of services:" . count($server_map) . "
Services: All," . $services_assigned . "
"; - - -$layout->push_outside($layout->create_box($info_box_title, $core_content)); +$layout->create_box($info_box_title, $core_content, "server_detail_services", array( + "services_assigned" => $services_assigned, + "server_map" => $server_map + ) + , "server_detail_services"); @@ -190,6 +95,6 @@ -$layout->TableEnd(); -$layout->display(); \ No newline at end of file + +$layout->display("server_detail"); \ No newline at end of file diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/service_detail.php bartlby-ui/service_detail.php --- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/service_detail.php 2008-04-03 11:21:13.000000000 +0200 +++ bartlby-ui/service_detail.php 2008-10-13 21:28:10.000000000 +0200 @@ -15,13 +15,9 @@ $_GET[service_place] = $btl->findSHMPlace($_GET[service_id]); } -if(preg_match("/^XML:(.*):(.*)$/i", $_GET[service_place], $match)) { - $defaults=$btl->remoteServiceByID($match[1], $match[2]); -} else { - $defaults=bartlby_get_service($btl->CFG, $_GET[service_place]); - - $btl->hasServerorServiceRight($defaults[service_id]); -} +$defaults=bartlby_get_service($btl->CFG, $_GET[service_place]); +$btl->hasServerorServiceRight($defaults[service_id]); + if(!$defaults) { $btl->redirectError("BARTLBY::OBJECT::MISSING"); exit(1); @@ -32,7 +28,7 @@ } $map=$btl->getSVCMap($btl->CFG, NULL, NULL); -$layout->Table("100%"); + $svc_color=$btl->getColor($defaults[current_state]); $svc_state=$btl->getState($defaults[current_state]); @@ -143,195 +139,43 @@ $info_box_title='Service Info'; -// (Logged in as:' . $btl->user . ') Uptime: ' . $btl->intervall(time()-$btl->info[startup_time]) . '' -$core_content = " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Server:" . $defaults[server_name] . " ( IP: " . gethostbyname($defaults[client_ip]) . " Port: " . $defaults[client_port] . " ) $server_enabled  
Name:" . $defaults[service_name] . " 
ID:" . $defaults[service_id] . " 
Type:" . $svc_type . " 
Current State:" . $svc_state . " 
Server Life Indicator:" . $btl->resolveDeadMarker($defaults[server_dead], $map) . " 
Last Check:" . date("d.m.Y H:i:s", $defaults[last_check]) . " 
approx. next Check:" . date("d.m.Y H:i:s", $defaults[last_check]+$defaults[check_interval]) . " 
Check intervall:" . $defaults[check_interval_original] . " / " . $defaults[check_interval] . " 
Last Notify Send:" . date("d.m.Y H:i:s", $defaults[last_notify_send]) . " 
Re-Notification Interval" . $renot_en ." 
Escalate after:" . $escal_en . " 
Notify Enabled:" . $noti_en . " $server_noti_enabled 
Check Enabled:" . $serv_en . " 
Check Plan:" . $plan_box . " 
Flap count:" . $defaults[flap_count] . " 
Flap seconds:" . $defaults[flap_seconds] . " 
Ack settings:" . $needs_ack . " 
Status:" . $defaults[service_retain_current] . "/" . $defaults[service_retain] . " 
Is Running?:" . $currun . " 
Average Check Time:" . $svcMS . " ms 
Average delay Time:" . $svcDEL . " Seconds 
"; - -$layout->push_outside($layout->create_box($info_box_title, $core_content)); +$layout->create_box($info_box_title, $core_content, "service_detail_service_info", array( + "service" => $defaults, + "service_type" => $svc_type, + "map" => $map, + "server_enabled" => $server_enabled, + "currently_running" => $currun, + "renotify" => $renot_en, + "escalate" => $escal_en, + "server_notifications" => $server_noti_enabled, + "server_enabled" => $server_enabled, + "service_ms" => $svcMS, + "service_delay" => $svcDEL, + "service_enabled" => $serv_en, + "notify_enabled" => $noti_en, + "needs_ack" => $needs_ack, + "color" => $svc_color, + "state" => $svc_state, + "check_plan" => $plan_box + ) + + , "service_detail_service_info"); if($defaults[is_downtime] == 1) { $info_box_title='Downtime'; - // (Logged in as:' . $btl->user . ') Uptime: ' . $btl->intervall(time()-$btl->info[startup_time]) . '' - $core_content = " - - - - - - - - - - - - - - - - - -
From:" . date("d.m.Y H:i", $defaults[downtime_from]) . "
To:" . date("d.m.Y H:i", $defaults[downtime_from]) . "
Left:" . $btl->Intervall($defaults[downtime_to]-time()) . "
Notice/Reason:" . $defaults[downtime_notice] . "
"; - - - $layout->push_outside($layout->create_box($info_box_title, $core_content)); + $core_content = ""; + $layout->create_box($info_box_title, $core_content, "service_detail_downtime_notice", array("service" => $defaults), "service_detail_downtime_notice"); } $info_box_title='Last Output'; -// (Logged in as:' . $btl->user . ') Uptime: ' . $btl->intervall(time()-$btl->info[startup_time]) . '' -$core_content = " - - - - - -
" . str_replace( "\\dbr", "
",nl2br(htmlspecialchars($defaults[new_server_text]))) . "
"; - - -$layout->push_outside($layout->create_box($info_box_title, $core_content)); +$layout->create_box($info_box_title, $core_content, "service_detail_status_text", array("service" => $defaults), "service_detail_status_text"); if($defaults[service_type] == 2 || $defaults[service_type] == 1 || $defaults[service_type] == 4 || $defaults[service_type] == 6 || $defaults[service_type] == 7|| $defaults[service_type] == 8 || $defaults[service_type] == 9){ $info_box_title='Plugin settings'; - // (Logged in as:' . $btl->user . ') Uptime: ' . $btl->intervall(time()-$btl->info[startup_time]) . '' - $core_content = " - - - - - - - - - - - - - - - - -
Plugin:" . htmlspecialchars($defaults[plugin]) . " 
Plugin Arguments:" . htmlspecialchars($defaults[plugin_arguments]) . " 
Plugin Timeout:" . $defaults[service_check_timeout] . " Seconds 
"; + $core_content = ""; - $layout->push_outside($layout->create_box($info_box_title, $core_content)); + $layout->create_box($info_box_title, $core_content, "service_detail_plugin_info", array("service" => $defaults), "service_detail_plugin_info"); } @@ -343,42 +187,7 @@ $snmp_type = "Greater"; } $info_box_title='SNMP Service'; - // (Logged in as:' . $btl->user . ') Uptime: ' . $btl->intervall(time()-$btl->info[startup_time]) . '' - $core_content = " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Community:" . $defaults[service_snmp_community] . " 
Object ID:" . $defaults[service_snmp_objid] . " 
Protocol Version:" . $defaults[service_snmp_version] . " 
Warning:" . $defaults[service_snmp_warning] . " 
Critical:" . $defaults[service_snmp_critical] . " 
Match Type:" . $snmp_type . " 
"; - - $layout->push_outside($layout->create_box($info_box_title, $core_content)); + $layout->create_box($info_box_title, $core_content, "service_detail_snmp", array("service"=>$defaults, "snmp_type"=>$snmp_type), "service_detail_snmp"); } @@ -398,84 +207,18 @@ $ibox[$defaults[current_state]][s]=1; $state_dropdown=$layout->DropDown("passive_state", $ibox); - $info_box_title='Passive Service'; - // (Logged in as:' . $btl->user . ') Uptime: ' . $btl->intervall(time()-$btl->info[startup_time]) . '' - $core_content = " - - - - - - - - - - - - -
Timeout:" . $defaults[service_passive_timeout] . " 
Submit manually:$state_dropdown 
"; - - $layout->push_outside($layout->create_box($info_box_title, $core_content)); + $info_box_title='Passive Service'; + $layout->create_box($info_box_title, $core_content, "service_detail_passive", array("service" => $defaults, "state_dropdown" => $state_dropdown), "service_detail_passive"); } if($defaults[service_type] == 3){ $info_box_title='Group Service'; - // (Logged in as:' . $btl->user . ') Uptime: ' . $btl->intervall(time()-$btl->info[startup_time]) . '' - $core_content = " - - - - - - - -
Check String:" . $btl->resolveGroupString($defaults[service_var]) . " 
"; - - $layout->push_outside($layout->create_box($info_box_title, $core_content)); + $layout->create_box($info_box_title, $core_content, "service_detail_group_check", array("service" => $defaults), "service_detail_group_check"); } -//special_ui's -if(preg_match("/^XML:(.*):(.*)$/i", $_GET[service_place], $match)) { - $special_counter=$btl->XMLRemoteConfig($match[1], "ui-extra.conf", "special_addon_ui_" . $defaults[service_id_real] . "_cnt"); -} else { - $special_counter=bartlby_config("ui-extra.conf", "special_addon_ui_" . $defaults[service_id] . "_cnt"); - -} -if($special_counter) { - - for($spc=1; $spc<=$special_counter; $spc++) { - - if(preg_match("/^XML:(.*):(.*)$/i", $_GET[service_place], $match)) { - $spc_name=$btl->XMLRemoteConfig($match[1], "ui-extra.conf", "special_addon_ui_" . $defaults[service_id_real] . "_[" . $spc ."]_name"); - } else { - $spc_name=bartlby_config("ui-extra.conf", "special_addon_ui_" . $defaults[service_id] . "_[" . $spc ."]_name"); - } - //$layout->OUT .= "menu" . $defaults[service_id] . "[" . $spc_real . "]='" . str_replace("^", "=", bartlby_config($btl->CFG, "special_addon_ui_" . $defaults[service_id] . "_[" . $spc ."]")) . "';\n"; - $info_box_title="$spc_name"; - // (Logged in as:' . $btl->user . ') Uptime: ' . $btl->intervall(time()-$btl->info[startup_time]) . '' - - if(preg_match("/^XML:(.*):(.*)$/i", $_GET[service_place], $match)) { - - $special_value=$btl->XMLRemoteConfig($match[1], 'ui-extra.conf', "special_addon_ui_" . $defaults[service_id_real] . "_[" . $spc ."]"); - } else { - $special_value=bartlby_config('ui-extra.conf', "special_addon_ui_" . $defaults[service_id] . "_[" . $spc ."]"); - } - - $core_content = " - - - - - -
" . str_replace("^", "=", $special_value) . "
"; - - $layout->push_outside($layout->create_box($info_box_title, $core_content)); - } - -} $r=$btl->getExtensionsReturn("_serviceDetail", $layout); $layout->OUT .= $btl->getserviceOptions($defaults, $layout); -$layout->TableEnd(); -$layout->display(); \ No newline at end of file + +$layout->display("service_detail"); \ No newline at end of file diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/services.php bartlby-ui/services.php --- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/services.php 2008-04-03 11:21:13.000000000 +0200 +++ bartlby-ui/services.php 2008-11-11 17:16:41.000000000 +0100 @@ -3,55 +3,23 @@ include "config.php"; include "bartlby-ui.class.php"; + $btl=new BartlbyUi($Bartlby_CONF); $layout= new Layout(); $layout->MetaRefresh(240); $layout->Table("100%"); - $btl=new BartlbyUi($Bartlby_CONF); + $btl->hasRight("main.services"); $map = $btl->GetSVCMap($_GET[service_state]); - $mode=bartlby_config("ui-extra.conf", "xml_remote_count"); - $do_xml=true; - if($_GET[server_id]) { - if(!preg_match("/^XML.*/i", $_GET[server_id])) { - $do_xml=false; - } - } - if($do_xml==true) { - if($mode) { - $remote_xml=array(); - for($xml_X=1; $xml_X<=$mode; $xml_X++) { - $xml_cur=bartlby_config("ui-extra.conf", "xml_remote[" . $xml_X . "]"); - $xml_cur_alias=bartlby_config("ui-extra.conf", "xml_alias[" . $xml_X . "]"); - if($xml_cur) { - $xml_return = $btl->getRemoteStatus($xml_cur, $xml_cur_alias); - $btl->appendXML_to_svc_map($xml_return[services], $xml_cur_alias, $map, $xml_X); - } - } - - - - } - } - - $layout->set_menu("main"); - $layout->setTitle("Services"); $display_serv=$_GET[server_id]; - if(!$display_serv) { - while(list($k,$v) = @each($map)) { - // $display_serv=$k; - - break; - } - @reset($map); - } + while(list($k, $servs) = @each($map)) { @@ -66,12 +34,13 @@ $forward_link=$btl->create_pagelinks("services.php?expect_state=" . $_GET[expect_state] . "&server_id=" . $_GET[server_id], count($servs)-1, $perp, $curp,$k ."site"); - $cur_box_title="" . $servs[0][server_name] . " ( " . $servs[0][client_ip] . ":" . $servs[0][client_port] . " ) $forward_link"; //. ""; - $cur_box_content = ""; + $cur_box_title="" . $servs[0][server_name] . " ( " . $servs[0][client_ip] . ":" . $servs[0][client_port] . " ) $forward_link"; //. ""; + $d=0; $skip_em=($curp*$perp)-$perp; $f=false; + $services_found=array(); for($x=$skip_em; $xTr( - $layout->Td( - Array( - - 0=>array( - "width"=>58, - "align"=>"center", - "show"=>"" . $svc_state . "", - 'class'=>$svc_color . "_img" - ), - 1=>array( - "width"=>80, - "class"=>$class, - "show"=>"" . date("d.m.y H:i:s", $servs[$x][last_check]) - ), - 2=>array( - "width"=>80, - "class"=>$class, - "show"=>"" . date("d.m.y H:i:s", $servs[$x][last_check]+$servs[$x][check_interval]) - ), - 3=>array( - "width"=>150, - "class"=>"header1", - "show"=>"" . $servs[$x][service_name] . "$working_on $flap_pic
" . "
" . $btl->getserviceOptions($servs[$x],$layout) . "" - ), - 4=>array( - "width"=>450, - "class"=>$class, - "show"=>str_replace( "\\dbr", "
",nl2br($servs[$x][new_server_text])) - ) - ) - ) - , true); + $servs[$x][color]=$svc_color; + $servs[$x][state_readable]=$svc_state; + $servs[$x]["class"]=$class; + array_push($services_found, $servs[$x]); $f=true; + $abc=$servs[$x][server_id]; + } - $cur_box_content .= "
"; + + if($f == true) { - $layout->push_outside($layout->create_box($cur_box_title, $cur_box_content)); + + $displayed_servers++; + $layout->create_box($cur_box_title, $cur_box_content, "server_box_" . $abc, + array( + "services" => $services_found, + "state" => $svc_state, + "color" => $svc_color, + + + ) + + ,"service_list_element"); + + + + } } - $legend_content=" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Service Check is disabledNotifications are disabledView Logfile
Service Check is enabledNotifications are enabledComments
Force CheckCopy serviceCreate Report
Update graphModify Service
"; + $legend_content=""; + + $layout->create_box("Legend", $legend_content, "legend", array("a"=>"b"), "legend"); + - $layout->push_outside($layout->create_box("Legend", $legend_content)); $layout->Tr( $layout->Td( Array( @@ -232,8 +140,8 @@ $r=$btl->getExtensionsReturn("_services", $layout); - + $layout->boxes_placed[MAIN]=true; $layout->TableEnd(); - $layout->display(); + $layout->display("services"); ?> diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/setup.php bartlby-ui/setup.php --- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/setup.php 2008-04-03 11:21:13.000000000 +0200 +++ bartlby-ui/setup.php 2008-04-24 00:58:07.000000000 +0200 @@ -33,7 +33,6 @@

Checking default disabled UI extensions

 
\ No newline at end of file
+?>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/template.html bartlby-ui/template.html
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/template.html	2008-04-03 11:21:13.000000000 +0200
+++ bartlby-ui/template.html	1970-01-01 01:00:00.000000000 +0100
@@ -1,472 +0,0 @@
-
-
-bartlby
- 
-
-
-
-
-
-
-
-
-
-
-	
-		
-			
-			
-		
-		
-			
-			
-		
-	

-			

-			
UI-Version:  Page Render: secs          

-			

-			
Auto Reload   Quick look

-			

-				
-			

-			
-			

-				
-					
-						
-						
-					
-				

-							
-								
-								
-								
-							
 Monitoring 

-							
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-																
-								
-									
-								
-								 
-                                                                        
-                                                                
-
-                                                                
-                                                                        
-                                                                
-
-								
-								
-								
-							
-							
-								
-									
-								
-								
-									
-								
-							
 
 Reporting

-							
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-							
-							
-								
-									
-								
-								
-									
-								
-								
-									
-								
-							
 
 Clients(s)
 

-							
-								
-								
-									
-								
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-							
-							
-								
-									
-								
-								
-									
-								
-							
 Packages
 

-							
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-							
-							
-								
-									
-								
-								
-									
-								
-							
 Services(s)
 

-							
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-								
-									
-								
-							
-							
-								
-									
-								
-								
-							
 Downtime(s)

-							
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-							
-							
-								
-									
-								
-								
-								
-									
-								
-								
-									
-								
-							
 
 Worker(s)
 

-							
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-							
-							
-							
-							
-								
-									
-								
-								
-									
-								
-							
 Core
 

-							
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-								
-									
-								
-							
-							
-							
-							
-							
-							
-								
-									
-								
-								
-									
-								
-								
-							
Get Firefox!

-								
-							
-								
-									
-								
-								
-									
-								
-									
-							

-										
-											
-												
-												
-												
-											
-											
-												
-												
-												
-											
-											
-												
-												
-												
-											
-										
  
  
   

-										

-										
-											
-												
-											
-										

-													
-													bartlby is a GPLv2 product of januschka.com
-												

-										

-									

-						
			
-			

-
-
-
-
-

-
-
-
-
-
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/bulk_services.php bartlby-ui/themes/classic/boxes/bulk_services.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/bulk_services.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/boxes/bulk_services.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,103 @@
+
+

+
+

+	
+	
+

+Search Result

+

+	
+

+Already  Selected

+

+	
+

+Actions

+

+	
+	
+	
+

+
+

diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/core_info.php bartlby-ui/themes/classic/boxes/core_info.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/core_info.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/boxes/core_info.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,52 @@
+create_box($info_box_title, $core_content, "core_info", array(
+		'user' => $btl->user,
+		'time' =>  date("d.m.Y H:i:s"),
+		'uptime' =>  $btl->intervall(time()-$btl->info[startup_time]),
+		'services' => $info[services],
+		'workers' => $info[workers],
+		'downtimes' => $info[downtimes],
+		'datalib' => $lib[Name],
+		'datalib_version' => $lib[Version],
+		'running' => $load_bar,
+		'round_ms_time' => $rndMS,
+		'average_delay' => $avgDEL,
+		'release_name' => $btl->getRelease(),
+		'reload_state' => $reload_status,
+		'sirene'  => $sir
+
+*/
+?>
+
+		
+			
+			
+		
+		
+			
+			
+		
+		
+			
+			
+		
+		
+		
+			
+			
+		
+		
+			
+			
+		
+		
+		
+		
+		
+			
+			
+		
+	
(Logged in as: )Uptime:
Services:     Workers:     Downtimes:     Datalib:-

+			Running: 
+			Avg Round Time: ms / avg service delay:  sec.
Version: 
Reload: 
 

diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/default_box.php bartlby-ui/themes/classic/boxes/default_box.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/default_box.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/boxes/default_box.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,17 @@
+
+				
+					
+					
+					
+				
+				
+					
+					
+					
+				
+				
+					
+					
+					
+				
+			
  
  
   

diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/legend.php bartlby-ui/themes/classic/boxes/legend.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/legend.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/boxes/legend.php	2008-10-09 23:34:49.000000000 +0200
@@ -0,0 +1,58 @@
+
+
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+
+	
+		
+                        
+                        
+
+                        
+                        
+
+                        
+                        
+
+
+
+                	
+		
+			
+			
+			
+			
+                        
+
+		
+		
+	
Service Check is disabledNotifications are disabledView Logfile
Service Check is enabledNotifications are enabledComments
Force CheckCopy serviceCreate Report
Update graphModify Service

\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/quick_view.php bartlby-ui/themes/classic/boxes/quick_view.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/quick_view.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/boxes/quick_view.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,73 @@
+";
+	while(list($k, $v)=@each($qck)) {
+		
+		if($k != $last_qck) {
+			$cl="";
+			$STATE="UP";
+			if ($hosts_a_down[$qck[$k][10]] == 1) {
+				$cl="";
+				$STATE="DOWN";
+			}
+			$quick_view .= "";
+			$quick_view .= "" . $qck[$k][server_name] . "";
+			$quick_view .= "$STATE";
+			$quick_view .= "";
+			
+			$sf=false;
+			if($qck[$k][0]) {
+				$sf=true;
+				$qo="";
+			}
+			if($qck[$k][1]) {
+				$sf=true;
+				$qw="";
+			}
+			
+			if($qck[$k][2]) {
+				$sf=true;
+				$qc="";
+			}
+			
+			if($qck[$k][3]) {
+				$sf=true;
+				$qk="";
+			}
+			if($qck[$k][4]) {
+				$sf=true;
+				$qk="";
+			}
+			if($qck[$k][downtime]) {
+				//$qk="";
+				$qk="";
+			}
+			if($qck[$k][acks]) {
+				$qk="";
+			}
+					
+				$quick_view .= "$qo";
+				$quick_view .= "$qw";
+				$quick_view .= "$qc";
+				$quick_view .= "$qk";
+			$quick_view .= "
" . $qck[$k][0] . " OK's
" . $qck[$k][1] . " Warnings
" . $qck[$k][2] . " Criticals
" . $qck[$k][3] . " Unkown
" . $qck[$k][4] . " Info
" . $qck[$k][downtime] . " Downtime
" . $qck[$k][downtime] . " Downtime
" . $qck[$k][acks] . " Ack Wait
";
+			$quick_view .= "";
+			$quick_view .= "
";
+		}
+		
+		$last_qck=$k;	
+		$qo="";
+		$qw="";
+		$qc="";
+		$qk="";
+	}
+	$quick_view .= "";
+
+	echo $quick_view;
+?>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/server_detail_server_info.php bartlby-ui/themes/classic/boxes/server_detail_server_info.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/server_detail_server_info.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/boxes/server_detail_server_info.php	2008-10-13 22:04:01.000000000 +0200
@@ -0,0 +1,61 @@
+
+	
+		
+		 
+		     
+	
+	
+		
+		 
+		     
+	
+	
+		
+		  
+		         
+	
+	
+		
+		  
+		         
+	
+	
+		
+		  
+		         
+	
+	
+		
+		  
+		         
+	
+	
+		
+		  
+		         
+	
+	
+		
+		  
+		         
+	
+	
+		
+		  
+		         
+	
+	
+		
+		  
+		         
+	
+	
+	
+		
+		  
+		         
+	
+	
+	
+	
+
Name: 
Status: 
Ip:/ 
Port: 
Notifications?: 
Enabled ?: 
Last notify sent: 
Flap Seconds: 
Icon: 
Location: 
Server Life indicator:resolveDeadMarker($plcs[service][server_dead], $plcs[map])?> 

\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/server_detail_services.php bartlby-ui/themes/classic/boxes/server_detail_services.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/server_detail_services.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/boxes/server_detail_services.php	2008-10-13 22:04:01.000000000 +0200
@@ -0,0 +1,12 @@
+
+	
+		
+		 
+	
+	
+		
+		 
+	
+	
+	
+
Number of services:
Services:  All,

\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/service_detail_downtime_notice.php bartlby-ui/themes/classic/boxes/service_detail_downtime_notice.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/service_detail_downtime_notice.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/boxes/service_detail_downtime_notice.php	2008-10-13 21:28:10.000000000 +0200
@@ -0,0 +1,19 @@
+
+		
+			
+			 
+		
+		
+			
+			 
+		
+		
+			
+			 
+		
+		
+			
+			 
+		
+		
+	
From:
To:
Left:Intervall($plcs[service][downtime_to]-time())?>
Notice/Reason:

\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/service_detail_group_check.php bartlby-ui/themes/classic/boxes/service_detail_group_check.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/service_detail_group_check.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/boxes/service_detail_group_check.php	2008-10-13 21:28:10.000000000 +0200
@@ -0,0 +1,9 @@
+
+		
+			
+			
+			           
+		
+		
+		
+	
Check String:resolveGroupString($plcs[service][service_var])?> 

\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/service_detail_passive.php bartlby-ui/themes/classic/boxes/service_detail_passive.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/service_detail_passive.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/boxes/service_detail_passive.php	2008-10-13 21:28:10.000000000 +0200
@@ -0,0 +1,14 @@
+
+		
+		
+			
+			
+			           
+		
+		
+			
+			
+			           
+		
+		
+	
Timeout: 
Submit manually: 

\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/service_detail_plugin_info.php bartlby-ui/themes/classic/boxes/service_detail_plugin_info.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/service_detail_plugin_info.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/boxes/service_detail_plugin_info.php	2008-10-13 21:28:10.000000000 +0200
@@ -0,0 +1,18 @@
+
+		
+			
+			
+			           
+		
+		
+			
+			
+			           
+		
+		
+			
+			
+			           
+		
+		
+	
Plugin: 
Plugin Arguments: 
Plugin Timeout: Seconds 

\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/service_detail_service_info.php bartlby-ui/themes/classic/boxes/service_detail_service_info.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/service_detail_service_info.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/boxes/service_detail_service_info.php	2008-10-13 21:28:10.000000000 +0200
@@ -0,0 +1,143 @@
+ $defaults,
+											"service_type" => $svc_type,
+											"map" => $map,
+											"server_enabled" => $server_enabled,
+											"currently_running" => $currun,
+											"renotify" => $renot_en,
+											"escalate" => $escal_en,
+											"server_notifications" => $server_noti_enabled,
+											"server_enabled" => $server_enabled,
+											"service_ms" => $svcMS,
+											"service_delay" => $svcDEL,
+											"service_enabled" => $serv_en,
+											"notify_enabled" => $noti_en,
+											"needs_ack" => $needs_ack,
+											"color" => $svc_color,
+											"state" => $svc_state
+
+*/
+
+?>
+
+	
+		
+		 
+		     
+	
+	
+		
+		  
+		         
+	
+	
+		
+		  
+		         
+	
+	
+		
+		  
+		         
+	
+	
+		
+		 
+		          
+	
+	
+		
+		 
+		          
+	
+	
+	
+		
+		
+		           
+	
+	
+		
+		
+		           
+	
+	
+	
+		
+		
+		           
+	
+	
+		
+		
+		
+		           
+	
+		
+		
+		
+		
+		           
+	
+		
+		
+		
+		
+		           
+	
+	
+		
+		
+		           
+	
+	
+		
+		
+		           
+	
+	
+		
+		
+		           
+	
+	
+	
+		
+		
+		           
+	
+	
+		
+		
+		           
+	
+	
+		
+		
+		           
+	
+
+	
+		
+		
+		           
+		
+	
+		
+		
+		
+		           
+		
+	
+		
+		
+		           
+	
+	
+		
+		
+		           
+	
+	
+
Server: ( IP:  Port:  )   
Name: 
ID: 
Type: 
Current State: 
Server Life Indicator:resolveDeadMarker($plcs[service][server_dead], $plcs[map])?> 
Last Check: 
approx. next Check: 
Check intervall: /  
Last Notify Send: 
Re-Notification Interval 
Escalate after: 
Notify Enabled:  
Check Enabled: 
Check Plan: 
Flap count: 
Flap seconds: 
Ack settings: 
Status: /  
Is Running?: 
Average Check Time: ms 
Average delay Time: Seconds 

\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/service_detail_snmp.php bartlby-ui/themes/classic/boxes/service_detail_snmp.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/service_detail_snmp.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/boxes/service_detail_snmp.php	2008-10-13 21:28:10.000000000 +0200
@@ -0,0 +1,33 @@
+
+		
+			
+			
+			           
+		
+		
+			
+			
+			           
+		
+		
+			
+			
+			           
+		
+		
+			
+			
+			           
+		
+		
+			
+			
+			           
+		
+		
+			
+			
+			           
+		
+		
+	
Community: 
Object ID: 
Protocol Version: 
Warning: 
Critical: 
Match Type: 

\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/service_detail_status_text.php bartlby-ui/themes/classic/boxes/service_detail_status_text.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/service_detail_status_text.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/boxes/service_detail_status_text.php	2008-10-13 21:28:10.000000000 +0200
@@ -0,0 +1,7 @@
+
+	
+		 
+	
+	
+	
+
",nl2br(htmlspecialchars($plcs[service][new_server_text])))?>

\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/service_list_element.php bartlby-ui/themes/classic/boxes/service_list_element.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/service_list_element.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/boxes/service_list_element.php	2008-10-09 23:34:49.000000000 +0200
@@ -0,0 +1,34 @@
+
+
+
+	
+		
+		
+		
+		
+		
+
+	
+

+				
+		
+			
+		
+			
+
+		
+			
+			

+			getserviceOptions($plcs[services][$s_element], $layout)?>
+				
+			", nl2br($plcs[services][$s_element][new_server_text]))?>
+
+		

+
+
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/system_health.php bartlby-ui/themes/classic/boxes/system_health.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/system_health.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/boxes/system_health.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,31 @@
+create_box($health_title, $health_content,"system_health", array(
+			'prozent_float' => $prozent_float,
+			'color' => $color
+		), "system_health");
+*/
+?>
+
+		
+			 
+			
+			 
+			" . $plcs[prozent_float] . "% OK
+			
+		
+		
+	";
+?>
+	
+
 
+		
+			
+			
+			
+			
+			
+		
+		
+	
   

diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/tactical_overview.php bartlby-ui/themes/classic/boxes/tactical_overview.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/boxes/tactical_overview.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/boxes/tactical_overview.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,35 @@
+create_box($tac_title, $tac_content, "tactical_overview",array(
+		'host_sum' => $hosts_sum,
+		'hosts_up' => $hosts_up,
+		'hosts_down' => $hosts_down,
+		'services_ok' => $services_ok,
+		'services_warning' => $services_warning,
+		'services_critical' => $services_critical,
+		'services_downtime' => $services_downtime,
+		'acks_outstanding' => $acks_outstanding
+	
+	), "tactical_overview");
+*/
+
+?>
+
+
+		
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+	
Hosts:Services:
Up:Down:OK:Warning:Critical:Downtime:Acks outstanding:all failures

diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/btl.css bartlby-ui/themes/classic/btl.css
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/btl.css	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/btl.css	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,132 @@
+body { background-color: #C2CBCF; font-family: tahoma; font-size:12px; }
+input,td,select { font-size:12px; font-family:tahoma; }
+
+.suggest_link {
+				background-color: #FFFFFF;
+				padding: 2px 6px 2px 6px;
+			}
+			.suggest_link_over {
+				background-color: #3366CC;
+				padding: 2px 6px 2px 6px;
+			}
+			#search_suggest {
+				position: absolute; 
+				background-color: #FFFFFF; 
+				text-align: left; 
+				border: 1px solid #000000;			
+			}		
+
+.none { font-size:12px; font-family:tahoma; }
+
+.big_table { font-size: 10px; }
+.nopad {padding: 0; border-collapse: collapse; border-spacing: 0;}
+td.navi { vertical-align:top; font-family: tahoma; font-size: 10pt;  width: 125px;}
+td.content { vertical-align: top; font-family: tahoma; font-size:12px; }
+td.bg_header {  vertical-align: top; background-image: url(images/bg_header.jpg); height:105; background-repeat: no-repeat; padding-left:5px; padding-top:5px;}
+td.bg_body{  vertical-align: top; background-image: url(images/bartlby1-bg.jpg); height:663; background-repeat: no-repeat; }
+
+td.nav_main { font-weight: bold; vertical-align: middle; padding-left: 10px; font-size:12px; color:#ffffff;  background-image: url(images/btn_main.gif); height:21px; width:121px; background-repeat: no-repeat; }
+td.nav_sub { font-weight: bold; vertical-align: middle; padding-left: 3px; padding-top:0px; font-size:10px; color:#ffffff;  background-image: url(images/btn_sub.gif); height:12px; width:107px; background-repeat: no-repeat; }
+td.nav_place { font-size:1px; height:5px; }
+
+td.header { font-weight: bold; vertical-align: middle; padding-left: 10px; font-size:12px; color:#ffffff; height:21px; width:121px; background-color:#999999; }
+
+a:link.sub { text-decoration:none; font-size:10px; color:#ffffff; }
+a:visited.sub { text-decoration:none; font-size:10px; color:#ffffff; }
+a:hover.sub { text-decoration:underline; font-size:10px; color:#ffffff; }
+
+a:link {font-weight:bold; text-decoration:none; font-size:12px; color:#000000; }
+a:visited{font-weight:bold; text-decoration:none; font-size:12px; color:#000000; }
+a:hover{font-weight:bold; text-decoration:underline; font-size:12px; color:#000000; }
+
+td.box_left_corner_top { background-image: url(images/left_corner_up.gif); height:20px; width:16px; background-repeat: no-repeat; }
+td.box_top_run { width:650px; color: #999999; font-weight:bold; font-size:12px; font-family:tahoma; background-image: url(images/box_run_up.gif); height:20px;  }
+td.box_right_corner_top { background-image: url(images/right_corner_up.gif); height:20px; width:16px; background-repeat: no-repeat; }
+
+td.box_left_corner_bottom { background-image: url(images/left_corner_down.gif); height:20px; width:16px; background-repeat: no-repeat; }
+td.box_bottom_run { width:250px; color: #999999; font-weight:bold; font-size:12px; font-family:tahoma; background-image: url(images/box_run_down.gif); background-repeat: repeat-x; height:20px; font-size:1px;  }
+td.box_right_corner_bottom { background-image: url(images/right_corner_down.gif); height:20px; width:16px; background-repeat: no-repeat; }
+td.box_left_run { background-image: url(images/left_corner_run.gif); height:20px; width:16px;  }
+td.box_right_run { background-image: url(images/right_corner_run.gif); height:20px; width:16px;  }
+td.box_content { width:840px; background-image: url(images/box_bg.gif); font-family:tahoma; font-size:12px; color:#010101; }
+
+
+td.header1 { font-size:12px; font-family:tahoma; }
+td.header { font-size:12px; font-family:tahoma; }
+
+
+td.red_img {  padding-left:5px;    padding-top:20px; font-family:tahoma; font-size:10px; height:52px; color:#000000; background-image:url(images/bi-oc-red.gif);background-repeat: no-repeat;}
+td.green_img { padding-left:5px;    padding-top:20px; font-family:tahoma; font-size:10px; height:52px; color:#000000; background-image:url(images/bi-oc-green.gif);background-repeat: no-repeat;}
+td.orange_img {  padding-left:5px;   padding-top:20px; font-family:tahoma; font-size:10px; height:52px; color:#000000; background-image:url(images/bi-oc-yellow.gif);background-repeat: no-repeat;}
+td.silver_img {   padding-left:5px;  padding-top:20px; font-family:tahoma; font-size:10px; height:52px; color:#000000; background-image:url(images/bi-oc-silver.gif);background-repeat: no-repeat;}
+
+
+
+td.red { padding: 4;   text-valign: middle;  font-family:tahoma; font-size:12px; height:20px; color:000000; background-color:#F83838}
+td.green { padding: 4;   text-valign: middle;  font-family:tahoma; font-size:12px; height:20px; color:#000000; background-color:#33FF00}
+td.orange { padding: 4;   text-valign: middle;  font-family:tahoma; font-size:12px; height:20px; color:#000000; background-color:#FFFF00}
+td.blue { padding: 4;   text-valign: middle;  font-family:tahoma; font-size:12px; height:20px; color:#000000; background-color:#ACACAC}
+
+div.reload {z-index:101;visibility:hidden; position: absolute; left: 840px; top:80px;}
+div.ui_performance { position: absolute; left: 5px; top:83px;}
+div.clock {position: absolute; left: 800px; top:110px; color:#000000;z-index:3;}
+div.quick_look {position: absolute; left: 380px; top:81px; color:#000000;z-index:3;}
+
+div.help {position: absolute; left: 1024px; top:0px; color:#000000;z-index:3;}
+
+
+.font1 {font-weight:bold; color:#999999; font-family:tahoma; font-size:12px;}
+.font2 {font-weight:bold; color:#000000; font-family:tahoma; font-size:12px;}
+
+
+
+td.bar_left_yellow {background-image: url(images/bartlby1-bar-yellow_01.gif); height:39px; width:10px; background-repeat: no-repeat;}
+td.bar_right_yellow {background-image: url(images/bartlby1-bar-yellow_04.gif); height:39px; width:13px; background-repeat: no-repeat;}
+td.bar_middle_yellow {background-image: url(images/bartlby1-bar-yellow_02.gif); height:39px; width:4px; }
+
+td.bar_left_silver {background-image: url(images/bartlby1-bar-silver_01.gif); height:39px; width:10px; background-repeat: no-repeat;}
+td.bar_right_silver {background-image: url(images/bartlby1-bar-silver_04.gif); height:39px; width:13px; background-repeat: no-repeat;}
+td.bar_middle_silver {background-image: url(images/bartlby1-bar-silver_02.gif); height:39px; width:4px; }
+
+
+
+td.bar_left_green {background-image: url(images/bartlby1-bar-green_01.gif); height:39px; width:10px; background-repeat: no-repeat;}
+td.bar_right_green {background-image: url(images/bartlby1-bar-green_04.gif); height:39px; width:13px; background-repeat: no-repeat;}
+td.bar_middle_green {background-image: url(images/bartlby1-bar-green_02.gif); height:39px; width:4px; }
+
+td.bar_left_red {background-image: url(images/bartlby1-bar-red_01.gif); height:39px; width:10px; background-repeat: no-repeat;}
+td.bar_right_red {background-image: url(images/bartlby1-bar-red_04.gif); height:39px; width:13px; background-repeat: no-repeat;}
+td.bar_middle_red {background-image: url(images/bartlby1-bar-red_02.gif); height:39px; width:4px; }
+
+
+td.red_box { padding-left:10px;    padding-top:3px; font-family:tahoma; font-size:10px; height:29px; color:#000000; background-image:url(images/s_red.gif);background-repeat: no-repeat;}
+td.green_box { padding-left:10px;    padding-top:3px; font-family:tahoma; font-size:10px; height:29px; color:#000000; background-image:url(images/s_green.gif);background-repeat: no-repeat;}
+td.orange_box { padding-left:10px;    padding-top:3px; font-family:tahoma; font-size:10px; height:29px; color:#000000; background-image:url(images/s_yellow.gif);background-repeat: no-repeat;}
+td.yellow_box { padding-left:10px;    padding-top:3px; font-family:tahoma; font-size:10px; height:29px; color:#000000; background-image:url(images/s_yellow.gif);background-repeat: no-repeat;}
+td.silver_box { padding-left:10px;    padding-top:3px; font-family:tahoma; font-size:10px; height:29px; color:#000000; background-image:url(images/s_silver.gif);background-repeat: no-repeat;}
+
+
+
+
+#dropmenudiv{
+position:absolute;
+border:1px solid black;
+border-bottom-width: 0;
+font:normal 12px Tahoma;
+line-height:18px;
+z-index:100;
+}
+
+#dropmenudiv a{
+width: 100%;
+display: block;
+text-indent: 3px;
+border-bottom: 1px solid black;
+padding: 1px 0;
+text-decoration: none;
+font-weight: bold;
+}
+
+#dropmenudiv a:hover{ /*hover background color*/
+background-color: #C2CBCF;
+}
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/agent_syncer.gif and bartlby-ui/themes/classic/images/agent_syncer.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/arrow2.gif and bartlby-ui/themes/classic/images/arrow2.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/barcode.gif and bartlby-ui/themes/classic/images/barcode.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-green_01.gif and bartlby-ui/themes/classic/images/bartlby1-bar-green_01.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-green_01.png and bartlby-ui/themes/classic/images/bartlby1-bar-green_01.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-green_02.gif and bartlby-ui/themes/classic/images/bartlby1-bar-green_02.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-green_02.png and bartlby-ui/themes/classic/images/bartlby1-bar-green_02.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-green_04.gif and bartlby-ui/themes/classic/images/bartlby1-bar-green_04.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-green_04.png and bartlby-ui/themes/classic/images/bartlby1-bar-green_04.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-red_01.gif and bartlby-ui/themes/classic/images/bartlby1-bar-red_01.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-red_01.png and bartlby-ui/themes/classic/images/bartlby1-bar-red_01.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-red_02.gif and bartlby-ui/themes/classic/images/bartlby1-bar-red_02.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-red_02.png and bartlby-ui/themes/classic/images/bartlby1-bar-red_02.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-red_04.gif and bartlby-ui/themes/classic/images/bartlby1-bar-red_04.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-red_04.png and bartlby-ui/themes/classic/images/bartlby1-bar-red_04.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-silver_01.gif and bartlby-ui/themes/classic/images/bartlby1-bar-silver_01.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-silver_02.gif and bartlby-ui/themes/classic/images/bartlby1-bar-silver_02.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-silver_04.gif and bartlby-ui/themes/classic/images/bartlby1-bar-silver_04.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-yellow_01.gif and bartlby-ui/themes/classic/images/bartlby1-bar-yellow_01.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-yellow_01.png and bartlby-ui/themes/classic/images/bartlby1-bar-yellow_01.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-yellow_02.gif and bartlby-ui/themes/classic/images/bartlby1-bar-yellow_02.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-yellow_02.png and bartlby-ui/themes/classic/images/bartlby1-bar-yellow_02.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-yellow_04.gif and bartlby-ui/themes/classic/images/bartlby1-bar-yellow_04.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bar-yellow_04.png and bartlby-ui/themes/classic/images/bartlby1-bar-yellow_04.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-bg.jpg and bartlby-ui/themes/classic/images/bartlby1-bg.jpg differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bartlby1-first-aid.gif and bartlby-ui/themes/classic/images/bartlby1-first-aid.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bg_body.gif and bartlby-ui/themes/classic/images/bg_body.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bg_body.png and bartlby-ui/themes/classic/images/bg_body.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bg_header.gif and bartlby-ui/themes/classic/images/bg_header.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bg_header.jpg and bartlby-ui/themes/classic/images/bg_header.jpg differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bg_header.png and bartlby-ui/themes/classic/images/bg_header.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bi-oc-green.gif and bartlby-ui/themes/classic/images/bi-oc-green.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bi-oc-red.gif and bartlby-ui/themes/classic/images/bi-oc-red.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bi-oc-silver.gif and bartlby-ui/themes/classic/images/bi-oc-silver.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/bi-oc-yellow.gif and bartlby-ui/themes/classic/images/bi-oc-yellow.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/black.gif and bartlby-ui/themes/classic/images/black.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/blue.gif and bartlby-ui/themes/classic/images/blue.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_01.png and bartlby-ui/themes/classic/images/box_01.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_02.png and bartlby-ui/themes/classic/images/box_02.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_04.png and bartlby-ui/themes/classic/images/box_04.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_06.png and bartlby-ui/themes/classic/images/box_06.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_08.png and bartlby-ui/themes/classic/images/box_08.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_09.png and bartlby-ui/themes/classic/images/box_09.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_10.png and bartlby-ui/themes/classic/images/box_10.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_11.png and bartlby-ui/themes/classic/images/box_11.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_15.png and bartlby-ui/themes/classic/images/box_15.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_16.png and bartlby-ui/themes/classic/images/box_16.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_17.png and bartlby-ui/themes/classic/images/box_17.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_21.png and bartlby-ui/themes/classic/images/box_21.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_22.png and bartlby-ui/themes/classic/images/box_22.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_23.png and bartlby-ui/themes/classic/images/box_23.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_bg.gif and bartlby-ui/themes/classic/images/box_bg.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_bg.png and bartlby-ui/themes/classic/images/box_bg.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_run_down.gif and bartlby-ui/themes/classic/images/box_run_down.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_run_down.png and bartlby-ui/themes/classic/images/box_run_down.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_run_up.gif and bartlby-ui/themes/classic/images/box_run_up.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/box_run_up.png and bartlby-ui/themes/classic/images/box_run_up.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/btl-logo.gif and bartlby-ui/themes/classic/images/btl-logo.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/btl-logo.png and bartlby-ui/themes/classic/images/btl-logo.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/btn_main.gif and bartlby-ui/themes/classic/images/btn_main.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/btn_main.png and bartlby-ui/themes/classic/images/btn_main.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/btn_sub.gif and bartlby-ui/themes/classic/images/btn_sub.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/btn_sub.png and bartlby-ui/themes/classic/images/btn_sub.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/create_report.gif and bartlby-ui/themes/classic/images/create_report.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/critical.gif and bartlby-ui/themes/classic/images/critical.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/critical.png and bartlby-ui/themes/classic/images/critical.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/diabled.gif and bartlby-ui/themes/classic/images/diabled.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/diabled.png and bartlby-ui/themes/classic/images/diabled.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/Disable-Sirene.gif and bartlby-ui/themes/classic/images/Disable-Sirene.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/edit-copy.gif and bartlby-ui/themes/classic/images/edit-copy.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/emblem-generic.png and bartlby-ui/themes/classic/images/emblem-generic.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/emblem-important.png and bartlby-ui/themes/classic/images/emblem-important.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/enabled.gif and bartlby-ui/themes/classic/images/enabled.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/enabled.png and bartlby-ui/themes/classic/images/enabled.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/Enable-Sirene.gif and bartlby-ui/themes/classic/images/Enable-Sirene.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/extension_disable.gif and bartlby-ui/themes/classic/images/extension_disable.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/extension_enable.gif and bartlby-ui/themes/classic/images/extension_enable.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/extensions.gif and bartlby-ui/themes/classic/images/extensions.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/force.gif and bartlby-ui/themes/classic/images/force.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/green.png and bartlby-ui/themes/classic/images/green.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/header_bar.png and bartlby-ui/themes/classic/images/header_bar.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/icon_comments.gif and bartlby-ui/themes/classic/images/icon_comments.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/icon_comments.png and bartlby-ui/themes/classic/images/icon_comments.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/icon_stat.gif and bartlby-ui/themes/classic/images/icon_stat.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/icon_view.gif and bartlby-ui/themes/classic/images/icon_view.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/icon_view.png and bartlby-ui/themes/classic/images/icon_view.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/icon_work1.gif and bartlby-ui/themes/classic/images/icon_work1.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/icon_work1.png and bartlby-ui/themes/classic/images/icon_work1.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/icon_work.gif and bartlby-ui/themes/classic/images/icon_work.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/info.gif and bartlby-ui/themes/classic/images/info.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/info.png and bartlby-ui/themes/classic/images/info.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/keys.gif and bartlby-ui/themes/classic/images/keys.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/left_corner_down.gif and bartlby-ui/themes/classic/images/left_corner_down.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/left_corner_down.png and bartlby-ui/themes/classic/images/left_corner_down.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/left_corner_run.gif and bartlby-ui/themes/classic/images/left_corner_run.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/left_corner_run.png and bartlby-ui/themes/classic/images/left_corner_run.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/left_corner_up.gif and bartlby-ui/themes/classic/images/left_corner_up.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/left_corner_up.png and bartlby-ui/themes/classic/images/left_corner_up.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/minus.gif and bartlby-ui/themes/classic/images/minus.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/modify.gif and bartlby-ui/themes/classic/images/modify.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/notrigger.gif and bartlby-ui/themes/classic/images/notrigger.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/notrigger.png and bartlby-ui/themes/classic/images/notrigger.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/ok.gif and bartlby-ui/themes/classic/images/ok.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/ok.png and bartlby-ui/themes/classic/images/ok.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/plus.gif and bartlby-ui/themes/classic/images/plus.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/red.png and bartlby-ui/themes/classic/images/red.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/right_corner_down.gif and bartlby-ui/themes/classic/images/right_corner_down.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/right_corner_down.png and bartlby-ui/themes/classic/images/right_corner_down.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/right_corner_run.gif and bartlby-ui/themes/classic/images/right_corner_run.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/right_corner_run.png and bartlby-ui/themes/classic/images/right_corner_run.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/right_corner_up.gif and bartlby-ui/themes/classic/images/right_corner_up.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/right_corner_up.png and bartlby-ui/themes/classic/images/right_corner_up.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/s_green.gif and bartlby-ui/themes/classic/images/s_green.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/spacer.gif and bartlby-ui/themes/classic/images/spacer.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/s_red.gif and bartlby-ui/themes/classic/images/s_red.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/s_silver.gif and bartlby-ui/themes/classic/images/s_silver.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/s_yellow.gif and bartlby-ui/themes/classic/images/s_yellow.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/trigger.gif and bartlby-ui/themes/classic/images/trigger.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/trigger.png and bartlby-ui/themes/classic/images/trigger.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/warning.gif and bartlby-ui/themes/classic/images/warning.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/warning.png and bartlby-ui/themes/classic/images/warning.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/images/yellow.png and bartlby-ui/themes/classic/images/yellow.png differ
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/lineups/bartlby_action.php bartlby-ui/themes/classic/lineups/bartlby_action.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/lineups/bartlby_action.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/lineups/bartlby_action.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,7 @@
+
+
+disp_box("Message")?>
+disp_box("MAIN")?>
+disp_box("UNPLACED")?>
+
+
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/lineups/default.php bartlby-ui/themes/classic/lineups/default.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/lineups/default.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/lineups/default.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,27 @@
+, 
+ *
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
+ *   USA; either version 2 of the License, or (at your option) any later
+ *   version; incorporated herein by reference.
+ *
+ *   visit: www.bartlby.org for support
+ * ----------------------------------------------------------------------- */
+/*
+$Revision: 16 $
+$HeadURL: http://bartlby.svn.sourceforge.net/svnroot/bartlby/trunk/bartlby-core/src/ack.c $
+$Date: 2008-04-07 21:20:34 +0200 (Mo, 07 Apr 2008) $
+$Author: hjanuschka $ 
+*/
+?>
+
+disp_box("UNPLACED")?>
+
+
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/lineups/overview.php bartlby-ui/themes/classic/lineups/overview.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/lineups/overview.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/lineups/overview.php	2008-09-07 14:49:37.000000000 +0200
@@ -0,0 +1,8 @@
+
+disp_box("core_info")?>
+disp_box("tactical_overview")?>
+disp_box("system_health")?>
+disp_box("extension_ServerGroups")?>
+disp_box("UNPLACED")?>
+
+
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/lineups/server_detail.php bartlby-ui/themes/classic/lineups/server_detail.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/lineups/server_detail.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/lineups/server_detail.php	2008-10-13 22:04:01.000000000 +0200
@@ -0,0 +1,4 @@
+disp_box("MAIN")?>
+disp_box("server_detail_server_info")?>
+disp_box("server_detail_services")?>
+disp_box("UNPLACED")?>
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/lineups/service_detail.php bartlby-ui/themes/classic/lineups/service_detail.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/lineups/service_detail.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/lineups/service_detail.php	2008-10-13 21:28:10.000000000 +0200
@@ -0,0 +1,10 @@
+disp_box("MAIN")?>
+disp_box("service_detail_service_info")?>
+disp_box("service_detail_downtime_notice")?>
+disp_box("service_detail_status_text")?>
+disp_box("service_detail_plugin_info")?>
+disp_box("service_detail_snmp")?>
+disp_box("service_detail_passive")?>
+disp_box("service_detail_group_check")?>
+disp_box("UNPLACED")?>
+
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/lineups/services.php bartlby-ui/themes/classic/lineups/services.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/lineups/services.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/lineups/services.php	2008-10-09 23:34:49.000000000 +0200
@@ -0,0 +1,3 @@
+disp_box("legend")?>
+disp_box("server_box_.*")?>
+disp_box("UNPLACED")?>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/sample.html bartlby-ui/themes/classic/sample.html
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/sample.html	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/sample.html	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,77 @@
+
+
+bartlby
+
+
+
+	
+		
+			
+			
+		
+		
+			
+			
+		
+	

+				
+					
+						
+						
+					
+				

+							
+								
+									
+								
+									
+								
+								
+									
+								
+									
+								
+								
+									
+								
+									
+								
+								
+									
+								
+								
+									
+								
+									
+								
+								
+									
+								
+							
Main
+								
 
Sub
+								
 
Sub
+								
 
 
Main1
+								
 
Sub1
+								

+								
+							
+								
+									
+									
+									
+								
+								
+									
+									
+									
+								
+								
+									
+									
+									
+								
+							
 Title 
  
   

+						
			
+			

+
+
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/theme.php bartlby-ui/themes/classic/theme.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/themes/classic/theme.php	1970-01-01 01:00:00.000000000 +0100
+++ bartlby-ui/themes/classic/theme.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,110 @@
+, 
+ *
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
+ *   USA; either version 2 of the License, or (at your option) any later
+ *   version; incorporated herein by reference.
+ *
+ *   visit: www.bartlby.org for support
+ * ----------------------------------------------------------------------- */
+/*
+$Revision: 16 $
+$HeadURL: http://bartlby.svn.sourceforge.net/svnroot/bartlby/trunk/bartlby-core/src/ack.c $
+$Date: 2008-04-07 21:20:34 +0200 (Mo, 07 Apr 2008) $
+$Author: hjanuschka $ 
+*/
+?>
+
+
+bartlby
+ 
+
+
+
+XAJAX?>
+
+
+
+
+
+
+	
+		
+			
+			
+		
+		
+			
+			
+		
+	

+			

+			
UI-Version: UIVERSION?> Page Render:BTUITIME?> secs     SERVERTIME?>     

+			

+			
Auto Reload   Quick look

+						
+			

+				
+					
+						
+						
+					
+				

+							
+							
+							BTLEXTMENU?>
+							
+							
+							
+							
+							
+								
+									
+								
+								
+									
+								
+								
+							
Get Firefox!

+								
+							
+								
+									
+								
+							
BTUIOUTSIDE?>
+										

+										
+											
+												
+											
+										

+													
+													bartlby is a GPLv2 product of januschka.comRELNOT?>
+												

+										
									
+									

+						
			
+			

+
+
+
+
+

+
+
+
+
+
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/ui-extra.conf bartlby-ui/ui-extra.conf
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/ui-extra.conf	2008-04-03 11:21:13.000000000 +0200
+++ bartlby-ui/ui-extra.conf	2008-11-11 17:16:41.000000000 +0100
@@ -1,4 +1,5 @@
 services_per_page=25
+theme=classic
 ajaxed=true
 disable_dropdown_search=false
 
@@ -23,36 +24,8 @@
 new.server.port=9030
 new.server.icon=linux.gif
 
-xml_remote_count=0
-xml_remote[1]=http://h.januschka:gizmo1@bartlby.xxxx.at:80/xml_api.php
-xml_alias[1]=Work
 
 super_user=admin
 
 
-special_addon_ui_2559_cnt=2
-special_addon_ui_2559_[1]_name=Load Graph Last 24 Hours
-special_addon_ui_2559_[1]=
-special_addon_ui_2559_[2]=
-special_addon_ui_2559_[2]_name=Load Graph Last 7 Days
-
-special_addon_ui_2554_cnt=2
-special_addon_ui_2554_[1]_name=Memory Graph last 24 Hours
-special_addon_ui_2554_[1]=
-special_addon_ui_2554_[2]_name=Memory Graph last 7 Days
-special_addon_ui_2554_[2]=
 
-
-
-special_addon_ui_3187_cnt=2
-special_addon_ui_3187_[1]_name=Bandwidth Graph last 24 Hours
-special_addon_ui_3187_[1]=
-special_addon_ui_3187_[2]=
-special_addon_ui_3187_[2]_name=Bandwidth Graph last 7 Days
-
-
-special_addon_ui_3457_cnt=2
-special_addon_ui_3457_[1]_name=SNMP Graph last 24 Hours
-special_addon_ui_3457_[1]=
-special_addon_ui_3457_[2]=
-special_addon_ui_3457_[2]_name=SNMP Graph last 7 Days
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/xajax.common.php bartlby-ui/xajax.common.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/xajax.common.php	2008-04-03 11:21:13.000000000 +0200
+++ bartlby-ui/xajax.common.php	2008-10-13 21:28:10.000000000 +0200
@@ -38,6 +38,7 @@
 $xajax->registerFunction("group_search");
 $xajax->registerFunction("forceCheck");
 
+$xajax->registerFunction("BulkServiceSearch");
+$xajax->registerFunction("IphoneOverView");
 
-
-?>
\ No newline at end of file
+?>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/xajax_dispatcher.php bartlby-ui/xajax_dispatcher.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-ui/xajax_dispatcher.php	2008-04-06 22:57:23.000000000 +0200
+++ bartlby-ui/xajax_dispatcher.php	2008-10-13 21:28:10.000000000 +0200
@@ -7,31 +7,47 @@
 
 $btl=new BartlbyUi($Bartlby_CONF);
 $layout = new Layout();
-
+$layout->setTheme(bartlby_config("ui-extra.conf", "theme"));
 
 
 $xajax->processRequests();
 
 
-
+function IphoneOverView() {
+	global $btl;
+	$res=new xajaxResponse();
+	$map = $btl->GetSVCMap();
+	
+	
+	$oks=10;
+	
+	$res->AddScript("loadIcon=document.getElementById('activityIndicator'); loadIcon.style.display='none';");
+	
+	$res->AddScript("OKs=10;");
+	$res->AddAssign("text1", "innerHTML", "Welcome: " . $btl->user);
+	
+	return $res;
+}
 function toggle_extension($ext) {
+	global $layout;
 	$res=new xajaxResponse();
 	$fn = "extensions/" . $ext . ".disabled";
 	if(!file_exists($fn)) {
 		@touch($fn);
 		//enable	
-		$res->AddAssign("extension_" . $ext, "src", "images/extension_disable.gif");
-		$res->AddAssign("extension_" . $ext, "title", "enable extension");
+		$res->AddAssign("extension_img_" . $ext, "src", "themes/" . $layout->theme . "/images/extension_disable.gif");
+		$res->AddAssign("extension_img_" . $ext, "title", "enable extension");
 	} else {
 		@unlink($fn);
-		$res->AddAssign("extension_" . $ext, "src", "images/extension_enable.gif");
-		$res->AddAssign("extension_" . $ext, "title", "disable extension");
+		$res->AddAssign("extension_img_" . $ext, "src", "themes/" . $layout->theme . "/images/extension_enable.gif");
+		$res->AddAssign("extension_img_" . $ext, "title", "disable extension");
 		//disable extension_disable.gif
 	}
 	return $res;
 }
 function toggle_server_check($server_id, $service_id) {
 	global $btl;
+	global $layout;
 	$res = new xajaxresponse();
 	if(!preg_match("/^XML.*$/i", $server_id)) {
 		if($btl->hasServerorServiceRight($server_id, false)) {
@@ -41,11 +57,11 @@
 			
 			if($cur == 1) { //Active
 				//$res->addAlert("Check enabled on:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);
-				$res->AddAssign("server_" . $server_id, "src", "images/enabled.gif");
+				$res->AddAssign("server_" . $server_id, "src", "themes/" . $layout->theme . "/images/enabled.gif");
 				$res->AddAssign("server_" . $server_id, "title", "Disable Checks");
 			} else {
 				//$res->addAlert("Check disabled on:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);	
-				$res->AddAssign("server_" . $server_id, "src", "images/diabled.gif");
+				$res->AddAssign("server_" . $server_id, "src", "themes/" . $layout->theme . "/images/diabled.gif");
 				$res->AddAssign("server_" . $server_id, "title", "Enable Checks");
 			}
 			
@@ -67,6 +83,8 @@
 
 function toggle_server_notify_check($server_id, $service_id) {
 	global $btl;
+	global $layout;
+
 	$res = new xajaxresponse();
 	if(!preg_match("/^XML.*$/i", $server_id)) {
 		if($btl->hasServerorServiceRight($server_id, false)) {
@@ -76,11 +94,11 @@
 			
 			if($cur == 1) { //Active
 				//$res->addAlert("Check enabled on:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);
-				$res->AddAssign("trigger_" . $server_id, "src", "images/trigger.gif");
+				$res->AddAssign("trigger_" . $server_id, "src", "themes/" . $layout->theme . "/images/trigger.gif");
 				$res->AddAssign("trigger_" . $server_id, "title", "disable notifications");
 			} else {
 				//$res->addAlert("Check disabled on:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);	
-				$res->AddAssign("trigger_" . $server_id, "src", "images/notrigger.gif");
+				$res->AddAssign("trigger_" . $server_id, "src", "themes/" . $layout->theme . "/images/notrigger.gif");
 				$res->AddAssign("trigger_" . $server_id, "title", "enable trigger");
 			}
 			
@@ -97,7 +115,7 @@
 	return $res;
 }
 function toggle_service_notify_check($server_id, $service_id) {
-	global $btl;
+	global $btl, $layout;
 	$res = new xajaxresponse();
 	if(!preg_match("/^XML.*$/i", $service_id)) {
 		if($btl->hasServerorServiceRight($service_id, false)) {
@@ -107,11 +125,11 @@
 			
 			if($cur == 1) { //Active
 				//$res->addAlert("Check enabled on:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);
-				$res->AddAssign("trigger_" . $service_id, "src", "images/trigger.gif");
+				$res->AddAssign("trigger_" . $service_id, "src", "themes/" . $layout->theme . "/images/trigger.gif");
 				$res->AddAssign("trigger_" . $service_id, "title", "disable notifications");
 			} else {
 				//$res->addAlert("Check disabled on:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);	
-				$res->AddAssign("trigger_" . $service_id, "src", "images/notrigger.gif");
+				$res->AddAssign("trigger_" . $service_id, "src", "themes/" . $layout->theme . "/images/notrigger.gif");
 				$res->AddAssign("trigger_" . $service_id, "title", "enable trigger");
 			}
 			
@@ -129,7 +147,7 @@
 }
 
 function toggle_service_check($server_id, $service_id) {
-	global $btl;
+	global $btl, $layout;
 	$res = new xajaxresponse();
 	if(!preg_match("/^XML.*$/i", $service_id)) {
 		if($btl->hasServerorServiceRight($service_id, false)) {
@@ -139,11 +157,11 @@
 			
 			if($cur == 1) { //Active
 				//$res->addAlert("Check enabled on:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);
-				$res->AddAssign("service_" . $service_id, "src", "images/enabled.gif");
+				$res->AddAssign("service_" . $service_id, "src", "themes/" . $layout->theme . "/images/enabled.gif");
 				$res->AddAssign("service_" . $service_id, "title", "Disable Checks");
 			} else {
 				//$res->addAlert("Check disabled on:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);	
-				$res->AddAssign("service_" . $service_id, "src", "images/diabled.gif");
+				$res->AddAssign("service_" . $service_id, "src", "themes/" . $layout->theme . "/images/diabled.gif");
 				$res->AddAssign("service_" . $service_id, "title", "Enable Checks");
 			}
 			
@@ -198,7 +216,7 @@
 				$gsm=bartlby_get_service_by_id($btl->CFG, $service);
 				$idx=$btl->findSHMPlace($service);
 				$cur=bartlby_check_force($btl->CFG, $idx);
-				$res->addAlert("immediate check scheduled for:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);
+				//$res->addAlert("immediate check scheduled for:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);
 			} else {
 				$res->addAlert("permission denied to force:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);
 			}
@@ -477,6 +495,38 @@
 	$res->addAssign("server_search_suggest", "innerHTML", $output);
 	return $res;	
 }
+
+function BulkServiceSearch($what) {
+	global $btl, $layout, $rq;
+	//compat for extensions
+	$_GET[search] = $what;
+	$servers=$btl->GetSVCMap();	
+	$_GET["servers"]=$servers;
+	$res = new xajaxResponse();
+	$found = 0;
+	while(list($k, $v) = @each($servers)) {
+		
+		
+		
+		for($x=0; $x" . $v[$x][server_name] . "/" . $v[$x][service_name] . "
";	
+				$svcfound=true;
+				$found++;
+			}
+		}
+		if($found > 10) break;
+		
+	}	
+	if($svcfound != true) $rq = "No Services found";
+
+	$res->addAssign("service_result", "innerHTML", $rq);
+
+	return $res;
+	
+}
+
 function QuickLook($what) {
 	global $btl, $layout, $rq;
 	//compat for extensions
@@ -512,7 +562,7 @@
 	}
 	
 	$rq .= "";
-	$output .= $layout->create_box("Server", $rq);
+	$output .= $layout->create_box("Server", $rq, "search_servers");
 	$rq = "";
 	
 	$rq .= "";
@@ -542,7 +592,7 @@
 	
 	
 	$rq .= "
";
-	$output .= $layout->create_box("Services", $rq);
+	$output .= $layout->create_box("Services", $rq, "search_services");
 	$rq = "";
 	
 	@reset($servers);
@@ -557,8 +607,11 @@
 	
 	//Search Workers
 	//Call n get return of Extensions
-	$output .=  $layout->create_box("Extensions", $rq);
-	$output = "close
" . $output;
+	$output .=  $layout->create_box("Extensions", $rq, "search_extensions");
+	$cl_button = "close
";
+	
+	$output = $cl_button . $layout->boxes[search_services] . $layout->boxes[search_servers] . $layout->boxes[search_extensions];
+	
 	$res->addAssign("quick_suggest", "innerHTML", $output);
 	return $res;	
 }
@@ -768,7 +821,12 @@
 	} else {
 		$res->addAssign("error_renotify_interval", "innerHTML", "");
 	}
-	
+	if(!$av["service_server[]"] && !$av["service_server"]) {
+		$res->addAssign("error_service_server[]", "innerHTML", "required field");
+		$al="1";
+	} else {
+		$res->addAssign("error_service_server[]", "innerHTML", "");
+	}
 	
 	switch($av[service_type]) {
 		case 1: