diff --exclude .svn --exclude '.o$' -ruwb zabbix-trunk/create/schema/schema.sql zabbix-trunk-w-caption/create/schema/schema.sql --- zabbix-trunk/create/schema/schema.sql 2011-08-10 18:18:54.000000000 +0200 +++ zabbix-trunk-w-caption/create/schema/schema.sql 2011-08-10 17:32:30.000000000 +0200 @@ -919,6 +919,7 @@ FIELD |url |t_varchar(255) |'' |NOT NULL |ZBX_SYNC FIELD |dynamic |t_integer |'0' |NOT NULL |ZBX_SYNC FIELD |sort_triggers |t_integer |'0' |NOT NULL |ZBX_SYNC +FIELD |caption |t_varchar(255) |'' |NOT NULL |ZBX_SYNC TABLE|services|serviceid|ZBX_SYNC FIELD |serviceid |t_id | |NOT NULL |0 diff --exclude .svn --exclude '.o$' -ruwb zabbix-trunk/frontends/php/include/defines.inc.php zabbix-trunk-w-caption/frontends/php/include/defines.inc.php --- zabbix-trunk/frontends/php/include/defines.inc.php 2011-08-10 18:18:54.000000000 +0200 +++ zabbix-trunk-w-caption/frontends/php/include/defines.inc.php 2011-08-10 17:16:21.000000000 +0200 @@ -478,6 +478,7 @@ define('SCREEN_RESOURCE_HOSTGROUP_TRIGGERS',14); define('SCREEN_RESOURCE_SYSTEM_STATUS', 15); define('SCREEN_RESOURCE_HOST_TRIGGERS', 16); + define('SCREEN_RESOURCE_CAPTION', 17); define('SCREEN_TYPE_NORMAL', 0); define('SCREEN_TYPE_TEMPLATED', 1); diff --exclude .svn --exclude '.o$' -ruwb zabbix-trunk/frontends/php/include/locales/en_gb.inc.php zabbix-trunk-w-caption/frontends/php/include/locales/en_gb.inc.php --- zabbix-trunk/frontends/php/include/locales/en_gb.inc.php 2011-08-10 18:18:54.000000000 +0200 +++ zabbix-trunk-w-caption/frontends/php/include/locales/en_gb.inc.php 2011-08-10 17:17:51.000000000 +0200 @@ -1290,6 +1290,7 @@ 'S_DATA_OVERVIEW'=> _('Data overview'), 'S_HISTORY_OF_ACTIONS'=> _('History of actions'), 'S_HISTORY_OF_EVENTS'=> _('History of events'), + 'S_CAPTION'=> _('Caption'), 'S_TIME_TYPE'=> _('Time type'), 'S_SERVER_TIME'=> _('Server time'), diff --exclude .svn --exclude '.o$' -ruwb zabbix-trunk/frontends/php/include/screens.inc.php zabbix-trunk-w-caption/frontends/php/include/screens.inc.php --- zabbix-trunk/frontends/php/include/screens.inc.php 2011-08-10 18:18:54.000000000 +0200 +++ zabbix-trunk-w-caption/frontends/php/include/screens.inc.php 2011-08-10 18:09:34.000000000 +0200 @@ -46,6 +46,7 @@ SCREEN_RESOURCE_TRIGGERS_INFO => S_TRIGGERS_INFO, SCREEN_RESOURCE_TRIGGERS_OVERVIEW => S_TRIGGERS_OVERVIEW, SCREEN_RESOURCE_URL => S_URL, + SCREEN_RESOURCE_CAPTION => S_CAPTION, ); if(is_null($res)){ @@ -58,28 +59,28 @@ return S_UNKNOW; } - function add_screen_item($resourcetype,$screenid,$x,$y,$resourceid,$width,$height,$colspan,$rowspan,$elements,$sort_triggers,$valign,$halign,$style,$url,$dynamic){ + function add_screen_item($resourcetype,$screenid,$x,$y,$resourceid,$width,$height,$colspan,$rowspan,$elements,$sort_triggers,$valign,$halign,$style,$url,$dynamic,$caption){ $sql='DELETE FROM screens_items WHERE screenid='.$screenid.' and x='.$x.' and y='.$y; DBexecute($sql); $screenitemid=get_dbid("screens_items","screenitemid"); $result=DBexecute('INSERT INTO screens_items '. '(screenitemid,resourcetype,screenid,x,y,resourceid,width,height,'. - ' colspan,rowspan,elements,valign,halign,style,url,dynamic,sort_triggers) '. + ' colspan,rowspan,elements,valign,halign,style,url,dynamic,sort_triggers,caption) '. ' VALUES '. "($screenitemid,$resourcetype,$screenid,$x,$y,$resourceid,$width,$height,$colspan,". - "$rowspan,$elements,$valign,$halign,$style,".zbx_dbstr($url).",$dynamic,$sort_triggers)"); + "$rowspan,$elements,$valign,$halign,$style,".zbx_dbstr($url).",$dynamic,$sort_triggers,".zbx_dbstr($caption).")"); if(!$result) return $result; return $screenitemid; } - function update_screen_item($screenitemid,$resourcetype,$resourceid,$width,$height,$colspan,$rowspan,$elements,$sort_triggers,$valign,$halign,$style,$url,$dynamic){ + function update_screen_item($screenitemid,$resourcetype,$resourceid,$width,$height,$colspan,$rowspan,$elements,$sort_triggers,$valign,$halign,$style,$url,$dynamic,$caption){ return DBexecute("UPDATE screens_items SET ". "resourcetype=$resourcetype,"."resourceid=$resourceid,"."width=$width,". "height=$height,colspan=$colspan,rowspan=$rowspan,elements=$elements,". "valign=$valign,halign=$halign,style=$style,url=".zbx_dbstr($url).",". - "dynamic=$dynamic,sort_triggers=$sort_triggers". + "dynamic=$dynamic,sort_triggers=$sort_triggers,caption=".zbx_dbstr($caption). " WHERE screenitemid=$screenitemid"); } @@ -456,6 +457,7 @@ $url = $screenItem['url']; $dynamic = $screenItem['dynamic']; $sort_triggers = $screenItem['sort_triggers']; + $caption = $screenItem['caption']; } else{ $resourcetype = get_request('resourcetype', 0); @@ -471,6 +473,7 @@ $url = get_request('url', ''); $dynamic = get_request('dynamic', SCREEN_SIMPLE_ITEM); $sort_triggers = get_request('sort_triggers', SCREEN_SORT_TRIGGERS_DATE_DESC); + $caption = get_request('caption',''); } $form->addVar('screenid',$_REQUEST['screenid']); @@ -888,7 +891,14 @@ $form->addVar('url', ''); } - if(in_array($resourcetype, array(SCREEN_RESOURCE_GRAPH,SCREEN_RESOURCE_SIMPLE_GRAPH,SCREEN_RESOURCE_CLOCK,SCREEN_RESOURCE_URL))){ + if(in_array($resourcetype, array(SCREEN_RESOURCE_CAPTION))){ + $form->addRow(S_CAPTION, new CTextBox('caption', $caption, 60)); + } + else{ + $form->addVar('caption', ''); + } + + if(in_array($resourcetype, array(SCREEN_RESOURCE_GRAPH,SCREEN_RESOURCE_SIMPLE_GRAPH,SCREEN_RESOURCE_CLOCK,SCREEN_RESOURCE_URL,SCREEN_RESOURCE_CAPTION))){ $form->addRow(S_WIDTH, new CNumericBox('width', $width, 5)); $form->addRow(S_HEIGHT, new CNumericBox('height', $height, 5)); } @@ -898,7 +908,7 @@ } if(in_array($resourcetype, array(SCREEN_RESOURCE_GRAPH,SCREEN_RESOURCE_SIMPLE_GRAPH,SCREEN_RESOURCE_MAP, - SCREEN_RESOURCE_CLOCK,SCREEN_RESOURCE_URL))){ + SCREEN_RESOURCE_CLOCK,SCREEN_RESOURCE_URL,SCREEN_RESOURCE_CAPTION))){ $cmbHalign = new CComboBox('halign', $halign); $cmbHalign->addItem(HALIGN_CENTER, S_CENTRE); $cmbHalign->addItem(HALIGN_LEFT, S_LEFT); @@ -1008,6 +1018,7 @@ $url = $screenItem['url']; $dynamic = $screenItem['dynamic']; $sort_triggers = $screenItem['sort_triggers']; + $caption = $screenItem['caption']; } else{ $screenitemid = 0; @@ -1024,6 +1035,7 @@ $url = ''; $dynamic = 0; $sort_triggers = SCREEN_SORT_TRIGGERS_DATE_DESC; + $caption = ''; } if($screenitemid>0){ @@ -1666,6 +1678,13 @@ $item = array(new CIFrame($url,$width,$height,"auto")); if($editmode == 1) array_push($item,BR(),new CLink(S_CHANGE,$action)); } + else if(($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_CAPTION)){ + $item = array(new CSpan($caption,"screen_caption")); + // TODO: Height/width - is it useful? Remove from line + // 901 if there's no use case + // TODO: Align - needed + if($editmode == 1) array_push($item,BR(),new CLink(S_CHANGE,$action)); + } else if(($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_ACTIONS)){ $item = array(get_history_of_actions($elements)); if($editmode == 1) array_push($item,new CLink(S_CHANGE,$action)); diff --exclude .svn --exclude '.o$' -ruwb zabbix-trunk/frontends/php/screenedit.php zabbix-trunk-w-caption/frontends/php/screenedit.php --- zabbix-trunk/frontends/php/screenedit.php 2011-08-10 18:18:54.000000000 +0200 +++ zabbix-trunk-w-caption/frontends/php/screenedit.php 2011-08-10 17:27:49.000000000 +0200 @@ -38,7 +38,7 @@ 'screenid'=> array(T_ZBX_INT, O_MAND, P_SYS, DB_ID, null), 'screenitemid'=> array(T_ZBX_INT, O_OPT, P_SYS, DB_ID, '(isset({form})&&({form}=="update"))&&(!isset({x})||!isset({y}))'), - 'resourcetype'=> array(T_ZBX_INT, O_OPT, null, BETWEEN(0,16), 'isset({save})'), + 'resourcetype'=> array(T_ZBX_INT, O_OPT, null, BETWEEN(0,17), 'isset({save})'), 'caption'=> array(T_ZBX_STR, O_OPT, null, null, null), 'resourceid'=> array(T_ZBX_INT, O_OPT, null, DB_ID, 'isset({save})'), 'templateid'=> array(T_ZBX_INT, O_OPT, null, DB_ID, null), @@ -56,6 +56,7 @@ 'x'=> array(T_ZBX_INT, O_OPT, null, BETWEEN(1,100), 'isset({save})&&(isset({form})&&({form}!="update"))'), 'y'=> array(T_ZBX_INT, O_OPT, null, BETWEEN(1,100), 'isset({save})&&(isset({form})&&({form}!="update"))'), 'screen_type'=> array(T_ZBX_INT, O_OPT, null, null, null), + 'caption'=> array(T_ZBX_STR, O_OPT, null, null, 'isset({save})'), // STATUS OF TRIGGER @@ -172,7 +173,7 @@ $_REQUEST['resourcetype'],$_REQUEST['resourceid'],$_REQUEST['width'], $_REQUEST['height'],$_REQUEST['colspan'],$_REQUEST['rowspan'], $_REQUEST['elements'],$_REQUEST['sort_triggers'],$_REQUEST['valign'], - $_REQUEST['halign'],$_REQUEST['style'],$_REQUEST['url'],$_REQUEST['dynmic']); + $_REQUEST['halign'],$_REQUEST['style'],$_REQUEST['url'],$_REQUEST['dynmic'],$_REQUEST['caption']); if(!$result) throw new Exception(); } @@ -182,7 +183,7 @@ $_REQUEST['x'],$_REQUEST['y'],$_REQUEST['resourceid'], $_REQUEST['width'],$_REQUEST['height'],$_REQUEST['colspan'], $_REQUEST['rowspan'],$_REQUEST['elements'],$_REQUEST['sort_triggers'],$_REQUEST['valign'], - $_REQUEST['halign'],$_REQUEST['style'],$_REQUEST['url'],$_REQUEST['dynmic']); + $_REQUEST['halign'],$_REQUEST['style'],$_REQUEST['url'],$_REQUEST['dynmic'],$_REQUEST['caption']); if(!$result) throw new Exception(); } diff --exclude .svn --exclude '.o$' -ruwb zabbix-trunk/frontends/php/styles/screen.css zabbix-trunk-w-caption/frontends/php/styles/screen.css --- zabbix-trunk/frontends/php/styles/screen.css 2011-08-09 13:23:49.000000000 +0200 +++ zabbix-trunk-w-caption/frontends/php/styles/screen.css 2011-08-10 18:12:10.000000000 +0200 @@ -23,3 +23,4 @@ .formlist .text, .formlist textarea { padding: 3px; } .formlist select { padding: 2px; } +.screen_caption { font-size: xx-large; } diff --exclude .svn --exclude '.o$' -ruwb zabbix-trunk/upgrades/dbpatches/2.0/postgresql/patch/screens_items.sql zabbix-trunk-w-caption/upgrades/dbpatches/2.0/postgresql/patch/screens_items.sql --- zabbix-trunk/upgrades/dbpatches/2.0/postgresql/patch/screens_items.sql 2011-08-10 18:18:54.000000000 +0200 +++ zabbix-trunk-w-caption/upgrades/dbpatches/2.0/postgresql/patch/screens_items.sql 2011-08-10 17:31:33.000000000 +0200 @@ -1,6 +1,7 @@ ALTER TABLE ONLY screens_items ALTER screenitemid DROP DEFAULT, ALTER screenid DROP DEFAULT, - ADD sort_triggers integer DEFAULT '0' NOT NULL; + ADD sort_triggers integer DEFAULT '0' NOT NULL, + ADD caption VARCHAR(255) DEFAULT '' NOT NULL; DELETE FROM screens_items WHERE NOT EXISTS (SELECT 1 FROM screens WHERE screens.screenid=screens_items.screenid); ALTER TABLE ONLY screens_items ADD CONSTRAINT c_screens_items_1 FOREIGN KEY (screenid) REFERENCES screens (screenid) ON DELETE CASCADE;