You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/06/09 21:08:38 UTC
[1/3] ambari git commit: AMBARI-21213 Consolidate UI for the
"Loading..." text (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-20859 ebe393900 -> eaa2e0f45
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-20859
Commit: d97aa1dfc5c238544b65fcd67534de64aff556a2
Parents: 29f7508
Author: Di Li <di...@apache.org>
Authored: Fri Jun 9 15:43:57 2017 -0400
Committer: Di Li <di...@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 () {
[2/3] ambari git commit: AMBARI-21218 Enable Kerberos UI is blank the
first time opens it (dili)
Posted by rl...@apache.org.
AMBARI-21218 Enable Kerberos UI is blank the first time opens it (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2bea1205
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2bea1205
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2bea1205
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 2bea1205e213db7fc35fc9a0aac0453bbdeaa417
Parents: d97aa1d
Author: Di Li <di...@apache.org>
Authored: Fri Jun 9 16:37:40 2017 -0400
Committer: Di Li <di...@apache.org>
Committed: Fri Jun 9 16:37:40 2017 -0400
----------------------------------------------------------------------
.../app/controllers/main/admin/stack_and_upgrade_controller.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2bea1205/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index a676f7429..3483b29 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -1863,7 +1863,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
* get the installed repositories of HDP from server
*/
loadRepositories: function () {
- if (App.router.get('clusterController.isLoaded')) {
+ if (App.router.get('clusterController.isLoaded') && App.get('currentStackVersion')) {
var nameVersionCombo = App.get('currentStackVersion');
var stackName = nameVersionCombo.split('-')[0];
var stackVersion = nameVersionCombo.split('-')[1];
[3/3] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-20859
Posted by rl...@apache.org.
Merge branch 'trunk' into branch-feature-AMBARI-20859
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eaa2e0f4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eaa2e0f4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eaa2e0f4
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: eaa2e0f45b86d223c779739ee78e5d184062177e
Parents: ebe3939 2bea120
Author: Robert Levas <rl...@hortonworks.com>
Authored: Fri Jun 9 17:08:27 2017 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Fri Jun 9 17:08:27 2017 -0400
----------------------------------------------------------------------
.../main/admin/highAvailability/progress_popup_controller.js | 2 +-
.../app/controllers/main/admin/stack_and_upgrade_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 +-
9 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------