mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-02 20:02:29 +01:00
bug 8816: Added link local IP to the system VM UI
merge from master
This commit is contained in:
parent
fc7f526090
commit
90dd395cf7
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -347,6 +347,7 @@ label.lang.spanish=スペイン語
|
||||
label.last.disconnected =最終接続
|
||||
label.last.name =姓
|
||||
label.level =レベル
|
||||
label.linklocal.ip=リンクローカルIP Adddress
|
||||
label.load.balancer = ロードバランサ
|
||||
label.loading =読み込んでいます
|
||||
label.local =ローカル
|
||||
|
||||
@ -347,6 +347,7 @@ label.lang.spanish=西班牙
|
||||
label.last.disconnected =上次断开
|
||||
label.last.name =姓氏
|
||||
label.level =等级
|
||||
label.linklocal.ip=链路本地的IP Adddress
|
||||
label.load.balancer =负载平衡器
|
||||
label.loading =载入
|
||||
label.local =本地
|
||||
|
||||
@ -684,6 +684,16 @@ dictionary = {
|
||||
<div class="row_celltitles" id="privateip">
|
||||
</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_row_cell" style="width: 20%;">
|
||||
|
||||
@ -147,6 +147,16 @@ dictionary = {
|
||||
<div class="row_celltitles" id="privateip">
|
||||
</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_row_cell" style="width: 20%;">
|
||||
|
||||
@ -485,6 +485,7 @@ function hostSystemvmJSONToTemplate(jsonObj, template) {
|
||||
template.find("#systemvmtype").text(toSystemVMTypeText(jsonObj.systemvmtype));
|
||||
template.find("#publicip").text(fromdb(jsonObj.publicip));
|
||||
template.find("#privateip").text(fromdb(jsonObj.privateip));
|
||||
template.find("#linklocalip").text(fromdb(jsonObj.linklocalip));
|
||||
setDateField(jsonObj.created, template.find("#created"));
|
||||
}
|
||||
|
||||
|
||||
@ -151,6 +151,7 @@ function systemvmJsonToDetailsTab() {
|
||||
$thisTab.find("#name").text(fromdb(jsonObj.name));
|
||||
$thisTab.find("#publicip").text(fromdb(jsonObj.publicip));
|
||||
$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));
|
||||
@ -214,6 +215,7 @@ function systemvmClearDetailsTab() {
|
||||
$thisTab.find("#name").text(fromdb(jsonObj.name));
|
||||
$thisTab.find("#publicip").text(fromdb(jsonObj.publicip));
|
||||
$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));
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user