diff --git a/src/sunstone/public/app/tabs/zones-tab.js b/src/sunstone/public/app/tabs/zones-tab.js index 3c6c7d9c8f..643f3162f5 100644 --- a/src/sunstone/public/app/tabs/zones-tab.js +++ b/src/sunstone/public/app/tabs/zones-tab.js @@ -4,7 +4,7 @@ define(function(require) { var Actions = require('./zones-tab/actions'); var DataTable = require('./zones-tab/datatable'); - var TAB_ID = 'zones-tab'; + var TAB_ID = require('./zones-tab/tabId'); var _dialogs = [ require('./zones-tab/dialogs/create') diff --git a/src/sunstone/public/app/tabs/zones-tab/actions.js b/src/sunstone/public/app/tabs/zones-tab/actions.js index 73db2699d9..17e12c9b38 100644 --- a/src/sunstone/public/app/tabs/zones-tab/actions.js +++ b/src/sunstone/public/app/tabs/zones-tab/actions.js @@ -5,13 +5,16 @@ define(function(require) { var ZonesDataTable = require('./datatable'); var Locale = require('utils/locale'); + var TAB_ID = require('./tabId'); + var CREATE_ZONE_DIALOG_ID = require('./dialogs/create/dialogId'); + var _zoneActions = { "Zone.create" : { type: "create", call: OpenNebulaZone.create, callback: function(request, response) { - Sunstone.hideDialog('zones-tab', 'createZoneDialog'); - Sunstone.resetDialog('zones-tab', 'createZoneDialog'); + Sunstone.hideDialog(TAB_ID, CREATE_ZONE_DIALOG_ID); + Sunstone.resetDialog(TAB_ID, CREATE_ZONE_DIALOG_ID); Sunstone.runAction('Zone.list'); }, error: Notifier.onError, @@ -21,7 +24,7 @@ define(function(require) { "Zone.create_dialog" : { type: "custom", call: function() { - Sunstone.showDialog('zones-tab', 'createZoneDialog'); + Sunstone.showDialog(TAB_ID, CREATE_ZONE_DIALOG_ID); } }, @@ -36,9 +39,9 @@ define(function(require) { type: "single", call: OpenNebulaZone.show, callback: function(request, response) { - if (Sunstone.rightInfoVisible($('#zones-tab'))) { + if (Sunstone.rightInfoVisible($('#'+TAB_ID))) { // individual view - Sunstone.insertPanels('zones-tab', response); + Sunstone.insertPanels(TAB_ID, response); } // datatable row @@ -57,7 +60,7 @@ define(function(require) { "Zone.refresh" : { type: "custom", call: function() { - var tab = $("#zones-tab"); + var tab = $('#' + TAB_ID); if (Sunstone.rightInfoVisible(tab)) { Sunstone.runAction("Zone.show", Sunstone.rightInfoResourceId(tab)) } else { diff --git a/src/sunstone/public/app/tabs/zones-tab/datatable.js b/src/sunstone/public/app/tabs/zones-tab/datatable.js index 005785d1f8..5089c38198 100644 --- a/src/sunstone/public/app/tabs/zones-tab/datatable.js +++ b/src/sunstone/public/app/tabs/zones-tab/datatable.js @@ -7,7 +7,7 @@ define(function(require) { var _dataTableZones; var DATATABLE_ID = "dataTableZones"; var DATATABLE_SEARCH_ID = "zonesSearch"; - var TAB_NAME = 'zones-tab'; + var TAB_NAME = require('./tabId'); function _initialize() { _dataTableZones = $('#'+DATATABLE_ID).dataTable({ diff --git a/src/sunstone/public/app/tabs/zones-tab/dialogs/create.js b/src/sunstone/public/app/tabs/zones-tab/dialogs/create.js index 9c7aa423a0..4fdfee24f7 100644 --- a/src/sunstone/public/app/tabs/zones-tab/dialogs/create.js +++ b/src/sunstone/public/app/tabs/zones-tab/dialogs/create.js @@ -1,7 +1,7 @@ define(function(require) { var TemplateHTML = require('hbs!./create/html'); var Sunstone = require('sunstone'); - var DIALOG_ID = "createZoneDialog"; + var DIALOG_ID = require('./create/dialogId'); var _html = function() { return TemplateHTML({dialogId: DIALOG_ID}); diff --git a/src/sunstone/public/app/tabs/zones-tab/dialogs/create/dialogId.js b/src/sunstone/public/app/tabs/zones-tab/dialogs/create/dialogId.js new file mode 100644 index 0000000000..51aeb26b14 --- /dev/null +++ b/src/sunstone/public/app/tabs/zones-tab/dialogs/create/dialogId.js @@ -0,0 +1,3 @@ +define(function(require){ + return 'createZoneDialog'; +}) \ No newline at end of file diff --git a/src/sunstone/public/app/tabs/zones-tab/panels/info.js b/src/sunstone/public/app/tabs/zones-tab/panels/info.js index c29b7cca0f..3f4bf1d7d7 100644 --- a/src/sunstone/public/app/tabs/zones-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/zones-tab/panels/info.js @@ -4,7 +4,7 @@ define(function(require) { var RenameTr = require('utils/panel/rename-tr'); var ExtendedTemplateTable = require('utils/panel/extended-template-table'); - var PANEL_ID = "zone_info_tab"; + var PANEL_ID = require('./info/panelId'); var _html = function(info) { var renameTrHTML = RenameTr.html("Zone", info.ZONE.NAME); diff --git a/src/sunstone/public/app/tabs/zones-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/zones-tab/panels/info/panelId.js new file mode 100644 index 0000000000..c9704b2031 --- /dev/null +++ b/src/sunstone/public/app/tabs/zones-tab/panels/info/panelId.js @@ -0,0 +1,3 @@ +define(function(require){ + return 'zone_info_tab'; +}) \ No newline at end of file diff --git a/src/sunstone/public/app/tabs/zones-tab/tabId.js b/src/sunstone/public/app/tabs/zones-tab/tabId.js new file mode 100644 index 0000000000..04ee20c4a4 --- /dev/null +++ b/src/sunstone/public/app/tabs/zones-tab/tabId.js @@ -0,0 +1,3 @@ +define(function(require){ + return 'zones-tab'; +}) \ No newline at end of file