From f079be93cc833f2689978bea0f859cf0ccfb5812 Mon Sep 17 00:00:00 2001
From: Hector Sanjuan <hsanjuan@opennebula.org>
Date: Wed, 4 Jan 2012 16:49:15 +0100
Subject: [PATCH] Fixes in network plugins.
In SelfService add missing network information (address, size). Fix some html syntax in SelfService/Sunstone plugins.
(cherry picked from commit b6190cdf3ec7558fdc32b4e83a5182ba2c1575b1)
---
.../occi/lib/ui/public/js/plugins/network.js | 19 ++++++++++++++++++-
.../occi/lib/ui/public/js/plugins/storage.js | 4 ++--
src/sunstone/public/js/plugins/vnets-tab.js | 4 ++--
3 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/cloud/occi/lib/ui/public/js/plugins/network.js b/src/cloud/occi/lib/ui/public/js/plugins/network.js
index b4146411ae..6668ec386d 100644
--- a/src/cloud/occi/lib/ui/public/js/plugins/network.js
+++ b/src/cloud/occi/lib/ui/public/js/plugins/network.js
@@ -290,11 +290,28 @@ function updateVNetworkInfo(request,vn){
<tr>\
<td class="key_td">'+tr("ID")+'</td>\
<td class="value_td">'+vn_info.ID+'</td>\
- <tr>\
+ </tr>\
<tr>\
<td class="key_td">'+tr("Name")+'</td>\
<td class="value_td">'+vn_info.NAME+'</td>\
+ </tr>\
<tr>\
+ <td class="key_td">'+tr("Used leases")+'</td>\
+ <td class="value_td">'+vn_info.USED_LEASES+'</td>\
+ </tr>';
+
+ if (vn_info.ADDRESS){
+ info_tab_content += '\
+ <tr>\
+ <td class="key_td">'+tr("Address")+'</td>\
+ <td class="value_td">'+vn_info.ADDRESS+'</td>\
+ </tr>\
+ <tr>\
+ <td class="key_td">'+tr("Size")+'</td>\
+ <td class="value_td">'+vn_info.SIZE+'</td>\
+ </tr>';
+ };
+ info_tab_content += '\
</table>\
<div class="form_buttons">\
<button class="vnet_close_dialog_link"/></div>';
diff --git a/src/cloud/occi/lib/ui/public/js/plugins/storage.js b/src/cloud/occi/lib/ui/public/js/plugins/storage.js
index 502d320fd9..891414a42f 100644
--- a/src/cloud/occi/lib/ui/public/js/plugins/storage.js
+++ b/src/cloud/occi/lib/ui/public/js/plugins/storage.js
@@ -366,14 +366,14 @@ function updateImageInfo(request,img){
<td class="value_td">'+img_info.NAME+'</td>\
</tr>\
<tr>\
- <td class="key_td">'+tr("Name")+'</td>\
+ <td class="key_td">'+tr("Description")+'</td>\
<td class="value_td">'+img_info.DESCRIPTION+'</td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Type")+'</td>\
<td class="value_td">'+OCCI.Helper.image_type(img_info.TYPE)+'</td>\
</tr>\
- </tr>\
+ <tr>\
<td class="key_td">'+tr("Persistent")+'</td>\
<td class="value_td"><input type="checkbox" '+(img_info.PERSISTENT == "YES" ? 'checked="checked"' : "")+' /></td>\
</tr>\
diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js
index b227fd2b64..5b445f32a7 100644
--- a/src/sunstone/public/js/plugins/vnets-tab.js
+++ b/src/sunstone/public/js/plugins/vnets-tab.js
@@ -487,11 +487,11 @@ function updateVNetworkInfo(request,vn){
<tr>\
<td class="key_td">'+tr("ID")+'</td>\
<td class="value_td">'+vn_info.ID+'</td>\
- <tr>\
+ </tr>\
<tr>\
<td class="key_td">'+tr("Name")+'</td>\
<td class="value_td">'+vn_info.NAME+'</td>\
- <tr>\
+ </tr>\
<tr>\
<td class="key_td">'+tr("Owner")+'</td>\
<td class="value_td">'+vn_info.UNAME+'</td>\