From 49a3b6667b59e6c75fd3c154a768a8a84f95a4b0 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Tue, 6 Nov 2012 13:54:28 -0800
Subject: [PATCH] CS-16741: Fix traffic type descriptions

-Update alt tags to specify what the name of each traffic type is

-Move traffic type alt descriptions to message.properties, for
 localization
---
 client/WEB-INF/classes/resources/messages.properties | 4 ++++
 ui/index.jsp                                         | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 71f8194ee0f..3c8876330bb 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -17,6 +17,10 @@
 
 
 #new labels (begin) **********************************************************************************************
+label.zoneWizard.trafficType.management=Mangement: Traffic between CloudStack\'s internal resources, including any components that communicate with the Management Server, such as hosts and CloudStack system VMs
+label.zoneWizard.trafficType.public=Public: Traffic between the internet and virtual machines in the cloud.
+label.zoneWizard.trafficType.guest=Guest: Traffic between end-user virtual machines
+label.zoneWizard.trafficType.storage=Storage: Traffic between primary and secondary storage servers, such as VM templates and snapshots
 label.quickview=Quickview
 label.migrate.to.host=Migrate to host
 label.migrate.to.storage=Migrate to storage
diff --git a/ui/index.jsp b/ui/index.jsp
index 6c38e363734..663b81a2bc7 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -533,7 +533,7 @@ under the License.
                 <li class="management">
                   <ul class="container">
                     <li traffic-type-id="management"
-                        title="Traffic between CloudStack's internal resources, including any components that communicate with the Management Server, such as hosts and CloudStack system VMs"
+                        title="<fmt:message key="label.zoneWizard.trafficType.management"/>"
                         class="traffic-type-draggable management">
                       <!-- Edit buttton -->
                       <div class="edit-traffic-type">
@@ -550,7 +550,7 @@ under the License.
                 <li class="public">
                   <ul class="container">
                     <li traffic-type-id="public"
-                        title="Traffic between the internet and virtual machines in the cloud."
+                        title="<fmt:message key="label.zoneWizard.trafficType.public"/>"
                         class="traffic-type-draggable public">
                       <!-- Edit buttton -->
                       <div class="edit-traffic-type">
@@ -567,7 +567,7 @@ under the License.
                 <li class="guest">
                   <ul class="container">
                     <li traffic-type-id="guest"
-                        title="Traffic between end-user virtual machines"
+                        title="<fmt:message key="label.zoneWizard.trafficType.guest"/>"
                         class="traffic-type-draggable guest">
                       <!-- Edit buttton -->
                       <div class="edit-traffic-type">
@@ -584,7 +584,7 @@ under the License.
                 <li class="storage">
                   <ul class="container">
                     <li traffic-type-id="storage"
-                        title="Traffic between primary and secondary storage servers, such as VM templates and snapshots"
+                        title="<fmt:message key="label.zoneWizard.trafficType.storage"/>"
                         class="traffic-type-draggable storage">
                       <!-- Edit buttton -->
                       <div class="edit-traffic-type">