From 5923cf70d5942b8a37771ec8637621015e2345c1 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Tue, 30 Jun 2015 16:13:58 +0200
Subject: [PATCH] feature #3748: Add resource name in header

---
 src/sunstone/public/app/sunstone/tab.hbs         |  7 +++++--
 .../public/app/tabs/clusters-tab/panels/info.js  |  1 +
 .../app/tabs/datastores-tab/panels/info.js       |  9 +++++----
 .../public/app/tabs/files-tab/panels/info.js     |  7 ++++---
 .../public/app/tabs/groups-tab/panels/info.js    |  7 +++++--
 .../public/app/tabs/hosts-tab/panels/info.js     | 11 ++++++-----
 .../public/app/tabs/images-tab/panels/info.js    |  7 ++++---
 .../app/tabs/marketplace-tab/panels/info.js      |  7 +++++--
 .../app/tabs/oneflow-services-tab/panels/info.js |  5 +++--
 .../tabs/oneflow-templates-tab/panels/info.js    |  7 ++++---
 .../public/app/tabs/secgroups-tab/panels/info.js |  5 +++--
 .../public/app/tabs/templates-tab/panels/info.js |  7 ++++---
 .../public/app/tabs/users-tab/panels/info.js     |  7 ++++---
 .../public/app/tabs/vdcs-tab/panels/info.js      |  2 ++
 .../public/app/tabs/vms-tab/panels/info.js       | 16 +++++++++++++---
 .../public/app/tabs/vnets-tab/panels/info.js     |  5 +++--
 .../public/app/tabs/zones-tab/panels/info.js     |  8 +++++---
 17 files changed, 76 insertions(+), 42 deletions(-)

diff --git a/src/sunstone/public/app/sunstone/tab.hbs b/src/sunstone/public/app/sunstone/tab.hbs
index 24056bd86f..273410e933 100644
--- a/src/sunstone/public/app/sunstone/tab.hbs
+++ b/src/sunstone/public/app/sunstone/tab.hbs
@@ -6,11 +6,14 @@
         <span class="header-resource" style="border-bottom: 2px solid #0098c3; padding: 0px 50px 10px 0px;">{{{listHeader}}}</span>
       </h3>
       <h3 class="subheader header-title only-right-info" style="border-bottom: 1px solid #efefef; padding-bottom: 10px;" hidden>
-        <span class="header-resource" style="border-bottom: 2px solid #0098c3; padding: 0px 50px 10px 0px;">{{{infoHeader}}}</span>
+        <span class="header-resource" style="border-bottom: 2px solid #0098c3; padding: 0px 50px 10px 0px;">{{{infoHeader}}}
         &emsp;
         <span class="resource-id"></span>
         &emsp;
         <span class="resource-info-header"></span>
+        &emsp;
+        <small class="resource-info-header-small"></small>
+        </span>
       </h3>
       <h3 class="subheader header-title only-right-form" style="border-bottom: 1px solid #efefef; padding-bottom: 10px;" hidden>
         <span class="right-form-title" style="border-bottom: 2px solid #0098c3; padding: 0px 50px 10px 0px;"></span>
