IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed following issues:

Browse Source 
1) Grant wizard close issue.
   2) Moved grant wizard specific css from wizard.css to grant_wizard.css
   3) removed 'ajs_content' css from wizard.css causing padding issue in alertify dialog
This commit is contained in:
Surinder Kumar 2016-05-13 15:04:36 +05:30 committed by Akshay Joshi
parent 174363c9a7
commit 938ea21f40
3 changed files with 43 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
web/pgadmin/browser/static/css/wizard.css
View File

@ -1,10 +1,10 @@
/** CSS for Wizard **/ /** CSS for Wizard **/
.pgadmin_grant_wizard_body .ajs-content { .pgadmin_grant_wizard_body .ajs-content {
padding-top: 0px !important; padding: 0px !important;
} }
.wizard-header { .wizard-header {
padding: 6px 10px!important; padding: 6px 10px!important;
min-height: 35px; min-height: 35px;
max-height: 35px; max-height: 35px;
border-bottom: 2px solid darkgray; border-bottom: 2px solid darkgray;
@ -29,25 +29,18 @@
width: 100%; width: 100%;
} }
.grant_wizard_container { .pgadmin-wizard {
position: relative;
overflow: hidden;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.grant_wizard_container .pgadmin-wizard { .wizard-content {
width: 100%;
height: 100%;
}
.grant_wizard_container .wizard-content {
position: relative; position: relative;
padding: 0; padding: 0;
height: 78%; height: calc(100% - 97px);
} }
.grant_wizard_container .wizard-right-panel { .wizard-right-panel {
overflow-y: auto; overflow-y: auto;
height: 100%; height: 100%;
top: 0; top: 0;
@ -56,7 +49,7 @@
bottom: 0; bottom: 0;
} }
.grant_wizard_container .wizard-left-panel { .wizard-left-panel {
position: absolute; position: absolute;
top: 0; top: 0;
display: flex; display: flex;
@ -67,20 +60,16 @@
right: 0; right: 0;
} }
.grant_wizard_container .wizard-left-panel img { .wizard-left-panel img {
width: 140px; width: 140px;
} }
.grant_wizard_container .wizard-right-panel_content { .wizard-right-panel_content {
height: 60%; height: calc(100% - 113px);
}
.grant_wizard_container {
height: 100%;
} }
/* Wizard Footer CSS */ /* Wizard Footer CSS */
.grant_wizard_container .footer { .pgadmin-wizard .footer {
background-color: #D2D2D2; background-color: #D2D2D2;
border-width: 2px 0px 0px 0px; border-width: 2px 0px 0px 0px;
border-style: solid; border-style: solid;
@ -94,41 +83,41 @@
} }
/* Wizard Button CSS */ /* Wizard Button CSS */
.grant_wizard_container .wizard-buttons { .pgadmin-wizard .wizard-buttons {
float: right; float: right;
} }
.grant_wizard_container .wizard-buttons button { .pgadmin-wizard .wizard-buttons button {
float: left; float: left;
font-size: 14px; font-size: 14px;
margin: 3px 5px 0 0 !important; margin: 3px 5px 0 0 !important;
} }
.grant_wizard_container .wizard-buttons button.wizard-next i.fa { .pgadmin-wizard .wizard-buttons button.wizard-next i.fa {
padding-left: 5px; padding-left: 5px;
} }
.grant_wizard_container .wizard-buttons button.wizard-back i.fa, .pgadmin-wizard .wizard-buttons button.wizard-back i.fa,
.grant_wizard_container .wizard-buttons button.wizard-cancel i.fa { .pgadmin-wizard .wizard-buttons button.wizard-cancel i.fa {
padding-right: 5px; padding-right: 5px;
} }
.grant_wizard_container .wizard-buttons .wizard-finish { .pgadmin-wizard .wizard-buttons .wizard-finish {
margin-right: 0 !important; margin-right: 0 !important;
} }
/* Wizard Status bar CSS */ /* Wizard Status bar CSS */
.grant_wizard_container .wizard-description { .pgadmin-wizard .wizard-description {
padding: 1.0em 0.1em; padding: 1.0em 0.1em;
} }
/* Error message css */ /* Error message css */
.grant_wizard_container .error_msg_div { .pgadmin-wizard .error_msg_div {
display: block;
background: #fff; background: #fff;
font-size: 13px;
} }
.grant_wizard_container .error_msg_div p { .pgadmin-wizard .error_msg_div p {
background: #fff; background: #fff;
color: #b92c28; color: #b92c28;
} }
@ -142,8 +131,4 @@
*/ */
.select2-container--open { .select2-container--open {
z-index: 10000; z-index: 10000;
}
.alertify .ajs-body .ajs-content {
padding: 0px;
} }

16
web/pgadmin/tools/grant_wizard/static/css/grant_wizard.css
View File

@ -11,9 +11,14 @@
} }
.object_type_table { .object_type_table {
display: inline-block;
height: 100%; height: 100%;
border: 0 !important; border: 0 !important;
display: inline;
}
.object_type_table thead {
display: table;
width: 100%;
} }
.object_type_table thead tr { .object_type_table thead tr {
@ -24,7 +29,7 @@
.object_type_table tbody { .object_type_table tbody {
display: block; display: block;
overflow: scroll; overflow: auto;
border: 1px solid #ddd; border: 1px solid #ddd;
width: 100%; width: 100%;
min-height: 100%; min-height: 100%;
@ -107,3 +112,10 @@
.wizard-right-panel_content .CodeMirror-gutters { .wizard-right-panel_content .CodeMirror-gutters {
min-height: 285px !important; min-height: 285px !important;
} }
.grant_wizard_container {
position: relative;
overflow: hidden;
width: 100%;
height: 100%;
}

17
web/pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js
View File

@ -93,7 +93,6 @@ define([
var col = this.column.get('name'); var col = this.column.get('name');
if (this.model && this.model.has(col)) { if (this.model && this.model.has(col)) {
if (this.model.get(col)) { if (this.model.get(col)) {
this.checkbox().prop("checked", true);
this.$el.parent().toggleClass("selected", true); this.$el.parent().toggleClass("selected", true);
this.model.trigger("backgrid:selected", this.model, true); this.model.trigger("backgrid:selected", this.model, true);
} }
@ -142,7 +141,7 @@ define([
var supported_nodes = [ var supported_nodes = [
'schema', 'coll-function', 'coll-sequence', 'schema', 'coll-function', 'coll-sequence',
'coll-table', 'coll-view', 'coll-procedure', 'coll-table', 'coll-view', 'coll-procedure',
'coll-materialized_view', 'database' 'coll-mview', 'database'
], ],
/** /**
@ -201,7 +200,6 @@ define([
}, },
setup:function() { setup:function() {
return { return {
// Set options for dialog // Set options for dialog
options: { options: {
frameless: true, frameless: true,
@ -946,8 +944,9 @@ define([
dataType: "json", dataType: "json",
contentType: "application/json" contentType: "application/json"
}).done(function(res) { }).done(function(res) {
self.sqlTab.clearHistory(); self.sqlCtrl.clearHistory();
self.sqlTab.setValue(res.data); self.sqlCtrl.setValue(res.data);
self.sqlCtrl.refresh();
}).fail(function() { }).fail(function() {
self.model.trigger('pgadmin-view:msql:error'); self.model.trigger('pgadmin-view:msql:error');
}).always(function() { }).always(function() {
@ -959,9 +958,9 @@ define([
// Clear html dom elements of CodeMirror sql tab // Clear html dom elements of CodeMirror sql tab
self.sqlControl.unbind(); // Unbind all local event bindings self.sqlControl.unbind(); // Unbind all local event bindings
var cmElem = self.sqlControl.sqlTab.getWrapperElement(); var cmElem = self.sqlControl.sqlCtrl.getWrapperElement();
cmElem.remove(); cmElem.remove();
self.sqlControl.sqlTab = undefined; self.sqlControl.sqlCtrl = undefined;
} }
}) })
@ -987,9 +986,9 @@ define([
view: new(function() { view: new(function() {
// Render SqlTab control to generate its html markup // Render SqlTab control to generate its html markup
var sqlTabHtml = sqlControl.render().$el; var sqlCtrlHtml = sqlControl.render().$el;
this.render = function() { this.render = function() {
return { el: sqlTabHtml }; return { el: sqlCtrlHtml };
}; };
}), }),