ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [38/50] [abbrv] ambari git commit: AMBARI-21213 Consolidate UI for the "Loading..." text (dili)
Date Mon, 12 Jun 2017 16:45:45 GMT
AMBARI-21213 Consolidate UI for the "Loading..." text (dili)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d97aa1df
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d97aa1df
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d97aa1df

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: d97aa1dfc5c238544b65fcd67534de64aff556a2
Parents: 29f7508
Author: Di Li <dili@apache.org>
Authored: Fri Jun 9 15:43:57 2017 -0400
Committer: Di Li <dili@apache.org>
Committed: Fri Jun 9 15:43:57 2017 -0400

----------------------------------------------------------------------
 .../main/admin/highAvailability/progress_popup_controller.js      | 2 +-
 ambari-web/app/messages.js                                        | 3 ---
 ambari-web/app/templates/main.hbs                                 | 2 +-
 ambari-web/app/utils/ajax/ajax.js                                 | 2 +-
 .../app/views/common/configs/service_config_container_view.js     | 2 +-
 ambari-web/app/views/loading.js                                   | 2 +-
 ambari-web/app/views/main/alerts/definition_details_view.js       | 2 +-
 ambari-web/test/views/main/alerts/definition_details_view_test.js | 2 +-
 8 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d97aa1df/ambari-web/app/controllers/main/admin/highAvailability/progress_popup_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/progress_popup_controller.js
