From 90dd395cf70a27f20f465fdf7cd0bcbf2b5e85d6 Mon Sep 17 00:00:00 2001 From: will Date: Mon, 4 Apr 2011 10:02:36 -0700 Subject: [PATCH] bug 8816: Added link local IP to the system VM UI merge from master --- client/WEB-INF/classes/resources/messages.properties | 1 + .../WEB-INF/classes/resources/messages_es.properties | 1 + .../WEB-INF/classes/resources/messages_ja.properties | 3 ++- .../classes/resources/messages_zh_CN.properties | 3 ++- ui/jsp/host.jsp | 12 +++++++++++- ui/jsp/systemvm.jsp | 10 ++++++++++ ui/scripts/cloud.core.host.js | 3 ++- ui/scripts/cloud.core.systemvm.js | 6 ++++-- 8 files changed, 33 insertions(+), 6 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index b3729acd472..d410e88da1d 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -347,6 +347,7 @@ label.lang.spanish=Spanish label.last.disconnected=Last Disconnected label.last.name=Last Name label.level=Level +label.linklocal.ip=Link Local IP Adddress label.load.balancer=Load Balancer label.loading=Loading label.local=Local diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties index fa11c3d2ac7..bc3d0428b71 100644 --- a/client/WEB-INF/classes/resources/messages_es.properties +++ b/client/WEB-INF/classes/resources/messages_es.properties @@ -347,6 +347,7 @@ label.lang.spanish = Español label.last.disconnected = Última Desconectado label.last.name = Apellido label.level = Nivel +lable.linklocal.ip=Enlace adddress IP local label.load.balancer = equilibrador de carga label.loading = Carga label.local = local diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties index 56cad27f631..20b9c98081b 100644 --- a/client/WEB-INF/classes/resources/messages_ja.properties +++ b/client/WEB-INF/classes/resources/messages_ja.properties @@ -346,7 +346,8 @@ label.lang.japanese=日本語 label.lang.spanish=スペイン語 label.last.disconnected =最終接続 label.last.name =姓 -label.level =レベル +label.level =レベル +label.linklocal.ip=リンクローカルIP Adddress label.load.balancer = ロードバランサ label.loading =読み込んでいます label.local =ローカル diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties index 7496f20fbf3..87855d04600 100644 --- a/client/WEB-INF/classes/resources/messages_zh_CN.properties +++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties @@ -346,7 +346,8 @@ label.lang.japanese=日本 label.lang.spanish=西班牙 label.last.disconnected =上次断开 label.last.name =姓氏 -label.level =等级 +label.level =等级 +label.linklocal.ip=链路本地的IP Adddress label.load.balancer =负载平衡器 label.loading =载入 label.local =本地 diff --git a/ui/jsp/host.jsp b/ui/jsp/host.jsp index bfef9257a8d..0b30e568efe 100644 --- a/ui/jsp/host.jsp +++ b/ui/jsp/host.jsp @@ -684,7 +684,17 @@ dictionary = {
- + +
+
+
+ :
+
+
+
+
+
+
diff --git a/ui/jsp/systemvm.jsp b/ui/jsp/systemvm.jsp index 928ca97463d..0065263ef8c 100644 --- a/ui/jsp/systemvm.jsp +++ b/ui/jsp/systemvm.jsp @@ -147,6 +147,16 @@ dictionary = {
+
+
+
+
+ :
+
+
+
+
+
diff --git a/ui/scripts/cloud.core.host.js b/ui/scripts/cloud.core.host.js index 45188f968b3..a9be21907c6 100644 --- a/ui/scripts/cloud.core.host.js +++ b/ui/scripts/cloud.core.host.js @@ -484,7 +484,8 @@ function hostSystemvmJSONToTemplate(jsonObj, template) { template.find("#name").text(fromdb(jsonObj.name)); template.find("#systemvmtype").text(toSystemVMTypeText(jsonObj.systemvmtype)); template.find("#publicip").text(fromdb(jsonObj.publicip)); - template.find("#privateip").text(fromdb(jsonObj.privateip)); + template.find("#privateip").text(fromdb(jsonObj.privateip)); + template.find("#linklocalip").text(fromdb(jsonObj.linklocalip)); setDateField(jsonObj.created, template.find("#created")); } diff --git a/ui/scripts/cloud.core.systemvm.js b/ui/scripts/cloud.core.systemvm.js index aa5d7816c22..ce9c697aa93 100644 --- a/ui/scripts/cloud.core.systemvm.js +++ b/ui/scripts/cloud.core.systemvm.js @@ -150,7 +150,8 @@ function systemvmJsonToDetailsTab() { $thisTab.find("#id").text(fromdb(jsonObj.id)); $thisTab.find("#name").text(fromdb(jsonObj.name)); $thisTab.find("#publicip").text(fromdb(jsonObj.publicip)); - $thisTab.find("#privateip").text(fromdb(jsonObj.privateip)); + $thisTab.find("#privateip").text(fromdb(jsonObj.privateip)); + $thisTab.find("#linklocalip").text(fromdb(jsonObj.linklocalip)); $thisTab.find("#hostname").text(fromdb(jsonObj.hostname)); $thisTab.find("#gateway").text(fromdb(jsonObj.gateway)); $thisTab.find("#created").text(fromdb(jsonObj.created)); @@ -213,7 +214,8 @@ function systemvmClearDetailsTab() { $thisTab.find("#id").text(fromdb(jsonObj.id)); $thisTab.find("#name").text(fromdb(jsonObj.name)); $thisTab.find("#publicip").text(fromdb(jsonObj.publicip)); - $thisTab.find("#privateip").text(fromdb(jsonObj.privateip)); + $thisTab.find("#privateip").text(fromdb(jsonObj.privateip)); + $thisTab.find("#linklocalip").text(fromdb(jsonObj.linklocalip)); $thisTab.find("#hostname").text(fromdb(jsonObj.hostname)); $thisTab.find("#gateway").text(fromdb(jsonObj.gateway)); $thisTab.find("#created").text(fromdb(jsonObj.created));