diff --git a/web/pgadmin/browser/server_groups/servers/templates/servers/password.html b/web/pgadmin/browser/server_groups/servers/templates/servers/password.html index 3bae7c1..97c8907 100644 --- a/web/pgadmin/browser/server_groups/servers/templates/servers/password.html +++ b/web/pgadmin/browser/server_groups/servers/templates/servers/password.html @@ -24,7 +24,7 @@
-
{{ errmsg }}
+ diff --git a/web/pgadmin/browser/server_groups/servers/templates/servers/tunnel_password.html b/web/pgadmin/browser/server_groups/servers/templates/servers/tunnel_password.html index ed7df86..7ac05cd 100644 --- a/web/pgadmin/browser/server_groups/servers/templates/servers/tunnel_password.html +++ b/web/pgadmin/browser/server_groups/servers/templates/servers/tunnel_password.html @@ -44,7 +44,7 @@
-
{{ errmsg }}
+ diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js index 1941ef9..c468e7e 100644 --- a/web/pgadmin/browser/static/js/browser.js +++ b/web/pgadmin/browser/static/js/browser.js @@ -201,7 +201,7 @@ define('pgadmin.browser', [ isCloseable: false, isPrivate: true, elContainer: true, - content: '
' + select_object_msg + '
', + content: '
' + select_object_msg + '
', events: panelEvents, onCreate: function(myPanel, $container) { $container.addClass('pg-no-overflow'); @@ -215,7 +215,7 @@ define('pgadmin.browser', [ width: 500, isCloseable: false, isPrivate: true, - content: '
' + select_object_msg + '
', + content: '
' + select_object_msg + '
', events: panelEvents, }), // Reversed engineered SQL for the object @@ -236,7 +236,7 @@ define('pgadmin.browser', [ width: 500, isCloseable: false, isPrivate: true, - content: '
' + select_object_msg + '
', + content: '
' + select_object_msg + '
', events: panelEvents, }), // Dependents of the object @@ -247,7 +247,7 @@ define('pgadmin.browser', [ width: 500, isCloseable: false, isPrivate: true, - content: '
' + select_object_msg + '
', + content: '
' + select_object_msg + '
', events: panelEvents, }), }, diff --git a/web/pgadmin/browser/static/js/collection.js b/web/pgadmin/browser/static/js/collection.js index 5b7ab0d..9511068 100644 --- a/web/pgadmin/browser/static/js/collection.js +++ b/web/pgadmin/browser/static/js/collection.js @@ -216,7 +216,7 @@ define([ j.empty(); j.data('obj-view', gridView); - $msgContainer = '
' + + $msgContainer = '
' + gettext('Retrieving data from the server...') + '
'; $msgContainer = $($msgContainer).appendTo(j); diff --git a/web/pgadmin/browser/static/js/node.js b/web/pgadmin/browser/static/js/node.js index e3fac91..80014f1 100644 --- a/web/pgadmin/browser/static/js/node.js +++ b/web/pgadmin/browser/static/js/node.js @@ -329,7 +329,7 @@ define('pgadmin.browser.node', [
-
${msg}
+
@@ -396,7 +396,7 @@ define('pgadmin.browser.node', [ if (!newModel.isNew()) { // This is definetely not in create mode - var msgDiv = '
' + + var msgDiv = '
' + gettext('Retrieving data from the server...') + '
', $msgDiv = $(msgDiv); var timer = setTimeout(function(ctx) { @@ -500,7 +500,7 @@ define('pgadmin.browser.node', [ isPrivate: true, isLayoutMember: false, elContainer: true, - content: '
' + gettext('Please wait while we fetch information about the node from the server...') + '
', + content: '
' + gettext('Please wait while we fetch information about the node from the server...') + '
', onCreate: function(myPanel, $container) { $container.addClass('pg-no-overflow'); }, diff --git a/web/pgadmin/browser/static/js/wizard.js b/web/pgadmin/browser/static/js/wizard.js index 879f07d..5e2a27d 100644 --- a/web/pgadmin/browser/static/js/wizard.js +++ b/web/pgadmin/browser/static/js/wizard.js @@ -106,7 +106,7 @@ define([ '
' + ' <% } %>' + '
<% if (show_progress_bar) { %>' + - '

<%= show_progress_bar %>

<% } %>' + + '

<%= show_progress_bar %>

<% } %>' + '
' + '
' + '
' + @@ -119,7 +119,7 @@ define([ '
' + ' ' + '
' + - '
' + + ' ' + '
' + ' ' + '
' + diff --git a/web/pgadmin/dashboard/templates/dashboard/database_dashboard.html b/web/pgadmin/dashboard/templates/dashboard/database_dashboard.html index a7ae539..5b19a64 100644 --- a/web/pgadmin/dashboard/templates/dashboard/database_dashboard.html +++ b/web/pgadmin/dashboard/templates/dashboard/database_dashboard.html @@ -2,8 +2,8 @@
-
-
+
+
{{ _('Database sessions') }}
@@ -12,8 +12,8 @@
-
-
+
+
{{ _('Transactions per second') }}
@@ -24,8 +24,8 @@
-
-
+
+
{{ _('Tuples in') }}
@@ -34,8 +34,8 @@
-
-
+
+
{{ _('Tuples out') }}
@@ -44,8 +44,8 @@
-
-
+
+
{{ _('Block I/O') }}
diff --git a/web/pgadmin/dashboard/templates/dashboard/server_dashboard.html b/web/pgadmin/dashboard/templates/dashboard/server_dashboard.html index 52d3868..437b01e 100644 --- a/web/pgadmin/dashboard/templates/dashboard/server_dashboard.html +++ b/web/pgadmin/dashboard/templates/dashboard/server_dashboard.html @@ -2,8 +2,8 @@
-
-
+
+
{{ _('Server sessions') }}
@@ -12,8 +12,8 @@
-
-
+
+
{{ _('Transactions per second') }}
@@ -24,8 +24,8 @@
-
-
+
+
{{ _('Tuples in') }}
@@ -34,8 +34,8 @@
-
-
+
+
{{ _('Tuples out') }}
@@ -44,8 +44,8 @@
-
-
+
+
{{ _('Block I/O') }}
diff --git a/web/pgadmin/static/js/alertify.pgadmin.defaults.js b/web/pgadmin/static/js/alertify.pgadmin.defaults.js index 79a7632..206a327 100644 --- a/web/pgadmin/static/js/alertify.pgadmin.defaults.js +++ b/web/pgadmin/static/js/alertify.pgadmin.defaults.js @@ -127,8 +127,8 @@ define([ alertMessage = '\
\
\ -
' + promptmsg + '

\ -
' + gettext('Click for details.') + '
\ +
\ + \
\
'; } @@ -172,8 +172,8 @@ define([ var alertMessage = '\
\
\ -
' + gettext('INTERNAL SERVER ERROR') + '

\ -
' + gettext('Click for details.') + '
\ +
\ + \
\
'; @@ -457,6 +457,14 @@ define([ $(this.elements.commands.close).attr('title', gettext('Close')); $(this.elements.commands.maximize).attr('title', gettext('Maximize')); $(this.elements.content).addClass('ajs-wrap-text'); + $(this.elements.header).attr('id', 'confirm-dialog-header'); + $(this.elements.body).attr('id', 'confirm-dialog-body'); + $(this.elements.dialog).attr({ + role: 'alertdialog', + 'aria-modal': 'true', + 'aria-labelledby': 'confirm-dialog-header', + 'aria-describedby': 'confirm-dialog-body', + }); }, reverseButtons: true, }); @@ -465,6 +473,19 @@ define([ reverseButtons: true, }); + alertify.alert().set({ + onshow:function() { + $(this.elements.header).attr('id', 'alert-dialog-header'); + $(this.elements.body).attr('id', 'alert-dialog-body'); + $(this.elements.modal).attr({ + role: 'alertdialog', + 'aria-modal': 'true', + 'aria-labelledby': 'alert-dialog-header', + 'aria-describedby': 'alert-dialog-body', + }); + }, + }); + /* Suppress the enter key events occurring from select2 boxes * so that the dialog does not close. * Alertify listens to keyup events on the body element unfortunately diff --git a/web/pgadmin/static/js/sqleditor/filter_dialog.js b/web/pgadmin/static/js/sqleditor/filter_dialog.js index b920af1..a060ce4 100644 --- a/web/pgadmin/static/js/sqleditor/filter_dialog.js +++ b/web/pgadmin/static/js/sqleditor/filter_dialog.js @@ -129,7 +129,7 @@ let FilterDialog = { '
' + ' ' + '
' + - '
' + + ' ' + '
' + '
' + '
').appendTo($container); diff --git a/web/pgadmin/static/js/sqleditor/history/query_history.js b/web/pgadmin/static/js/sqleditor/history/query_history.js index d009159..c1472a9 100644 --- a/web/pgadmin/static/js/sqleditor/history/query_history.js +++ b/web/pgadmin/static/js/sqleditor/history/query_history.js @@ -59,7 +59,7 @@ export default class QueryHistory { this.parentNode.empty() .removeClass('d-flex') .append( - `
${gettext( + `
${gettext( 'No history found' )}
` ); diff --git a/web/pgadmin/tools/datagrid/templates/datagrid/index.html b/web/pgadmin/tools/datagrid/templates/datagrid/index.html index 8c7e628..285d5c1 100644 --- a/web/pgadmin/tools/datagrid/templates/datagrid/index.html +++ b/web/pgadmin/tools/datagrid/templates/datagrid/index.html @@ -364,6 +364,7 @@
', + content: '
', }); // Create the result panel to display the result after debugging the function diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js index fbc8635..eab7fee 100644 --- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js +++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js @@ -262,7 +262,7 @@ define('tools.querytool', [ height: '100%', isCloseable: false, isPrivate: true, - content: '
', + content: '
', }); var history = new pgAdmin.Browser.Panel({