diff --git a/web/pgadmin/browser/static/js/node.js b/web/pgadmin/browser/static/js/node.js index a9c2b1863..7b5ba6f11 100644 --- a/web/pgadmin/browser/static/js/node.js +++ b/web/pgadmin/browser/static/js/node.js @@ -265,10 +265,16 @@ define( \ \
' + msg + '
\ +
\ + x\ +
\ \ '; if(!_.isUndefined(that.statusBar)) { that.statusBar.html(alertMessage).css("visibility", "visible"); + that.statusBar.find("a.close-error").bind("click", function(e) { + this.empty().css("visibility", "hidden"); + }.bind(that.statusBar)); } callback(true); diff --git a/web/pgadmin/browser/static/js/wizard.js b/web/pgadmin/browser/static/js/wizard.js index a65c71cd1..d088aa724 100644 --- a/web/pgadmin/browser/static/js/wizard.js +++ b/web/pgadmin/browser/static/js/wizard.js @@ -96,6 +96,9 @@ function(_, Backbone, pgAdmin, pgBrowser) { + " " + "
" + "
" + + "
" + + " x" + + "
" + " " + " " + " " @@ -128,6 +131,7 @@ function(_, Backbone, pgAdmin, pgBrowser) { "click button.wizard-maximize-event" : "onMaximize", "click button.wizard-finish" : "finishWizard", "click button.wizard-help" : "onDialogHelp", + "click a.close-error" : "closeErrorMsg", }, initialize: function(options) { this.options = _.extend({}, this.options, options.options); @@ -224,6 +228,10 @@ function(_, Backbone, pgAdmin, pgBrowser) { this.options.disable_prev = false; } }, + closeErrorMsg: function() { + $(this.el).find('.pg-prop-status-bar .alert-text').empty(); + $(this.el).find('.pg-prop-status-bar').css("visibility", "hidden"); + }, beforeNext: function(){ return this.evalASFunc(this.currPage.beforeNext); }, diff --git a/web/pgadmin/static/css/bootstrap.overrides.css b/web/pgadmin/static/css/bootstrap.overrides.css index b894021e9..b0c531a55 100755 --- a/web/pgadmin/static/css/bootstrap.overrides.css +++ b/web/pgadmin/static/css/bootstrap.overrides.css @@ -1176,6 +1176,16 @@ form[name="change_password_form"] .help-block { overflow: hidden; } +.close-error-bar { + background: #d0021b; + padding: 5px; +} + +.close-error-bar a { + color: #FFFFFF; + cursor: pointer; +} + .user_management .search_users form { margin: 0; } diff --git a/web/pgadmin/static/scss/_alert.scss b/web/pgadmin/static/scss/_alert.scss index 3f860b87c..441c40f8c 100644 --- a/web/pgadmin/static/scss/_alert.scss +++ b/web/pgadmin/static/scss/_alert.scss @@ -104,8 +104,6 @@ .alert-text { flex-grow: 1; border: 1px solid $color-red-2; - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; padding: 7px 12px 6px 10px; border-left: none; } diff --git a/web/pgadmin/tools/user_management/static/js/user_management.js b/web/pgadmin/tools/user_management/static/js/user_management.js index 6507bf087..bd14ce1e5 100644 --- a/web/pgadmin/tools/user_management/static/js/user_management.js +++ b/web/pgadmin/tools/user_management/static/js/user_management.js @@ -477,8 +477,8 @@ define([ prepare: function() { var self = this, footerTpl = _.template([ - '