From b005d4bcda224754f7cca2df806aa69058695715 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 1 Mar 2013 13:03:57 +0100 Subject: [PATCH] feature #1664: Update Group tab --- src/sunstone/public/js/plugins/groups-tab.js | 156 +++++++++++-------- 1 file changed, 88 insertions(+), 68 deletions(-) diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index 3a5a95104c..2bf7744bf6 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -84,19 +84,30 @@ var groups_tab_content = '\ '; var create_group_tmpl = -'
\ -
\ -
\ - \ -
\ +'
\ +

\ + '+tr("Create Group")+'\ +

\ +
\ +\ +
\ +
\ +
\ + \ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\
\ -
\ -
\ +
\
\ - \ - \ + \ + \
\ -
\ ×\
'; @@ -260,7 +271,7 @@ var group_actions = { call: OpenNebula.Group.accounting, callback: function(req,response) { var info = req.request.data[0].monitor; - plot_graph(response,'#group_acct_tabTab','group_acct_', info); + //plot_graph(response,'#group_acct_tabTab','group_acct_', info); }, error: onError }, @@ -316,10 +327,10 @@ var group_info_panel = { title: tr("Group information"), content:"" }, - "group_acct_tab" : { - title: tr("Historical usages"), - content: "" - } +// "group_acct_tab" : { +// title: tr("Historical usages"), +// content: "" +// } }; var groups_tab = { @@ -365,16 +376,18 @@ function groupElements(){ function groupElementArray(group_json){ var group = group_json.GROUP; - var users_str=""; - if (group.USERS.ID && - group.USERS.ID.constructor == Array){ - for (var i=0; i\ - \ - \ - \ - ' + tr("ID") + '\ - '+info.ID+'\ - \ - \ - \ - \ - \ - \ - \ - \ -
' + tr("Quota information") +'
'; +
\ +
\ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +
' + tr("Group information") + ' - '+info.NAME+'
' + tr("ID") + ''+info.ID+'
\ +
\ +
\ + \ + \ + \ + \ + \ +
' + tr("Quota information") +'
\ +
\ +
'; if (!$.isEmptyObject(info.VM_QUOTA)) info_tab_html += '\ @@ -488,33 +508,33 @@ function updateGroupInfo(request,group){ }; - var acct_tab = { - title : tr("Historical usages"), - content : '
\ - \ - \ - \ - \ -\ -
\ - \ - \ - \ -
' + generateMonitoringDivs(group_acct_graphs, "group_acct_") - }; +// var acct_tab = { +// title : tr("Historical usages"), +// content : '
\ +// \ +// \ +// \ +// \ +//\ +//
\ +// \ +// \ +// \ +//
' + generateMonitoringDivs(group_acct_graphs, "group_acct_") +// }; Sunstone.updateInfoPanelTab("group_info_panel","group_info_tab",info_tab); - Sunstone.updateInfoPanelTab("group_info_panel","group_acct_tab",acct_tab); +// Sunstone.updateInfoPanelTab("group_info_panel","group_acct_tab",acct_tab); Sunstone.popUpInfoPanel("group_info_panel"); @@ -603,7 +623,7 @@ function setupCreateGroupDialog(){ } function popUpCreateGroupDialog(){ - $create_group_dialog.trigger("reveal:close") + $create_group_dialog.reveal(); return false; }