- [ZBX-200] improved Sysmap links color selection, changes in schema (Artem),

 - [ZBX-190] fixed typo in triggers.inc.php (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5154 97f52cf1-0a1b-0410-bd0e-c28be96e8082

4 files changed, 20 insertions, 12 deletions

diff --git a/frontends/php/include/classes/ccolor.inc.php b/frontends/php/include/classes/ccolor.inc.php
index d63b2582..dad01cc7 100644
--- a/frontends/php/include/classes/ccolor.inc.php
+++ b/frontends/php/include/classes/ccolor.inc.php
@@ -208,9 +208,10 @@ else if (document.getElementById)
 			$lbl = new CColorCell('lbl_'.$name, $value, 'show_color_picker(\''.$name.'\')');
 
 			$txt = new CTextBox($name,$value,7);
+			$txt->AddOption('maxlength', 6);
 			$txt->AddOption('id', $name);
 			$txt->AddAction('onchange', 'set_color_by_name(\''.$name.'\',this.value)');
-			$txt->AddOption('style', 'margin: 0px');
+			$txt->AddOption('style', 'margin-top: 0px; margin-bottom: 0px');
 			$this->AddItem(array($txt, $lbl));
 			
 			insert_show_color_picker_javascript();
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 20074b85..023f09e1 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -4940,13 +4940,7 @@ include_once 'include/discovery.inc.php';
 			$value = map_link_drawtype2str($i);
 			$cmbType->AddItem($i, $value);
 		}		
-		$cmbColor = new CComboBox("color",$color);
 
-		foreach(array('Black','Blue','Cyan','Dark Blue','Dark Green',
-			'Dark Red','Dark Yellow','Green','Red','White','Yellow') as $value)
-		{
-			$cmbColor->AddItem($value, $value);
-		}
 /* END preparation */
 
 		$frmCnct->AddRow("Element 1",$cmbElements1);
@@ -4980,7 +4974,7 @@ include_once 'include/discovery.inc.php';
 			if(!isset($trigger['triggerid'])) continue;
 			
 			$colorbox = new CSpan(SPACE.SPACE.SPACE);
-			$colorbox->AddOption('style','text-decoration: none; outline-color: black; outline-style: solid; outline-width: 1px; background-color:'.$trigger['color'].';');
+			$colorbox->AddOption('style','text-decoration: none; outline-color: black; outline-style: solid; outline-width: 1px; background-color: #'.$trigger['color'].';');
 		
 			$table->AddRow(array(
 					array(
@@ -4988,7 +4982,7 @@ include_once 'include/discovery.inc.php';
 						new CVar('triggers['.$trigger['triggerid'].'][triggerid]', $trigger['triggerid'])
 						),
 					array(
-						new CLink($trigger['description'],"javascript: openWinCentered('popup_link_tr.php?form=1&dstfrm=".$frmCnct->GetName()."&triggerid=".$trigger['triggerid'].url_param('linkid')."','ZBX_Link_Indicator',560,180,'scrollbars=1, toolbar=0, menubar=0, resizable=0');"),
+						new CLink($trigger['description'],"javascript: openWinCentered('popup_link_tr.php?form=1&dstfrm=".$frmCnct->GetName()."&triggerid=".$trigger['triggerid'].url_param('linkid')."','ZBX_Link_Indicator',560,260,'scrollbars=1, toolbar=0, menubar=0, resizable=0');"),
 						new CVar('triggers['.$trigger['triggerid'].'][description]', $trigger['description'])
 						),
 					array(
@@ -5017,7 +5011,7 @@ include_once 'include/discovery.inc.php';
 //----------
 
 		$frmCnct->AddRow(S_TYPE.' ('.S_OFF.')',$cmbType);
-		$frmCnct->AddRow(S_COLOR.' ('.S_OFF.')',$cmbColor);
+		$frmCnct->AddRow(S_COLOR.' ('.S_OFF.')',new CColor('color',$color));
 
 		$frmCnct->AddItemToBottomRow(new CButton("save_link",S_SAVE));
 		if(isset($_REQUEST["linkid"]))
diff --git a/frontends/php/include/maps.inc.php b/frontends/php/include/maps.inc.php
index 9a511d29..de482013 100644
--- a/frontends/php/include/maps.inc.php
+++ b/frontends/php/include/maps.inc.php
@@ -754,4 +754,17 @@
 			ImageLine($image,$x1,$y1,$x2,$y2,$color);
 		}
 	}
+	
+	function convertColor($im,$color){
+	
+		$RGB = array(
+			hexdec('0x'.substr($color, 0,2)),
+			hexdec('0x'.substr($color, 2,2)),
+			hexdec('0x'.substr($color, 4,2))
+			);
+		
+		
+	return ImageColorAllocate($im,$RGB[0],$RGB[1],$RGB[2]);
+	}
+
 ?>
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index 82e9c5bf..d1e8a387 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -1894,11 +1894,11 @@
 			if((time(NULL)-$trhosts[$hostname]['lastchange'])<300)
 				$style .= 'background-image: url(images/gradients/blink1.gif); '.
 					'background-position: top left; '.
-					'background-repeat: repeate;';
+					'background-repeat: repeat;';
 			elseif((time(NULL)-$trhosts[$hostname]['lastchange'])<900)
 				$style .= 'background-image: url(images/gradients/blink2.gif); '.
 					'background-position: top left; '.
-					'background-repeat: repeate;';
+					'background-repeat: repeat;';
 
 			unset($item_menu);
 			$tr_ov_menu = array(