@@ -69,4 +72,4 @@
     <div class="contentForm">
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/sunstone/public/app/tabs/clusters-tab/panels/info.js b/src/sunstone/public/app/tabs/clusters-tab/panels/info.js
index c912ad2105..6103186517 100644
--- a/src/sunstone/public/app/tabs/clusters-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/clusters-tab/panels/info.js
@@ -53,6 +53,7 @@ define(function(require) {
   }
 
   function _setup(context) {
+    $('.resource-info-header', '#' + TAB_ID).text(this.element.NAME);
     RenameTr.setup(RESOURCE, this.element.ID, context);
 
     TemplateTable.setup(this.element.TEMPLATE, RESOURCE, this.element.ID, context);
diff --git a/src/sunstone/public/app/tabs/datastores-tab/panels/info.js b/src/sunstone/public/app/tabs/datastores-tab/panels/info.js
index 1149944401..cf38f156d3 100644
--- a/src/sunstone/public/app/tabs/datastores-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/datastores-tab/panels/info.js
@@ -2,7 +2,7 @@ define(function(require) {
   /*
     DEPENDENCIES
    */
-  
+
   var Locale = require('utils/locale');
   var Humanize = require('utils/humanize');
   var RenameTr = require('utils/panel/rename-tr');
@@ -15,13 +15,13 @@ define(function(require) {
   /*
     TEMPLATES
    */
-  
+
   var TemplateInfo = require('hbs!./info/html');
 
   /*
     CONSTANTS
    */
-  
+
   var TAB_ID = require('../tabId');
   var PANEL_ID = require('./info/panelId');
   var RESOURCE = "Datastore"
@@ -54,7 +54,7 @@ define(function(require) {
     var renameTrHTML = RenameTr.html(RESOURCE, this.element.NAME);
     var clusterTrHTML = ClusterTr.html(this.element.CLUSTER);
     var templateTableHTML = TemplateTable.html(
-                                      this.element.TEMPLATE, RESOURCE, 
+                                      this.element.TEMPLATE, RESOURCE,
                                       Locale.tr("Attributes"));
     var permissionsTableHTML = PermissionsTable.html(TAB_ID, RESOURCE, this.element);
     var capacityBar = DatastoreCapacityBar.html(this.element);
@@ -80,6 +80,7 @@ define(function(require) {
   }
 
   function _setup(context) {
+    $('.resource-info-header', '#' + TAB_ID).text(this.element.NAME);
     RenameTr.setup(RESOURCE, this.element.ID, context);
     ClusterTr.setup(RESOURCE, this.element.ID, this.element.CLUSTER_ID, context);
     TemplateTable.setup(this.element.TEMPLATE, RESOURCE, this.element.ID, context);
diff --git a/src/sunstone/public/app/tabs/files-tab/panels/info.js b/src/sunstone/public/app/tabs/files-tab/panels/info.js
index 97ed20449e..ddc1e7c522 100644
--- a/src/sunstone/public/app/tabs/files-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/files-tab/panels/info.js
@@ -2,7 +2,7 @@ define(function(require) {
   /*
     DEPENDENCIES
    */
-  
+
   var Locale = require('utils/locale');
   var Humanize = require('utils/humanize');
   var RenameTr = require('utils/panel/rename-tr');
@@ -15,13 +15,13 @@ define(function(require) {
   /*
     TEMPLATES
    */
-  
+
   var TemplateInfo = require('hbs!./info/html');
 
   /*
     CONSTANTS
    */
-  
+
   var TAB_ID = require('../tabId');
   var PANEL_ID = require('./info/panelId');
   var RESOURCE = "File";
@@ -73,6 +73,7 @@ define(function(require) {
   }
 
   function _setup(context) {
+    $('.resource-info-header', '#' + TAB_ID).text(this.element.NAME);
     RenameTr.setup(RESOURCE, this.element.ID, context);
     TemplateTable.setup(this.element.TEMPLATE, RESOURCE, this.element.ID, context);
     PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context);
diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/info.js b/src/sunstone/public/app/tabs/groups-tab/panels/info.js
index 5623940adc..63f8256306 100644
--- a/src/sunstone/public/app/tabs/groups-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/groups-tab/panels/info.js
@@ -2,7 +2,7 @@ define(function(require) {
   /*
     DEPENDENCIES
    */
-  
+
   var TemplateInfo = require('hbs!./info/html');
   var Locale = require('utils/locale');
   var Views = require('../utils/views');
@@ -11,7 +11,7 @@ define(function(require) {
   /*
     TEMPLATES
    */
-  
+
   var TemplateTable = require('utils/panel/template-table');
 
   /*
@@ -76,6 +76,9 @@ define(function(require) {
 
   function _setup(context) {
     var that = this;
+
+    $('.resource-info-header', '#' + TAB_ID).text(that.element.NAME);
+    
     Tips.setup(context);
 
     // Template update
diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/info.js b/src/sunstone/public/app/tabs/hosts-tab/panels/info.js
index dfb602f0f6..998a927ece 100644
--- a/src/sunstone/public/app/tabs/hosts-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/hosts-tab/panels/info.js
@@ -2,7 +2,7 @@ define(function(require) {
   /*
     DEPENDENCIES
    */
-  
+
   var Locale = require('utils/locale');
   var Humanize = require('utils/humanize');
   var RenameTr = require('utils/panel/rename-tr');
@@ -18,13 +18,13 @@ define(function(require) {
   /*
     TEMPLATES
    */
-  
+
   var TemplateInfo = require('hbs!./info/html');
 
   /*
     CONSTANTS
    */
-  
+
   var TAB_ID = require('../tabId');
   var PANEL_ID = require('./info/panelId');
   var RESOURCE = "Host"
@@ -72,8 +72,8 @@ define(function(require) {
 
   function _html() {
     var templateTableHTML = TemplateTable.html(
-                                      this.strippedTemplate, 
-                                      RESOURCE, 
+                                      this.strippedTemplate,
+                                      RESOURCE,
                                       Locale.tr("Attributes"));
 
     var renameTrHTML = RenameTr.html(RESOURCE, this.element.NAME);
@@ -97,6 +97,7 @@ define(function(require) {
   }
 
   function _setup(context) {
+    $('.resource-info-header', '#' + TAB_ID).text(this.element.NAME);
     RenameTr.setup(RESOURCE, this.element.ID, context);
     ClusterTr.setup(RESOURCE, this.element.ID, this.element.CLUSTER_ID, context);
     TemplateTable.setup(this.strippedTemplate, RESOURCE, this.element.ID, context, this.unshownTemplate);
diff --git a/src/sunstone/public/app/tabs/images-tab/panels/info.js b/src/sunstone/public/app/tabs/images-tab/panels/info.js
index b5320c68bc..c3fd5745c8 100644
--- a/src/sunstone/public/app/tabs/images-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/images-tab/panels/info.js
@@ -2,7 +2,7 @@ define(function(require) {
   /*
     DEPENDENCIES
    */
-  
+
   var Locale = require('utils/locale');
   var Humanize = require('utils/humanize');
   var RenameTr = require('utils/panel/rename-tr');
@@ -15,13 +15,13 @@ define(function(require) {
   /*
     TEMPLATES
    */
-  
+
   var TemplateInfo = require('hbs!./info/html');
 
   /*
     CONSTANTS
    */
-  
+
   var TAB_ID = require('../tabId');
   var PANEL_ID = require('./info/panelId');
   var RESOURCE = "Image"
@@ -74,6 +74,7 @@ define(function(require) {
   }
 
   function _setup(context) {
+    $('.resource-info-header', '#' + TAB_ID).text(this.element.NAME);
     RenameTr.setup(RESOURCE, this.element.ID, context);
     TemplateTable.setup(this.element.TEMPLATE, RESOURCE, this.element.ID, context);
     PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context);
diff --git a/src/sunstone/public/app/tabs/marketplace-tab/panels/info.js b/src/sunstone/public/app/tabs/marketplace-tab/panels/info.js
index c178753546..56eb17aa78 100644
--- a/src/sunstone/public/app/tabs/marketplace-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/marketplace-tab/panels/info.js
@@ -2,7 +2,7 @@ define(function(require) {
   /*
     DEPENDENCIES
    */
-  
+
   var TemplateInfo = require('hbs!./info/html');
   var Locale = require('utils/locale');
   var Humanize = require('utils/humanize');
@@ -11,7 +11,7 @@ define(function(require) {
   /*
     TEMPLATES
    */
-  
+
   var TemplateTable = require('utils/panel/template-table');
 
   /*
@@ -20,6 +20,7 @@ define(function(require) {
 
   var PANEL_ID = require('./info/panelId');
   var RESOURCE = "Marketplace";
+  var TAB_ID = require('../tabId');
 
   /*
     CONSTRUCTOR
@@ -65,6 +66,8 @@ define(function(require) {
   }
 
   function _setup(context) {
+    $('.resource-id', '#' + TAB_ID).hide();
+    $('.resource-info-header', '#' + TAB_ID).text(this.element.name);
     return false;
   }
 });
diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/info.js b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/info.js
index 0b53ee37db..a404919c1e 100644
--- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/info.js
@@ -2,7 +2,7 @@ define(function(require) {
   /*
     DEPENDENCIES
    */
-  
+
   var Locale = require('utils/locale');
   var PermissionsTable = require('utils/panel/permissions-table');
   var OpenNebulaService = require('opennebula/service');
@@ -10,7 +10,7 @@ define(function(require) {
   /*
     TEMPLATES
    */
-  
+
   var TemplateHTML = require('hbs!./info/html');
 
   /*
@@ -56,6 +56,7 @@ define(function(require) {
   }
 
   function _setup(context) {
+    $('.resource-info-header', '#' + TAB_ID).text(this.element.NAME);
     PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context);
   }
 });
diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info.js
index 50e6c51598..a1e741a21e 100644
--- a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info.js
@@ -2,7 +2,7 @@ define(function(require) {
   /*
     DEPENDENCIES
    */
-  
+
   var Locale = require('utils/locale');
   var PermissionsTable = require('utils/panel/permissions-table');
   var TemplateUtils = require('utils/template-utils');
@@ -10,13 +10,13 @@ define(function(require) {
   /*
     TEMPLATES
    */
-  
+
   var TemplateHTML = require('hbs!./info/html');
 
   /*
     CONSTANTS
    */
-  
+
   var TAB_ID = require('../tabId');
   var PANEL_ID = require('./info/panelId');
   var XML_ROOT = "DOCUMENT";
@@ -92,6 +92,7 @@ define(function(require) {
   }
 
   function _setup(context) {
+    $('.resource-info-header', '#' + TAB_ID).text(this.element.NAME);
     PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context);
   }
 });
diff --git a/src/sunstone/public/app/tabs/secgroups-tab/panels/info.js b/src/sunstone/public/app/tabs/secgroups-tab/panels/info.js
index 89c175ceb9..61e806ddc1 100644
--- a/src/sunstone/public/app/tabs/secgroups-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/secgroups-tab/panels/info.js
@@ -2,7 +2,7 @@ define(function(require) {
   /*
     DEPENDENCIES
    */
-  
+
   var TemplateInfo = require('hbs!./info/html');
   var Locale = require('utils/locale');
   var PermissionsTable = require('utils/panel/permissions-table');
@@ -13,7 +13,7 @@ define(function(require) {
   /*
     TEMPLATES
    */
-  
+
   var TemplateTable = require('utils/panel/template-table');
 
   /*
@@ -81,6 +81,7 @@ define(function(require) {
   }
 
   function _setup(context) {
+    $('.resource-info-header', '#' + TAB_ID).text(this.element.NAME);
     RenameTr.setup(RESOURCE, this.element.ID, context);
     PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context);
 
diff --git a/src/sunstone/public/app/tabs/templates-tab/panels/info.js b/src/sunstone/public/app/tabs/templates-tab/panels/info.js
index 2bab1186f8..b63cbf89f8 100644
--- a/src/sunstone/public/app/tabs/templates-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/templates-tab/panels/info.js
@@ -2,7 +2,7 @@ define(function(require) {
   /*
     DEPENDENCIES
    */
-  
+
   var Locale = require('utils/locale');
   var Humanize = require('utils/humanize');
   var RenameTr = require('utils/panel/rename-tr');
@@ -11,13 +11,13 @@ define(function(require) {
   /*
     TEMPLATES
    */
-  
+
   var TemplateInfo = require('hbs!./info/html');
 
   /*
     CONSTANTS
    */
-  
+
   var TAB_ID = require('../tabId');
   var PANEL_ID = require('./info/panelId');
   var RESOURCE = "Template"
@@ -60,6 +60,7 @@ define(function(require) {
   }
 
   function _setup(context) {
+    $('.resource-info-header', '#' + TAB_ID).text(this.element.NAME);
     RenameTr.setup(RESOURCE, this.element.ID, context);
     PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context);
   }
diff --git a/src/sunstone/public/app/tabs/users-tab/panels/info.js b/src/sunstone/public/app/tabs/users-tab/panels/info.js
index 650a978a7f..1ef91e35cb 100644
--- a/src/sunstone/public/app/tabs/users-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/users-tab/panels/info.js
@@ -2,7 +2,7 @@ define(function(require) {
   /*
     DEPENDENCIES
    */
-  
+
   var TemplateInfo = require('hbs!./info/html');
   var TemplateChgrpTr = require('hbs!./info/chgrp-tr');
   var ResourceSelect = require('utils/resource-select');
@@ -13,7 +13,7 @@ define(function(require) {
   /*
     TEMPLATES
    */
-  
+
   var TemplateTable = require('utils/panel/template-table');
 
   /*
@@ -85,6 +85,8 @@ define(function(require) {
   function _setup(context) {
     var that = this;
 
+    $('.resource-info-header', '#' + TAB_ID).text(that.element.NAME);
+
     // Template update
     // TODO: simplify interface?
     var strippedTemplate = $.extend({}, this.element.TEMPLATE);
@@ -284,4 +286,3 @@ define(function(require) {
     return false;
   }
 });
-  
\ No newline at end of file
diff --git a/src/sunstone/public/app/tabs/vdcs-tab/panels/info.js b/src/sunstone/public/app/tabs/vdcs-tab/panels/info.js
index 2fca29f6bf..00fbf6a6ab 100644
--- a/src/sunstone/public/app/tabs/vdcs-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/vdcs-tab/panels/info.js
@@ -53,6 +53,8 @@ define(function(require) {
   }
 
   function _setup(context) {
+    $('.resource-info-header', '#' + TAB_ID).text(this.element.NAME);
+
     RenameTr.setup(RESOURCE, this.element.ID, context);
 
     TemplateTable.setup(this.element.TEMPLATE, RESOURCE, this.element.ID, context);
diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/info.js b/src/sunstone/public/app/tabs/vms-tab/panels/info.js
index fe2905eb6b..5c4e05c42d 100644
--- a/src/sunstone/public/app/tabs/vms-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/vms-tab/panels/info.js
@@ -2,7 +2,7 @@ define(function(require) {
   /*
     DEPENDENCIES
    */
-  
+
   var Locale = require('utils/locale');
   var Humanize = require('utils/humanize');
   var RenameTr = require('utils/panel/rename-tr');
@@ -14,13 +14,13 @@ define(function(require) {
   /*
     TEMPLATES
    */
-  
+
   var TemplateInfo = require('hbs!./info/html');
 
   /*
     CONSTANTS
    */
-  
+
   var TAB_ID = require('../tabId');
   var PANEL_ID = require('./info/panelId');
   var RESOURCE = "VM"
@@ -78,6 +78,16 @@ define(function(require) {
   }
 
   function _setup(context) {
+    var state;
+    if (this.element.STATE == OpenNebulaVM.STATES.ACTIVE) {
+      state = OpenNebulaVM.shortLcmStateStr(this.element.LCM_STATE);
+    } else {
+      state = OpenNebulaVM.stateStr(this.element.STATE);
+    }
+
+    $('.resource-info-header', '#' + TAB_ID).text(this.element.NAME);
+    $('.resource-info-header-small', '#' + TAB_ID).text(state);
+
     // Enable only action buttons for the current state
     StateActions.disableAllStateActions();
     StateActions.enableStateActions(this.element.STATE, this.element.LCM_STATE);
diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/info.js b/src/sunstone/public/app/tabs/vnets-tab/panels/info.js
index 5d0695c6ba..751c2050c1 100644
--- a/src/sunstone/public/app/tabs/vnets-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/vnets-tab/panels/info.js
@@ -2,7 +2,7 @@ define(function(require) {
   /*
     DEPENDENCIES
    */
-  
+
   var TemplateInfo = require('hbs!./info/html');
   var Locale = require('utils/locale');
   var PermissionsTable = require('utils/panel/permissions-table');
@@ -13,7 +13,7 @@ define(function(require) {
   /*
     TEMPLATES
    */
-  
+
   var TemplateTable = require('utils/panel/template-table');
 
   /*
@@ -93,6 +93,7 @@ define(function(require) {
   }
 
   function _setup(context) {
+    $('.resource-info-header', '#' + TAB_ID).text(this.element.NAME);
     RenameTr.setup(RESOURCE, this.element.ID, context);
     ClusterTr.setup(RESOURCE, this.element.ID, this.element.CLUSTER_ID, context);
     PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context);
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 a1e4fe491c..5c1e3b1e9c 100644
--- a/src/sunstone/public/app/tabs/zones-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/zones-tab/panels/info.js
@@ -2,7 +2,7 @@ define(function(require) {
   /*
     DEPENDENCIES
    */
-  
+
   var TemplateInfo = require('hbs!./info/html');
   var Locale = require('utils/locale');
   var RenameTr = require('utils/panel/rename-tr');
@@ -10,7 +10,7 @@ define(function(require) {
   /*
     TEMPLATES
    */
-  
+
   var TemplateTable = require('utils/panel/template-table');
 
   /*
@@ -18,6 +18,7 @@ define(function(require) {
    */
 
   var PANEL_ID = require('./info/panelId');
+  var TAB_ID = require('../tabId');
   var RESOURCE = "Zone"
 
   /*
@@ -45,7 +46,7 @@ define(function(require) {
 
   function _html() {
     var renameTrHTML = RenameTr.html(RESOURCE, this.element.NAME);
-    var templateTableHTML = TemplateTable.html(this.element.TEMPLATE, RESOURCE, 
+    var templateTableHTML = TemplateTable.html(this.element.TEMPLATE, RESOURCE,
                                       Locale.tr("Attributes"));
 
     return TemplateInfo({
@@ -56,6 +57,7 @@ define(function(require) {
   }
 
   function _setup(context) {
+    $('.resource-info-header', '#' + TAB_ID).text(this.element.NAME);
     RenameTr.setup(RESOURCE, this.element.ID, context);
     TemplateTable.setup(this.element.TEMPLATE, RESOURCE, this.element.ID, context);
     return false;