b/ambari-web/app/controllers/main/admin/highAvailability/progress_popup_controller.js
index 7231e5c..4cbe59b 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/progress_popup_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/progress_popup_controller.js
@@ -83,7 +83,7 @@ App.HighAvailabilityProgressPopupController = Ember.Controller.extend({
   initPopup: function (popupTitle, requestIds, progressController, showSpinner, stageId)
{
     if (showSpinner) {
       var loadingPopup = App.ModalPopup.show({
-        header: Em.I18n.t('jobs.loadingTasks'),
+        header: Em.I18n.t('common.loading.eclipses'),
         primary: false,
         secondary: false,
         bodyClass: Ember.View.extend({

http://git-wip-us.apache.org/repos/asf/ambari/blob/d97aa1df/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 6f317a3..faad84c 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -30,7 +30,6 @@ Em.I18n.translations = {
     '<br/>Alternatively login as an Ambari local user using the local login page.<br
/>' +
     '<a href="{0}" target="_blank">{0}</a>',
 
-  'app.loadingPlaceholder': 'Loading...',
   'app.versionMismatchAlert.title': 'Ambari Server / Web Client Version Mismatch',
   'app.versionMismatchAlert.body': 'Ambari Server and Web Client versions do not match:<br>
' +
     '<br>Ambari Server: <strong>{0}</strong>' +
@@ -3169,9 +3168,7 @@ Em.I18n.translations = {
   'menu.item.views':'<i class="glyphicon glyphicon-th"></i>',
   'menu.item.views.noViews':'No Views',
 
-  'bulkOperation.loading': 'Loading...',
   'jobs.nothingToShow': 'No jobs to display',
-  'jobs.loadingTasks': 'Loading...',
   'jobs.error.ats.down': 'Jobs data cannot be shown since YARN App Timeline Server is not
running.',
   'jobs.error.400': 'Unable to load data.',
   'jobs.table.custom.date.am':'AM',

http://git-wip-us.apache.org/repos/asf/ambari/blob/d97aa1df/ambari-web/app/templates/main.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main.hbs b/ambari-web/app/templates/main.hbs
index bf6fa56..a1ba86a 100644
--- a/ambari-web/app/templates/main.hbs
+++ b/ambari-web/app/templates/main.hbs
@@ -22,7 +22,7 @@
   </div>
 {{else}}
   {{#unless isClusterDataLoaded}}
-    <h2>{{t app.loadingPlaceholder}}</h2>
+    <h2>{{t common.loading.eclipses}}</h2>
     <div class="progress">
       <div class="progress-bar progress-bar-striped active" {{QAAttr "main-progress-bar"}}
{{bindAttr style="controller.clusterDataLoadedPercent"}}></div>
     </div>

http://git-wip-us.apache.org/repos/asf/ambari/blob/d97aa1df/ambari-web/app/utils/ajax/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js
index 492a216..c595181 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -3131,7 +3131,7 @@ var ajax = Em.Object.extend({
     if(config.hasOwnProperty("showLoadingPopup") && config.showLoadingPopup === true)
{
       loadingPopupTimeout = setTimeout(function() {
         loadingPopup = App.ModalPopup.show({
-          header: Em.I18n.t('jobs.loadingTasks'),
+          header: Em.I18n.t('common.loading.eclipses'),
           backdrop: false,
           primary: false,
           secondary: false,

http://git-wip-us.apache.org/repos/asf/ambari/blob/d97aa1df/ambari-web/app/views/common/configs/service_config_container_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/service_config_container_view.js b/ambari-web/app/views/common/configs/service_config_container_view.js
index a7cee0c..d1ff009 100644
--- a/ambari-web/app/views/common/configs/service_config_container_view.js
+++ b/ambari-web/app/views/common/configs/service_config_container_view.js
@@ -40,7 +40,7 @@ App.ServiceConfigContainerView = Em.ContainerView.extend({
           selectedServiceBinding: controllerRoute + '.selectedService',
           serviceConfigsByCategoryView: Em.ContainerView.create(),
           willDestroyElement: function () {
-            $('.loading').append(Em.I18n.t('app.loadingPlaceholder'));
+            $('.loading').append(Em.I18n.t('common.loading.eclipses'));
           },
           didInsertElement: function () {
             $('.loading').empty();

http://git-wip-us.apache.org/repos/asf/ambari/blob/d97aa1df/ambari-web/app/views/loading.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/loading.js b/ambari-web/app/views/loading.js
index 81d4a60..47468bb 100644
--- a/ambari-web/app/views/loading.js
+++ b/ambari-web/app/views/loading.js
@@ -20,5 +20,5 @@ var App = require('app');
 
 App.LoadingView = Em.View.extend({
     tagName: 'h2',
-    template: Ember.Handlebars.compile('{{t app.loadingPlaceholder}}')
+    template: Ember.Handlebars.compile('{{t common.loading.eclipses}}')
 });
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/d97aa1df/ambari-web/app/views/main/alerts/definition_details_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/alerts/definition_details_view.js b/ambari-web/app/views/main/alerts/definition_details_view.js
index 5c8efff..bb9e738 100644
--- a/ambari-web/app/views/main/alerts/definition_details_view.js
+++ b/ambari-web/app/views/main/alerts/definition_details_view.js
@@ -216,7 +216,7 @@ App.MainAlertDefinitionDetailsView = App.TableView.extend({
     template: Ember.Handlebars.compile('<span>{{view.count}}</span>'),
     count: function () {
       var lastDayAlertsCount = this.get('parentView.controller.lastDayAlertsCount');
-      return lastDayAlertsCount ? lastDayAlertsCount[this.get('hostName')] || 0 : Em.I18n.t('app.loadingPlaceholder');
+      return lastDayAlertsCount ? lastDayAlertsCount[this.get('hostName')] || 0 : Em.I18n.t('common.loading.eclipses');
     }.property('parentView.controller.lastDayAlertsCount', 'hostName')
   }),
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d97aa1df/ambari-web/test/views/main/alerts/definition_details_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/alerts/definition_details_view_test.js b/ambari-web/test/views/main/alerts/definition_details_view_test.js
index b3c4712..7b96858 100644
--- a/ambari-web/test/views/main/alerts/definition_details_view_test.js
+++ b/ambari-web/test/views/main/alerts/definition_details_view_test.js
@@ -208,7 +208,7 @@ describe('App.MainAlertDefinitionDetailsView', function () {
 
       it("lastDayAlertsCount is null", function () {
         lastDayCountView.set('parentView.controller.lastDayAlertsCount', null);
-        expect(lastDayCountView.get('count')).to.equal(Em.I18n.t('app.loadingPlaceholder'));
+        expect(lastDayCountView.get('count')).to.equal(Em.I18n.t('common.loading.eclipses'));
       });
 
       it("lastDayAlertsCount does not contain host", function () {


Mime
View raw message