Use the same layout mechanism used as in the panel using elementary

layout support in different dialogs. Fixes #1358.
This commit is contained in:
Ashesh Vashi 2016-06-20 12:46:30 +05:30
parent f1dd39e5e9
commit 3350eaceab
9 changed files with 96 additions and 74 deletions

View File

@ -22,7 +22,9 @@ define(
options: {modal: 0, resizable: true} options: {modal: 0, resizable: true}
}; };
}, },
build:function() {}, build: function() {
alertify.pgDialogBuild.apply(this);
},
prepare:function() { prepare:function() {
this.setContent(this.message); this.setContent(this.message);
} }

View File

@ -164,6 +164,9 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
var title = '{{ _('Move objects to another tablespace') }} '; var title = '{{ _('Move objects to another tablespace') }} ';
this.set('title', title); this.set('title', title);
}, },
build: function() {
alertify.pgDialogBuild.apply(this);
},
setup:function() { setup:function() {
return { return {
buttons: [{ buttons: [{
@ -213,11 +216,10 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
// Create treeInfo // Create treeInfo
var treeInfo = node.getTreeNodeHierarchy.apply(node, [i]); var treeInfo = node.getTreeNodeHierarchy.apply(node, [i]);
// Instance of backbone model // Instance of backbone model
var newModel = new objModel( var newModel = new objModel({}, {node_info: treeInfo}),
{}, {node_info: treeInfo}
),
fields = Backform.generateViewSchema( fields = Backform.generateViewSchema(
treeInfo, newModel, 'create', node, treeInfo.server, true treeInfo, newModel, 'create', node,
treeInfo.server, true
); );
var view = this.view = new Backform.Dialog({ var view = this.view = new Backform.Dialog({

View File

@ -327,9 +327,9 @@ define(
dialogContentCleanup(); dialogContentCleanup();
$container.append( $container.append(
"<div class='col-xs-3 preferences_tree aciTree'></div>" "<div class='pg-el-xs-3 preferences_tree aciTree'></div>"
).append( ).append(
"<div class='col-xs-9 preferences_content'>" + "<div class='pg-el-xs-9 preferences_content'>" +
" {{ _('Category is not selected.')|safe }}" + " {{ _('Category is not selected.')|safe }}" +
"</div>" "</div>"
); );
@ -385,6 +385,7 @@ define(
}, },
build: function() { build: function() {
this.elements.content.appendChild($container.get(0)); this.elements.content.appendChild($container.get(0));
alertify.pgDialogBuild.apply(this)
}, },
hooks: { hooks: {
onshow: function() { onshow: function() {

View File

@ -45,7 +45,7 @@ TODO LIST FOR BACKUP:
' <span class="<%=Backform.helpMessageClassName%>"><%=helpMessage%></span>', ' <span class="<%=Backform.helpMessageClassName%>"><%=helpMessage%></span>',
'<% } %>' '<% } %>'
].join("\n")), ].join("\n")),
className: 'pgadmin-control-group form-group col-xs-6' className: 'pgadmin-control-group form-group pg-el-md-6 pg-el-xs-12'
}); });
//Backup Model (Server Node) //Backup Model (Server Node)
@ -382,6 +382,9 @@ TODO LIST FOR BACKUP:
main: function(title) { main: function(title) {
this.set('title', title); this.set('title', title);
}, },
build: function() {
alertify.pgDialogBuild.apply(this);
},
setup:function() { setup:function() {
return { return {
buttons: [{ buttons: [{
@ -546,6 +549,9 @@ TODO LIST FOR BACKUP:
main: function(title) { main: function(title) {
this.set('title', title); this.set('title', title);
}, },
build: function() {
alertify.pgDialogBuild.apply(this);
},
setup:function() { setup:function() {
return { return {
buttons: [{ buttons: [{

View File

@ -402,6 +402,7 @@ define([
*/ */
build: function() { build: function() {
this.elements.content.appendChild($container.get(0)); this.elements.content.appendChild($container.get(0));
alertify.pgDialogBuild.apply(this);
}, },
//Returns list of Acls defined for nodes //Returns list of Acls defined for nodes
@ -653,7 +654,7 @@ define([
// Create a grid container // Create a grid container
var gridBody = var gridBody =
$('<div class="db_objects_container col-xs-12"></div>'); $('<div class="db_objects_container pg-el-xs-12"></div>');
// Remove grid if exits before render // Remove grid if exits before render
if (this.grid) { if (this.grid) {
@ -664,7 +665,7 @@ define([
this.grid = new Backgrid.Grid({ this.grid = new Backgrid.Grid({
columns: _.clone(columns), columns: _.clone(columns),
collection: coll, collection: coll,
className: "backgrid table-bordered object_type_table col-xs-12" className: "backgrid table-bordered object_type_table pg-el-xs-12"
}); });
// Render selection Type grid and paginator // Render selection Type grid and paginator

View File

@ -322,6 +322,10 @@ define(
this.setting('pg_item_data', data); this.setting('pg_item_data', data);
}, },
build: function() {
Alertify.pgDialogBuild.apply(this)
},
setup: function() { setup: function() {
return { return {
buttons:[{ buttons:[{

View File

@ -268,7 +268,7 @@ define(
} }
}, },
build: function() { build: function() {
Alertify.pgDialogBuild.apply(this)
}, },
hooks: { hooks: {
onclose: function() { onclose: function() {

View File

@ -26,7 +26,7 @@ define([
' <span class="<%=Backform.helpMessageClassName%>"><%=helpMessage%></span>', ' <span class="<%=Backform.helpMessageClassName%>"><%=helpMessage%></span>',
'<% } %>' '<% } %>'
].join("\n")), ].join("\n")),
className: 'pgadmin-control-group form-group col-xs-6' className: 'pgadmin-control-group form-group pg-el-xs-4'
}); });
//Restore Model (Objects like Database/Schema/Table) //Restore Model (Objects like Database/Schema/Table)
@ -305,6 +305,9 @@ define([
this.setting('pg_item', item); this.setting('pg_item', item);
this.setting('pg_item_data', data); this.setting('pg_item_data', data);
}, },
build: function() {
alertify.pgDialogBuild.apply(this)
},
setup:function() { setup:function() {
return { return {
buttons: [{ buttons: [{

View File

@ -374,6 +374,9 @@ define([
main: function(title) { main: function(title) {
this.set('title', title); this.set('title', title);
}, },
build: function() {
alertify.pgDialogBuild.apply(this)
},
setup:function() { setup:function() {
return { return {
buttons: [{ buttons: [{