- support for no labels and no status in network maps (Alexei)

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

2 files changed, 4 insertions, 1 deletions

diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index 2011487a..9175dffc 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -63,7 +63,8 @@
 	define("MAP_LABEL_TYPE_HOSTLABEL",0);
 	define("MAP_LABEL_TYPE_IP",1);
 	define("MAP_LABEL_TYPE_HOSTNAME",2);
-	define("MAP_LABEL_TYPE_NOTHING",3);
+	define("MAP_LABEL_TYPE_STATUS",3);
+	define("MAP_LABEL_TYPE_NOTHING",4);
 
 	define("ITEM_TYPE_ZABBIX",0);
 	define("ITEM_TYPE_SNMPV1",1);
diff --git a/frontends/php/include/local_en.inc.php b/frontends/php/include/local_en.inc.php
index bdcafbce..b8fae77f 100644
--- a/frontends/php/include/local_en.inc.php
+++ b/frontends/php/include/local_en.inc.php
@@ -381,6 +381,7 @@
 	define("S_ICON_LABEL_TYPE",			"Icon label type");
 	define("S_HOST_LABEL",				"Host label");
 	define("S_HOST_NAME",				"Host name");
+	define("S_STATUS_ONLY",				"Status only");
 	define("S_NOTHING",				"Nothing");
 
 //	media.php
@@ -623,6 +624,7 @@
 	define("S_USER_GROUPS",				"User groups");
 	define("S_MEMBERS",				"Members");
 	define("S_TEMPLATES",				"Templates");
+	define("S_HOSTS_TEMPLATES_LINKAGE",		"Hosts/templates linkage");
 	define("S_CONFIGURATION_OF_TEMPLATES_LINKAGE",	"CONFIGURATION OF TEMPLATES LINKAGE");
 	define("S_LINKED_TEMPLATES_BIG",		"LINKED TEMPLATES");
 	define("S_NO_USER_GROUPS_DEFINED",		"No user groups defined");