From c292f2aa8d47eea138c9940169ecc09f1317a23c Mon Sep 17 00:00:00 2001 From: Abel Coronado Date: Thu, 4 May 2017 19:48:24 +0200 Subject: [PATCH] Changed order in datatables (#286) * Changed order in image datatable * Changed order in virtual routers datatable * Changed order virtual routers templates datatable * Changed order datastores datatable * Changed order marketplaceapps datatable * Changed order marketplaces datatable * Changed order oneflow-services datatable * Changed order oneflow-templates datatable * Changed order secgroups datatable * Changed order vms datatable * Changed order vnets datatable --- src/sunstone/public/app/tabs/datastores-tab/datatable.js | 6 +++--- .../public/app/tabs/images-tab/datatable-common.js | 6 +++--- .../public/app/tabs/marketplaceapps-tab/datatable.js | 4 ++-- .../public/app/tabs/marketplaces-tab/datatable.js | 4 ++-- .../public/app/tabs/oneflow-services-tab/datatable.js | 6 +++--- .../public/app/tabs/oneflow-templates-tab/datatable.js | 8 ++++---- src/sunstone/public/app/tabs/secgroups-tab/datatable.js | 4 ++-- .../public/app/tabs/templates-tab/datatable-common.js | 8 ++++---- .../public/app/tabs/vms-tab/utils/datatable-common.js | 8 ++++---- src/sunstone/public/app/tabs/vnets-tab/datatable.js | 4 ++-- src/sunstone/public/app/tabs/vrouters-tab/datatable.js | 4 ++-- 11 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/sunstone/public/app/tabs/datastores-tab/datatable.js b/src/sunstone/public/app/tabs/datastores-tab/datatable.js index c14faba516..d9274da168 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/datatable.js +++ b/src/sunstone/public/app/tabs/datastores-tab/datatable.js @@ -79,9 +79,9 @@ define(function(require) { this.columns = [ Locale.tr("ID"), - Locale.tr("Owner"), - Locale.tr("Group"), Locale.tr("Name"), + Locale.tr("Owner"), + Locale.tr("Group"), Locale.tr("Capacity"), Locale.tr("Cluster"), Locale.tr("Basepath"), @@ -143,9 +143,9 @@ define(function(require) { element.ID + '" name="selected_items" value="' + element.ID + '"/>', element.ID, + element.NAME, element.UNAME, element.GNAME, - element.NAME, DatastoreCapacityBar.html(element), clusters, element.BASE_PATH, diff --git a/src/sunstone/public/app/tabs/images-tab/datatable-common.js b/src/sunstone/public/app/tabs/images-tab/datatable-common.js index d2688d4720..7349747cac 100644 --- a/src/sunstone/public/app/tabs/images-tab/datatable-common.js +++ b/src/sunstone/public/app/tabs/images-tab/datatable-common.js @@ -63,9 +63,9 @@ define(function(require) { this.columns = [ Locale.tr("ID"), + Locale.tr("Name"), Locale.tr("Owner"), Locale.tr("Group"), - Locale.tr("Name"), Locale.tr("Datastore"), Locale.tr("Size"), Locale.tr("Type"), @@ -116,9 +116,9 @@ define(function(require) { element.ID + '" name="selected_items" value="' + element.ID + '"/>', element.ID, - element.UNAME, - element.GNAME, element.NAME, + element.UNAME, + element.GNAME, element.DATASTORE, Humanize.sizeFromMB(element.SIZE), type, diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js index 444ce80e67..71f7379409 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js @@ -81,9 +81,9 @@ define(function(require) { this.columns = [ Locale.tr("ID"), + Locale.tr("Name"), Locale.tr("Owner"), Locale.tr("Group"), - Locale.tr("Name"), Locale.tr("Version"), Locale.tr("Size"), Locale.tr("State"), @@ -143,9 +143,9 @@ define(function(require) { element.ID + '" name="selected_items" value="' + element.ID + '"/>', element.ID, + element.NAME, element.UNAME, element.GNAME, - element.NAME, element.VERSION, Humanize.sizeFromMB(element.SIZE), state, diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/datatable.js b/src/sunstone/public/app/tabs/marketplaces-tab/datatable.js index 3afb4b8a74..2afa2684c8 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab/datatable.js +++ b/src/sunstone/public/app/tabs/marketplaces-tab/datatable.js @@ -80,9 +80,9 @@ define(function(require) { this.columns = [ Locale.tr("ID"), + Locale.tr("Name"), Locale.tr("Owner"), Locale.tr("Group"), - Locale.tr("Name"), Locale.tr("Capacity"), Locale.tr("Apps"), Locale.tr("Driver"), @@ -135,9 +135,9 @@ define(function(require) { element.ID + '" name="selected_items" value="' + element.ID + '"/>', element.ID, + element.NAME, element.UNAME, element.GNAME, - element.NAME, DatastoreCapacityBar.html(element), _lengthOf(element.MARKETPLACEAPPS.ID), element.MARKET_MAD, diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js b/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js index 0f0c218353..e70fa05f70 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js @@ -62,10 +62,10 @@ define(function(require) { }; this.columns = [ - Locale.tr("ID") , - Locale.tr("Owner") , - Locale.tr("Group"), + Locale.tr("ID"), Locale.tr("Name"), + Locale.tr("Owner"), + Locale.tr("Group"), Locale.tr("State"), Locale.tr("Labels"), "search_data" diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/datatable.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/datatable.js index e574621030..e976081f89 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/datatable.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/datatable.js @@ -61,10 +61,10 @@ define(function(require) { }; this.columns = [ - Locale.tr("ID") , - Locale.tr("Owner") , - Locale.tr("Group"), + Locale.tr("ID"), Locale.tr("Name"), + Locale.tr("Owner"), + Locale.tr("Group"), Locale.tr("Labels"), "search_data" ]; @@ -108,9 +108,9 @@ define(function(require) { element.ID + '" name="selected_items" value="' + element.ID + '"/>', element.ID, + element.NAME, element.UNAME, element.GNAME, - element.NAME, (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||''), btoa(unescape(encodeURIComponent(JSON.stringify(search)))) ]; diff --git a/src/sunstone/public/app/tabs/secgroups-tab/datatable.js b/src/sunstone/public/app/tabs/secgroups-tab/datatable.js index 7236b0b75b..7fb4614fa0 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/datatable.js +++ b/src/sunstone/public/app/tabs/secgroups-tab/datatable.js @@ -62,9 +62,9 @@ define(function(require) { this.columns = [ Locale.tr("ID"), + Locale.tr("Name"), Locale.tr("Owner"), Locale.tr("Group"), - Locale.tr("Name"), Locale.tr("Labels"), "search_data" ]; @@ -108,9 +108,9 @@ define(function(require) { element.ID + '" name="selected_items" value="' + element.ID + '"/>', element.ID, + element.NAME, element.UNAME, element.GNAME, - element.NAME, (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||''), btoa(unescape(encodeURIComponent(JSON.stringify(search)))) ]; diff --git a/src/sunstone/public/app/tabs/templates-tab/datatable-common.js b/src/sunstone/public/app/tabs/templates-tab/datatable-common.js index 139ea09051..b57b030576 100644 --- a/src/sunstone/public/app/tabs/templates-tab/datatable-common.js +++ b/src/sunstone/public/app/tabs/templates-tab/datatable-common.js @@ -63,10 +63,10 @@ define(function(require) { } this.columns = [ - Locale.tr("ID") , - Locale.tr("Owner") , - Locale.tr("Group"), + Locale.tr("ID"), Locale.tr("Name"), + Locale.tr("Owner"), + Locale.tr("Group"), Locale.tr("Registration time"), Locale.tr("Labels"), "search_data" @@ -115,9 +115,9 @@ define(function(require) { element.ID + '" name="selected_items" value="' + element.ID + '"/>', element.ID, + element.NAME, element.UNAME, element.GNAME, - element.NAME, Humanize.prettyTime(element.REGTIME), (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||''), btoa(unescape(encodeURIComponent(JSON.stringify(search)))) diff --git a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js index 152e1192dc..64fb3be741 100644 --- a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js +++ b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js @@ -27,10 +27,10 @@ define(function(require) { var TEMPLATE_ATTR = 'USER_TEMPLATE'; var _columns = [ - Locale.tr("ID") , - Locale.tr("Owner") , - Locale.tr("Group"), + Locale.tr("ID"), Locale.tr("Name"), + Locale.tr("Owner"), + Locale.tr("Group"), Locale.tr("Status"), Locale.tr("Used CPU"), Locale.tr("Used Memory"), @@ -117,9 +117,9 @@ define(function(require) { 'value="' + element.ID + '" '+ 'state="'+element.STATE+'" lcm_state="'+element.LCM_STATE+'"/>', element.ID, + element.NAME, element.UNAME, element.GNAME, - element.NAME, state, cpuMonitoring, Humanize.size(memoryMonitoring), diff --git a/src/sunstone/public/app/tabs/vnets-tab/datatable.js b/src/sunstone/public/app/tabs/vnets-tab/datatable.js index fff84431d6..4425ed3c5a 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/datatable.js +++ b/src/sunstone/public/app/tabs/vnets-tab/datatable.js @@ -65,9 +65,9 @@ define(function(require) { this.columns = [ Locale.tr("ID"), + Locale.tr("Name"), Locale.tr("Owner"), Locale.tr("Group"), - Locale.tr("Name"), Locale.tr("Reservation"), Locale.tr("Cluster"), Locale.tr("Bridge"), @@ -146,9 +146,9 @@ define(function(require) { element.ID + '" name="selected_items" value="' + element.ID + '"/>', element.ID, + element.NAME, element.UNAME, element.GNAME, - element.NAME, element.PARENT_NETWORK_ID.length ? Locale.tr("Yes") : Locale.tr("No"), clusters, element.BRIDGE, diff --git a/src/sunstone/public/app/tabs/vrouters-tab/datatable.js b/src/sunstone/public/app/tabs/vrouters-tab/datatable.js index ece6b9b4bb..b726dd77a7 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/datatable.js +++ b/src/sunstone/public/app/tabs/vrouters-tab/datatable.js @@ -62,9 +62,9 @@ define(function(require) { this.columns = [ Locale.tr("ID"), + Locale.tr("Name"), Locale.tr("Owner"), Locale.tr("Group"), - Locale.tr("Name"), Locale.tr("Labels"), "search_data" ]; @@ -108,9 +108,9 @@ define(function(require) { element.ID + '" name="selected_items" value="' + element.ID + '"/>', element.ID, + element.NAME, element.UNAME, element.GNAME, - element.NAME, (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||''), btoa(unescape(encodeURIComponent(JSON.stringify(search)))) ];