apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 8816: Added link local IP to the system VM UI

Browse Source 
merge from master
This commit is contained in:
will 2011-04-04 10:02:36 -07:00
parent fc7f526090
commit 90dd395cf7
8 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/WEB-INF/classes/resources/messages.properties
View File

@ -347,6 +347,7 @@ label.lang.spanish=Spanish
label.last.disconnected=Last Disconnected label.last.disconnected=Last Disconnected
label.last.name=Last Name label.last.name=Last Name
label.level=Level label.level=Level
label.linklocal.ip=Link Local IP Adddress
label.load.balancer=Load Balancer label.load.balancer=Load Balancer
label.loading=Loading label.loading=Loading
label.local=Local label.local=Local

1
client/WEB-INF/classes/resources/messages_es.properties
View File

@ -347,6 +347,7 @@ label.lang.spanish = Español
label.last.disconnected = Última Desconectado label.last.disconnected = Última Desconectado
label.last.name = Apellido label.last.name = Apellido
label.level = Nivel label.level = Nivel
lable.linklocal.ip=Enlace adddress IP local
label.load.balancer = equilibrador de carga label.load.balancer = equilibrador de carga
label.loading = Carga label.loading = Carga
label.local = local label.local = local

3
client/WEB-INF/classes/resources/messages_ja.properties
View File

@ -346,7 +346,8 @@ label.lang.japanese=日本語
label.lang.spanish=スペイン語 label.lang.spanish=スペイン語
label.last.disconnected =最終接続 label.last.disconnected =最終接続
label.last.name =姓 label.last.name =姓
label.level =レベル label.level =レベル
label.linklocal.ip=リンクローカルIP Adddress
label.load.balancer = ロードバランサ label.load.balancer = ロードバランサ
label.loading =読み込んでいます label.loading =読み込んでいます
label.local =ローカル label.local =ローカル

3
client/WEB-INF/classes/resources/messages_zh_CN.properties
View File

@ -346,7 +346,8 @@ label.lang.japanese=日本
label.lang.spanish=西班牙 label.lang.spanish=西班牙
label.last.disconnected =上次断开 label.last.disconnected =上次断开
label.last.name =姓氏 label.last.name =姓氏
label.level =等级 label.level =等级
label.linklocal.ip=链路本地的IP Adddress
label.load.balancer =负载平衡器 label.load.balancer =负载平衡器
label.loading =载入 label.loading =载入
label.local =本地 label.local =本地

12
ui/jsp/host.jsp
View File

@ -684,7 +684,17 @@ dictionary = {
<div class="row_celltitles" id="privateip"> <div class="row_celltitles" id="privateip">
</div> </div>
</div> </div>
</div> </div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.linklocal.ip"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="linklocalip">
</div>
</div>
</div>
<div class="grid_rows even"> <div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;"> <div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles"> <div class="row_celltitles">

10
ui/jsp/systemvm.jsp
View File

@ -147,6 +147,16 @@ dictionary = {
<div class="row_celltitles" id="privateip"> <div class="row_celltitles" id="privateip">
</div> </div>
</div> </div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.linklocal.ip"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="linklocalip">
</div>
</div>
</div> </div>
<div class="grid_rows even"> <div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;"> <div class="grid_row_cell" style="width: 20%;">

3
ui/scripts/cloud.core.host.js
View File

@ -484,7 +484,8 @@ function hostSystemvmJSONToTemplate(jsonObj, template) {
template.find("#name").text(fromdb(jsonObj.name)); template.find("#name").text(fromdb(jsonObj.name));
template.find("#systemvmtype").text(toSystemVMTypeText(jsonObj.systemvmtype)); template.find("#systemvmtype").text(toSystemVMTypeText(jsonObj.systemvmtype));
template.find("#publicip").text(fromdb(jsonObj.publicip)); 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")); setDateField(jsonObj.created, template.find("#created"));
} }

6
ui/scripts/cloud.core.systemvm.js
View File

@ -150,7 +150,8 @@ function systemvmJsonToDetailsTab() {
$thisTab.find("#id").text(fromdb(jsonObj.id)); $thisTab.find("#id").text(fromdb(jsonObj.id));
$thisTab.find("#name").text(fromdb(jsonObj.name)); $thisTab.find("#name").text(fromdb(jsonObj.name));
$thisTab.find("#publicip").text(fromdb(jsonObj.publicip)); $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("#hostname").text(fromdb(jsonObj.hostname));
$thisTab.find("#gateway").text(fromdb(jsonObj.gateway)); $thisTab.find("#gateway").text(fromdb(jsonObj.gateway));
$thisTab.find("#created").text(fromdb(jsonObj.created)); $thisTab.find("#created").text(fromdb(jsonObj.created));
@ -213,7 +214,8 @@ function systemvmClearDetailsTab() {
$thisTab.find("#id").text(fromdb(jsonObj.id)); $thisTab.find("#id").text(fromdb(jsonObj.id));
$thisTab.find("#name").text(fromdb(jsonObj.name)); $thisTab.find("#name").text(fromdb(jsonObj.name));
$thisTab.find("#publicip").text(fromdb(jsonObj.publicip)); $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("#hostname").text(fromdb(jsonObj.hostname));
$thisTab.find("#gateway").text(fromdb(jsonObj.gateway)); $thisTab.find("#gateway").text(fromdb(jsonObj.gateway));
$thisTab.find("#created").text(fromdb(jsonObj.created)); $thisTab.find("#created").text(fromdb(jsonObj.created));