You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2015/01/09 21:44:51 UTC
[2/2] ambari git commit: AMBARI-9074. Create Alert Notification Popup
is too short
AMBARI-9074. Create Alert Notification Popup is too short
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fe799646
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fe799646
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fe799646
Branch: refs/heads/trunk
Commit: fe7996466fda0da4c9851e3eac4d5dab9351fba8
Parents: a8fc971
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Fri Jan 9 11:27:44 2015 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Fri Jan 9 12:44:37 2015 -0800
----------------------------------------------------------------------
.../main/alerts/manage_alert_notifications_controller.js | 1 +
ambari-web/app/views/common/modal_popup.js | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fe799646/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js b/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js
index 2d84994..bc03905 100644
--- a/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js
+++ b/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js
@@ -331,6 +331,7 @@ App.ManageAlertNotificationsController = Em.Controller.extend({
var createEditPopup = App.ModalPopup.show({
header: isEdit ? Em.I18n.t('alerts.actions.manage_alert_notifications_popup.editHeader') : Em.I18n.t('alerts.actions.manage_alert_notifications_popup.addHeader'),
classNames: ['create-edit-alert-notification-popup'],
+ marginBottom: 130,
bodyClass: Em.View.extend({
controller: this,
templateName: require('templates/main/alerts/create_alert_notification'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/fe799646/ambari-web/app/views/common/modal_popup.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/modal_popup.js b/ambari-web/app/views/common/modal_popup.js
index 08e63dd..b07fc22 100644
--- a/ambari-web/app/views/common/modal_popup.js
+++ b/ambari-web/app/views/common/modal_popup.js
@@ -30,6 +30,7 @@ App.ModalPopup = Ember.View.extend({
secondary: Em.I18n.t('common.cancel'),
third: null,
autoHeight: true,
+ marginBottom: 300,
disablePrimary: false,
disableSecondary: false,
disableThird: false,
@@ -66,7 +67,7 @@ App.ModalPopup = Ember.View.extend({
if (this.autoHeight) {
var block = this.$().find('#modal > .modal-body').first();
if(block.offset()) {
- block.css('max-height', $(window).height() - block.offset().top - 300 + $(window).scrollTop()); // fix popup height
+ block.css('max-height', $(window).height() - block.offset().top - this.marginBottom + $(window).scrollTop()); // fix popup height
}
}
// If popup is opened from another popup it should be displayed above