Browse Source

AMBARI-8199 Title after install completion is still 'Ambari-Cluster Install Wizard'. (ababiichuk)

aBabiichuk 10 years ago
parent
commit
a59bbb2bc8
3 changed files with 8 additions and 6 deletions
  1. 4 4
      ambari-web/app/controllers/main.js
  2. 2 0
      ambari-web/app/messages.js
  3. 2 2
      ambari-web/app/router.js

+ 4 - 4
ambari-web/app/controllers/main.js

@@ -24,15 +24,15 @@ App.MainController = Em.Controller.extend({
 
   updateTitle: function(){
     var name = App.router.get('clusterController.clusterName');
-    if(App.clusterStatus.get('isInstalled')) {
-      if (name) {
+    if(App.router.get('clusterInstallCompleted')) {
+      if (name && App.router.get('clusterController').get('isLoaded')) {
         name = name.length > 13 ? name.substr(0, 10) + "..." : name;
       } else {
         name = Em.I18n.t('common.loading');
       }
-      $('title').text('Ambari - ' + name);
+      $('title').text(Em.I18n.t('app.name.subtitle').format(name));
     }
-  }.observes('App.router.clusterController.clusterName, App.clusterStatus.isInstalled'),
+  }.observes('App.router.clusterController.clusterName, App.router.clusterInstallCompleted', 'App.router.clusterController.isLoaded'),
 
   isClusterDataLoaded: function(){
     return App.router.get('clusterController.isLoaded');

+ 2 - 0
ambari-web/app/messages.js

@@ -19,6 +19,8 @@
 Em.I18n.translations = {
 
   'app.name':'Ambari',
+  'app.name.subtitle':'Ambari - {0}',
+  'app.name.subtitle.experimental':'Ambari Experimental',
   'app.reloadPopup.link': 'Reload Page',
   'app.reloadPopup.text': 'Trying to connect to server...',
   'app.reloadPopup.header': 'Reload Page',

+ 2 - 2
ambari-web/app/router.js

@@ -350,7 +350,7 @@ App.Router = Em.Router.extend({
   },
 
   logOff: function (context) {
-    $('title').text('Ambari');
+    $('title').text(Em.I18n.t('app.name'));
     var hash = window.btoa(this.get('loginController.loginName') + ":" + this.get('loginController.password'));
 
     App.router.get('mainController').stopPolling();
@@ -485,7 +485,7 @@ App.Router = Em.Router.extend({
       },
       connectOutlets: function (router, context) {
         if (App.get('isAdmin') && !App.get('isOperator')) {
-          $('title').text("Ambari Experimental");
+          $('title').text(Em.I18n.t('app.name.subtitle.experimental'));
           console.log('/experimental:connectOutlet');
           router.get('applicationController').connectOutlet('experimental');
         }