mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Fixed following:
- Base font size changed from 0.815rem to 0.875rem, for navbar from 0.875rem to 0.925rem. - Dialog sizes made consistent throughout the application. Now there are 3 size options for width and height each - sm, md, lg. Combination of any of these to be used hereafter - Alignment fix for controls of Node properties dialogs which includes showing text and label in one line without dialog size change, checkbox alignment, switch control alignment at places and other minor improvements in other dialogs - Error message design change in dialogs validation - SQL Editor data grid editor popup design changes which were missed - Design change for dashboard server activity grid - Login page language dropdown color fix - Properties accordion collapse design fix - Help, Info icon fixed across all dialogs which were not working if clicked exactly on the text - Added missing icon with buttons at few places - Shadow behind the dialogs is increased to make it look clearly separated and depth. - Control Alignment fix in maintenance dialog - Min height of alertify dialogs set for better UX - File dialog design fix when no files found - Grant wizard fixes - Scroll bar visibility on first page, use full space for SQL generated on the last page - Browser toolbar buttons changed to sync with SQL editor toolbar buttons - Rounded corners for docker floating dialog (no properties) - Renaming file in file dialog should show original file name - SQL data grid text edit popup buttons behaviour was swapped. This is fixed. - Import/Export dialog changes as per new design.
This commit is contained in:
committed by
Akshay Joshi
parent
1b9c841c15
commit
86ecf9c84e
@@ -220,14 +220,14 @@ define('pgadmin.node.language', [
|
||||
},
|
||||
}, {
|
||||
id: 'lanacl', label: gettext('Privileges'), type: 'collection',
|
||||
group: 'security', control: 'unique-col-collection', mode: ['edit', 'create'],
|
||||
group: gettext('Security'), control: 'unique-col-collection', mode: ['edit', 'create'],
|
||||
model: pgBrowser.Node.PrivilegeRoleModel.extend({
|
||||
privileges: ['U'],
|
||||
}), canAdd: true, canDelete: true, uniqueCol : ['grantee'],
|
||||
},{
|
||||
id: 'seclabels', label: gettext('Security Labels'), mode: ['edit', 'create'],
|
||||
model: pgBrowser.SecLabelModel, editable: false,
|
||||
type: 'collection', group: 'security', min_version: 90200,
|
||||
type: 'collection', group: gettext('Security'), min_version: 90200,
|
||||
canAdd: true, canEdit: false, canDelete: true,
|
||||
control: 'unique-col-collection',
|
||||
},
|
||||
|
||||
@@ -72,7 +72,7 @@ define('pgadmin.node.schema', [
|
||||
var grid = self.grid = new Backgrid.Grid({
|
||||
columns: self.grid_columns,
|
||||
collection: self.model.get(self.field.get('name')),
|
||||
className: 'backgrid table-bordered',
|
||||
className: 'backgrid table-bordered table-noouter-border table-hover',
|
||||
});
|
||||
|
||||
// render grid
|
||||
@@ -120,6 +120,8 @@ define('pgadmin.node.schema', [
|
||||
|
||||
// Extend the browser's collection class for VacuumSettingsModel
|
||||
Backform.VacuumSettingsSchema = [{
|
||||
id: 'spacer_ctrl', group: gettext('Table'), mode: ['edit', 'create'], type: 'spacer',
|
||||
},{
|
||||
id: 'autovacuum_custom', label: gettext('Custom auto-vacuum?'),
|
||||
group: gettext('Table'), mode: ['edit', 'create'],
|
||||
type: 'switch',
|
||||
@@ -184,6 +186,8 @@ define('pgadmin.node.schema', [
|
||||
],
|
||||
}),
|
||||
deps: ['autovacuum_enabled'],
|
||||
},{
|
||||
id: 'spacer_ctrl', group: gettext('Toast Table'), mode: ['edit', 'create'], type: 'spacer',
|
||||
},{
|
||||
id: 'toast_autovacuum', label: gettext('Custom auto-vacuum?'),
|
||||
group: gettext('Toast Table'), mode: ['edit', 'create'],
|
||||
|
||||
@@ -228,7 +228,6 @@ define('pgadmin.node.index', [
|
||||
hasDepends: true,
|
||||
hasStatistics: true,
|
||||
statsPrettifyFields: ['Size', 'Index size'],
|
||||
width: '45%',
|
||||
Init: function() {
|
||||
/* Avoid mulitple registration of menus */
|
||||
if (this.initialized)
|
||||
|
||||
@@ -44,7 +44,7 @@ define('pgadmin.node.table', [
|
||||
sqlCreateHelp: 'sql-createtable.html',
|
||||
dialogHelp: url_for('help.static', {'filename': 'table_dialog.html'}),
|
||||
hasScriptTypes: ['create', 'select', 'insert', 'update', 'delete'],
|
||||
width: '60%',
|
||||
width: '650px',
|
||||
Init: function() {
|
||||
/* Avoid multiple registration of menus */
|
||||
if (this.initialized)
|
||||
|
||||
@@ -187,6 +187,15 @@ define('pgadmin.node.pga_schedule', [
|
||||
},
|
||||
});
|
||||
|
||||
var CustomInfoControl = Backform.Control.extend({
|
||||
template: _.template([
|
||||
'<div>',
|
||||
' <%=infotext%>',
|
||||
'</div>',
|
||||
].join('\n')),
|
||||
className: 'pgadmin-control-group',
|
||||
});
|
||||
|
||||
pgBrowser.Nodes['pga_schedule'] = pgBrowser.Node.extend({
|
||||
parent_type: 'pga_job',
|
||||
type: 'pga_schedule',
|
||||
@@ -335,6 +344,10 @@ define('pgadmin.node.pga_schedule', [
|
||||
return this;
|
||||
},
|
||||
}), mode: ['properties'],
|
||||
},{
|
||||
type: 'control', mode: ['create', 'edit'], group: gettext('Repeat'),
|
||||
infotext: gettext('Schedules are specified using a <b>cron-style</b> format.<br/><ul><li>For each selected time or date element, the schedule will execute.<br/>e.g. To execute at 5 minutes past every hour, simply select ‘05’ in the Minutes list box.<br/></li><li>Values from more than one field may be specified in order to further control the schedule.<br/>e.g. To execute at 12:05 and 14:05 every Monday and Thursday, you would click minute 05, hours 12 and 14, and weekdays Monday and Thursday.</li><li>For additional flexibility, the Month Days check list includes an extra Last Day option. This matches the last day of the month, whether it happens to be the 28th, 29th, 30th or 31st.</li></ul>'),
|
||||
control: CustomInfoControl,
|
||||
},{
|
||||
type: 'nested', label: gettext('Days'), group: gettext('Repeat'),
|
||||
mode: ['create', 'edit'],
|
||||
@@ -344,11 +357,11 @@ define('pgadmin.node.pga_schedule', [
|
||||
this, arguments
|
||||
);
|
||||
|
||||
this.$el.prepend(
|
||||
'<div class="set-group">' +
|
||||
gettext('Schedules are specified using a <b>cron-style</b> format.<br/><ul><li>For each selected time or date element, the schedule will execute.<br/>e.g. To execute at 5 minutes past every hour, simply select ‘05’ in the Minutes list box.<br/></li><li>Values from more than one field may be specified in order to further control the schedule.<br/>e.g. To execute at 12:05 and 14:05 every Monday and Thursday, you would click minute 05, hours 12 and 14, and weekdays Monday and Thursday.</li><li>For additional flexibility, the Month Days check list includes an extra Last Day option. This matches the last day of the month, whether it happens to be the 28th, 29th, 30th or 31st.</li></ul>') +
|
||||
'</div>'
|
||||
);
|
||||
// $(
|
||||
// '<div>' +
|
||||
// gettext('Schedules are specified using a <b>cron-style</b> format.<br/><ul><li>For each selected time or date element, the schedule will execute.<br/>e.g. To execute at 5 minutes past every hour, simply select ‘05’ in the Minutes list box.<br/></li><li>Values from more than one field may be specified in order to further control the schedule.<br/>e.g. To execute at 12:05 and 14:05 every Monday and Thursday, you would click minute 05, hours 12 and 14, and weekdays Monday and Thursday.</li><li>For additional flexibility, the Month Days check list includes an extra Last Day option. This matches the last day of the month, whether it happens to be the 28th, 29th, 30th or 31st.</li></ul>') +
|
||||
// '</div>'
|
||||
// ).insertBefore(this.$el);
|
||||
|
||||
return res;
|
||||
},
|
||||
|
||||
@@ -68,18 +68,19 @@ define('pgadmin.node.role', [
|
||||
|
||||
var RoleCustomSwitchControl = Backform.SwitchControl.extend({
|
||||
template: _.template([
|
||||
'<label class="control-label"><%=label%></label>',
|
||||
'<div class="pgadmin-controls">',
|
||||
' <div class="checkbox" style="float:right">',
|
||||
'<label class="control-label pg-el-sm-10 pg-el-12"><%=label%></label>',
|
||||
'<div class="pgadmin-controls pg-el-sm-2 pg-el-12">',
|
||||
' <div class="checkbox">',
|
||||
' <label>',
|
||||
' <input type="checkbox" class="<%=extraClasses.join(\' \')%>" name="<%=name%>" <%=value ? "checked=\'checked\'" : ""%> <%=disabled ? "disabled" : ""%> <%=required ? "required" : ""%> />',
|
||||
' </label>',
|
||||
' </div>',
|
||||
' <% if (helpMessage && helpMessage.length) { %>',
|
||||
' <span class="<%=Backform.helpMessageClassName%>"><%=helpMessage%></span>',
|
||||
' <% } %>',
|
||||
'</div>',
|
||||
'<% if (helpMessage && helpMessage.length) { %>',
|
||||
' <span class="<%=Backform.helpMessageClassName%>"><%=helpMessage%></span>',
|
||||
'<% } %>',
|
||||
].join('\n')),
|
||||
className: 'pgadmin-control-group form-group pg-el-12 row',
|
||||
});
|
||||
|
||||
var RoleMembersControl = Backform.Control.extend({
|
||||
|
||||
@@ -9,4 +9,4 @@
|
||||
|
||||
.change_password {
|
||||
padding-left: 7px;
|
||||
}
|
||||
}
|
||||
@@ -302,7 +302,7 @@ define('pgadmin.node.tablespace', [
|
||||
};
|
||||
});
|
||||
}
|
||||
Alertify.move_objects_dlg(true).resizeTo('40%','50%');
|
||||
Alertify.move_objects_dlg(true).resizeTo(pgBrowser.stdW.md,pgBrowser.stdH.md);
|
||||
},
|
||||
},
|
||||
model: pgBrowser.Node.Model.extend({
|
||||
|
||||
@@ -9,8 +9,8 @@ define('pgadmin.node.server_group', [
|
||||
type: 'server_group',
|
||||
dialogHelp: url_for('help.static', {'filename': 'server_group_dialog.html'}),
|
||||
label: gettext('Server Group'),
|
||||
width: '350px',
|
||||
height: '250px',
|
||||
width: '250px',
|
||||
height: '150px',
|
||||
is_collection: true,
|
||||
Init: function() {
|
||||
/* Avoid multiple registration of menus */
|
||||
|
||||
Reference in New Issue
Block a user