From d2a6694b9a308933144a874e506a935b8ddaea8c Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 14 Oct 2010 20:06:46 -0700 Subject: [PATCH] change text --- client/WEB-INF/classes/resources/resource.properties | 2 +- ui/new/jsp/resource.jsp | 8 ++++---- ui/new/scripts/cloud.core2.resource.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties index 91661fe1122..8725c6e38aa 100644 --- a/client/WEB-INF/classes/resources/resource.properties +++ b/client/WEB-INF/classes/resources/resource.properties @@ -90,7 +90,7 @@ tags = Tags type = Type disk.total = Disk Total disk.allocated = Disk Allocated - +ip.address.range = IP Range disk.offering = Disk Offering copy.ISO.to = Copy ISO to diff --git a/ui/new/jsp/resource.jsp b/ui/new/jsp/resource.jsp index 5d4cc111d0e..433c9808b5b 100644 --- a/ui/new/jsp/resource.jsp +++ b/ui/new/jsp/resource.jsp @@ -896,8 +896,8 @@
- IP:
- n.n.n.n + <%=t.t("ip.address.range")%>:
+ n.n.n.n - m.m.m.m
@@ -918,8 +918,8 @@
- IP:
- n.n.n.n + <%=t.t("ip.address.range")%>:
+ n.n.n.n - m.m.m.m
diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js index 2965af4c652..8578fd15e28 100644 --- a/ui/new/scripts/cloud.core2.resource.js +++ b/ui/new/scripts/cloud.core2.resource.js @@ -351,7 +351,7 @@ function afterLoadResourceJSP() { function vlanjsontotemplate(jsonObj, $template1) { $template1.data("jsonObj", jsonObj); $template1.find("#vlan_id").text(jsonObj.vlan); - $template1.find("#ipaddress").text(jsonObj.description); + $template1.find("#ip_range").text(jsonObj.description); } //***** zone page (end) *******************************************************************************************************