public inbox for [email protected]
help / color / mirror / Atom feedpgAdmin 4 commit: Improvement in the look and feel of the whole applica
29+ messages / 5 participants
[nested] [flat]
* pgAdmin 4 commit: Improvement in the look and feel of the whole applica
@ 2018-12-21 12:01 Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Ashesh Vashi @ 2018-12-21 12:01 UTC (permalink / raw)
To: [email protected]
Improvement in the look and feel of the whole application
Changed the SCSS/CSS for the below third party libraries to adopt the
new look 'n' feel:
- wcDocker
- Alertify dialogs, and notifications
- AciTree
- Bootstrap Navbar
- Bootstrap Tabs
- Bootstrap Drop-Down menu
- Backgrid
- Select2
Adopated the new the look 'n' feel for the dialogs, wizard, properties,
tab panels, tabs, fieldset, subnode control, spinner control, HTML
table, and other form controls.
- Font is changed to Roboto
- Using SCSS variables to define the look 'n' feel
- Designer background images for the Login, and Forget password pages in
'web' mode
- Improved the look 'n' feel for the key selection in the preferences
dialog
- Table classes consistency changes across the application
- File Open and Save dialog list view changes
Author(s): Aditya Toshniwal & Khushboo Vashi
Branch
------
master
Details
-------
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5799ac14ba17dc25fbec184b3b2c6afbe37f...
Modified Files
--------------
web/package.json | 2 +-
.../static/js/fts_configuration.js | 2 +-
.../databases/schemas/functions/__init__.py | 4 +-
.../function => static}/css/function.css | 0
.../templates/trigger_function/css/function.css | 3 -
.../{templates/edbfunc => static}/css/edbfunc.css | 0
.../static/js/exclusion_constraint.js | 18 +-
.../foreign_key/static/js/foreign_key.js | 17 +-
.../schemas/tables/rules/static/css/rule.css | 7 +
.../tables/rules/templates/rules/css/rule.css | 8 -
.../databases/schemas/views/static/css/view.css | 7 +
.../schemas/views/templates/mview/css/mview.css | 4 -
.../schemas/views/templates/view/css/view.css | 4 -
.../pgagent/schedules/static/js/pga_schedule.js | 3 +-
.../servers/pgagent/static/css/pga_job.css | 3 +
.../pgagent/templates/pga_job/css/pga_job.css | 13 -
.../server_groups/servers/static/css/servers.css | 4 +
.../server_groups/servers/static/js/server.js | 22 +-
.../server_groups/servers/static/js/variable.js | 4 +-
.../servers/tablespaces/static/js/tablespace.js | 13 +-
.../servers/templates/css/servers.css | 4 -
web/pgadmin/browser/static/css/browser.css | 13 -
web/pgadmin/browser/static/css/wizard.css | 21 +-
web/pgadmin/browser/static/js/browser.js | 26 +-
web/pgadmin/browser/static/js/collection.js | 16 +-
web/pgadmin/browser/static/js/keyboard.js | 14 +-
web/pgadmin/browser/static/js/menu.js | 28 +-
web/pgadmin/browser/static/js/node.js | 53 +-
web/pgadmin/browser/static/js/node.ui.js | 4 +-
web/pgadmin/browser/static/js/panel.js | 15 +-
web/pgadmin/browser/static/js/toolbar.js | 3 -
web/pgadmin/browser/static/js/wizard.js | 58 +-
web/pgadmin/browser/static/scss/_browser.scss | 43 +-
web/pgadmin/browser/static/scss/_wizard.scss | 41 +-
web/pgadmin/browser/templates/browser/css/node.css | 2 +-
web/pgadmin/browser/templates/browser/index.html | 9 +-
web/pgadmin/dashboard/__init__.py | 2 +-
web/pgadmin/dashboard/static/css/dashboard.css | 21 +-
web/pgadmin/dashboard/static/js/dashboard.js | 120 +-
web/pgadmin/dashboard/static/scss/_dashboard.scss | 44 +-
.../templates/dashboard/database_dashboard.html | 171 ++-
.../templates/dashboard/server_dashboard.html | 197 ++-
.../templates/dashboard/welcome_dashboard.html | 30 +-
web/pgadmin/feature_tests/browser_tool_bar_test.py | 23 +-
web/pgadmin/feature_tests/file_manager_test.py | 23 +-
.../feature_tests/keyboard_shortcut_test.py | 5 +-
.../feature_tests/pg_datatype_validation_test.py | 5 +-
.../pg_utilities_backup_restore_test.py | 28 +-
.../feature_tests/pg_utilities_maintenance_test.py | 16 +-
.../feature_tests/query_tool_journey_test.py | 5 +-
web/pgadmin/feature_tests/query_tool_tests.py | 117 +-
web/pgadmin/feature_tests/view_data_dml_queries.py | 16 +-
.../misc/bgprocess/static/css/bgprocess.css | 11 -
web/pgadmin/misc/bgprocess/static/js/bgprocess.js | 173 ++-
.../misc/bgprocess/static/scss/_bgprocess.scss | 81 +-
web/pgadmin/misc/depends/static/js/depends.js | 3 +-
.../misc/file_manager/static/css/file_manager.css | 141 +-
.../misc/file_manager/static/js/create_dialogue.js | 9 +-
.../misc/file_manager/static/js/select_dialogue.js | 19 +-
web/pgadmin/misc/file_manager/static/js/utility.js | 77 +-
.../file_manager/static/scss/_file_manager.scss | 157 +--
.../file_manager/templates/file_manager/index.html | 95 +-
.../misc/statistics/static/js/statistics.js | 3 +-
web/pgadmin/preferences/static/css/preferences.css | 14 -
web/pgadmin/preferences/static/js/preferences.js | 31 +-
.../preferences/static/scss/_preferences.scss | 16 +
web/pgadmin/static/css/pgadmin.css | 81 +-
web/pgadmin/static/fonts/Roboto-Bold.ttf | Bin 0 -> 170760 bytes
web/pgadmin/static/fonts/Roboto-Medium.ttf | Bin 0 -> 172064 bytes
web/pgadmin/static/fonts/Roboto-Regular.ttf | Bin 0 -> 171676 bytes
web/pgadmin/static/img/collapse_expand.svg | 15 +
web/pgadmin/static/img/forgot_password.svg | 283 ++++
web/pgadmin/static/img/login.svg | 1 +
web/pgadmin/static/js/alertify.pgadmin.defaults.js | 82 +-
web/pgadmin/static/js/backform.pgadmin.js | 80 +-
web/pgadmin/static/js/backgrid.pgadmin.js | 33 +-
web/pgadmin/static/js/slickgrid/editors.js | 8 +-
web/pgadmin/static/js/sqleditor/filter_dialog.js | 33 +-
.../static/js/sqleditor/query_tool_preferences.js | 15 +-
web/pgadmin/static/scss/_aci_tree.overrides.scss | 75 +-
web/pgadmin/static/scss/_alert.scss | 12 +-
web/pgadmin/static/scss/_alertify.overrides.scss | 150 +-
web/pgadmin/static/scss/_backform.overrides.scss | 8 +
web/pgadmin/static/scss/_backgrid.overrides.scss | 251 +++-
web/pgadmin/static/scss/_bootstrap.overrides.scss | 230 ++--
web/pgadmin/static/scss/_codemirror.overrides.scss | 94 +-
web/pgadmin/static/scss/_pgadmin.grid.scss | 56 +
web/pgadmin/static/scss/_pgadmin.style.scss | 1440 +++++---------------
web/pgadmin/static/scss/_select2.overrides.scss | 24 +-
web/pgadmin/static/scss/_webcabin.overrides.scss | 368 -----
web/pgadmin/static/scss/_webcabin.pgadmin.scss | 250 ++++
web/pgadmin/static/scss/pgadmin.scss | 10 +-
.../static/scss/resources/_default.style.scss | 90 +-
.../static/scss/resources/_default.variables.scss | 203 ++-
web/pgadmin/static/vendor/backform/backform.js | 645 +++++++++
.../templates/security/change_password.html | 43 +-
.../templates/security/forgot_password.html | 9 +-
web/pgadmin/templates/security/login_user.html | 16 +-
web/pgadmin/templates/security/panel.html | 23 +-
web/pgadmin/tools/backup/__init__.py | 6 +-
web/pgadmin/tools/backup/static/js/backup.js | 8 +-
.../backup/static/js/backup_dialog_wrapper.js | 22 +-
web/pgadmin/tools/datagrid/__init__.py | 1 -
web/pgadmin/tools/datagrid/static/js/datagrid.js | 38 +-
.../tools/datagrid/templates/datagrid/filter.html | 2 -
.../tools/datagrid/templates/datagrid/index.html | 193 ++-
web/pgadmin/tools/debugger/static/css/debugger.css | 34 +-
web/pgadmin/tools/debugger/static/js/debugger.js | 2 +-
.../tools/debugger/static/js/debugger_ui.js | 28 +-
web/pgadmin/tools/debugger/static/js/direct.js | 13 +-
.../tools/debugger/static/scss/_debugger.scss | 8 -
.../tools/debugger/templates/debugger/direct.html | 89 +-
.../tools/grant_wizard/static/js/grant_wizard.js | 27 +-
.../grant_wizard/static/scss/_grant_wizard.scss | 31 +-
.../tools/import_export/static/js/import_export.js | 24 +-
web/pgadmin/tools/maintenance/__init__.py | 10 +-
.../tools/maintenance/static/js/maintenance.js | 24 +-
.../maintenance/static/scss/_maintenance.scss | 2 +-
web/pgadmin/tools/restore/__init__.py | 14 +-
web/pgadmin/tools/restore/static/js/restore.js | 8 +-
.../restore/static/js/restore_dialog_wrapper.js | 24 +-
.../tools/sqleditor/static/css/sqleditor.css | 128 +-
web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 35 +-
.../tools/sqleditor/static/scss/_history.scss | 42 +-
.../tools/sqleditor/static/scss/_sqleditor.scss | 128 +-
.../user_management/static/css/user_management.css | 37 -
.../user_management/static/js/user_management.js | 53 +-
.../static/scss/_user_management.scss | 12 +-
.../javascript/alerts/alertify_wrapper_spec.js | 4 +-
.../backup/backup_dialog_wrapper_spec.js | 8 +-
.../restore/restore_dialog_wrapper_spec.js | 8 +-
web/webpack.config.js | 2 +-
web/webpack.shim.js | 2 +-
web/webpack.test.config.js | 1 +
web/yarn.lock | 1015 +++++++++++++-
135 files changed, 5002 insertions(+), 3850 deletions(-)
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
@ 2018-12-21 12:21 ` Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Dave Page @ 2018-12-21 12:21 UTC (permalink / raw)
To: Ashesh Vashi <[email protected]>; +Cc: pgadmin-hackers <[email protected]>; Akshay Joshi <[email protected]>; Aditya Toshniwal <[email protected]>; Chethana Kumar <[email protected]>; Khushboo Vashi <[email protected]>
Nice! Thanks Ashesh.
Some small issues I spotted:
- The font looks somewhat small. How does it compare in size to, say,
Gmail? I think it needs to be increased to at least that size.
- Dialogues have 2 close buttons next to each other in the top-right.
Looks like an icon and a text version?
- Why do some Preferences panels use alternate line colouring, whilst
others don't? I suspect it's because some are actually tables under
the hood? I think we need consistency there.
- The Maintenance dialogue looks terrible - it needs to be made much
more compact. I also seem to be getting a failure to create
maintenance jobs (backups etc work fine).
- I think the buttons on the Browser need borders to match other buttons.
Thanks!
On Fri, Dec 21, 2018 at 12:01 PM Ashesh Vashi
<[email protected]> wrote:
>
> Improvement in the look and feel of the whole application
>
> Changed the SCSS/CSS for the below third party libraries to adopt the
> new look 'n' feel:
> - wcDocker
> - Alertify dialogs, and notifications
> - AciTree
> - Bootstrap Navbar
> - Bootstrap Tabs
> - Bootstrap Drop-Down menu
> - Backgrid
> - Select2
>
> Adopated the new the look 'n' feel for the dialogs, wizard, properties,
> tab panels, tabs, fieldset, subnode control, spinner control, HTML
> table, and other form controls.
>
> - Font is changed to Roboto
> - Using SCSS variables to define the look 'n' feel
> - Designer background images for the Login, and Forget password pages in
> 'web' mode
> - Improved the look 'n' feel for the key selection in the preferences
> dialog
> - Table classes consistency changes across the application
> - File Open and Save dialog list view changes
>
> Author(s): Aditya Toshniwal & Khushboo Vashi
>
> Branch
> ------
> master
>
> Details
> -------
> https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5799ac14ba17dc25fbec184b3b2c6afbe37f...
>
> Modified Files
> --------------
> web/package.json | 2 +-
> .../static/js/fts_configuration.js | 2 +-
> .../databases/schemas/functions/__init__.py | 4 +-
> .../function => static}/css/function.css | 0
> .../templates/trigger_function/css/function.css | 3 -
> .../{templates/edbfunc => static}/css/edbfunc.css | 0
> .../static/js/exclusion_constraint.js | 18 +-
> .../foreign_key/static/js/foreign_key.js | 17 +-
> .../schemas/tables/rules/static/css/rule.css | 7 +
> .../tables/rules/templates/rules/css/rule.css | 8 -
> .../databases/schemas/views/static/css/view.css | 7 +
> .../schemas/views/templates/mview/css/mview.css | 4 -
> .../schemas/views/templates/view/css/view.css | 4 -
> .../pgagent/schedules/static/js/pga_schedule.js | 3 +-
> .../servers/pgagent/static/css/pga_job.css | 3 +
> .../pgagent/templates/pga_job/css/pga_job.css | 13 -
> .../server_groups/servers/static/css/servers.css | 4 +
> .../server_groups/servers/static/js/server.js | 22 +-
> .../server_groups/servers/static/js/variable.js | 4 +-
> .../servers/tablespaces/static/js/tablespace.js | 13 +-
> .../servers/templates/css/servers.css | 4 -
> web/pgadmin/browser/static/css/browser.css | 13 -
> web/pgadmin/browser/static/css/wizard.css | 21 +-
> web/pgadmin/browser/static/js/browser.js | 26 +-
> web/pgadmin/browser/static/js/collection.js | 16 +-
> web/pgadmin/browser/static/js/keyboard.js | 14 +-
> web/pgadmin/browser/static/js/menu.js | 28 +-
> web/pgadmin/browser/static/js/node.js | 53 +-
> web/pgadmin/browser/static/js/node.ui.js | 4 +-
> web/pgadmin/browser/static/js/panel.js | 15 +-
> web/pgadmin/browser/static/js/toolbar.js | 3 -
> web/pgadmin/browser/static/js/wizard.js | 58 +-
> web/pgadmin/browser/static/scss/_browser.scss | 43 +-
> web/pgadmin/browser/static/scss/_wizard.scss | 41 +-
> web/pgadmin/browser/templates/browser/css/node.css | 2 +-
> web/pgadmin/browser/templates/browser/index.html | 9 +-
> web/pgadmin/dashboard/__init__.py | 2 +-
> web/pgadmin/dashboard/static/css/dashboard.css | 21 +-
> web/pgadmin/dashboard/static/js/dashboard.js | 120 +-
> web/pgadmin/dashboard/static/scss/_dashboard.scss | 44 +-
> .../templates/dashboard/database_dashboard.html | 171 ++-
> .../templates/dashboard/server_dashboard.html | 197 ++-
> .../templates/dashboard/welcome_dashboard.html | 30 +-
> web/pgadmin/feature_tests/browser_tool_bar_test.py | 23 +-
> web/pgadmin/feature_tests/file_manager_test.py | 23 +-
> .../feature_tests/keyboard_shortcut_test.py | 5 +-
> .../feature_tests/pg_datatype_validation_test.py | 5 +-
> .../pg_utilities_backup_restore_test.py | 28 +-
> .../feature_tests/pg_utilities_maintenance_test.py | 16 +-
> .../feature_tests/query_tool_journey_test.py | 5 +-
> web/pgadmin/feature_tests/query_tool_tests.py | 117 +-
> web/pgadmin/feature_tests/view_data_dml_queries.py | 16 +-
> .../misc/bgprocess/static/css/bgprocess.css | 11 -
> web/pgadmin/misc/bgprocess/static/js/bgprocess.js | 173 ++-
> .../misc/bgprocess/static/scss/_bgprocess.scss | 81 +-
> web/pgadmin/misc/depends/static/js/depends.js | 3 +-
> .../misc/file_manager/static/css/file_manager.css | 141 +-
> .../misc/file_manager/static/js/create_dialogue.js | 9 +-
> .../misc/file_manager/static/js/select_dialogue.js | 19 +-
> web/pgadmin/misc/file_manager/static/js/utility.js | 77 +-
> .../file_manager/static/scss/_file_manager.scss | 157 +--
> .../file_manager/templates/file_manager/index.html | 95 +-
> .../misc/statistics/static/js/statistics.js | 3 +-
> web/pgadmin/preferences/static/css/preferences.css | 14 -
> web/pgadmin/preferences/static/js/preferences.js | 31 +-
> .../preferences/static/scss/_preferences.scss | 16 +
> web/pgadmin/static/css/pgadmin.css | 81 +-
> web/pgadmin/static/fonts/Roboto-Bold.ttf | Bin 0 -> 170760 bytes
> web/pgadmin/static/fonts/Roboto-Medium.ttf | Bin 0 -> 172064 bytes
> web/pgadmin/static/fonts/Roboto-Regular.ttf | Bin 0 -> 171676 bytes
> web/pgadmin/static/img/collapse_expand.svg | 15 +
> web/pgadmin/static/img/forgot_password.svg | 283 ++++
> web/pgadmin/static/img/login.svg | 1 +
> web/pgadmin/static/js/alertify.pgadmin.defaults.js | 82 +-
> web/pgadmin/static/js/backform.pgadmin.js | 80 +-
> web/pgadmin/static/js/backgrid.pgadmin.js | 33 +-
> web/pgadmin/static/js/slickgrid/editors.js | 8 +-
> web/pgadmin/static/js/sqleditor/filter_dialog.js | 33 +-
> .../static/js/sqleditor/query_tool_preferences.js | 15 +-
> web/pgadmin/static/scss/_aci_tree.overrides.scss | 75 +-
> web/pgadmin/static/scss/_alert.scss | 12 +-
> web/pgadmin/static/scss/_alertify.overrides.scss | 150 +-
> web/pgadmin/static/scss/_backform.overrides.scss | 8 +
> web/pgadmin/static/scss/_backgrid.overrides.scss | 251 +++-
> web/pgadmin/static/scss/_bootstrap.overrides.scss | 230 ++--
> web/pgadmin/static/scss/_codemirror.overrides.scss | 94 +-
> web/pgadmin/static/scss/_pgadmin.grid.scss | 56 +
> web/pgadmin/static/scss/_pgadmin.style.scss | 1440 +++++---------------
> web/pgadmin/static/scss/_select2.overrides.scss | 24 +-
> web/pgadmin/static/scss/_webcabin.overrides.scss | 368 -----
> web/pgadmin/static/scss/_webcabin.pgadmin.scss | 250 ++++
> web/pgadmin/static/scss/pgadmin.scss | 10 +-
> .../static/scss/resources/_default.style.scss | 90 +-
> .../static/scss/resources/_default.variables.scss | 203 ++-
> web/pgadmin/static/vendor/backform/backform.js | 645 +++++++++
> .../templates/security/change_password.html | 43 +-
> .../templates/security/forgot_password.html | 9 +-
> web/pgadmin/templates/security/login_user.html | 16 +-
> web/pgadmin/templates/security/panel.html | 23 +-
> web/pgadmin/tools/backup/__init__.py | 6 +-
> web/pgadmin/tools/backup/static/js/backup.js | 8 +-
> .../backup/static/js/backup_dialog_wrapper.js | 22 +-
> web/pgadmin/tools/datagrid/__init__.py | 1 -
> web/pgadmin/tools/datagrid/static/js/datagrid.js | 38 +-
> .../tools/datagrid/templates/datagrid/filter.html | 2 -
> .../tools/datagrid/templates/datagrid/index.html | 193 ++-
> web/pgadmin/tools/debugger/static/css/debugger.css | 34 +-
> web/pgadmin/tools/debugger/static/js/debugger.js | 2 +-
> .../tools/debugger/static/js/debugger_ui.js | 28 +-
> web/pgadmin/tools/debugger/static/js/direct.js | 13 +-
> .../tools/debugger/static/scss/_debugger.scss | 8 -
> .../tools/debugger/templates/debugger/direct.html | 89 +-
> .../tools/grant_wizard/static/js/grant_wizard.js | 27 +-
> .../grant_wizard/static/scss/_grant_wizard.scss | 31 +-
> .../tools/import_export/static/js/import_export.js | 24 +-
> web/pgadmin/tools/maintenance/__init__.py | 10 +-
> .../tools/maintenance/static/js/maintenance.js | 24 +-
> .../maintenance/static/scss/_maintenance.scss | 2 +-
> web/pgadmin/tools/restore/__init__.py | 14 +-
> web/pgadmin/tools/restore/static/js/restore.js | 8 +-
> .../restore/static/js/restore_dialog_wrapper.js | 24 +-
> .../tools/sqleditor/static/css/sqleditor.css | 128 +-
> web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 35 +-
> .../tools/sqleditor/static/scss/_history.scss | 42 +-
> .../tools/sqleditor/static/scss/_sqleditor.scss | 128 +-
> .../user_management/static/css/user_management.css | 37 -
> .../user_management/static/js/user_management.js | 53 +-
> .../static/scss/_user_management.scss | 12 +-
> .../javascript/alerts/alertify_wrapper_spec.js | 4 +-
> .../backup/backup_dialog_wrapper_spec.js | 8 +-
> .../restore/restore_dialog_wrapper_spec.js | 8 +-
> web/webpack.config.js | 2 +-
> web/webpack.shim.js | 2 +-
> web/webpack.test.config.js | 1 +
> web/yarn.lock | 1015 +++++++++++++-
> 135 files changed, 5002 insertions(+), 3850 deletions(-)
>
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
@ 2018-12-21 12:29 ` Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Aditya Toshniwal @ 2018-12-21 12:29 UTC (permalink / raw)
To: Dave Page <[email protected]>; +Cc: Ashesh Vashi <[email protected]>; pgadmin-hackers <[email protected]>; Akshay Joshi <[email protected]>; Chethana Kumar <[email protected]>; Khushboo Vashi <[email protected]>
Hi Dave,
On Fri, Dec 21, 2018 at 5:51 PM Dave Page <[email protected]> wrote:
> Nice! Thanks Ashesh.
>
> Some small issues I spotted:
>
> - The font looks somewhat small. How does it compare in size to, say,
> Gmail? I think it needs to be increased to at least that size.
>
Gmail uses 0.875rem (14px) for the left panel (Inbox, Sent). We are
using 0.875rem
(14px) for main navbar links and 0.815rem(13.04px) for all other text.
>
> - Dialogues have 2 close buttons next to each other in the top-right.
> Looks like an icon and a text version?
>
You need to do a yarn install. wcDocker code is changed to fix that.
>
> - Why do some Preferences panels use alternate line colouring, whilst
> others don't? I suspect it's because some are actually tables under
> the hood? I think we need consistency there.
>
Noted.
>
> - The Maintenance dialogue looks terrible - it needs to be made much
> more compact. I also seem to be getting a failure to create
> maintenance jobs (backups etc work fine).
>
Noted.
>
> - I think the buttons on the Browser need borders to match other buttons.
>
It is made consistent with other wcDocker buttons like close, right arrow,
left arrow. However, we can make it look like other buttons.
>
> Thanks!
>
> On Fri, Dec 21, 2018 at 12:01 PM Ashesh Vashi
> <[email protected]> wrote:
> >
> > Improvement in the look and feel of the whole application
> >
> > Changed the SCSS/CSS for the below third party libraries to adopt the
> > new look 'n' feel:
> > - wcDocker
> > - Alertify dialogs, and notifications
> > - AciTree
> > - Bootstrap Navbar
> > - Bootstrap Tabs
> > - Bootstrap Drop-Down menu
> > - Backgrid
> > - Select2
> >
> > Adopated the new the look 'n' feel for the dialogs, wizard, properties,
> > tab panels, tabs, fieldset, subnode control, spinner control, HTML
> > table, and other form controls.
> >
> > - Font is changed to Roboto
> > - Using SCSS variables to define the look 'n' feel
> > - Designer background images for the Login, and Forget password pages in
> > 'web' mode
> > - Improved the look 'n' feel for the key selection in the preferences
> > dialog
> > - Table classes consistency changes across the application
> > - File Open and Save dialog list view changes
> >
> > Author(s): Aditya Toshniwal & Khushboo Vashi
> >
> > Branch
> > ------
> > master
> >
> > Details
> > -------
> >
> https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5799ac14ba17dc25fbec184b3b2c6afbe37f...
> >
> > Modified Files
> > --------------
> > web/package.json | 2 +-
> > .../static/js/fts_configuration.js | 2 +-
> > .../databases/schemas/functions/__init__.py | 4 +-
> > .../function => static}/css/function.css | 0
> > .../templates/trigger_function/css/function.css | 3 -
> > .../{templates/edbfunc => static}/css/edbfunc.css | 0
> > .../static/js/exclusion_constraint.js | 18 +-
> > .../foreign_key/static/js/foreign_key.js | 17 +-
> > .../schemas/tables/rules/static/css/rule.css | 7 +
> > .../tables/rules/templates/rules/css/rule.css | 8 -
> > .../databases/schemas/views/static/css/view.css | 7 +
> > .../schemas/views/templates/mview/css/mview.css | 4 -
> > .../schemas/views/templates/view/css/view.css | 4 -
> > .../pgagent/schedules/static/js/pga_schedule.js | 3 +-
> > .../servers/pgagent/static/css/pga_job.css | 3 +
> > .../pgagent/templates/pga_job/css/pga_job.css | 13 -
> > .../server_groups/servers/static/css/servers.css | 4 +
> > .../server_groups/servers/static/js/server.js | 22 +-
> > .../server_groups/servers/static/js/variable.js | 4 +-
> > .../servers/tablespaces/static/js/tablespace.js | 13 +-
> > .../servers/templates/css/servers.css | 4 -
> > web/pgadmin/browser/static/css/browser.css | 13 -
> > web/pgadmin/browser/static/css/wizard.css | 21 +-
> > web/pgadmin/browser/static/js/browser.js | 26 +-
> > web/pgadmin/browser/static/js/collection.js | 16 +-
> > web/pgadmin/browser/static/js/keyboard.js | 14 +-
> > web/pgadmin/browser/static/js/menu.js | 28 +-
> > web/pgadmin/browser/static/js/node.js | 53 +-
> > web/pgadmin/browser/static/js/node.ui.js | 4 +-
> > web/pgadmin/browser/static/js/panel.js | 15 +-
> > web/pgadmin/browser/static/js/toolbar.js | 3 -
> > web/pgadmin/browser/static/js/wizard.js | 58 +-
> > web/pgadmin/browser/static/scss/_browser.scss | 43 +-
> > web/pgadmin/browser/static/scss/_wizard.scss | 41 +-
> > web/pgadmin/browser/templates/browser/css/node.css | 2 +-
> > web/pgadmin/browser/templates/browser/index.html | 9 +-
> > web/pgadmin/dashboard/__init__.py | 2 +-
> > web/pgadmin/dashboard/static/css/dashboard.css | 21 +-
> > web/pgadmin/dashboard/static/js/dashboard.js | 120 +-
> > web/pgadmin/dashboard/static/scss/_dashboard.scss | 44 +-
> > .../templates/dashboard/database_dashboard.html | 171 ++-
> > .../templates/dashboard/server_dashboard.html | 197 ++-
> > .../templates/dashboard/welcome_dashboard.html | 30 +-
> > web/pgadmin/feature_tests/browser_tool_bar_test.py | 23 +-
> > web/pgadmin/feature_tests/file_manager_test.py | 23 +-
> > .../feature_tests/keyboard_shortcut_test.py | 5 +-
> > .../feature_tests/pg_datatype_validation_test.py | 5 +-
> > .../pg_utilities_backup_restore_test.py | 28 +-
> > .../feature_tests/pg_utilities_maintenance_test.py | 16 +-
> > .../feature_tests/query_tool_journey_test.py | 5 +-
> > web/pgadmin/feature_tests/query_tool_tests.py | 117 +-
> > web/pgadmin/feature_tests/view_data_dml_queries.py | 16 +-
> > .../misc/bgprocess/static/css/bgprocess.css | 11 -
> > web/pgadmin/misc/bgprocess/static/js/bgprocess.js | 173 ++-
> > .../misc/bgprocess/static/scss/_bgprocess.scss | 81 +-
> > web/pgadmin/misc/depends/static/js/depends.js | 3 +-
> > .../misc/file_manager/static/css/file_manager.css | 141 +-
> > .../misc/file_manager/static/js/create_dialogue.js | 9 +-
> > .../misc/file_manager/static/js/select_dialogue.js | 19 +-
> > web/pgadmin/misc/file_manager/static/js/utility.js | 77 +-
> > .../file_manager/static/scss/_file_manager.scss | 157 +--
> > .../file_manager/templates/file_manager/index.html | 95 +-
> > .../misc/statistics/static/js/statistics.js | 3 +-
> > web/pgadmin/preferences/static/css/preferences.css | 14 -
> > web/pgadmin/preferences/static/js/preferences.js | 31 +-
> > .../preferences/static/scss/_preferences.scss | 16 +
> > web/pgadmin/static/css/pgadmin.css | 81 +-
> > web/pgadmin/static/fonts/Roboto-Bold.ttf | Bin 0 -> 170760
> bytes
> > web/pgadmin/static/fonts/Roboto-Medium.ttf | Bin 0 -> 172064
> bytes
> > web/pgadmin/static/fonts/Roboto-Regular.ttf | Bin 0 -> 171676
> bytes
> > web/pgadmin/static/img/collapse_expand.svg | 15 +
> > web/pgadmin/static/img/forgot_password.svg | 283 ++++
> > web/pgadmin/static/img/login.svg | 1 +
> > web/pgadmin/static/js/alertify.pgadmin.defaults.js | 82 +-
> > web/pgadmin/static/js/backform.pgadmin.js | 80 +-
> > web/pgadmin/static/js/backgrid.pgadmin.js | 33 +-
> > web/pgadmin/static/js/slickgrid/editors.js | 8 +-
> > web/pgadmin/static/js/sqleditor/filter_dialog.js | 33 +-
> > .../static/js/sqleditor/query_tool_preferences.js | 15 +-
> > web/pgadmin/static/scss/_aci_tree.overrides.scss | 75 +-
> > web/pgadmin/static/scss/_alert.scss | 12 +-
> > web/pgadmin/static/scss/_alertify.overrides.scss | 150 +-
> > web/pgadmin/static/scss/_backform.overrides.scss | 8 +
> > web/pgadmin/static/scss/_backgrid.overrides.scss | 251 +++-
> > web/pgadmin/static/scss/_bootstrap.overrides.scss | 230 ++--
> > web/pgadmin/static/scss/_codemirror.overrides.scss | 94 +-
> > web/pgadmin/static/scss/_pgadmin.grid.scss | 56 +
> > web/pgadmin/static/scss/_pgadmin.style.scss | 1440
> +++++---------------
> > web/pgadmin/static/scss/_select2.overrides.scss | 24 +-
> > web/pgadmin/static/scss/_webcabin.overrides.scss | 368 -----
> > web/pgadmin/static/scss/_webcabin.pgadmin.scss | 250 ++++
> > web/pgadmin/static/scss/pgadmin.scss | 10 +-
> > .../static/scss/resources/_default.style.scss | 90 +-
> > .../static/scss/resources/_default.variables.scss | 203 ++-
> > web/pgadmin/static/vendor/backform/backform.js | 645 +++++++++
> > .../templates/security/change_password.html | 43 +-
> > .../templates/security/forgot_password.html | 9 +-
> > web/pgadmin/templates/security/login_user.html | 16 +-
> > web/pgadmin/templates/security/panel.html | 23 +-
> > web/pgadmin/tools/backup/__init__.py | 6 +-
> > web/pgadmin/tools/backup/static/js/backup.js | 8 +-
> > .../backup/static/js/backup_dialog_wrapper.js | 22 +-
> > web/pgadmin/tools/datagrid/__init__.py | 1 -
> > web/pgadmin/tools/datagrid/static/js/datagrid.js | 38 +-
> > .../tools/datagrid/templates/datagrid/filter.html | 2 -
> > .../tools/datagrid/templates/datagrid/index.html | 193 ++-
> > web/pgadmin/tools/debugger/static/css/debugger.css | 34 +-
> > web/pgadmin/tools/debugger/static/js/debugger.js | 2 +-
> > .../tools/debugger/static/js/debugger_ui.js | 28 +-
> > web/pgadmin/tools/debugger/static/js/direct.js | 13 +-
> > .../tools/debugger/static/scss/_debugger.scss | 8 -
> > .../tools/debugger/templates/debugger/direct.html | 89 +-
> > .../tools/grant_wizard/static/js/grant_wizard.js | 27 +-
> > .../grant_wizard/static/scss/_grant_wizard.scss | 31 +-
> > .../tools/import_export/static/js/import_export.js | 24 +-
> > web/pgadmin/tools/maintenance/__init__.py | 10 +-
> > .../tools/maintenance/static/js/maintenance.js | 24 +-
> > .../maintenance/static/scss/_maintenance.scss | 2 +-
> > web/pgadmin/tools/restore/__init__.py | 14 +-
> > web/pgadmin/tools/restore/static/js/restore.js | 8 +-
> > .../restore/static/js/restore_dialog_wrapper.js | 24 +-
> > .../tools/sqleditor/static/css/sqleditor.css | 128 +-
> > web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 35 +-
> > .../tools/sqleditor/static/scss/_history.scss | 42 +-
> > .../tools/sqleditor/static/scss/_sqleditor.scss | 128 +-
> > .../user_management/static/css/user_management.css | 37 -
> > .../user_management/static/js/user_management.js | 53 +-
> > .../static/scss/_user_management.scss | 12 +-
> > .../javascript/alerts/alertify_wrapper_spec.js | 4 +-
> > .../backup/backup_dialog_wrapper_spec.js | 8 +-
> > .../restore/restore_dialog_wrapper_spec.js | 8 +-
> > web/webpack.config.js | 2 +-
> > web/webpack.shim.js | 2 +-
> > web/webpack.test.config.js | 1 +
> > web/yarn.lock | 1015 +++++++++++++-
> > 135 files changed, 5002 insertions(+), 3850 deletions(-)
> >
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
--
Thanks and Regards,
Aditya Toshniwal
Software Engineer | EnterpriseDB Software Solutions | Pune
"Don't Complain about Heat, Plant a tree"
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
@ 2018-12-21 12:46 ` Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Dave Page @ 2018-12-21 12:46 UTC (permalink / raw)
To: Aditya Toshniwal <[email protected]>; +Cc: Ashesh Vashi <[email protected]>; pgadmin-hackers <[email protected]>; Akshay Joshi <[email protected]>; Chethana Kumar <[email protected]>; Khushboo Vashi <[email protected]>
Hi
On Fri, Dec 21, 2018 at 12:29 PM Aditya Toshniwal
<[email protected]> wrote:
>
> Hi Dave,
>
> On Fri, Dec 21, 2018 at 5:51 PM Dave Page <[email protected]> wrote:
>>
>> Nice! Thanks Ashesh.
>>
>> Some small issues I spotted:
>>
>> - The font looks somewhat small. How does it compare in size to, say,
>> Gmail? I think it needs to be increased to at least that size.
>
> Gmail uses 0.875rem (14px) for the left panel (Inbox, Sent). We are using 0.875rem (14px) for main navbar links and 0.815rem(13.04px) for all other text.
Let's increase the default to 0.875, and make the main links
proportionally bigger.
>> - Dialogues have 2 close buttons next to each other in the top-right.
>> Looks like an icon and a text version?
>
> You need to do a yarn install. wcDocker code is changed to fix that.
Yup, that fixed it.
>> - Why do some Preferences panels use alternate line colouring, whilst
>> others don't? I suspect it's because some are actually tables under
>> the hood? I think we need consistency there.
>
> Noted.
>>
>>
>> - The Maintenance dialogue looks terrible - it needs to be made much
>> more compact. I also seem to be getting a failure to create
>> maintenance jobs (backups etc work fine).
>
> Noted.
>>
>>
>> - I think the buttons on the Browser need borders to match other buttons.
>
> It is made consistent with other wcDocker buttons like close, right arrow, left arrow. However, we can make it look like other buttons.
I think they're a different class of buttons - control/navigation vs.
function. I think we should make this change as the browser buttons
really are a toolbar just like the larger on on the query tool.
Thanks!
>> Thanks!
>>
>> On Fri, Dec 21, 2018 at 12:01 PM Ashesh Vashi
>> <[email protected]> wrote:
>> >
>> > Improvement in the look and feel of the whole application
>> >
>> > Changed the SCSS/CSS for the below third party libraries to adopt the
>> > new look 'n' feel:
>> > - wcDocker
>> > - Alertify dialogs, and notifications
>> > - AciTree
>> > - Bootstrap Navbar
>> > - Bootstrap Tabs
>> > - Bootstrap Drop-Down menu
>> > - Backgrid
>> > - Select2
>> >
>> > Adopated the new the look 'n' feel for the dialogs, wizard, properties,
>> > tab panels, tabs, fieldset, subnode control, spinner control, HTML
>> > table, and other form controls.
>> >
>> > - Font is changed to Roboto
>> > - Using SCSS variables to define the look 'n' feel
>> > - Designer background images for the Login, and Forget password pages in
>> > 'web' mode
>> > - Improved the look 'n' feel for the key selection in the preferences
>> > dialog
>> > - Table classes consistency changes across the application
>> > - File Open and Save dialog list view changes
>> >
>> > Author(s): Aditya Toshniwal & Khushboo Vashi
>> >
>> > Branch
>> > ------
>> > master
>> >
>> > Details
>> > -------
>> > https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5799ac14ba17dc25fbec184b3b2c6afbe37f...
>> >
>> > Modified Files
>> > --------------
>> > web/package.json | 2 +-
>> > .../static/js/fts_configuration.js | 2 +-
>> > .../databases/schemas/functions/__init__.py | 4 +-
>> > .../function => static}/css/function.css | 0
>> > .../templates/trigger_function/css/function.css | 3 -
>> > .../{templates/edbfunc => static}/css/edbfunc.css | 0
>> > .../static/js/exclusion_constraint.js | 18 +-
>> > .../foreign_key/static/js/foreign_key.js | 17 +-
>> > .../schemas/tables/rules/static/css/rule.css | 7 +
>> > .../tables/rules/templates/rules/css/rule.css | 8 -
>> > .../databases/schemas/views/static/css/view.css | 7 +
>> > .../schemas/views/templates/mview/css/mview.css | 4 -
>> > .../schemas/views/templates/view/css/view.css | 4 -
>> > .../pgagent/schedules/static/js/pga_schedule.js | 3 +-
>> > .../servers/pgagent/static/css/pga_job.css | 3 +
>> > .../pgagent/templates/pga_job/css/pga_job.css | 13 -
>> > .../server_groups/servers/static/css/servers.css | 4 +
>> > .../server_groups/servers/static/js/server.js | 22 +-
>> > .../server_groups/servers/static/js/variable.js | 4 +-
>> > .../servers/tablespaces/static/js/tablespace.js | 13 +-
>> > .../servers/templates/css/servers.css | 4 -
>> > web/pgadmin/browser/static/css/browser.css | 13 -
>> > web/pgadmin/browser/static/css/wizard.css | 21 +-
>> > web/pgadmin/browser/static/js/browser.js | 26 +-
>> > web/pgadmin/browser/static/js/collection.js | 16 +-
>> > web/pgadmin/browser/static/js/keyboard.js | 14 +-
>> > web/pgadmin/browser/static/js/menu.js | 28 +-
>> > web/pgadmin/browser/static/js/node.js | 53 +-
>> > web/pgadmin/browser/static/js/node.ui.js | 4 +-
>> > web/pgadmin/browser/static/js/panel.js | 15 +-
>> > web/pgadmin/browser/static/js/toolbar.js | 3 -
>> > web/pgadmin/browser/static/js/wizard.js | 58 +-
>> > web/pgadmin/browser/static/scss/_browser.scss | 43 +-
>> > web/pgadmin/browser/static/scss/_wizard.scss | 41 +-
>> > web/pgadmin/browser/templates/browser/css/node.css | 2 +-
>> > web/pgadmin/browser/templates/browser/index.html | 9 +-
>> > web/pgadmin/dashboard/__init__.py | 2 +-
>> > web/pgadmin/dashboard/static/css/dashboard.css | 21 +-
>> > web/pgadmin/dashboard/static/js/dashboard.js | 120 +-
>> > web/pgadmin/dashboard/static/scss/_dashboard.scss | 44 +-
>> > .../templates/dashboard/database_dashboard.html | 171 ++-
>> > .../templates/dashboard/server_dashboard.html | 197 ++-
>> > .../templates/dashboard/welcome_dashboard.html | 30 +-
>> > web/pgadmin/feature_tests/browser_tool_bar_test.py | 23 +-
>> > web/pgadmin/feature_tests/file_manager_test.py | 23 +-
>> > .../feature_tests/keyboard_shortcut_test.py | 5 +-
>> > .../feature_tests/pg_datatype_validation_test.py | 5 +-
>> > .../pg_utilities_backup_restore_test.py | 28 +-
>> > .../feature_tests/pg_utilities_maintenance_test.py | 16 +-
>> > .../feature_tests/query_tool_journey_test.py | 5 +-
>> > web/pgadmin/feature_tests/query_tool_tests.py | 117 +-
>> > web/pgadmin/feature_tests/view_data_dml_queries.py | 16 +-
>> > .../misc/bgprocess/static/css/bgprocess.css | 11 -
>> > web/pgadmin/misc/bgprocess/static/js/bgprocess.js | 173 ++-
>> > .../misc/bgprocess/static/scss/_bgprocess.scss | 81 +-
>> > web/pgadmin/misc/depends/static/js/depends.js | 3 +-
>> > .../misc/file_manager/static/css/file_manager.css | 141 +-
>> > .../misc/file_manager/static/js/create_dialogue.js | 9 +-
>> > .../misc/file_manager/static/js/select_dialogue.js | 19 +-
>> > web/pgadmin/misc/file_manager/static/js/utility.js | 77 +-
>> > .../file_manager/static/scss/_file_manager.scss | 157 +--
>> > .../file_manager/templates/file_manager/index.html | 95 +-
>> > .../misc/statistics/static/js/statistics.js | 3 +-
>> > web/pgadmin/preferences/static/css/preferences.css | 14 -
>> > web/pgadmin/preferences/static/js/preferences.js | 31 +-
>> > .../preferences/static/scss/_preferences.scss | 16 +
>> > web/pgadmin/static/css/pgadmin.css | 81 +-
>> > web/pgadmin/static/fonts/Roboto-Bold.ttf | Bin 0 -> 170760 bytes
>> > web/pgadmin/static/fonts/Roboto-Medium.ttf | Bin 0 -> 172064 bytes
>> > web/pgadmin/static/fonts/Roboto-Regular.ttf | Bin 0 -> 171676 bytes
>> > web/pgadmin/static/img/collapse_expand.svg | 15 +
>> > web/pgadmin/static/img/forgot_password.svg | 283 ++++
>> > web/pgadmin/static/img/login.svg | 1 +
>> > web/pgadmin/static/js/alertify.pgadmin.defaults.js | 82 +-
>> > web/pgadmin/static/js/backform.pgadmin.js | 80 +-
>> > web/pgadmin/static/js/backgrid.pgadmin.js | 33 +-
>> > web/pgadmin/static/js/slickgrid/editors.js | 8 +-
>> > web/pgadmin/static/js/sqleditor/filter_dialog.js | 33 +-
>> > .../static/js/sqleditor/query_tool_preferences.js | 15 +-
>> > web/pgadmin/static/scss/_aci_tree.overrides.scss | 75 +-
>> > web/pgadmin/static/scss/_alert.scss | 12 +-
>> > web/pgadmin/static/scss/_alertify.overrides.scss | 150 +-
>> > web/pgadmin/static/scss/_backform.overrides.scss | 8 +
>> > web/pgadmin/static/scss/_backgrid.overrides.scss | 251 +++-
>> > web/pgadmin/static/scss/_bootstrap.overrides.scss | 230 ++--
>> > web/pgadmin/static/scss/_codemirror.overrides.scss | 94 +-
>> > web/pgadmin/static/scss/_pgadmin.grid.scss | 56 +
>> > web/pgadmin/static/scss/_pgadmin.style.scss | 1440 +++++---------------
>> > web/pgadmin/static/scss/_select2.overrides.scss | 24 +-
>> > web/pgadmin/static/scss/_webcabin.overrides.scss | 368 -----
>> > web/pgadmin/static/scss/_webcabin.pgadmin.scss | 250 ++++
>> > web/pgadmin/static/scss/pgadmin.scss | 10 +-
>> > .../static/scss/resources/_default.style.scss | 90 +-
>> > .../static/scss/resources/_default.variables.scss | 203 ++-
>> > web/pgadmin/static/vendor/backform/backform.js | 645 +++++++++
>> > .../templates/security/change_password.html | 43 +-
>> > .../templates/security/forgot_password.html | 9 +-
>> > web/pgadmin/templates/security/login_user.html | 16 +-
>> > web/pgadmin/templates/security/panel.html | 23 +-
>> > web/pgadmin/tools/backup/__init__.py | 6 +-
>> > web/pgadmin/tools/backup/static/js/backup.js | 8 +-
>> > .../backup/static/js/backup_dialog_wrapper.js | 22 +-
>> > web/pgadmin/tools/datagrid/__init__.py | 1 -
>> > web/pgadmin/tools/datagrid/static/js/datagrid.js | 38 +-
>> > .../tools/datagrid/templates/datagrid/filter.html | 2 -
>> > .../tools/datagrid/templates/datagrid/index.html | 193 ++-
>> > web/pgadmin/tools/debugger/static/css/debugger.css | 34 +-
>> > web/pgadmin/tools/debugger/static/js/debugger.js | 2 +-
>> > .../tools/debugger/static/js/debugger_ui.js | 28 +-
>> > web/pgadmin/tools/debugger/static/js/direct.js | 13 +-
>> > .../tools/debugger/static/scss/_debugger.scss | 8 -
>> > .../tools/debugger/templates/debugger/direct.html | 89 +-
>> > .../tools/grant_wizard/static/js/grant_wizard.js | 27 +-
>> > .../grant_wizard/static/scss/_grant_wizard.scss | 31 +-
>> > .../tools/import_export/static/js/import_export.js | 24 +-
>> > web/pgadmin/tools/maintenance/__init__.py | 10 +-
>> > .../tools/maintenance/static/js/maintenance.js | 24 +-
>> > .../maintenance/static/scss/_maintenance.scss | 2 +-
>> > web/pgadmin/tools/restore/__init__.py | 14 +-
>> > web/pgadmin/tools/restore/static/js/restore.js | 8 +-
>> > .../restore/static/js/restore_dialog_wrapper.js | 24 +-
>> > .../tools/sqleditor/static/css/sqleditor.css | 128 +-
>> > web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 35 +-
>> > .../tools/sqleditor/static/scss/_history.scss | 42 +-
>> > .../tools/sqleditor/static/scss/_sqleditor.scss | 128 +-
>> > .../user_management/static/css/user_management.css | 37 -
>> > .../user_management/static/js/user_management.js | 53 +-
>> > .../static/scss/_user_management.scss | 12 +-
>> > .../javascript/alerts/alertify_wrapper_spec.js | 4 +-
>> > .../backup/backup_dialog_wrapper_spec.js | 8 +-
>> > .../restore/restore_dialog_wrapper_spec.js | 8 +-
>> > web/webpack.config.js | 2 +-
>> > web/webpack.shim.js | 2 +-
>> > web/webpack.test.config.js | 1 +
>> > web/yarn.lock | 1015 +++++++++++++-
>> > 135 files changed, 5002 insertions(+), 3850 deletions(-)
>> >
>>
>>
>> --
>> Dave Page
>> Blog: http://pgsnake.blogspot.com
>> Twitter: @pgsnake
>>
>> EnterpriseDB UK: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>
>
>
> --
> Thanks and Regards,
> Aditya Toshniwal
> Software Engineer | EnterpriseDB Software Solutions | Pune
> "Don't Complain about Heat, Plant a tree"
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
@ 2018-12-21 13:59 ` Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:02 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
0 siblings, 2 replies; 29+ messages in thread
From: Dave Page @ 2018-12-21 13:59 UTC (permalink / raw)
To: Aditya Toshniwal <[email protected]>; +Cc: Ashesh Vashi <[email protected]>; pgadmin-hackers <[email protected]>; Akshay Joshi <[email protected]>; Chethana Kumar <[email protected]>; Khushboo Vashi <[email protected]>
One other issue: I'm seeing that standard sized dialogues (e.g. the
Server or Database Properties dialogues) are wrapping their labels and
controls at the default size. That should not be the case.
On Fri, Dec 21, 2018 at 12:46 PM Dave Page <[email protected]> wrote:
>
> Hi
>
> On Fri, Dec 21, 2018 at 12:29 PM Aditya Toshniwal
> <[email protected]> wrote:
> >
> > Hi Dave,
> >
> > On Fri, Dec 21, 2018 at 5:51 PM Dave Page <[email protected]> wrote:
> >>
> >> Nice! Thanks Ashesh.
> >>
> >> Some small issues I spotted:
> >>
> >> - The font looks somewhat small. How does it compare in size to, say,
> >> Gmail? I think it needs to be increased to at least that size.
> >
> > Gmail uses 0.875rem (14px) for the left panel (Inbox, Sent). We are using 0.875rem (14px) for main navbar links and 0.815rem(13.04px) for all other text.
>
> Let's increase the default to 0.875, and make the main links
> proportionally bigger.
>
> >> - Dialogues have 2 close buttons next to each other in the top-right.
> >> Looks like an icon and a text version?
> >
> > You need to do a yarn install. wcDocker code is changed to fix that.
>
> Yup, that fixed it.
>
> >> - Why do some Preferences panels use alternate line colouring, whilst
> >> others don't? I suspect it's because some are actually tables under
> >> the hood? I think we need consistency there.
> >
> > Noted.
> >>
> >>
> >> - The Maintenance dialogue looks terrible - it needs to be made much
> >> more compact. I also seem to be getting a failure to create
> >> maintenance jobs (backups etc work fine).
> >
> > Noted.
> >>
> >>
> >> - I think the buttons on the Browser need borders to match other buttons.
> >
> > It is made consistent with other wcDocker buttons like close, right arrow, left arrow. However, we can make it look like other buttons.
>
> I think they're a different class of buttons - control/navigation vs.
> function. I think we should make this change as the browser buttons
> really are a toolbar just like the larger on on the query tool.
>
> Thanks!
>
> >> Thanks!
> >>
> >> On Fri, Dec 21, 2018 at 12:01 PM Ashesh Vashi
> >> <[email protected]> wrote:
> >> >
> >> > Improvement in the look and feel of the whole application
> >> >
> >> > Changed the SCSS/CSS for the below third party libraries to adopt the
> >> > new look 'n' feel:
> >> > - wcDocker
> >> > - Alertify dialogs, and notifications
> >> > - AciTree
> >> > - Bootstrap Navbar
> >> > - Bootstrap Tabs
> >> > - Bootstrap Drop-Down menu
> >> > - Backgrid
> >> > - Select2
> >> >
> >> > Adopated the new the look 'n' feel for the dialogs, wizard, properties,
> >> > tab panels, tabs, fieldset, subnode control, spinner control, HTML
> >> > table, and other form controls.
> >> >
> >> > - Font is changed to Roboto
> >> > - Using SCSS variables to define the look 'n' feel
> >> > - Designer background images for the Login, and Forget password pages in
> >> > 'web' mode
> >> > - Improved the look 'n' feel for the key selection in the preferences
> >> > dialog
> >> > - Table classes consistency changes across the application
> >> > - File Open and Save dialog list view changes
> >> >
> >> > Author(s): Aditya Toshniwal & Khushboo Vashi
> >> >
> >> > Branch
> >> > ------
> >> > master
> >> >
> >> > Details
> >> > -------
> >> > https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5799ac14ba17dc25fbec184b3b2c6afbe37f...
> >> >
> >> > Modified Files
> >> > --------------
> >> > web/package.json | 2 +-
> >> > .../static/js/fts_configuration.js | 2 +-
> >> > .../databases/schemas/functions/__init__.py | 4 +-
> >> > .../function => static}/css/function.css | 0
> >> > .../templates/trigger_function/css/function.css | 3 -
> >> > .../{templates/edbfunc => static}/css/edbfunc.css | 0
> >> > .../static/js/exclusion_constraint.js | 18 +-
> >> > .../foreign_key/static/js/foreign_key.js | 17 +-
> >> > .../schemas/tables/rules/static/css/rule.css | 7 +
> >> > .../tables/rules/templates/rules/css/rule.css | 8 -
> >> > .../databases/schemas/views/static/css/view.css | 7 +
> >> > .../schemas/views/templates/mview/css/mview.css | 4 -
> >> > .../schemas/views/templates/view/css/view.css | 4 -
> >> > .../pgagent/schedules/static/js/pga_schedule.js | 3 +-
> >> > .../servers/pgagent/static/css/pga_job.css | 3 +
> >> > .../pgagent/templates/pga_job/css/pga_job.css | 13 -
> >> > .../server_groups/servers/static/css/servers.css | 4 +
> >> > .../server_groups/servers/static/js/server.js | 22 +-
> >> > .../server_groups/servers/static/js/variable.js | 4 +-
> >> > .../servers/tablespaces/static/js/tablespace.js | 13 +-
> >> > .../servers/templates/css/servers.css | 4 -
> >> > web/pgadmin/browser/static/css/browser.css | 13 -
> >> > web/pgadmin/browser/static/css/wizard.css | 21 +-
> >> > web/pgadmin/browser/static/js/browser.js | 26 +-
> >> > web/pgadmin/browser/static/js/collection.js | 16 +-
> >> > web/pgadmin/browser/static/js/keyboard.js | 14 +-
> >> > web/pgadmin/browser/static/js/menu.js | 28 +-
> >> > web/pgadmin/browser/static/js/node.js | 53 +-
> >> > web/pgadmin/browser/static/js/node.ui.js | 4 +-
> >> > web/pgadmin/browser/static/js/panel.js | 15 +-
> >> > web/pgadmin/browser/static/js/toolbar.js | 3 -
> >> > web/pgadmin/browser/static/js/wizard.js | 58 +-
> >> > web/pgadmin/browser/static/scss/_browser.scss | 43 +-
> >> > web/pgadmin/browser/static/scss/_wizard.scss | 41 +-
> >> > web/pgadmin/browser/templates/browser/css/node.css | 2 +-
> >> > web/pgadmin/browser/templates/browser/index.html | 9 +-
> >> > web/pgadmin/dashboard/__init__.py | 2 +-
> >> > web/pgadmin/dashboard/static/css/dashboard.css | 21 +-
> >> > web/pgadmin/dashboard/static/js/dashboard.js | 120 +-
> >> > web/pgadmin/dashboard/static/scss/_dashboard.scss | 44 +-
> >> > .../templates/dashboard/database_dashboard.html | 171 ++-
> >> > .../templates/dashboard/server_dashboard.html | 197 ++-
> >> > .../templates/dashboard/welcome_dashboard.html | 30 +-
> >> > web/pgadmin/feature_tests/browser_tool_bar_test.py | 23 +-
> >> > web/pgadmin/feature_tests/file_manager_test.py | 23 +-
> >> > .../feature_tests/keyboard_shortcut_test.py | 5 +-
> >> > .../feature_tests/pg_datatype_validation_test.py | 5 +-
> >> > .../pg_utilities_backup_restore_test.py | 28 +-
> >> > .../feature_tests/pg_utilities_maintenance_test.py | 16 +-
> >> > .../feature_tests/query_tool_journey_test.py | 5 +-
> >> > web/pgadmin/feature_tests/query_tool_tests.py | 117 +-
> >> > web/pgadmin/feature_tests/view_data_dml_queries.py | 16 +-
> >> > .../misc/bgprocess/static/css/bgprocess.css | 11 -
> >> > web/pgadmin/misc/bgprocess/static/js/bgprocess.js | 173 ++-
> >> > .../misc/bgprocess/static/scss/_bgprocess.scss | 81 +-
> >> > web/pgadmin/misc/depends/static/js/depends.js | 3 +-
> >> > .../misc/file_manager/static/css/file_manager.css | 141 +-
> >> > .../misc/file_manager/static/js/create_dialogue.js | 9 +-
> >> > .../misc/file_manager/static/js/select_dialogue.js | 19 +-
> >> > web/pgadmin/misc/file_manager/static/js/utility.js | 77 +-
> >> > .../file_manager/static/scss/_file_manager.scss | 157 +--
> >> > .../file_manager/templates/file_manager/index.html | 95 +-
> >> > .../misc/statistics/static/js/statistics.js | 3 +-
> >> > web/pgadmin/preferences/static/css/preferences.css | 14 -
> >> > web/pgadmin/preferences/static/js/preferences.js | 31 +-
> >> > .../preferences/static/scss/_preferences.scss | 16 +
> >> > web/pgadmin/static/css/pgadmin.css | 81 +-
> >> > web/pgadmin/static/fonts/Roboto-Bold.ttf | Bin 0 -> 170760 bytes
> >> > web/pgadmin/static/fonts/Roboto-Medium.ttf | Bin 0 -> 172064 bytes
> >> > web/pgadmin/static/fonts/Roboto-Regular.ttf | Bin 0 -> 171676 bytes
> >> > web/pgadmin/static/img/collapse_expand.svg | 15 +
> >> > web/pgadmin/static/img/forgot_password.svg | 283 ++++
> >> > web/pgadmin/static/img/login.svg | 1 +
> >> > web/pgadmin/static/js/alertify.pgadmin.defaults.js | 82 +-
> >> > web/pgadmin/static/js/backform.pgadmin.js | 80 +-
> >> > web/pgadmin/static/js/backgrid.pgadmin.js | 33 +-
> >> > web/pgadmin/static/js/slickgrid/editors.js | 8 +-
> >> > web/pgadmin/static/js/sqleditor/filter_dialog.js | 33 +-
> >> > .../static/js/sqleditor/query_tool_preferences.js | 15 +-
> >> > web/pgadmin/static/scss/_aci_tree.overrides.scss | 75 +-
> >> > web/pgadmin/static/scss/_alert.scss | 12 +-
> >> > web/pgadmin/static/scss/_alertify.overrides.scss | 150 +-
> >> > web/pgadmin/static/scss/_backform.overrides.scss | 8 +
> >> > web/pgadmin/static/scss/_backgrid.overrides.scss | 251 +++-
> >> > web/pgadmin/static/scss/_bootstrap.overrides.scss | 230 ++--
> >> > web/pgadmin/static/scss/_codemirror.overrides.scss | 94 +-
> >> > web/pgadmin/static/scss/_pgadmin.grid.scss | 56 +
> >> > web/pgadmin/static/scss/_pgadmin.style.scss | 1440 +++++---------------
> >> > web/pgadmin/static/scss/_select2.overrides.scss | 24 +-
> >> > web/pgadmin/static/scss/_webcabin.overrides.scss | 368 -----
> >> > web/pgadmin/static/scss/_webcabin.pgadmin.scss | 250 ++++
> >> > web/pgadmin/static/scss/pgadmin.scss | 10 +-
> >> > .../static/scss/resources/_default.style.scss | 90 +-
> >> > .../static/scss/resources/_default.variables.scss | 203 ++-
> >> > web/pgadmin/static/vendor/backform/backform.js | 645 +++++++++
> >> > .../templates/security/change_password.html | 43 +-
> >> > .../templates/security/forgot_password.html | 9 +-
> >> > web/pgadmin/templates/security/login_user.html | 16 +-
> >> > web/pgadmin/templates/security/panel.html | 23 +-
> >> > web/pgadmin/tools/backup/__init__.py | 6 +-
> >> > web/pgadmin/tools/backup/static/js/backup.js | 8 +-
> >> > .../backup/static/js/backup_dialog_wrapper.js | 22 +-
> >> > web/pgadmin/tools/datagrid/__init__.py | 1 -
> >> > web/pgadmin/tools/datagrid/static/js/datagrid.js | 38 +-
> >> > .../tools/datagrid/templates/datagrid/filter.html | 2 -
> >> > .../tools/datagrid/templates/datagrid/index.html | 193 ++-
> >> > web/pgadmin/tools/debugger/static/css/debugger.css | 34 +-
> >> > web/pgadmin/tools/debugger/static/js/debugger.js | 2 +-
> >> > .../tools/debugger/static/js/debugger_ui.js | 28 +-
> >> > web/pgadmin/tools/debugger/static/js/direct.js | 13 +-
> >> > .../tools/debugger/static/scss/_debugger.scss | 8 -
> >> > .../tools/debugger/templates/debugger/direct.html | 89 +-
> >> > .../tools/grant_wizard/static/js/grant_wizard.js | 27 +-
> >> > .../grant_wizard/static/scss/_grant_wizard.scss | 31 +-
> >> > .../tools/import_export/static/js/import_export.js | 24 +-
> >> > web/pgadmin/tools/maintenance/__init__.py | 10 +-
> >> > .../tools/maintenance/static/js/maintenance.js | 24 +-
> >> > .../maintenance/static/scss/_maintenance.scss | 2 +-
> >> > web/pgadmin/tools/restore/__init__.py | 14 +-
> >> > web/pgadmin/tools/restore/static/js/restore.js | 8 +-
> >> > .../restore/static/js/restore_dialog_wrapper.js | 24 +-
> >> > .../tools/sqleditor/static/css/sqleditor.css | 128 +-
> >> > web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 35 +-
> >> > .../tools/sqleditor/static/scss/_history.scss | 42 +-
> >> > .../tools/sqleditor/static/scss/_sqleditor.scss | 128 +-
> >> > .../user_management/static/css/user_management.css | 37 -
> >> > .../user_management/static/js/user_management.js | 53 +-
> >> > .../static/scss/_user_management.scss | 12 +-
> >> > .../javascript/alerts/alertify_wrapper_spec.js | 4 +-
> >> > .../backup/backup_dialog_wrapper_spec.js | 8 +-
> >> > .../restore/restore_dialog_wrapper_spec.js | 8 +-
> >> > web/webpack.config.js | 2 +-
> >> > web/webpack.shim.js | 2 +-
> >> > web/webpack.test.config.js | 1 +
> >> > web/yarn.lock | 1015 +++++++++++++-
> >> > 135 files changed, 5002 insertions(+), 3850 deletions(-)
> >> >
> >>
> >>
> >> --
> >> Dave Page
> >> Blog: http://pgsnake.blogspot.com
> >> Twitter: @pgsnake
> >>
> >> EnterpriseDB UK: http://www.enterprisedb.com
> >> The Enterprise PostgreSQL Company
> >
> >
> >
> > --
> > Thanks and Regards,
> > Aditya Toshniwal
> > Software Engineer | EnterpriseDB Software Solutions | Pune
> > "Don't Complain about Heat, Plant a tree"
>
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
@ 2018-12-21 14:01 ` Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
1 sibling, 1 reply; 29+ messages in thread
From: Aditya Toshniwal @ 2018-12-21 14:01 UTC (permalink / raw)
To: Dave Page <[email protected]>; +Cc: Ashesh Vashi <[email protected]>; pgadmin-hackers <[email protected]>; Akshay Joshi <[email protected]>; Chethana Kumar <[email protected]>; Khushboo Vashi <[email protected]>
On Fri, Dec 21, 2018 at 7:29 PM Dave Page <[email protected]> wrote:
> One other issue: I'm seeing that standard sized dialogues (e.g. the
> Server or Database Properties dialogues) are wrapping their labels and
> controls at the default size. That should not be the case.
>
Yep. Akshay has logged that in the sheet shared (
https://drive.google.com/open?id=127BgrvdVUvWSEp-GnQvCDx1WaaemsycxSD0aUpWxb6k
).
>
> On Fri, Dec 21, 2018 at 12:46 PM Dave Page <[email protected]> wrote:
> >
> > Hi
> >
> > On Fri, Dec 21, 2018 at 12:29 PM Aditya Toshniwal
> > <[email protected]> wrote:
> > >
> > > Hi Dave,
> > >
> > > On Fri, Dec 21, 2018 at 5:51 PM Dave Page <[email protected]> wrote:
> > >>
> > >> Nice! Thanks Ashesh.
> > >>
> > >> Some small issues I spotted:
> > >>
> > >> - The font looks somewhat small. How does it compare in size to, say,
> > >> Gmail? I think it needs to be increased to at least that size.
> > >
> > > Gmail uses 0.875rem (14px) for the left panel (Inbox, Sent). We are
> using 0.875rem (14px) for main navbar links and 0.815rem(13.04px) for all
> other text.
> >
> > Let's increase the default to 0.875, and make the main links
> > proportionally bigger.
> >
> > >> - Dialogues have 2 close buttons next to each other in the top-right.
> > >> Looks like an icon and a text version?
> > >
> > > You need to do a yarn install. wcDocker code is changed to fix that.
> >
> > Yup, that fixed it.
> >
> > >> - Why do some Preferences panels use alternate line colouring, whilst
> > >> others don't? I suspect it's because some are actually tables under
> > >> the hood? I think we need consistency there.
> > >
> > > Noted.
> > >>
> > >>
> > >> - The Maintenance dialogue looks terrible - it needs to be made much
> > >> more compact. I also seem to be getting a failure to create
> > >> maintenance jobs (backups etc work fine).
> > >
> > > Noted.
> > >>
> > >>
> > >> - I think the buttons on the Browser need borders to match other
> buttons.
> > >
> > > It is made consistent with other wcDocker buttons like close, right
> arrow, left arrow. However, we can make it look like other buttons.
> >
> > I think they're a different class of buttons - control/navigation vs.
> > function. I think we should make this change as the browser buttons
> > really are a toolbar just like the larger on on the query tool.
> >
> > Thanks!
> >
> > >> Thanks!
> > >>
> > >> On Fri, Dec 21, 2018 at 12:01 PM Ashesh Vashi
> > >> <[email protected]> wrote:
> > >> >
> > >> > Improvement in the look and feel of the whole application
> > >> >
> > >> > Changed the SCSS/CSS for the below third party libraries to adopt
> the
> > >> > new look 'n' feel:
> > >> > - wcDocker
> > >> > - Alertify dialogs, and notifications
> > >> > - AciTree
> > >> > - Bootstrap Navbar
> > >> > - Bootstrap Tabs
> > >> > - Bootstrap Drop-Down menu
> > >> > - Backgrid
> > >> > - Select2
> > >> >
> > >> > Adopated the new the look 'n' feel for the dialogs, wizard,
> properties,
> > >> > tab panels, tabs, fieldset, subnode control, spinner control, HTML
> > >> > table, and other form controls.
> > >> >
> > >> > - Font is changed to Roboto
> > >> > - Using SCSS variables to define the look 'n' feel
> > >> > - Designer background images for the Login, and Forget password
> pages in
> > >> > 'web' mode
> > >> > - Improved the look 'n' feel for the key selection in the
> preferences
> > >> > dialog
> > >> > - Table classes consistency changes across the application
> > >> > - File Open and Save dialog list view changes
> > >> >
> > >> > Author(s): Aditya Toshniwal & Khushboo Vashi
> > >> >
> > >> > Branch
> > >> > ------
> > >> > master
> > >> >
> > >> > Details
> > >> > -------
> > >> >
> https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5799ac14ba17dc25fbec184b3b2c6afbe37f...
> > >> >
> > >> > Modified Files
> > >> > --------------
> > >> > web/package.json | 2 +-
> > >> > .../static/js/fts_configuration.js | 2 +-
> > >> > .../databases/schemas/functions/__init__.py | 4 +-
> > >> > .../function => static}/css/function.css | 0
> > >> > .../templates/trigger_function/css/function.css | 3 -
> > >> > .../{templates/edbfunc => static}/css/edbfunc.css | 0
> > >> > .../static/js/exclusion_constraint.js | 18 +-
> > >> > .../foreign_key/static/js/foreign_key.js | 17 +-
> > >> > .../schemas/tables/rules/static/css/rule.css | 7 +
> > >> > .../tables/rules/templates/rules/css/rule.css | 8 -
> > >> > .../databases/schemas/views/static/css/view.css | 7 +
> > >> > .../schemas/views/templates/mview/css/mview.css | 4 -
> > >> > .../schemas/views/templates/view/css/view.css | 4 -
> > >> > .../pgagent/schedules/static/js/pga_schedule.js | 3 +-
> > >> > .../servers/pgagent/static/css/pga_job.css | 3 +
> > >> > .../pgagent/templates/pga_job/css/pga_job.css | 13 -
> > >> > .../server_groups/servers/static/css/servers.css | 4 +
> > >> > .../server_groups/servers/static/js/server.js | 22 +-
> > >> > .../server_groups/servers/static/js/variable.js | 4 +-
> > >> > .../servers/tablespaces/static/js/tablespace.js | 13 +-
> > >> > .../servers/templates/css/servers.css | 4 -
> > >> > web/pgadmin/browser/static/css/browser.css | 13 -
> > >> > web/pgadmin/browser/static/css/wizard.css | 21 +-
> > >> > web/pgadmin/browser/static/js/browser.js | 26 +-
> > >> > web/pgadmin/browser/static/js/collection.js | 16 +-
> > >> > web/pgadmin/browser/static/js/keyboard.js | 14 +-
> > >> > web/pgadmin/browser/static/js/menu.js | 28 +-
> > >> > web/pgadmin/browser/static/js/node.js | 53 +-
> > >> > web/pgadmin/browser/static/js/node.ui.js | 4 +-
> > >> > web/pgadmin/browser/static/js/panel.js | 15 +-
> > >> > web/pgadmin/browser/static/js/toolbar.js | 3 -
> > >> > web/pgadmin/browser/static/js/wizard.js | 58 +-
> > >> > web/pgadmin/browser/static/scss/_browser.scss | 43 +-
> > >> > web/pgadmin/browser/static/scss/_wizard.scss | 41 +-
> > >> > web/pgadmin/browser/templates/browser/css/node.css | 2 +-
> > >> > web/pgadmin/browser/templates/browser/index.html | 9 +-
> > >> > web/pgadmin/dashboard/__init__.py | 2 +-
> > >> > web/pgadmin/dashboard/static/css/dashboard.css | 21 +-
> > >> > web/pgadmin/dashboard/static/js/dashboard.js | 120 +-
> > >> > web/pgadmin/dashboard/static/scss/_dashboard.scss | 44 +-
> > >> > .../templates/dashboard/database_dashboard.html | 171 ++-
> > >> > .../templates/dashboard/server_dashboard.html | 197 ++-
> > >> > .../templates/dashboard/welcome_dashboard.html | 30 +-
> > >> > web/pgadmin/feature_tests/browser_tool_bar_test.py | 23 +-
> > >> > web/pgadmin/feature_tests/file_manager_test.py | 23 +-
> > >> > .../feature_tests/keyboard_shortcut_test.py | 5 +-
> > >> > .../feature_tests/pg_datatype_validation_test.py | 5 +-
> > >> > .../pg_utilities_backup_restore_test.py | 28 +-
> > >> > .../feature_tests/pg_utilities_maintenance_test.py | 16 +-
> > >> > .../feature_tests/query_tool_journey_test.py | 5 +-
> > >> > web/pgadmin/feature_tests/query_tool_tests.py | 117 +-
> > >> > web/pgadmin/feature_tests/view_data_dml_queries.py | 16 +-
> > >> > .../misc/bgprocess/static/css/bgprocess.css | 11 -
> > >> > web/pgadmin/misc/bgprocess/static/js/bgprocess.js | 173 ++-
> > >> > .../misc/bgprocess/static/scss/_bgprocess.scss | 81 +-
> > >> > web/pgadmin/misc/depends/static/js/depends.js | 3 +-
> > >> > .../misc/file_manager/static/css/file_manager.css | 141 +-
> > >> > .../misc/file_manager/static/js/create_dialogue.js | 9 +-
> > >> > .../misc/file_manager/static/js/select_dialogue.js | 19 +-
> > >> > web/pgadmin/misc/file_manager/static/js/utility.js | 77 +-
> > >> > .../file_manager/static/scss/_file_manager.scss | 157 +--
> > >> > .../file_manager/templates/file_manager/index.html | 95 +-
> > >> > .../misc/statistics/static/js/statistics.js | 3 +-
> > >> > web/pgadmin/preferences/static/css/preferences.css | 14 -
> > >> > web/pgadmin/preferences/static/js/preferences.js | 31 +-
> > >> > .../preferences/static/scss/_preferences.scss | 16 +
> > >> > web/pgadmin/static/css/pgadmin.css | 81 +-
> > >> > web/pgadmin/static/fonts/Roboto-Bold.ttf | Bin 0 ->
> 170760 bytes
> > >> > web/pgadmin/static/fonts/Roboto-Medium.ttf | Bin 0 ->
> 172064 bytes
> > >> > web/pgadmin/static/fonts/Roboto-Regular.ttf | Bin 0 ->
> 171676 bytes
> > >> > web/pgadmin/static/img/collapse_expand.svg | 15 +
> > >> > web/pgadmin/static/img/forgot_password.svg | 283 ++++
> > >> > web/pgadmin/static/img/login.svg | 1 +
> > >> > web/pgadmin/static/js/alertify.pgadmin.defaults.js | 82 +-
> > >> > web/pgadmin/static/js/backform.pgadmin.js | 80 +-
> > >> > web/pgadmin/static/js/backgrid.pgadmin.js | 33 +-
> > >> > web/pgadmin/static/js/slickgrid/editors.js | 8 +-
> > >> > web/pgadmin/static/js/sqleditor/filter_dialog.js | 33 +-
> > >> > .../static/js/sqleditor/query_tool_preferences.js | 15 +-
> > >> > web/pgadmin/static/scss/_aci_tree.overrides.scss | 75 +-
> > >> > web/pgadmin/static/scss/_alert.scss | 12 +-
> > >> > web/pgadmin/static/scss/_alertify.overrides.scss | 150 +-
> > >> > web/pgadmin/static/scss/_backform.overrides.scss | 8 +
> > >> > web/pgadmin/static/scss/_backgrid.overrides.scss | 251 +++-
> > >> > web/pgadmin/static/scss/_bootstrap.overrides.scss | 230 ++--
> > >> > web/pgadmin/static/scss/_codemirror.overrides.scss | 94 +-
> > >> > web/pgadmin/static/scss/_pgadmin.grid.scss | 56 +
> > >> > web/pgadmin/static/scss/_pgadmin.style.scss | 1440
> +++++---------------
> > >> > web/pgadmin/static/scss/_select2.overrides.scss | 24 +-
> > >> > web/pgadmin/static/scss/_webcabin.overrides.scss | 368 -----
> > >> > web/pgadmin/static/scss/_webcabin.pgadmin.scss | 250 ++++
> > >> > web/pgadmin/static/scss/pgadmin.scss | 10 +-
> > >> > .../static/scss/resources/_default.style.scss | 90 +-
> > >> > .../static/scss/resources/_default.variables.scss | 203 ++-
> > >> > web/pgadmin/static/vendor/backform/backform.js | 645 +++++++++
> > >> > .../templates/security/change_password.html | 43 +-
> > >> > .../templates/security/forgot_password.html | 9 +-
> > >> > web/pgadmin/templates/security/login_user.html | 16 +-
> > >> > web/pgadmin/templates/security/panel.html | 23 +-
> > >> > web/pgadmin/tools/backup/__init__.py | 6 +-
> > >> > web/pgadmin/tools/backup/static/js/backup.js | 8 +-
> > >> > .../backup/static/js/backup_dialog_wrapper.js | 22 +-
> > >> > web/pgadmin/tools/datagrid/__init__.py | 1 -
> > >> > web/pgadmin/tools/datagrid/static/js/datagrid.js | 38 +-
> > >> > .../tools/datagrid/templates/datagrid/filter.html | 2 -
> > >> > .../tools/datagrid/templates/datagrid/index.html | 193 ++-
> > >> > web/pgadmin/tools/debugger/static/css/debugger.css | 34 +-
> > >> > web/pgadmin/tools/debugger/static/js/debugger.js | 2 +-
> > >> > .../tools/debugger/static/js/debugger_ui.js | 28 +-
> > >> > web/pgadmin/tools/debugger/static/js/direct.js | 13 +-
> > >> > .../tools/debugger/static/scss/_debugger.scss | 8 -
> > >> > .../tools/debugger/templates/debugger/direct.html | 89 +-
> > >> > .../tools/grant_wizard/static/js/grant_wizard.js | 27 +-
> > >> > .../grant_wizard/static/scss/_grant_wizard.scss | 31 +-
> > >> > .../tools/import_export/static/js/import_export.js | 24 +-
> > >> > web/pgadmin/tools/maintenance/__init__.py | 10 +-
> > >> > .../tools/maintenance/static/js/maintenance.js | 24 +-
> > >> > .../maintenance/static/scss/_maintenance.scss | 2 +-
> > >> > web/pgadmin/tools/restore/__init__.py | 14 +-
> > >> > web/pgadmin/tools/restore/static/js/restore.js | 8 +-
> > >> > .../restore/static/js/restore_dialog_wrapper.js | 24 +-
> > >> > .../tools/sqleditor/static/css/sqleditor.css | 128 +-
> > >> > web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 35 +-
> > >> > .../tools/sqleditor/static/scss/_history.scss | 42 +-
> > >> > .../tools/sqleditor/static/scss/_sqleditor.scss | 128 +-
> > >> > .../user_management/static/css/user_management.css | 37 -
> > >> > .../user_management/static/js/user_management.js | 53 +-
> > >> > .../static/scss/_user_management.scss | 12 +-
> > >> > .../javascript/alerts/alertify_wrapper_spec.js | 4 +-
> > >> > .../backup/backup_dialog_wrapper_spec.js | 8 +-
> > >> > .../restore/restore_dialog_wrapper_spec.js | 8 +-
> > >> > web/webpack.config.js | 2 +-
> > >> > web/webpack.shim.js | 2 +-
> > >> > web/webpack.test.config.js | 1 +
> > >> > web/yarn.lock | 1015
> +++++++++++++-
> > >> > 135 files changed, 5002 insertions(+), 3850 deletions(-)
> > >> >
> > >>
> > >>
> > >> --
> > >> Dave Page
> > >> Blog: http://pgsnake.blogspot.com
> > >> Twitter: @pgsnake
> > >>
> > >> EnterpriseDB UK: http://www.enterprisedb.com
> > >> The Enterprise PostgreSQL Company
> > >
> > >
> > >
> > > --
> > > Thanks and Regards,
> > > Aditya Toshniwal
> > > Software Engineer | EnterpriseDB Software Solutions | Pune
> > > "Don't Complain about Heat, Plant a tree"
> >
> >
> >
> > --
> > Dave Page
> > Blog: http://pgsnake.blogspot.com
> > Twitter: @pgsnake
> >
> > EnterpriseDB UK: http://www.enterprisedb.com
> > The Enterprise PostgreSQL Company
>
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
--
Thanks and Regards,
Aditya Toshniwal
Software Engineer | EnterpriseDB Software Solutions | Pune
"Don't Complain about Heat, Plant a tree"
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
@ 2018-12-21 14:05 ` Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Dave Page @ 2018-12-21 14:05 UTC (permalink / raw)
To: Aditya Toshniwal <[email protected]>; +Cc: Ashesh Vashi <[email protected]>; pgadmin-hackers <[email protected]>; Akshay Joshi <[email protected]>; Chethana Kumar <[email protected]>; Khushboo Vashi <[email protected]>
On Fri, Dec 21, 2018 at 2:02 PM Aditya Toshniwal
<[email protected]> wrote:
>
>
>
> On Fri, Dec 21, 2018 at 7:29 PM Dave Page <[email protected]> wrote:
>>
>> One other issue: I'm seeing that standard sized dialogues (e.g. the
>> Server or Database Properties dialogues) are wrapping their labels and
>> controls at the default size. That should not be the case.
>
> Yep. Akshay has logged that in the sheet shared (https://drive.google.com/open?id=127BgrvdVUvWSEp-GnQvCDx1WaaemsycxSD0aUpWxb6k).
OK, but the answer isn't to increase the size of the dialogues as
suggested. The size is fine (though we should review for consistency,
and ensure we are using no more than 3 default standard sizes
throughout the app); we should make the controls display nicely on the
default dialogue size and wrap if the user makes it smaller than we
can display in.
>> On Fri, Dec 21, 2018 at 12:46 PM Dave Page <[email protected]> wrote:
>> >
>> > Hi
>> >
>> > On Fri, Dec 21, 2018 at 12:29 PM Aditya Toshniwal
>> > <[email protected]> wrote:
>> > >
>> > > Hi Dave,
>> > >
>> > > On Fri, Dec 21, 2018 at 5:51 PM Dave Page <[email protected]> wrote:
>> > >>
>> > >> Nice! Thanks Ashesh.
>> > >>
>> > >> Some small issues I spotted:
>> > >>
>> > >> - The font looks somewhat small. How does it compare in size to, say,
>> > >> Gmail? I think it needs to be increased to at least that size.
>> > >
>> > > Gmail uses 0.875rem (14px) for the left panel (Inbox, Sent). We are using 0.875rem (14px) for main navbar links and 0.815rem(13.04px) for all other text.
>> >
>> > Let's increase the default to 0.875, and make the main links
>> > proportionally bigger.
>> >
>> > >> - Dialogues have 2 close buttons next to each other in the top-right.
>> > >> Looks like an icon and a text version?
>> > >
>> > > You need to do a yarn install. wcDocker code is changed to fix that.
>> >
>> > Yup, that fixed it.
>> >
>> > >> - Why do some Preferences panels use alternate line colouring, whilst
>> > >> others don't? I suspect it's because some are actually tables under
>> > >> the hood? I think we need consistency there.
>> > >
>> > > Noted.
>> > >>
>> > >>
>> > >> - The Maintenance dialogue looks terrible - it needs to be made much
>> > >> more compact. I also seem to be getting a failure to create
>> > >> maintenance jobs (backups etc work fine).
>> > >
>> > > Noted.
>> > >>
>> > >>
>> > >> - I think the buttons on the Browser need borders to match other buttons.
>> > >
>> > > It is made consistent with other wcDocker buttons like close, right arrow, left arrow. However, we can make it look like other buttons.
>> >
>> > I think they're a different class of buttons - control/navigation vs.
>> > function. I think we should make this change as the browser buttons
>> > really are a toolbar just like the larger on on the query tool.
>> >
>> > Thanks!
>> >
>> > >> Thanks!
>> > >>
>> > >> On Fri, Dec 21, 2018 at 12:01 PM Ashesh Vashi
>> > >> <[email protected]> wrote:
>> > >> >
>> > >> > Improvement in the look and feel of the whole application
>> > >> >
>> > >> > Changed the SCSS/CSS for the below third party libraries to adopt the
>> > >> > new look 'n' feel:
>> > >> > - wcDocker
>> > >> > - Alertify dialogs, and notifications
>> > >> > - AciTree
>> > >> > - Bootstrap Navbar
>> > >> > - Bootstrap Tabs
>> > >> > - Bootstrap Drop-Down menu
>> > >> > - Backgrid
>> > >> > - Select2
>> > >> >
>> > >> > Adopated the new the look 'n' feel for the dialogs, wizard, properties,
>> > >> > tab panels, tabs, fieldset, subnode control, spinner control, HTML
>> > >> > table, and other form controls.
>> > >> >
>> > >> > - Font is changed to Roboto
>> > >> > - Using SCSS variables to define the look 'n' feel
>> > >> > - Designer background images for the Login, and Forget password pages in
>> > >> > 'web' mode
>> > >> > - Improved the look 'n' feel for the key selection in the preferences
>> > >> > dialog
>> > >> > - Table classes consistency changes across the application
>> > >> > - File Open and Save dialog list view changes
>> > >> >
>> > >> > Author(s): Aditya Toshniwal & Khushboo Vashi
>> > >> >
>> > >> > Branch
>> > >> > ------
>> > >> > master
>> > >> >
>> > >> > Details
>> > >> > -------
>> > >> > https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5799ac14ba17dc25fbec184b3b2c6afbe37f...
>> > >> >
>> > >> > Modified Files
>> > >> > --------------
>> > >> > web/package.json | 2 +-
>> > >> > .../static/js/fts_configuration.js | 2 +-
>> > >> > .../databases/schemas/functions/__init__.py | 4 +-
>> > >> > .../function => static}/css/function.css | 0
>> > >> > .../templates/trigger_function/css/function.css | 3 -
>> > >> > .../{templates/edbfunc => static}/css/edbfunc.css | 0
>> > >> > .../static/js/exclusion_constraint.js | 18 +-
>> > >> > .../foreign_key/static/js/foreign_key.js | 17 +-
>> > >> > .../schemas/tables/rules/static/css/rule.css | 7 +
>> > >> > .../tables/rules/templates/rules/css/rule.css | 8 -
>> > >> > .../databases/schemas/views/static/css/view.css | 7 +
>> > >> > .../schemas/views/templates/mview/css/mview.css | 4 -
>> > >> > .../schemas/views/templates/view/css/view.css | 4 -
>> > >> > .../pgagent/schedules/static/js/pga_schedule.js | 3 +-
>> > >> > .../servers/pgagent/static/css/pga_job.css | 3 +
>> > >> > .../pgagent/templates/pga_job/css/pga_job.css | 13 -
>> > >> > .../server_groups/servers/static/css/servers.css | 4 +
>> > >> > .../server_groups/servers/static/js/server.js | 22 +-
>> > >> > .../server_groups/servers/static/js/variable.js | 4 +-
>> > >> > .../servers/tablespaces/static/js/tablespace.js | 13 +-
>> > >> > .../servers/templates/css/servers.css | 4 -
>> > >> > web/pgadmin/browser/static/css/browser.css | 13 -
>> > >> > web/pgadmin/browser/static/css/wizard.css | 21 +-
>> > >> > web/pgadmin/browser/static/js/browser.js | 26 +-
>> > >> > web/pgadmin/browser/static/js/collection.js | 16 +-
>> > >> > web/pgadmin/browser/static/js/keyboard.js | 14 +-
>> > >> > web/pgadmin/browser/static/js/menu.js | 28 +-
>> > >> > web/pgadmin/browser/static/js/node.js | 53 +-
>> > >> > web/pgadmin/browser/static/js/node.ui.js | 4 +-
>> > >> > web/pgadmin/browser/static/js/panel.js | 15 +-
>> > >> > web/pgadmin/browser/static/js/toolbar.js | 3 -
>> > >> > web/pgadmin/browser/static/js/wizard.js | 58 +-
>> > >> > web/pgadmin/browser/static/scss/_browser.scss | 43 +-
>> > >> > web/pgadmin/browser/static/scss/_wizard.scss | 41 +-
>> > >> > web/pgadmin/browser/templates/browser/css/node.css | 2 +-
>> > >> > web/pgadmin/browser/templates/browser/index.html | 9 +-
>> > >> > web/pgadmin/dashboard/__init__.py | 2 +-
>> > >> > web/pgadmin/dashboard/static/css/dashboard.css | 21 +-
>> > >> > web/pgadmin/dashboard/static/js/dashboard.js | 120 +-
>> > >> > web/pgadmin/dashboard/static/scss/_dashboard.scss | 44 +-
>> > >> > .../templates/dashboard/database_dashboard.html | 171 ++-
>> > >> > .../templates/dashboard/server_dashboard.html | 197 ++-
>> > >> > .../templates/dashboard/welcome_dashboard.html | 30 +-
>> > >> > web/pgadmin/feature_tests/browser_tool_bar_test.py | 23 +-
>> > >> > web/pgadmin/feature_tests/file_manager_test.py | 23 +-
>> > >> > .../feature_tests/keyboard_shortcut_test.py | 5 +-
>> > >> > .../feature_tests/pg_datatype_validation_test.py | 5 +-
>> > >> > .../pg_utilities_backup_restore_test.py | 28 +-
>> > >> > .../feature_tests/pg_utilities_maintenance_test.py | 16 +-
>> > >> > .../feature_tests/query_tool_journey_test.py | 5 +-
>> > >> > web/pgadmin/feature_tests/query_tool_tests.py | 117 +-
>> > >> > web/pgadmin/feature_tests/view_data_dml_queries.py | 16 +-
>> > >> > .../misc/bgprocess/static/css/bgprocess.css | 11 -
>> > >> > web/pgadmin/misc/bgprocess/static/js/bgprocess.js | 173 ++-
>> > >> > .../misc/bgprocess/static/scss/_bgprocess.scss | 81 +-
>> > >> > web/pgadmin/misc/depends/static/js/depends.js | 3 +-
>> > >> > .../misc/file_manager/static/css/file_manager.css | 141 +-
>> > >> > .../misc/file_manager/static/js/create_dialogue.js | 9 +-
>> > >> > .../misc/file_manager/static/js/select_dialogue.js | 19 +-
>> > >> > web/pgadmin/misc/file_manager/static/js/utility.js | 77 +-
>> > >> > .../file_manager/static/scss/_file_manager.scss | 157 +--
>> > >> > .../file_manager/templates/file_manager/index.html | 95 +-
>> > >> > .../misc/statistics/static/js/statistics.js | 3 +-
>> > >> > web/pgadmin/preferences/static/css/preferences.css | 14 -
>> > >> > web/pgadmin/preferences/static/js/preferences.js | 31 +-
>> > >> > .../preferences/static/scss/_preferences.scss | 16 +
>> > >> > web/pgadmin/static/css/pgadmin.css | 81 +-
>> > >> > web/pgadmin/static/fonts/Roboto-Bold.ttf | Bin 0 -> 170760 bytes
>> > >> > web/pgadmin/static/fonts/Roboto-Medium.ttf | Bin 0 -> 172064 bytes
>> > >> > web/pgadmin/static/fonts/Roboto-Regular.ttf | Bin 0 -> 171676 bytes
>> > >> > web/pgadmin/static/img/collapse_expand.svg | 15 +
>> > >> > web/pgadmin/static/img/forgot_password.svg | 283 ++++
>> > >> > web/pgadmin/static/img/login.svg | 1 +
>> > >> > web/pgadmin/static/js/alertify.pgadmin.defaults.js | 82 +-
>> > >> > web/pgadmin/static/js/backform.pgadmin.js | 80 +-
>> > >> > web/pgadmin/static/js/backgrid.pgadmin.js | 33 +-
>> > >> > web/pgadmin/static/js/slickgrid/editors.js | 8 +-
>> > >> > web/pgadmin/static/js/sqleditor/filter_dialog.js | 33 +-
>> > >> > .../static/js/sqleditor/query_tool_preferences.js | 15 +-
>> > >> > web/pgadmin/static/scss/_aci_tree.overrides.scss | 75 +-
>> > >> > web/pgadmin/static/scss/_alert.scss | 12 +-
>> > >> > web/pgadmin/static/scss/_alertify.overrides.scss | 150 +-
>> > >> > web/pgadmin/static/scss/_backform.overrides.scss | 8 +
>> > >> > web/pgadmin/static/scss/_backgrid.overrides.scss | 251 +++-
>> > >> > web/pgadmin/static/scss/_bootstrap.overrides.scss | 230 ++--
>> > >> > web/pgadmin/static/scss/_codemirror.overrides.scss | 94 +-
>> > >> > web/pgadmin/static/scss/_pgadmin.grid.scss | 56 +
>> > >> > web/pgadmin/static/scss/_pgadmin.style.scss | 1440 +++++---------------
>> > >> > web/pgadmin/static/scss/_select2.overrides.scss | 24 +-
>> > >> > web/pgadmin/static/scss/_webcabin.overrides.scss | 368 -----
>> > >> > web/pgadmin/static/scss/_webcabin.pgadmin.scss | 250 ++++
>> > >> > web/pgadmin/static/scss/pgadmin.scss | 10 +-
>> > >> > .../static/scss/resources/_default.style.scss | 90 +-
>> > >> > .../static/scss/resources/_default.variables.scss | 203 ++-
>> > >> > web/pgadmin/static/vendor/backform/backform.js | 645 +++++++++
>> > >> > .../templates/security/change_password.html | 43 +-
>> > >> > .../templates/security/forgot_password.html | 9 +-
>> > >> > web/pgadmin/templates/security/login_user.html | 16 +-
>> > >> > web/pgadmin/templates/security/panel.html | 23 +-
>> > >> > web/pgadmin/tools/backup/__init__.py | 6 +-
>> > >> > web/pgadmin/tools/backup/static/js/backup.js | 8 +-
>> > >> > .../backup/static/js/backup_dialog_wrapper.js | 22 +-
>> > >> > web/pgadmin/tools/datagrid/__init__.py | 1 -
>> > >> > web/pgadmin/tools/datagrid/static/js/datagrid.js | 38 +-
>> > >> > .../tools/datagrid/templates/datagrid/filter.html | 2 -
>> > >> > .../tools/datagrid/templates/datagrid/index.html | 193 ++-
>> > >> > web/pgadmin/tools/debugger/static/css/debugger.css | 34 +-
>> > >> > web/pgadmin/tools/debugger/static/js/debugger.js | 2 +-
>> > >> > .../tools/debugger/static/js/debugger_ui.js | 28 +-
>> > >> > web/pgadmin/tools/debugger/static/js/direct.js | 13 +-
>> > >> > .../tools/debugger/static/scss/_debugger.scss | 8 -
>> > >> > .../tools/debugger/templates/debugger/direct.html | 89 +-
>> > >> > .../tools/grant_wizard/static/js/grant_wizard.js | 27 +-
>> > >> > .../grant_wizard/static/scss/_grant_wizard.scss | 31 +-
>> > >> > .../tools/import_export/static/js/import_export.js | 24 +-
>> > >> > web/pgadmin/tools/maintenance/__init__.py | 10 +-
>> > >> > .../tools/maintenance/static/js/maintenance.js | 24 +-
>> > >> > .../maintenance/static/scss/_maintenance.scss | 2 +-
>> > >> > web/pgadmin/tools/restore/__init__.py | 14 +-
>> > >> > web/pgadmin/tools/restore/static/js/restore.js | 8 +-
>> > >> > .../restore/static/js/restore_dialog_wrapper.js | 24 +-
>> > >> > .../tools/sqleditor/static/css/sqleditor.css | 128 +-
>> > >> > web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 35 +-
>> > >> > .../tools/sqleditor/static/scss/_history.scss | 42 +-
>> > >> > .../tools/sqleditor/static/scss/_sqleditor.scss | 128 +-
>> > >> > .../user_management/static/css/user_management.css | 37 -
>> > >> > .../user_management/static/js/user_management.js | 53 +-
>> > >> > .../static/scss/_user_management.scss | 12 +-
>> > >> > .../javascript/alerts/alertify_wrapper_spec.js | 4 +-
>> > >> > .../backup/backup_dialog_wrapper_spec.js | 8 +-
>> > >> > .../restore/restore_dialog_wrapper_spec.js | 8 +-
>> > >> > web/webpack.config.js | 2 +-
>> > >> > web/webpack.shim.js | 2 +-
>> > >> > web/webpack.test.config.js | 1 +
>> > >> > web/yarn.lock | 1015 +++++++++++++-
>> > >> > 135 files changed, 5002 insertions(+), 3850 deletions(-)
>> > >> >
>> > >>
>> > >>
>> > >> --
>> > >> Dave Page
>> > >> Blog: http://pgsnake.blogspot.com
>> > >> Twitter: @pgsnake
>> > >>
>> > >> EnterpriseDB UK: http://www.enterprisedb.com
>> > >> The Enterprise PostgreSQL Company
>> > >
>> > >
>> > >
>> > > --
>> > > Thanks and Regards,
>> > > Aditya Toshniwal
>> > > Software Engineer | EnterpriseDB Software Solutions | Pune
>> > > "Don't Complain about Heat, Plant a tree"
>> >
>> >
>> >
>> > --
>> > Dave Page
>> > Blog: http://pgsnake.blogspot.com
>> > Twitter: @pgsnake
>> >
>> > EnterpriseDB UK: http://www.enterprisedb.com
>> > The Enterprise PostgreSQL Company
>>
>>
>>
>> --
>> Dave Page
>> Blog: http://pgsnake.blogspot.com
>> Twitter: @pgsnake
>>
>> EnterpriseDB UK: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>
>
>
> --
> Thanks and Regards,
> Aditya Toshniwal
> Software Engineer | EnterpriseDB Software Solutions | Pune
> "Don't Complain about Heat, Plant a tree"
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
@ 2018-12-21 14:13 ` Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Aditya Toshniwal @ 2018-12-21 14:13 UTC (permalink / raw)
To: Dave Page <[email protected]>; +Cc: Ashesh Vashi <[email protected]>; pgadmin-hackers <[email protected]>; Akshay Joshi <[email protected]>; Chethana Kumar <[email protected]>; Khushboo Vashi <[email protected]>
For the query tool results grid text pop-out, you mean the border size
around it ?
We don't have any design discussed for it, so could you please propose what
can be done.
On Fri, Dec 21, 2018 at 7:35 PM Dave Page <[email protected]> wrote:
> On Fri, Dec 21, 2018 at 2:02 PM Aditya Toshniwal
> <[email protected]> wrote:
> >
> >
> >
> > On Fri, Dec 21, 2018 at 7:29 PM Dave Page <[email protected]> wrote:
> >>
> >> One other issue: I'm seeing that standard sized dialogues (e.g. the
> >> Server or Database Properties dialogues) are wrapping their labels and
> >> controls at the default size. That should not be the case.
> >
> > Yep. Akshay has logged that in the sheet shared (
> https://drive.google.com/open?id=127BgrvdVUvWSEp-GnQvCDx1WaaemsycxSD0aUpWxb6k
> ).
>
> OK, but the answer isn't to increase the size of the dialogues as
> suggested. The size is fine (though we should review for consistency,
> and ensure we are using no more than 3 default standard sizes
> throughout the app); we should make the controls display nicely on the
> default dialogue size and wrap if the user makes it smaller than we
> can display in.
>
> >> On Fri, Dec 21, 2018 at 12:46 PM Dave Page <[email protected]> wrote:
> >> >
> >> > Hi
> >> >
> >> > On Fri, Dec 21, 2018 at 12:29 PM Aditya Toshniwal
> >> > <[email protected]> wrote:
> >> > >
> >> > > Hi Dave,
> >> > >
> >> > > On Fri, Dec 21, 2018 at 5:51 PM Dave Page <[email protected]>
> wrote:
> >> > >>
> >> > >> Nice! Thanks Ashesh.
> >> > >>
> >> > >> Some small issues I spotted:
> >> > >>
> >> > >> - The font looks somewhat small. How does it compare in size to,
> say,
> >> > >> Gmail? I think it needs to be increased to at least that size.
> >> > >
> >> > > Gmail uses 0.875rem (14px) for the left panel (Inbox, Sent). We are
> using 0.875rem (14px) for main navbar links and 0.815rem(13.04px) for all
> other text.
> >> >
> >> > Let's increase the default to 0.875, and make the main links
> >> > proportionally bigger.
> >> >
> >> > >> - Dialogues have 2 close buttons next to each other in the
> top-right.
> >> > >> Looks like an icon and a text version?
> >> > >
> >> > > You need to do a yarn install. wcDocker code is changed to fix that.
> >> >
> >> > Yup, that fixed it.
> >> >
> >> > >> - Why do some Preferences panels use alternate line colouring,
> whilst
> >> > >> others don't? I suspect it's because some are actually tables under
> >> > >> the hood? I think we need consistency there.
> >> > >
> >> > > Noted.
> >> > >>
> >> > >>
> >> > >> - The Maintenance dialogue looks terrible - it needs to be made
> much
> >> > >> more compact. I also seem to be getting a failure to create
> >> > >> maintenance jobs (backups etc work fine).
> >> > >
> >> > > Noted.
> >> > >>
> >> > >>
> >> > >> - I think the buttons on the Browser need borders to match other
> buttons.
> >> > >
> >> > > It is made consistent with other wcDocker buttons like close, right
> arrow, left arrow. However, we can make it look like other buttons.
> >> >
> >> > I think they're a different class of buttons - control/navigation vs.
> >> > function. I think we should make this change as the browser buttons
> >> > really are a toolbar just like the larger on on the query tool.
> >> >
> >> > Thanks!
> >> >
> >> > >> Thanks!
> >> > >>
> >> > >> On Fri, Dec 21, 2018 at 12:01 PM Ashesh Vashi
> >> > >> <[email protected]> wrote:
> >> > >> >
> >> > >> > Improvement in the look and feel of the whole application
> >> > >> >
> >> > >> > Changed the SCSS/CSS for the below third party libraries to
> adopt the
> >> > >> > new look 'n' feel:
> >> > >> > - wcDocker
> >> > >> > - Alertify dialogs, and notifications
> >> > >> > - AciTree
> >> > >> > - Bootstrap Navbar
> >> > >> > - Bootstrap Tabs
> >> > >> > - Bootstrap Drop-Down menu
> >> > >> > - Backgrid
> >> > >> > - Select2
> >> > >> >
> >> > >> > Adopated the new the look 'n' feel for the dialogs, wizard,
> properties,
> >> > >> > tab panels, tabs, fieldset, subnode control, spinner control,
> HTML
> >> > >> > table, and other form controls.
> >> > >> >
> >> > >> > - Font is changed to Roboto
> >> > >> > - Using SCSS variables to define the look 'n' feel
> >> > >> > - Designer background images for the Login, and Forget password
> pages in
> >> > >> > 'web' mode
> >> > >> > - Improved the look 'n' feel for the key selection in the
> preferences
> >> > >> > dialog
> >> > >> > - Table classes consistency changes across the application
> >> > >> > - File Open and Save dialog list view changes
> >> > >> >
> >> > >> > Author(s): Aditya Toshniwal & Khushboo Vashi
> >> > >> >
> >> > >> > Branch
> >> > >> > ------
> >> > >> > master
> >> > >> >
> >> > >> > Details
> >> > >> > -------
> >> > >> >
> https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5799ac14ba17dc25fbec184b3b2c6afbe37f...
> >> > >> >
> >> > >> > Modified Files
> >> > >> > --------------
> >> > >> > web/package.json | 2 +-
> >> > >> > .../static/js/fts_configuration.js | 2 +-
> >> > >> > .../databases/schemas/functions/__init__.py | 4 +-
> >> > >> > .../function => static}/css/function.css | 0
> >> > >> > .../templates/trigger_function/css/function.css | 3 -
> >> > >> > .../{templates/edbfunc => static}/css/edbfunc.css | 0
> >> > >> > .../static/js/exclusion_constraint.js | 18 +-
> >> > >> > .../foreign_key/static/js/foreign_key.js | 17 +-
> >> > >> > .../schemas/tables/rules/static/css/rule.css | 7 +
> >> > >> > .../tables/rules/templates/rules/css/rule.css | 8 -
> >> > >> > .../databases/schemas/views/static/css/view.css | 7 +
> >> > >> > .../schemas/views/templates/mview/css/mview.css | 4 -
> >> > >> > .../schemas/views/templates/view/css/view.css | 4 -
> >> > >> > .../pgagent/schedules/static/js/pga_schedule.js | 3 +-
> >> > >> > .../servers/pgagent/static/css/pga_job.css | 3 +
> >> > >> > .../pgagent/templates/pga_job/css/pga_job.css | 13 -
> >> > >> > .../server_groups/servers/static/css/servers.css | 4 +
> >> > >> > .../server_groups/servers/static/js/server.js | 22 +-
> >> > >> > .../server_groups/servers/static/js/variable.js | 4 +-
> >> > >> > .../servers/tablespaces/static/js/tablespace.js | 13 +-
> >> > >> > .../servers/templates/css/servers.css | 4 -
> >> > >> > web/pgadmin/browser/static/css/browser.css | 13 -
> >> > >> > web/pgadmin/browser/static/css/wizard.css | 21 +-
> >> > >> > web/pgadmin/browser/static/js/browser.js | 26 +-
> >> > >> > web/pgadmin/browser/static/js/collection.js | 16 +-
> >> > >> > web/pgadmin/browser/static/js/keyboard.js | 14 +-
> >> > >> > web/pgadmin/browser/static/js/menu.js | 28 +-
> >> > >> > web/pgadmin/browser/static/js/node.js | 53 +-
> >> > >> > web/pgadmin/browser/static/js/node.ui.js | 4 +-
> >> > >> > web/pgadmin/browser/static/js/panel.js | 15 +-
> >> > >> > web/pgadmin/browser/static/js/toolbar.js | 3 -
> >> > >> > web/pgadmin/browser/static/js/wizard.js | 58 +-
> >> > >> > web/pgadmin/browser/static/scss/_browser.scss | 43 +-
> >> > >> > web/pgadmin/browser/static/scss/_wizard.scss | 41 +-
> >> > >> > web/pgadmin/browser/templates/browser/css/node.css | 2 +-
> >> > >> > web/pgadmin/browser/templates/browser/index.html | 9 +-
> >> > >> > web/pgadmin/dashboard/__init__.py | 2 +-
> >> > >> > web/pgadmin/dashboard/static/css/dashboard.css | 21 +-
> >> > >> > web/pgadmin/dashboard/static/js/dashboard.js | 120 +-
> >> > >> > web/pgadmin/dashboard/static/scss/_dashboard.scss | 44 +-
> >> > >> > .../templates/dashboard/database_dashboard.html | 171 ++-
> >> > >> > .../templates/dashboard/server_dashboard.html | 197 ++-
> >> > >> > .../templates/dashboard/welcome_dashboard.html | 30 +-
> >> > >> > web/pgadmin/feature_tests/browser_tool_bar_test.py | 23 +-
> >> > >> > web/pgadmin/feature_tests/file_manager_test.py | 23 +-
> >> > >> > .../feature_tests/keyboard_shortcut_test.py | 5 +-
> >> > >> > .../feature_tests/pg_datatype_validation_test.py | 5 +-
> >> > >> > .../pg_utilities_backup_restore_test.py | 28 +-
> >> > >> > .../feature_tests/pg_utilities_maintenance_test.py | 16 +-
> >> > >> > .../feature_tests/query_tool_journey_test.py | 5 +-
> >> > >> > web/pgadmin/feature_tests/query_tool_tests.py | 117 +-
> >> > >> > web/pgadmin/feature_tests/view_data_dml_queries.py | 16 +-
> >> > >> > .../misc/bgprocess/static/css/bgprocess.css | 11 -
> >> > >> > web/pgadmin/misc/bgprocess/static/js/bgprocess.js | 173 ++-
> >> > >> > .../misc/bgprocess/static/scss/_bgprocess.scss | 81 +-
> >> > >> > web/pgadmin/misc/depends/static/js/depends.js | 3 +-
> >> > >> > .../misc/file_manager/static/css/file_manager.css | 141 +-
> >> > >> > .../misc/file_manager/static/js/create_dialogue.js | 9 +-
> >> > >> > .../misc/file_manager/static/js/select_dialogue.js | 19 +-
> >> > >> > web/pgadmin/misc/file_manager/static/js/utility.js | 77 +-
> >> > >> > .../file_manager/static/scss/_file_manager.scss | 157 +--
> >> > >> > .../file_manager/templates/file_manager/index.html | 95 +-
> >> > >> > .../misc/statistics/static/js/statistics.js | 3 +-
> >> > >> > web/pgadmin/preferences/static/css/preferences.css | 14 -
> >> > >> > web/pgadmin/preferences/static/js/preferences.js | 31 +-
> >> > >> > .../preferences/static/scss/_preferences.scss | 16 +
> >> > >> > web/pgadmin/static/css/pgadmin.css | 81 +-
> >> > >> > web/pgadmin/static/fonts/Roboto-Bold.ttf | Bin 0 ->
> 170760 bytes
> >> > >> > web/pgadmin/static/fonts/Roboto-Medium.ttf | Bin 0 ->
> 172064 bytes
> >> > >> > web/pgadmin/static/fonts/Roboto-Regular.ttf | Bin 0 ->
> 171676 bytes
> >> > >> > web/pgadmin/static/img/collapse_expand.svg | 15 +
> >> > >> > web/pgadmin/static/img/forgot_password.svg | 283 ++++
> >> > >> > web/pgadmin/static/img/login.svg | 1 +
> >> > >> > web/pgadmin/static/js/alertify.pgadmin.defaults.js | 82 +-
> >> > >> > web/pgadmin/static/js/backform.pgadmin.js | 80 +-
> >> > >> > web/pgadmin/static/js/backgrid.pgadmin.js | 33 +-
> >> > >> > web/pgadmin/static/js/slickgrid/editors.js | 8 +-
> >> > >> > web/pgadmin/static/js/sqleditor/filter_dialog.js | 33 +-
> >> > >> > .../static/js/sqleditor/query_tool_preferences.js | 15 +-
> >> > >> > web/pgadmin/static/scss/_aci_tree.overrides.scss | 75 +-
> >> > >> > web/pgadmin/static/scss/_alert.scss | 12 +-
> >> > >> > web/pgadmin/static/scss/_alertify.overrides.scss | 150 +-
> >> > >> > web/pgadmin/static/scss/_backform.overrides.scss | 8 +
> >> > >> > web/pgadmin/static/scss/_backgrid.overrides.scss | 251 +++-
> >> > >> > web/pgadmin/static/scss/_bootstrap.overrides.scss | 230 ++--
> >> > >> > web/pgadmin/static/scss/_codemirror.overrides.scss | 94 +-
> >> > >> > web/pgadmin/static/scss/_pgadmin.grid.scss | 56 +
> >> > >> > web/pgadmin/static/scss/_pgadmin.style.scss | 1440
> +++++---------------
> >> > >> > web/pgadmin/static/scss/_select2.overrides.scss | 24 +-
> >> > >> > web/pgadmin/static/scss/_webcabin.overrides.scss | 368 -----
> >> > >> > web/pgadmin/static/scss/_webcabin.pgadmin.scss | 250 ++++
> >> > >> > web/pgadmin/static/scss/pgadmin.scss | 10 +-
> >> > >> > .../static/scss/resources/_default.style.scss | 90 +-
> >> > >> > .../static/scss/resources/_default.variables.scss | 203 ++-
> >> > >> > web/pgadmin/static/vendor/backform/backform.js | 645
> +++++++++
> >> > >> > .../templates/security/change_password.html | 43 +-
> >> > >> > .../templates/security/forgot_password.html | 9 +-
> >> > >> > web/pgadmin/templates/security/login_user.html | 16 +-
> >> > >> > web/pgadmin/templates/security/panel.html | 23 +-
> >> > >> > web/pgadmin/tools/backup/__init__.py | 6 +-
> >> > >> > web/pgadmin/tools/backup/static/js/backup.js | 8 +-
> >> > >> > .../backup/static/js/backup_dialog_wrapper.js | 22 +-
> >> > >> > web/pgadmin/tools/datagrid/__init__.py | 1 -
> >> > >> > web/pgadmin/tools/datagrid/static/js/datagrid.js | 38 +-
> >> > >> > .../tools/datagrid/templates/datagrid/filter.html | 2 -
> >> > >> > .../tools/datagrid/templates/datagrid/index.html | 193 ++-
> >> > >> > web/pgadmin/tools/debugger/static/css/debugger.css | 34 +-
> >> > >> > web/pgadmin/tools/debugger/static/js/debugger.js | 2 +-
> >> > >> > .../tools/debugger/static/js/debugger_ui.js | 28 +-
> >> > >> > web/pgadmin/tools/debugger/static/js/direct.js | 13 +-
> >> > >> > .../tools/debugger/static/scss/_debugger.scss | 8 -
> >> > >> > .../tools/debugger/templates/debugger/direct.html | 89 +-
> >> > >> > .../tools/grant_wizard/static/js/grant_wizard.js | 27 +-
> >> > >> > .../grant_wizard/static/scss/_grant_wizard.scss | 31 +-
> >> > >> > .../tools/import_export/static/js/import_export.js | 24 +-
> >> > >> > web/pgadmin/tools/maintenance/__init__.py | 10 +-
> >> > >> > .../tools/maintenance/static/js/maintenance.js | 24 +-
> >> > >> > .../maintenance/static/scss/_maintenance.scss | 2 +-
> >> > >> > web/pgadmin/tools/restore/__init__.py | 14 +-
> >> > >> > web/pgadmin/tools/restore/static/js/restore.js | 8 +-
> >> > >> > .../restore/static/js/restore_dialog_wrapper.js | 24 +-
> >> > >> > .../tools/sqleditor/static/css/sqleditor.css | 128 +-
> >> > >> > web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 35 +-
> >> > >> > .../tools/sqleditor/static/scss/_history.scss | 42 +-
> >> > >> > .../tools/sqleditor/static/scss/_sqleditor.scss | 128 +-
> >> > >> > .../user_management/static/css/user_management.css | 37 -
> >> > >> > .../user_management/static/js/user_management.js | 53 +-
> >> > >> > .../static/scss/_user_management.scss | 12 +-
> >> > >> > .../javascript/alerts/alertify_wrapper_spec.js | 4 +-
> >> > >> > .../backup/backup_dialog_wrapper_spec.js | 8 +-
> >> > >> > .../restore/restore_dialog_wrapper_spec.js | 8 +-
> >> > >> > web/webpack.config.js | 2 +-
> >> > >> > web/webpack.shim.js | 2 +-
> >> > >> > web/webpack.test.config.js | 1 +
> >> > >> > web/yarn.lock | 1015
> +++++++++++++-
> >> > >> > 135 files changed, 5002 insertions(+), 3850 deletions(-)
> >> > >> >
> >> > >>
> >> > >>
> >> > >> --
> >> > >> Dave Page
> >> > >> Blog: http://pgsnake.blogspot.com
> >> > >> Twitter: @pgsnake
> >> > >>
> >> > >> EnterpriseDB UK: http://www.enterprisedb.com
> >> > >> The Enterprise PostgreSQL Company
> >> > >
> >> > >
> >> > >
> >> > > --
> >> > > Thanks and Regards,
> >> > > Aditya Toshniwal
> >> > > Software Engineer | EnterpriseDB Software Solutions | Pune
> >> > > "Don't Complain about Heat, Plant a tree"
> >> >
> >> >
> >> >
> >> > --
> >> > Dave Page
> >> > Blog: http://pgsnake.blogspot.com
> >> > Twitter: @pgsnake
> >> >
> >> > EnterpriseDB UK: http://www.enterprisedb.com
> >> > The Enterprise PostgreSQL Company
> >>
> >>
> >>
> >> --
> >> Dave Page
> >> Blog: http://pgsnake.blogspot.com
> >> Twitter: @pgsnake
> >>
> >> EnterpriseDB UK: http://www.enterprisedb.com
> >> The Enterprise PostgreSQL Company
> >
> >
> >
> > --
> > Thanks and Regards,
> > Aditya Toshniwal
> > Software Engineer | EnterpriseDB Software Solutions | Pune
> > "Don't Complain about Heat, Plant a tree"
>
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
--
Thanks and Regards,
Aditya Toshniwal
Software Engineer | EnterpriseDB Software Solutions | Pune
"Don't Complain about Heat, Plant a tree"
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
@ 2018-12-21 14:16 ` Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Dave Page @ 2018-12-21 14:16 UTC (permalink / raw)
To: Aditya Toshniwal <[email protected]>; +Cc: Ashesh Vashi <[email protected]>; pgadmin-hackers <[email protected]>; Akshay Joshi <[email protected]>; Chethana Kumar <[email protected]>; Khushboo Vashi <[email protected]>
On Fri, Dec 21, 2018 at 2:14 PM Aditya Toshniwal
<[email protected]> wrote:
>
> For the query tool results grid text pop-out, you mean the border size around it ?
> We don't have any design discussed for it, so could you please propose what can be done.
Border, button colours etc. I can't draw anything, but I'd suggest
that the border should be squared not rounded, and the
thickness/shadow etc adjusted to match the other styling.
>
> On Fri, Dec 21, 2018 at 7:35 PM Dave Page <[email protected]> wrote:
>>
>> On Fri, Dec 21, 2018 at 2:02 PM Aditya Toshniwal
>> <[email protected]> wrote:
>> >
>> >
>> >
>> > On Fri, Dec 21, 2018 at 7:29 PM Dave Page <[email protected]> wrote:
>> >>
>> >> One other issue: I'm seeing that standard sized dialogues (e.g. the
>> >> Server or Database Properties dialogues) are wrapping their labels and
>> >> controls at the default size. That should not be the case.
>> >
>> > Yep. Akshay has logged that in the sheet shared (https://drive.google.com/open?id=127BgrvdVUvWSEp-GnQvCDx1WaaemsycxSD0aUpWxb6k).
>>
>> OK, but the answer isn't to increase the size of the dialogues as
>> suggested. The size is fine (though we should review for consistency,
>> and ensure we are using no more than 3 default standard sizes
>> throughout the app); we should make the controls display nicely on the
>> default dialogue size and wrap if the user makes it smaller than we
>> can display in.
>>
>> >> On Fri, Dec 21, 2018 at 12:46 PM Dave Page <[email protected]> wrote:
>> >> >
>> >> > Hi
>> >> >
>> >> > On Fri, Dec 21, 2018 at 12:29 PM Aditya Toshniwal
>> >> > <[email protected]> wrote:
>> >> > >
>> >> > > Hi Dave,
>> >> > >
>> >> > > On Fri, Dec 21, 2018 at 5:51 PM Dave Page <[email protected]> wrote:
>> >> > >>
>> >> > >> Nice! Thanks Ashesh.
>> >> > >>
>> >> > >> Some small issues I spotted:
>> >> > >>
>> >> > >> - The font looks somewhat small. How does it compare in size to, say,
>> >> > >> Gmail? I think it needs to be increased to at least that size.
>> >> > >
>> >> > > Gmail uses 0.875rem (14px) for the left panel (Inbox, Sent). We are using 0.875rem (14px) for main navbar links and 0.815rem(13.04px) for all other text.
>> >> >
>> >> > Let's increase the default to 0.875, and make the main links
>> >> > proportionally bigger.
>> >> >
>> >> > >> - Dialogues have 2 close buttons next to each other in the top-right.
>> >> > >> Looks like an icon and a text version?
>> >> > >
>> >> > > You need to do a yarn install. wcDocker code is changed to fix that.
>> >> >
>> >> > Yup, that fixed it.
>> >> >
>> >> > >> - Why do some Preferences panels use alternate line colouring, whilst
>> >> > >> others don't? I suspect it's because some are actually tables under
>> >> > >> the hood? I think we need consistency there.
>> >> > >
>> >> > > Noted.
>> >> > >>
>> >> > >>
>> >> > >> - The Maintenance dialogue looks terrible - it needs to be made much
>> >> > >> more compact. I also seem to be getting a failure to create
>> >> > >> maintenance jobs (backups etc work fine).
>> >> > >
>> >> > > Noted.
>> >> > >>
>> >> > >>
>> >> > >> - I think the buttons on the Browser need borders to match other buttons.
>> >> > >
>> >> > > It is made consistent with other wcDocker buttons like close, right arrow, left arrow. However, we can make it look like other buttons.
>> >> >
>> >> > I think they're a different class of buttons - control/navigation vs.
>> >> > function. I think we should make this change as the browser buttons
>> >> > really are a toolbar just like the larger on on the query tool.
>> >> >
>> >> > Thanks!
>> >> >
>> >> > >> Thanks!
>> >> > >>
>> >> > >> On Fri, Dec 21, 2018 at 12:01 PM Ashesh Vashi
>> >> > >> <[email protected]> wrote:
>> >> > >> >
>> >> > >> > Improvement in the look and feel of the whole application
>> >> > >> >
>> >> > >> > Changed the SCSS/CSS for the below third party libraries to adopt the
>> >> > >> > new look 'n' feel:
>> >> > >> > - wcDocker
>> >> > >> > - Alertify dialogs, and notifications
>> >> > >> > - AciTree
>> >> > >> > - Bootstrap Navbar
>> >> > >> > - Bootstrap Tabs
>> >> > >> > - Bootstrap Drop-Down menu
>> >> > >> > - Backgrid
>> >> > >> > - Select2
>> >> > >> >
>> >> > >> > Adopated the new the look 'n' feel for the dialogs, wizard, properties,
>> >> > >> > tab panels, tabs, fieldset, subnode control, spinner control, HTML
>> >> > >> > table, and other form controls.
>> >> > >> >
>> >> > >> > - Font is changed to Roboto
>> >> > >> > - Using SCSS variables to define the look 'n' feel
>> >> > >> > - Designer background images for the Login, and Forget password pages in
>> >> > >> > 'web' mode
>> >> > >> > - Improved the look 'n' feel for the key selection in the preferences
>> >> > >> > dialog
>> >> > >> > - Table classes consistency changes across the application
>> >> > >> > - File Open and Save dialog list view changes
>> >> > >> >
>> >> > >> > Author(s): Aditya Toshniwal & Khushboo Vashi
>> >> > >> >
>> >> > >> > Branch
>> >> > >> > ------
>> >> > >> > master
>> >> > >> >
>> >> > >> > Details
>> >> > >> > -------
>> >> > >> > https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5799ac14ba17dc25fbec184b3b2c6afbe37f...
>> >> > >> >
>> >> > >> > Modified Files
>> >> > >> > --------------
>> >> > >> > web/package.json | 2 +-
>> >> > >> > .../static/js/fts_configuration.js | 2 +-
>> >> > >> > .../databases/schemas/functions/__init__.py | 4 +-
>> >> > >> > .../function => static}/css/function.css | 0
>> >> > >> > .../templates/trigger_function/css/function.css | 3 -
>> >> > >> > .../{templates/edbfunc => static}/css/edbfunc.css | 0
>> >> > >> > .../static/js/exclusion_constraint.js | 18 +-
>> >> > >> > .../foreign_key/static/js/foreign_key.js | 17 +-
>> >> > >> > .../schemas/tables/rules/static/css/rule.css | 7 +
>> >> > >> > .../tables/rules/templates/rules/css/rule.css | 8 -
>> >> > >> > .../databases/schemas/views/static/css/view.css | 7 +
>> >> > >> > .../schemas/views/templates/mview/css/mview.css | 4 -
>> >> > >> > .../schemas/views/templates/view/css/view.css | 4 -
>> >> > >> > .../pgagent/schedules/static/js/pga_schedule.js | 3 +-
>> >> > >> > .../servers/pgagent/static/css/pga_job.css | 3 +
>> >> > >> > .../pgagent/templates/pga_job/css/pga_job.css | 13 -
>> >> > >> > .../server_groups/servers/static/css/servers.css | 4 +
>> >> > >> > .../server_groups/servers/static/js/server.js | 22 +-
>> >> > >> > .../server_groups/servers/static/js/variable.js | 4 +-
>> >> > >> > .../servers/tablespaces/static/js/tablespace.js | 13 +-
>> >> > >> > .../servers/templates/css/servers.css | 4 -
>> >> > >> > web/pgadmin/browser/static/css/browser.css | 13 -
>> >> > >> > web/pgadmin/browser/static/css/wizard.css | 21 +-
>> >> > >> > web/pgadmin/browser/static/js/browser.js | 26 +-
>> >> > >> > web/pgadmin/browser/static/js/collection.js | 16 +-
>> >> > >> > web/pgadmin/browser/static/js/keyboard.js | 14 +-
>> >> > >> > web/pgadmin/browser/static/js/menu.js | 28 +-
>> >> > >> > web/pgadmin/browser/static/js/node.js | 53 +-
>> >> > >> > web/pgadmin/browser/static/js/node.ui.js | 4 +-
>> >> > >> > web/pgadmin/browser/static/js/panel.js | 15 +-
>> >> > >> > web/pgadmin/browser/static/js/toolbar.js | 3 -
>> >> > >> > web/pgadmin/browser/static/js/wizard.js | 58 +-
>> >> > >> > web/pgadmin/browser/static/scss/_browser.scss | 43 +-
>> >> > >> > web/pgadmin/browser/static/scss/_wizard.scss | 41 +-
>> >> > >> > web/pgadmin/browser/templates/browser/css/node.css | 2 +-
>> >> > >> > web/pgadmin/browser/templates/browser/index.html | 9 +-
>> >> > >> > web/pgadmin/dashboard/__init__.py | 2 +-
>> >> > >> > web/pgadmin/dashboard/static/css/dashboard.css | 21 +-
>> >> > >> > web/pgadmin/dashboard/static/js/dashboard.js | 120 +-
>> >> > >> > web/pgadmin/dashboard/static/scss/_dashboard.scss | 44 +-
>> >> > >> > .../templates/dashboard/database_dashboard.html | 171 ++-
>> >> > >> > .../templates/dashboard/server_dashboard.html | 197 ++-
>> >> > >> > .../templates/dashboard/welcome_dashboard.html | 30 +-
>> >> > >> > web/pgadmin/feature_tests/browser_tool_bar_test.py | 23 +-
>> >> > >> > web/pgadmin/feature_tests/file_manager_test.py | 23 +-
>> >> > >> > .../feature_tests/keyboard_shortcut_test.py | 5 +-
>> >> > >> > .../feature_tests/pg_datatype_validation_test.py | 5 +-
>> >> > >> > .../pg_utilities_backup_restore_test.py | 28 +-
>> >> > >> > .../feature_tests/pg_utilities_maintenance_test.py | 16 +-
>> >> > >> > .../feature_tests/query_tool_journey_test.py | 5 +-
>> >> > >> > web/pgadmin/feature_tests/query_tool_tests.py | 117 +-
>> >> > >> > web/pgadmin/feature_tests/view_data_dml_queries.py | 16 +-
>> >> > >> > .../misc/bgprocess/static/css/bgprocess.css | 11 -
>> >> > >> > web/pgadmin/misc/bgprocess/static/js/bgprocess.js | 173 ++-
>> >> > >> > .../misc/bgprocess/static/scss/_bgprocess.scss | 81 +-
>> >> > >> > web/pgadmin/misc/depends/static/js/depends.js | 3 +-
>> >> > >> > .../misc/file_manager/static/css/file_manager.css | 141 +-
>> >> > >> > .../misc/file_manager/static/js/create_dialogue.js | 9 +-
>> >> > >> > .../misc/file_manager/static/js/select_dialogue.js | 19 +-
>> >> > >> > web/pgadmin/misc/file_manager/static/js/utility.js | 77 +-
>> >> > >> > .../file_manager/static/scss/_file_manager.scss | 157 +--
>> >> > >> > .../file_manager/templates/file_manager/index.html | 95 +-
>> >> > >> > .../misc/statistics/static/js/statistics.js | 3 +-
>> >> > >> > web/pgadmin/preferences/static/css/preferences.css | 14 -
>> >> > >> > web/pgadmin/preferences/static/js/preferences.js | 31 +-
>> >> > >> > .../preferences/static/scss/_preferences.scss | 16 +
>> >> > >> > web/pgadmin/static/css/pgadmin.css | 81 +-
>> >> > >> > web/pgadmin/static/fonts/Roboto-Bold.ttf | Bin 0 -> 170760 bytes
>> >> > >> > web/pgadmin/static/fonts/Roboto-Medium.ttf | Bin 0 -> 172064 bytes
>> >> > >> > web/pgadmin/static/fonts/Roboto-Regular.ttf | Bin 0 -> 171676 bytes
>> >> > >> > web/pgadmin/static/img/collapse_expand.svg | 15 +
>> >> > >> > web/pgadmin/static/img/forgot_password.svg | 283 ++++
>> >> > >> > web/pgadmin/static/img/login.svg | 1 +
>> >> > >> > web/pgadmin/static/js/alertify.pgadmin.defaults.js | 82 +-
>> >> > >> > web/pgadmin/static/js/backform.pgadmin.js | 80 +-
>> >> > >> > web/pgadmin/static/js/backgrid.pgadmin.js | 33 +-
>> >> > >> > web/pgadmin/static/js/slickgrid/editors.js | 8 +-
>> >> > >> > web/pgadmin/static/js/sqleditor/filter_dialog.js | 33 +-
>> >> > >> > .../static/js/sqleditor/query_tool_preferences.js | 15 +-
>> >> > >> > web/pgadmin/static/scss/_aci_tree.overrides.scss | 75 +-
>> >> > >> > web/pgadmin/static/scss/_alert.scss | 12 +-
>> >> > >> > web/pgadmin/static/scss/_alertify.overrides.scss | 150 +-
>> >> > >> > web/pgadmin/static/scss/_backform.overrides.scss | 8 +
>> >> > >> > web/pgadmin/static/scss/_backgrid.overrides.scss | 251 +++-
>> >> > >> > web/pgadmin/static/scss/_bootstrap.overrides.scss | 230 ++--
>> >> > >> > web/pgadmin/static/scss/_codemirror.overrides.scss | 94 +-
>> >> > >> > web/pgadmin/static/scss/_pgadmin.grid.scss | 56 +
>> >> > >> > web/pgadmin/static/scss/_pgadmin.style.scss | 1440 +++++---------------
>> >> > >> > web/pgadmin/static/scss/_select2.overrides.scss | 24 +-
>> >> > >> > web/pgadmin/static/scss/_webcabin.overrides.scss | 368 -----
>> >> > >> > web/pgadmin/static/scss/_webcabin.pgadmin.scss | 250 ++++
>> >> > >> > web/pgadmin/static/scss/pgadmin.scss | 10 +-
>> >> > >> > .../static/scss/resources/_default.style.scss | 90 +-
>> >> > >> > .../static/scss/resources/_default.variables.scss | 203 ++-
>> >> > >> > web/pgadmin/static/vendor/backform/backform.js | 645 +++++++++
>> >> > >> > .../templates/security/change_password.html | 43 +-
>> >> > >> > .../templates/security/forgot_password.html | 9 +-
>> >> > >> > web/pgadmin/templates/security/login_user.html | 16 +-
>> >> > >> > web/pgadmin/templates/security/panel.html | 23 +-
>> >> > >> > web/pgadmin/tools/backup/__init__.py | 6 +-
>> >> > >> > web/pgadmin/tools/backup/static/js/backup.js | 8 +-
>> >> > >> > .../backup/static/js/backup_dialog_wrapper.js | 22 +-
>> >> > >> > web/pgadmin/tools/datagrid/__init__.py | 1 -
>> >> > >> > web/pgadmin/tools/datagrid/static/js/datagrid.js | 38 +-
>> >> > >> > .../tools/datagrid/templates/datagrid/filter.html | 2 -
>> >> > >> > .../tools/datagrid/templates/datagrid/index.html | 193 ++-
>> >> > >> > web/pgadmin/tools/debugger/static/css/debugger.css | 34 +-
>> >> > >> > web/pgadmin/tools/debugger/static/js/debugger.js | 2 +-
>> >> > >> > .../tools/debugger/static/js/debugger_ui.js | 28 +-
>> >> > >> > web/pgadmin/tools/debugger/static/js/direct.js | 13 +-
>> >> > >> > .../tools/debugger/static/scss/_debugger.scss | 8 -
>> >> > >> > .../tools/debugger/templates/debugger/direct.html | 89 +-
>> >> > >> > .../tools/grant_wizard/static/js/grant_wizard.js | 27 +-
>> >> > >> > .../grant_wizard/static/scss/_grant_wizard.scss | 31 +-
>> >> > >> > .../tools/import_export/static/js/import_export.js | 24 +-
>> >> > >> > web/pgadmin/tools/maintenance/__init__.py | 10 +-
>> >> > >> > .../tools/maintenance/static/js/maintenance.js | 24 +-
>> >> > >> > .../maintenance/static/scss/_maintenance.scss | 2 +-
>> >> > >> > web/pgadmin/tools/restore/__init__.py | 14 +-
>> >> > >> > web/pgadmin/tools/restore/static/js/restore.js | 8 +-
>> >> > >> > .../restore/static/js/restore_dialog_wrapper.js | 24 +-
>> >> > >> > .../tools/sqleditor/static/css/sqleditor.css | 128 +-
>> >> > >> > web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 35 +-
>> >> > >> > .../tools/sqleditor/static/scss/_history.scss | 42 +-
>> >> > >> > .../tools/sqleditor/static/scss/_sqleditor.scss | 128 +-
>> >> > >> > .../user_management/static/css/user_management.css | 37 -
>> >> > >> > .../user_management/static/js/user_management.js | 53 +-
>> >> > >> > .../static/scss/_user_management.scss | 12 +-
>> >> > >> > .../javascript/alerts/alertify_wrapper_spec.js | 4 +-
>> >> > >> > .../backup/backup_dialog_wrapper_spec.js | 8 +-
>> >> > >> > .../restore/restore_dialog_wrapper_spec.js | 8 +-
>> >> > >> > web/webpack.config.js | 2 +-
>> >> > >> > web/webpack.shim.js | 2 +-
>> >> > >> > web/webpack.test.config.js | 1 +
>> >> > >> > web/yarn.lock | 1015 +++++++++++++-
>> >> > >> > 135 files changed, 5002 insertions(+), 3850 deletions(-)
>> >> > >> >
>> >> > >>
>> >> > >>
>> >> > >> --
>> >> > >> Dave Page
>> >> > >> Blog: http://pgsnake.blogspot.com
>> >> > >> Twitter: @pgsnake
>> >> > >>
>> >> > >> EnterpriseDB UK: http://www.enterprisedb.com
>> >> > >> The Enterprise PostgreSQL Company
>> >> > >
>> >> > >
>> >> > >
>> >> > > --
>> >> > > Thanks and Regards,
>> >> > > Aditya Toshniwal
>> >> > > Software Engineer | EnterpriseDB Software Solutions | Pune
>> >> > > "Don't Complain about Heat, Plant a tree"
>> >> >
>> >> >
>> >> >
>> >> > --
>> >> > Dave Page
>> >> > Blog: http://pgsnake.blogspot.com
>> >> > Twitter: @pgsnake
>> >> >
>> >> > EnterpriseDB UK: http://www.enterprisedb.com
>> >> > The Enterprise PostgreSQL Company
>> >>
>> >>
>> >>
>> >> --
>> >> Dave Page
>> >> Blog: http://pgsnake.blogspot.com
>> >> Twitter: @pgsnake
>> >>
>> >> EnterpriseDB UK: http://www.enterprisedb.com
>> >> The Enterprise PostgreSQL Company
>> >
>> >
>> >
>> > --
>> > Thanks and Regards,
>> > Aditya Toshniwal
>> > Software Engineer | EnterpriseDB Software Solutions | Pune
>> > "Don't Complain about Heat, Plant a tree"
>>
>>
>>
>> --
>> Dave Page
>> Blog: http://pgsnake.blogspot.com
>> Twitter: @pgsnake
>>
>> EnterpriseDB UK: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>
>
>
> --
> Thanks and Regards,
> Aditya Toshniwal
> Software Engineer | EnterpriseDB Software Solutions | Pune
> "Don't Complain about Heat, Plant a tree"
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
@ 2018-12-21 14:18 ` Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Aditya Toshniwal @ 2018-12-21 14:18 UTC (permalink / raw)
To: Dave Page <[email protected]>; +Cc: Ashesh Vashi <[email protected]>; pgadmin-hackers <[email protected]>; Akshay Joshi <[email protected]>; Chethana Kumar <[email protected]>; Khushboo Vashi <[email protected]>
On Fri, Dec 21, 2018 at 7:46 PM Dave Page <[email protected]> wrote:
> On Fri, Dec 21, 2018 at 2:14 PM Aditya Toshniwal
> <[email protected]> wrote:
> >
> > For the query tool results grid text pop-out, you mean the border size
> around it ?
> > We don't have any design discussed for it, so could you please propose
> what can be done.
>
> Border, button colours etc. I can't draw anything, but I'd suggest
> that the border should be squared not rounded, and the
> thickness/shadow etc adjusted to match the other styling.
>
Cool.
Button colors are already changed. Others things noted. Will work on it.
> >
> > On Fri, Dec 21, 2018 at 7:35 PM Dave Page <[email protected]> wrote:
> >>
> >> On Fri, Dec 21, 2018 at 2:02 PM Aditya Toshniwal
> >> <[email protected]> wrote:
> >> >
> >> >
> >> >
> >> > On Fri, Dec 21, 2018 at 7:29 PM Dave Page <[email protected]> wrote:
> >> >>
> >> >> One other issue: I'm seeing that standard sized dialogues (e.g. the
> >> >> Server or Database Properties dialogues) are wrapping their labels
> and
> >> >> controls at the default size. That should not be the case.
> >> >
> >> > Yep. Akshay has logged that in the sheet shared (
> https://drive.google.com/open?id=127BgrvdVUvWSEp-GnQvCDx1WaaemsycxSD0aUpWxb6k
> ).
> >>
> >> OK, but the answer isn't to increase the size of the dialogues as
> >> suggested. The size is fine (though we should review for consistency,
> >> and ensure we are using no more than 3 default standard sizes
> >> throughout the app); we should make the controls display nicely on the
> >> default dialogue size and wrap if the user makes it smaller than we
> >> can display in.
> >>
> >> >> On Fri, Dec 21, 2018 at 12:46 PM Dave Page <[email protected]>
> wrote:
> >> >> >
> >> >> > Hi
> >> >> >
> >> >> > On Fri, Dec 21, 2018 at 12:29 PM Aditya Toshniwal
> >> >> > <[email protected]> wrote:
> >> >> > >
> >> >> > > Hi Dave,
> >> >> > >
> >> >> > > On Fri, Dec 21, 2018 at 5:51 PM Dave Page <[email protected]>
> wrote:
> >> >> > >>
> >> >> > >> Nice! Thanks Ashesh.
> >> >> > >>
> >> >> > >> Some small issues I spotted:
> >> >> > >>
> >> >> > >> - The font looks somewhat small. How does it compare in size
> to, say,
> >> >> > >> Gmail? I think it needs to be increased to at least that size.
> >> >> > >
> >> >> > > Gmail uses 0.875rem (14px) for the left panel (Inbox, Sent). We
> are using 0.875rem (14px) for main navbar links and 0.815rem(13.04px) for
> all other text.
> >> >> >
> >> >> > Let's increase the default to 0.875, and make the main links
> >> >> > proportionally bigger.
> >> >> >
> >> >> > >> - Dialogues have 2 close buttons next to each other in the
> top-right.
> >> >> > >> Looks like an icon and a text version?
> >> >> > >
> >> >> > > You need to do a yarn install. wcDocker code is changed to fix
> that.
> >> >> >
> >> >> > Yup, that fixed it.
> >> >> >
> >> >> > >> - Why do some Preferences panels use alternate line colouring,
> whilst
> >> >> > >> others don't? I suspect it's because some are actually tables
> under
> >> >> > >> the hood? I think we need consistency there.
> >> >> > >
> >> >> > > Noted.
> >> >> > >>
> >> >> > >>
> >> >> > >> - The Maintenance dialogue looks terrible - it needs to be made
> much
> >> >> > >> more compact. I also seem to be getting a failure to create
> >> >> > >> maintenance jobs (backups etc work fine).
> >> >> > >
> >> >> > > Noted.
> >> >> > >>
> >> >> > >>
> >> >> > >> - I think the buttons on the Browser need borders to match
> other buttons.
> >> >> > >
> >> >> > > It is made consistent with other wcDocker buttons like close,
> right arrow, left arrow. However, we can make it look like other buttons.
> >> >> >
> >> >> > I think they're a different class of buttons - control/navigation
> vs.
> >> >> > function. I think we should make this change as the browser buttons
> >> >> > really are a toolbar just like the larger on on the query tool.
> >> >> >
> >> >> > Thanks!
> >> >> >
> >> >> > >> Thanks!
> >> >> > >>
> >> >> > >> On Fri, Dec 21, 2018 at 12:01 PM Ashesh Vashi
> >> >> > >> <[email protected]> wrote:
> >> >> > >> >
> >> >> > >> > Improvement in the look and feel of the whole application
> >> >> > >> >
> >> >> > >> > Changed the SCSS/CSS for the below third party libraries to
> adopt the
> >> >> > >> > new look 'n' feel:
> >> >> > >> > - wcDocker
> >> >> > >> > - Alertify dialogs, and notifications
> >> >> > >> > - AciTree
> >> >> > >> > - Bootstrap Navbar
> >> >> > >> > - Bootstrap Tabs
> >> >> > >> > - Bootstrap Drop-Down menu
> >> >> > >> > - Backgrid
> >> >> > >> > - Select2
> >> >> > >> >
> >> >> > >> > Adopated the new the look 'n' feel for the dialogs, wizard,
> properties,
> >> >> > >> > tab panels, tabs, fieldset, subnode control, spinner control,
> HTML
> >> >> > >> > table, and other form controls.
> >> >> > >> >
> >> >> > >> > - Font is changed to Roboto
> >> >> > >> > - Using SCSS variables to define the look 'n' feel
> >> >> > >> > - Designer background images for the Login, and Forget
> password pages in
> >> >> > >> > 'web' mode
> >> >> > >> > - Improved the look 'n' feel for the key selection in the
> preferences
> >> >> > >> > dialog
> >> >> > >> > - Table classes consistency changes across the application
> >> >> > >> > - File Open and Save dialog list view changes
> >> >> > >> >
> >> >> > >> > Author(s): Aditya Toshniwal & Khushboo Vashi
> >> >> > >> >
> >> >> > >> > Branch
> >> >> > >> > ------
> >> >> > >> > master
> >> >> > >> >
> >> >> > >> > Details
> >> >> > >> > -------
> >> >> > >> >
> https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5799ac14ba17dc25fbec184b3b2c6afbe37f...
> >> >> > >> >
> >> >> > >> > Modified Files
> >> >> > >> > --------------
> >> >> > >> > web/package.json | 2 +-
> >> >> > >> > .../static/js/fts_configuration.js | 2 +-
> >> >> > >> > .../databases/schemas/functions/__init__.py | 4 +-
> >> >> > >> > .../function => static}/css/function.css | 0
> >> >> > >> > .../templates/trigger_function/css/function.css | 3 -
> >> >> > >> > .../{templates/edbfunc => static}/css/edbfunc.css | 0
> >> >> > >> > .../static/js/exclusion_constraint.js | 18 +-
> >> >> > >> > .../foreign_key/static/js/foreign_key.js | 17 +-
> >> >> > >> > .../schemas/tables/rules/static/css/rule.css | 7 +
> >> >> > >> > .../tables/rules/templates/rules/css/rule.css | 8 -
> >> >> > >> > .../databases/schemas/views/static/css/view.css | 7 +
> >> >> > >> > .../schemas/views/templates/mview/css/mview.css | 4 -
> >> >> > >> > .../schemas/views/templates/view/css/view.css | 4 -
> >> >> > >> > .../pgagent/schedules/static/js/pga_schedule.js | 3 +-
> >> >> > >> > .../servers/pgagent/static/css/pga_job.css | 3 +
> >> >> > >> > .../pgagent/templates/pga_job/css/pga_job.css | 13 -
> >> >> > >> > .../server_groups/servers/static/css/servers.css | 4 +
> >> >> > >> > .../server_groups/servers/static/js/server.js | 22 +-
> >> >> > >> > .../server_groups/servers/static/js/variable.js | 4 +-
> >> >> > >> > .../servers/tablespaces/static/js/tablespace.js | 13 +-
> >> >> > >> > .../servers/templates/css/servers.css | 4 -
> >> >> > >> > web/pgadmin/browser/static/css/browser.css | 13 -
> >> >> > >> > web/pgadmin/browser/static/css/wizard.css | 21 +-
> >> >> > >> > web/pgadmin/browser/static/js/browser.js | 26 +-
> >> >> > >> > web/pgadmin/browser/static/js/collection.js | 16 +-
> >> >> > >> > web/pgadmin/browser/static/js/keyboard.js | 14 +-
> >> >> > >> > web/pgadmin/browser/static/js/menu.js | 28 +-
> >> >> > >> > web/pgadmin/browser/static/js/node.js | 53 +-
> >> >> > >> > web/pgadmin/browser/static/js/node.ui.js | 4 +-
> >> >> > >> > web/pgadmin/browser/static/js/panel.js | 15 +-
> >> >> > >> > web/pgadmin/browser/static/js/toolbar.js | 3 -
> >> >> > >> > web/pgadmin/browser/static/js/wizard.js | 58 +-
> >> >> > >> > web/pgadmin/browser/static/scss/_browser.scss | 43 +-
> >> >> > >> > web/pgadmin/browser/static/scss/_wizard.scss | 41 +-
> >> >> > >> > web/pgadmin/browser/templates/browser/css/node.css | 2 +-
> >> >> > >> > web/pgadmin/browser/templates/browser/index.html | 9 +-
> >> >> > >> > web/pgadmin/dashboard/__init__.py | 2 +-
> >> >> > >> > web/pgadmin/dashboard/static/css/dashboard.css | 21 +-
> >> >> > >> > web/pgadmin/dashboard/static/js/dashboard.js | 120 +-
> >> >> > >> > web/pgadmin/dashboard/static/scss/_dashboard.scss | 44 +-
> >> >> > >> > .../templates/dashboard/database_dashboard.html | 171 ++-
> >> >> > >> > .../templates/dashboard/server_dashboard.html | 197 ++-
> >> >> > >> > .../templates/dashboard/welcome_dashboard.html | 30 +-
> >> >> > >> > web/pgadmin/feature_tests/browser_tool_bar_test.py | 23 +-
> >> >> > >> > web/pgadmin/feature_tests/file_manager_test.py | 23 +-
> >> >> > >> > .../feature_tests/keyboard_shortcut_test.py | 5 +-
> >> >> > >> > .../feature_tests/pg_datatype_validation_test.py | 5 +-
> >> >> > >> > .../pg_utilities_backup_restore_test.py | 28 +-
> >> >> > >> > .../feature_tests/pg_utilities_maintenance_test.py | 16 +-
> >> >> > >> > .../feature_tests/query_tool_journey_test.py | 5 +-
> >> >> > >> > web/pgadmin/feature_tests/query_tool_tests.py | 117 +-
> >> >> > >> > web/pgadmin/feature_tests/view_data_dml_queries.py | 16 +-
> >> >> > >> > .../misc/bgprocess/static/css/bgprocess.css | 11 -
> >> >> > >> > web/pgadmin/misc/bgprocess/static/js/bgprocess.js | 173 ++-
> >> >> > >> > .../misc/bgprocess/static/scss/_bgprocess.scss | 81 +-
> >> >> > >> > web/pgadmin/misc/depends/static/js/depends.js | 3 +-
> >> >> > >> > .../misc/file_manager/static/css/file_manager.css | 141 +-
> >> >> > >> > .../misc/file_manager/static/js/create_dialogue.js | 9 +-
> >> >> > >> > .../misc/file_manager/static/js/select_dialogue.js | 19 +-
> >> >> > >> > web/pgadmin/misc/file_manager/static/js/utility.js | 77 +-
> >> >> > >> > .../file_manager/static/scss/_file_manager.scss | 157 +--
> >> >> > >> > .../file_manager/templates/file_manager/index.html | 95 +-
> >> >> > >> > .../misc/statistics/static/js/statistics.js | 3 +-
> >> >> > >> > web/pgadmin/preferences/static/css/preferences.css | 14 -
> >> >> > >> > web/pgadmin/preferences/static/js/preferences.js | 31 +-
> >> >> > >> > .../preferences/static/scss/_preferences.scss | 16 +
> >> >> > >> > web/pgadmin/static/css/pgadmin.css | 81 +-
> >> >> > >> > web/pgadmin/static/fonts/Roboto-Bold.ttf | Bin 0
> -> 170760 bytes
> >> >> > >> > web/pgadmin/static/fonts/Roboto-Medium.ttf | Bin 0
> -> 172064 bytes
> >> >> > >> > web/pgadmin/static/fonts/Roboto-Regular.ttf | Bin 0
> -> 171676 bytes
> >> >> > >> > web/pgadmin/static/img/collapse_expand.svg | 15 +
> >> >> > >> > web/pgadmin/static/img/forgot_password.svg | 283 ++++
> >> >> > >> > web/pgadmin/static/img/login.svg | 1 +
> >> >> > >> > web/pgadmin/static/js/alertify.pgadmin.defaults.js | 82 +-
> >> >> > >> > web/pgadmin/static/js/backform.pgadmin.js | 80 +-
> >> >> > >> > web/pgadmin/static/js/backgrid.pgadmin.js | 33 +-
> >> >> > >> > web/pgadmin/static/js/slickgrid/editors.js | 8 +-
> >> >> > >> > web/pgadmin/static/js/sqleditor/filter_dialog.js | 33 +-
> >> >> > >> > .../static/js/sqleditor/query_tool_preferences.js | 15 +-
> >> >> > >> > web/pgadmin/static/scss/_aci_tree.overrides.scss | 75 +-
> >> >> > >> > web/pgadmin/static/scss/_alert.scss | 12 +-
> >> >> > >> > web/pgadmin/static/scss/_alertify.overrides.scss | 150 +-
> >> >> > >> > web/pgadmin/static/scss/_backform.overrides.scss | 8 +
> >> >> > >> > web/pgadmin/static/scss/_backgrid.overrides.scss | 251 +++-
> >> >> > >> > web/pgadmin/static/scss/_bootstrap.overrides.scss | 230 ++--
> >> >> > >> > web/pgadmin/static/scss/_codemirror.overrides.scss | 94 +-
> >> >> > >> > web/pgadmin/static/scss/_pgadmin.grid.scss | 56 +
> >> >> > >> > web/pgadmin/static/scss/_pgadmin.style.scss | 1440
> +++++---------------
> >> >> > >> > web/pgadmin/static/scss/_select2.overrides.scss | 24 +-
> >> >> > >> > web/pgadmin/static/scss/_webcabin.overrides.scss | 368
> -----
> >> >> > >> > web/pgadmin/static/scss/_webcabin.pgadmin.scss | 250 ++++
> >> >> > >> > web/pgadmin/static/scss/pgadmin.scss | 10 +-
> >> >> > >> > .../static/scss/resources/_default.style.scss | 90 +-
> >> >> > >> > .../static/scss/resources/_default.variables.scss | 203 ++-
> >> >> > >> > web/pgadmin/static/vendor/backform/backform.js | 645
> +++++++++
> >> >> > >> > .../templates/security/change_password.html | 43 +-
> >> >> > >> > .../templates/security/forgot_password.html | 9 +-
> >> >> > >> > web/pgadmin/templates/security/login_user.html | 16 +-
> >> >> > >> > web/pgadmin/templates/security/panel.html | 23 +-
> >> >> > >> > web/pgadmin/tools/backup/__init__.py | 6 +-
> >> >> > >> > web/pgadmin/tools/backup/static/js/backup.js | 8 +-
> >> >> > >> > .../backup/static/js/backup_dialog_wrapper.js | 22 +-
> >> >> > >> > web/pgadmin/tools/datagrid/__init__.py | 1 -
> >> >> > >> > web/pgadmin/tools/datagrid/static/js/datagrid.js | 38 +-
> >> >> > >> > .../tools/datagrid/templates/datagrid/filter.html | 2 -
> >> >> > >> > .../tools/datagrid/templates/datagrid/index.html | 193 ++-
> >> >> > >> > web/pgadmin/tools/debugger/static/css/debugger.css | 34 +-
> >> >> > >> > web/pgadmin/tools/debugger/static/js/debugger.js | 2 +-
> >> >> > >> > .../tools/debugger/static/js/debugger_ui.js | 28 +-
> >> >> > >> > web/pgadmin/tools/debugger/static/js/direct.js | 13 +-
> >> >> > >> > .../tools/debugger/static/scss/_debugger.scss | 8 -
> >> >> > >> > .../tools/debugger/templates/debugger/direct.html | 89 +-
> >> >> > >> > .../tools/grant_wizard/static/js/grant_wizard.js | 27 +-
> >> >> > >> > .../grant_wizard/static/scss/_grant_wizard.scss | 31 +-
> >> >> > >> > .../tools/import_export/static/js/import_export.js | 24 +-
> >> >> > >> > web/pgadmin/tools/maintenance/__init__.py | 10 +-
> >> >> > >> > .../tools/maintenance/static/js/maintenance.js | 24 +-
> >> >> > >> > .../maintenance/static/scss/_maintenance.scss | 2 +-
> >> >> > >> > web/pgadmin/tools/restore/__init__.py | 14 +-
> >> >> > >> > web/pgadmin/tools/restore/static/js/restore.js | 8 +-
> >> >> > >> > .../restore/static/js/restore_dialog_wrapper.js | 24 +-
> >> >> > >> > .../tools/sqleditor/static/css/sqleditor.css | 128 +-
> >> >> > >> > web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 35 +-
> >> >> > >> > .../tools/sqleditor/static/scss/_history.scss | 42 +-
> >> >> > >> > .../tools/sqleditor/static/scss/_sqleditor.scss | 128 +-
> >> >> > >> > .../user_management/static/css/user_management.css | 37 -
> >> >> > >> > .../user_management/static/js/user_management.js | 53 +-
> >> >> > >> > .../static/scss/_user_management.scss | 12 +-
> >> >> > >> > .../javascript/alerts/alertify_wrapper_spec.js | 4 +-
> >> >> > >> > .../backup/backup_dialog_wrapper_spec.js | 8 +-
> >> >> > >> > .../restore/restore_dialog_wrapper_spec.js | 8 +-
> >> >> > >> > web/webpack.config.js | 2 +-
> >> >> > >> > web/webpack.shim.js | 2 +-
> >> >> > >> > web/webpack.test.config.js | 1 +
> >> >> > >> > web/yarn.lock | 1015
> +++++++++++++-
> >> >> > >> > 135 files changed, 5002 insertions(+), 3850 deletions(-)
> >> >> > >> >
> >> >> > >>
> >> >> > >>
> >> >> > >> --
> >> >> > >> Dave Page
> >> >> > >> Blog: http://pgsnake.blogspot.com
> >> >> > >> Twitter: @pgsnake
> >> >> > >>
> >> >> > >> EnterpriseDB UK: http://www.enterprisedb.com
> >> >> > >> The Enterprise PostgreSQL Company
> >> >> > >
> >> >> > >
> >> >> > >
> >> >> > > --
> >> >> > > Thanks and Regards,
> >> >> > > Aditya Toshniwal
> >> >> > > Software Engineer | EnterpriseDB Software Solutions | Pune
> >> >> > > "Don't Complain about Heat, Plant a tree"
> >> >> >
> >> >> >
> >> >> >
> >> >> > --
> >> >> > Dave Page
> >> >> > Blog: http://pgsnake.blogspot.com
> >> >> > Twitter: @pgsnake
> >> >> >
> >> >> > EnterpriseDB UK: http://www.enterprisedb.com
> >> >> > The Enterprise PostgreSQL Company
> >> >>
> >> >>
> >> >>
> >> >> --
> >> >> Dave Page
> >> >> Blog: http://pgsnake.blogspot.com
> >> >> Twitter: @pgsnake
> >> >>
> >> >> EnterpriseDB UK: http://www.enterprisedb.com
> >> >> The Enterprise PostgreSQL Company
> >> >
> >> >
> >> >
> >> > --
> >> > Thanks and Regards,
> >> > Aditya Toshniwal
> >> > Software Engineer | EnterpriseDB Software Solutions | Pune
> >> > "Don't Complain about Heat, Plant a tree"
> >>
> >>
> >>
> >> --
> >> Dave Page
> >> Blog: http://pgsnake.blogspot.com
> >> Twitter: @pgsnake
> >>
> >> EnterpriseDB UK: http://www.enterprisedb.com
> >> The Enterprise PostgreSQL Company
> >
> >
> >
> > --
> > Thanks and Regards,
> > Aditya Toshniwal
> > Software Engineer | EnterpriseDB Software Solutions | Pune
> > "Don't Complain about Heat, Plant a tree"
>
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
--
Thanks and Regards,
Aditya Toshniwal
Software Engineer | EnterpriseDB Software Solutions | Pune
"Don't Complain about Heat, Plant a tree"
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
@ 2019-01-01 05:39 ` Aditya Toshniwal <[email protected]>
2019-01-02 05:52 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Aditya Toshniwal @ 2019-01-01 05:39 UTC (permalink / raw)
To: pgadmin-hackers <[email protected]>
Hi Hackers,
Attached is the patch to improve the previously committed new design
changes.
The patch includes:
- 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)
- Other improvements wherever noticed.
I hope this covers majority of the issues.
Kindly review.
On Fri, Dec 21, 2018 at 7:48 PM Aditya Toshniwal <
[email protected]> wrote:
>
>
> On Fri, Dec 21, 2018 at 7:46 PM Dave Page <[email protected]> wrote:
>
>> On Fri, Dec 21, 2018 at 2:14 PM Aditya Toshniwal
>> <[email protected]> wrote:
>> >
>> > For the query tool results grid text pop-out, you mean the border size
>> around it ?
>> > We don't have any design discussed for it, so could you please propose
>> what can be done.
>>
>> Border, button colours etc. I can't draw anything, but I'd suggest
>> that the border should be squared not rounded, and the
>> thickness/shadow etc adjusted to match the other styling.
>>
> Cool.
> Button colors are already changed. Others things noted. Will work on it.
>
>> >
>> > On Fri, Dec 21, 2018 at 7:35 PM Dave Page <[email protected]> wrote:
>> >>
>> >> On Fri, Dec 21, 2018 at 2:02 PM Aditya Toshniwal
>> >> <[email protected]> wrote:
>> >> >
>> >> >
>> >> >
>> >> > On Fri, Dec 21, 2018 at 7:29 PM Dave Page <[email protected]> wrote:
>> >> >>
>> >> >> One other issue: I'm seeing that standard sized dialogues (e.g. the
>> >> >> Server or Database Properties dialogues) are wrapping their labels
>> and
>> >> >> controls at the default size. That should not be the case.
>> >> >
>> >> > Yep. Akshay has logged that in the sheet shared (
>> https://drive.google.com/open?id=127BgrvdVUvWSEp-GnQvCDx1WaaemsycxSD0aUpWxb6k
>> ).
>> >>
>> >> OK, but the answer isn't to increase the size of the dialogues as
>> >> suggested. The size is fine (though we should review for consistency,
>> >> and ensure we are using no more than 3 default standard sizes
>> >> throughout the app); we should make the controls display nicely on the
>> >> default dialogue size and wrap if the user makes it smaller than we
>> >> can display in.
>> >>
>> >> >> On Fri, Dec 21, 2018 at 12:46 PM Dave Page <[email protected]>
>> wrote:
>> >> >> >
>> >> >> > Hi
>> >> >> >
>> >> >> > On Fri, Dec 21, 2018 at 12:29 PM Aditya Toshniwal
>> >> >> > <[email protected]> wrote:
>> >> >> > >
>> >> >> > > Hi Dave,
>> >> >> > >
>> >> >> > > On Fri, Dec 21, 2018 at 5:51 PM Dave Page <[email protected]>
>> wrote:
>> >> >> > >>
>> >> >> > >> Nice! Thanks Ashesh.
>> >> >> > >>
>> >> >> > >> Some small issues I spotted:
>> >> >> > >>
>> >> >> > >> - The font looks somewhat small. How does it compare in size
>> to, say,
>> >> >> > >> Gmail? I think it needs to be increased to at least that size.
>> >> >> > >
>> >> >> > > Gmail uses 0.875rem (14px) for the left panel (Inbox, Sent). We
>> are using 0.875rem (14px) for main navbar links and 0.815rem(13.04px) for
>> all other text.
>> >> >> >
>> >> >> > Let's increase the default to 0.875, and make the main links
>> >> >> > proportionally bigger.
>> >> >> >
>> >> >> > >> - Dialogues have 2 close buttons next to each other in the
>> top-right.
>> >> >> > >> Looks like an icon and a text version?
>> >> >> > >
>> >> >> > > You need to do a yarn install. wcDocker code is changed to fix
>> that.
>> >> >> >
>> >> >> > Yup, that fixed it.
>> >> >> >
>> >> >> > >> - Why do some Preferences panels use alternate line colouring,
>> whilst
>> >> >> > >> others don't? I suspect it's because some are actually tables
>> under
>> >> >> > >> the hood? I think we need consistency there.
>> >> >> > >
>> >> >> > > Noted.
>> >> >> > >>
>> >> >> > >>
>> >> >> > >> - The Maintenance dialogue looks terrible - it needs to be
>> made much
>> >> >> > >> more compact. I also seem to be getting a failure to create
>> >> >> > >> maintenance jobs (backups etc work fine).
>> >> >> > >
>> >> >> > > Noted.
>> >> >> > >>
>> >> >> > >>
>> >> >> > >> - I think the buttons on the Browser need borders to match
>> other buttons.
>> >> >> > >
>> >> >> > > It is made consistent with other wcDocker buttons like close,
>> right arrow, left arrow. However, we can make it look like other buttons.
>> >> >> >
>> >> >> > I think they're a different class of buttons - control/navigation
>> vs.
>> >> >> > function. I think we should make this change as the browser
>> buttons
>> >> >> > really are a toolbar just like the larger on on the query tool.
>> >> >> >
>> >> >> > Thanks!
>> >> >> >
>> >> >> > >> Thanks!
>> >> >> > >>
>> >> >> > >> On Fri, Dec 21, 2018 at 12:01 PM Ashesh Vashi
>> >> >> > >> <[email protected]> wrote:
>> >> >> > >> >
>> >> >> > >> > Improvement in the look and feel of the whole application
>> >> >> > >> >
>> >> >> > >> > Changed the SCSS/CSS for the below third party libraries to
>> adopt the
>> >> >> > >> > new look 'n' feel:
>> >> >> > >> > - wcDocker
>> >> >> > >> > - Alertify dialogs, and notifications
>> >> >> > >> > - AciTree
>> >> >> > >> > - Bootstrap Navbar
>> >> >> > >> > - Bootstrap Tabs
>> >> >> > >> > - Bootstrap Drop-Down menu
>> >> >> > >> > - Backgrid
>> >> >> > >> > - Select2
>> >> >> > >> >
>> >> >> > >> > Adopated the new the look 'n' feel for the dialogs, wizard,
>> properties,
>> >> >> > >> > tab panels, tabs, fieldset, subnode control, spinner
>> control, HTML
>> >> >> > >> > table, and other form controls.
>> >> >> > >> >
>> >> >> > >> > - Font is changed to Roboto
>> >> >> > >> > - Using SCSS variables to define the look 'n' feel
>> >> >> > >> > - Designer background images for the Login, and Forget
>> password pages in
>> >> >> > >> > 'web' mode
>> >> >> > >> > - Improved the look 'n' feel for the key selection in the
>> preferences
>> >> >> > >> > dialog
>> >> >> > >> > - Table classes consistency changes across the application
>> >> >> > >> > - File Open and Save dialog list view changes
>> >> >> > >> >
>> >> >> > >> > Author(s): Aditya Toshniwal & Khushboo Vashi
>> >> >> > >> >
>> >> >> > >> > Branch
>> >> >> > >> > ------
>> >> >> > >> > master
>> >> >> > >> >
>> >> >> > >> > Details
>> >> >> > >> > -------
>> >> >> > >> >
>> https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5799ac14ba17dc25fbec184b3b2c6afbe37f...
>> >> >> > >> >
>> >> >> > >> > Modified Files
>> >> >> > >> > --------------
>> >> >> > >> > web/package.json | 2 +-
>> >> >> > >> > .../static/js/fts_configuration.js | 2 +-
>> >> >> > >> > .../databases/schemas/functions/__init__.py | 4 +-
>> >> >> > >> > .../function => static}/css/function.css | 0
>> >> >> > >> > .../templates/trigger_function/css/function.css | 3 -
>> >> >> > >> > .../{templates/edbfunc => static}/css/edbfunc.css | 0
>> >> >> > >> > .../static/js/exclusion_constraint.js | 18 +-
>> >> >> > >> > .../foreign_key/static/js/foreign_key.js | 17 +-
>> >> >> > >> > .../schemas/tables/rules/static/css/rule.css | 7 +
>> >> >> > >> > .../tables/rules/templates/rules/css/rule.css | 8 -
>> >> >> > >> > .../databases/schemas/views/static/css/view.css | 7 +
>> >> >> > >> > .../schemas/views/templates/mview/css/mview.css | 4 -
>> >> >> > >> > .../schemas/views/templates/view/css/view.css | 4 -
>> >> >> > >> > .../pgagent/schedules/static/js/pga_schedule.js | 3 +-
>> >> >> > >> > .../servers/pgagent/static/css/pga_job.css | 3 +
>> >> >> > >> > .../pgagent/templates/pga_job/css/pga_job.css | 13 -
>> >> >> > >> > .../server_groups/servers/static/css/servers.css | 4 +
>> >> >> > >> > .../server_groups/servers/static/js/server.js | 22 +-
>> >> >> > >> > .../server_groups/servers/static/js/variable.js | 4 +-
>> >> >> > >> > .../servers/tablespaces/static/js/tablespace.js | 13 +-
>> >> >> > >> > .../servers/templates/css/servers.css | 4 -
>> >> >> > >> > web/pgadmin/browser/static/css/browser.css | 13 -
>> >> >> > >> > web/pgadmin/browser/static/css/wizard.css | 21 +-
>> >> >> > >> > web/pgadmin/browser/static/js/browser.js | 26 +-
>> >> >> > >> > web/pgadmin/browser/static/js/collection.js | 16 +-
>> >> >> > >> > web/pgadmin/browser/static/js/keyboard.js | 14 +-
>> >> >> > >> > web/pgadmin/browser/static/js/menu.js | 28 +-
>> >> >> > >> > web/pgadmin/browser/static/js/node.js | 53 +-
>> >> >> > >> > web/pgadmin/browser/static/js/node.ui.js | 4 +-
>> >> >> > >> > web/pgadmin/browser/static/js/panel.js | 15 +-
>> >> >> > >> > web/pgadmin/browser/static/js/toolbar.js | 3 -
>> >> >> > >> > web/pgadmin/browser/static/js/wizard.js | 58 +-
>> >> >> > >> > web/pgadmin/browser/static/scss/_browser.scss | 43 +-
>> >> >> > >> > web/pgadmin/browser/static/scss/_wizard.scss | 41 +-
>> >> >> > >> > web/pgadmin/browser/templates/browser/css/node.css | 2 +-
>> >> >> > >> > web/pgadmin/browser/templates/browser/index.html | 9 +-
>> >> >> > >> > web/pgadmin/dashboard/__init__.py | 2 +-
>> >> >> > >> > web/pgadmin/dashboard/static/css/dashboard.css | 21 +-
>> >> >> > >> > web/pgadmin/dashboard/static/js/dashboard.js | 120 +-
>> >> >> > >> > web/pgadmin/dashboard/static/scss/_dashboard.scss | 44 +-
>> >> >> > >> > .../templates/dashboard/database_dashboard.html | 171 ++-
>> >> >> > >> > .../templates/dashboard/server_dashboard.html | 197 ++-
>> >> >> > >> > .../templates/dashboard/welcome_dashboard.html | 30 +-
>> >> >> > >> > web/pgadmin/feature_tests/browser_tool_bar_test.py | 23 +-
>> >> >> > >> > web/pgadmin/feature_tests/file_manager_test.py | 23 +-
>> >> >> > >> > .../feature_tests/keyboard_shortcut_test.py | 5 +-
>> >> >> > >> > .../feature_tests/pg_datatype_validation_test.py | 5 +-
>> >> >> > >> > .../pg_utilities_backup_restore_test.py | 28 +-
>> >> >> > >> > .../feature_tests/pg_utilities_maintenance_test.py | 16 +-
>> >> >> > >> > .../feature_tests/query_tool_journey_test.py | 5 +-
>> >> >> > >> > web/pgadmin/feature_tests/query_tool_tests.py | 117 +-
>> >> >> > >> > web/pgadmin/feature_tests/view_data_dml_queries.py | 16 +-
>> >> >> > >> > .../misc/bgprocess/static/css/bgprocess.css | 11 -
>> >> >> > >> > web/pgadmin/misc/bgprocess/static/js/bgprocess.js | 173 ++-
>> >> >> > >> > .../misc/bgprocess/static/scss/_bgprocess.scss | 81 +-
>> >> >> > >> > web/pgadmin/misc/depends/static/js/depends.js | 3 +-
>> >> >> > >> > .../misc/file_manager/static/css/file_manager.css | 141 +-
>> >> >> > >> > .../misc/file_manager/static/js/create_dialogue.js | 9 +-
>> >> >> > >> > .../misc/file_manager/static/js/select_dialogue.js | 19 +-
>> >> >> > >> > web/pgadmin/misc/file_manager/static/js/utility.js | 77 +-
>> >> >> > >> > .../file_manager/static/scss/_file_manager.scss | 157 +--
>> >> >> > >> > .../file_manager/templates/file_manager/index.html | 95 +-
>> >> >> > >> > .../misc/statistics/static/js/statistics.js | 3 +-
>> >> >> > >> > web/pgadmin/preferences/static/css/preferences.css | 14 -
>> >> >> > >> > web/pgadmin/preferences/static/js/preferences.js | 31 +-
>> >> >> > >> > .../preferences/static/scss/_preferences.scss | 16 +
>> >> >> > >> > web/pgadmin/static/css/pgadmin.css | 81 +-
>> >> >> > >> > web/pgadmin/static/fonts/Roboto-Bold.ttf | Bin 0
>> -> 170760 bytes
>> >> >> > >> > web/pgadmin/static/fonts/Roboto-Medium.ttf | Bin 0
>> -> 172064 bytes
>> >> >> > >> > web/pgadmin/static/fonts/Roboto-Regular.ttf | Bin 0
>> -> 171676 bytes
>> >> >> > >> > web/pgadmin/static/img/collapse_expand.svg | 15 +
>> >> >> > >> > web/pgadmin/static/img/forgot_password.svg | 283
>> ++++
>> >> >> > >> > web/pgadmin/static/img/login.svg | 1 +
>> >> >> > >> > web/pgadmin/static/js/alertify.pgadmin.defaults.js | 82 +-
>> >> >> > >> > web/pgadmin/static/js/backform.pgadmin.js | 80 +-
>> >> >> > >> > web/pgadmin/static/js/backgrid.pgadmin.js | 33 +-
>> >> >> > >> > web/pgadmin/static/js/slickgrid/editors.js | 8 +-
>> >> >> > >> > web/pgadmin/static/js/sqleditor/filter_dialog.js | 33 +-
>> >> >> > >> > .../static/js/sqleditor/query_tool_preferences.js | 15 +-
>> >> >> > >> > web/pgadmin/static/scss/_aci_tree.overrides.scss | 75 +-
>> >> >> > >> > web/pgadmin/static/scss/_alert.scss | 12 +-
>> >> >> > >> > web/pgadmin/static/scss/_alertify.overrides.scss | 150 +-
>> >> >> > >> > web/pgadmin/static/scss/_backform.overrides.scss | 8 +
>> >> >> > >> > web/pgadmin/static/scss/_backgrid.overrides.scss | 251
>> +++-
>> >> >> > >> > web/pgadmin/static/scss/_bootstrap.overrides.scss | 230
>> ++--
>> >> >> > >> > web/pgadmin/static/scss/_codemirror.overrides.scss | 94 +-
>> >> >> > >> > web/pgadmin/static/scss/_pgadmin.grid.scss | 56 +
>> >> >> > >> > web/pgadmin/static/scss/_pgadmin.style.scss | 1440
>> +++++---------------
>> >> >> > >> > web/pgadmin/static/scss/_select2.overrides.scss | 24 +-
>> >> >> > >> > web/pgadmin/static/scss/_webcabin.overrides.scss | 368
>> -----
>> >> >> > >> > web/pgadmin/static/scss/_webcabin.pgadmin.scss | 250
>> ++++
>> >> >> > >> > web/pgadmin/static/scss/pgadmin.scss | 10 +-
>> >> >> > >> > .../static/scss/resources/_default.style.scss | 90 +-
>> >> >> > >> > .../static/scss/resources/_default.variables.scss | 203 ++-
>> >> >> > >> > web/pgadmin/static/vendor/backform/backform.js | 645
>> +++++++++
>> >> >> > >> > .../templates/security/change_password.html | 43 +-
>> >> >> > >> > .../templates/security/forgot_password.html | 9 +-
>> >> >> > >> > web/pgadmin/templates/security/login_user.html | 16 +-
>> >> >> > >> > web/pgadmin/templates/security/panel.html | 23 +-
>> >> >> > >> > web/pgadmin/tools/backup/__init__.py | 6 +-
>> >> >> > >> > web/pgadmin/tools/backup/static/js/backup.js | 8 +-
>> >> >> > >> > .../backup/static/js/backup_dialog_wrapper.js | 22 +-
>> >> >> > >> > web/pgadmin/tools/datagrid/__init__.py | 1 -
>> >> >> > >> > web/pgadmin/tools/datagrid/static/js/datagrid.js | 38 +-
>> >> >> > >> > .../tools/datagrid/templates/datagrid/filter.html | 2 -
>> >> >> > >> > .../tools/datagrid/templates/datagrid/index.html | 193 ++-
>> >> >> > >> > web/pgadmin/tools/debugger/static/css/debugger.css | 34 +-
>> >> >> > >> > web/pgadmin/tools/debugger/static/js/debugger.js | 2 +-
>> >> >> > >> > .../tools/debugger/static/js/debugger_ui.js | 28 +-
>> >> >> > >> > web/pgadmin/tools/debugger/static/js/direct.js | 13 +-
>> >> >> > >> > .../tools/debugger/static/scss/_debugger.scss | 8 -
>> >> >> > >> > .../tools/debugger/templates/debugger/direct.html | 89 +-
>> >> >> > >> > .../tools/grant_wizard/static/js/grant_wizard.js | 27 +-
>> >> >> > >> > .../grant_wizard/static/scss/_grant_wizard.scss | 31 +-
>> >> >> > >> > .../tools/import_export/static/js/import_export.js | 24 +-
>> >> >> > >> > web/pgadmin/tools/maintenance/__init__.py | 10 +-
>> >> >> > >> > .../tools/maintenance/static/js/maintenance.js | 24 +-
>> >> >> > >> > .../maintenance/static/scss/_maintenance.scss | 2 +-
>> >> >> > >> > web/pgadmin/tools/restore/__init__.py | 14 +-
>> >> >> > >> > web/pgadmin/tools/restore/static/js/restore.js | 8 +-
>> >> >> > >> > .../restore/static/js/restore_dialog_wrapper.js | 24 +-
>> >> >> > >> > .../tools/sqleditor/static/css/sqleditor.css | 128 +-
>> >> >> > >> > web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 35 +-
>> >> >> > >> > .../tools/sqleditor/static/scss/_history.scss | 42 +-
>> >> >> > >> > .../tools/sqleditor/static/scss/_sqleditor.scss | 128 +-
>> >> >> > >> > .../user_management/static/css/user_management.css | 37 -
>> >> >> > >> > .../user_management/static/js/user_management.js | 53 +-
>> >> >> > >> > .../static/scss/_user_management.scss | 12 +-
>> >> >> > >> > .../javascript/alerts/alertify_wrapper_spec.js | 4 +-
>> >> >> > >> > .../backup/backup_dialog_wrapper_spec.js | 8 +-
>> >> >> > >> > .../restore/restore_dialog_wrapper_spec.js | 8 +-
>> >> >> > >> > web/webpack.config.js | 2 +-
>> >> >> > >> > web/webpack.shim.js | 2 +-
>> >> >> > >> > web/webpack.test.config.js | 1 +
>> >> >> > >> > web/yarn.lock | 1015
>> +++++++++++++-
>> >> >> > >> > 135 files changed, 5002 insertions(+), 3850 deletions(-)
>> >> >> > >> >
>> >> >> > >>
>> >> >> > >>
>> >> >> > >> --
>> >> >> > >> Dave Page
>> >> >> > >> Blog: http://pgsnake.blogspot.com
>> >> >> > >> Twitter: @pgsnake
>> >> >> > >>
>> >> >> > >> EnterpriseDB UK: http://www.enterprisedb.com
>> >> >> > >> The Enterprise PostgreSQL Company
>> >> >> > >
>> >> >> > >
>> >> >> > >
>> >> >> > > --
>> >> >> > > Thanks and Regards,
>> >> >> > > Aditya Toshniwal
>> >> >> > > Software Engineer | EnterpriseDB Software Solutions | Pune
>> >> >> > > "Don't Complain about Heat, Plant a tree"
>> >> >> >
>> >> >> >
>> >> >> >
>> >> >> > --
>> >> >> > Dave Page
>> >> >> > Blog: http://pgsnake.blogspot.com
>> >> >> > Twitter: @pgsnake
>> >> >> >
>> >> >> > EnterpriseDB UK: http://www.enterprisedb.com
>> >> >> > The Enterprise PostgreSQL Company
>> >> >>
>> >> >>
>> >> >>
>> >> >> --
>> >> >> Dave Page
>> >> >> Blog: http://pgsnake.blogspot.com
>> >> >> Twitter: @pgsnake
>> >> >>
>> >> >> EnterpriseDB UK: http://www.enterprisedb.com
>> >> >> The Enterprise PostgreSQL Company
>> >> >
>> >> >
>> >> >
>> >> > --
>> >> > Thanks and Regards,
>> >> > Aditya Toshniwal
>> >> > Software Engineer | EnterpriseDB Software Solutions | Pune
>> >> > "Don't Complain about Heat, Plant a tree"
>> >>
>> >>
>> >>
>> >> --
>> >> Dave Page
>> >> Blog: http://pgsnake.blogspot.com
>> >> Twitter: @pgsnake
>> >>
>> >> EnterpriseDB UK: http://www.enterprisedb.com
>> >> The Enterprise PostgreSQL Company
>> >
>> >
>> >
>> > --
>> > Thanks and Regards,
>> > Aditya Toshniwal
>> > Software Engineer | EnterpriseDB Software Solutions | Pune
>> > "Don't Complain about Heat, Plant a tree"
>>
>>
>>
>> --
>> Dave Page
>> Blog: http://pgsnake.blogspot.com
>> Twitter: @pgsnake
>>
>> EnterpriseDB UK: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>>
>
>
> --
> Thanks and Regards,
> Aditya Toshniwal
> Software Engineer | EnterpriseDB Software Solutions | Pune
> "Don't Complain about Heat, Plant a tree"
>
--
Thanks and Regards,
Aditya Toshniwal
Software Engineer | EnterpriseDB Software Solutions | Pune
"Don't Complain about Heat, Plant a tree"
Attachments:
[application/octet-stream] RM3692.part2.patch (70.0K, 3-RM3692.part2.patch)
download | inline diff:
diff --git a/web/pgadmin/about/static/js/about.js b/web/pgadmin/about/static/js/about.js
index 1e72c917..2aaf98f4 100644
--- a/web/pgadmin/about/static/js/about.js
+++ b/web/pgadmin/about/static/js/about.js
@@ -20,7 +20,8 @@ define(
},
setup: function() {
return {
- buttons:[{ text: gettext('OK'), key: 27, className: 'btn btn-primary' }],
+ buttons:[{ text: gettext('OK'), key: 27,
+ className: 'btn btn-primary fa fa-lg fa-check pg-alertify-button' }],
options: {
modal: false,
resizable: true,
@@ -44,7 +45,7 @@ define(
function(data) {
alertify.aboutDialog(
S(gettext('About %s')).sprintf(pgAdmin.Browser.utils.app_name).value(), data
- ).resizeTo(800, 450);
+ ).resizeTo(pgAdmin.Browser.stdW.md, pgAdmin.Browser.stdH.md);
});
},
};
diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js b/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js
index e7e2aa43..b1c76887 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js
@@ -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',
},
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js
index c716f824..8775b9fb 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js
@@ -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'],
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js
index bb1986bd..f6d8f319 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js
@@ -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)
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
index c8a09297..4185aa77 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
@@ -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)
diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js
index bcc27509..e60f3304 100644
--- a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js
+++ b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js
@@ -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;
},
diff --git a/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js b/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js
index 419ae45f..0226a5be 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js
+++ b/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js
@@ -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({
diff --git a/web/pgadmin/browser/server_groups/servers/static/css/servers.css b/web/pgadmin/browser/server_groups/servers/static/css/servers.css
index e8981cf5..65f9f53d 100644
--- a/web/pgadmin/browser/server_groups/servers/static/css/servers.css
+++ b/web/pgadmin/browser/server_groups/servers/static/css/servers.css
@@ -9,4 +9,4 @@
.change_password {
padding-left: 7px;
-}
+}
\ No newline at end of file
diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js b/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js
index 25d85a8b..7e9dd79d 100644
--- a/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js
+++ b/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js
@@ -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({
diff --git a/web/pgadmin/browser/server_groups/static/js/server_group.js b/web/pgadmin/browser/server_groups/static/js/server_group.js
index 58d1ccd2..93053a95 100644
--- a/web/pgadmin/browser/server_groups/static/js/server_group.js
+++ b/web/pgadmin/browser/server_groups/static/js/server_group.js
@@ -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 */
diff --git a/web/pgadmin/browser/static/css/wizard.css b/web/pgadmin/browser/static/css/wizard.css
index 1cdded00..d293881f 100644
--- a/web/pgadmin/browser/static/css/wizard.css
+++ b/web/pgadmin/browser/static/css/wizard.css
@@ -44,30 +44,11 @@
width: 140px;
}
-.wizard-right-panel_content {
- padding: 0.5rem 0rem;
-}
-
/* Wizard Footer CSS */
.pgadmin-wizard .footer .row {
margin: 0 -6px 3px -6px;
}
-/* Wizard Button CSS */
-
-.pgadmin-wizard .wizard-buttons button.wizard-next i.fa {
- padding-left: 5px;
-}
-
-.pgadmin-wizard .wizard-buttons button.wizard-back i.fa,
-.pgadmin-wizard .wizard-buttons button.wizard-cancel i.fa {
- padding-right: 5px;
-}
-
-.pgadmin-wizard .wizard-buttons .wizard-finish {
- margin-right: 0 !important;
-}
-
.wizard-header .wizard-cancel-event {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAdklEQVQ4jd2SwQnAIAxF36GH0pOTFHEgF3IkR5LO0F4SCGJVEHroAy/f/E+igV+yAa6hO7nrcgAZuIBg9CBalppXEnDL0RA1q556ASdQqhBrLlLTxVch1uxHZiU2AuKs2Vdt23GGHSy/wfIvzOzBPhpjaRO/5wG/szevJ+ZXzAAAAABJRU5ErkJggg==) no-repeat center center;
padding: 10px;
diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js
index e9ef25c9..00f72e94 100644
--- a/web/pgadmin/browser/static/js/browser.js
+++ b/web/pgadmin/browser/static/js/browser.js
@@ -108,6 +108,19 @@ define('pgadmin.browser', [
// It will be used to register extensions, tools, child node scripts,
// etc.
scripts: {},
+ // Standard Widths and Height for dialogs in px
+ stdW: {
+ sm: 500,
+ md: 700,
+ lg: 900,
+ default: 500,
+ },
+ stdH: {
+ sm: 200,
+ md: 400,
+ lg: 550,
+ default: 550,
+ },
// Default panels
panels: {
// Panel to keep the left hand browser tree
diff --git a/web/pgadmin/browser/static/js/node.js b/web/pgadmin/browser/static/js/node.js
index 9fe31aea..76de9964 100644
--- a/web/pgadmin/browser/static/js/node.js
+++ b/web/pgadmin/browser/static/js/node.js
@@ -313,18 +313,19 @@ define('pgadmin.browser.node', [
}
var onSessionInvalid = function(msg) {
- var alertMessage = '\
- <div class="media error-in-footer bg-danger-light border-danger text-danger text-14">\
- <div class="media-body media-middle">\
- <div class="alert-icon error-icon">\
- <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>\
- </div>\
- <div class="alert-text">' + msg + '</div>\
- <div class="close-error-bar">\
- <a class="close-error">x</a>\
- </div>\
- </div>\
- </div>';
+ var alertMessage = `
+ <div class="error-in-footer">
+ <div class="d-flex px-2 py-1">
+ <div class="pr-2">
+ <i class="fa fa-exclamation-triangle text-danger" aria-hidden="true"></i>
+ </div>
+ <div class="alert-text">${msg}</div>
+ <div class="ml-auto close-error-bar">
+ <a class="close-error fa fa-times text-danger"></a>
+ </div>
+ </div>
+ </div>`;
+
if (!_.isUndefined(that.statusBar)) {
that.statusBar.html(alertMessage).css('visibility', 'visible');
that.statusBar.find('a.close-error').bind('click', function() {
@@ -558,12 +559,43 @@ define('pgadmin.browser.node', [
d.body.insertBefore(el, d.body.firstChild);
- var pW = screen.width < 800 ? '95%' : '500px',
- pH = screen.height < 600 ? '95%' : '550px',
- w = pgAdmin.toPx(el, self.width || pW, 'width', true),
- h = pgAdmin.toPx(el, self.height || pH, 'height', true),
- x = (b.offsetWidth - w) / 2,
- y = (b.offsetHeight - h) / 2;
+ let w, h, x, y;
+ if(screen.width < 800) {
+ w= pgAdmin.toPx(el, '95%', 'width', true);
+ } else {
+ w= pgAdmin.toPx(el, self.width || pgBrowser.stdW.default+'px', 'width', true);
+
+ /* Fit to standard sizes */
+ if(w <= pgBrowser.stdW.sm) {
+ w = pgBrowser.stdW.sm;
+ } else {
+ if(w <= pgBrowser.stdW.md) {
+ w = pgBrowser.stdW.md;
+ } else {
+ w = pgBrowser.stdW.lg;
+ }
+ }
+ }
+
+ if(screen.height < 600) {
+ h = pgAdmin.toPx(el, '95%', 'height', true);
+ } else {
+ h = pgAdmin.toPx(el, self.height || pgBrowser.stdH.default+'px', 'height', true);
+
+ /* Fit to standard sizes */
+ if(h <= pgBrowser.stdH.sm) {
+ h = pgBrowser.stdH.sm;
+ } else {
+ if(h <= pgBrowser.stdH.md) {
+ h = pgBrowser.stdH.md;
+ } else {
+ h = pgBrowser.stdH.lg;
+ }
+ }
+ }
+
+ x = (b.offsetWidth - w) / 2,
+ y = (b.offsetHeight - h) / 4;
var p = pgBrowser.docker.addPanel(
'node_props', wcDocker.DOCK.FLOAT, undefined, {
@@ -1319,7 +1351,7 @@ define('pgadmin.browser.node', [
var btnGroup = this.find('.pg-prop-btn-group'),
btnSave = btnGroup.find('button.btn-primary'),
- btnReset = btnGroup.find('button.btn-warning');
+ btnReset = btnGroup.find('button.btn-secondary[type="reset"]');
if (hasError || !modified) {
btnSave.prop('disabled', true);
diff --git a/web/pgadmin/browser/static/js/panel.js b/web/pgadmin/browser/static/js/panel.js
index 45131d10..09c21a9f 100644
--- a/web/pgadmin/browser/static/js/panel.js
+++ b/web/pgadmin/browser/static/js/panel.js
@@ -142,10 +142,10 @@ define(
p.pgResizeTimeout = null;
/** Calculations based on https://getbootstrap.com/docs/4.1/layout/grid/#grid-options **/
- if (w < 576) {
+ if (w < 480) {
w = 'xs';
}
- if (w >= 576) {
+ if (w >= 480) {
w = 'sm';
}
if (w >= 768) {
diff --git a/web/pgadmin/browser/static/js/toolbar.js b/web/pgadmin/browser/static/js/toolbar.js
index 7719c29a..b01e28e8 100644
--- a/web/pgadmin/browser/static/js/toolbar.js
+++ b/web/pgadmin/browser/static/js/toolbar.js
@@ -13,6 +13,7 @@ let _defaultToolBarButtons = [
text: '',
toggled: false,
toggleClass: '',
+ parentClass: 'pg-toolbar-btn',
enabled: false,
},
{
@@ -21,6 +22,7 @@ let _defaultToolBarButtons = [
text: '',
toggled: false,
toggleClass: '',
+ parentClass: 'pg-toolbar-btn',
enabled: false,
},
{
@@ -29,6 +31,7 @@ let _defaultToolBarButtons = [
text: '',
toggled: false,
toggleClass: '',
+ parentClass: 'pg-toolbar-btn',
enabled: false,
},
];
diff --git a/web/pgadmin/browser/static/js/wizard.js b/web/pgadmin/browser/static/js/wizard.js
index fbb1a578..401a7342 100644
--- a/web/pgadmin/browser/static/js/wizard.js
+++ b/web/pgadmin/browser/static/js/wizard.js
@@ -106,20 +106,19 @@ define([
' </div>' +
' </div>' +
' <div class="wizard-footer pg-prop-footer">' +
- ' <div class="pg-prop-status-bar" style="visibility:hidden">' +
- ' <div class="media error-in-footer bg-danger-light border-danger text-danger text-14">' +
- ' <div class="media-body media-middle">' +
- ' <div class="alert-icon error-icon">' +
- ' <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>' +
- ' </div>' +
- ' <div class="alert-text">' +
- ' </div>' +
- ' <div class="close-error-bar">' +
- ' <a class="close-error">x</a>' +
- ' </div>' +
- ' </div>' +
- ' </div>' +
- ' </div>' +
+ ' <div class="pg-prop-status-bar" style="visibility:hidden">' +
+ ' <div class="error-in-footer"> ' +
+ ' <div class="d-flex px-2 py-1"> ' +
+ ' <div class="pr-2"> ' +
+ ' <i class="fa fa-exclamation-triangle text-danger" aria-hidden="true"></i> ' +
+ ' </div> ' +
+ ' <div class="alert-text"></div> ' +
+ ' <div class="ml-auto close-error-bar"> ' +
+ ' <a class="close-error fa fa-times text-danger"></a> ' +
+ ' </div> ' +
+ ' </div> ' +
+ ' </div> ' +
+ ' </div>' +
' <div class="wizard-buttons d-flex">' +
' <div>' +
' <button title = "' + gettext('Help for this dialog.') + '"' +
@@ -128,14 +127,14 @@ define([
' </div>' +
' <div class="ml-auto">' +
' <button class="btn btn-secondary wizard-cancel" <%=this.options.disable_cancel ? "disabled" : ""%>>' +
- ' <i class="fa fa-lg fa-close"></i>' + gettext('Cancel') + '</button>' +
+ ' <i class="fa fa-close"></i> ' + gettext('Cancel') + '</button>' +
' <button class="btn btn-secondary wizard-back" <%=this.options.disable_prev ? "disabled" : ""%>>' +
- ' <i class="fa fa-backward"></i>' + gettext('Back') + '</button>' +
+ ' <i class="fa fa-backward"></i> ' + gettext('Back') + '</button>' +
' <button class="btn btn-secondary wizard-next" <%=this.options.disable_next ? "disabled" : ""%>>' +
' ' + gettext('Next') +
- ' <i class="fa fa-forward"></i></button>' +
+ ' <i class="fa fa-forward"></i></button>' +
' <button class="btn btn-primary wizard-finish" <%=this.options.disable_finish ? "disabled" : ""%>>' +
- ' ' + gettext('Finish') + '</button>' +
+ ' <i class="fa fa-check"></i> ' + gettext('Finish') + '</button>' +
' </div>' +
' </div>' +
' </div>' +
diff --git a/web/pgadmin/browser/static/scss/_browser.scss b/web/pgadmin/browser/static/scss/_browser.scss
index 158d2891..76c230cd 100644
--- a/web/pgadmin/browser/static/scss/_browser.scss
+++ b/web/pgadmin/browser/static/scss/_browser.scss
@@ -46,3 +46,8 @@ samp,
text-align: center;
color: $loading-fg;
}
+
+.pg-toolbar-btn {
+ margin-left: 0.25rem;
+ border: $input-btn-border-width solid $btn-secondary-border;
+}
\ No newline at end of file
diff --git a/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss b/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss
index 59572914..caf54f23 100644
--- a/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss
+++ b/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss
@@ -82,7 +82,7 @@ $bgproc-container-pad: 2px;
.ajs-bg-bgprocess > .pg-bg-bgprocess > .pg-bg-status.bg-failed {
color: $color-fg;
- background-color: $color-danger-light;
+ background-color: $color-danger-lighter;
}
.pg-panel-content div.bg-process-watcher {
diff --git a/web/pgadmin/misc/file_manager/static/css/file_manager.css b/web/pgadmin/misc/file_manager/static/css/file_manager.css
index 23824fa7..dd7596b4 100644
--- a/web/pgadmin/misc/file_manager/static/css/file_manager.css
+++ b/web/pgadmin/misc/file_manager/static/css/file_manager.css
@@ -236,10 +236,8 @@ a.dz-remove {
.file_listing .no_folder_found {
text-align: center;
- position: absolute;
- top: 50px;
width: 100%;
- font-size: 14px;
+ padding: 0.5rem;
}
div.change_file_types span {
diff --git a/web/pgadmin/misc/file_manager/static/js/file_manager.js b/web/pgadmin/misc/file_manager/static/js/file_manager.js
index 1dccd79b..ed4f99e4 100644
--- a/web/pgadmin/misc/file_manager/static/js/file_manager.js
+++ b/web/pgadmin/misc/file_manager/static/js/file_manager.js
@@ -29,9 +29,9 @@ define('misc.file_manager', [
// Call dialogs subject to dialog_type param
show_dialog: function(params) {
if (params.dialog_type == 'create_file') {
- Alertify.createModeDlg(params).resizeTo('60%', '80%');
+ Alertify.createModeDlg(params).resizeTo(pgAdmin.Browser.stdW.md,pgAdmin.Browser.stdH.lg);
} else {
- Alertify.fileSelectionDlg(params).resizeTo('60%', '80%');
+ Alertify.fileSelectionDlg(params).resizeTo(pgAdmin.Browser.stdW.md,pgAdmin.Browser.stdH.lg);
}
},
};
diff --git a/web/pgadmin/misc/file_manager/static/js/utility.js b/web/pgadmin/misc/file_manager/static/js/utility.js
index 5fbf0a55..47b7bfc0 100644
--- a/web/pgadmin/misc/file_manager/static/js/utility.js
+++ b/web/pgadmin/misc/file_manager/static/js/utility.js
@@ -576,7 +576,7 @@ define([
result += '</ul>';
} else {
- result += '<table id="contents" class="table table-bordered table-noouter-border table-hover tablesorter">';
+ result += '<table id="contents" class="table table-bordered table-noouter-border table-bottom-border table-hover tablesorter">';
result += '<thead><tr><th>';
result += '<span>' + lg.name + '</span></th>';
result += '<th><span>' + lg.size + '</span></th><th>';
@@ -659,16 +659,15 @@ define([
if ($('.fileinfo').data('view') == 'grid') {
result += '<ul id="contents" class="grid"></ul>';
} else {
- result += '<table id="contents" class="list tablesorter">';
- result += '<thead><tr><th><span>' +
- lg.name + '</span></th><th><span>' + lg.size +
- '</span></th><th><span>' + lg.modified +
- '</span></th></tr></thead>';
- result += '<tbody>';
+ result += '<table id="contents" class="table table-bordered table-noouter-border table-empty-rows ablesorter">';
+ result += '<thead><tr><th><span>' + lg.name + '</span></th>' +
+ '<th><span>' + lg.size + '</span></th>' +
+ '<th><span>' + lg.modified + '</span></th>' +
+ '</tr></thead>';
+ result += '</tbody>';
+ result += '</table>';
}
- result += '<h1 class="no_folder_found">' +
- lg.could_not_retrieve_folder + '</h1>';
-
+ result += '<div class="no_folder_found">' + lg.could_not_retrieve_folder + '</div>';
var cap_no_folders = ['upload', 'create'];
data.Capabilities = cap_no_folders;
@@ -1137,7 +1136,7 @@ define([
<input type='checkbox' id='show_hidden' onclick='pgAdmin.FileUtils.handleClick(this)' tabindex='11'>
</div>
<div class="ml-auto">
- <label>${gettext('Format')}</label>
+ <label class="my-auto">${gettext('Format')}</label>
<select name='type' tabindex='12'>${fileFormats}</select>
<div>`;
}
diff --git a/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss b/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
index 85f85463..2d90a67f 100644
--- a/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
+++ b/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
@@ -142,6 +142,9 @@
.allowed_file_types {
border-top: $panel-border;
+ background: $color-bg-theme;
+ z-index: 5;
+ padding: 0.25rem;
}
.upload_file{
@@ -211,10 +214,10 @@
}
.fileinfo .fm_dimmer {
- height: calc(100% - 32px);
display: none;
- top: 0px;
- background:$color-fg;
+ top: 0;
+ bottom: 0;
+ background: $loading-bg;
opacity: 0.5;
width: 100%;
position: absolute;
@@ -223,10 +226,8 @@
.fileinfo .delete_item, .fileinfo .replace_file {
display: none;
- padding: 15px 15px;
- border: 1px solid $color-gray-light;
- border-left: 0;
- border-right: 0;
+ padding: 1rem;
+ border-bottom: $panel-border;
background: $color-bg-theme;
position: absolute;
top: 0;
@@ -235,15 +236,6 @@
z-index: 4;
}
-.fileinfo .delete_item span.pull-right .btn,
-.fileinfo .replace_file span.pull-right .btn {
- padding: 0px 5px;
- color: $color-fg;
- background: $color-bg;
- font-size: 12px;
- margin-right: 4px;
-}
-
.upload_file .dz_cross_btn {
color: $color-fg-theme;
right: 0px;
diff --git a/web/pgadmin/misc/file_manager/templates/file_manager/index.html b/web/pgadmin/misc/file_manager/templates/file_manager/index.html
index 9d1e3673..f854545e 100644
--- a/web/pgadmin/misc/file_manager/templates/file_manager/index.html
+++ b/web/pgadmin/misc/file_manager/templates/file_manager/index.html
@@ -64,16 +64,16 @@
<div class='fm_dimmer'></div>
<div class='delete_item'>
<span>{{ _('Are you sure you want to delete this item?') }}</span>
- <span class="pull-right">
- <button type='button' class='btn btn_yes' tabindex="13">{{ _('Yes') }}</button>
- <button type='button' class='btn btn_no' tabindex="14">{{ _('No') }}</button>
- </span>
+ <span class="pull-right">
+ <button type='button' class='btn btn-secondary btn_no' tabindex="14">{{ _('No') }}</button>
+ <button type='button' class='btn btn-primary btn_yes' tabindex="13">{{ _('Yes') }}</button>
+ </span>
</div>
<div class='replace_file'>
<span>{{ _('Are you sure you want to replace this file?') }}</span>
<span class="pull-right">
- <button type='button' class='btn btn_yes' tabindex="15">{{ _('Yes') }}</button>
- <button type='button' class='btn btn_no' tabindex="16">{{ _('No') }}</button>
+ <button type='button' class='btn btn-secondary btn_no' tabindex="16">{{ _('No') }}</button>
+ <button type='button' class='btn btn-primary btn_yes' tabindex="15">{{ _('Yes') }}</button>
</span>
</div>
</div>
diff --git a/web/pgadmin/preferences/static/js/preferences.js b/web/pgadmin/preferences/static/js/preferences.js
index 511c80a1..b25be5c8 100644
--- a/web/pgadmin/preferences/static/js/preferences.js
+++ b/web/pgadmin/preferences/static/js/preferences.js
@@ -477,7 +477,7 @@ define('pgadmin.preferences', [
},
show: function() {
- Alertify.preferencesDlg(true).resizeTo('60%', '60%');
+ Alertify.preferencesDlg(true).resizeTo(pgAdmin.Browser.stdW.lg,pgAdmin.Browser.stdH.lg);
},
};
diff --git a/web/pgadmin/preferences/static/scss/_preferences.scss b/web/pgadmin/preferences/static/scss/_preferences.scss
index 7c8d674a..241ca8f5 100644
--- a/web/pgadmin/preferences/static/scss/_preferences.scss
+++ b/web/pgadmin/preferences/static/scss/_preferences.scss
@@ -3,8 +3,7 @@
padding-top: 2px;
height: 100%;
overflow: auto;
- border-right: 2px solid $color-gray-light;
- background-image: $color-gray-lighter;
+ border-right: $panel-border;
}
.preferences_content {
@@ -21,4 +20,8 @@
.btn-checkbox {
padding: $btn-checkbox-padding;
+
+ & input[type="checkbox"]{
+ margin-top: 0px !important;
+ }
}
diff --git a/web/pgadmin/static/js/alertify.pgadmin.defaults.js b/web/pgadmin/static/js/alertify.pgadmin.defaults.js
index 2d093df3..83047985 100644
--- a/web/pgadmin/static/js/alertify.pgadmin.defaults.js
+++ b/web/pgadmin/static/js/alertify.pgadmin.defaults.js
@@ -197,10 +197,10 @@ define([
this.pgResizeTimeout = null;
/** Calculations based on https://getbootstrap.com/docs/4.1/layout/grid/#grid-options **/
- if (w < 576) {
+ if (w < 480) {
w = 'xs';
}
- if (w >= 576) {
+ if (w >= 480) {
w = 'sm';
}
if (w >= 768) {
diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js
index 024a7eed..357be9e4 100644
--- a/web/pgadmin/static/js/backform.pgadmin.js
+++ b/web/pgadmin/static/js/backform.pgadmin.js
@@ -2288,7 +2288,7 @@ define([
'<div class="input-group">',
'<input type="<%=type%>" class="form-control <%=extraClasses.join(\' \')%>" name="<%=name%>" min="<%=min%>" max="<%=max%>"maxlength="<%=maxlength%>" value="<%-value%>" placeholder="<%-placeholder%>" <%=disabled ? "disabled" : ""%> <%=required ? "required" : ""%> />',
'<div class="input-group-append">',
- '<button class="btn btn-outline-secondary fa fa-ellipsis-h select_item" <%=disabled ? "disabled" : ""%> ></button>',
+ '<button class="btn btn-secondary fa fa-ellipsis-h select_item" <%=disabled ? "disabled" : ""%> ></button>',
'</div>',
'</div>',
'<% if (helpMessage && helpMessage.length) { %>',
diff --git a/web/pgadmin/static/js/slickgrid/editors.js b/web/pgadmin/static/js/slickgrid/editors.js
index 2d732c56..6f278ec4 100644
--- a/web/pgadmin/static/js/slickgrid/editors.js
+++ b/web/pgadmin/static/js/slickgrid/editors.js
@@ -36,7 +36,13 @@
function getButtons(editable) {
var $buttons = $('<div class=\'pg_buttons\' />'),
label = editable ? 'Cancel' : 'OK',
- button_type = editable ? 'btn-danger' : 'btn-primary';
+ button_type = editable ? 'btn-secondary' : 'btn-primary',
+ button_icon = editable ? 'fa-times' : 'fa-check';
+
+ $('<button class=\'btn ' + button_type + ' long_text_editor pg-alertify-button\' data-label="'+label+'">' +
+ '<span class="fa '+ button_icon +' pg-alertify-button"></span> '+ label +
+ '</button>')
+ .appendTo($buttons);
if (editable) {
$('<button class=\'btn btn-primary long_text_editor\' data-label="Save">'+
@@ -44,11 +50,6 @@
'</button>')
.appendTo($buttons);
}
-
- $('<button class=\'btn ' + button_type + ' long_text_editor pg-alertify-button\' data-label="'+label+'">' +
- '<span class="fa fa-save pg-alertify-button"></span> '+ label +
- '</button>')
- .appendTo($buttons);
return $buttons;
}
diff --git a/web/pgadmin/static/js/sqleditor/filter_dialog.js b/web/pgadmin/static/js/sqleditor/filter_dialog.js
index 6dc9571b..f25ef312 100644
--- a/web/pgadmin/static/js/sqleditor/filter_dialog.js
+++ b/web/pgadmin/static/js/sqleditor/filter_dialog.js
@@ -112,19 +112,17 @@ let FilterDialog = {
this.__internal.buttons[2].element.disabled = true;
// Status bar
- this.statusBar = $('<div class=\'pg-prop-status-bar pg-el-xs-12 d-none\'>' +
- ' <div class=\'media error-in-footer bg-danger-light border-danger text-danger text-14\'>' +
- ' <div class=\'media-body media-middle\'>' +
- ' <div class=\'alert-icon error-icon\'>' +
- ' <i class=\'fa fa-exclamation-triangle\' aria-hidden=\'true\'></i>' +
- ' </div>' +
- ' <div class=\'alert-text\'>' +
- ' </div>' +
- ' </div>' +
- ' </div>' +
- '</div>', {
- text: '',
- }).appendTo($container);
+ this.statusBar = $(
+ '<div class=\'pg-prop-status-bar pg-el-xs-12 d-none\'>' +
+ ' <div class="error-in-footer"> ' +
+ ' <div class="d-flex px-2 py-1"> ' +
+ ' <div class="pr-2"> ' +
+ ' <i class="fa fa-exclamation-triangle text-danger" aria-hidden="true"></i> ' +
+ ' </div> ' +
+ ' <div class="alert-text"></div> ' +
+ ' </div> ' +
+ ' </div> ' +
+ '</div>').appendTo($container);
// To show progress on filter Saving/Updating on AJAX
this.showFilterProgress = $(
@@ -259,7 +257,7 @@ let FilterDialog = {
};
});
- Alertify.filterDialog(title).resizeTo('65%', '60%');
+ Alertify.filterDialog(title).resizeTo(pgAdmin.Browser.stdW.md,pgAdmin.Browser.stdH.md);
})
.fail(function(e) {
handleQueryToolAjaxError(pgAdmin, handler, e, '_show_filter', [], true);
diff --git a/web/pgadmin/static/scss/_aci_tree.overrides.scss b/web/pgadmin/static/scss/_aci_tree.overrides.scss
index ad775173..70a0c916 100644
--- a/web/pgadmin/static/scss/_aci_tree.overrides.scss
+++ b/web/pgadmin/static/scss/_aci_tree.overrides.scss
@@ -3,7 +3,7 @@
}
.aciTree .aciTreeText {
font-family: $font-family-primary;
- font-size: 12px;
+ font-size: 0.815rem;
}
.aciTree.aciTreeFocus .aciTreeFocus > .aciTreeLine {
background-color: $color-primary-light;
diff --git a/web/pgadmin/static/scss/_alert.scss b/web/pgadmin/static/scss/_alert.scss
index 507b9477..4f59011d 100644
--- a/web/pgadmin/static/scss/_alert.scss
+++ b/web/pgadmin/static/scss/_alert.scss
@@ -104,25 +104,17 @@
}
.alert-text {
- flex-grow: 1;
- border: 1px solid $color-danger-light;
- padding: 6px 12px 6px 10px;
- border-left: none;
-moz-user-select: text;
-khtml-user-select: text;
-webkit-user-select: text;
-ms-user-select: text;
user-select: text;
- width: 100%;
}
.error-in-footer {
- border-radius: 5px;
- border: 1px solid transparent;
-
- .alert-text {
- border-color: $color-danger-light;
- }
+ border-radius: $border-radius;
+ border: 1px solid $color-danger-light;
+ background: $color-danger-lighter;
}
.success-in-footer {
diff --git a/web/pgadmin/static/scss/_alertify.overrides.scss b/web/pgadmin/static/scss/_alertify.overrides.scss
index c7382d4b..235c9fdb 100644
--- a/web/pgadmin/static/scss/_alertify.overrides.scss
+++ b/web/pgadmin/static/scss/_alertify.overrides.scss
@@ -32,7 +32,7 @@
border-top-left-radius: $panel-border-radius;
border-top-right-radius: $panel-border-radius;
& .ajs-content {
- top: 0;
+ top: 0 !important;
border-radius: inherit;
}
}
@@ -48,7 +48,8 @@
}
}
.ajs-body .ajs-content {
- top: $title-height;
+ top: $title-height !important;
+ bottom: $footer-height-calc !important;
}
/* Removes padding from alertify footer */
@@ -114,6 +115,10 @@
}
}
+.alertify.ajs-frameless .ajs-body .ajs-content {
+ bottom: 0px !important;
+}
+
.alertify.ajs-maximized .ajs-commands,
.alertify.ajs-resizable .ajs-commands {
margin: 2px 0px 0 0;
@@ -180,11 +185,9 @@
}
.pg-alertify-icon-button {
- //refered - $input-btn-padding-y, $input-btn-padding-x
- padding: 0.275rem $input-btn-padding-x;
&:before {
font-size: 1.3em !important;
- line-height: 1.3;
+ line-height: 1.2;
font-family: $font-family-icon;
}
}
@@ -195,7 +198,7 @@
}
.ajs-message.ajs-error.ajs-visible {
- background: $color-danger-light;
+ background: $color-danger-lighter;
border: $border-width solid $color-danger;
@extend .ajs-text-smoothing;
}
@@ -215,3 +218,7 @@
.ajs-message > .media > .media-body.media-middle {
display: flex;
}
+
+.alertify .ajs-dimmer {
+ background-color: $loading-bg;
+}
\ No newline at end of file
diff --git a/web/pgadmin/static/scss/_backform.overrides.scss b/web/pgadmin/static/scss/_backform.overrides.scss
index 6a04f614..abc2af4e 100644
--- a/web/pgadmin/static/scss/_backform.overrides.scss
+++ b/web/pgadmin/static/scss/_backform.overrides.scss
@@ -1,6 +1,6 @@
.has-error {
.pgadmin-controls .form-control {
- border-color: $color-danger;
+ border-color: $color-danger-light;
}
.form-control {
@@ -11,15 +11,15 @@
color: $color-danger;
}
- .control-label:before {
+ .control-label::before {
font: normal normal normal 16px/1 FontAwesome;
content: "\f071";
text-decoration: inherit;
position: absolute;
color: $color-danger;
- right: 6px;
- padding-top: 6px;
+ right: 0.5rem;
z-index: 1;
+ line-height: inherit;
}
}
@@ -36,10 +36,14 @@
}
}
.backform-tab .tab-pane {
- padding: 7px;
+ padding: 0.5rem;
&.SQL {
height: 100%;
- padding: 0px 7px 0px 0px;
+ padding: 0px;
+
+ & .pgadmin-controls.SQL {
+ padding: 0px;
+ }
}
}
diff --git a/web/pgadmin/static/scss/_backgrid.overrides.scss b/web/pgadmin/static/scss/_backgrid.overrides.scss
index 519a56be..afe1c65e 100644
--- a/web/pgadmin/static/scss/_backgrid.overrides.scss
+++ b/web/pgadmin/static/scss/_backgrid.overrides.scss
@@ -1,6 +1,7 @@
.backgrid th, .backgrid td {
font-weight: normal!important;
text-align: left;
+ line-height: $line-height-base;
}
.backgrid.backgrid-striped tbody {
@@ -223,6 +224,10 @@ span.form-control:disabled {
background-color: $color-bg;
border: 1px solid $border-color;
border-radius: $panel-border-radius;
+
+ & .tab-pane {
+ padding: 0.5rem;
+ }
}
.subnode-footer {
height: 38px;
diff --git a/web/pgadmin/static/scss/_bootstrap.overrides.scss b/web/pgadmin/static/scss/_bootstrap.overrides.scss
index e7b44e72..8ab15ad5 100644
--- a/web/pgadmin/static/scss/_bootstrap.overrides.scss
+++ b/web/pgadmin/static/scss/_bootstrap.overrides.scss
@@ -18,6 +18,10 @@ iframe {
border-width: 0;
}
+legend {
+ margin-bottom: 0rem;
+}
+
/* Padding for the treeview */
.browser-browser-pane {
padding-left: 0;
@@ -134,13 +138,19 @@ iframe {
border-left: 5px solid;
border-top: 5px solid transparent;
}
+/* 25px is for showing error icon */
.control-label {
display: inline-block;
margin: 0px;
- padding: 5px 25px 5px 5px;
+ padding: 5px 25px 5px 5px !important;
vertical-align: middle;
}
+.form-check {
+ padding-left: 0rem;
+ padding-right: 0.5rem;
+}
+
.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
color: $text-muted;
}
@@ -259,6 +269,7 @@ td.switch-cell > div.bootstrap-switch {
font-weight: bold;
&.active {
border-bottom: $active-border !important;
+ color: $color-primary;
}
}
}
@@ -311,3 +322,17 @@ td.switch-cell > div.bootstrap-switch {
.bootstrap-datetimepicker-widget thead th {
background-color: $color-bg;
}
+
+.input-group {
+ & .input-group-text {
+ background: $input-bg;
+ }
+}
+
+/* bootstrap-switch */
+.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary, .bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary {
+ background: $color-primary;
+}
+.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-success, .bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-success {
+ background: $color-success;
+}
diff --git a/web/pgadmin/static/scss/_pgadmin.style.scss b/web/pgadmin/static/scss/_pgadmin.style.scss
index 99b12e09..0e8ffc7a 100644
--- a/web/pgadmin/static/scss/_pgadmin.style.scss
+++ b/web/pgadmin/static/scss/_pgadmin.style.scss
@@ -24,9 +24,6 @@
.user-language div{
float:left;
}
-.user-language select{
- height: 25px !important;
-}
.Resizer {
background: $color-gray-lighter;
@@ -142,7 +139,7 @@
}
.alertify .ajs-body {
- min-height: $footer-height-calc*2;
+ min-height: $footer-height-calc*1.5;
}
@@ -248,6 +245,10 @@
margin-bottom: 33px;
}
+.pg-prop-btn-group-above {
+ border-bottom: $panel-border;
+}
+
.has-pg-prop-btn-group {
top: 45px;
height: calc(100% - 45px);
@@ -323,9 +324,10 @@
}
.pgadmin-controls {
- padding-right: 3px;
- padding-left: 3px;
+ padding-right: 0px;
+ padding-left: 0px;
}
+
.pgadmin-controls.SQL {
padding-right: 3px;
padding-left: 1px;
@@ -372,6 +374,11 @@
border-radius: 0rem;
border-top-left-radius: $card-border-radius;
border-top-right-radius: $card-border-radius;
+
+ &.collapsed {
+ border-bottom: none !important;
+ border-radius: $card-border-radius;
+ }
}
.obj_properties .badge .caret {
@@ -502,15 +509,17 @@ fieldset.inline-fieldset > div {
padding: 15px;
}
-.pgadmin-control-group.sql {
- margin: 0px;
- padding: 0px;
- height: 100%;
+.pgadmin-control-group{
+ &.sql, &.sqltab {
+ margin: 0px;
+ padding: 0px;
+ height: 100%;
+ }
}
.pgadmin-controls input[type="checkbox"]{
margin-left: 0 !important;
- margin-top: 0px !important;
+ margin-top: 10px !important;
}
.pgadmin-controls.sql_field_layout {
@@ -520,14 +529,14 @@ fieldset.inline-fieldset > div {
z-index: 1;
}
-.pgadmin-controls.focused {
- border-color: $color-primary-light;
+.pgadmin-controls.focused,
+.pgadmin-controls:focus {
+ border-color: $input-focus-border-color !important;
outline: 0;
- -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba($color-primary, .6);
- box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba($color-primary, .6);
+ -webkit-box-shadow: $input-focus-box-shadow;
+ box-shadow: $input-focus-box-shadow;
}
-
.dashboard-tab-container,
.pg-panel-statistics-container,
.pg-panel-depends-container,
@@ -742,14 +751,7 @@ form[name="change_password_form"] .help-block {
}
}
-.close-error-bar {
- background: $color-danger;
- padding: 5px;
- border-radius: 0px 4px 4px 0px;
-}
-
-.close-error-bar a {
- color: $color-danger-fg !important;
+.close-error {
cursor: pointer;
}
@@ -831,6 +833,15 @@ table.table-bottom-border {
}
}
+table.table-empty-rows{
+ thead th:last-of-type,tr:last-of-type{
+ & td, & th {
+ border-bottom: $panel-border;
+ }
+ }
+}
+
+
.context-menu-list .context-menu-submenu:after {
font-family: $font-family-icon;
content: "\f054" !important;
@@ -852,14 +863,21 @@ table.table-bottom-border {
padding-bottom: 1.0rem;
}
& .panel-body {
- padding-botttom: 0.8rem;
+ padding-bottom: 0.8rem;
}
& .btn-login {
background-color: $security-btn-color;
}
- & .user-language select {
- background-color: transparent;
- color: $security-text-color;
+ & .user-language {
+ & select{
+ background-color: $color-primary;
+ color: $security-text-color;
+
+ & option{
+ background-color: $color-primary;
+ color: $security-text-color;
+ }
+ }
}
& .pg-icon {
width: 28px;
@@ -917,7 +935,6 @@ table.table-bottom-border {
}
}
-
.backform-tab{
& > .nav.nav-tabs {
position: absolute;
@@ -928,7 +945,7 @@ table.table-bottom-border {
& > .tab-content {
position: absolute;
top: $title-height;
- bottom: 50px;
+ bottom: $footer-height-calc;
}
}
.ajs-content {
diff --git a/web/pgadmin/static/scss/_select2.overrides.scss b/web/pgadmin/static/scss/_select2.overrides.scss
index d7bb5b3e..afecaf7b 100644
--- a/web/pgadmin/static/scss/_select2.overrides.scss
+++ b/web/pgadmin/static/scss/_select2.overrides.scss
@@ -30,18 +30,14 @@
height: 100%;
}
-
-.select2-container--default.select2-container--focus
-.select2-selection--multiple {
- border: 1px solid $color-gray-light !important;
- outline: 0 none;
-}
-
.select2-container--default.select2-container--focus {
- border-color: $color-primary-light;
- outline: 0;
- -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba($color-primary, .6);
- box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba($color-primary, .6);
+ & .select2-selection--single,
+ & .select2-selection--multiple {
+ border-color: $input-focus-border-color !important;
+ outline: 0;
+ -webkit-box-shadow: $input-focus-box-shadow;
+ box-shadow: $input-focus-box-shadow;
+ }
}
diff --git a/web/pgadmin/static/scss/_webcabin.pgadmin.scss b/web/pgadmin/static/scss/_webcabin.pgadmin.scss
index 5550a207..79f68ecc 100644
--- a/web/pgadmin/static/scss/_webcabin.pgadmin.scss
+++ b/web/pgadmin/static/scss/_webcabin.pgadmin.scss
@@ -29,8 +29,8 @@
}
.wcFrameButton {
- width: 25px;
- height: 20px;
+ width: 24px;
+ height: 22px;
display: flex;
border-radius: $btn-border-radius;
margin: auto;
@@ -85,6 +85,66 @@
.wcFloating {
box-shadow: $box-shadow;
z-index: 1050 !important;
+
+ &.wcFrame, & .wcPanelBackground {
+ border-bottom-left-radius: $card-border-radius;
+ border-bottom-right-radius: $card-border-radius;
+ }
+
+ & .pg-panel-content {
+ border-bottom: $card-border-radius;
+ }
+
+ & .wcFrameCornerNE,
+ & .wcFrameCornerNW,
+ & .wcFrameCornerSE,
+ & .wcFrameCornerSW {
+ height: $card-border-radius*2;
+ width: $card-border-radius*2;
+ background: transparent;
+ }
+
+ & .wcFrameCornerNE {
+ border: $panel-border;
+ border-left: none !important;
+ border-bottom: none !important;
+ border-radius: none;
+ border-top-right-radius: $card-border-radius;
+ }
+
+ & .wcFrameCornerNW {
+ border: $panel-border;
+ border-right: none !important;
+ border-bottom: none !important;
+ border-radius: none;
+ border-top-left-radius: $card-border-radius;
+ }
+
+ & .wcFrameCornerSE {
+ border: $panel-border;
+ border-top: none !important;
+ border-left: none !important;
+ border-radius: none;
+ border-bottom-right-radius: $card-border-radius;
+ }
+
+ & .wcFrameCornerSW {
+ border: $panel-border;
+ border-right: none !important;
+ border-top: none !important;
+ border-radius: none;
+ border-bottom-left-radius: $card-border-radius;
+ }
+
+ .wcFrameEdgeH {
+ left: $card-border-radius !important;
+ right: $card-border-radius !important;
+ }
+
+ .wcFrameEdgeV {
+ top: $card-border-radius !important;
+ bottom: $card-border-radius !important;
+ }
}
.wcFloating .wcPanelTabActive {
diff --git a/web/pgadmin/static/scss/resources/_default.style.scss b/web/pgadmin/static/scss/resources/_default.style.scss
index 0096d3e9..f90fe47a 100644
--- a/web/pgadmin/static/scss/resources/_default.style.scss
+++ b/web/pgadmin/static/scss/resources/_default.style.scss
@@ -22,6 +22,10 @@
&-light {
background-color: $color-danger-light;
}
+
+ &-lighter {
+ background-color: $color-danger-lighter;
+ }
}
.bg-success {
@@ -81,6 +85,10 @@
&-light {
border-color: $color-danger-light;
}
+
+ &-lighter {
+ border-color: $color-danger-lighter;
+ }
}
.border-success {
diff --git a/web/pgadmin/static/scss/resources/_default.variables.scss b/web/pgadmin/static/scss/resources/_default.variables.scss
index a97bedca..79eff097 100644
--- a/web/pgadmin/static/scss/resources/_default.variables.scss
+++ b/web/pgadmin/static/scss/resources/_default.variables.scss
@@ -19,7 +19,8 @@ $color-secondary: $white !default;
$color-danger: #e53935 !default;
$color-danger-fg: $white !default;
-$color-danger-light: #FBE1E1;
+$color-danger-light: #F39999;
+$color-danger-lighter: #FAECEC;
$color-success: #43a047 !default;
$color-success-fg: $black !default;
@@ -51,7 +52,7 @@ $font-family-editor: 'Source Code Pro' !default;
$font-family-icon: 'FontAwesome' !default;
$border-width: 1px;
-$border-color: rgba($color-gray, 0.5);
+$border-color: #dde0e6;
$border-color-dark: $color-gray;
$box-shadow: 0 0.5rem 3rem $color-gray-dark;
@@ -59,7 +60,8 @@ $box-shadow: 0 0.5rem 3rem $color-gray-dark;
$gray-600: $color-gray-dark;
$gray-900: $color-fg-theme;
$body-color: $color-fg-theme;
-$font-size-base: 0.815rem;
+$font-size-base: 0.875rem;
+$line-height-base: 1.5; // no change
$grid-gutter-width: 15px;
$border-radius: 0.25rem; //no change
@@ -122,9 +124,19 @@ $input-border-radius: $border-radius; //no change
$input-disabled-bg: $color-gray-lighter;
$input-btn-border-width: $border-width; //no change
$input-border-width: $input-btn-border-width; //no change
-$input-btn-padding-y: .375rem; //no change
+$input-btn-padding-y: .25rem;
$input-btn-padding-x: .75rem; //no change
+$component-active-bg: $color-primary; //no change
+$input-btn-focus-width: .2rem !default; //no change
+$input-btn-focus-color: rgba($component-active-bg, .25) !default; //no change
+$input-btn-focus-box-shadow: 0 0 0 $input-btn-focus-width $input-btn-focus-color !default; //no change
+$input-focus-bg: $input-bg !default; //no change
+$input-focus-border-color: lighten($component-active-bg, 25%) !default; //no change
+$input-focus-color: $input-color !default; //no change
+$input-focus-width: $input-btn-focus-width !default; //no change
+$input-focus-box-shadow: $input-btn-focus-box-shadow !default; //no change
+
$btn-border-radius: $border-radius; //no change
/***************/
@@ -136,12 +148,12 @@ $panel-border-radius: $border-radius;
$panel-border: $panel-border-width solid $panel-border-color !important;
$panel-border-dark: $panel-border-width solid $border-color-dark !important;
$tabs-padding: 5px 10px 2px;
-$title-height: 37px * $font-size-base/1rem;
+$title-height: ($line-height-base*16px) + 5px + 2px + $border-width;
$footer-padding: 0.5rem;
-$footer-min-height: 2.18rem;
+$footer-min-height: 2rem;
$footer-height-calc: $footer-min-height+$footer-padding*2;
-$navbar-font-size: 0.875rem;
-$navbar-user-font-size: 0.815rem;
+$navbar-font-size: 0.925rem;
+$navbar-user-font-size: 0.875rem;
$navbar-dropdown-top: 100%;
$dropdown-submenu-top: -$dropdown-spacer;
@@ -160,7 +172,7 @@ $sql-gutters-bg: $color-gray-light;
$sql-history-detail-bg: $color-gray-lighter;
$sql-history-success-bg: $color-primary-light;
$sql-history-success-fg: $color-primary;
-$sql-history-error-bg: $color-danger-light;
+$sql-history-error-bg: $color-danger-lighter;
$sql-history-error-fg: $color-danger;
$negative-bg: $color-gray-light;
@@ -175,7 +187,7 @@ $btn-secondary-hover-bg: $color-gray-light;
$card-header-padding : 0.25rem 0.5rem;
$no-border-radius: 0px !important;
-$btn-checkbox-padding: 0.3rem 0.8rem;
+$btn-checkbox-padding: $input-btn-padding-y $input-btn-padding-x;
$security-text-color: $white;
$security-btn-color: #038bba;
diff --git a/web/pgadmin/static/vendor/backform/backform.js b/web/pgadmin/static/vendor/backform/backform.js
index b0b72511..b0d2fd4a 100644
--- a/web/pgadmin/static/vendor/backform/backform.js
+++ b/web/pgadmin/static/vendor/backform/backform.js
@@ -404,7 +404,6 @@
var SpacerControl = Backform.SpacerControl = Control.extend({
template: _.template([
- '<label class="<%=Backform.controlLabelClassName%>"> </label>',
'<div class="<%=Backform.controlsClassName%>"></div>'
].join("\n"))
});
@@ -558,7 +557,7 @@
},
template: _.template([
'<label class="<%=Backform.controlLabelClassName%>"><%=label%></label>',
- '<div class="<%=Backform.controlContainerClassName%> form-check-inline">',
+ '<div class="<%=Backform.controlContainerClassName%> d-flex">',
' <% for (var i=0; i < options.length; i++) { %>',
' <% var option = options[i]; %>',
' <% var id = _.uniqueId("bf_"); %>',
diff --git a/web/pgadmin/static/vendor/backgrid/backgrid.css b/web/pgadmin/static/vendor/backgrid/backgrid.css
index 7eb59697..c4298e22 100644
--- a/web/pgadmin/static/vendor/backgrid/backgrid.css
+++ b/web/pgadmin/static/vendor/backgrid/backgrid.css
@@ -80,10 +80,6 @@
text-align: center;
}
-.backgrid td.editor {
- padding: 0;
-}
-
.backgrid td.editor,
.backgrid tbody tr:nth-child(odd) td.editor {
background-color: rgba(82, 168, 236, 0.1);
diff --git a/web/pgadmin/templates/security/fields.html b/web/pgadmin/templates/security/fields.html
index a07971aa..efb126b2 100644
--- a/web/pgadmin/templates/security/fields.html
+++ b/web/pgadmin/templates/security/fields.html
@@ -4,7 +4,7 @@
type="{% if type %}{{ type }}{% else %}{{ field.type }}{% endif %}" autofocus>
{% if field.errors %}
{% for error in field.errors %}
- <span class="form-text text-danger">{{ error }}</span>
+ <span class="form-text">{{ error }}</span>
{% endfor %}
{% endif %}
</div>
diff --git a/web/pgadmin/templates/security/login_user.html b/web/pgadmin/templates/security/login_user.html
index b53f9461..7515c2c2 100644
--- a/web/pgadmin/templates/security/login_user.html
+++ b/web/pgadmin/templates/security/login_user.html
@@ -14,8 +14,8 @@
{{ render_field_with_errors(login_user_form.password, "password") }}
<button class="btn btn-primary btn-block btn-login" type="submit" value="{{ _('Login') }}">{{ _('Login') }}</button>
<div class="form-group row mb-3 c user-language">
- <div class="col-8"><span class="help-block">{{ _('<a href="%(url)s" class="text-white">Forgotten your password</a>?', url=url_for('browser.forgot_password')) }}</span></div>
- <div class="col-4">
+ <div class="col-7"><span class="help-block">{{ _('<a href="%(url)s" class="text-white">Forgotten your password</a>?', url=url_for('browser.forgot_password')) }}</span></div>
+ <div class="col-5">
<select class="form-control" name="language" value="{{user_language}}">
{% for key, lang in config.LANGUAGES.items() %}
<option value="{{key}}" {% if user_language == key %}selected{% endif %}>{{lang}}</option>
diff --git a/web/pgadmin/tools/backup/static/js/backup.js b/web/pgadmin/tools/backup/static/js/backup.js
index 3662f5a5..3bb5da0d 100644
--- a/web/pgadmin/tools/backup/static/js/backup.js
+++ b/web/pgadmin/tools/backup/static/js/backup.js
@@ -50,7 +50,7 @@ define([
' <span class="<%=Backform.helpMessageClassName%>"><%=helpMessage%></span>',
'<% } %>',
].join('\n')),
- className: 'pgadmin-control-group form-group pg-el-md-6 pg-el-xs-12 row',
+ className: 'pgadmin-control-group form-group pg-el-md-6 pg-el-12 row',
});
//Backup Model (Server Node)
@@ -580,7 +580,7 @@ define([
alertify,
BackupModel
);
- dialog.draw(action, item, {'globals': true});
+ dialog.draw(action, item, {'globals': true}, pgBrowser.stdW.md, pgBrowser.stdH.md);
},
start_backup_server: function(action, item) {
let dialog = new globalBackupDialog.BackupDialog(
@@ -589,7 +589,7 @@ define([
alertify,
BackupObjectModel
);
- dialog.draw(action, item, {'server': true});
+ dialog.draw(action, item, {'server': true}, pgBrowser.stdW.md, pgBrowser.stdH.md);
},
// Callback to draw Backup Dialog for objects
backup_objects: function(action, treeItem) {
@@ -599,7 +599,7 @@ define([
alertify,
BackupObjectModel
);
- dialog.draw(action, treeItem, null);
+ dialog.draw(action, treeItem, null, pgBrowser.stdW.md, pgBrowser.stdH.md);
},
};
return pgBrowser.Backup;
diff --git a/web/pgadmin/tools/backup/static/js/backup_dialog.js b/web/pgadmin/tools/backup/static/js/backup_dialog.js
index 8613ddd6..bd68ecb5 100644
--- a/web/pgadmin/tools/backup/static/js/backup_dialog.js
+++ b/web/pgadmin/tools/backup/static/js/backup_dialog.js
@@ -28,7 +28,7 @@ export class BackupDialog extends Dialog {
});
}
- draw(action, aciTreeItem, params) {
+ draw(action, aciTreeItem, params, width=0, height=0) {
const serverInformation = this.retrieveAncestorOfTypeServer(aciTreeItem);
if (!serverInformation) {
@@ -66,7 +66,7 @@ export class BackupDialog extends Dialog {
typeOfDialog
);
- dialog(true).resizeTo('60%', '50%');
+ dialog(true).resizeTo(width, height);
}).catch(function() {
that.alertify.alert(
gettext('Utility not found'),
diff --git a/web/pgadmin/tools/datagrid/static/js/datagrid.js b/web/pgadmin/tools/datagrid/static/js/datagrid.js
index 8b842c56..c27482ab 100644
--- a/web/pgadmin/tools/datagrid/static/js/datagrid.js
+++ b/web/pgadmin/tools/datagrid/static/js/datagrid.js
@@ -379,7 +379,7 @@ define('pgadmin.datagrid', [
$.get(url_for('datagrid.filter'),
function(data) {
alertify.filterDialog('Data Filter', data, baseUrl, validateUrl)
- .resizeTo(300, 200);
+ .resizeTo(pgBrowser.stdW.sm,pgBrowser.stdH.sm);
}
);
},
diff --git a/web/pgadmin/tools/debugger/static/js/debugger_ui.js b/web/pgadmin/tools/debugger/static/js/debugger_ui.js
index f86418e3..6372835d 100644
--- a/web/pgadmin/tools/debugger/static/js/debugger_ui.js
+++ b/web/pgadmin/tools/debugger/static/js/debugger_ui.js
@@ -951,7 +951,7 @@ define([
Alertify.debuggerInputArgsDialog(
gettext('Debugger'), debug_info, restart_debug, is_edb_proc
- ).resizeTo('60%', '60%');
+ ).resizeTo(pgBrowser.stdW.md,pgBrowser.stdH.md);
};
diff --git a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
index f87742e6..ece3945c 100644
--- a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
+++ b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
@@ -1031,6 +1031,7 @@ define([
// Render SqlTab control to generate its html markup
var sqlCtrlHtml = sqlControl.render().$el;
+ sqlCtrlHtml.addClass('h-100');
this.render = function() {
return {
el: sqlCtrlHtml,
@@ -1150,7 +1151,7 @@ define([
}
// Call Grant Wizard Dialog and set dimensions for wizard
- Alertify.wizardDialog(true).resizeTo('55%', '75%');
+ Alertify.wizardDialog(true).resizeTo(pgBrowser.stdW.lg,pgBrowser.stdH.lg);
},
};
diff --git a/web/pgadmin/tools/grant_wizard/static/scss/_grant_wizard.scss b/web/pgadmin/tools/grant_wizard/static/scss/_grant_wizard.scss
index 35810cb1..5975d607 100644
--- a/web/pgadmin/tools/grant_wizard/static/scss/_grant_wizard.scss
+++ b/web/pgadmin/tools/grant_wizard/static/scss/_grant_wizard.scss
@@ -29,6 +29,7 @@
height: calc(100% - 15px);
display: block;
padding: 0;
+ overflow-y: hidden !important;
}
.object_type_table thead {
@@ -114,8 +115,8 @@
.wizard-right-panel_content .CodeMirror {
border: 1px solid $color-gray-light;
- height: 285px !important;
- min-height: 285px !important;
+ height: 100% !important;
+ min-height: 100% !important;
}
.wizard-right-panel_content .CodeMirror-linenumber {
@@ -123,10 +124,6 @@
border-right: none;
}
-.wizard-right-panel_content .CodeMirror-gutters {
- min-height: 285px !important;
-}
-
.grant_wizard_container {
position: relative;
overflow: hidden;
diff --git a/web/pgadmin/tools/import_export/static/js/import_export.js b/web/pgadmin/tools/import_export/static/js/import_export.js
index 35f41ac8..93e34d4e 100644
--- a/web/pgadmin/tools/import_export/static/js/import_export.js
+++ b/web/pgadmin/tools/import_export/static/js/import_export.js
@@ -682,7 +682,7 @@ Backform, commonUtils, supportedNodes
S(
gettext('Import/Export data - table \'%s\'')
).sprintf(treeInfo.table.label).value(), node, i, d
- ).set('resizable', true).resizeTo('70%', '80%');
+ ).set('resizable', true).resizeTo(pgAdmin.Browser.stdW.md,pgAdmin.Browser.stdH.md);
})
.fail(function() {
Alertify.alert(
diff --git a/web/pgadmin/tools/maintenance/static/js/maintenance.js b/web/pgadmin/tools/maintenance/static/js/maintenance.js
index f402dabf..b9e584cf 100644
--- a/web/pgadmin/tools/maintenance/static/js/maintenance.js
+++ b/web/pgadmin/tools/maintenance/static/js/maintenance.js
@@ -34,7 +34,7 @@ define([
' <span class="<%=Backform.helpMessageClassName%>"><%=helpMessage%></span>',
'<% } %>',
].join('\n')),
- className: 'pgadmin-control-group form-group col-6',
+ className: 'pgadmin-control-group form-group pg-el-md-6 pg-el-12 row',
});
// Main model for Maintenance functionality
@@ -492,7 +492,8 @@ define([
return;
}
// Open the Alertify dialog
- Alertify.MaintenanceDialog('Maintenance...').set('resizable', true).resizeTo('60%', '80%');
+ Alertify.MaintenanceDialog('Maintenance...').set('resizable', true)
+ .resizeTo(pgAdmin.Browser.stdW.md,pgAdmin.Browser.stdH.md);
})
.fail(function() {
Alertify.alert(
diff --git a/web/pgadmin/tools/restore/static/js/restore.js b/web/pgadmin/tools/restore/static/js/restore.js
index 2dcfdd60..fcb96396 100644
--- a/web/pgadmin/tools/restore/static/js/restore.js
+++ b/web/pgadmin/tools/restore/static/js/restore.js
@@ -29,7 +29,7 @@ commonUtils, menuUtils, supportedNodes, restoreDialog
' <span class="<%=Backform.helpMessageClassName%>"><%=helpMessage%></span>',
'<% } %>',
].join('\n')),
- className: 'pgadmin-control-group form-group pg-el-4 row',
+ className: 'pgadmin-control-group form-group pg-el-md-6 row',
});
//Restore Model (Objects like Database/Schema/Table)
@@ -381,7 +381,7 @@ commonUtils, menuUtils, supportedNodes, restoreDialog
let dialog = new restoreDialog.RestoreDialog(
pgBrowser, $, alertify, RestoreObjectModel
);
- dialog.draw(action, treeItem);
+ dialog.draw(action, treeItem, pgBrowser.stdW.md, pgBrowser.stdH.md);
},
};
return pgBrowser.Restore;
diff --git a/web/pgadmin/tools/restore/static/js/restore_dialog.js b/web/pgadmin/tools/restore/static/js/restore_dialog.js
index 88970b2c..1fe36bc9 100644
--- a/web/pgadmin/tools/restore/static/js/restore_dialog.js
+++ b/web/pgadmin/tools/restore/static/js/restore_dialog.js
@@ -27,7 +27,7 @@ export class RestoreDialog extends Dialog {
});
}
- draw(action, aciTreeItem) {
+ draw(action, aciTreeItem, width, height) {
const serverInformation = this.retrieveAncestorOfTypeServer(aciTreeItem);
@@ -69,7 +69,8 @@ export class RestoreDialog extends Dialog {
let title = sprintf(gettext('Restore (%s: %s)'), node.label, data.label);
that.createOrGetDialog(title, 'restore');
- that.alertify.pg_restore(title, aciTreeItem1, data, node).resizeTo('65%', '60%');
+ that.alertify.pg_restore(title, aciTreeItem1, data, node)
+ .resizeTo(width, height);
}).catch(function() {
that.alertify.alert(
gettext('Utility not found'),
diff --git a/web/pgadmin/tools/sqleditor/static/css/sqleditor.css b/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
index 5961dc5a..91c515f4 100644
--- a/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
+++ b/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
@@ -310,7 +310,9 @@ input.editor-checkbox:focus {
/* For Filter status bar */
.data_sorting_dialog .pg-prop-status-bar {
position: absolute;
- bottom: 40px;
+ left: 0;
+ right: 0;
+ bottom: 0;
z-index: 5;
}
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
index b334036a..4b1fbb10 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -2172,7 +2172,7 @@ define('tools.querytool', [
/* If filter is applied then remove class 'btn-secondary'
- * and add 'btn-warning' to change the colour of the button.
+ * and add 'btn-primary' to change the colour of the button.
*/
if (self.can_filter && res.data.filter_applied) {
$('#btn-filter').removeClass('btn-secondary');
diff --git a/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss b/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
index 73513620..5d425bb8 100644
--- a/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
+++ b/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
@@ -218,11 +218,10 @@ li.CodeMirror-hint-active {
.pg_text_editor {
z-index:10000;
position:absolute;
- background: $color-bg;
- padding: 7px 5px 5px 1px;
- border:2px solid $color-gray;
- -moz-border-radius:10px;
- border-radius:10px;
+ background: $color-bg-theme;
+ padding: 0.25rem;
+ border: $panel-border;
+ box-shadow: $dropdown-box-shadow;
}
.editor-title {
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 f928c0bb..212a9de0 100644
--- a/web/pgadmin/tools/user_management/static/js/user_management.js
+++ b/web/pgadmin/tools/user_management/static/js/user_management.js
@@ -122,7 +122,7 @@ define([
});
}
- alertify.ChangePassword(title, url).resizeTo('55%', '60%');
+ alertify.ChangePassword(title, url).resizeTo(pgBrowser.stdW.lg, pgBrowser.stdH.md);
},
isPgaLoginRequired(xhr) {
@@ -220,7 +220,7 @@ define([
});
}
- alertify.PgaLogin(title, url).resizeTo('75%','70%');
+ alertify.PgaLogin(title, url).resizeTo(pgBrowser.stdW.md, pgBrowser.stdH.md);
},
// Callback to draw User Management Dialog.
@@ -625,18 +625,19 @@ define([
prepare: function() {
var footerTpl = _.template([
'<div class="pg-prop-footer" style="visibility:hidden;">',
- '<div class="pg-prop-status-bar">',
- '<div class="media error-in-footer bg-danger-light border-danger text-danger text-14">',
- '<div class="media-body media-middle">',
- '<div class="alert-icon error-icon">',
- '<i class="fa fa-exclamation-triangle" aria-hidden="true"></i>',
- '</div>',
- '<div class="alert-text">',
- '</div>',
- '<div class="close-error-bar"><a class="close-error">x</a></div>',
- '</div>',
- '</div>',
- '</div>',
+ ' <div class="pg-prop-status-bar">',
+ ' <div class="error-in-footer"> ',
+ ' <div class="d-flex px-2 py-1"> ',
+ ' <div class="pr-2"> ',
+ ' <i class="fa fa-exclamation-triangle text-danger" aria-hidden="true"></i> ',
+ ' </div> ',
+ ' <div class="alert-text"></div> ',
+ ' <div class="ml-auto close-error-bar"> ',
+ ' <a class="close-error fa fa-times text-danger"></a> ',
+ ' </div> ',
+ ' </div> ',
+ ' </div> ',
+ ' </div>',
'</div>',
].join('\n')),
$statusBar = $(footerTpl()),
@@ -887,7 +888,7 @@ define([
};
});
}
- alertify.UserManagement(true).resizeTo('680px', '400px');
+ alertify.UserManagement(true).resizeTo(pgBrowser.stdW.md, pgBrowser.stdH.md);
},
};
diff --git a/web/pgadmin/tools/user_management/static/scss/_user_management.scss b/web/pgadmin/tools/user_management/static/scss/_user_management.scss
index 145bb664..ca1b090a 100644
--- a/web/pgadmin/tools/user_management/static/scss/_user_management.scss
+++ b/web/pgadmin/tools/user_management/static/scss/_user_management.scss
@@ -24,23 +24,4 @@
.user_management .backform-tab {
height: calc(100% - 75px);
-}
-
-.user_management .search_users {
- float:right;
- margin-right: 5px;
- padding:0 !important;
-}
-
-.user_management .search_users input{
- height:15px;
- margin-top: 3px;
-}
-
-.user_management input[placeholder] {
- font-size: 12px;
-}
-
-.user_management_pg-alertify-button {
- line-height: 16px;
-}
+}
\ No newline at end of file
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
@ 2019-01-02 05:52 ` Aditya Toshniwal <[email protected]>
2019-01-02 09:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Aditya Toshniwal @ 2019-01-02 05:52 UTC (permalink / raw)
To: pgadmin-hackers <[email protected]>
Hi Hackers,
Kindly ignore the previous patch. Attaching updated patch with few more
corrections.
The patch includes:
- 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.
- Other improvements wherever noticed.
On Tue, Jan 1, 2019 at 11:09 AM Aditya Toshniwal <
[email protected]> wrote:
> Hi Hackers,
>
> Attached is the patch to improve the previously committed new design
> changes.
> The patch includes:
> - 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)
> - Other improvements wherever noticed.
>
> I hope this covers majority of the issues.
> Kindly review.
>
>
> On Fri, Dec 21, 2018 at 7:48 PM Aditya Toshniwal <
> [email protected]> wrote:
>
>>
>>
>> On Fri, Dec 21, 2018 at 7:46 PM Dave Page <[email protected]> wrote:
>>
>>> On Fri, Dec 21, 2018 at 2:14 PM Aditya Toshniwal
>>> <[email protected]> wrote:
>>> >
>>> > For the query tool results grid text pop-out, you mean the border size
>>> around it ?
>>> > We don't have any design discussed for it, so could you please propose
>>> what can be done.
>>>
>>> Border, button colours etc. I can't draw anything, but I'd suggest
>>> that the border should be squared not rounded, and the
>>> thickness/shadow etc adjusted to match the other styling.
>>>
>> Cool.
>> Button colors are already changed. Others things noted. Will work on it.
>>
>>> >
>>> > On Fri, Dec 21, 2018 at 7:35 PM Dave Page <[email protected]> wrote:
>>> >>
>>> >> On Fri, Dec 21, 2018 at 2:02 PM Aditya Toshniwal
>>> >> <[email protected]> wrote:
>>> >> >
>>> >> >
>>> >> >
>>> >> > On Fri, Dec 21, 2018 at 7:29 PM Dave Page <[email protected]>
>>> wrote:
>>> >> >>
>>> >> >> One other issue: I'm seeing that standard sized dialogues (e.g. the
>>> >> >> Server or Database Properties dialogues) are wrapping their labels
>>> and
>>> >> >> controls at the default size. That should not be the case.
>>> >> >
>>> >> > Yep. Akshay has logged that in the sheet shared (
>>> https://drive.google.com/open?id=127BgrvdVUvWSEp-GnQvCDx1WaaemsycxSD0aUpWxb6k
>>> ).
>>> >>
>>> >> OK, but the answer isn't to increase the size of the dialogues as
>>> >> suggested. The size is fine (though we should review for consistency,
>>> >> and ensure we are using no more than 3 default standard sizes
>>> >> throughout the app); we should make the controls display nicely on the
>>> >> default dialogue size and wrap if the user makes it smaller than we
>>> >> can display in.
>>> >>
>>> >> >> On Fri, Dec 21, 2018 at 12:46 PM Dave Page <[email protected]>
>>> wrote:
>>> >> >> >
>>> >> >> > Hi
>>> >> >> >
>>> >> >> > On Fri, Dec 21, 2018 at 12:29 PM Aditya Toshniwal
>>> >> >> > <[email protected]> wrote:
>>> >> >> > >
>>> >> >> > > Hi Dave,
>>> >> >> > >
>>> >> >> > > On Fri, Dec 21, 2018 at 5:51 PM Dave Page <[email protected]>
>>> wrote:
>>> >> >> > >>
>>> >> >> > >> Nice! Thanks Ashesh.
>>> >> >> > >>
>>> >> >> > >> Some small issues I spotted:
>>> >> >> > >>
>>> >> >> > >> - The font looks somewhat small. How does it compare in size
>>> to, say,
>>> >> >> > >> Gmail? I think it needs to be increased to at least that size.
>>> >> >> > >
>>> >> >> > > Gmail uses 0.875rem (14px) for the left panel (Inbox, Sent).
>>> We are using 0.875rem (14px) for main navbar links and 0.815rem(13.04px)
>>> for all other text.
>>> >> >> >
>>> >> >> > Let's increase the default to 0.875, and make the main links
>>> >> >> > proportionally bigger.
>>> >> >> >
>>> >> >> > >> - Dialogues have 2 close buttons next to each other in the
>>> top-right.
>>> >> >> > >> Looks like an icon and a text version?
>>> >> >> > >
>>> >> >> > > You need to do a yarn install. wcDocker code is changed to fix
>>> that.
>>> >> >> >
>>> >> >> > Yup, that fixed it.
>>> >> >> >
>>> >> >> > >> - Why do some Preferences panels use alternate line
>>> colouring, whilst
>>> >> >> > >> others don't? I suspect it's because some are actually tables
>>> under
>>> >> >> > >> the hood? I think we need consistency there.
>>> >> >> > >
>>> >> >> > > Noted.
>>> >> >> > >>
>>> >> >> > >>
>>> >> >> > >> - The Maintenance dialogue looks terrible - it needs to be
>>> made much
>>> >> >> > >> more compact. I also seem to be getting a failure to create
>>> >> >> > >> maintenance jobs (backups etc work fine).
>>> >> >> > >
>>> >> >> > > Noted.
>>> >> >> > >>
>>> >> >> > >>
>>> >> >> > >> - I think the buttons on the Browser need borders to match
>>> other buttons.
>>> >> >> > >
>>> >> >> > > It is made consistent with other wcDocker buttons like close,
>>> right arrow, left arrow. However, we can make it look like other buttons.
>>> >> >> >
>>> >> >> > I think they're a different class of buttons -
>>> control/navigation vs.
>>> >> >> > function. I think we should make this change as the browser
>>> buttons
>>> >> >> > really are a toolbar just like the larger on on the query tool.
>>> >> >> >
>>> >> >> > Thanks!
>>> >> >> >
>>> >> >> > >> Thanks!
>>> >> >> > >>
>>> >> >> > >> On Fri, Dec 21, 2018 at 12:01 PM Ashesh Vashi
>>> >> >> > >> <[email protected]> wrote:
>>> >> >> > >> >
>>> >> >> > >> > Improvement in the look and feel of the whole application
>>> >> >> > >> >
>>> >> >> > >> > Changed the SCSS/CSS for the below third party libraries to
>>> adopt the
>>> >> >> > >> > new look 'n' feel:
>>> >> >> > >> > - wcDocker
>>> >> >> > >> > - Alertify dialogs, and notifications
>>> >> >> > >> > - AciTree
>>> >> >> > >> > - Bootstrap Navbar
>>> >> >> > >> > - Bootstrap Tabs
>>> >> >> > >> > - Bootstrap Drop-Down menu
>>> >> >> > >> > - Backgrid
>>> >> >> > >> > - Select2
>>> >> >> > >> >
>>> >> >> > >> > Adopated the new the look 'n' feel for the dialogs, wizard,
>>> properties,
>>> >> >> > >> > tab panels, tabs, fieldset, subnode control, spinner
>>> control, HTML
>>> >> >> > >> > table, and other form controls.
>>> >> >> > >> >
>>> >> >> > >> > - Font is changed to Roboto
>>> >> >> > >> > - Using SCSS variables to define the look 'n' feel
>>> >> >> > >> > - Designer background images for the Login, and Forget
>>> password pages in
>>> >> >> > >> > 'web' mode
>>> >> >> > >> > - Improved the look 'n' feel for the key selection in the
>>> preferences
>>> >> >> > >> > dialog
>>> >> >> > >> > - Table classes consistency changes across the application
>>> >> >> > >> > - File Open and Save dialog list view changes
>>> >> >> > >> >
>>> >> >> > >> > Author(s): Aditya Toshniwal & Khushboo Vashi
>>> >> >> > >> >
>>> >> >> > >> > Branch
>>> >> >> > >> > ------
>>> >> >> > >> > master
>>> >> >> > >> >
>>> >> >> > >> > Details
>>> >> >> > >> > -------
>>> >> >> > >> >
>>> https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5799ac14ba17dc25fbec184b3b2c6afbe37f...
>>> >> >> > >> >
>>> >> >> > >> > Modified Files
>>> >> >> > >> > --------------
>>> >> >> > >> > web/package.json | 2 +-
>>> >> >> > >> > .../static/js/fts_configuration.js | 2 +-
>>> >> >> > >> > .../databases/schemas/functions/__init__.py | 4 +-
>>> >> >> > >> > .../function => static}/css/function.css | 0
>>> >> >> > >> > .../templates/trigger_function/css/function.css | 3 -
>>> >> >> > >> > .../{templates/edbfunc => static}/css/edbfunc.css | 0
>>> >> >> > >> > .../static/js/exclusion_constraint.js | 18 +-
>>> >> >> > >> > .../foreign_key/static/js/foreign_key.js | 17 +-
>>> >> >> > >> > .../schemas/tables/rules/static/css/rule.css | 7 +
>>> >> >> > >> > .../tables/rules/templates/rules/css/rule.css | 8 -
>>> >> >> > >> > .../databases/schemas/views/static/css/view.css | 7 +
>>> >> >> > >> > .../schemas/views/templates/mview/css/mview.css | 4 -
>>> >> >> > >> > .../schemas/views/templates/view/css/view.css | 4 -
>>> >> >> > >> > .../pgagent/schedules/static/js/pga_schedule.js | 3 +-
>>> >> >> > >> > .../servers/pgagent/static/css/pga_job.css | 3 +
>>> >> >> > >> > .../pgagent/templates/pga_job/css/pga_job.css | 13 -
>>> >> >> > >> > .../server_groups/servers/static/css/servers.css | 4 +
>>> >> >> > >> > .../server_groups/servers/static/js/server.js | 22 +-
>>> >> >> > >> > .../server_groups/servers/static/js/variable.js | 4 +-
>>> >> >> > >> > .../servers/tablespaces/static/js/tablespace.js | 13 +-
>>> >> >> > >> > .../servers/templates/css/servers.css | 4 -
>>> >> >> > >> > web/pgadmin/browser/static/css/browser.css | 13 -
>>> >> >> > >> > web/pgadmin/browser/static/css/wizard.css | 21 +-
>>> >> >> > >> > web/pgadmin/browser/static/js/browser.js | 26 +-
>>> >> >> > >> > web/pgadmin/browser/static/js/collection.js | 16 +-
>>> >> >> > >> > web/pgadmin/browser/static/js/keyboard.js | 14 +-
>>> >> >> > >> > web/pgadmin/browser/static/js/menu.js | 28 +-
>>> >> >> > >> > web/pgadmin/browser/static/js/node.js | 53 +-
>>> >> >> > >> > web/pgadmin/browser/static/js/node.ui.js | 4 +-
>>> >> >> > >> > web/pgadmin/browser/static/js/panel.js | 15 +-
>>> >> >> > >> > web/pgadmin/browser/static/js/toolbar.js | 3 -
>>> >> >> > >> > web/pgadmin/browser/static/js/wizard.js | 58 +-
>>> >> >> > >> > web/pgadmin/browser/static/scss/_browser.scss | 43 +-
>>> >> >> > >> > web/pgadmin/browser/static/scss/_wizard.scss | 41 +-
>>> >> >> > >> > web/pgadmin/browser/templates/browser/css/node.css | 2 +-
>>> >> >> > >> > web/pgadmin/browser/templates/browser/index.html | 9 +-
>>> >> >> > >> > web/pgadmin/dashboard/__init__.py | 2 +-
>>> >> >> > >> > web/pgadmin/dashboard/static/css/dashboard.css | 21 +-
>>> >> >> > >> > web/pgadmin/dashboard/static/js/dashboard.js | 120 +-
>>> >> >> > >> > web/pgadmin/dashboard/static/scss/_dashboard.scss | 44 +-
>>> >> >> > >> > .../templates/dashboard/database_dashboard.html | 171
>>> ++-
>>> >> >> > >> > .../templates/dashboard/server_dashboard.html | 197
>>> ++-
>>> >> >> > >> > .../templates/dashboard/welcome_dashboard.html | 30 +-
>>> >> >> > >> > web/pgadmin/feature_tests/browser_tool_bar_test.py | 23 +-
>>> >> >> > >> > web/pgadmin/feature_tests/file_manager_test.py | 23 +-
>>> >> >> > >> > .../feature_tests/keyboard_shortcut_test.py | 5 +-
>>> >> >> > >> > .../feature_tests/pg_datatype_validation_test.py | 5 +-
>>> >> >> > >> > .../pg_utilities_backup_restore_test.py | 28 +-
>>> >> >> > >> > .../feature_tests/pg_utilities_maintenance_test.py | 16 +-
>>> >> >> > >> > .../feature_tests/query_tool_journey_test.py | 5 +-
>>> >> >> > >> > web/pgadmin/feature_tests/query_tool_tests.py | 117 +-
>>> >> >> > >> > web/pgadmin/feature_tests/view_data_dml_queries.py | 16 +-
>>> >> >> > >> > .../misc/bgprocess/static/css/bgprocess.css | 11 -
>>> >> >> > >> > web/pgadmin/misc/bgprocess/static/js/bgprocess.js | 173
>>> ++-
>>> >> >> > >> > .../misc/bgprocess/static/scss/_bgprocess.scss | 81 +-
>>> >> >> > >> > web/pgadmin/misc/depends/static/js/depends.js | 3 +-
>>> >> >> > >> > .../misc/file_manager/static/css/file_manager.css | 141 +-
>>> >> >> > >> > .../misc/file_manager/static/js/create_dialogue.js | 9 +-
>>> >> >> > >> > .../misc/file_manager/static/js/select_dialogue.js | 19 +-
>>> >> >> > >> > web/pgadmin/misc/file_manager/static/js/utility.js | 77 +-
>>> >> >> > >> > .../file_manager/static/scss/_file_manager.scss | 157
>>> +--
>>> >> >> > >> > .../file_manager/templates/file_manager/index.html | 95 +-
>>> >> >> > >> > .../misc/statistics/static/js/statistics.js | 3 +-
>>> >> >> > >> > web/pgadmin/preferences/static/css/preferences.css | 14 -
>>> >> >> > >> > web/pgadmin/preferences/static/js/preferences.js | 31 +-
>>> >> >> > >> > .../preferences/static/scss/_preferences.scss | 16 +
>>> >> >> > >> > web/pgadmin/static/css/pgadmin.css | 81 +-
>>> >> >> > >> > web/pgadmin/static/fonts/Roboto-Bold.ttf | Bin 0
>>> -> 170760 bytes
>>> >> >> > >> > web/pgadmin/static/fonts/Roboto-Medium.ttf | Bin 0
>>> -> 172064 bytes
>>> >> >> > >> > web/pgadmin/static/fonts/Roboto-Regular.ttf | Bin 0
>>> -> 171676 bytes
>>> >> >> > >> > web/pgadmin/static/img/collapse_expand.svg | 15 +
>>> >> >> > >> > web/pgadmin/static/img/forgot_password.svg | 283
>>> ++++
>>> >> >> > >> > web/pgadmin/static/img/login.svg | 1 +
>>> >> >> > >> > web/pgadmin/static/js/alertify.pgadmin.defaults.js | 82 +-
>>> >> >> > >> > web/pgadmin/static/js/backform.pgadmin.js | 80 +-
>>> >> >> > >> > web/pgadmin/static/js/backgrid.pgadmin.js | 33 +-
>>> >> >> > >> > web/pgadmin/static/js/slickgrid/editors.js | 8 +-
>>> >> >> > >> > web/pgadmin/static/js/sqleditor/filter_dialog.js | 33 +-
>>> >> >> > >> > .../static/js/sqleditor/query_tool_preferences.js | 15 +-
>>> >> >> > >> > web/pgadmin/static/scss/_aci_tree.overrides.scss | 75 +-
>>> >> >> > >> > web/pgadmin/static/scss/_alert.scss | 12 +-
>>> >> >> > >> > web/pgadmin/static/scss/_alertify.overrides.scss | 150 +-
>>> >> >> > >> > web/pgadmin/static/scss/_backform.overrides.scss | 8 +
>>> >> >> > >> > web/pgadmin/static/scss/_backgrid.overrides.scss | 251
>>> +++-
>>> >> >> > >> > web/pgadmin/static/scss/_bootstrap.overrides.scss | 230
>>> ++--
>>> >> >> > >> > web/pgadmin/static/scss/_codemirror.overrides.scss | 94 +-
>>> >> >> > >> > web/pgadmin/static/scss/_pgadmin.grid.scss | 56 +
>>> >> >> > >> > web/pgadmin/static/scss/_pgadmin.style.scss | 1440
>>> +++++---------------
>>> >> >> > >> > web/pgadmin/static/scss/_select2.overrides.scss | 24 +-
>>> >> >> > >> > web/pgadmin/static/scss/_webcabin.overrides.scss | 368
>>> -----
>>> >> >> > >> > web/pgadmin/static/scss/_webcabin.pgadmin.scss | 250
>>> ++++
>>> >> >> > >> > web/pgadmin/static/scss/pgadmin.scss | 10 +-
>>> >> >> > >> > .../static/scss/resources/_default.style.scss | 90 +-
>>> >> >> > >> > .../static/scss/resources/_default.variables.scss | 203
>>> ++-
>>> >> >> > >> > web/pgadmin/static/vendor/backform/backform.js | 645
>>> +++++++++
>>> >> >> > >> > .../templates/security/change_password.html | 43 +-
>>> >> >> > >> > .../templates/security/forgot_password.html | 9 +-
>>> >> >> > >> > web/pgadmin/templates/security/login_user.html | 16 +-
>>> >> >> > >> > web/pgadmin/templates/security/panel.html | 23 +-
>>> >> >> > >> > web/pgadmin/tools/backup/__init__.py | 6 +-
>>> >> >> > >> > web/pgadmin/tools/backup/static/js/backup.js | 8 +-
>>> >> >> > >> > .../backup/static/js/backup_dialog_wrapper.js | 22 +-
>>> >> >> > >> > web/pgadmin/tools/datagrid/__init__.py | 1 -
>>> >> >> > >> > web/pgadmin/tools/datagrid/static/js/datagrid.js | 38 +-
>>> >> >> > >> > .../tools/datagrid/templates/datagrid/filter.html | 2 -
>>> >> >> > >> > .../tools/datagrid/templates/datagrid/index.html | 193
>>> ++-
>>> >> >> > >> > web/pgadmin/tools/debugger/static/css/debugger.css | 34 +-
>>> >> >> > >> > web/pgadmin/tools/debugger/static/js/debugger.js | 2 +-
>>> >> >> > >> > .../tools/debugger/static/js/debugger_ui.js | 28 +-
>>> >> >> > >> > web/pgadmin/tools/debugger/static/js/direct.js | 13 +-
>>> >> >> > >> > .../tools/debugger/static/scss/_debugger.scss | 8 -
>>> >> >> > >> > .../tools/debugger/templates/debugger/direct.html | 89 +-
>>> >> >> > >> > .../tools/grant_wizard/static/js/grant_wizard.js | 27 +-
>>> >> >> > >> > .../grant_wizard/static/scss/_grant_wizard.scss | 31 +-
>>> >> >> > >> > .../tools/import_export/static/js/import_export.js | 24 +-
>>> >> >> > >> > web/pgadmin/tools/maintenance/__init__.py | 10 +-
>>> >> >> > >> > .../tools/maintenance/static/js/maintenance.js | 24 +-
>>> >> >> > >> > .../maintenance/static/scss/_maintenance.scss | 2 +-
>>> >> >> > >> > web/pgadmin/tools/restore/__init__.py | 14 +-
>>> >> >> > >> > web/pgadmin/tools/restore/static/js/restore.js | 8 +-
>>> >> >> > >> > .../restore/static/js/restore_dialog_wrapper.js | 24 +-
>>> >> >> > >> > .../tools/sqleditor/static/css/sqleditor.css | 128 +-
>>> >> >> > >> > web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 35 +-
>>> >> >> > >> > .../tools/sqleditor/static/scss/_history.scss | 42 +-
>>> >> >> > >> > .../tools/sqleditor/static/scss/_sqleditor.scss | 128 +-
>>> >> >> > >> > .../user_management/static/css/user_management.css | 37 -
>>> >> >> > >> > .../user_management/static/js/user_management.js | 53 +-
>>> >> >> > >> > .../static/scss/_user_management.scss | 12 +-
>>> >> >> > >> > .../javascript/alerts/alertify_wrapper_spec.js | 4 +-
>>> >> >> > >> > .../backup/backup_dialog_wrapper_spec.js | 8 +-
>>> >> >> > >> > .../restore/restore_dialog_wrapper_spec.js | 8 +-
>>> >> >> > >> > web/webpack.config.js | 2 +-
>>> >> >> > >> > web/webpack.shim.js | 2 +-
>>> >> >> > >> > web/webpack.test.config.js | 1 +
>>> >> >> > >> > web/yarn.lock | 1015
>>> +++++++++++++-
>>> >> >> > >> > 135 files changed, 5002 insertions(+), 3850 deletions(-)
>>> >> >> > >> >
>>> >> >> > >>
>>> >> >> > >>
>>> >> >> > >> --
>>> >> >> > >> Dave Page
>>> >> >> > >> Blog: http://pgsnake.blogspot.com
>>> >> >> > >> Twitter: @pgsnake
>>> >> >> > >>
>>> >> >> > >> EnterpriseDB UK: http://www.enterprisedb.com
>>> >> >> > >> The Enterprise PostgreSQL Company
>>> >> >> > >
>>> >> >> > >
>>> >> >> > >
>>> >> >> > > --
>>> >> >> > > Thanks and Regards,
>>> >> >> > > Aditya Toshniwal
>>> >> >> > > Software Engineer | EnterpriseDB Software Solutions | Pune
>>> >> >> > > "Don't Complain about Heat, Plant a tree"
>>> >> >> >
>>> >> >> >
>>> >> >> >
>>> >> >> > --
>>> >> >> > Dave Page
>>> >> >> > Blog: http://pgsnake.blogspot.com
>>> >> >> > Twitter: @pgsnake
>>> >> >> >
>>> >> >> > EnterpriseDB UK: http://www.enterprisedb.com
>>> >> >> > The Enterprise PostgreSQL Company
>>> >> >>
>>> >> >>
>>> >> >>
>>> >> >> --
>>> >> >> Dave Page
>>> >> >> Blog: http://pgsnake.blogspot.com
>>> >> >> Twitter: @pgsnake
>>> >> >>
>>> >> >> EnterpriseDB UK: http://www.enterprisedb.com
>>> >> >> The Enterprise PostgreSQL Company
>>> >> >
>>> >> >
>>> >> >
>>> >> > --
>>> >> > Thanks and Regards,
>>> >> > Aditya Toshniwal
>>> >> > Software Engineer | EnterpriseDB Software Solutions | Pune
>>> >> > "Don't Complain about Heat, Plant a tree"
>>> >>
>>> >>
>>> >>
>>> >> --
>>> >> Dave Page
>>> >> Blog: http://pgsnake.blogspot.com
>>> >> Twitter: @pgsnake
>>> >>
>>> >> EnterpriseDB UK: http://www.enterprisedb.com
>>> >> The Enterprise PostgreSQL Company
>>> >
>>> >
>>> >
>>> > --
>>> > Thanks and Regards,
>>> > Aditya Toshniwal
>>> > Software Engineer | EnterpriseDB Software Solutions | Pune
>>> > "Don't Complain about Heat, Plant a tree"
>>>
>>>
>>>
>>> --
>>> Dave Page
>>> Blog: http://pgsnake.blogspot.com
>>> Twitter: @pgsnake
>>>
>>> EnterpriseDB UK: http://www.enterprisedb.com
>>> The Enterprise PostgreSQL Company
>>>
>>
>>
>> --
>> Thanks and Regards,
>> Aditya Toshniwal
>> Software Engineer | EnterpriseDB Software Solutions | Pune
>> "Don't Complain about Heat, Plant a tree"
>>
>
>
> --
> Thanks and Regards,
> Aditya Toshniwal
> Software Engineer | EnterpriseDB Software Solutions | Pune
> "Don't Complain about Heat, Plant a tree"
>
--
Thanks and Regards,
Aditya Toshniwal
Software Engineer | EnterpriseDB Software Solutions | Pune
"Don't Complain about Heat, Plant a tree"
Attachments:
[application/octet-stream] RM3692.part2.patch (74.7K, 3-RM3692.part2.patch)
download | inline diff:
diff --git a/web/pgadmin/about/static/js/about.js b/web/pgadmin/about/static/js/about.js
index 1e72c917..2aaf98f4 100644
--- a/web/pgadmin/about/static/js/about.js
+++ b/web/pgadmin/about/static/js/about.js
@@ -20,7 +20,8 @@ define(
},
setup: function() {
return {
- buttons:[{ text: gettext('OK'), key: 27, className: 'btn btn-primary' }],
+ buttons:[{ text: gettext('OK'), key: 27,
+ className: 'btn btn-primary fa fa-lg fa-check pg-alertify-button' }],
options: {
modal: false,
resizable: true,
@@ -44,7 +45,7 @@ define(
function(data) {
alertify.aboutDialog(
S(gettext('About %s')).sprintf(pgAdmin.Browser.utils.app_name).value(), data
- ).resizeTo(800, 450);
+ ).resizeTo(pgAdmin.Browser.stdW.md, pgAdmin.Browser.stdH.md);
});
},
};
diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js b/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js
index e7e2aa43..b1c76887 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js
@@ -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',
},
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js
index c716f824..8775b9fb 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js
@@ -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'],
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js
index bb1986bd..f6d8f319 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js
@@ -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)
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
index c8a09297..4185aa77 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
@@ -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)
diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js
index bcc27509..e60f3304 100644
--- a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js
+++ b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js
@@ -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;
},
diff --git a/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js b/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js
index 419ae45f..0226a5be 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js
+++ b/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js
@@ -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({
diff --git a/web/pgadmin/browser/server_groups/servers/static/css/servers.css b/web/pgadmin/browser/server_groups/servers/static/css/servers.css
index e8981cf5..65f9f53d 100644
--- a/web/pgadmin/browser/server_groups/servers/static/css/servers.css
+++ b/web/pgadmin/browser/server_groups/servers/static/css/servers.css
@@ -9,4 +9,4 @@
.change_password {
padding-left: 7px;
-}
+}
\ No newline at end of file
diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js b/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js
index 25d85a8b..7e9dd79d 100644
--- a/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js
+++ b/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js
@@ -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({
diff --git a/web/pgadmin/browser/server_groups/static/js/server_group.js b/web/pgadmin/browser/server_groups/static/js/server_group.js
index 58d1ccd2..93053a95 100644
--- a/web/pgadmin/browser/server_groups/static/js/server_group.js
+++ b/web/pgadmin/browser/server_groups/static/js/server_group.js
@@ -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 */
diff --git a/web/pgadmin/browser/static/css/wizard.css b/web/pgadmin/browser/static/css/wizard.css
index 1cdded00..d293881f 100644
--- a/web/pgadmin/browser/static/css/wizard.css
+++ b/web/pgadmin/browser/static/css/wizard.css
@@ -44,30 +44,11 @@
width: 140px;
}
-.wizard-right-panel_content {
- padding: 0.5rem 0rem;
-}
-
/* Wizard Footer CSS */
.pgadmin-wizard .footer .row {
margin: 0 -6px 3px -6px;
}
-/* Wizard Button CSS */
-
-.pgadmin-wizard .wizard-buttons button.wizard-next i.fa {
- padding-left: 5px;
-}
-
-.pgadmin-wizard .wizard-buttons button.wizard-back i.fa,
-.pgadmin-wizard .wizard-buttons button.wizard-cancel i.fa {
- padding-right: 5px;
-}
-
-.pgadmin-wizard .wizard-buttons .wizard-finish {
- margin-right: 0 !important;
-}
-
.wizard-header .wizard-cancel-event {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAdklEQVQ4jd2SwQnAIAxF36GH0pOTFHEgF3IkR5LO0F4SCGJVEHroAy/f/E+igV+yAa6hO7nrcgAZuIBg9CBalppXEnDL0RA1q556ASdQqhBrLlLTxVch1uxHZiU2AuKs2Vdt23GGHSy/wfIvzOzBPhpjaRO/5wG/szevJ+ZXzAAAAABJRU5ErkJggg==) no-repeat center center;
padding: 10px;
diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js
index e9ef25c9..00f72e94 100644
--- a/web/pgadmin/browser/static/js/browser.js
+++ b/web/pgadmin/browser/static/js/browser.js
@@ -108,6 +108,19 @@ define('pgadmin.browser', [
// It will be used to register extensions, tools, child node scripts,
// etc.
scripts: {},
+ // Standard Widths and Height for dialogs in px
+ stdW: {
+ sm: 500,
+ md: 700,
+ lg: 900,
+ default: 500,
+ },
+ stdH: {
+ sm: 200,
+ md: 400,
+ lg: 550,
+ default: 550,
+ },
// Default panels
panels: {
// Panel to keep the left hand browser tree
diff --git a/web/pgadmin/browser/static/js/node.js b/web/pgadmin/browser/static/js/node.js
index 9fe31aea..76de9964 100644
--- a/web/pgadmin/browser/static/js/node.js
+++ b/web/pgadmin/browser/static/js/node.js
@@ -313,18 +313,19 @@ define('pgadmin.browser.node', [
}
var onSessionInvalid = function(msg) {
- var alertMessage = '\
- <div class="media error-in-footer bg-danger-light border-danger text-danger text-14">\
- <div class="media-body media-middle">\
- <div class="alert-icon error-icon">\
- <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>\
- </div>\
- <div class="alert-text">' + msg + '</div>\
- <div class="close-error-bar">\
- <a class="close-error">x</a>\
- </div>\
- </div>\
- </div>';
+ var alertMessage = `
+ <div class="error-in-footer">
+ <div class="d-flex px-2 py-1">
+ <div class="pr-2">
+ <i class="fa fa-exclamation-triangle text-danger" aria-hidden="true"></i>
+ </div>
+ <div class="alert-text">${msg}</div>
+ <div class="ml-auto close-error-bar">
+ <a class="close-error fa fa-times text-danger"></a>
+ </div>
+ </div>
+ </div>`;
+
if (!_.isUndefined(that.statusBar)) {
that.statusBar.html(alertMessage).css('visibility', 'visible');
that.statusBar.find('a.close-error').bind('click', function() {
@@ -558,12 +559,43 @@ define('pgadmin.browser.node', [
d.body.insertBefore(el, d.body.firstChild);
- var pW = screen.width < 800 ? '95%' : '500px',
- pH = screen.height < 600 ? '95%' : '550px',
- w = pgAdmin.toPx(el, self.width || pW, 'width', true),
- h = pgAdmin.toPx(el, self.height || pH, 'height', true),
- x = (b.offsetWidth - w) / 2,
- y = (b.offsetHeight - h) / 2;
+ let w, h, x, y;
+ if(screen.width < 800) {
+ w= pgAdmin.toPx(el, '95%', 'width', true);
+ } else {
+ w= pgAdmin.toPx(el, self.width || pgBrowser.stdW.default+'px', 'width', true);
+
+ /* Fit to standard sizes */
+ if(w <= pgBrowser.stdW.sm) {
+ w = pgBrowser.stdW.sm;
+ } else {
+ if(w <= pgBrowser.stdW.md) {
+ w = pgBrowser.stdW.md;
+ } else {
+ w = pgBrowser.stdW.lg;
+ }
+ }
+ }
+
+ if(screen.height < 600) {
+ h = pgAdmin.toPx(el, '95%', 'height', true);
+ } else {
+ h = pgAdmin.toPx(el, self.height || pgBrowser.stdH.default+'px', 'height', true);
+
+ /* Fit to standard sizes */
+ if(h <= pgBrowser.stdH.sm) {
+ h = pgBrowser.stdH.sm;
+ } else {
+ if(h <= pgBrowser.stdH.md) {
+ h = pgBrowser.stdH.md;
+ } else {
+ h = pgBrowser.stdH.lg;
+ }
+ }
+ }
+
+ x = (b.offsetWidth - w) / 2,
+ y = (b.offsetHeight - h) / 4;
var p = pgBrowser.docker.addPanel(
'node_props', wcDocker.DOCK.FLOAT, undefined, {
@@ -1319,7 +1351,7 @@ define('pgadmin.browser.node', [
var btnGroup = this.find('.pg-prop-btn-group'),
btnSave = btnGroup.find('button.btn-primary'),
- btnReset = btnGroup.find('button.btn-warning');
+ btnReset = btnGroup.find('button.btn-secondary[type="reset"]');
if (hasError || !modified) {
btnSave.prop('disabled', true);
diff --git a/web/pgadmin/browser/static/js/panel.js b/web/pgadmin/browser/static/js/panel.js
index 45131d10..09c21a9f 100644
--- a/web/pgadmin/browser/static/js/panel.js
+++ b/web/pgadmin/browser/static/js/panel.js
@@ -142,10 +142,10 @@ define(
p.pgResizeTimeout = null;
/** Calculations based on https://getbootstrap.com/docs/4.1/layout/grid/#grid-options **/
- if (w < 576) {
+ if (w < 480) {
w = 'xs';
}
- if (w >= 576) {
+ if (w >= 480) {
w = 'sm';
}
if (w >= 768) {
diff --git a/web/pgadmin/browser/static/js/toolbar.js b/web/pgadmin/browser/static/js/toolbar.js
index 7719c29a..b01e28e8 100644
--- a/web/pgadmin/browser/static/js/toolbar.js
+++ b/web/pgadmin/browser/static/js/toolbar.js
@@ -13,6 +13,7 @@ let _defaultToolBarButtons = [
text: '',
toggled: false,
toggleClass: '',
+ parentClass: 'pg-toolbar-btn',
enabled: false,
},
{
@@ -21,6 +22,7 @@ let _defaultToolBarButtons = [
text: '',
toggled: false,
toggleClass: '',
+ parentClass: 'pg-toolbar-btn',
enabled: false,
},
{
@@ -29,6 +31,7 @@ let _defaultToolBarButtons = [
text: '',
toggled: false,
toggleClass: '',
+ parentClass: 'pg-toolbar-btn',
enabled: false,
},
];
diff --git a/web/pgadmin/browser/static/js/wizard.js b/web/pgadmin/browser/static/js/wizard.js
index fbb1a578..401a7342 100644
--- a/web/pgadmin/browser/static/js/wizard.js
+++ b/web/pgadmin/browser/static/js/wizard.js
@@ -106,20 +106,19 @@ define([
' </div>' +
' </div>' +
' <div class="wizard-footer pg-prop-footer">' +
- ' <div class="pg-prop-status-bar" style="visibility:hidden">' +
- ' <div class="media error-in-footer bg-danger-light border-danger text-danger text-14">' +
- ' <div class="media-body media-middle">' +
- ' <div class="alert-icon error-icon">' +
- ' <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>' +
- ' </div>' +
- ' <div class="alert-text">' +
- ' </div>' +
- ' <div class="close-error-bar">' +
- ' <a class="close-error">x</a>' +
- ' </div>' +
- ' </div>' +
- ' </div>' +
- ' </div>' +
+ ' <div class="pg-prop-status-bar" style="visibility:hidden">' +
+ ' <div class="error-in-footer"> ' +
+ ' <div class="d-flex px-2 py-1"> ' +
+ ' <div class="pr-2"> ' +
+ ' <i class="fa fa-exclamation-triangle text-danger" aria-hidden="true"></i> ' +
+ ' </div> ' +
+ ' <div class="alert-text"></div> ' +
+ ' <div class="ml-auto close-error-bar"> ' +
+ ' <a class="close-error fa fa-times text-danger"></a> ' +
+ ' </div> ' +
+ ' </div> ' +
+ ' </div> ' +
+ ' </div>' +
' <div class="wizard-buttons d-flex">' +
' <div>' +
' <button title = "' + gettext('Help for this dialog.') + '"' +
@@ -128,14 +127,14 @@ define([
' </div>' +
' <div class="ml-auto">' +
' <button class="btn btn-secondary wizard-cancel" <%=this.options.disable_cancel ? "disabled" : ""%>>' +
- ' <i class="fa fa-lg fa-close"></i>' + gettext('Cancel') + '</button>' +
+ ' <i class="fa fa-close"></i> ' + gettext('Cancel') + '</button>' +
' <button class="btn btn-secondary wizard-back" <%=this.options.disable_prev ? "disabled" : ""%>>' +
- ' <i class="fa fa-backward"></i>' + gettext('Back') + '</button>' +
+ ' <i class="fa fa-backward"></i> ' + gettext('Back') + '</button>' +
' <button class="btn btn-secondary wizard-next" <%=this.options.disable_next ? "disabled" : ""%>>' +
' ' + gettext('Next') +
- ' <i class="fa fa-forward"></i></button>' +
+ ' <i class="fa fa-forward"></i></button>' +
' <button class="btn btn-primary wizard-finish" <%=this.options.disable_finish ? "disabled" : ""%>>' +
- ' ' + gettext('Finish') + '</button>' +
+ ' <i class="fa fa-check"></i> ' + gettext('Finish') + '</button>' +
' </div>' +
' </div>' +
' </div>' +
diff --git a/web/pgadmin/browser/static/scss/_browser.scss b/web/pgadmin/browser/static/scss/_browser.scss
index 158d2891..76c230cd 100644
--- a/web/pgadmin/browser/static/scss/_browser.scss
+++ b/web/pgadmin/browser/static/scss/_browser.scss
@@ -46,3 +46,8 @@ samp,
text-align: center;
color: $loading-fg;
}
+
+.pg-toolbar-btn {
+ margin-left: 0.25rem;
+ border: $input-btn-border-width solid $btn-secondary-border;
+}
\ No newline at end of file
diff --git a/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss b/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss
index 59572914..caf54f23 100644
--- a/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss
+++ b/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss
@@ -82,7 +82,7 @@ $bgproc-container-pad: 2px;
.ajs-bg-bgprocess > .pg-bg-bgprocess > .pg-bg-status.bg-failed {
color: $color-fg;
- background-color: $color-danger-light;
+ background-color: $color-danger-lighter;
}
.pg-panel-content div.bg-process-watcher {
diff --git a/web/pgadmin/misc/file_manager/static/css/file_manager.css b/web/pgadmin/misc/file_manager/static/css/file_manager.css
index 23824fa7..dd7596b4 100644
--- a/web/pgadmin/misc/file_manager/static/css/file_manager.css
+++ b/web/pgadmin/misc/file_manager/static/css/file_manager.css
@@ -236,10 +236,8 @@ a.dz-remove {
.file_listing .no_folder_found {
text-align: center;
- position: absolute;
- top: 50px;
width: 100%;
- font-size: 14px;
+ padding: 0.5rem;
}
div.change_file_types span {
diff --git a/web/pgadmin/misc/file_manager/static/js/file_manager.js b/web/pgadmin/misc/file_manager/static/js/file_manager.js
index 1dccd79b..ed4f99e4 100644
--- a/web/pgadmin/misc/file_manager/static/js/file_manager.js
+++ b/web/pgadmin/misc/file_manager/static/js/file_manager.js
@@ -29,9 +29,9 @@ define('misc.file_manager', [
// Call dialogs subject to dialog_type param
show_dialog: function(params) {
if (params.dialog_type == 'create_file') {
- Alertify.createModeDlg(params).resizeTo('60%', '80%');
+ Alertify.createModeDlg(params).resizeTo(pgAdmin.Browser.stdW.md,pgAdmin.Browser.stdH.lg);
} else {
- Alertify.fileSelectionDlg(params).resizeTo('60%', '80%');
+ Alertify.fileSelectionDlg(params).resizeTo(pgAdmin.Browser.stdW.md,pgAdmin.Browser.stdH.lg);
}
},
};
diff --git a/web/pgadmin/misc/file_manager/static/js/utility.js b/web/pgadmin/misc/file_manager/static/js/utility.js
index 5fbf0a55..0733e52d 100644
--- a/web/pgadmin/misc/file_manager/static/js/utility.js
+++ b/web/pgadmin/misc/file_manager/static/js/utility.js
@@ -576,7 +576,7 @@ define([
result += '</ul>';
} else {
- result += '<table id="contents" class="table table-bordered table-noouter-border table-hover tablesorter">';
+ result += '<table id="contents" class="table table-bordered table-noouter-border table-bottom-border table-hover tablesorter">';
result += '<thead><tr><th>';
result += '<span>' + lg.name + '</span></th>';
result += '<th><span>' + lg.size + '</span></th><th>';
@@ -659,16 +659,15 @@ define([
if ($('.fileinfo').data('view') == 'grid') {
result += '<ul id="contents" class="grid"></ul>';
} else {
- result += '<table id="contents" class="list tablesorter">';
- result += '<thead><tr><th><span>' +
- lg.name + '</span></th><th><span>' + lg.size +
- '</span></th><th><span>' + lg.modified +
- '</span></th></tr></thead>';
- result += '<tbody>';
+ result += '<table id="contents" class="table table-bordered table-noouter-border table-empty-rows ablesorter">';
+ result += '<thead><tr><th><span>' + lg.name + '</span></th>' +
+ '<th><span>' + lg.size + '</span></th>' +
+ '<th><span>' + lg.modified + '</span></th>' +
+ '</tr></thead>';
+ result += '</tbody>';
+ result += '</table>';
}
- result += '<h1 class="no_folder_found">' +
- lg.could_not_retrieve_folder + '</h1>';
-
+ result += '<div class="no_folder_found">' + lg.could_not_retrieve_folder + '</div>';
var cap_no_folders = ['upload', 'create'];
data.Capabilities = cap_no_folders;
@@ -691,7 +690,7 @@ define([
if ($('.fileinfo').data('view') == 'grid') {
e.stopPropagation();
$this = $('.file_manager').find('#contents li.selected p');
- orig_value = decodeURI($this.find('span').attr('title'));
+ orig_value = decodeURI($this.find('span.less_text').attr('title'));
newvalue = orig_value.substring(0, orig_value.indexOf('.'));
if (newvalue === '') {
@@ -715,7 +714,7 @@ define([
$this = $('.fileinfo').find(
'table#contents tbody tr.selected td:first-child p'
);
- orig_value = decodeURI($this.find('span').html()),
+ orig_value = decodeURI($this.find('span.less_text').html()),
newvalue = orig_value.substring(0, orig_value.lastIndexOf('.'));
if (orig_value.lastIndexOf('/') == orig_value.length - 1 || newvalue === '') {
@@ -1137,7 +1136,7 @@ define([
<input type='checkbox' id='show_hidden' onclick='pgAdmin.FileUtils.handleClick(this)' tabindex='11'>
</div>
<div class="ml-auto">
- <label>${gettext('Format')}</label>
+ <label class="my-auto">${gettext('Format')}</label>
<select name='type' tabindex='12'>${fileFormats}</select>
<div>`;
}
diff --git a/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss b/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
index 85f85463..2d90a67f 100644
--- a/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
+++ b/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
@@ -142,6 +142,9 @@
.allowed_file_types {
border-top: $panel-border;
+ background: $color-bg-theme;
+ z-index: 5;
+ padding: 0.25rem;
}
.upload_file{
@@ -211,10 +214,10 @@
}
.fileinfo .fm_dimmer {
- height: calc(100% - 32px);
display: none;
- top: 0px;
- background:$color-fg;
+ top: 0;
+ bottom: 0;
+ background: $loading-bg;
opacity: 0.5;
width: 100%;
position: absolute;
@@ -223,10 +226,8 @@
.fileinfo .delete_item, .fileinfo .replace_file {
display: none;
- padding: 15px 15px;
- border: 1px solid $color-gray-light;
- border-left: 0;
- border-right: 0;
+ padding: 1rem;
+ border-bottom: $panel-border;
background: $color-bg-theme;
position: absolute;
top: 0;
@@ -235,15 +236,6 @@
z-index: 4;
}
-.fileinfo .delete_item span.pull-right .btn,
-.fileinfo .replace_file span.pull-right .btn {
- padding: 0px 5px;
- color: $color-fg;
- background: $color-bg;
- font-size: 12px;
- margin-right: 4px;
-}
-
.upload_file .dz_cross_btn {
color: $color-fg-theme;
right: 0px;
diff --git a/web/pgadmin/misc/file_manager/templates/file_manager/index.html b/web/pgadmin/misc/file_manager/templates/file_manager/index.html
index 9d1e3673..f854545e 100644
--- a/web/pgadmin/misc/file_manager/templates/file_manager/index.html
+++ b/web/pgadmin/misc/file_manager/templates/file_manager/index.html
@@ -64,16 +64,16 @@
<div class='fm_dimmer'></div>
<div class='delete_item'>
<span>{{ _('Are you sure you want to delete this item?') }}</span>
- <span class="pull-right">
- <button type='button' class='btn btn_yes' tabindex="13">{{ _('Yes') }}</button>
- <button type='button' class='btn btn_no' tabindex="14">{{ _('No') }}</button>
- </span>
+ <span class="pull-right">
+ <button type='button' class='btn btn-secondary btn_no' tabindex="14">{{ _('No') }}</button>
+ <button type='button' class='btn btn-primary btn_yes' tabindex="13">{{ _('Yes') }}</button>
+ </span>
</div>
<div class='replace_file'>
<span>{{ _('Are you sure you want to replace this file?') }}</span>
<span class="pull-right">
- <button type='button' class='btn btn_yes' tabindex="15">{{ _('Yes') }}</button>
- <button type='button' class='btn btn_no' tabindex="16">{{ _('No') }}</button>
+ <button type='button' class='btn btn-secondary btn_no' tabindex="16">{{ _('No') }}</button>
+ <button type='button' class='btn btn-primary btn_yes' tabindex="15">{{ _('Yes') }}</button>
</span>
</div>
</div>
diff --git a/web/pgadmin/misc/static/explain/css/explain.css b/web/pgadmin/misc/static/explain/css/explain.css
index b6d413cc..7c4ee999 100644
--- a/web/pgadmin/misc/static/explain/css/explain.css
+++ b/web/pgadmin/misc/static/explain/css/explain.css
@@ -6,11 +6,11 @@
cursor: pointer;
}
-.pg-explain-zoom-btn {
+.pg-explain-zoom-btn,
+.pg-explain-download-btn {
top: 5px;
min-width: 25px;
cursor: pointer;
- border: 1px solid transparent;
font-size: 0.75rem;
}
@@ -72,10 +72,3 @@ td.explain-tooltip-val {
left: 79px;
opacity: 0.5;
}
-
-.pg-explain-download-btn {
- top: 5px;
- min-width: 25px;
- border: 1px solid transparent;
- font-size: 0.75rem;
-}
diff --git a/web/pgadmin/preferences/static/js/preferences.js b/web/pgadmin/preferences/static/js/preferences.js
index 511c80a1..97bb496c 100644
--- a/web/pgadmin/preferences/static/js/preferences.js
+++ b/web/pgadmin/preferences/static/js/preferences.js
@@ -307,12 +307,6 @@ define('pgadmin.preferences', [
/*
* Clear the existing html in the preferences content
*/
- // Keyboard short cuts and nodes wiull have striped divs
- if (d.label.toLowerCase() == 'keyboard shortcuts' || d.label.toLowerCase() == 'nodes')
- $container.find('.preferences_content').addClass('striped-divs');
- else
- $container.find('.preferences_content').removeClass('striped-divs');
-
$container.find('.preferences_content');
renderPreferencePanel(d.preferences);
@@ -477,7 +471,7 @@ define('pgadmin.preferences', [
},
show: function() {
- Alertify.preferencesDlg(true).resizeTo('60%', '60%');
+ Alertify.preferencesDlg(true).resizeTo(pgAdmin.Browser.stdW.lg,pgAdmin.Browser.stdH.lg);
},
};
diff --git a/web/pgadmin/preferences/static/scss/_preferences.scss b/web/pgadmin/preferences/static/scss/_preferences.scss
index 7c8d674a..14b52d32 100644
--- a/web/pgadmin/preferences/static/scss/_preferences.scss
+++ b/web/pgadmin/preferences/static/scss/_preferences.scss
@@ -3,22 +3,13 @@
padding-top: 2px;
height: 100%;
overflow: auto;
- border-right: 2px solid $color-gray-light;
- background-image: $color-gray-lighter;
-}
-
-.preferences_content {
- &.striped-divs > {
- div.pgadmin-control-group:nth-of-type(odd) {
- background: $color-gray-light;
- padding-top: 6px;
- }
- div.pgadmin-control-group:nth-of-type(even) {
- background: $color-bg-theme;
- }
- }
+ border-right: $panel-border;
}
.btn-checkbox {
padding: $btn-checkbox-padding;
+
+ & input[type="checkbox"]{
+ margin-top: 0px !important;
+ }
}
diff --git a/web/pgadmin/static/js/alertify.pgadmin.defaults.js b/web/pgadmin/static/js/alertify.pgadmin.defaults.js
index 2d093df3..83047985 100644
--- a/web/pgadmin/static/js/alertify.pgadmin.defaults.js
+++ b/web/pgadmin/static/js/alertify.pgadmin.defaults.js
@@ -197,10 +197,10 @@ define([
this.pgResizeTimeout = null;
/** Calculations based on https://getbootstrap.com/docs/4.1/layout/grid/#grid-options **/
- if (w < 576) {
+ if (w < 480) {
w = 'xs';
}
- if (w >= 576) {
+ if (w >= 480) {
w = 'sm';
}
if (w >= 768) {
diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js
index 024a7eed..357be9e4 100644
--- a/web/pgadmin/static/js/backform.pgadmin.js
+++ b/web/pgadmin/static/js/backform.pgadmin.js
@@ -2288,7 +2288,7 @@ define([
'<div class="input-group">',
'<input type="<%=type%>" class="form-control <%=extraClasses.join(\' \')%>" name="<%=name%>" min="<%=min%>" max="<%=max%>"maxlength="<%=maxlength%>" value="<%-value%>" placeholder="<%-placeholder%>" <%=disabled ? "disabled" : ""%> <%=required ? "required" : ""%> />',
'<div class="input-group-append">',
- '<button class="btn btn-outline-secondary fa fa-ellipsis-h select_item" <%=disabled ? "disabled" : ""%> ></button>',
+ '<button class="btn btn-secondary fa fa-ellipsis-h select_item" <%=disabled ? "disabled" : ""%> ></button>',
'</div>',
'</div>',
'<% if (helpMessage && helpMessage.length) { %>',
diff --git a/web/pgadmin/static/js/slickgrid/editors.js b/web/pgadmin/static/js/slickgrid/editors.js
index 2d732c56..18e8494c 100644
--- a/web/pgadmin/static/js/slickgrid/editors.js
+++ b/web/pgadmin/static/js/slickgrid/editors.js
@@ -36,7 +36,13 @@
function getButtons(editable) {
var $buttons = $('<div class=\'pg_buttons\' />'),
label = editable ? 'Cancel' : 'OK',
- button_type = editable ? 'btn-danger' : 'btn-primary';
+ button_type = editable ? 'btn-secondary' : 'btn-primary',
+ button_icon = editable ? 'fa-times' : 'fa-check';
+
+ $('<button class=\'btn ' + button_type + ' long_text_editor pg-alertify-button\' data-label="'+label+'">' +
+ '<span class="fa '+ button_icon +' pg-alertify-button"></span> '+ label +
+ '</button>')
+ .appendTo($buttons);
if (editable) {
$('<button class=\'btn btn-primary long_text_editor\' data-label="Save">'+
@@ -44,11 +50,6 @@
'</button>')
.appendTo($buttons);
}
-
- $('<button class=\'btn ' + button_type + ' long_text_editor pg-alertify-button\' data-label="'+label+'">' +
- '<span class="fa fa-save pg-alertify-button"></span> '+ label +
- '</button>')
- .appendTo($buttons);
return $buttons;
}
@@ -140,8 +141,8 @@
$input = getTextArea().appendTo($wrapper);
$buttons = getButtons(true).appendTo($wrapper);
- $buttons.find('button:first').on('click', this.save);
- $buttons.find('button:last').on('click', this.cancel);
+ $buttons.find('button:first').on('click', this.cancel);
+ $buttons.find('button:last').on('click', this.save);
$input.on('keydown', this.handleKeyDown);
scope.position(args.position);
diff --git a/web/pgadmin/static/js/sqleditor/filter_dialog.js b/web/pgadmin/static/js/sqleditor/filter_dialog.js
index 6dc9571b..f25ef312 100644
--- a/web/pgadmin/static/js/sqleditor/filter_dialog.js
+++ b/web/pgadmin/static/js/sqleditor/filter_dialog.js
@@ -112,19 +112,17 @@ let FilterDialog = {
this.__internal.buttons[2].element.disabled = true;
// Status bar
- this.statusBar = $('<div class=\'pg-prop-status-bar pg-el-xs-12 d-none\'>' +
- ' <div class=\'media error-in-footer bg-danger-light border-danger text-danger text-14\'>' +
- ' <div class=\'media-body media-middle\'>' +
- ' <div class=\'alert-icon error-icon\'>' +
- ' <i class=\'fa fa-exclamation-triangle\' aria-hidden=\'true\'></i>' +
- ' </div>' +
- ' <div class=\'alert-text\'>' +
- ' </div>' +
- ' </div>' +
- ' </div>' +
- '</div>', {
- text: '',
- }).appendTo($container);
+ this.statusBar = $(
+ '<div class=\'pg-prop-status-bar pg-el-xs-12 d-none\'>' +
+ ' <div class="error-in-footer"> ' +
+ ' <div class="d-flex px-2 py-1"> ' +
+ ' <div class="pr-2"> ' +
+ ' <i class="fa fa-exclamation-triangle text-danger" aria-hidden="true"></i> ' +
+ ' </div> ' +
+ ' <div class="alert-text"></div> ' +
+ ' </div> ' +
+ ' </div> ' +
+ '</div>').appendTo($container);
// To show progress on filter Saving/Updating on AJAX
this.showFilterProgress = $(
@@ -259,7 +257,7 @@ let FilterDialog = {
};
});
- Alertify.filterDialog(title).resizeTo('65%', '60%');
+ Alertify.filterDialog(title).resizeTo(pgAdmin.Browser.stdW.md,pgAdmin.Browser.stdH.md);
})
.fail(function(e) {
handleQueryToolAjaxError(pgAdmin, handler, e, '_show_filter', [], true);
diff --git a/web/pgadmin/static/js/sqleditor/query_tool_notifications.js b/web/pgadmin/static/js/sqleditor/query_tool_notifications.js
index 500d2059..472bf178 100644
--- a/web/pgadmin/static/js/sqleditor/query_tool_notifications.js
+++ b/web/pgadmin/static/js/sqleditor/query_tool_notifications.js
@@ -88,14 +88,15 @@ let queryToolNotifications = {
// Set up the grid
let notifications_grid = new Backgrid.Grid({
+ emptyText: 'No data found',
columns: gridCols,
collection: queryToolNotifications.collection,
- className: 'backgrid table-bordered presentation table backgrid-striped',
+ className: 'backgrid presentation table table-bordered table-hover table-noouter-border table-bottom-border',
});
// Render the grid
if (notifications_grid)
- notifications_panel.$container.append(notifications_grid.render().el);
+ notifications_panel.$container.find(".sql-editor-notifications").append(notifications_grid.render().el);
},
// This function is used to raise notify messages and update the
diff --git a/web/pgadmin/static/scss/_aci_tree.overrides.scss b/web/pgadmin/static/scss/_aci_tree.overrides.scss
index ad775173..70a0c916 100644
--- a/web/pgadmin/static/scss/_aci_tree.overrides.scss
+++ b/web/pgadmin/static/scss/_aci_tree.overrides.scss
@@ -3,7 +3,7 @@
}
.aciTree .aciTreeText {
font-family: $font-family-primary;
- font-size: 12px;
+ font-size: 0.815rem;
}
.aciTree.aciTreeFocus .aciTreeFocus > .aciTreeLine {
background-color: $color-primary-light;
diff --git a/web/pgadmin/static/scss/_alert.scss b/web/pgadmin/static/scss/_alert.scss
index 507b9477..4f59011d 100644
--- a/web/pgadmin/static/scss/_alert.scss
+++ b/web/pgadmin/static/scss/_alert.scss
@@ -104,25 +104,17 @@
}
.alert-text {
- flex-grow: 1;
- border: 1px solid $color-danger-light;
- padding: 6px 12px 6px 10px;
- border-left: none;
-moz-user-select: text;
-khtml-user-select: text;
-webkit-user-select: text;
-ms-user-select: text;
user-select: text;
- width: 100%;
}
.error-in-footer {
- border-radius: 5px;
- border: 1px solid transparent;
-
- .alert-text {
- border-color: $color-danger-light;
- }
+ border-radius: $border-radius;
+ border: 1px solid $color-danger-light;
+ background: $color-danger-lighter;
}
.success-in-footer {
diff --git a/web/pgadmin/static/scss/_alertify.overrides.scss b/web/pgadmin/static/scss/_alertify.overrides.scss
index c7382d4b..235c9fdb 100644
--- a/web/pgadmin/static/scss/_alertify.overrides.scss
+++ b/web/pgadmin/static/scss/_alertify.overrides.scss
@@ -32,7 +32,7 @@
border-top-left-radius: $panel-border-radius;
border-top-right-radius: $panel-border-radius;
& .ajs-content {
- top: 0;
+ top: 0 !important;
border-radius: inherit;
}
}
@@ -48,7 +48,8 @@
}
}
.ajs-body .ajs-content {
- top: $title-height;
+ top: $title-height !important;
+ bottom: $footer-height-calc !important;
}
/* Removes padding from alertify footer */
@@ -114,6 +115,10 @@
}
}
+.alertify.ajs-frameless .ajs-body .ajs-content {
+ bottom: 0px !important;
+}
+
.alertify.ajs-maximized .ajs-commands,
.alertify.ajs-resizable .ajs-commands {
margin: 2px 0px 0 0;
@@ -180,11 +185,9 @@
}
.pg-alertify-icon-button {
- //refered - $input-btn-padding-y, $input-btn-padding-x
- padding: 0.275rem $input-btn-padding-x;
&:before {
font-size: 1.3em !important;
- line-height: 1.3;
+ line-height: 1.2;
font-family: $font-family-icon;
}
}
@@ -195,7 +198,7 @@
}
.ajs-message.ajs-error.ajs-visible {
- background: $color-danger-light;
+ background: $color-danger-lighter;
border: $border-width solid $color-danger;
@extend .ajs-text-smoothing;
}
@@ -215,3 +218,7 @@
.ajs-message > .media > .media-body.media-middle {
display: flex;
}
+
+.alertify .ajs-dimmer {
+ background-color: $loading-bg;
+}
\ No newline at end of file
diff --git a/web/pgadmin/static/scss/_backform.overrides.scss b/web/pgadmin/static/scss/_backform.overrides.scss
index 6a04f614..abc2af4e 100644
--- a/web/pgadmin/static/scss/_backform.overrides.scss
+++ b/web/pgadmin/static/scss/_backform.overrides.scss
@@ -1,6 +1,6 @@
.has-error {
.pgadmin-controls .form-control {
- border-color: $color-danger;
+ border-color: $color-danger-light;
}
.form-control {
@@ -11,15 +11,15 @@
color: $color-danger;
}
- .control-label:before {
+ .control-label::before {
font: normal normal normal 16px/1 FontAwesome;
content: "\f071";
text-decoration: inherit;
position: absolute;
color: $color-danger;
- right: 6px;
- padding-top: 6px;
+ right: 0.5rem;
z-index: 1;
+ line-height: inherit;
}
}
@@ -36,10 +36,14 @@
}
}
.backform-tab .tab-pane {
- padding: 7px;
+ padding: 0.5rem;
&.SQL {
height: 100%;
- padding: 0px 7px 0px 0px;
+ padding: 0px;
+
+ & .pgadmin-controls.SQL {
+ padding: 0px;
+ }
}
}
diff --git a/web/pgadmin/static/scss/_backgrid.overrides.scss b/web/pgadmin/static/scss/_backgrid.overrides.scss
index 519a56be..afe1c65e 100644
--- a/web/pgadmin/static/scss/_backgrid.overrides.scss
+++ b/web/pgadmin/static/scss/_backgrid.overrides.scss
@@ -1,6 +1,7 @@
.backgrid th, .backgrid td {
font-weight: normal!important;
text-align: left;
+ line-height: $line-height-base;
}
.backgrid.backgrid-striped tbody {
@@ -223,6 +224,10 @@ span.form-control:disabled {
background-color: $color-bg;
border: 1px solid $border-color;
border-radius: $panel-border-radius;
+
+ & .tab-pane {
+ padding: 0.5rem;
+ }
}
.subnode-footer {
height: 38px;
diff --git a/web/pgadmin/static/scss/_bootstrap.overrides.scss b/web/pgadmin/static/scss/_bootstrap.overrides.scss
index e7b44e72..8ab15ad5 100644
--- a/web/pgadmin/static/scss/_bootstrap.overrides.scss
+++ b/web/pgadmin/static/scss/_bootstrap.overrides.scss
@@ -18,6 +18,10 @@ iframe {
border-width: 0;
}
+legend {
+ margin-bottom: 0rem;
+}
+
/* Padding for the treeview */
.browser-browser-pane {
padding-left: 0;
@@ -134,13 +138,19 @@ iframe {
border-left: 5px solid;
border-top: 5px solid transparent;
}
+/* 25px is for showing error icon */
.control-label {
display: inline-block;
margin: 0px;
- padding: 5px 25px 5px 5px;
+ padding: 5px 25px 5px 5px !important;
vertical-align: middle;
}
+.form-check {
+ padding-left: 0rem;
+ padding-right: 0.5rem;
+}
+
.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
color: $text-muted;
}
@@ -259,6 +269,7 @@ td.switch-cell > div.bootstrap-switch {
font-weight: bold;
&.active {
border-bottom: $active-border !important;
+ color: $color-primary;
}
}
}
@@ -311,3 +322,17 @@ td.switch-cell > div.bootstrap-switch {
.bootstrap-datetimepicker-widget thead th {
background-color: $color-bg;
}
+
+.input-group {
+ & .input-group-text {
+ background: $input-bg;
+ }
+}
+
+/* bootstrap-switch */
+.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary, .bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary {
+ background: $color-primary;
+}
+.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-success, .bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-success {
+ background: $color-success;
+}
diff --git a/web/pgadmin/static/scss/_pgadmin.style.scss b/web/pgadmin/static/scss/_pgadmin.style.scss
index 99b12e09..0e8ffc7a 100644
--- a/web/pgadmin/static/scss/_pgadmin.style.scss
+++ b/web/pgadmin/static/scss/_pgadmin.style.scss
@@ -24,9 +24,6 @@
.user-language div{
float:left;
}
-.user-language select{
- height: 25px !important;
-}
.Resizer {
background: $color-gray-lighter;
@@ -142,7 +139,7 @@
}
.alertify .ajs-body {
- min-height: $footer-height-calc*2;
+ min-height: $footer-height-calc*1.5;
}
@@ -248,6 +245,10 @@
margin-bottom: 33px;
}
+.pg-prop-btn-group-above {
+ border-bottom: $panel-border;
+}
+
.has-pg-prop-btn-group {
top: 45px;
height: calc(100% - 45px);
@@ -323,9 +324,10 @@
}
.pgadmin-controls {
- padding-right: 3px;
- padding-left: 3px;
+ padding-right: 0px;
+ padding-left: 0px;
}
+
.pgadmin-controls.SQL {
padding-right: 3px;
padding-left: 1px;
@@ -372,6 +374,11 @@
border-radius: 0rem;
border-top-left-radius: $card-border-radius;
border-top-right-radius: $card-border-radius;
+
+ &.collapsed {
+ border-bottom: none !important;
+ border-radius: $card-border-radius;
+ }
}
.obj_properties .badge .caret {
@@ -502,15 +509,17 @@ fieldset.inline-fieldset > div {
padding: 15px;
}
-.pgadmin-control-group.sql {
- margin: 0px;
- padding: 0px;
- height: 100%;
+.pgadmin-control-group{
+ &.sql, &.sqltab {
+ margin: 0px;
+ padding: 0px;
+ height: 100%;
+ }
}
.pgadmin-controls input[type="checkbox"]{
margin-left: 0 !important;
- margin-top: 0px !important;
+ margin-top: 10px !important;
}
.pgadmin-controls.sql_field_layout {
@@ -520,14 +529,14 @@ fieldset.inline-fieldset > div {
z-index: 1;
}
-.pgadmin-controls.focused {
- border-color: $color-primary-light;
+.pgadmin-controls.focused,
+.pgadmin-controls:focus {
+ border-color: $input-focus-border-color !important;
outline: 0;
- -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba($color-primary, .6);
- box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba($color-primary, .6);
+ -webkit-box-shadow: $input-focus-box-shadow;
+ box-shadow: $input-focus-box-shadow;
}
-
.dashboard-tab-container,
.pg-panel-statistics-container,
.pg-panel-depends-container,
@@ -742,14 +751,7 @@ form[name="change_password_form"] .help-block {
}
}
-.close-error-bar {
- background: $color-danger;
- padding: 5px;
- border-radius: 0px 4px 4px 0px;
-}
-
-.close-error-bar a {
- color: $color-danger-fg !important;
+.close-error {
cursor: pointer;
}
@@ -831,6 +833,15 @@ table.table-bottom-border {
}
}
+table.table-empty-rows{
+ thead th:last-of-type,tr:last-of-type{
+ & td, & th {
+ border-bottom: $panel-border;
+ }
+ }
+}
+
+
.context-menu-list .context-menu-submenu:after {
font-family: $font-family-icon;
content: "\f054" !important;
@@ -852,14 +863,21 @@ table.table-bottom-border {
padding-bottom: 1.0rem;
}
& .panel-body {
- padding-botttom: 0.8rem;
+ padding-bottom: 0.8rem;
}
& .btn-login {
background-color: $security-btn-color;
}
- & .user-language select {
- background-color: transparent;
- color: $security-text-color;
+ & .user-language {
+ & select{
+ background-color: $color-primary;
+ color: $security-text-color;
+
+ & option{
+ background-color: $color-primary;
+ color: $security-text-color;
+ }
+ }
}
& .pg-icon {
width: 28px;
@@ -917,7 +935,6 @@ table.table-bottom-border {
}
}
-
.backform-tab{
& > .nav.nav-tabs {
position: absolute;
@@ -928,7 +945,7 @@ table.table-bottom-border {
& > .tab-content {
position: absolute;
top: $title-height;
- bottom: 50px;
+ bottom: $footer-height-calc;
}
}
.ajs-content {
diff --git a/web/pgadmin/static/scss/_select2.overrides.scss b/web/pgadmin/static/scss/_select2.overrides.scss
index d7bb5b3e..afecaf7b 100644
--- a/web/pgadmin/static/scss/_select2.overrides.scss
+++ b/web/pgadmin/static/scss/_select2.overrides.scss
@@ -30,18 +30,14 @@
height: 100%;
}
-
-.select2-container--default.select2-container--focus
-.select2-selection--multiple {
- border: 1px solid $color-gray-light !important;
- outline: 0 none;
-}
-
.select2-container--default.select2-container--focus {
- border-color: $color-primary-light;
- outline: 0;
- -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba($color-primary, .6);
- box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba($color-primary, .6);
+ & .select2-selection--single,
+ & .select2-selection--multiple {
+ border-color: $input-focus-border-color !important;
+ outline: 0;
+ -webkit-box-shadow: $input-focus-box-shadow;
+ box-shadow: $input-focus-box-shadow;
+ }
}
diff --git a/web/pgadmin/static/scss/_webcabin.pgadmin.scss b/web/pgadmin/static/scss/_webcabin.pgadmin.scss
index 5550a207..79f68ecc 100644
--- a/web/pgadmin/static/scss/_webcabin.pgadmin.scss
+++ b/web/pgadmin/static/scss/_webcabin.pgadmin.scss
@@ -29,8 +29,8 @@
}
.wcFrameButton {
- width: 25px;
- height: 20px;
+ width: 24px;
+ height: 22px;
display: flex;
border-radius: $btn-border-radius;
margin: auto;
@@ -85,6 +85,66 @@
.wcFloating {
box-shadow: $box-shadow;
z-index: 1050 !important;
+
+ &.wcFrame, & .wcPanelBackground {
+ border-bottom-left-radius: $card-border-radius;
+ border-bottom-right-radius: $card-border-radius;
+ }
+
+ & .pg-panel-content {
+ border-bottom: $card-border-radius;
+ }
+
+ & .wcFrameCornerNE,
+ & .wcFrameCornerNW,
+ & .wcFrameCornerSE,
+ & .wcFrameCornerSW {
+ height: $card-border-radius*2;
+ width: $card-border-radius*2;
+ background: transparent;
+ }
+
+ & .wcFrameCornerNE {
+ border: $panel-border;
+ border-left: none !important;
+ border-bottom: none !important;
+ border-radius: none;
+ border-top-right-radius: $card-border-radius;
+ }
+
+ & .wcFrameCornerNW {
+ border: $panel-border;
+ border-right: none !important;
+ border-bottom: none !important;
+ border-radius: none;
+ border-top-left-radius: $card-border-radius;
+ }
+
+ & .wcFrameCornerSE {
+ border: $panel-border;
+ border-top: none !important;
+ border-left: none !important;
+ border-radius: none;
+ border-bottom-right-radius: $card-border-radius;
+ }
+
+ & .wcFrameCornerSW {
+ border: $panel-border;
+ border-right: none !important;
+ border-top: none !important;
+ border-radius: none;
+ border-bottom-left-radius: $card-border-radius;
+ }
+
+ .wcFrameEdgeH {
+ left: $card-border-radius !important;
+ right: $card-border-radius !important;
+ }
+
+ .wcFrameEdgeV {
+ top: $card-border-radius !important;
+ bottom: $card-border-radius !important;
+ }
}
.wcFloating .wcPanelTabActive {
diff --git a/web/pgadmin/static/scss/resources/_default.style.scss b/web/pgadmin/static/scss/resources/_default.style.scss
index 0096d3e9..f90fe47a 100644
--- a/web/pgadmin/static/scss/resources/_default.style.scss
+++ b/web/pgadmin/static/scss/resources/_default.style.scss
@@ -22,6 +22,10 @@
&-light {
background-color: $color-danger-light;
}
+
+ &-lighter {
+ background-color: $color-danger-lighter;
+ }
}
.bg-success {
@@ -81,6 +85,10 @@
&-light {
border-color: $color-danger-light;
}
+
+ &-lighter {
+ border-color: $color-danger-lighter;
+ }
}
.border-success {
diff --git a/web/pgadmin/static/scss/resources/_default.variables.scss b/web/pgadmin/static/scss/resources/_default.variables.scss
index a97bedca..79eff097 100644
--- a/web/pgadmin/static/scss/resources/_default.variables.scss
+++ b/web/pgadmin/static/scss/resources/_default.variables.scss
@@ -19,7 +19,8 @@ $color-secondary: $white !default;
$color-danger: #e53935 !default;
$color-danger-fg: $white !default;
-$color-danger-light: #FBE1E1;
+$color-danger-light: #F39999;
+$color-danger-lighter: #FAECEC;
$color-success: #43a047 !default;
$color-success-fg: $black !default;
@@ -51,7 +52,7 @@ $font-family-editor: 'Source Code Pro' !default;
$font-family-icon: 'FontAwesome' !default;
$border-width: 1px;
-$border-color: rgba($color-gray, 0.5);
+$border-color: #dde0e6;
$border-color-dark: $color-gray;
$box-shadow: 0 0.5rem 3rem $color-gray-dark;
@@ -59,7 +60,8 @@ $box-shadow: 0 0.5rem 3rem $color-gray-dark;
$gray-600: $color-gray-dark;
$gray-900: $color-fg-theme;
$body-color: $color-fg-theme;
-$font-size-base: 0.815rem;
+$font-size-base: 0.875rem;
+$line-height-base: 1.5; // no change
$grid-gutter-width: 15px;
$border-radius: 0.25rem; //no change
@@ -122,9 +124,19 @@ $input-border-radius: $border-radius; //no change
$input-disabled-bg: $color-gray-lighter;
$input-btn-border-width: $border-width; //no change
$input-border-width: $input-btn-border-width; //no change
-$input-btn-padding-y: .375rem; //no change
+$input-btn-padding-y: .25rem;
$input-btn-padding-x: .75rem; //no change
+$component-active-bg: $color-primary; //no change
+$input-btn-focus-width: .2rem !default; //no change
+$input-btn-focus-color: rgba($component-active-bg, .25) !default; //no change
+$input-btn-focus-box-shadow: 0 0 0 $input-btn-focus-width $input-btn-focus-color !default; //no change
+$input-focus-bg: $input-bg !default; //no change
+$input-focus-border-color: lighten($component-active-bg, 25%) !default; //no change
+$input-focus-color: $input-color !default; //no change
+$input-focus-width: $input-btn-focus-width !default; //no change
+$input-focus-box-shadow: $input-btn-focus-box-shadow !default; //no change
+
$btn-border-radius: $border-radius; //no change
/***************/
@@ -136,12 +148,12 @@ $panel-border-radius: $border-radius;
$panel-border: $panel-border-width solid $panel-border-color !important;
$panel-border-dark: $panel-border-width solid $border-color-dark !important;
$tabs-padding: 5px 10px 2px;
-$title-height: 37px * $font-size-base/1rem;
+$title-height: ($line-height-base*16px) + 5px + 2px + $border-width;
$footer-padding: 0.5rem;
-$footer-min-height: 2.18rem;
+$footer-min-height: 2rem;
$footer-height-calc: $footer-min-height+$footer-padding*2;
-$navbar-font-size: 0.875rem;
-$navbar-user-font-size: 0.815rem;
+$navbar-font-size: 0.925rem;
+$navbar-user-font-size: 0.875rem;
$navbar-dropdown-top: 100%;
$dropdown-submenu-top: -$dropdown-spacer;
@@ -160,7 +172,7 @@ $sql-gutters-bg: $color-gray-light;
$sql-history-detail-bg: $color-gray-lighter;
$sql-history-success-bg: $color-primary-light;
$sql-history-success-fg: $color-primary;
-$sql-history-error-bg: $color-danger-light;
+$sql-history-error-bg: $color-danger-lighter;
$sql-history-error-fg: $color-danger;
$negative-bg: $color-gray-light;
@@ -175,7 +187,7 @@ $btn-secondary-hover-bg: $color-gray-light;
$card-header-padding : 0.25rem 0.5rem;
$no-border-radius: 0px !important;
-$btn-checkbox-padding: 0.3rem 0.8rem;
+$btn-checkbox-padding: $input-btn-padding-y $input-btn-padding-x;
$security-text-color: $white;
$security-btn-color: #038bba;
diff --git a/web/pgadmin/static/vendor/backform/backform.js b/web/pgadmin/static/vendor/backform/backform.js
index b0b72511..b0d2fd4a 100644
--- a/web/pgadmin/static/vendor/backform/backform.js
+++ b/web/pgadmin/static/vendor/backform/backform.js
@@ -404,7 +404,6 @@
var SpacerControl = Backform.SpacerControl = Control.extend({
template: _.template([
- '<label class="<%=Backform.controlLabelClassName%>"> </label>',
'<div class="<%=Backform.controlsClassName%>"></div>'
].join("\n"))
});
@@ -558,7 +557,7 @@
},
template: _.template([
'<label class="<%=Backform.controlLabelClassName%>"><%=label%></label>',
- '<div class="<%=Backform.controlContainerClassName%> form-check-inline">',
+ '<div class="<%=Backform.controlContainerClassName%> d-flex">',
' <% for (var i=0; i < options.length; i++) { %>',
' <% var option = options[i]; %>',
' <% var id = _.uniqueId("bf_"); %>',
diff --git a/web/pgadmin/static/vendor/backgrid/backgrid.css b/web/pgadmin/static/vendor/backgrid/backgrid.css
index 7eb59697..c4298e22 100644
--- a/web/pgadmin/static/vendor/backgrid/backgrid.css
+++ b/web/pgadmin/static/vendor/backgrid/backgrid.css
@@ -80,10 +80,6 @@
text-align: center;
}
-.backgrid td.editor {
- padding: 0;
-}
-
.backgrid td.editor,
.backgrid tbody tr:nth-child(odd) td.editor {
background-color: rgba(82, 168, 236, 0.1);
diff --git a/web/pgadmin/templates/security/fields.html b/web/pgadmin/templates/security/fields.html
index a07971aa..efb126b2 100644
--- a/web/pgadmin/templates/security/fields.html
+++ b/web/pgadmin/templates/security/fields.html
@@ -4,7 +4,7 @@
type="{% if type %}{{ type }}{% else %}{{ field.type }}{% endif %}" autofocus>
{% if field.errors %}
{% for error in field.errors %}
- <span class="form-text text-danger">{{ error }}</span>
+ <span class="form-text">{{ error }}</span>
{% endfor %}
{% endif %}
</div>
diff --git a/web/pgadmin/templates/security/login_user.html b/web/pgadmin/templates/security/login_user.html
index b53f9461..7515c2c2 100644
--- a/web/pgadmin/templates/security/login_user.html
+++ b/web/pgadmin/templates/security/login_user.html
@@ -14,8 +14,8 @@
{{ render_field_with_errors(login_user_form.password, "password") }}
<button class="btn btn-primary btn-block btn-login" type="submit" value="{{ _('Login') }}">{{ _('Login') }}</button>
<div class="form-group row mb-3 c user-language">
- <div class="col-8"><span class="help-block">{{ _('<a href="%(url)s" class="text-white">Forgotten your password</a>?', url=url_for('browser.forgot_password')) }}</span></div>
- <div class="col-4">
+ <div class="col-7"><span class="help-block">{{ _('<a href="%(url)s" class="text-white">Forgotten your password</a>?', url=url_for('browser.forgot_password')) }}</span></div>
+ <div class="col-5">
<select class="form-control" name="language" value="{{user_language}}">
{% for key, lang in config.LANGUAGES.items() %}
<option value="{{key}}" {% if user_language == key %}selected{% endif %}>{{lang}}</option>
diff --git a/web/pgadmin/tools/backup/static/js/backup.js b/web/pgadmin/tools/backup/static/js/backup.js
index 3662f5a5..3bb5da0d 100644
--- a/web/pgadmin/tools/backup/static/js/backup.js
+++ b/web/pgadmin/tools/backup/static/js/backup.js
@@ -50,7 +50,7 @@ define([
' <span class="<%=Backform.helpMessageClassName%>"><%=helpMessage%></span>',
'<% } %>',
].join('\n')),
- className: 'pgadmin-control-group form-group pg-el-md-6 pg-el-xs-12 row',
+ className: 'pgadmin-control-group form-group pg-el-md-6 pg-el-12 row',
});
//Backup Model (Server Node)
@@ -580,7 +580,7 @@ define([
alertify,
BackupModel
);
- dialog.draw(action, item, {'globals': true});
+ dialog.draw(action, item, {'globals': true}, pgBrowser.stdW.md, pgBrowser.stdH.md);
},
start_backup_server: function(action, item) {
let dialog = new globalBackupDialog.BackupDialog(
@@ -589,7 +589,7 @@ define([
alertify,
BackupObjectModel
);
- dialog.draw(action, item, {'server': true});
+ dialog.draw(action, item, {'server': true}, pgBrowser.stdW.md, pgBrowser.stdH.md);
},
// Callback to draw Backup Dialog for objects
backup_objects: function(action, treeItem) {
@@ -599,7 +599,7 @@ define([
alertify,
BackupObjectModel
);
- dialog.draw(action, treeItem, null);
+ dialog.draw(action, treeItem, null, pgBrowser.stdW.md, pgBrowser.stdH.md);
},
};
return pgBrowser.Backup;
diff --git a/web/pgadmin/tools/backup/static/js/backup_dialog.js b/web/pgadmin/tools/backup/static/js/backup_dialog.js
index 8613ddd6..bd68ecb5 100644
--- a/web/pgadmin/tools/backup/static/js/backup_dialog.js
+++ b/web/pgadmin/tools/backup/static/js/backup_dialog.js
@@ -28,7 +28,7 @@ export class BackupDialog extends Dialog {
});
}
- draw(action, aciTreeItem, params) {
+ draw(action, aciTreeItem, params, width=0, height=0) {
const serverInformation = this.retrieveAncestorOfTypeServer(aciTreeItem);
if (!serverInformation) {
@@ -66,7 +66,7 @@ export class BackupDialog extends Dialog {
typeOfDialog
);
- dialog(true).resizeTo('60%', '50%');
+ dialog(true).resizeTo(width, height);
}).catch(function() {
that.alertify.alert(
gettext('Utility not found'),
diff --git a/web/pgadmin/tools/datagrid/static/js/datagrid.js b/web/pgadmin/tools/datagrid/static/js/datagrid.js
index 8b842c56..c27482ab 100644
--- a/web/pgadmin/tools/datagrid/static/js/datagrid.js
+++ b/web/pgadmin/tools/datagrid/static/js/datagrid.js
@@ -379,7 +379,7 @@ define('pgadmin.datagrid', [
$.get(url_for('datagrid.filter'),
function(data) {
alertify.filterDialog('Data Filter', data, baseUrl, validateUrl)
- .resizeTo(300, 200);
+ .resizeTo(pgBrowser.stdW.sm,pgBrowser.stdH.sm);
}
);
},
diff --git a/web/pgadmin/tools/debugger/static/js/debugger_ui.js b/web/pgadmin/tools/debugger/static/js/debugger_ui.js
index f86418e3..6372835d 100644
--- a/web/pgadmin/tools/debugger/static/js/debugger_ui.js
+++ b/web/pgadmin/tools/debugger/static/js/debugger_ui.js
@@ -951,7 +951,7 @@ define([
Alertify.debuggerInputArgsDialog(
gettext('Debugger'), debug_info, restart_debug, is_edb_proc
- ).resizeTo('60%', '60%');
+ ).resizeTo(pgBrowser.stdW.md,pgBrowser.stdH.md);
};
diff --git a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
index f87742e6..ece3945c 100644
--- a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
+++ b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
@@ -1031,6 +1031,7 @@ define([
// Render SqlTab control to generate its html markup
var sqlCtrlHtml = sqlControl.render().$el;
+ sqlCtrlHtml.addClass('h-100');
this.render = function() {
return {
el: sqlCtrlHtml,
@@ -1150,7 +1151,7 @@ define([
}
// Call Grant Wizard Dialog and set dimensions for wizard
- Alertify.wizardDialog(true).resizeTo('55%', '75%');
+ Alertify.wizardDialog(true).resizeTo(pgBrowser.stdW.lg,pgBrowser.stdH.lg);
},
};
diff --git a/web/pgadmin/tools/grant_wizard/static/scss/_grant_wizard.scss b/web/pgadmin/tools/grant_wizard/static/scss/_grant_wizard.scss
index 35810cb1..5975d607 100644
--- a/web/pgadmin/tools/grant_wizard/static/scss/_grant_wizard.scss
+++ b/web/pgadmin/tools/grant_wizard/static/scss/_grant_wizard.scss
@@ -29,6 +29,7 @@
height: calc(100% - 15px);
display: block;
padding: 0;
+ overflow-y: hidden !important;
}
.object_type_table thead {
@@ -114,8 +115,8 @@
.wizard-right-panel_content .CodeMirror {
border: 1px solid $color-gray-light;
- height: 285px !important;
- min-height: 285px !important;
+ height: 100% !important;
+ min-height: 100% !important;
}
.wizard-right-panel_content .CodeMirror-linenumber {
@@ -123,10 +124,6 @@
border-right: none;
}
-.wizard-right-panel_content .CodeMirror-gutters {
- min-height: 285px !important;
-}
-
.grant_wizard_container {
position: relative;
overflow: hidden;
diff --git a/web/pgadmin/tools/import_export/static/js/import_export.js b/web/pgadmin/tools/import_export/static/js/import_export.js
index 35f41ac8..9d6d8e55 100644
--- a/web/pgadmin/tools/import_export/static/js/import_export.js
+++ b/web/pgadmin/tools/import_export/static/js/import_export.js
@@ -496,6 +496,8 @@ Backform, commonUtils, supportedNodes
}],
options: {
modal: true,
+ padding: !1,
+ overflow: !1,
},
};
},
@@ -645,10 +647,6 @@ Backform, commonUtils, supportedNodes
}
});
- // Give the dialog initial height & width
- this.elements.dialog.style.minHeight = '80%';
- this.elements.dialog.style.minWidth = '70%';
-
view.$el.attr('tabindex', -1);
// var dialogTabNavigator = pgBrowser.keyboardNavigation.getDialogTabNavigator(view);
pgBrowser.keyboardNavigation.getDialogTabNavigator(view);
@@ -682,7 +680,7 @@ Backform, commonUtils, supportedNodes
S(
gettext('Import/Export data - table \'%s\'')
).sprintf(treeInfo.table.label).value(), node, i, d
- ).set('resizable', true).resizeTo('70%', '80%');
+ ).set('resizable', true).resizeTo(pgAdmin.Browser.stdW.md,pgAdmin.Browser.stdH.lg);
})
.fail(function() {
Alertify.alert(
diff --git a/web/pgadmin/tools/maintenance/static/js/maintenance.js b/web/pgadmin/tools/maintenance/static/js/maintenance.js
index f402dabf..c3e7e541 100644
--- a/web/pgadmin/tools/maintenance/static/js/maintenance.js
+++ b/web/pgadmin/tools/maintenance/static/js/maintenance.js
@@ -34,7 +34,7 @@ define([
' <span class="<%=Backform.helpMessageClassName%>"><%=helpMessage%></span>',
'<% } %>',
].join('\n')),
- className: 'pgadmin-control-group form-group col-6',
+ className: 'pgadmin-control-group form-group pg-el-md-6 pg-el-12 row',
});
// Main model for Maintenance functionality
@@ -492,7 +492,8 @@ define([
return;
}
// Open the Alertify dialog
- Alertify.MaintenanceDialog('Maintenance...').set('resizable', true).resizeTo('60%', '80%');
+ Alertify.MaintenanceDialog(gettext('Maintenance...')).set('resizable', true)
+ .resizeTo(pgAdmin.Browser.stdW.md,pgAdmin.Browser.stdH.md);
})
.fail(function() {
Alertify.alert(
diff --git a/web/pgadmin/tools/restore/static/js/restore.js b/web/pgadmin/tools/restore/static/js/restore.js
index 2dcfdd60..fcb96396 100644
--- a/web/pgadmin/tools/restore/static/js/restore.js
+++ b/web/pgadmin/tools/restore/static/js/restore.js
@@ -29,7 +29,7 @@ commonUtils, menuUtils, supportedNodes, restoreDialog
' <span class="<%=Backform.helpMessageClassName%>"><%=helpMessage%></span>',
'<% } %>',
].join('\n')),
- className: 'pgadmin-control-group form-group pg-el-4 row',
+ className: 'pgadmin-control-group form-group pg-el-md-6 row',
});
//Restore Model (Objects like Database/Schema/Table)
@@ -381,7 +381,7 @@ commonUtils, menuUtils, supportedNodes, restoreDialog
let dialog = new restoreDialog.RestoreDialog(
pgBrowser, $, alertify, RestoreObjectModel
);
- dialog.draw(action, treeItem);
+ dialog.draw(action, treeItem, pgBrowser.stdW.md, pgBrowser.stdH.md);
},
};
return pgBrowser.Restore;
diff --git a/web/pgadmin/tools/restore/static/js/restore_dialog.js b/web/pgadmin/tools/restore/static/js/restore_dialog.js
index 88970b2c..1fe36bc9 100644
--- a/web/pgadmin/tools/restore/static/js/restore_dialog.js
+++ b/web/pgadmin/tools/restore/static/js/restore_dialog.js
@@ -27,7 +27,7 @@ export class RestoreDialog extends Dialog {
});
}
- draw(action, aciTreeItem) {
+ draw(action, aciTreeItem, width, height) {
const serverInformation = this.retrieveAncestorOfTypeServer(aciTreeItem);
@@ -69,7 +69,8 @@ export class RestoreDialog extends Dialog {
let title = sprintf(gettext('Restore (%s: %s)'), node.label, data.label);
that.createOrGetDialog(title, 'restore');
- that.alertify.pg_restore(title, aciTreeItem1, data, node).resizeTo('65%', '60%');
+ that.alertify.pg_restore(title, aciTreeItem1, data, node)
+ .resizeTo(width, height);
}).catch(function() {
that.alertify.alert(
gettext('Utility not found'),
diff --git a/web/pgadmin/tools/sqleditor/static/css/sqleditor.css b/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
index 5961dc5a..91c515f4 100644
--- a/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
+++ b/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
@@ -310,7 +310,9 @@ input.editor-checkbox:focus {
/* For Filter status bar */
.data_sorting_dialog .pg-prop-status-bar {
position: absolute;
- bottom: 40px;
+ left: 0;
+ right: 0;
+ bottom: 0;
z-index: 5;
}
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
index b334036a..4b1fbb10 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -2172,7 +2172,7 @@ define('tools.querytool', [
/* If filter is applied then remove class 'btn-secondary'
- * and add 'btn-warning' to change the colour of the button.
+ * and add 'btn-primary' to change the colour of the button.
*/
if (self.can_filter && res.data.filter_applied) {
$('#btn-filter').removeClass('btn-secondary');
diff --git a/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss b/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
index 73513620..5d425bb8 100644
--- a/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
+++ b/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
@@ -218,11 +218,10 @@ li.CodeMirror-hint-active {
.pg_text_editor {
z-index:10000;
position:absolute;
- background: $color-bg;
- padding: 7px 5px 5px 1px;
- border:2px solid $color-gray;
- -moz-border-radius:10px;
- border-radius:10px;
+ background: $color-bg-theme;
+ padding: 0.25rem;
+ border: $panel-border;
+ box-shadow: $dropdown-box-shadow;
}
.editor-title {
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 f928c0bb..212a9de0 100644
--- a/web/pgadmin/tools/user_management/static/js/user_management.js
+++ b/web/pgadmin/tools/user_management/static/js/user_management.js
@@ -122,7 +122,7 @@ define([
});
}
- alertify.ChangePassword(title, url).resizeTo('55%', '60%');
+ alertify.ChangePassword(title, url).resizeTo(pgBrowser.stdW.lg, pgBrowser.stdH.md);
},
isPgaLoginRequired(xhr) {
@@ -220,7 +220,7 @@ define([
});
}
- alertify.PgaLogin(title, url).resizeTo('75%','70%');
+ alertify.PgaLogin(title, url).resizeTo(pgBrowser.stdW.md, pgBrowser.stdH.md);
},
// Callback to draw User Management Dialog.
@@ -625,18 +625,19 @@ define([
prepare: function() {
var footerTpl = _.template([
'<div class="pg-prop-footer" style="visibility:hidden;">',
- '<div class="pg-prop-status-bar">',
- '<div class="media error-in-footer bg-danger-light border-danger text-danger text-14">',
- '<div class="media-body media-middle">',
- '<div class="alert-icon error-icon">',
- '<i class="fa fa-exclamation-triangle" aria-hidden="true"></i>',
- '</div>',
- '<div class="alert-text">',
- '</div>',
- '<div class="close-error-bar"><a class="close-error">x</a></div>',
- '</div>',
- '</div>',
- '</div>',
+ ' <div class="pg-prop-status-bar">',
+ ' <div class="error-in-footer"> ',
+ ' <div class="d-flex px-2 py-1"> ',
+ ' <div class="pr-2"> ',
+ ' <i class="fa fa-exclamation-triangle text-danger" aria-hidden="true"></i> ',
+ ' </div> ',
+ ' <div class="alert-text"></div> ',
+ ' <div class="ml-auto close-error-bar"> ',
+ ' <a class="close-error fa fa-times text-danger"></a> ',
+ ' </div> ',
+ ' </div> ',
+ ' </div> ',
+ ' </div>',
'</div>',
].join('\n')),
$statusBar = $(footerTpl()),
@@ -887,7 +888,7 @@ define([
};
});
}
- alertify.UserManagement(true).resizeTo('680px', '400px');
+ alertify.UserManagement(true).resizeTo(pgBrowser.stdW.md, pgBrowser.stdH.md);
},
};
diff --git a/web/pgadmin/tools/user_management/static/scss/_user_management.scss b/web/pgadmin/tools/user_management/static/scss/_user_management.scss
index 145bb664..ca1b090a 100644
--- a/web/pgadmin/tools/user_management/static/scss/_user_management.scss
+++ b/web/pgadmin/tools/user_management/static/scss/_user_management.scss
@@ -24,23 +24,4 @@
.user_management .backform-tab {
height: calc(100% - 75px);
-}
-
-.user_management .search_users {
- float:right;
- margin-right: 5px;
- padding:0 !important;
-}
-
-.user_management .search_users input{
- height:15px;
- margin-top: 3px;
-}
-
-.user_management input[placeholder] {
- font-size: 12px;
-}
-
-.user_management_pg-alertify-button {
- line-height: 16px;
-}
+}
\ No newline at end of file
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 05:52 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
@ 2019-01-02 09:39 ` Akshay Joshi <[email protected]>
2019-01-03 10:20 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Akshay Joshi @ 2019-01-02 09:39 UTC (permalink / raw)
To: Aditya Toshniwal <[email protected]>; +Cc: pgadmin-hackers <[email protected]>
Thanks patch applied.
On Wed, Jan 2, 2019 at 11:23 AM Aditya Toshniwal <
[email protected]> wrote:
> Hi Hackers,
>
> Kindly ignore the previous patch. Attaching updated patch with few more
> corrections.
> The patch includes:
> - 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.
> - Other improvements wherever noticed.
>
> On Tue, Jan 1, 2019 at 11:09 AM Aditya Toshniwal <
> [email protected]> wrote:
>
>> Hi Hackers,
>>
>> Attached is the patch to improve the previously committed new design
>> changes.
>> The patch includes:
>> - 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)
>> - Other improvements wherever noticed.
>>
>> I hope this covers majority of the issues.
>> Kindly review.
>>
>>
>> On Fri, Dec 21, 2018 at 7:48 PM Aditya Toshniwal <
>> [email protected]> wrote:
>>
>>>
>>>
>>> On Fri, Dec 21, 2018 at 7:46 PM Dave Page <[email protected]> wrote:
>>>
>>>> On Fri, Dec 21, 2018 at 2:14 PM Aditya Toshniwal
>>>> <[email protected]> wrote:
>>>> >
>>>> > For the query tool results grid text pop-out, you mean the border
>>>> size around it ?
>>>> > We don't have any design discussed for it, so could you please
>>>> propose what can be done.
>>>>
>>>> Border, button colours etc. I can't draw anything, but I'd suggest
>>>> that the border should be squared not rounded, and the
>>>> thickness/shadow etc adjusted to match the other styling.
>>>>
>>> Cool.
>>> Button colors are already changed. Others things noted. Will work on it.
>>>
>>>> >
>>>> > On Fri, Dec 21, 2018 at 7:35 PM Dave Page <[email protected]> wrote:
>>>> >>
>>>> >> On Fri, Dec 21, 2018 at 2:02 PM Aditya Toshniwal
>>>> >> <[email protected]> wrote:
>>>> >> >
>>>> >> >
>>>> >> >
>>>> >> > On Fri, Dec 21, 2018 at 7:29 PM Dave Page <[email protected]>
>>>> wrote:
>>>> >> >>
>>>> >> >> One other issue: I'm seeing that standard sized dialogues (e.g.
>>>> the
>>>> >> >> Server or Database Properties dialogues) are wrapping their
>>>> labels and
>>>> >> >> controls at the default size. That should not be the case.
>>>> >> >
>>>> >> > Yep. Akshay has logged that in the sheet shared (
>>>> https://drive.google.com/open?id=127BgrvdVUvWSEp-GnQvCDx1WaaemsycxSD0aUpWxb6k
>>>> ).
>>>> >>
>>>> >> OK, but the answer isn't to increase the size of the dialogues as
>>>> >> suggested. The size is fine (though we should review for consistency,
>>>> >> and ensure we are using no more than 3 default standard sizes
>>>> >> throughout the app); we should make the controls display nicely on
>>>> the
>>>> >> default dialogue size and wrap if the user makes it smaller than we
>>>> >> can display in.
>>>> >>
>>>> >> >> On Fri, Dec 21, 2018 at 12:46 PM Dave Page <[email protected]>
>>>> wrote:
>>>> >> >> >
>>>> >> >> > Hi
>>>> >> >> >
>>>> >> >> > On Fri, Dec 21, 2018 at 12:29 PM Aditya Toshniwal
>>>> >> >> > <[email protected]> wrote:
>>>> >> >> > >
>>>> >> >> > > Hi Dave,
>>>> >> >> > >
>>>> >> >> > > On Fri, Dec 21, 2018 at 5:51 PM Dave Page <[email protected]>
>>>> wrote:
>>>> >> >> > >>
>>>> >> >> > >> Nice! Thanks Ashesh.
>>>> >> >> > >>
>>>> >> >> > >> Some small issues I spotted:
>>>> >> >> > >>
>>>> >> >> > >> - The font looks somewhat small. How does it compare in size
>>>> to, say,
>>>> >> >> > >> Gmail? I think it needs to be increased to at least that
>>>> size.
>>>> >> >> > >
>>>> >> >> > > Gmail uses 0.875rem (14px) for the left panel (Inbox, Sent).
>>>> We are using 0.875rem (14px) for main navbar links and 0.815rem(13.04px)
>>>> for all other text.
>>>> >> >> >
>>>> >> >> > Let's increase the default to 0.875, and make the main links
>>>> >> >> > proportionally bigger.
>>>> >> >> >
>>>> >> >> > >> - Dialogues have 2 close buttons next to each other in the
>>>> top-right.
>>>> >> >> > >> Looks like an icon and a text version?
>>>> >> >> > >
>>>> >> >> > > You need to do a yarn install. wcDocker code is changed to
>>>> fix that.
>>>> >> >> >
>>>> >> >> > Yup, that fixed it.
>>>> >> >> >
>>>> >> >> > >> - Why do some Preferences panels use alternate line
>>>> colouring, whilst
>>>> >> >> > >> others don't? I suspect it's because some are actually
>>>> tables under
>>>> >> >> > >> the hood? I think we need consistency there.
>>>> >> >> > >
>>>> >> >> > > Noted.
>>>> >> >> > >>
>>>> >> >> > >>
>>>> >> >> > >> - The Maintenance dialogue looks terrible - it needs to be
>>>> made much
>>>> >> >> > >> more compact. I also seem to be getting a failure to create
>>>> >> >> > >> maintenance jobs (backups etc work fine).
>>>> >> >> > >
>>>> >> >> > > Noted.
>>>> >> >> > >>
>>>> >> >> > >>
>>>> >> >> > >> - I think the buttons on the Browser need borders to match
>>>> other buttons.
>>>> >> >> > >
>>>> >> >> > > It is made consistent with other wcDocker buttons like close,
>>>> right arrow, left arrow. However, we can make it look like other buttons.
>>>> >> >> >
>>>> >> >> > I think they're a different class of buttons -
>>>> control/navigation vs.
>>>> >> >> > function. I think we should make this change as the browser
>>>> buttons
>>>> >> >> > really are a toolbar just like the larger on on the query tool.
>>>> >> >> >
>>>> >> >> > Thanks!
>>>> >> >> >
>>>> >> >> > >> Thanks!
>>>> >> >> > >>
>>>> >> >> > >> On Fri, Dec 21, 2018 at 12:01 PM Ashesh Vashi
>>>> >> >> > >> <[email protected]> wrote:
>>>> >> >> > >> >
>>>> >> >> > >> > Improvement in the look and feel of the whole application
>>>> >> >> > >> >
>>>> >> >> > >> > Changed the SCSS/CSS for the below third party libraries
>>>> to adopt the
>>>> >> >> > >> > new look 'n' feel:
>>>> >> >> > >> > - wcDocker
>>>> >> >> > >> > - Alertify dialogs, and notifications
>>>> >> >> > >> > - AciTree
>>>> >> >> > >> > - Bootstrap Navbar
>>>> >> >> > >> > - Bootstrap Tabs
>>>> >> >> > >> > - Bootstrap Drop-Down menu
>>>> >> >> > >> > - Backgrid
>>>> >> >> > >> > - Select2
>>>> >> >> > >> >
>>>> >> >> > >> > Adopated the new the look 'n' feel for the dialogs,
>>>> wizard, properties,
>>>> >> >> > >> > tab panels, tabs, fieldset, subnode control, spinner
>>>> control, HTML
>>>> >> >> > >> > table, and other form controls.
>>>> >> >> > >> >
>>>> >> >> > >> > - Font is changed to Roboto
>>>> >> >> > >> > - Using SCSS variables to define the look 'n' feel
>>>> >> >> > >> > - Designer background images for the Login, and Forget
>>>> password pages in
>>>> >> >> > >> > 'web' mode
>>>> >> >> > >> > - Improved the look 'n' feel for the key selection in the
>>>> preferences
>>>> >> >> > >> > dialog
>>>> >> >> > >> > - Table classes consistency changes across the application
>>>> >> >> > >> > - File Open and Save dialog list view changes
>>>> >> >> > >> >
>>>> >> >> > >> > Author(s): Aditya Toshniwal & Khushboo Vashi
>>>> >> >> > >> >
>>>> >> >> > >> > Branch
>>>> >> >> > >> > ------
>>>> >> >> > >> > master
>>>> >> >> > >> >
>>>> >> >> > >> > Details
>>>> >> >> > >> > -------
>>>> >> >> > >> >
>>>> https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5799ac14ba17dc25fbec184b3b2c6afbe37f...
>>>> >> >> > >> >
>>>> >> >> > >> > Modified Files
>>>> >> >> > >> > --------------
>>>> >> >> > >> > web/package.json | 2
>>>> +-
>>>> >> >> > >> > .../static/js/fts_configuration.js | 2
>>>> +-
>>>> >> >> > >> > .../databases/schemas/functions/__init__.py | 4
>>>> +-
>>>> >> >> > >> > .../function => static}/css/function.css | 0
>>>> >> >> > >> > .../templates/trigger_function/css/function.css | 3 -
>>>> >> >> > >> > .../{templates/edbfunc => static}/css/edbfunc.css | 0
>>>> >> >> > >> > .../static/js/exclusion_constraint.js | 18
>>>> +-
>>>> >> >> > >> > .../foreign_key/static/js/foreign_key.js | 17
>>>> +-
>>>> >> >> > >> > .../schemas/tables/rules/static/css/rule.css | 7 +
>>>> >> >> > >> > .../tables/rules/templates/rules/css/rule.css | 8 -
>>>> >> >> > >> > .../databases/schemas/views/static/css/view.css | 7 +
>>>> >> >> > >> > .../schemas/views/templates/mview/css/mview.css | 4 -
>>>> >> >> > >> > .../schemas/views/templates/view/css/view.css | 4 -
>>>> >> >> > >> > .../pgagent/schedules/static/js/pga_schedule.js | 3
>>>> +-
>>>> >> >> > >> > .../servers/pgagent/static/css/pga_job.css | 3 +
>>>> >> >> > >> > .../pgagent/templates/pga_job/css/pga_job.css | 13 -
>>>> >> >> > >> > .../server_groups/servers/static/css/servers.css | 4 +
>>>> >> >> > >> > .../server_groups/servers/static/js/server.js | 22
>>>> +-
>>>> >> >> > >> > .../server_groups/servers/static/js/variable.js | 4
>>>> +-
>>>> >> >> > >> > .../servers/tablespaces/static/js/tablespace.js | 13
>>>> +-
>>>> >> >> > >> > .../servers/templates/css/servers.css | 4 -
>>>> >> >> > >> > web/pgadmin/browser/static/css/browser.css | 13 -
>>>> >> >> > >> > web/pgadmin/browser/static/css/wizard.css | 21
>>>> +-
>>>> >> >> > >> > web/pgadmin/browser/static/js/browser.js | 26
>>>> +-
>>>> >> >> > >> > web/pgadmin/browser/static/js/collection.js | 16
>>>> +-
>>>> >> >> > >> > web/pgadmin/browser/static/js/keyboard.js | 14
>>>> +-
>>>> >> >> > >> > web/pgadmin/browser/static/js/menu.js | 28
>>>> +-
>>>> >> >> > >> > web/pgadmin/browser/static/js/node.js | 53
>>>> +-
>>>> >> >> > >> > web/pgadmin/browser/static/js/node.ui.js | 4
>>>> +-
>>>> >> >> > >> > web/pgadmin/browser/static/js/panel.js | 15
>>>> +-
>>>> >> >> > >> > web/pgadmin/browser/static/js/toolbar.js | 3 -
>>>> >> >> > >> > web/pgadmin/browser/static/js/wizard.js | 58
>>>> +-
>>>> >> >> > >> > web/pgadmin/browser/static/scss/_browser.scss | 43
>>>> +-
>>>> >> >> > >> > web/pgadmin/browser/static/scss/_wizard.scss | 41
>>>> +-
>>>> >> >> > >> > web/pgadmin/browser/templates/browser/css/node.css | 2
>>>> +-
>>>> >> >> > >> > web/pgadmin/browser/templates/browser/index.html | 9
>>>> +-
>>>> >> >> > >> > web/pgadmin/dashboard/__init__.py | 2
>>>> +-
>>>> >> >> > >> > web/pgadmin/dashboard/static/css/dashboard.css | 21
>>>> +-
>>>> >> >> > >> > web/pgadmin/dashboard/static/js/dashboard.js | 120
>>>> +-
>>>> >> >> > >> > web/pgadmin/dashboard/static/scss/_dashboard.scss | 44
>>>> +-
>>>> >> >> > >> > .../templates/dashboard/database_dashboard.html | 171
>>>> ++-
>>>> >> >> > >> > .../templates/dashboard/server_dashboard.html | 197
>>>> ++-
>>>> >> >> > >> > .../templates/dashboard/welcome_dashboard.html | 30
>>>> +-
>>>> >> >> > >> > web/pgadmin/feature_tests/browser_tool_bar_test.py | 23
>>>> +-
>>>> >> >> > >> > web/pgadmin/feature_tests/file_manager_test.py | 23
>>>> +-
>>>> >> >> > >> > .../feature_tests/keyboard_shortcut_test.py | 5
>>>> +-
>>>> >> >> > >> > .../feature_tests/pg_datatype_validation_test.py | 5
>>>> +-
>>>> >> >> > >> > .../pg_utilities_backup_restore_test.py | 28
>>>> +-
>>>> >> >> > >> > .../feature_tests/pg_utilities_maintenance_test.py | 16
>>>> +-
>>>> >> >> > >> > .../feature_tests/query_tool_journey_test.py | 5
>>>> +-
>>>> >> >> > >> > web/pgadmin/feature_tests/query_tool_tests.py | 117
>>>> +-
>>>> >> >> > >> > web/pgadmin/feature_tests/view_data_dml_queries.py | 16
>>>> +-
>>>> >> >> > >> > .../misc/bgprocess/static/css/bgprocess.css | 11 -
>>>> >> >> > >> > web/pgadmin/misc/bgprocess/static/js/bgprocess.js | 173
>>>> ++-
>>>> >> >> > >> > .../misc/bgprocess/static/scss/_bgprocess.scss | 81
>>>> +-
>>>> >> >> > >> > web/pgadmin/misc/depends/static/js/depends.js | 3
>>>> +-
>>>> >> >> > >> > .../misc/file_manager/static/css/file_manager.css | 141
>>>> +-
>>>> >> >> > >> > .../misc/file_manager/static/js/create_dialogue.js | 9
>>>> +-
>>>> >> >> > >> > .../misc/file_manager/static/js/select_dialogue.js | 19
>>>> +-
>>>> >> >> > >> > web/pgadmin/misc/file_manager/static/js/utility.js | 77
>>>> +-
>>>> >> >> > >> > .../file_manager/static/scss/_file_manager.scss | 157
>>>> +--
>>>> >> >> > >> > .../file_manager/templates/file_manager/index.html | 95
>>>> +-
>>>> >> >> > >> > .../misc/statistics/static/js/statistics.js | 3
>>>> +-
>>>> >> >> > >> > web/pgadmin/preferences/static/css/preferences.css | 14 -
>>>> >> >> > >> > web/pgadmin/preferences/static/js/preferences.js | 31
>>>> +-
>>>> >> >> > >> > .../preferences/static/scss/_preferences.scss | 16 +
>>>> >> >> > >> > web/pgadmin/static/css/pgadmin.css | 81
>>>> +-
>>>> >> >> > >> > web/pgadmin/static/fonts/Roboto-Bold.ttf | Bin
>>>> 0 -> 170760 bytes
>>>> >> >> > >> > web/pgadmin/static/fonts/Roboto-Medium.ttf | Bin
>>>> 0 -> 172064 bytes
>>>> >> >> > >> > web/pgadmin/static/fonts/Roboto-Regular.ttf | Bin
>>>> 0 -> 171676 bytes
>>>> >> >> > >> > web/pgadmin/static/img/collapse_expand.svg | 15 +
>>>> >> >> > >> > web/pgadmin/static/img/forgot_password.svg | 283
>>>> ++++
>>>> >> >> > >> > web/pgadmin/static/img/login.svg | 1 +
>>>> >> >> > >> > web/pgadmin/static/js/alertify.pgadmin.defaults.js | 82
>>>> +-
>>>> >> >> > >> > web/pgadmin/static/js/backform.pgadmin.js | 80
>>>> +-
>>>> >> >> > >> > web/pgadmin/static/js/backgrid.pgadmin.js | 33
>>>> +-
>>>> >> >> > >> > web/pgadmin/static/js/slickgrid/editors.js | 8
>>>> +-
>>>> >> >> > >> > web/pgadmin/static/js/sqleditor/filter_dialog.js | 33
>>>> +-
>>>> >> >> > >> > .../static/js/sqleditor/query_tool_preferences.js | 15
>>>> +-
>>>> >> >> > >> > web/pgadmin/static/scss/_aci_tree.overrides.scss | 75
>>>> +-
>>>> >> >> > >> > web/pgadmin/static/scss/_alert.scss | 12
>>>> +-
>>>> >> >> > >> > web/pgadmin/static/scss/_alertify.overrides.scss | 150
>>>> +-
>>>> >> >> > >> > web/pgadmin/static/scss/_backform.overrides.scss | 8 +
>>>> >> >> > >> > web/pgadmin/static/scss/_backgrid.overrides.scss | 251
>>>> +++-
>>>> >> >> > >> > web/pgadmin/static/scss/_bootstrap.overrides.scss | 230
>>>> ++--
>>>> >> >> > >> > web/pgadmin/static/scss/_codemirror.overrides.scss | 94
>>>> +-
>>>> >> >> > >> > web/pgadmin/static/scss/_pgadmin.grid.scss | 56 +
>>>> >> >> > >> > web/pgadmin/static/scss/_pgadmin.style.scss | 1440
>>>> +++++---------------
>>>> >> >> > >> > web/pgadmin/static/scss/_select2.overrides.scss | 24
>>>> +-
>>>> >> >> > >> > web/pgadmin/static/scss/_webcabin.overrides.scss | 368
>>>> -----
>>>> >> >> > >> > web/pgadmin/static/scss/_webcabin.pgadmin.scss | 250
>>>> ++++
>>>> >> >> > >> > web/pgadmin/static/scss/pgadmin.scss | 10
>>>> +-
>>>> >> >> > >> > .../static/scss/resources/_default.style.scss | 90
>>>> +-
>>>> >> >> > >> > .../static/scss/resources/_default.variables.scss | 203
>>>> ++-
>>>> >> >> > >> > web/pgadmin/static/vendor/backform/backform.js | 645
>>>> +++++++++
>>>> >> >> > >> > .../templates/security/change_password.html | 43
>>>> +-
>>>> >> >> > >> > .../templates/security/forgot_password.html | 9
>>>> +-
>>>> >> >> > >> > web/pgadmin/templates/security/login_user.html | 16
>>>> +-
>>>> >> >> > >> > web/pgadmin/templates/security/panel.html | 23
>>>> +-
>>>> >> >> > >> > web/pgadmin/tools/backup/__init__.py | 6
>>>> +-
>>>> >> >> > >> > web/pgadmin/tools/backup/static/js/backup.js | 8
>>>> +-
>>>> >> >> > >> > .../backup/static/js/backup_dialog_wrapper.js | 22
>>>> +-
>>>> >> >> > >> > web/pgadmin/tools/datagrid/__init__.py | 1 -
>>>> >> >> > >> > web/pgadmin/tools/datagrid/static/js/datagrid.js | 38
>>>> +-
>>>> >> >> > >> > .../tools/datagrid/templates/datagrid/filter.html | 2 -
>>>> >> >> > >> > .../tools/datagrid/templates/datagrid/index.html | 193
>>>> ++-
>>>> >> >> > >> > web/pgadmin/tools/debugger/static/css/debugger.css | 34
>>>> +-
>>>> >> >> > >> > web/pgadmin/tools/debugger/static/js/debugger.js | 2
>>>> +-
>>>> >> >> > >> > .../tools/debugger/static/js/debugger_ui.js | 28
>>>> +-
>>>> >> >> > >> > web/pgadmin/tools/debugger/static/js/direct.js | 13
>>>> +-
>>>> >> >> > >> > .../tools/debugger/static/scss/_debugger.scss | 8 -
>>>> >> >> > >> > .../tools/debugger/templates/debugger/direct.html | 89
>>>> +-
>>>> >> >> > >> > .../tools/grant_wizard/static/js/grant_wizard.js | 27
>>>> +-
>>>> >> >> > >> > .../grant_wizard/static/scss/_grant_wizard.scss | 31
>>>> +-
>>>> >> >> > >> > .../tools/import_export/static/js/import_export.js | 24
>>>> +-
>>>> >> >> > >> > web/pgadmin/tools/maintenance/__init__.py | 10
>>>> +-
>>>> >> >> > >> > .../tools/maintenance/static/js/maintenance.js | 24
>>>> +-
>>>> >> >> > >> > .../maintenance/static/scss/_maintenance.scss | 2
>>>> +-
>>>> >> >> > >> > web/pgadmin/tools/restore/__init__.py | 14
>>>> +-
>>>> >> >> > >> > web/pgadmin/tools/restore/static/js/restore.js | 8
>>>> +-
>>>> >> >> > >> > .../restore/static/js/restore_dialog_wrapper.js | 24
>>>> +-
>>>> >> >> > >> > .../tools/sqleditor/static/css/sqleditor.css | 128
>>>> +-
>>>> >> >> > >> > web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 35
>>>> +-
>>>> >> >> > >> > .../tools/sqleditor/static/scss/_history.scss | 42
>>>> +-
>>>> >> >> > >> > .../tools/sqleditor/static/scss/_sqleditor.scss | 128
>>>> +-
>>>> >> >> > >> > .../user_management/static/css/user_management.css | 37 -
>>>> >> >> > >> > .../user_management/static/js/user_management.js | 53
>>>> +-
>>>> >> >> > >> > .../static/scss/_user_management.scss | 12
>>>> +-
>>>> >> >> > >> > .../javascript/alerts/alertify_wrapper_spec.js | 4
>>>> +-
>>>> >> >> > >> > .../backup/backup_dialog_wrapper_spec.js | 8
>>>> +-
>>>> >> >> > >> > .../restore/restore_dialog_wrapper_spec.js | 8
>>>> +-
>>>> >> >> > >> > web/webpack.config.js | 2
>>>> +-
>>>> >> >> > >> > web/webpack.shim.js | 2
>>>> +-
>>>> >> >> > >> > web/webpack.test.config.js | 1 +
>>>> >> >> > >> > web/yarn.lock | 1015
>>>> +++++++++++++-
>>>> >> >> > >> > 135 files changed, 5002 insertions(+), 3850 deletions(-)
>>>> >> >> > >> >
>>>> >> >> > >>
>>>> >> >> > >>
>>>> >> >> > >> --
>>>> >> >> > >> Dave Page
>>>> >> >> > >> Blog: http://pgsnake.blogspot.com
>>>> >> >> > >> Twitter: @pgsnake
>>>> >> >> > >>
>>>> >> >> > >> EnterpriseDB UK: http://www.enterprisedb.com
>>>> >> >> > >> The Enterprise PostgreSQL Company
>>>> >> >> > >
>>>> >> >> > >
>>>> >> >> > >
>>>> >> >> > > --
>>>> >> >> > > Thanks and Regards,
>>>> >> >> > > Aditya Toshniwal
>>>> >> >> > > Software Engineer | EnterpriseDB Software Solutions | Pune
>>>> >> >> > > "Don't Complain about Heat, Plant a tree"
>>>> >> >> >
>>>> >> >> >
>>>> >> >> >
>>>> >> >> > --
>>>> >> >> > Dave Page
>>>> >> >> > Blog: http://pgsnake.blogspot.com
>>>> >> >> > Twitter: @pgsnake
>>>> >> >> >
>>>> >> >> > EnterpriseDB UK: http://www.enterprisedb.com
>>>> >> >> > The Enterprise PostgreSQL Company
>>>> >> >>
>>>> >> >>
>>>> >> >>
>>>> >> >> --
>>>> >> >> Dave Page
>>>> >> >> Blog: http://pgsnake.blogspot.com
>>>> >> >> Twitter: @pgsnake
>>>> >> >>
>>>> >> >> EnterpriseDB UK: http://www.enterprisedb.com
>>>> >> >> The Enterprise PostgreSQL Company
>>>> >> >
>>>> >> >
>>>> >> >
>>>> >> > --
>>>> >> > Thanks and Regards,
>>>> >> > Aditya Toshniwal
>>>> >> > Software Engineer | EnterpriseDB Software Solutions | Pune
>>>> >> > "Don't Complain about Heat, Plant a tree"
>>>> >>
>>>> >>
>>>> >>
>>>> >> --
>>>> >> Dave Page
>>>> >> Blog: http://pgsnake.blogspot.com
>>>> >> Twitter: @pgsnake
>>>> >>
>>>> >> EnterpriseDB UK: http://www.enterprisedb.com
>>>> >> The Enterprise PostgreSQL Company
>>>> >
>>>> >
>>>> >
>>>> > --
>>>> > Thanks and Regards,
>>>> > Aditya Toshniwal
>>>> > Software Engineer | EnterpriseDB Software Solutions | Pune
>>>> > "Don't Complain about Heat, Plant a tree"
>>>>
>>>>
>>>>
>>>> --
>>>> Dave Page
>>>> Blog: http://pgsnake.blogspot.com
>>>> Twitter: @pgsnake
>>>>
>>>> EnterpriseDB UK: http://www.enterprisedb.com
>>>> The Enterprise PostgreSQL Company
>>>>
>>>
>>>
>>> --
>>> Thanks and Regards,
>>> Aditya Toshniwal
>>> Software Engineer | EnterpriseDB Software Solutions | Pune
>>> "Don't Complain about Heat, Plant a tree"
>>>
>>
>>
>> --
>> Thanks and Regards,
>> Aditya Toshniwal
>> Software Engineer | EnterpriseDB Software Solutions | Pune
>> "Don't Complain about Heat, Plant a tree"
>>
>
>
> --
> Thanks and Regards,
> Aditya Toshniwal
> Software Engineer | EnterpriseDB Software Solutions | Pune
> "Don't Complain about Heat, Plant a tree"
>
--
*Akshay Joshi*
*Sr. Software Architect *
*Phone: +91 20-3058-9517Mobile: +91 976-788-8246*
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 05:52 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 09:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
@ 2019-01-03 10:20 ` Aditya Toshniwal <[email protected]>
2019-01-03 15:09 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Aditya Toshniwal @ 2019-01-03 10:20 UTC (permalink / raw)
To: Akshay Joshi <[email protected]>; +Cc: pgadmin-hackers <[email protected]>
Hi Hackers,
Further improvement patch. With this patch, following are fixed:
- Fieldset control design changes
- File dialog - files list header should not scroll with the body and stick
to the top
- Debugger input args dialog cancel button should always be enabled
- Backup globals dialog controls aligmnent correction
- In View Data query tool, explain related buttons should be disabled
- Autocomplete design changes
I have also fixed one issue which was created by the copyright changes in
the file - pgadmin/misc/file_manager/templates/file_manager/js/languages/en.js.
The en.js file contains json data and adding copyright comments to it
caused JSON parsing failure in file dialog. As an improvement, I have
renamed the file from en.js to en.json at all the places to avoid such
changes in future.
Kindly review.
On Wed, Jan 2, 2019 at 3:09 PM Akshay Joshi <[email protected]>
wrote:
> Thanks patch applied.
>
> On Wed, Jan 2, 2019 at 11:23 AM Aditya Toshniwal <
> [email protected]> wrote:
>
>> Hi Hackers,
>>
>> Kindly ignore the previous patch. Attaching updated patch with few more
>> corrections.
>> The patch includes:
>> - 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.
>> - Other improvements wherever noticed.
>>
>> On Tue, Jan 1, 2019 at 11:09 AM Aditya Toshniwal <
>> [email protected]> wrote:
>>
>>> Hi Hackers,
>>>
>>> Attached is the patch to improve the previously committed new design
>>> changes.
>>> The patch includes:
>>> - 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)
>>> - Other improvements wherever noticed.
>>>
>>> I hope this covers majority of the issues.
>>> Kindly review.
>>>
>>>
>>> On Fri, Dec 21, 2018 at 7:48 PM Aditya Toshniwal <
>>> [email protected]> wrote:
>>>
>>>>
>>>>
>>>> On Fri, Dec 21, 2018 at 7:46 PM Dave Page <[email protected]> wrote:
>>>>
>>>>> On Fri, Dec 21, 2018 at 2:14 PM Aditya Toshniwal
>>>>> <[email protected]> wrote:
>>>>> >
>>>>> > For the query tool results grid text pop-out, you mean the border
>>>>> size around it ?
>>>>> > We don't have any design discussed for it, so could you please
>>>>> propose what can be done.
>>>>>
>>>>> Border, button colours etc. I can't draw anything, but I'd suggest
>>>>> that the border should be squared not rounded, and the
>>>>> thickness/shadow etc adjusted to match the other styling.
>>>>>
>>>> Cool.
>>>> Button colors are already changed. Others things noted. Will work on
>>>> it.
>>>>
>>>>> >
>>>>> > On Fri, Dec 21, 2018 at 7:35 PM Dave Page <[email protected]> wrote:
>>>>> >>
>>>>> >> On Fri, Dec 21, 2018 at 2:02 PM Aditya Toshniwal
>>>>> >> <[email protected]> wrote:
>>>>> >> >
>>>>> >> >
>>>>> >> >
>>>>> >> > On Fri, Dec 21, 2018 at 7:29 PM Dave Page <[email protected]>
>>>>> wrote:
>>>>> >> >>
>>>>> >> >> One other issue: I'm seeing that standard sized dialogues (e.g.
>>>>> the
>>>>> >> >> Server or Database Properties dialogues) are wrapping their
>>>>> labels and
>>>>> >> >> controls at the default size. That should not be the case.
>>>>> >> >
>>>>> >> > Yep. Akshay has logged that in the sheet shared (
>>>>> https://drive.google.com/open?id=127BgrvdVUvWSEp-GnQvCDx1WaaemsycxSD0aUpWxb6k
>>>>> ).
>>>>> >>
>>>>> >> OK, but the answer isn't to increase the size of the dialogues as
>>>>> >> suggested. The size is fine (though we should review for
>>>>> consistency,
>>>>> >> and ensure we are using no more than 3 default standard sizes
>>>>> >> throughout the app); we should make the controls display nicely on
>>>>> the
>>>>> >> default dialogue size and wrap if the user makes it smaller than we
>>>>> >> can display in.
>>>>> >>
>>>>> >> >> On Fri, Dec 21, 2018 at 12:46 PM Dave Page <[email protected]>
>>>>> wrote:
>>>>> >> >> >
>>>>> >> >> > Hi
>>>>> >> >> >
>>>>> >> >> > On Fri, Dec 21, 2018 at 12:29 PM Aditya Toshniwal
>>>>> >> >> > <[email protected]> wrote:
>>>>> >> >> > >
>>>>> >> >> > > Hi Dave,
>>>>> >> >> > >
>>>>> >> >> > > On Fri, Dec 21, 2018 at 5:51 PM Dave Page <[email protected]>
>>>>> wrote:
>>>>> >> >> > >>
>>>>> >> >> > >> Nice! Thanks Ashesh.
>>>>> >> >> > >>
>>>>> >> >> > >> Some small issues I spotted:
>>>>> >> >> > >>
>>>>> >> >> > >> - The font looks somewhat small. How does it compare in
>>>>> size to, say,
>>>>> >> >> > >> Gmail? I think it needs to be increased to at least that
>>>>> size.
>>>>> >> >> > >
>>>>> >> >> > > Gmail uses 0.875rem (14px) for the left panel (Inbox, Sent).
>>>>> We are using 0.875rem (14px) for main navbar links and 0.815rem(13.04px)
>>>>> for all other text.
>>>>> >> >> >
>>>>> >> >> > Let's increase the default to 0.875, and make the main links
>>>>> >> >> > proportionally bigger.
>>>>> >> >> >
>>>>> >> >> > >> - Dialogues have 2 close buttons next to each other in the
>>>>> top-right.
>>>>> >> >> > >> Looks like an icon and a text version?
>>>>> >> >> > >
>>>>> >> >> > > You need to do a yarn install. wcDocker code is changed to
>>>>> fix that.
>>>>> >> >> >
>>>>> >> >> > Yup, that fixed it.
>>>>> >> >> >
>>>>> >> >> > >> - Why do some Preferences panels use alternate line
>>>>> colouring, whilst
>>>>> >> >> > >> others don't? I suspect it's because some are actually
>>>>> tables under
>>>>> >> >> > >> the hood? I think we need consistency there.
>>>>> >> >> > >
>>>>> >> >> > > Noted.
>>>>> >> >> > >>
>>>>> >> >> > >>
>>>>> >> >> > >> - The Maintenance dialogue looks terrible - it needs to be
>>>>> made much
>>>>> >> >> > >> more compact. I also seem to be getting a failure to create
>>>>> >> >> > >> maintenance jobs (backups etc work fine).
>>>>> >> >> > >
>>>>> >> >> > > Noted.
>>>>> >> >> > >>
>>>>> >> >> > >>
>>>>> >> >> > >> - I think the buttons on the Browser need borders to match
>>>>> other buttons.
>>>>> >> >> > >
>>>>> >> >> > > It is made consistent with other wcDocker buttons like
>>>>> close, right arrow, left arrow. However, we can make it look like other
>>>>> buttons.
>>>>> >> >> >
>>>>> >> >> > I think they're a different class of buttons -
>>>>> control/navigation vs.
>>>>> >> >> > function. I think we should make this change as the browser
>>>>> buttons
>>>>> >> >> > really are a toolbar just like the larger on on the query tool.
>>>>> >> >> >
>>>>> >> >> > Thanks!
>>>>> >> >> >
>>>>> >> >> > >> Thanks!
>>>>> >> >> > >>
>>>>> >> >> > >> On Fri, Dec 21, 2018 at 12:01 PM Ashesh Vashi
>>>>> >> >> > >> <[email protected]> wrote:
>>>>> >> >> > >> >
>>>>> >> >> > >> > Improvement in the look and feel of the whole application
>>>>> >> >> > >> >
>>>>> >> >> > >> > Changed the SCSS/CSS for the below third party libraries
>>>>> to adopt the
>>>>> >> >> > >> > new look 'n' feel:
>>>>> >> >> > >> > - wcDocker
>>>>> >> >> > >> > - Alertify dialogs, and notifications
>>>>> >> >> > >> > - AciTree
>>>>> >> >> > >> > - Bootstrap Navbar
>>>>> >> >> > >> > - Bootstrap Tabs
>>>>> >> >> > >> > - Bootstrap Drop-Down menu
>>>>> >> >> > >> > - Backgrid
>>>>> >> >> > >> > - Select2
>>>>> >> >> > >> >
>>>>> >> >> > >> > Adopated the new the look 'n' feel for the dialogs,
>>>>> wizard, properties,
>>>>> >> >> > >> > tab panels, tabs, fieldset, subnode control, spinner
>>>>> control, HTML
>>>>> >> >> > >> > table, and other form controls.
>>>>> >> >> > >> >
>>>>> >> >> > >> > - Font is changed to Roboto
>>>>> >> >> > >> > - Using SCSS variables to define the look 'n' feel
>>>>> >> >> > >> > - Designer background images for the Login, and Forget
>>>>> password pages in
>>>>> >> >> > >> > 'web' mode
>>>>> >> >> > >> > - Improved the look 'n' feel for the key selection in the
>>>>> preferences
>>>>> >> >> > >> > dialog
>>>>> >> >> > >> > - Table classes consistency changes across the application
>>>>> >> >> > >> > - File Open and Save dialog list view changes
>>>>> >> >> > >> >
>>>>> >> >> > >> > Author(s): Aditya Toshniwal & Khushboo Vashi
>>>>> >> >> > >> >
>>>>> >> >> > >> > Branch
>>>>> >> >> > >> > ------
>>>>> >> >> > >> > master
>>>>> >> >> > >> >
>>>>> >> >> > >> > Details
>>>>> >> >> > >> > -------
>>>>> >> >> > >> >
>>>>> https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5799ac14ba17dc25fbec184b3b2c6afbe37f...
>>>>> >> >> > >> >
>>>>> >> >> > >> > Modified Files
>>>>> >> >> > >> > --------------
>>>>> >> >> > >> > web/package.json | 2
>>>>> +-
>>>>> >> >> > >> > .../static/js/fts_configuration.js | 2
>>>>> +-
>>>>> >> >> > >> > .../databases/schemas/functions/__init__.py | 4
>>>>> +-
>>>>> >> >> > >> > .../function => static}/css/function.css | 0
>>>>> >> >> > >> > .../templates/trigger_function/css/function.css | 3
>>>>> -
>>>>> >> >> > >> > .../{templates/edbfunc => static}/css/edbfunc.css | 0
>>>>> >> >> > >> > .../static/js/exclusion_constraint.js | 18
>>>>> +-
>>>>> >> >> > >> > .../foreign_key/static/js/foreign_key.js | 17
>>>>> +-
>>>>> >> >> > >> > .../schemas/tables/rules/static/css/rule.css | 7
>>>>> +
>>>>> >> >> > >> > .../tables/rules/templates/rules/css/rule.css | 8
>>>>> -
>>>>> >> >> > >> > .../databases/schemas/views/static/css/view.css | 7
>>>>> +
>>>>> >> >> > >> > .../schemas/views/templates/mview/css/mview.css | 4
>>>>> -
>>>>> >> >> > >> > .../schemas/views/templates/view/css/view.css | 4
>>>>> -
>>>>> >> >> > >> > .../pgagent/schedules/static/js/pga_schedule.js | 3
>>>>> +-
>>>>> >> >> > >> > .../servers/pgagent/static/css/pga_job.css | 3
>>>>> +
>>>>> >> >> > >> > .../pgagent/templates/pga_job/css/pga_job.css | 13
>>>>> -
>>>>> >> >> > >> > .../server_groups/servers/static/css/servers.css | 4
>>>>> +
>>>>> >> >> > >> > .../server_groups/servers/static/js/server.js | 22
>>>>> +-
>>>>> >> >> > >> > .../server_groups/servers/static/js/variable.js | 4
>>>>> +-
>>>>> >> >> > >> > .../servers/tablespaces/static/js/tablespace.js | 13
>>>>> +-
>>>>> >> >> > >> > .../servers/templates/css/servers.css | 4
>>>>> -
>>>>> >> >> > >> > web/pgadmin/browser/static/css/browser.css | 13
>>>>> -
>>>>> >> >> > >> > web/pgadmin/browser/static/css/wizard.css | 21
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/browser/static/js/browser.js | 26
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/browser/static/js/collection.js | 16
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/browser/static/js/keyboard.js | 14
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/browser/static/js/menu.js | 28
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/browser/static/js/node.js | 53
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/browser/static/js/node.ui.js | 4
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/browser/static/js/panel.js | 15
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/browser/static/js/toolbar.js | 3
>>>>> -
>>>>> >> >> > >> > web/pgadmin/browser/static/js/wizard.js | 58
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/browser/static/scss/_browser.scss | 43
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/browser/static/scss/_wizard.scss | 41
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/browser/templates/browser/css/node.css | 2
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/browser/templates/browser/index.html | 9
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/dashboard/__init__.py | 2
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/dashboard/static/css/dashboard.css | 21
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/dashboard/static/js/dashboard.js | 120
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/dashboard/static/scss/_dashboard.scss | 44
>>>>> +-
>>>>> >> >> > >> > .../templates/dashboard/database_dashboard.html | 171
>>>>> ++-
>>>>> >> >> > >> > .../templates/dashboard/server_dashboard.html | 197
>>>>> ++-
>>>>> >> >> > >> > .../templates/dashboard/welcome_dashboard.html | 30
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/feature_tests/browser_tool_bar_test.py | 23
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/feature_tests/file_manager_test.py | 23
>>>>> +-
>>>>> >> >> > >> > .../feature_tests/keyboard_shortcut_test.py | 5
>>>>> +-
>>>>> >> >> > >> > .../feature_tests/pg_datatype_validation_test.py | 5
>>>>> +-
>>>>> >> >> > >> > .../pg_utilities_backup_restore_test.py | 28
>>>>> +-
>>>>> >> >> > >> > .../feature_tests/pg_utilities_maintenance_test.py | 16
>>>>> +-
>>>>> >> >> > >> > .../feature_tests/query_tool_journey_test.py | 5
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/feature_tests/query_tool_tests.py | 117
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/feature_tests/view_data_dml_queries.py | 16
>>>>> +-
>>>>> >> >> > >> > .../misc/bgprocess/static/css/bgprocess.css | 11
>>>>> -
>>>>> >> >> > >> > web/pgadmin/misc/bgprocess/static/js/bgprocess.js | 173
>>>>> ++-
>>>>> >> >> > >> > .../misc/bgprocess/static/scss/_bgprocess.scss | 81
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/misc/depends/static/js/depends.js | 3
>>>>> +-
>>>>> >> >> > >> > .../misc/file_manager/static/css/file_manager.css | 141
>>>>> +-
>>>>> >> >> > >> > .../misc/file_manager/static/js/create_dialogue.js | 9
>>>>> +-
>>>>> >> >> > >> > .../misc/file_manager/static/js/select_dialogue.js | 19
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/misc/file_manager/static/js/utility.js | 77
>>>>> +-
>>>>> >> >> > >> > .../file_manager/static/scss/_file_manager.scss | 157
>>>>> +--
>>>>> >> >> > >> > .../file_manager/templates/file_manager/index.html | 95
>>>>> +-
>>>>> >> >> > >> > .../misc/statistics/static/js/statistics.js | 3
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/preferences/static/css/preferences.css | 14
>>>>> -
>>>>> >> >> > >> > web/pgadmin/preferences/static/js/preferences.js | 31
>>>>> +-
>>>>> >> >> > >> > .../preferences/static/scss/_preferences.scss | 16
>>>>> +
>>>>> >> >> > >> > web/pgadmin/static/css/pgadmin.css | 81
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/static/fonts/Roboto-Bold.ttf | Bin
>>>>> 0 -> 170760 bytes
>>>>> >> >> > >> > web/pgadmin/static/fonts/Roboto-Medium.ttf | Bin
>>>>> 0 -> 172064 bytes
>>>>> >> >> > >> > web/pgadmin/static/fonts/Roboto-Regular.ttf | Bin
>>>>> 0 -> 171676 bytes
>>>>> >> >> > >> > web/pgadmin/static/img/collapse_expand.svg | 15
>>>>> +
>>>>> >> >> > >> > web/pgadmin/static/img/forgot_password.svg | 283
>>>>> ++++
>>>>> >> >> > >> > web/pgadmin/static/img/login.svg | 1
>>>>> +
>>>>> >> >> > >> > web/pgadmin/static/js/alertify.pgadmin.defaults.js | 82
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/static/js/backform.pgadmin.js | 80
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/static/js/backgrid.pgadmin.js | 33
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/static/js/slickgrid/editors.js | 8
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/static/js/sqleditor/filter_dialog.js | 33
>>>>> +-
>>>>> >> >> > >> > .../static/js/sqleditor/query_tool_preferences.js | 15
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/static/scss/_aci_tree.overrides.scss | 75
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/static/scss/_alert.scss | 12
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/static/scss/_alertify.overrides.scss | 150
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/static/scss/_backform.overrides.scss | 8
>>>>> +
>>>>> >> >> > >> > web/pgadmin/static/scss/_backgrid.overrides.scss | 251
>>>>> +++-
>>>>> >> >> > >> > web/pgadmin/static/scss/_bootstrap.overrides.scss | 230
>>>>> ++--
>>>>> >> >> > >> > web/pgadmin/static/scss/_codemirror.overrides.scss | 94
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/static/scss/_pgadmin.grid.scss | 56
>>>>> +
>>>>> >> >> > >> > web/pgadmin/static/scss/_pgadmin.style.scss | 1440
>>>>> +++++---------------
>>>>> >> >> > >> > web/pgadmin/static/scss/_select2.overrides.scss | 24
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/static/scss/_webcabin.overrides.scss | 368
>>>>> -----
>>>>> >> >> > >> > web/pgadmin/static/scss/_webcabin.pgadmin.scss | 250
>>>>> ++++
>>>>> >> >> > >> > web/pgadmin/static/scss/pgadmin.scss | 10
>>>>> +-
>>>>> >> >> > >> > .../static/scss/resources/_default.style.scss | 90
>>>>> +-
>>>>> >> >> > >> > .../static/scss/resources/_default.variables.scss | 203
>>>>> ++-
>>>>> >> >> > >> > web/pgadmin/static/vendor/backform/backform.js | 645
>>>>> +++++++++
>>>>> >> >> > >> > .../templates/security/change_password.html | 43
>>>>> +-
>>>>> >> >> > >> > .../templates/security/forgot_password.html | 9
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/templates/security/login_user.html | 16
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/templates/security/panel.html | 23
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/tools/backup/__init__.py | 6
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/tools/backup/static/js/backup.js | 8
>>>>> +-
>>>>> >> >> > >> > .../backup/static/js/backup_dialog_wrapper.js | 22
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/tools/datagrid/__init__.py | 1
>>>>> -
>>>>> >> >> > >> > web/pgadmin/tools/datagrid/static/js/datagrid.js | 38
>>>>> +-
>>>>> >> >> > >> > .../tools/datagrid/templates/datagrid/filter.html | 2
>>>>> -
>>>>> >> >> > >> > .../tools/datagrid/templates/datagrid/index.html | 193
>>>>> ++-
>>>>> >> >> > >> > web/pgadmin/tools/debugger/static/css/debugger.css | 34
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/tools/debugger/static/js/debugger.js | 2
>>>>> +-
>>>>> >> >> > >> > .../tools/debugger/static/js/debugger_ui.js | 28
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/tools/debugger/static/js/direct.js | 13
>>>>> +-
>>>>> >> >> > >> > .../tools/debugger/static/scss/_debugger.scss | 8
>>>>> -
>>>>> >> >> > >> > .../tools/debugger/templates/debugger/direct.html | 89
>>>>> +-
>>>>> >> >> > >> > .../tools/grant_wizard/static/js/grant_wizard.js | 27
>>>>> +-
>>>>> >> >> > >> > .../grant_wizard/static/scss/_grant_wizard.scss | 31
>>>>> +-
>>>>> >> >> > >> > .../tools/import_export/static/js/import_export.js | 24
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/tools/maintenance/__init__.py | 10
>>>>> +-
>>>>> >> >> > >> > .../tools/maintenance/static/js/maintenance.js | 24
>>>>> +-
>>>>> >> >> > >> > .../maintenance/static/scss/_maintenance.scss | 2
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/tools/restore/__init__.py | 14
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/tools/restore/static/js/restore.js | 8
>>>>> +-
>>>>> >> >> > >> > .../restore/static/js/restore_dialog_wrapper.js | 24
>>>>> +-
>>>>> >> >> > >> > .../tools/sqleditor/static/css/sqleditor.css | 128
>>>>> +-
>>>>> >> >> > >> > web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 35
>>>>> +-
>>>>> >> >> > >> > .../tools/sqleditor/static/scss/_history.scss | 42
>>>>> +-
>>>>> >> >> > >> > .../tools/sqleditor/static/scss/_sqleditor.scss | 128
>>>>> +-
>>>>> >> >> > >> > .../user_management/static/css/user_management.css | 37
>>>>> -
>>>>> >> >> > >> > .../user_management/static/js/user_management.js | 53
>>>>> +-
>>>>> >> >> > >> > .../static/scss/_user_management.scss | 12
>>>>> +-
>>>>> >> >> > >> > .../javascript/alerts/alertify_wrapper_spec.js | 4
>>>>> +-
>>>>> >> >> > >> > .../backup/backup_dialog_wrapper_spec.js | 8
>>>>> +-
>>>>> >> >> > >> > .../restore/restore_dialog_wrapper_spec.js | 8
>>>>> +-
>>>>> >> >> > >> > web/webpack.config.js | 2
>>>>> +-
>>>>> >> >> > >> > web/webpack.shim.js | 2
>>>>> +-
>>>>> >> >> > >> > web/webpack.test.config.js | 1
>>>>> +
>>>>> >> >> > >> > web/yarn.lock | 1015
>>>>> +++++++++++++-
>>>>> >> >> > >> > 135 files changed, 5002 insertions(+), 3850 deletions(-)
>>>>> >> >> > >> >
>>>>> >> >> > >>
>>>>> >> >> > >>
>>>>> >> >> > >> --
>>>>> >> >> > >> Dave Page
>>>>> >> >> > >> Blog: http://pgsnake.blogspot.com
>>>>> >> >> > >> Twitter: @pgsnake
>>>>> >> >> > >>
>>>>> >> >> > >> EnterpriseDB UK: http://www.enterprisedb.com
>>>>> >> >> > >> The Enterprise PostgreSQL Company
>>>>> >> >> > >
>>>>> >> >> > >
>>>>> >> >> > >
>>>>> >> >> > > --
>>>>> >> >> > > Thanks and Regards,
>>>>> >> >> > > Aditya Toshniwal
>>>>> >> >> > > Software Engineer | EnterpriseDB Software Solutions | Pune
>>>>> >> >> > > "Don't Complain about Heat, Plant a tree"
>>>>> >> >> >
>>>>> >> >> >
>>>>> >> >> >
>>>>> >> >> > --
>>>>> >> >> > Dave Page
>>>>> >> >> > Blog: http://pgsnake.blogspot.com
>>>>> >> >> > Twitter: @pgsnake
>>>>> >> >> >
>>>>> >> >> > EnterpriseDB UK: http://www.enterprisedb.com
>>>>> >> >> > The Enterprise PostgreSQL Company
>>>>> >> >>
>>>>> >> >>
>>>>> >> >>
>>>>> >> >> --
>>>>> >> >> Dave Page
>>>>> >> >> Blog: http://pgsnake.blogspot.com
>>>>> >> >> Twitter: @pgsnake
>>>>> >> >>
>>>>> >> >> EnterpriseDB UK: http://www.enterprisedb.com
>>>>> >> >> The Enterprise PostgreSQL Company
>>>>> >> >
>>>>> >> >
>>>>> >> >
>>>>> >> > --
>>>>> >> > Thanks and Regards,
>>>>> >> > Aditya Toshniwal
>>>>> >> > Software Engineer | EnterpriseDB Software Solutions | Pune
>>>>> >> > "Don't Complain about Heat, Plant a tree"
>>>>> >>
>>>>> >>
>>>>> >>
>>>>> >> --
>>>>> >> Dave Page
>>>>> >> Blog: http://pgsnake.blogspot.com
>>>>> >> Twitter: @pgsnake
>>>>> >>
>>>>> >> EnterpriseDB UK: http://www.enterprisedb.com
>>>>> >> The Enterprise PostgreSQL Company
>>>>> >
>>>>> >
>>>>> >
>>>>> > --
>>>>> > Thanks and Regards,
>>>>> > Aditya Toshniwal
>>>>> > Software Engineer | EnterpriseDB Software Solutions | Pune
>>>>> > "Don't Complain about Heat, Plant a tree"
>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> Dave Page
>>>>> Blog: http://pgsnake.blogspot.com
>>>>> Twitter: @pgsnake
>>>>>
>>>>> EnterpriseDB UK: http://www.enterprisedb.com
>>>>> The Enterprise PostgreSQL Company
>>>>>
>>>>
>>>>
>>>> --
>>>> Thanks and Regards,
>>>> Aditya Toshniwal
>>>> Software Engineer | EnterpriseDB Software Solutions | Pune
>>>> "Don't Complain about Heat, Plant a tree"
>>>>
>>>
>>>
>>> --
>>> Thanks and Regards,
>>> Aditya Toshniwal
>>> Software Engineer | EnterpriseDB Software Solutions | Pune
>>> "Don't Complain about Heat, Plant a tree"
>>>
>>
>>
>> --
>> Thanks and Regards,
>> Aditya Toshniwal
>> Software Engineer | EnterpriseDB Software Solutions | Pune
>> "Don't Complain about Heat, Plant a tree"
>>
>
>
> --
> *Akshay Joshi*
>
> *Sr. Software Architect *
>
>
>
> *Phone: +91 20-3058-9517Mobile: +91 976-788-8246*
>
--
Thanks and Regards,
Aditya Toshniwal
Software Engineer | EnterpriseDB Software Solutions | Pune
"Don't Complain about Heat, Plant a tree"
Attachments:
[application/octet-stream] RM3692.part3.patch (17.3K, 3-RM3692.part3.patch)
download | inline diff:
diff --git a/web/pgadmin/browser/static/js/node.js b/web/pgadmin/browser/static/js/node.js
index 66769223..f5cb8cd0 100644
--- a/web/pgadmin/browser/static/js/node.js
+++ b/web/pgadmin/browser/static/js/node.js
@@ -368,7 +368,7 @@ define('pgadmin.browser.node', [
if (formType == 'fieldset') {
// It is used to show, edit, create the object in the
// properties tab.
- view = new Backform.Fieldset({
+ view = new Backform.Accordian({
el: el,
model: newModel,
schema: fields,
diff --git a/web/pgadmin/misc/file_manager/__init__.py b/web/pgadmin/misc/file_manager/__init__.py
index 1c29b3b0..ec956ea5 100644
--- a/web/pgadmin/misc/file_manager/__init__.py
+++ b/web/pgadmin/misc/file_manager/__init__.py
@@ -221,14 +221,13 @@ def file_manager_js():
mimetype="application/javascript")
[email protected]("/en.js")
[email protected]("/en.json")
@login_required
def language():
"""render the required javascript"""
return Response(response=render_template(
- "file_manager/js/languages/en.js", _=gettext),
- status=200,
- mimetype="application/javascript")
+ "file_manager/js/languages/en.json", _=gettext),
+ status=200)
@blueprint.route("/file_manager_config.js")
diff --git a/web/pgadmin/misc/file_manager/static/js/utility.js b/web/pgadmin/misc/file_manager/static/js/utility.js
index d9ed297e..ae6b8b34 100644
--- a/web/pgadmin/misc/file_manager/static/js/utility.js
+++ b/web/pgadmin/misc/file_manager/static/js/utility.js
@@ -36,7 +36,7 @@ define([
};
/* Common function to load:
- * en.js language file
+ * en.json language file
* file_manager_config.js config file
* return transaction id
*/
@@ -585,7 +585,7 @@ define([
result += '</ul>';
} else {
- result += '<table id="contents" class="table table-bordered table-noouter-border table-bottom-border table-hover tablesorter">';
+ result += '<table id="contents" class="table table-bordered table-noouter-border table-bottom-border table-hover tablesorter file_listing_table">';
result += '<thead><tr><th>';
result += '<span>' + lg.name + '</span></th>';
result += '<th><span>' + lg.size + '</span></th><th>';
@@ -1096,8 +1096,8 @@ define([
*/
var lg = [],
- enjs = url_for('file_manager.index') + 'en.js',
- lgf = loadData(enjs);
+ enjson = url_for('file_manager.index') + 'en.json',
+ lgf = loadData(enjson);
if (lgf.readyState == 4) {
this.lg = lg = JSON.parse(lgf.responseText);
diff --git a/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss b/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
index 2d90a67f..404bf6d1 100644
--- a/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
+++ b/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
@@ -5,6 +5,58 @@
.file_listing {
min-width: 100%;
+
+ .file_listing_table {
+ height: 100%;
+ display: block;
+ padding: 0;
+ overflow-y: hidden !important;
+ }
+
+ .file_listing_table thead {
+ display: table;
+ width: 100%;
+ }
+
+ .file_listing_table thead tr {
+ position: relative;
+ display: block;
+ width: 100%;
+ border-bottom: $panel-border;
+ }
+
+ .file_listing_table tbody {
+ display: block;
+ overflow: auto;
+ width: 100%;
+ /* 100% minus thead height */
+ height: calc(100% - 30px);
+ }
+
+ .file_listing_table tbody tr {
+ max-width: 100%;
+ width: 100%;
+ }
+
+ .file_listing_table tbody tr td:nth-child(1),
+ .file_listing_table thead tr th:nth-child(1) {
+ width: 100%;
+ min-width: 100%;
+ }
+
+ .file_listing_table tbody tr td:nth-child(2),
+ .file_listing_table thead tr th:nth-child(2) {
+ width: 100px;
+ min-width: 100px;
+ max-width: 100px;
+ }
+
+ .file_listing_table tbody tr td:nth-child(3),
+ .file_listing_table thead tr th:nth-child(3) {
+ width: 200px;
+ min-width: 200px;
+ max-width: 200px;
+ }
}
.file_listing #contents.grid li:hover,
diff --git a/web/pgadmin/misc/file_manager/templates/file_manager/js/languages/en.js b/web/pgadmin/misc/file_manager/templates/file_manager/js/languages/en.json
similarity index 84%
rename from web/pgadmin/misc/file_manager/templates/file_manager/js/languages/en.js
rename to web/pgadmin/misc/file_manager/templates/file_manager/js/languages/en.json
index 65d822f8..cc2b91b4 100644
--- a/web/pgadmin/misc/file_manager/templates/file_manager/js/languages/en.js
+++ b/web/pgadmin/misc/file_manager/templates/file_manager/js/languages/en.json
@@ -1,12 +1,3 @@
-/////////////////////////////////////////////////////////////
-//
-// pgAdmin 4 - PostgreSQL Tools
-//
-// Copyright (C) 2013 - 2019, The pgAdmin Development Team
-// This software is released under the PostgreSQL Licence
-//
-//////////////////////////////////////////////////////////////
-
{
"LANGUAGE_FILE_NOT_FOUND": "Language file not found.",
"upload_success": "File uploaded successfully.",
diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js
index a565edeb..246b30b7 100644
--- a/web/pgadmin/static/js/backform.pgadmin.js
+++ b/web/pgadmin/static/js/backform.pgadmin.js
@@ -38,6 +38,8 @@ define([
setGroupClassName: 'set-group pg-el-12',
tabClassName: 'backform-tab pg-el-12',
setGroupContentClassName: 'fieldset-content pg-el-12',
+ accordianGroupClassName: 'accordian-group pg-el-12',
+ accordianContentClassName: 'accordian-content pg-el-12',
hiddenClassName: 'd-none',
});
@@ -429,12 +431,14 @@ define([
offColor: 'primary',
size: 'small',
},
+ controlLabelClassName: Backform.controlLabelClassName,
+ controlsClassName: Backform.controlsClassName,
extraClasses: [],
helpMessage: null,
},
template: _.template([
- '<label class="<%=Backform.controlLabelClassName%>"><%=label%></label>',
- '<div class="<%=Backform.controlsClassName%>">',
+ '<label class="<%=controlLabelClassName%>"><%=label%></label>',
+ '<div class="<%=controlsClassName%>">',
' <div class="checkbox">',
' <label>',
' <input type="checkbox" class="<%=extraClasses.join(\' \')%>" name="<%=name%>" <%=value ? "checked=\'checked\'" : ""%> <%=disabled ? "disabled" : ""%> <%=required ? "required" : ""%> />',
@@ -636,6 +640,80 @@ define([
},
});
+ Backform.Accordian = Backform.Dialog.extend({
+ className: function() {
+ return 'set-group pg-el-12';
+ },
+ tabPanelClassName: function() {
+ return Backform.tabClassName;
+ },
+ legendClass: 'badge',
+ contentClass: Backform.accordianContentClassName + ' collapse show',
+ template: {
+ 'header': _.template([
+ '<div class="<%=Backform.accordianGroupClassName%>" <%=disabled ? "disabled" : ""%>>',
+ ' <% if (legend != false) { %>',
+ ' <div class="<%=legendClass%>" <%=collapse ? "data-toggle=\'collapse\'" : ""%> data-target="#<%=cId%>"><%=collapse ? "<span class=\'caret\'></span>" : "" %><%=label%></legend>',
+ ' <% } %>',
+ '</div>',
+ ].join('\n')),
+ 'content': _.template(
+ ' <div id="<%= cId %>" class="<%=contentClass%>"></div>'
+ ),
+ },
+ collapse: true,
+ render: function() {
+ this.cleanup();
+
+ var m = this.model,
+ $el = this.$el,
+ tmpl = this.template,
+ controls = this.controls,
+ data = {
+ 'className': _.result(this, 'className'),
+ 'legendClass': _.result(this, 'legendClass'),
+ 'contentClass': _.result(this, 'contentClass'),
+ 'collapse': _.result(this, 'collapse'),
+ },
+ idx = (this.tabIndex * 100),
+ evalF = function(f, d, m) {
+ return (_.isFunction(f) ? !!f.apply(d, [m]) : !!f);
+ };
+
+ this.$el.empty();
+
+ _.each(this.schema, function(o) {
+ idx++;
+ if (!o.version_compatible || !evalF(o.visible, o, m)) {
+ return;
+ }
+
+ if (!o.fields)
+ return;
+
+ var d = _.extend({}, data, o),
+ h = $((tmpl['header'])(d)).appendTo($el),
+ el = $((tmpl['content'])(d)).appendTo(h);
+
+ o.fields.each(function(f) {
+ var cntr = new(f.get('control'))({
+ field: f,
+ model: m,
+ tabIndex: idx,
+ });
+ el.append(cntr.render().$el);
+ controls.push(cntr);
+ });
+ });
+
+ return this;
+ },
+ getValueFromDOM: function() {
+ return '';
+ },
+ events: {},
+ });
+
Backform.Fieldset = Backform.Dialog.extend({
className: function() {
return 'set-group pg-el-12';
@@ -650,7 +728,7 @@ define([
'header': _.template([
'<fieldset class="<%=fieldsetClass%>" <%=disabled ? "disabled" : ""%>>',
' <% if (legend != false) { %>',
- ' <div><legend class="<%=legendClass%>" <%=collapse ? "data-toggle=\'collapse\'" : ""%> data-target="#<%=cId%>"><%=collapse ? "<span class=\'caret\'></span>" : "" %><%=label%></legend></div>',
+ ' <legend class="<%=legendClass%>" <%=collapse ? "data-toggle=\'collapse\'" : ""%> data-target="#<%=cId%>"><%=collapse ? "<span class=\'caret\'></span>" : "" %><%=label%></legend>',
' <% } %>',
'</fieldset>',
].join('\n')),
diff --git a/web/pgadmin/static/scss/_backform.overrides.scss b/web/pgadmin/static/scss/_backform.overrides.scss
index abc2af4e..0a413e37 100644
--- a/web/pgadmin/static/scss/_backform.overrides.scss
+++ b/web/pgadmin/static/scss/_backform.overrides.scss
@@ -48,16 +48,11 @@
}
.backform_control_notes {
- background-color: $color-gray-lighter;
- border: 1px solid $color-gray-light;
- border-radius: 3px;
- color: $color-gray-dark;
- display: block;
+ border: $panel-border;
+ border-radius: $border-radius;
font-family: $font-family-editor;
- font-size: 12px;
- line-height: 1.42857;
+ font-size: 0.8rem;
margin: 0 0 10px;
- overflow: auto;
padding: 5px 10px;
word-wrap: break-word;
}
@@ -69,6 +64,6 @@ div.backform_control_notes label.control-label {
max-width: 90% !important;
}
-.set-group {
+.set-group, .accordian-group {
margin-bottom: $form-group-margin-bottom;
-}
\ No newline at end of file
+}
diff --git a/web/pgadmin/static/scss/_backgrid.overrides.scss b/web/pgadmin/static/scss/_backgrid.overrides.scss
index afe1c65e..e3a3c4ea 100644
--- a/web/pgadmin/static/scss/_backgrid.overrides.scss
+++ b/web/pgadmin/static/scss/_backgrid.overrides.scss
@@ -268,13 +268,18 @@ table.backgrid {
}
.backgrid tbody {
- & td.editor {
+ & td.edit-cell.editor {
background-color: $color-gray-light !important;
border-bottom-color: $color-gray-light !important;
outline: none !important;
}
+ & td.editor {
+ background-color: $color-bg-theme !important;
+ }
+
tr.editor-row {
+ background-color: $color-gray-light !important;
& > td {
padding: 15px !important;
background-color: $color-gray-light !important;
diff --git a/web/pgadmin/static/scss/_codemirror.overrides.scss b/web/pgadmin/static/scss/_codemirror.overrides.scss
index 7fcf18db..70747ced 100644
--- a/web/pgadmin/static/scss/_codemirror.overrides.scss
+++ b/web/pgadmin/static/scss/_codemirror.overrides.scss
@@ -127,18 +127,27 @@
list-style: none;
margin: 0;
- padding: 2px;
+ padding: 0px;
- -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
- -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
- box-shadow: 2px 3px 5px rgba(0,0,0,.2);
- border-radius: 3px;
- border: 1px solid $border-color;
+ -webkit-box-shadow: $dropdown-box-shadow;
+ -moz-box-shadow: $dropdown-box-shadow;
+ box-shadow: $dropdown-box-shadow;
+ border-radius: $border-radius;
+ border: $panel-border;
- background: $color-bg-theme;
+ background: $sql-hint-bg;
font-size: 90%;
font-family: $font-family-editor;
max-height: 20em;
overflow-y: auto;
-}
+
+ & li {
+ padding: 0.125rem;
+ border-radius: 0rem;
+ &.CodeMirror-hint-active {
+ background: $sql-hint-active-bg;
+ color: $sql-hint-active-fg;
+ }
+ }
+}
\ No newline at end of file
diff --git a/web/pgadmin/static/scss/_pgadmin.style.scss b/web/pgadmin/static/scss/_pgadmin.style.scss
index 0e8ffc7a..3e131848 100644
--- a/web/pgadmin/static/scss/_pgadmin.style.scss
+++ b/web/pgadmin/static/scss/_pgadmin.style.scss
@@ -363,6 +363,10 @@
padding: 5px 10px;
}
+.obj_properties .accordian-group > .accordian-content {
+ padding: 5px 10px;
+}
+
.obj_properties .badge {
display: block;
text-align: left;
@@ -409,15 +413,21 @@
.obj_properties .set-group {
margin: 0.5rem 0rem;
padding: 0rem;
+}
+
+.obj_properties .accordian-group {
+ margin: 0.5rem 0rem;
+ padding: 0rem;
border: $panel-border;
border-radius: $card-border-radius;
- background-color: $color-bg;
+ background-color: $color-bg-theme;
}
fieldset.inline-fieldset {
padding: 10px;
border-radius: $card-border-radius;
background: $color-gray-light;
+ border: $panel-border;
& legend {
font-size: 0.875rem;
font-weight: bold;
diff --git a/web/pgadmin/static/scss/resources/_default.variables.scss b/web/pgadmin/static/scss/resources/_default.variables.scss
index 79eff097..060e915f 100644
--- a/web/pgadmin/static/scss/resources/_default.variables.scss
+++ b/web/pgadmin/static/scss/resources/_default.variables.scss
@@ -174,6 +174,9 @@ $sql-history-success-bg: $color-primary-light;
$sql-history-success-fg: $color-primary;
$sql-history-error-bg: $color-danger-lighter;
$sql-history-error-fg: $color-danger;
+$sql-hint-bg: $color-bg-theme;
+$sql-hint-active-bg: $color-primary;
+$sql-hint-active-fg: $white;
$negative-bg: $color-gray-light;
$dialog-box-shadow: $box-shadow;
diff --git a/web/pgadmin/templates/security/change_password.html b/web/pgadmin/templates/security/change_password.html
index 11f1f438..2de189bc 100644
--- a/web/pgadmin/templates/security/change_password.html
+++ b/web/pgadmin/templates/security/change_password.html
@@ -8,7 +8,7 @@
<div class="col-md-4">
<div class="panel-header h4"><i class="app-icon pg-icon-blue"></i> {{ _('%(appname)s', appname=config.APP_NAME) }}</div>
<div class="panel-body">
- <div class="d-block text-color pb-3 h5">{{ _('Password Change', appname=config.APP_NAME) }}</div>
+ <div class="d-block text-color pb-3 h5">{{ _('Password Change') }}</div>
{% if config.SERVER_MODE %}
<form action="{{ url_for('browser.change_password') }}" method="POST" name="change_password_form">
{{ change_password_form.hidden_tag() }}
diff --git a/web/pgadmin/tools/backup/static/js/backup.js b/web/pgadmin/tools/backup/static/js/backup.js
index c27ca09f..70e8a68b 100644
--- a/web/pgadmin/tools/backup/static/js/backup.js
+++ b/web/pgadmin/tools/backup/static/js/backup.js
@@ -45,8 +45,8 @@ define([
Backform.CustomSwitchControl = Backform.SwitchControl.extend({
template: _.template([
- '<label class="<%=Backform.controlLabelClassName%> custom_switch_label_class"><%=label%></label>',
- '<div class="<%=Backform.controlsClassName%> custom_switch_control_class">',
+ '<label class="<%=controlLabelClassName%> custom_switch_label_class"><%=label%></label>',
+ '<div class="<%=controlsClassName%> custom_switch_control_class">',
' <div class="checkbox">',
' <label>',
' <input type="checkbox" class="<%=extraClasses.join(\' \')%>"',
@@ -93,6 +93,7 @@ define([
type: 'nested',
control: 'fieldset',
label: gettext('Miscellaneous'),
+ contentClass: 'row',
schema: [{
id: 'verbose',
label: gettext('Verbose messages'),
@@ -105,6 +106,8 @@ define([
control: Backform.CustomSwitchControl,
disabled: false,
group: gettext('Miscellaneous'),
+ controlLabelClassName: 'control-label pg-el-sm-6 pg-el-12',
+ controlsClassName: 'pgadmin-controls pg-el-sm-6 pg-el-12',
}],
}, {
id: 'globals_note',
diff --git a/web/pgadmin/tools/debugger/static/js/debugger_ui.js b/web/pgadmin/tools/debugger/static/js/debugger_ui.js
index 90177b6b..921813df 100644
--- a/web/pgadmin/tools/debugger/static/js/debugger_ui.js
+++ b/web/pgadmin/tools/debugger/static/js/debugger_ui.js
@@ -949,7 +949,7 @@ define([
this.grid.listenTo(this.debuggerInputArgsColl, 'backgrid:error',
(function(obj) {
return function() {
- obj.__internal.buttons[0].element.disabled = true;
+ obj.__internal.buttons[1].element.disabled = true;
};
})(this)
);
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
index be957b44..0bba2b38 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -3435,6 +3435,9 @@ define('tools.querytool', [
disable_tool_buttons: function(disabled) {
$('#btn-clear').prop('disabled', disabled);
$('#btn-query-dropdown').prop('disabled', disabled);
+ $('#btn-explain').prop('disabled', disabled);
+ $('#btn-explain-analyze').prop('disabled', disabled);
+ $('#btn-explain-options-dropdown').prop('disabled', disabled);
$('#btn-edit-dropdown').prop('disabled', disabled);
$('#btn-edit').prop('disabled', disabled);
$('#btn-load-file').prop('disabled', disabled);
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 05:52 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 09:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
2019-01-03 10:20 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
@ 2019-01-03 15:09 ` Dave Page <[email protected]>
2019-01-04 04:51 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Dave Page @ 2019-01-03 15:09 UTC (permalink / raw)
To: Aditya Toshniwal <[email protected]>; +Cc: Akshay Joshi <[email protected]>; pgadmin-hackers <[email protected]>
Hi
On Thu, Jan 3, 2019 at 10:20 AM Aditya Toshniwal <
[email protected]> wrote:
> Hi Hackers,
>
> Further improvement patch. With this patch, following are fixed:
> - Fieldset control design changes
> - File dialog - files list header should not scroll with the body and
> stick to the top
> - Debugger input args dialog cancel button should always be enabled
> - Backup globals dialog controls aligmnent correction
> - In View Data query tool, explain related buttons should be disabled
> - Autocomplete design changes
>
> I have also fixed one issue which was created by the copyright changes in
> the file - pgadmin/misc/file_manager/templates/file_manager/js/languages/en.js.
> The en.js file contains json data and adding copyright comments to it
> caused JSON parsing failure in file dialog. As an improvement, I have
> renamed the file from en.js to en.json at all the places to avoid such
> changes in future.
>
> Kindly review.
>
Thanks - applied.
A few other things that I noticed (or have been bugging me):
- The menu bar seems a little cramped. Taking pg-navbar from 32 to 40px and
setting the font-weight to normal on the menu options (but not the product
name) seems much better to me (and adjusting everything else as required of
course).
- In the file dialogue, the column headers don't line up with the columns
in the rows.
- In list mode of the file dialogue, can we use the same coloured icons as
we do in icon mode? Obviously smaller...
- "Show hidden files and folders ?" shouldn't have a space before the
question mark.
- The menu bar on the file dialogue doesn't match the styling of the menu
bar on the query tool (in fact, even the left and right ends of it are
styled differently from each other).
- The line numbers in the gutter of CodeMirror are tiny.
- I'm not convinced about the boldness of the tab titles - I think the are
just a little too harsh - can you change the font-weight to normal for them
please (both the wcDocker and Bootstrap tabs)?
Also (for another day); we should move the file dialog messages out of the
JSON file altogether and use our normal translation mechanisms.
Thanks again :-)
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 05:52 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 09:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
2019-01-03 10:20 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-03 15:09 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
@ 2019-01-04 04:51 ` Aditya Toshniwal <[email protected]>
2019-01-04 09:23 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Aditya Toshniwal @ 2019-01-04 04:51 UTC (permalink / raw)
To: Dave Page <[email protected]>; +Cc: Akshay Joshi <[email protected]>; pgadmin-hackers <[email protected]>
Hi Dave,
On Thu, Jan 3, 2019 at 8:39 PM Dave Page <[email protected]> wrote:
> Hi
>
> On Thu, Jan 3, 2019 at 10:20 AM Aditya Toshniwal <
> [email protected]> wrote:
>
>> Hi Hackers,
>>
>> Further improvement patch. With this patch, following are fixed:
>> - Fieldset control design changes
>> - File dialog - files list header should not scroll with the body and
>> stick to the top
>> - Debugger input args dialog cancel button should always be enabled
>> - Backup globals dialog controls aligmnent correction
>> - In View Data query tool, explain related buttons should be disabled
>> - Autocomplete design changes
>>
>> I have also fixed one issue which was created by the copyright changes in
>> the file - pgadmin/misc/file_manager/templates/file_manager/js/languages/en.js.
>> The en.js file contains json data and adding copyright comments to it
>> caused JSON parsing failure in file dialog. As an improvement, I have
>> renamed the file from en.js to en.json at all the places to avoid such
>> changes in future.
>>
>> Kindly review.
>>
>
> Thanks - applied.
>
> A few other things that I noticed (or have been bugging me):
>
> - The menu bar seems a little cramped. Taking pg-navbar from 32 to 40px
> and setting the font-weight to normal on the menu options (but not the
> product name) seems much better to me (and adjusting everything else as
> required of course).
>
Giving too much space for the navbar will reduce the usable space for other
things. It is good enough(32) to be used easily, and is equal to all the
other headers in app (including tabs) giving a feel of native desktop
application. You'll find even smaller menu heights in native desktop
application. We can make font weight to normal and may be slightly increase
horizontal spacing between the menu links.
>
> - In the file dialogue, the column headers don't line up with the columns
> in the rows.
>
I could not see this on my machine (screenshot attached). Could you please
share the screenshot.
[image: Screenshot 2019-01-04 at 10.14.41 AM.png]
>
> - In list mode of the file dialogue, can we use the same coloured icons as
> we do in icon mode? Obviously smaller...
>
> - "Show hidden files and folders ?" shouldn't have a space before the
> question mark.
>
> - The menu bar on the file dialogue doesn't match the styling of the menu
> bar on the query tool (in fact, even the left and right ends of it are
> styled differently from each other).
>
> - The line numbers in the gutter of CodeMirror are tiny.
>
> - I'm not convinced about the boldness of the tab titles - I think the are
> just a little too harsh - can you change the font-weight to normal for them
> please (both the wcDocker and Bootstrap tabs)?
>
All other changes noted. Will send patch with the changes.
>
> Also (for another day); we should move the file dialog messages out of the
> JSON file altogether and use our normal translation mechanisms.
>
> Thanks again :-)
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
--
Thanks and Regards,
Aditya Toshniwal
Software Engineer | EnterpriseDB Software Solutions | Pune
"Don't Complain about Heat, Plant a tree"
Attachments:
[image/png] Screenshot 2019-01-04 at 10.14.41 AM.png (198.2K, 3-Screenshot%202019-01-04%20at%2010.14.41%20AM.png)
download | view image
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 05:52 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 09:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
2019-01-03 10:20 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-03 15:09 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 04:51 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
@ 2019-01-04 09:23 ` Dave Page <[email protected]>
2019-01-04 09:58 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Dave Page @ 2019-01-04 09:23 UTC (permalink / raw)
To: Aditya Toshniwal <[email protected]>; +Cc: Akshay Joshi <[email protected]>; pgadmin-hackers <[email protected]>
Hi
On Fri, Jan 4, 2019 at 4:51 AM Aditya Toshniwal <
[email protected]> wrote:
> Hi Dave,
>
> On Thu, Jan 3, 2019 at 8:39 PM Dave Page <[email protected]> wrote:
>
>>
>> A few other things that I noticed (or have been bugging me):
>>
>> - The menu bar seems a little cramped. Taking pg-navbar from 32 to 40px
>> and setting the font-weight to normal on the menu options (but not the
>> product name) seems much better to me (and adjusting everything else as
>> required of course).
>>
> Giving too much space for the navbar will reduce the usable space for
> other things. It is good enough(32) to be used easily, and is equal to all
> the other headers in app (including tabs) giving a feel of native desktop
> application. You'll find even smaller menu heights in native desktop
> application. We can make font weight to normal and may be slightly
> increase horizontal spacing between the menu links.
>
8 pixels isn't going to make a noticeable difference to the workspace for
users, and would leave the bar smaller than the 50px it's been for the last
couple of years (iirc). I think it needs it to avoid looking cramped -
please make the change.
>
>> - In the file dialogue, the column headers don't line up with the columns
>> in the rows.
>>
> I could not see this on my machine (screenshot attached). Could you please
> share the screenshot.
>
Attached - thanks! This is Chrome 70.0.3538.102 on MacOS.
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
Attachments:
[image/png] Screenshot 2019-01-04 at 09.18.45.png (78.6K, 3-Screenshot%202019-01-04%20at%2009.18.45.png)
download | view image
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 05:52 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 09:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
2019-01-03 10:20 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-03 15:09 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 04:51 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 09:23 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
@ 2019-01-04 09:58 ` Aditya Toshniwal <[email protected]>
2019-01-04 10:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Aditya Toshniwal @ 2019-01-04 09:58 UTC (permalink / raw)
To: Dave Page <[email protected]>; +Cc: Akshay Joshi <[email protected]>; pgadmin-hackers <[email protected]>
Hi,
On Fri, Jan 4, 2019 at 2:53 PM Dave Page <[email protected]> wrote:
> Hi
>
> On Fri, Jan 4, 2019 at 4:51 AM Aditya Toshniwal <
> [email protected]> wrote:
>
>> Hi Dave,
>>
>> On Thu, Jan 3, 2019 at 8:39 PM Dave Page <[email protected]> wrote:
>>
>>>
>>> A few other things that I noticed (or have been bugging me):
>>>
>>> - The menu bar seems a little cramped. Taking pg-navbar from 32 to 40px
>>> and setting the font-weight to normal on the menu options (but not the
>>> product name) seems much better to me (and adjusting everything else as
>>> required of course).
>>>
>> Giving too much space for the navbar will reduce the usable space for
>> other things. It is good enough(32) to be used easily, and is equal to all
>> the other headers in app (including tabs) giving a feel of native desktop
>> application. You'll find even smaller menu heights in native desktop
>> application. We can make font weight to normal and may be slightly
>> increase horizontal spacing between the menu links.
>>
>
> 8 pixels isn't going to make a noticeable difference to the workspace for
> users, and would leave the bar smaller than the 50px it's been for the last
> couple of years (iirc). I think it needs it to avoid looking cramped -
> please make the change.
>
Will do.
One more doubt regarding bold headers, should I remove bold headers in
dashboard graph header, subnode headers (eg.table->columns), properties tab
accrordian headers ?
>
>
>>
>>> - In the file dialogue, the column headers don't line up with the
>>> columns in the rows.
>>>
>> I could not see this on my machine (screenshot attached). Could you
>> please share the screenshot.
>>
>
> Attached - thanks! This is Chrome 70.0.3538.102 on MacOS.
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
--
Thanks and Regards,
Aditya Toshniwal
Software Engineer | EnterpriseDB Software Solutions | Pune
"Don't Complain about Heat, Plant a tree"
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 05:52 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 09:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
2019-01-03 10:20 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-03 15:09 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 04:51 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 09:23 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 09:58 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
@ 2019-01-04 10:01 ` Dave Page <[email protected]>
2019-01-07 05:14 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Dave Page @ 2019-01-04 10:01 UTC (permalink / raw)
To: Aditya Toshniwal <[email protected]>; +Cc: Akshay Joshi <[email protected]>; pgadmin-hackers <[email protected]>
On Fri, Jan 4, 2019 at 9:58 AM Aditya Toshniwal
<[email protected]> wrote:
>
> Hi,
>
> On Fri, Jan 4, 2019 at 2:53 PM Dave Page <[email protected]> wrote:
>>
>> Hi
>>
>> On Fri, Jan 4, 2019 at 4:51 AM Aditya Toshniwal <[email protected]> wrote:
>>>
>>> Hi Dave,
>>>
>>> On Thu, Jan 3, 2019 at 8:39 PM Dave Page <[email protected]> wrote:
>>>>
>>>>
>>>> A few other things that I noticed (or have been bugging me):
>>>>
>>>> - The menu bar seems a little cramped. Taking pg-navbar from 32 to 40px and setting the font-weight to normal on the menu options (but not the product name) seems much better to me (and adjusting everything else as required of course).
>>>
>>> Giving too much space for the navbar will reduce the usable space for other things. It is good enough(32) to be used easily, and is equal to all the other headers in app (including tabs) giving a feel of native desktop application. You'll find even smaller menu heights in native desktop application. We can make font weight to normal and may be slightly increase horizontal spacing between the menu links.
>>
>>
>> 8 pixels isn't going to make a noticeable difference to the workspace for users, and would leave the bar smaller than the 50px it's been for the last couple of years (iirc). I think it needs it to avoid looking cramped - please make the change.
>
> Will do.
> One more doubt regarding bold headers, should I remove bold headers in dashboard graph header, subnode headers (eg.table->columns), properties tab accrordian headers ?
No, please don't. I left them bold and the styling seemed like it
worked. We can tweak again if others disagree later.
Thanks!
BTW - Chrome 71 shows the offset headers in the file dialogue as well.
>>>>
>>>> - In the file dialogue, the column headers don't line up with the columns in the rows.
>>>
>>> I could not see this on my machine (screenshot attached). Could you please share the screenshot.
>>
>>
>> Attached - thanks! This is Chrome 70.0.3538.102 on MacOS.
>>
>> --
>> Dave Page
>> Blog: http://pgsnake.blogspot.com
>> Twitter: @pgsnake
>>
>> EnterpriseDB UK: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>
>
>
> --
> Thanks and Regards,
> Aditya Toshniwal
> Software Engineer | EnterpriseDB Software Solutions | Pune
> "Don't Complain about Heat, Plant a tree"
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 05:52 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 09:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
2019-01-03 10:20 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-03 15:09 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 04:51 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 09:23 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 09:58 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 10:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
@ 2019-01-07 05:14 ` Aditya Toshniwal <[email protected]>
2019-01-07 08:54 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Aditya Toshniwal @ 2019-01-07 05:14 UTC (permalink / raw)
To: Dave Page <[email protected]>; +Cc: Akshay Joshi <[email protected]>; pgadmin-hackers <[email protected]>
Hi Hackers,
Attached is the patch to incorporate the changes discussed in trailing
mail(s).
Kindly review.
On Fri, Jan 4, 2019 at 3:31 PM Dave Page <[email protected]> wrote:
> On Fri, Jan 4, 2019 at 9:58 AM Aditya Toshniwal
> <[email protected]> wrote:
> >
> > Hi,
> >
> > On Fri, Jan 4, 2019 at 2:53 PM Dave Page <[email protected]> wrote:
> >>
> >> Hi
> >>
> >> On Fri, Jan 4, 2019 at 4:51 AM Aditya Toshniwal <
> [email protected]> wrote:
> >>>
> >>> Hi Dave,
> >>>
> >>> On Thu, Jan 3, 2019 at 8:39 PM Dave Page <[email protected]> wrote:
> >>>>
> >>>>
> >>>> A few other things that I noticed (or have been bugging me):
> >>>>
> >>>> - The menu bar seems a little cramped. Taking pg-navbar from 32 to
> 40px and setting the font-weight to normal on the menu options (but not the
> product name) seems much better to me (and adjusting everything else as
> required of course).
> >>>
> >>> Giving too much space for the navbar will reduce the usable space for
> other things. It is good enough(32) to be used easily, and is equal to all
> the other headers in app (including tabs) giving a feel of native desktop
> application. You'll find even smaller menu heights in native desktop
> application. We can make font weight to normal and may be slightly increase
> horizontal spacing between the menu links.
> >>
> >>
> >> 8 pixels isn't going to make a noticeable difference to the workspace
> for users, and would leave the bar smaller than the 50px it's been for the
> last couple of years (iirc). I think it needs it to avoid looking cramped -
> please make the change.
> >
> > Will do.
> > One more doubt regarding bold headers, should I remove bold headers in
> dashboard graph header, subnode headers (eg.table->columns), properties tab
> accrordian headers ?
>
> No, please don't. I left them bold and the styling seemed like it
> worked. We can tweak again if others disagree later.
>
> Thanks!
>
> BTW - Chrome 71 shows the offset headers in the file dialogue as well.
>
> >>>>
> >>>> - In the file dialogue, the column headers don't line up with the
> columns in the rows.
> >>>
> >>> I could not see this on my machine (screenshot attached). Could you
> please share the screenshot.
> >>
> >>
> >> Attached - thanks! This is Chrome 70.0.3538.102 on MacOS.
> >>
> >> --
> >> Dave Page
> >> Blog: http://pgsnake.blogspot.com
> >> Twitter: @pgsnake
> >>
> >> EnterpriseDB UK: http://www.enterprisedb.com
> >> The Enterprise PostgreSQL Company
> >
> >
> >
> > --
> > Thanks and Regards,
> > Aditya Toshniwal
> > Software Engineer | EnterpriseDB Software Solutions | Pune
> > "Don't Complain about Heat, Plant a tree"
>
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
--
Thanks and Regards,
Aditya Toshniwal
Software Engineer | EnterpriseDB Software Solutions | Pune
"Don't Complain about Heat, Plant a tree"
Attachments:
[application/octet-stream] RM3692.part4.patch (17.2K, 3-RM3692.part4.patch)
download | inline diff:
diff --git a/web/pgadmin/misc/file_manager/static/css/file_manager.css b/web/pgadmin/misc/file_manager/static/css/file_manager.css
index dd7596b4..571e90e8 100644
--- a/web/pgadmin/misc/file_manager/static/css/file_manager.css
+++ b/web/pgadmin/misc/file_manager/static/css/file_manager.css
@@ -20,20 +20,6 @@
height: 17px;
}
-.fileinfo #contents li p > span.less_text,
-.fileinfo table#contents tr td:first-child p span.less_text {
- width: 100%;
- text-overflow: ellipsis;
- overflow: hidden;
- text-align: center;
- white-space: nowrap;
-}
-
-.fileinfo table#contents tr td p {
- display: inline-block;
- margin-bottom: 0;
-}
-
.fileinfo > h1 {
font-size: 16px;
margin: 100px auto;
@@ -86,7 +72,6 @@ x:-o-prefocus, .file-input-container {top:16px;width:198px;}
}
div.clip {
- width: 30px;
height: 30px;
margin: 10px auto;
overflow: hidden;
diff --git a/web/pgadmin/misc/file_manager/static/js/utility.js b/web/pgadmin/misc/file_manager/static/js/utility.js
index ae6b8b34..5e9eb2f0 100644
--- a/web/pgadmin/misc/file_manager/static/js/utility.js
+++ b/web/pgadmin/misc/file_manager/static/js/utility.js
@@ -533,7 +533,7 @@ define([
var class_type;
if ((data[key]).file_type == 'dir') {
- class_type = 'fa fa-folder-open fm_folder';
+ class_type = 'fa fa-folder-open fm_folder_grid';
} else if ((data[key]).file_type == 'drive') {
class_type = 'fa fa-hdd-o fm_drive';
} else {
@@ -560,9 +560,9 @@ define([
result += '<span>' + fm_filename + '</span>';
} else {
result +=
- '<p><input type="text" class="fm_file_rename" />' +
+ '<div><input type="text" class="fm_file_rename" />' +
'<span class="less_text" title="' + fm_filename + '">' + fm_filename +
- '</span></p>';
+ '</span></div>';
}
if (props.Width && props.Width != '') {
result += '<span class="meta dimensions">' +
@@ -611,7 +611,7 @@ define([
if ((data[key]).file_type == 'dir') {
class_type = 'tbl_folder';
- icon_type = 'fa fa-folder-open';
+ icon_type = 'fa fa-folder-open fm_folder_list';
} else if ((data[key]).file_type == 'drive') {
class_type = 'tbl_drive';
icon_type = 'fa fa-hdd-o';
@@ -639,11 +639,13 @@ define([
result += '<span title="' + (data[key]).Filename + '">' +
fm_filename + '</span></td>';
} else {
- result += '<p><input type="text" class="fm_file_rename"/>'+
+ result += '<div><input type="text" class="fm_file_rename"/>'+
+ '<div class="d-flex">' +
'<span class="'+icon_type+'"></span>' +
data_protected +
'<span class="less_text ml-2" title="' + fm_filename + '">' + fm_filename + '</span>' +
- '</p></td>';
+ '</div>' +
+ '</div></td>';
}
if (props.Size && props.Size != '') {
result += '<td><span title="' + props.Size + '">' +
@@ -698,7 +700,7 @@ define([
if ($('.fileinfo').data('view') == 'grid') {
e.stopPropagation();
- $this = $('.file_manager').find('#contents li.selected p');
+ $this = $('.file_manager').find('#contents li.selected div');
orig_value = decodeURI($this.find('span.less_text').attr('title'));
newvalue = orig_value.substring(0, orig_value.indexOf('.'));
@@ -713,7 +715,7 @@ define([
$('.file_manager').off().on('keyup', function(e) {
if (e.keyCode == 13) {
e.stopPropagation();
- $('.fileinfo #contents li.selected p').find(
+ $('.fileinfo #contents li.selected div').find(
'input'
).trigger('blur');
}
@@ -721,7 +723,7 @@ define([
} else if ($('.fileinfo').data('view') == 'list') {
e.stopPropagation();
$this = $('.fileinfo').find(
- 'table#contents tbody tr.selected td:first-child p'
+ 'table#contents tbody tr.selected td:first-child div'
);
orig_value = decodeURI($this.find('span.less_text').html()),
newvalue = orig_value.substring(0, orig_value.lastIndexOf('.'));
@@ -737,7 +739,7 @@ define([
$('.file_manager').off().on('keyup', function(e) {
if (e.keyCode == 13) {
e.stopPropagation();
- $('.fileinfo table#contents tr.selected td p').find(
+ $('.fileinfo table#contents tr.selected td div').find(
'input'
).trigger('blur');
}
@@ -746,7 +748,7 @@ define([
});
// Rename UI handling
- $('.fileinfo #contents li p').on('blur dblclick', 'input', function(e) {
+ $('.fileinfo #contents li div').on('blur dblclick', 'input', function(e) {
e.stopPropagation();
var old_name = decodeURI($(this).siblings('span').attr('title'));
@@ -824,7 +826,7 @@ define([
}
});
- $('.fileinfo table#contents tr td p').on(
+ $('.fileinfo table#contents tr td div').on(
'blur dblclick', 'input',
function(e) {
var old_name = decodeURI($(this).siblings('span').attr('title')),
@@ -1141,7 +1143,7 @@ define([
select_box = `<div class='change_file_types d-flex align-items-center p-1'>
<div>
- ${gettext('Show hidden files and folders')} ?
+ ${gettext('Show hidden files and folders')}?
<input type='checkbox' id='show_hidden' onclick='pgAdmin.FileUtils.handleClick(this)' tabindex='11'>
</div>
<div class="ml-auto">
@@ -1415,7 +1417,7 @@ define([
// we remove simple file upload element
$('.file-input-container').remove();
$('.upload').remove();
- $('.create').before('<button value="Upload" type="button" title="Upload File" name="upload" id="upload" class="btn fa fa-upload upload" tabindex="6"><span></span></button> ');
+ $('.create').before('<button value="Upload" type="button" title="Upload File" name="upload" id="upload" class="btn btn-sm btn-secondary upload" tabindex="6"><span class="fa fa-upload sql-icon-lg"></span></button> ');
$('#uploader .upload').off().on('click', function() {
// we create prompt
@@ -1579,8 +1581,8 @@ define([
// template for creating new folder
folder_div =
'<li class=\'cap_download cap_delete cap_select_file cap_select_folder cap_rename cap_create cap_upload\'>' +
- '<div class=\'clip\'><span data-alt=\'\' class=\'fa fa-folder-open fm_folder\'></span></div>' +
- '<p><input type=\'text\' class=\'fm_file_rename\'><span title=\'\'>New_Folder</span></p>' +
+ '<div class=\'clip\'><span data-alt=\'\' class=\'fa fa-folder-open fm_folder_grid\'></span></div>' +
+ '<div><input type=\'text\' class=\'fm_file_rename\'><span title=\'\'>New_Folder</span></div>' +
'<span class=\'meta size\'></span><span class=\'meta created\'></span><span class=\'meta modified\'></span></li>';
path = $('.currentpath').val();
@@ -1619,7 +1621,7 @@ define([
'<tr class=\'cap_download cap_delete cap_select_file cap_select_folder cap_rename cap_create cap_upload\'>' +
'<td title=\'\' class=\' tbl_folder\'>' +
'<input type=\'text\' class=\'fm_file_rename\'>'+
- '<span class="fa fa-folder-open"></span>' +
+ '<span class="fa fa-folder-open fm_folder_list"></span>' +
'<span>' + lg.new_folder + '</span>' +
'</td>'+
'<td><span title=\'\'></span></td>' +
diff --git a/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss b/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
index 404bf6d1..45bcfebb 100644
--- a/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
+++ b/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
@@ -40,8 +40,8 @@
.file_listing_table tbody tr td:nth-child(1),
.file_listing_table thead tr th:nth-child(1) {
- width: 100%;
- min-width: 100%;
+ width: 400px;
+ min-width: 400px;
}
.file_listing_table tbody tr td:nth-child(2),
@@ -53,9 +53,9 @@
.file_listing_table tbody tr td:nth-child(3),
.file_listing_table thead tr th:nth-child(3) {
- width: 200px;
- min-width: 200px;
- max-width: 200px;
+ width: 100%;
+ min-width: 100%;
+ max-width: 100%;
}
}
@@ -66,12 +66,39 @@
background: $table-hover-bg-color;
}
-.fileinfo table#contents tr td p {
+.fileinfo table#contents tr td {
font-family: $font-family-primary;
}
-.fm_folder {
+.fileinfo #contents li span.less_text {
+ width: 100%;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ text-align: center;
+ white-space: nowrap;
+ display: block;
+}
+
+.fileinfo table#contents tr td:first-child {
+ & span.less_text {
+ width: 100%;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ max-width: calc(400px - 30px);
+ }
+
+ & .fa {
+ line-height: inherit;
+ }
+}
+
+.fm_folder_grid {
font-size: xx-large !important;
+}
+
+.fm_folder_list,
+.fm_folder_grid {
color: $color-warning;
}
@@ -118,7 +145,7 @@
height: 80px;
text-align: center;
overflow: hidden;
- margin-bottom: 10px;
+ margin: 0.5rem;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
@@ -338,4 +365,4 @@
.cap_select_file {
cursor: pointer;
-}
+}
\ No newline at end of file
diff --git a/web/pgadmin/misc/file_manager/templates/file_manager/index.html b/web/pgadmin/misc/file_manager/templates/file_manager/index.html
index f854545e..86cf6fd6 100644
--- a/web/pgadmin/misc/file_manager/templates/file_manager/index.html
+++ b/web/pgadmin/misc/file_manager/templates/file_manager/index.html
@@ -8,12 +8,13 @@
<div class="flex-grow-1 mr-1">
<div class="input-group" role="group">
<div class="input-group-prepend">
- <button name="home" type="button" value="Home" title="{{ _('Home') }}" class="btn btn-secondary bg-gray-lighter home"
+ <button name="home" type="button" value="Home" title="{{ _('Home') }}" class="btn btn-secondary home"
tabindex="1">
- <span class="fa fa-home fa-lg"></span>
+ <span class="fa fa-home sql-icon-lg"></span>
</button>
- <button name="level-up" type="button" title="{{ _('Back') }}" value="LevelUp" class="btn btn-secondary bg-gray-lighter fa fa-level-up level-up"
+ <button name="level-up" type="button" title="{{ _('Back') }}" value="LevelUp" class="btn btn-secondary level-up"
disabled tabindex="2">
+ <span class="fa fa-level-up sql-icon-lg"></span>
</button>
</div>
<input id="file-input-path" class="form-control input-path text-truncate" title="" type="text" tabindex="3" autofocus/>
@@ -23,32 +24,32 @@
<div>
<input class="mode" name="mode" type="hidden" value="add"/>
<input class="currentpath" name="currentpath" type="hidden"/>
- <button type="button" title="{{ _('Refresh') }}" class="btn btn-sm refresh"
+ <button type="button" title="{{ _('Refresh') }}" class="btn btn-sm btn-secondary refresh"
tabindex="4">
- <span class="fa fa-refresh fa-lg"></span>
+ <span class="fa fa-refresh sql-icon-lg"></span>
</button>
- <button type="button" title="{{ _('Download File') }}" class="btn btn-sm download"
+ <button type="button" title="{{ _('Download File') }}" class="btn btn-sm btn-secondary download"
disabled>
- <span class="fa fa-download fa-lg"></span>
+ <span class="fa fa-download sql-icon-lg"></span>
</button>
- <button name="delete" type="button" title="{{ _('Delete File/Folder') }}" class="btn btn-sm delete"
+ <button name="delete" type="button" title="{{ _('Delete File/Folder') }}" class="btn btn-sm btn-secondary delete"
disabled>
- <span class="fa fa-trash fa-lg"></span>
+ <span class="fa fa-trash sql-icon-lg"></span>
</button>
- <button name="rename" type="button" title="{{ _('Rename File/Folder') }}" class="btn btn-sm rename"
+ <button name="rename" type="button" title="{{ _('Rename File/Folder') }}" class="btn btn-sm btn-secondary rename"
tabindex="5">
- <span class="fa fa-pencil-square-o fa-lg"></span>
+ <span class="fa fa-pencil-square-o sql-icon-lg"></span>
</button>
<button name="newfolder" type="button" title="{{ _('Create new folder') }}" value="New Folder"
- class="btn btn-sm create" tabindex="8">
- <span class="fa fa-folder-open fa-lg"></span>
+ class="btn btn-sm btn-secondary create" tabindex="8">
+ <span class="fa fa-folder-open sql-icon-lg"></span>
</button>
<div class="btn-group" role="group">
<button class="ON btn btn-secondary btn-sm grid" type="button" title="{{ _('View as grid') }}" tabindex="9">
- <span class="fa fa-th fa-lg"></span>
+ <span class="fa fa-th sql-icon-lg"></span>
</button>
<button type="button" class="btn btn-secondary btn-sm list" title="{{ _('View as table') }}" tabindex="10">
- <span class="fa fa-list fa-lg"></span>
+ <span class="fa fa-list sql-icon-lg"></span>
</button>
</div>
</div>
diff --git a/web/pgadmin/static/scss/_bootstrap.overrides.scss b/web/pgadmin/static/scss/_bootstrap.overrides.scss
index 8ab15ad5..febe7ad7 100644
--- a/web/pgadmin/static/scss/_bootstrap.overrides.scss
+++ b/web/pgadmin/static/scss/_bootstrap.overrides.scss
@@ -266,7 +266,6 @@ td.switch-cell > div.bootstrap-switch {
border: none !important;
padding: $tabs-padding;
color: $color-fg-theme;
- font-weight: bold;
&.active {
border-bottom: $active-border !important;
color: $color-primary;
@@ -290,10 +289,11 @@ td.switch-cell > div.bootstrap-switch {
margin-right: 0rem;
padding-left: 0.5rem !important;
padding-right: 1rem !important;
- min-height: $title-height;
+ min-height: $navbar-height;
padding: 0rem;
display: flex;
align-items: center !important;
+ font-weight: bold;
}
.navbar-brand:hover {
diff --git a/web/pgadmin/static/scss/_codemirror.overrides.scss b/web/pgadmin/static/scss/_codemirror.overrides.scss
index 70747ced..f2222017 100644
--- a/web/pgadmin/static/scss/_codemirror.overrides.scss
+++ b/web/pgadmin/static/scss/_codemirror.overrides.scss
@@ -9,6 +9,7 @@
.CodeMirror {
font-size: 1em;
+ font-family: monospace, monospace;
}
/* Ensure the codemirror editor displays full height gutters when resized */
diff --git a/web/pgadmin/static/scss/_pgadmin.style.scss b/web/pgadmin/static/scss/_pgadmin.style.scss
index 3e131848..1ad4b91f 100644
--- a/web/pgadmin/static/scss/_pgadmin.style.scss
+++ b/web/pgadmin/static/scss/_pgadmin.style.scss
@@ -145,17 +145,16 @@
@media (min-width: 768px) {
.pg-navbar {
- height: $title-height;
+ height: $navbar-height;
}
.pg-docker {
- top: $title-height !important;
+ top: $navbar-height !important;
}
}
.pg-navbar {
font-size: $navbar-font-size;
- font-weight: bold;
padding-left: 0rem;
padding-right: 0.5rem;
& .nav-item .nav-link{
@@ -163,7 +162,7 @@
}
.pg-navbar-brand-arrow {
- border: $title-height/2 solid $color-fg;
+ border: $navbar-height/2 solid $color-fg;
border-right-color: transparent;
border-bottom-color: transparent;
border-top-color: transparent;
diff --git a/web/pgadmin/static/scss/_webcabin.pgadmin.scss b/web/pgadmin/static/scss/_webcabin.pgadmin.scss
index 79f68ecc..55e35628 100644
--- a/web/pgadmin/static/scss/_webcabin.pgadmin.scss
+++ b/web/pgadmin/static/scss/_webcabin.pgadmin.scss
@@ -79,7 +79,6 @@
color: $color-fg-theme;
padding: $tabs-padding;
margin: 0px;
- font-weight: bold;
}
.wcFloating {
diff --git a/web/pgadmin/static/scss/resources/_default.variables.scss b/web/pgadmin/static/scss/resources/_default.variables.scss
index 060e915f..1a263784 100644
--- a/web/pgadmin/static/scss/resources/_default.variables.scss
+++ b/web/pgadmin/static/scss/resources/_default.variables.scss
@@ -155,7 +155,8 @@ $footer-height-calc: $footer-min-height+$footer-padding*2;
$navbar-font-size: 0.925rem;
$navbar-user-font-size: 0.875rem;
-$navbar-dropdown-top: 100%;
+$navbar-height: 40px;
+$navbar-dropdown-top: 110%;
$dropdown-submenu-top: -$dropdown-spacer;
$table-bg: $color-bg-theme;
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 05:52 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 09:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
2019-01-03 10:20 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-03 15:09 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 04:51 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 09:23 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 09:58 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 10:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-07 05:14 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
@ 2019-01-07 08:54 ` Dave Page <[email protected]>
2019-01-07 09:47 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Dave Page @ 2019-01-07 08:54 UTC (permalink / raw)
To: Aditya Toshniwal <[email protected]>; +Cc: Akshay Joshi <[email protected]>; pgadmin-hackers <[email protected]>
Thanks - applied!
On Mon, Jan 7, 2019 at 10:44 AM Aditya Toshniwal
<[email protected]> wrote:
>
> Hi Hackers,
>
> Attached is the patch to incorporate the changes discussed in trailing mail(s).
>
> Kindly review.
>
> On Fri, Jan 4, 2019 at 3:31 PM Dave Page <[email protected]> wrote:
>>
>> On Fri, Jan 4, 2019 at 9:58 AM Aditya Toshniwal
>> <[email protected]> wrote:
>> >
>> > Hi,
>> >
>> > On Fri, Jan 4, 2019 at 2:53 PM Dave Page <[email protected]> wrote:
>> >>
>> >> Hi
>> >>
>> >> On Fri, Jan 4, 2019 at 4:51 AM Aditya Toshniwal <[email protected]> wrote:
>> >>>
>> >>> Hi Dave,
>> >>>
>> >>> On Thu, Jan 3, 2019 at 8:39 PM Dave Page <[email protected]> wrote:
>> >>>>
>> >>>>
>> >>>> A few other things that I noticed (or have been bugging me):
>> >>>>
>> >>>> - The menu bar seems a little cramped. Taking pg-navbar from 32 to 40px and setting the font-weight to normal on the menu options (but not the product name) seems much better to me (and adjusting everything else as required of course).
>> >>>
>> >>> Giving too much space for the navbar will reduce the usable space for other things. It is good enough(32) to be used easily, and is equal to all the other headers in app (including tabs) giving a feel of native desktop application. You'll find even smaller menu heights in native desktop application. We can make font weight to normal and may be slightly increase horizontal spacing between the menu links.
>> >>
>> >>
>> >> 8 pixels isn't going to make a noticeable difference to the workspace for users, and would leave the bar smaller than the 50px it's been for the last couple of years (iirc). I think it needs it to avoid looking cramped - please make the change.
>> >
>> > Will do.
>> > One more doubt regarding bold headers, should I remove bold headers in dashboard graph header, subnode headers (eg.table->columns), properties tab accrordian headers ?
>>
>> No, please don't. I left them bold and the styling seemed like it
>> worked. We can tweak again if others disagree later.
>>
>> Thanks!
>>
>> BTW - Chrome 71 shows the offset headers in the file dialogue as well.
>>
>> >>>>
>> >>>> - In the file dialogue, the column headers don't line up with the columns in the rows.
>> >>>
>> >>> I could not see this on my machine (screenshot attached). Could you please share the screenshot.
>> >>
>> >>
>> >> Attached - thanks! This is Chrome 70.0.3538.102 on MacOS.
>> >>
>> >> --
>> >> Dave Page
>> >> Blog: http://pgsnake.blogspot.com
>> >> Twitter: @pgsnake
>> >>
>> >> EnterpriseDB UK: http://www.enterprisedb.com
>> >> The Enterprise PostgreSQL Company
>> >
>> >
>> >
>> > --
>> > Thanks and Regards,
>> > Aditya Toshniwal
>> > Software Engineer | EnterpriseDB Software Solutions | Pune
>> > "Don't Complain about Heat, Plant a tree"
>>
>>
>>
>> --
>> Dave Page
>> Blog: http://pgsnake.blogspot.com
>> Twitter: @pgsnake
>>
>> EnterpriseDB UK: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>
>
>
> --
> Thanks and Regards,
> Aditya Toshniwal
> Software Engineer | EnterpriseDB Software Solutions | Pune
> "Don't Complain about Heat, Plant a tree"
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 05:52 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 09:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
2019-01-03 10:20 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-03 15:09 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 04:51 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 09:23 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 09:58 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 10:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-07 05:14 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-07 08:54 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
@ 2019-01-07 09:47 ` Aditya Toshniwal <[email protected]>
2019-01-14 05:24 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Aditya Toshniwal @ 2019-01-07 09:47 UTC (permalink / raw)
To: Dave Page <[email protected]>; +Cc: Akshay Joshi <[email protected]>; pgadmin-hackers <[email protected]>
Hi Hackers,
Attached is the patch for few more changes:
- New Folder button was not working in file dialogue. Fixed that.
- Color, icon changes in file dialogue
- Also replaced the splash screen image (which is used on main dashboard
also). It works fine on dashboard. However, I'm not sure of the splash
screen as the new image is SVG and older was PNG. I have made changes for
that in runtime code but I'm not able to test (evnvironment issue) runtime
code :(. It would be helpful if someone else can try it once.
Kindly review.
On Mon, Jan 7, 2019 at 2:25 PM Dave Page <[email protected]> wrote:
> Thanks - applied!
>
> On Mon, Jan 7, 2019 at 10:44 AM Aditya Toshniwal
> <[email protected]> wrote:
> >
> > Hi Hackers,
> >
> > Attached is the patch to incorporate the changes discussed in trailing
> mail(s).
> >
> > Kindly review.
> >
> > On Fri, Jan 4, 2019 at 3:31 PM Dave Page <[email protected]> wrote:
> >>
> >> On Fri, Jan 4, 2019 at 9:58 AM Aditya Toshniwal
> >> <[email protected]> wrote:
> >> >
> >> > Hi,
> >> >
> >> > On Fri, Jan 4, 2019 at 2:53 PM Dave Page <[email protected]> wrote:
> >> >>
> >> >> Hi
> >> >>
> >> >> On Fri, Jan 4, 2019 at 4:51 AM Aditya Toshniwal <
> [email protected]> wrote:
> >> >>>
> >> >>> Hi Dave,
> >> >>>
> >> >>> On Thu, Jan 3, 2019 at 8:39 PM Dave Page <[email protected]> wrote:
> >> >>>>
> >> >>>>
> >> >>>> A few other things that I noticed (or have been bugging me):
> >> >>>>
> >> >>>> - The menu bar seems a little cramped. Taking pg-navbar from 32 to
> 40px and setting the font-weight to normal on the menu options (but not the
> product name) seems much better to me (and adjusting everything else as
> required of course).
> >> >>>
> >> >>> Giving too much space for the navbar will reduce the usable space
> for other things. It is good enough(32) to be used easily, and is equal to
> all the other headers in app (including tabs) giving a feel of native
> desktop application. You'll find even smaller menu heights in native
> desktop application. We can make font weight to normal and may be slightly
> increase horizontal spacing between the menu links.
> >> >>
> >> >>
> >> >> 8 pixels isn't going to make a noticeable difference to the
> workspace for users, and would leave the bar smaller than the 50px it's
> been for the last couple of years (iirc). I think it needs it to avoid
> looking cramped - please make the change.
> >> >
> >> > Will do.
> >> > One more doubt regarding bold headers, should I remove bold headers
> in dashboard graph header, subnode headers (eg.table->columns), properties
> tab accrordian headers ?
> >>
> >> No, please don't. I left them bold and the styling seemed like it
> >> worked. We can tweak again if others disagree later.
> >>
> >> Thanks!
> >>
> >> BTW - Chrome 71 shows the offset headers in the file dialogue as well.
> >>
> >> >>>>
> >> >>>> - In the file dialogue, the column headers don't line up with the
> columns in the rows.
> >> >>>
> >> >>> I could not see this on my machine (screenshot attached). Could you
> please share the screenshot.
> >> >>
> >> >>
> >> >> Attached - thanks! This is Chrome 70.0.3538.102 on MacOS.
> >> >>
> >> >> --
> >> >> Dave Page
> >> >> Blog: http://pgsnake.blogspot.com
> >> >> Twitter: @pgsnake
> >> >>
> >> >> EnterpriseDB UK: http://www.enterprisedb.com
> >> >> The Enterprise PostgreSQL Company
> >> >
> >> >
> >> >
> >> > --
> >> > Thanks and Regards,
> >> > Aditya Toshniwal
> >> > Software Engineer | EnterpriseDB Software Solutions | Pune
> >> > "Don't Complain about Heat, Plant a tree"
> >>
> >>
> >>
> >> --
> >> Dave Page
> >> Blog: http://pgsnake.blogspot.com
> >> Twitter: @pgsnake
> >>
> >> EnterpriseDB UK: http://www.enterprisedb.com
> >> The Enterprise PostgreSQL Company
> >
> >
> >
> > --
> > Thanks and Regards,
> > Aditya Toshniwal
> > Software Engineer | EnterpriseDB Software Solutions | Pune
> > "Don't Complain about Heat, Plant a tree"
>
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
--
Thanks and Regards,
Aditya Toshniwal
Software Engineer | EnterpriseDB Software Solutions | Pune
"Don't Complain about Heat, Plant a tree"
Attachments:
[application/octet-stream] RM3692.part5.patch (90.5K, 3-RM3692.part5.patch)
download | inline diff:
diff --git a/runtime/pgAdmin4.cpp b/runtime/pgAdmin4.cpp
index 7d0d8154..b3922c46 100644
--- a/runtime/pgAdmin4.cpp
+++ b/runtime/pgAdmin4.cpp
@@ -174,7 +174,7 @@ int main(int argc, char * argv[])
// Display the spash screen
QSplashScreen *splash = new QSplashScreen();
- splash->setPixmap(QPixmap(":/splash.png"));
+ splash->setPixmap(QIcon(":/splash.png").pixmap(QSize(400, 100)));
splash->setWindowFlags(splash->windowFlags() | Qt::WindowStaysOnTopHint);
splash->show();
app.processEvents(QEventLoop::AllEvents);
diff --git a/runtime/splash.png b/runtime/splash.png
deleted file mode 100755
index cb2cfac019af410f328d9041f6c15003d80c2416..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 13559
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
diff --git a/runtime/splash.svg b/runtime/splash.svg
new file mode 100644
index 00000000..a90323cd
--- /dev/null
+++ b/runtime/splash.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 600 130"><defs><style>.cls-1{stroke:#000;stroke-width:10.19px;}.cls-2{fill:#336791;}.cls-3,.cls-4,.cls-9{fill:none;}.cls-3,.cls-4,.cls-5,.cls-6{stroke:#fff;}.cls-3,.cls-4{stroke-linecap:round;stroke-width:3.4px;}.cls-3{stroke-linejoin:round;}.cls-4{stroke-linejoin:bevel;}.cls-5,.cls-6{fill:#fff;}.cls-5{stroke-width:1.13px;}.cls-6{stroke-width:0.57px;}.cls-7{fill:#2775b6;}.cls-8{fill:#333;}.cls-9{stroke:#333;stroke-width:3px;}</style></defs><title>pgAdmin_PostgreSQL</title><g id="Layer_1" data-name="Layer 1"><g id="Layer_3"><path class="cls-1" d="M95.59,93.65c.77-6.44.54-7.38,5.33-6.34l1.21.11a27.6,27.6,0,0,0,11.34-1.91c6.09-2.83,9.71-7.55,3.7-6.31-13.71,2.83-14.65-1.81-14.65-1.81C117,55.91,123,28.64,117.82,22,103.57,3.76,78.91,12.37,78.5,12.6l-.13,0a48.65,48.65,0,0,0-9.15-.95C63,11.57,58.31,13.29,54.74,16c0,0-44-18.12-41.95,22.8.44,8.7,12.48,65.86,26.84,48.6C44.88,81.08,50,75.75,50,75.75A13.39,13.39,0,0,0,58.65,78l.25-.21a9,9,0,0,0,.1,2.46c-3.7,4.13-2.62,4.86-10,6.38s-3.09,4.29-.22,5c3.48.87,11.53,2.1,17-5.52l-.22.87c1.46,1.16,1.36,8.35,1.56,13.48s.55,9.93,1.6,12.75,2.28,10.1,12,8C88.81,119.46,95,117,95.59,93.65"/><path class="cls-2" d="M117.17,79.2c-13.71,2.83-14.65-1.81-14.65-1.81C117,55.91,123,28.64,117.82,22,103.57,3.76,78.91,12.37,78.5,12.6l-.13,0a48.65,48.65,0,0,0-9.15-.95C63,11.57,58.31,13.29,54.74,16c0,0-44-18.12-41.95,22.8.44,8.7,12.48,65.86,26.84,48.6C44.88,81.08,50,75.75,50,75.75A13.39,13.39,0,0,0,58.65,78l.25-.21A9.41,9.41,0,0,0,59,80.22c-3.7,4.13-2.61,4.86-10,6.38s-3.08,4.29-.21,5c3.48.87,11.53,2.1,17-5.52l-.22.87c1.45,1.16,2.47,7.56,2.3,13.35s-.28,9.77.86,12.88,2.28,10.1,12,8C88.81,119.46,93,115,93.6,107.42,94,102.07,95,102.87,95,98.08l.75-2.26c.87-7.26.14-9.6,5.15-8.51l1.21.11a27.6,27.6,0,0,0,11.34-1.91c6.09-2.83,9.71-7.55,3.7-6.31Z"/><path class="cls-3" d="M66.33,83.36c-.38,13.5.09,27.09,1.41,30.39s4.15,9.73,13.88,7.64c8.12-1.74,11.08-5.11,12.36-12.55.94-5.47,2.77-20.67,3-23.79"/><path class="cls-3" d="M54.67,15.7s-44-18-42,22.93c.44,8.7,12.48,65.87,26.84,48.6,5.25-6.32,10-11.27,10-11.27"/><path class="cls-3" d="M78.45,12.42c-1.52.47,24.49-9.51,39.28,9.38,5.22,6.67-.83,33.94-15.31,55.42"/><path class="cls-4" d="M102.42,77.22s.94,4.64,14.65,1.81c6-1.24,2.4,3.48-3.7,6.31-5,2.32-16.21,2.92-16.39-.29-.47-8.27,5.9-5.76,5.44-7.83-.42-1.87-3.26-3.7-5.15-8.27-1.64-4-22.57-34.58,5.8-30,1-.22-7.4-27-33.95-27.42S43.45,44.14,43.45,44.14"/><path class="cls-3" d="M58.9,80.05c-3.7,4.13-2.61,4.86-10,6.38s-3.09,4.29-.22,5c3.48.87,11.53,2.1,17-5.52,1.66-2.32,0-6-2.28-7-1.1-.46-2.57-1-4.46,1.09Z"/><path class="cls-3" d="M58.66,80c-.38-2.44.79-5.33,2.05-8.71C62.6,66.19,67,61.11,63.47,45c-2.6-12-20-2.5-20-.87a81.48,81.48,0,0,1-.29,16c-1.41,10.06,6.4,18.57,15.39,17.7"/><path class="cls-5" d="M54.51,43.9c-.08.55,1,2,2.45,2.23a2.62,2.62,0,0,0,2.72-1.51c.08-.56-1-1.17-2.44-1.37s-2.65.09-2.73.65Z"/><path class="cls-6" d="M98,42.76c.07.56-1,2-2.45,2.24a2.64,2.64,0,0,1-2.73-1.52c-.07-.55,1-1.16,2.45-1.36s2.65.09,2.73.64Z"/><path class="cls-3" d="M103.07,38.92c.24,4.36-.94,7.33-1.08,12-.22,6.74,3.21,14.46-2,22.19"/></g><path class="cls-7" d="M154.72,28.15h5.16v4.16A12.84,12.84,0,0,1,163.35,29a11.17,11.17,0,0,1,6.28-1.76,11.84,11.84,0,0,1,9.08,4.09c2.48,2.72,3.73,6.62,3.73,11.67q0,10.26-5.38,14.65a12.2,12.2,0,0,1-7.95,2.79,10.78,10.78,0,0,1-6-1.56,13.55,13.55,0,0,1-3.14-3v16h-5.28Zm19.84,24.6Q177,49.65,177,43.5a17,17,0,0,0-1.09-6.44,7.51,7.51,0,0,0-7.53-5.19q-5.49,0-7.52,5.48a21.49,21.49,0,0,0-1.09,7.44A15.64,15.64,0,0,0,160.88,51a8,8,0,0,0,13.68,1.78Z"/><path class="cls-7" d="M206,29.26a14.6,14.6,0,0,1,3,3V28.3h4.86V56.83c0,4-.58,7.13-1.75,9.44q-3.27,6.38-12.35,6.38a15.07,15.07,0,0,1-8.5-2.27,8.86,8.86,0,0,1-3.85-7.1h5.36a6,6,0,0,0,1.52,3.25q1.77,1.75,5.59,1.76,6,0,7.9-4.28,1.1-2.52,1-9a10.39,10.39,0,0,1-3.8,3.57,13.56,13.56,0,0,1-14.75-2.45q-3.81-3.62-3.81-12,0-7.89,3.84-12.31a11.85,11.85,0,0,1,9.27-4.42A11.37,11.37,0,0,1,206,29.26Zm.64,5.66a7.61,7.61,0,0,0-6.09-2.81A7.52,7.52,0,0,0,193,37.32a20.56,20.56,0,0,0-1.08,7.3c0,3.53.72,6.22,2.14,8.07a6.93,6.93,0,0,0,5.76,2.77,8.09,8.09,0,0,0,8-5.13A16.72,16.72,0,0,0,209,43.56Q209,37.73,206.62,34.92Z"/><path class="cls-7" d="M235.16,16.34h6.58l15.62,43H251l-4.5-12.89H229.6l-4.67,12.89h-6Zm9.67,25.4-6.63-19-6.88,19Z"/><path class="cls-7" d="M279.16,29a14.3,14.3,0,0,1,3.18,3.08V16.2h5.07V59.38h-4.75V55a11.33,11.33,0,0,1-4.35,4.19,12.51,12.51,0,0,1-5.75,1.28,11.61,11.61,0,0,1-9-4.4q-3.82-4.41-3.83-11.74a20.35,20.35,0,0,1,3.49-11.88,11.41,11.41,0,0,1,10-5A11.15,11.15,0,0,1,279.16,29ZM267.39,52.5q2.13,3.39,6.82,3.39a7.17,7.17,0,0,0,6-3.14c1.56-2.1,2.35-5.12,2.35-9s-.81-6.9-2.42-8.81a7.56,7.56,0,0,0-6-2.85,7.88,7.88,0,0,0-6.43,3c-1.64,2-2.46,5-2.46,9A15.62,15.62,0,0,0,267.39,52.5Z"/><path class="cls-7" d="M295.29,28h5.21v4.46a17.4,17.4,0,0,1,3.4-3.37,10.24,10.24,0,0,1,5.92-1.79,9.34,9.34,0,0,1,6,1.85,9.61,9.61,0,0,1,2.34,3.1,11.37,11.37,0,0,1,4.13-3.73,11.52,11.52,0,0,1,5.33-1.22q6.33,0,8.62,4.57a15,15,0,0,1,1.23,6.62V59.38H332V37.58c0-2.09-.52-3.52-1.57-4.3a6.2,6.2,0,0,0-3.82-1.17,7.58,7.58,0,0,0-5.35,2.08c-1.49,1.38-2.24,3.7-2.24,6.94V59.38h-5.36V38.9a10.78,10.78,0,0,0-.76-4.66q-1.2-2.19-4.49-2.19A7.73,7.73,0,0,0,303,34.36c-1.63,1.54-2.45,4.34-2.45,8.38V59.38h-5.27Z"/><path class="cls-7" d="M345.27,16.34h5.36v6h-5.36Zm0,11.81h5.36V59.38h-5.36Z"/><path class="cls-7" d="M358.6,28h5v4.46a14,14,0,0,1,4.72-4,12.56,12.56,0,0,1,5.53-1.2c4.46,0,7.46,1.55,9,4.66a16.52,16.52,0,0,1,1.29,7.29V59.38h-5.37V39.61A10.8,10.8,0,0,0,378,35a5.15,5.15,0,0,0-5.1-2.93,10.21,10.21,0,0,0-3.08.38A8,8,0,0,0,366,35a7.66,7.66,0,0,0-1.71,3.2,21.84,21.84,0,0,0-.4,4.74V59.38H358.6Z"/><path class="cls-8" d="M155.24,86.87h3.9l5.77,17,5.74-17h3.87V107h-2.6V95.1q0-.61,0-2c0-.94,0-2,0-3L166.24,107h-2.7L157.75,90v.61c0,.49,0,1.24,0,2.25s.05,1.75.05,2.22V107h-2.6Z"/><path class="cls-8" d="M186.15,98.09a1.35,1.35,0,0,0,1.14-.71,2.31,2.31,0,0,0,.16-.94,2,2,0,0,0-.89-1.84A4.79,4.79,0,0,0,184,94a3.21,3.21,0,0,0-2.73,1,3.44,3.44,0,0,0-.59,1.72h-2.3A4.28,4.28,0,0,1,180.14,93,7.16,7.16,0,0,1,184.05,92a8,8,0,0,1,4.19,1,3.34,3.34,0,0,1,1.6,3.06v8.44a1.06,1.06,0,0,0,.16.62.77.77,0,0,0,.66.23l.37,0,.44-.07V107a7.38,7.38,0,0,1-.88.21,5.92,5.92,0,0,1-.82,0,2,2,0,0,1-1.84-.9,3.63,3.63,0,0,1-.43-1.36,6.16,6.16,0,0,1-2.16,1.71,6.56,6.56,0,0,1-3.1.73,4.59,4.59,0,0,1-3.33-1.24,4.09,4.09,0,0,1-1.29-3.09,4,4,0,0,1,1.27-3.16,6.16,6.16,0,0,1,3.34-1.38ZM181,104.74a2.88,2.88,0,0,0,1.84.62,5.51,5.51,0,0,0,2.52-.61,3.37,3.37,0,0,0,2-3.26v-2a3.79,3.79,0,0,1-1.16.48,10.37,10.37,0,0,1-1.39.28l-1.49.19a5.68,5.68,0,0,0-2,.56,2.18,2.18,0,0,0-1.14,2A2,2,0,0,0,181,104.74Z"/><path class="cls-8" d="M193.88,92.31h2.33v2.08a6.73,6.73,0,0,1,2.2-1.85A6,6,0,0,1,201,92q3.12,0,4.21,2.18a7.73,7.73,0,0,1,.6,3.4V107h-2.5V97.73a4.87,4.87,0,0,0-.4-2.16,2.41,2.41,0,0,0-2.38-1.37,4.75,4.75,0,0,0-1.43.18,3.68,3.68,0,0,0-1.78,1.2,3.55,3.55,0,0,0-.8,1.5,10.3,10.3,0,0,0-.18,2.21V107h-2.46Z"/><path class="cls-8" d="M217.29,98.09a1.33,1.33,0,0,0,1.14-.71,2.15,2.15,0,0,0,.16-.94,2,2,0,0,0-.89-1.84,4.79,4.79,0,0,0-2.56-.56,3.24,3.24,0,0,0-2.73,1,3.44,3.44,0,0,0-.58,1.72h-2.3A4.27,4.27,0,0,1,211.28,93,7.19,7.19,0,0,1,215.2,92a8,8,0,0,1,4.19,1A3.36,3.36,0,0,1,221,96v8.44a1.14,1.14,0,0,0,.15.62.79.79,0,0,0,.67.23l.37,0,.43-.07V107a7.32,7.32,0,0,1-.87.21,6,6,0,0,1-.82,0,2,2,0,0,1-1.85-.9,3.46,3.46,0,0,1-.42-1.36,6.16,6.16,0,0,1-2.16,1.71,6.63,6.63,0,0,1-3.11.73,4.58,4.58,0,0,1-3.32-1.24,4.06,4.06,0,0,1-1.3-3.09A4,4,0,0,1,210,100a6.13,6.13,0,0,1,3.33-1.38Zm-5.18,6.65a2.91,2.91,0,0,0,1.85.62,5.47,5.47,0,0,0,2.51-.61,3.38,3.38,0,0,0,2.06-3.26v-2a3.9,3.9,0,0,1-1.16.48,10.51,10.51,0,0,1-1.4.28l-1.48.19a5.55,5.55,0,0,0-2,.56,2.17,2.17,0,0,0-1.15,2A2,2,0,0,0,212.11,104.74Z"/><path class="cls-8" d="M233.16,92.9a7.05,7.05,0,0,1,1.42,1.39V92.45h2.27v13.32a10,10,0,0,1-.82,4.4c-1,2-2.94,3-5.77,3a7.09,7.09,0,0,1-4-1.06,4.15,4.15,0,0,1-1.8-3.32H227a2.81,2.81,0,0,0,.71,1.52,3.57,3.57,0,0,0,2.61.82c1.88,0,3.1-.66,3.68-2a11.15,11.15,0,0,0,.48-4.2,4.84,4.84,0,0,1-1.77,1.67,5.93,5.93,0,0,1-2.74.54,5.79,5.79,0,0,1-4.14-1.69q-1.79-1.68-1.78-5.58a8.49,8.49,0,0,1,1.79-5.74,5.51,5.51,0,0,1,4.32-2.07A5.33,5.33,0,0,1,233.16,92.9Zm.3,2.64a3.77,3.77,0,0,0-6.38,1.12,9.73,9.73,0,0,0-.5,3.4,6.05,6.05,0,0,0,1,3.77,3.21,3.21,0,0,0,2.68,1.29,3.77,3.77,0,0,0,3.72-2.39,7.71,7.71,0,0,0,.6-3.16A6.13,6.13,0,0,0,233.46,95.54Z"/><path class="cls-8" d="M249.64,92.72a5.44,5.44,0,0,1,2.21,1.89,6.52,6.52,0,0,1,1,2.58,17.44,17.44,0,0,1,.22,3.23H242.4a6.34,6.34,0,0,0,1,3.59,3.49,3.49,0,0,0,3,1.35,3.9,3.9,0,0,0,3.05-1.28,4.5,4.5,0,0,0,.9-1.72h2.42a5,5,0,0,1-.63,1.8,6.58,6.58,0,0,1-1.21,1.62,5.71,5.71,0,0,1-2.75,1.48,8.71,8.71,0,0,1-2,.21,6.11,6.11,0,0,1-4.6-2,7.79,7.79,0,0,1-1.89-5.58,8.41,8.41,0,0,1,1.9-5.72,6.26,6.26,0,0,1,5-2.21A6.59,6.59,0,0,1,249.64,92.72Zm.88,5.74a6.46,6.46,0,0,0-.69-2.55,3.54,3.54,0,0,0-3.35-1.78,3.72,3.72,0,0,0-2.82,1.22,4.69,4.69,0,0,0-1.21,3.11Z"/><path class="cls-8" d="M256.16,92.31h2.44v2.08a8.23,8.23,0,0,1,1.58-1.57A4.79,4.79,0,0,1,263,92a4.31,4.31,0,0,1,2.81.87,4.5,4.5,0,0,1,1.1,1.44,5.27,5.27,0,0,1,1.92-1.74,5.37,5.37,0,0,1,2.49-.57,4.08,4.08,0,0,1,4,2.14,7,7,0,0,1,.58,3.09V107h-2.56V96.78a2.41,2.41,0,0,0-.73-2,2.93,2.93,0,0,0-1.79-.54,3.53,3.53,0,0,0-2.49,1,4.23,4.23,0,0,0-1.05,3.24V107h-2.5V97.4a5,5,0,0,0-.36-2.18,2.17,2.17,0,0,0-2.09-1,3.59,3.59,0,0,0-2.53,1.08c-.76.72-1.14,2-1.14,3.91V107h-2.47Z"/><path class="cls-8" d="M288.53,92.72a5.47,5.47,0,0,1,2.22,1.89,6.67,6.67,0,0,1,1,2.58,17.66,17.66,0,0,1,.21,3.23H281.29a6.42,6.42,0,0,0,1,3.59,3.48,3.48,0,0,0,3,1.35,3.9,3.9,0,0,0,3.06-1.28,4.5,4.5,0,0,0,.9-1.72h2.42a5.23,5.23,0,0,1-.64,1.8,6.56,6.56,0,0,1-1.2,1.62,5.7,5.7,0,0,1-2.76,1.48,8.62,8.62,0,0,1-2,.21,6.14,6.14,0,0,1-4.61-2,7.79,7.79,0,0,1-1.89-5.58,8.41,8.41,0,0,1,1.91-5.72,6.24,6.24,0,0,1,5-2.21A6.58,6.58,0,0,1,288.53,92.72Zm.88,5.74a6.46,6.46,0,0,0-.69-2.55,3.53,3.53,0,0,0-3.35-1.78,3.72,3.72,0,0,0-2.82,1.22,4.63,4.63,0,0,0-1.2,3.11Z"/><path class="cls-8" d="M295.06,92.31h2.34v2.08a6.63,6.63,0,0,1,2.2-1.85,5.91,5.91,0,0,1,2.58-.56c2.08,0,3.49.73,4.21,2.18a7.57,7.57,0,0,1,.61,3.4V107h-2.51V97.73a5,5,0,0,0-.39-2.16,2.41,2.41,0,0,0-2.38-1.37,4.86,4.86,0,0,0-1.44.18,3.7,3.7,0,0,0-1.77,1.2,3.55,3.55,0,0,0-.8,1.5,9.58,9.58,0,0,0-.19,2.21V107h-2.46Z"/><path class="cls-8" d="M311.13,88.22h2.48v4.09H316v2h-2.34v9.56a1,1,0,0,0,.52,1,2.21,2.21,0,0,0,1,.15h.38l.48,0v2a4.16,4.16,0,0,1-.88.18,7.74,7.74,0,0,1-1,.06,2.69,2.69,0,0,1-2.34-.88,3.94,3.94,0,0,1-.61-2.29v-9.7h-2v-2h2Z"/><path class="cls-8" d="M340.63,86.87v2.39h-6.77V107h-2.75V89.26h-6.76V86.87Z"/><path class="cls-8" d="M350.31,93.77a7.42,7.42,0,0,1,1.94,5.55,9.57,9.57,0,0,1-1.71,5.85,6.19,6.19,0,0,1-5.31,2.3,6,6,0,0,1-4.76-2A8.08,8.08,0,0,1,338.7,100a8.78,8.78,0,0,1,1.86-5.88,6.25,6.25,0,0,1,5-2.18A6.6,6.6,0,0,1,350.31,93.77Zm-1.53,9.74a9.32,9.32,0,0,0,.9-4.12,7.39,7.39,0,0,0-.65-3.33,3.63,3.63,0,0,0-3.54-2,3.49,3.49,0,0,0-3.25,1.72,8.07,8.07,0,0,0-1,4.15,7.05,7.05,0,0,0,1,3.89,3.56,3.56,0,0,0,3.22,1.56A3.35,3.35,0,0,0,348.78,103.51Z"/><path class="cls-8" d="M365.88,93.77a7.42,7.42,0,0,1,1.94,5.55,9.57,9.57,0,0,1-1.71,5.85,6.19,6.19,0,0,1-5.31,2.3,6,6,0,0,1-4.76-2,8.08,8.08,0,0,1-1.77-5.48,8.78,8.78,0,0,1,1.86-5.88,6.25,6.25,0,0,1,5-2.18A6.58,6.58,0,0,1,365.88,93.77Zm-1.53,9.74a9.32,9.32,0,0,0,.9-4.12,7.26,7.26,0,0,0-.65-3.33,3.63,3.63,0,0,0-3.54-2,3.46,3.46,0,0,0-3.24,1.72,8,8,0,0,0-1,4.15,7,7,0,0,0,1,3.89,3.54,3.54,0,0,0,3.21,1.56A3.35,3.35,0,0,0,364.35,103.51Z"/><path class="cls-8" d="M370.91,86.87h2.46V107h-2.46Z"/><path class="cls-8" d="M378.53,102.36a3.47,3.47,0,0,0,.63,1.89,4,4,0,0,0,3.29,1.19,4.86,4.86,0,0,0,2.45-.6A2,2,0,0,0,386,103a1.56,1.56,0,0,0-.84-1.43,10.63,10.63,0,0,0-2.14-.7l-2-.49a10,10,0,0,1-2.81-1,3.11,3.11,0,0,1-1.61-2.76,4.21,4.21,0,0,1,1.52-3.37,6.13,6.13,0,0,1,4.08-1.28q3.36,0,4.83,1.94a4.24,4.24,0,0,1,.91,2.65h-2.33A2.72,2.72,0,0,0,385,95a3.92,3.92,0,0,0-3-1,3.7,3.7,0,0,0-2.16.53,1.65,1.65,0,0,0-.74,1.4,1.73,1.73,0,0,0,1,1.53,5.69,5.69,0,0,0,1.64.6l1.66.4A12.73,12.73,0,0,1,387,99.75a3.3,3.3,0,0,1,1.44,3,4.48,4.48,0,0,1-1.5,3.37,6.45,6.45,0,0,1-4.58,1.43c-2.2,0-3.77-.5-4.68-1.49a5.59,5.59,0,0,1-1.48-3.67Z"/><path class="cls-8" d="M400,87.84c.58-.84,1.68-1.26,3.32-1.26l.48,0,.56,0v2.24l-.56,0h-.32c-.76,0-1.21.19-1.36.58a11.75,11.75,0,0,0-.22,3h2.46v1.94h-2.46V107h-2.43V94.32h-2V92.38h2v-2.3A4.43,4.43,0,0,1,400,87.84Z"/><path class="cls-8" d="M417.23,93.77a7.38,7.38,0,0,1,1.94,5.55,9.57,9.57,0,0,1-1.71,5.85,6.18,6.18,0,0,1-5.3,2.3,6,6,0,0,1-4.77-2,8.07,8.07,0,0,1-1.76-5.48,8.83,8.83,0,0,1,1.85-5.88,6.25,6.25,0,0,1,5-2.18A6.58,6.58,0,0,1,417.23,93.77Zm-1.53,9.74a9.32,9.32,0,0,0,.9-4.12,7.26,7.26,0,0,0-.65-3.33,3.63,3.63,0,0,0-3.54-2,3.47,3.47,0,0,0-3.24,1.72,8,8,0,0,0-1,4.15,7,7,0,0,0,1,3.89,3.55,3.55,0,0,0,3.22,1.56A3.35,3.35,0,0,0,415.7,103.51Z"/><path class="cls-8" d="M422.26,92.31h2.34v2.53A5.61,5.61,0,0,1,426,93,3.68,3.68,0,0,1,428.59,92l.24,0,.56,0v2.6a2.08,2.08,0,0,0-.41-.05l-.4,0a3.52,3.52,0,0,0-2.86,1.2,4.2,4.2,0,0,0-1,2.75V107h-2.46Z"/><path class="cls-8" d="M439.89,86.87h9a6.09,6.09,0,0,1,4.31,1.51,5.5,5.5,0,0,1,1.64,4.25,6.15,6.15,0,0,1-1.47,4.09,5.5,5.5,0,0,1-4.47,1.74h-6.27V107h-2.72Zm10.55,2.76a5.92,5.92,0,0,0-2.46-.42h-5.37v7H448a5.07,5.07,0,0,0,2.95-.78,3.1,3.1,0,0,0,1.14-2.75A3,3,0,0,0,450.44,89.63Z"/><path class="cls-8" d="M468.58,93.77a7.38,7.38,0,0,1,1.95,5.55,9.51,9.51,0,0,1-1.72,5.85,6.17,6.17,0,0,1-5.3,2.3,6,6,0,0,1-4.77-2A8.07,8.07,0,0,1,457,100a8.78,8.78,0,0,1,1.86-5.88,6.23,6.23,0,0,1,5-2.18A6.56,6.56,0,0,1,468.58,93.77Zm-1.52,9.74a9.32,9.32,0,0,0,.9-4.12,7.39,7.39,0,0,0-.65-3.33,3.65,3.65,0,0,0-3.55-2,3.48,3.48,0,0,0-3.24,1.72,8,8,0,0,0-1,4.15,7,7,0,0,0,1,3.89,3.56,3.56,0,0,0,3.22,1.56A3.36,3.36,0,0,0,467.06,103.51Z"/><path class="cls-8" d="M475,102.36a3.47,3.47,0,0,0,.63,1.89,4,4,0,0,0,3.29,1.19,4.93,4.93,0,0,0,2.46-.6,2,2,0,0,0,1.06-1.84,1.55,1.55,0,0,0-.85-1.43,10.4,10.4,0,0,0-2.14-.7l-2-.49a9.78,9.78,0,0,1-2.8-1,3.1,3.1,0,0,1-1.62-2.76,4.21,4.21,0,0,1,1.52-3.37,6.13,6.13,0,0,1,4.08-1.28q3.36,0,4.84,1.94a4.17,4.17,0,0,1,.9,2.65h-2.33a2.72,2.72,0,0,0-.6-1.51,3.92,3.92,0,0,0-3-1,3.7,3.7,0,0,0-2.16.53,1.64,1.64,0,0,0-.73,1.4,1.72,1.72,0,0,0,1,1.53,5.66,5.66,0,0,0,1.65.6l1.65.4a12.83,12.83,0,0,1,3.63,1.24,3.31,3.31,0,0,1,1.43,3,4.48,4.48,0,0,1-1.5,3.37,6.45,6.45,0,0,1-4.58,1.43q-3.3,0-4.68-1.49a5.59,5.59,0,0,1-1.48-3.67Z"/><path class="cls-8" d="M488,88.22h2.49v4.09h2.34v2h-2.34v9.56a1,1,0,0,0,.52,1,2.19,2.19,0,0,0,.95.15h.39l.48,0v2a4.39,4.39,0,0,1-.89.18,7.52,7.52,0,0,1-1,.06,2.69,2.69,0,0,1-2.34-.88A3.94,3.94,0,0,1,488,104v-9.7h-2v-2h2Z"/><path class="cls-8" d="M503.47,92.9a6.78,6.78,0,0,1,1.41,1.39V92.45h2.27v13.32a10,10,0,0,1-.81,4.4c-1,2-2.94,3-5.77,3a7.09,7.09,0,0,1-4-1.06,4.1,4.1,0,0,1-1.8-3.32h2.5a2.74,2.74,0,0,0,.71,1.52,3.57,3.57,0,0,0,2.61.82c1.87,0,3.1-.66,3.68-2a11.37,11.37,0,0,0,.48-4.2,4.84,4.84,0,0,1-1.77,1.67,6,6,0,0,1-2.74.54,5.83,5.83,0,0,1-4.15-1.69q-1.77-1.68-1.77-5.58a8.43,8.43,0,0,1,1.79-5.74,5.51,5.51,0,0,1,4.32-2.07A5.38,5.38,0,0,1,503.47,92.9Zm.3,2.64a3.56,3.56,0,0,0-2.85-1.31,3.5,3.5,0,0,0-3.53,2.43,9.48,9.48,0,0,0-.51,3.4,6.12,6.12,0,0,0,1,3.77,3.24,3.24,0,0,0,2.69,1.29,3.75,3.75,0,0,0,3.71-2.39,7.71,7.71,0,0,0,.6-3.16A6.14,6.14,0,0,0,503.77,95.54Z"/><path class="cls-8" d="M511,92.31h2.33v2.53a5.91,5.91,0,0,1,1.41-1.8A3.69,3.69,0,0,1,517.3,92l.23,0,.56,0v2.6a2.08,2.08,0,0,0-.4-.05l-.41,0a3.48,3.48,0,0,0-2.85,1.2,4.14,4.14,0,0,0-1,2.75V107H511Z"/><path class="cls-8" d="M529.27,92.72a5.44,5.44,0,0,1,2.21,1.89,6.52,6.52,0,0,1,1,2.58,16.6,16.6,0,0,1,.22,3.23H522a6.34,6.34,0,0,0,1,3.59,3.49,3.49,0,0,0,3,1.35,3.9,3.9,0,0,0,3-1.28,4.37,4.37,0,0,0,.9-1.72h2.42a5,5,0,0,1-.63,1.8,6.34,6.34,0,0,1-1.21,1.62,5.71,5.71,0,0,1-2.75,1.48,8.65,8.65,0,0,1-2,.21,6.11,6.11,0,0,1-4.6-2,7.79,7.79,0,0,1-1.89-5.58,8.41,8.41,0,0,1,1.9-5.72,6.26,6.26,0,0,1,5-2.21A6.59,6.59,0,0,1,529.27,92.72Zm.88,5.74a6.46,6.46,0,0,0-.69-2.55,3.54,3.54,0,0,0-3.35-1.78,3.72,3.72,0,0,0-2.82,1.22,4.69,4.69,0,0,0-1.21,3.11Z"/><path class="cls-8" d="M537.9,100.47a5.6,5.6,0,0,0,.78,2.78q1.3,2,4.59,2a7.9,7.9,0,0,0,2.69-.44,3.09,3.09,0,0,0,2.34-3,2.64,2.64,0,0,0-1-2.33,9.55,9.55,0,0,0-3.15-1.19l-2.64-.62a11.41,11.41,0,0,1-3.65-1.33A4.23,4.23,0,0,1,536,92.54a5.86,5.86,0,0,1,1.83-4.44A7.16,7.16,0,0,1,543,86.37a8.75,8.75,0,0,1,5.22,1.52,5.57,5.57,0,0,1,2.15,4.87h-2.56a5.12,5.12,0,0,0-.84-2.47c-.79-1.05-2.14-1.57-4.05-1.57a4.51,4.51,0,0,0-3.31,1,3.2,3.2,0,0,0-1,2.35,2.33,2.33,0,0,0,1.19,2.16,16.76,16.76,0,0,0,3.54,1.09l2.73.65a8.15,8.15,0,0,1,3,1.27,4.81,4.81,0,0,1,1.86,4.09,5.14,5.14,0,0,1-2.37,4.77,10.46,10.46,0,0,1-5.5,1.43,8.07,8.07,0,0,1-5.72-1.91,6.57,6.57,0,0,1-2-5.16Z"/><path class="cls-8" d="M573.17,106.9l-1.36,1.65-3.11-2.36a11.33,11.33,0,0,1-2.43,1,10.29,10.29,0,0,1-2.85.37,9.18,9.18,0,0,1-7.32-3.06A11.71,11.71,0,0,1,553.76,97a11.9,11.9,0,0,1,2-7,8.78,8.78,0,0,1,7.69-3.72c3.54,0,6.17,1.14,7.87,3.42a11.08,11.08,0,0,1,2,6.82,14.28,14.28,0,0,1-.48,3.73,9.67,9.67,0,0,1-2.44,4.46ZM565.35,105a3.36,3.36,0,0,0,1.29-.47l-2.22-1.72,1.37-1.68,2.62,2A7.5,7.5,0,0,0,570.1,100a13.76,13.76,0,0,0,.45-3.39,8.48,8.48,0,0,0-1.85-5.7,6.35,6.35,0,0,0-5.07-2.17,6.6,6.6,0,0,0-5.15,2.08q-1.9,2.07-1.9,6.38A8.64,8.64,0,0,0,558.4,103a6.63,6.63,0,0,0,5.36,2.15A11.24,11.24,0,0,0,565.35,105Z"/><path class="cls-8" d="M576.58,86.87h2.72v17.69h10.08V107h-12.8Z"/><line class="cls-9" x1="219.17" y1="66.5" x2="384.17" y2="66.5"/></g></svg>
\ No newline at end of file
diff --git a/web/pgadmin/dashboard/static/img/welcome_logo.png b/web/pgadmin/dashboard/static/img/welcome_logo.png
deleted file mode 100644
index f49cb91abd0c0868b3d245fb3f1b4dec01e1dfd8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 22603
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≫P7B*MX<&Wd($Q)LL~9!Z1N
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
V8hjY39{q#&J*Q`)`%;Gx@qeJHdhGxJ
diff --git a/web/pgadmin/dashboard/static/img/welcome_logo.svg b/web/pgadmin/dashboard/static/img/welcome_logo.svg
new file mode 100644
index 00000000..a90323cd
--- /dev/null
+++ b/web/pgadmin/dashboard/static/img/welcome_logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 600 130"><defs><style>.cls-1{stroke:#000;stroke-width:10.19px;}.cls-2{fill:#336791;}.cls-3,.cls-4,.cls-9{fill:none;}.cls-3,.cls-4,.cls-5,.cls-6{stroke:#fff;}.cls-3,.cls-4{stroke-linecap:round;stroke-width:3.4px;}.cls-3{stroke-linejoin:round;}.cls-4{stroke-linejoin:bevel;}.cls-5,.cls-6{fill:#fff;}.cls-5{stroke-width:1.13px;}.cls-6{stroke-width:0.57px;}.cls-7{fill:#2775b6;}.cls-8{fill:#333;}.cls-9{stroke:#333;stroke-width:3px;}</style></defs><title>pgAdmin_PostgreSQL</title><g id="Layer_1" data-name="Layer 1"><g id="Layer_3"><path class="cls-1" d="M95.59,93.65c.77-6.44.54-7.38,5.33-6.34l1.21.11a27.6,27.6,0,0,0,11.34-1.91c6.09-2.83,9.71-7.55,3.7-6.31-13.71,2.83-14.65-1.81-14.65-1.81C117,55.91,123,28.64,117.82,22,103.57,3.76,78.91,12.37,78.5,12.6l-.13,0a48.65,48.65,0,0,0-9.15-.95C63,11.57,58.31,13.29,54.74,16c0,0-44-18.12-41.95,22.8.44,8.7,12.48,65.86,26.84,48.6C44.88,81.08,50,75.75,50,75.75A13.39,13.39,0,0,0,58.65,78l.25-.21a9,9,0,0,0,.1,2.46c-3.7,4.13-2.62,4.86-10,6.38s-3.09,4.29-.22,5c3.48.87,11.53,2.1,17-5.52l-.22.87c1.46,1.16,1.36,8.35,1.56,13.48s.55,9.93,1.6,12.75,2.28,10.1,12,8C88.81,119.46,95,117,95.59,93.65"/><path class="cls-2" d="M117.17,79.2c-13.71,2.83-14.65-1.81-14.65-1.81C117,55.91,123,28.64,117.82,22,103.57,3.76,78.91,12.37,78.5,12.6l-.13,0a48.65,48.65,0,0,0-9.15-.95C63,11.57,58.31,13.29,54.74,16c0,0-44-18.12-41.95,22.8.44,8.7,12.48,65.86,26.84,48.6C44.88,81.08,50,75.75,50,75.75A13.39,13.39,0,0,0,58.65,78l.25-.21A9.41,9.41,0,0,0,59,80.22c-3.7,4.13-2.61,4.86-10,6.38s-3.08,4.29-.21,5c3.48.87,11.53,2.1,17-5.52l-.22.87c1.45,1.16,2.47,7.56,2.3,13.35s-.28,9.77.86,12.88,2.28,10.1,12,8C88.81,119.46,93,115,93.6,107.42,94,102.07,95,102.87,95,98.08l.75-2.26c.87-7.26.14-9.6,5.15-8.51l1.21.11a27.6,27.6,0,0,0,11.34-1.91c6.09-2.83,9.71-7.55,3.7-6.31Z"/><path class="cls-3" d="M66.33,83.36c-.38,13.5.09,27.09,1.41,30.39s4.15,9.73,13.88,7.64c8.12-1.74,11.08-5.11,12.36-12.55.94-5.47,2.77-20.67,3-23.79"/><path class="cls-3" d="M54.67,15.7s-44-18-42,22.93c.44,8.7,12.48,65.87,26.84,48.6,5.25-6.32,10-11.27,10-11.27"/><path class="cls-3" d="M78.45,12.42c-1.52.47,24.49-9.51,39.28,9.38,5.22,6.67-.83,33.94-15.31,55.42"/><path class="cls-4" d="M102.42,77.22s.94,4.64,14.65,1.81c6-1.24,2.4,3.48-3.7,6.31-5,2.32-16.21,2.92-16.39-.29-.47-8.27,5.9-5.76,5.44-7.83-.42-1.87-3.26-3.7-5.15-8.27-1.64-4-22.57-34.58,5.8-30,1-.22-7.4-27-33.95-27.42S43.45,44.14,43.45,44.14"/><path class="cls-3" d="M58.9,80.05c-3.7,4.13-2.61,4.86-10,6.38s-3.09,4.29-.22,5c3.48.87,11.53,2.1,17-5.52,1.66-2.32,0-6-2.28-7-1.1-.46-2.57-1-4.46,1.09Z"/><path class="cls-3" d="M58.66,80c-.38-2.44.79-5.33,2.05-8.71C62.6,66.19,67,61.11,63.47,45c-2.6-12-20-2.5-20-.87a81.48,81.48,0,0,1-.29,16c-1.41,10.06,6.4,18.57,15.39,17.7"/><path class="cls-5" d="M54.51,43.9c-.08.55,1,2,2.45,2.23a2.62,2.62,0,0,0,2.72-1.51c.08-.56-1-1.17-2.44-1.37s-2.65.09-2.73.65Z"/><path class="cls-6" d="M98,42.76c.07.56-1,2-2.45,2.24a2.64,2.64,0,0,1-2.73-1.52c-.07-.55,1-1.16,2.45-1.36s2.65.09,2.73.64Z"/><path class="cls-3" d="M103.07,38.92c.24,4.36-.94,7.33-1.08,12-.22,6.74,3.21,14.46-2,22.19"/></g><path class="cls-7" d="M154.72,28.15h5.16v4.16A12.84,12.84,0,0,1,163.35,29a11.17,11.17,0,0,1,6.28-1.76,11.84,11.84,0,0,1,9.08,4.09c2.48,2.72,3.73,6.62,3.73,11.67q0,10.26-5.38,14.65a12.2,12.2,0,0,1-7.95,2.79,10.78,10.78,0,0,1-6-1.56,13.55,13.55,0,0,1-3.14-3v16h-5.28Zm19.84,24.6Q177,49.65,177,43.5a17,17,0,0,0-1.09-6.44,7.51,7.51,0,0,0-7.53-5.19q-5.49,0-7.52,5.48a21.49,21.49,0,0,0-1.09,7.44A15.64,15.64,0,0,0,160.88,51a8,8,0,0,0,13.68,1.78Z"/><path class="cls-7" d="M206,29.26a14.6,14.6,0,0,1,3,3V28.3h4.86V56.83c0,4-.58,7.13-1.75,9.44q-3.27,6.38-12.35,6.38a15.07,15.07,0,0,1-8.5-2.27,8.86,8.86,0,0,1-3.85-7.1h5.36a6,6,0,0,0,1.52,3.25q1.77,1.75,5.59,1.76,6,0,7.9-4.28,1.1-2.52,1-9a10.39,10.39,0,0,1-3.8,3.57,13.56,13.56,0,0,1-14.75-2.45q-3.81-3.62-3.81-12,0-7.89,3.84-12.31a11.85,11.85,0,0,1,9.27-4.42A11.37,11.37,0,0,1,206,29.26Zm.64,5.66a7.61,7.61,0,0,0-6.09-2.81A7.52,7.52,0,0,0,193,37.32a20.56,20.56,0,0,0-1.08,7.3c0,3.53.72,6.22,2.14,8.07a6.93,6.93,0,0,0,5.76,2.77,8.09,8.09,0,0,0,8-5.13A16.72,16.72,0,0,0,209,43.56Q209,37.73,206.62,34.92Z"/><path class="cls-7" d="M235.16,16.34h6.58l15.62,43H251l-4.5-12.89H229.6l-4.67,12.89h-6Zm9.67,25.4-6.63-19-6.88,19Z"/><path class="cls-7" d="M279.16,29a14.3,14.3,0,0,1,3.18,3.08V16.2h5.07V59.38h-4.75V55a11.33,11.33,0,0,1-4.35,4.19,12.51,12.51,0,0,1-5.75,1.28,11.61,11.61,0,0,1-9-4.4q-3.82-4.41-3.83-11.74a20.35,20.35,0,0,1,3.49-11.88,11.41,11.41,0,0,1,10-5A11.15,11.15,0,0,1,279.16,29ZM267.39,52.5q2.13,3.39,6.82,3.39a7.17,7.17,0,0,0,6-3.14c1.56-2.1,2.35-5.12,2.35-9s-.81-6.9-2.42-8.81a7.56,7.56,0,0,0-6-2.85,7.88,7.88,0,0,0-6.43,3c-1.64,2-2.46,5-2.46,9A15.62,15.62,0,0,0,267.39,52.5Z"/><path class="cls-7" d="M295.29,28h5.21v4.46a17.4,17.4,0,0,1,3.4-3.37,10.24,10.24,0,0,1,5.92-1.79,9.34,9.34,0,0,1,6,1.85,9.61,9.61,0,0,1,2.34,3.1,11.37,11.37,0,0,1,4.13-3.73,11.52,11.52,0,0,1,5.33-1.22q6.33,0,8.62,4.57a15,15,0,0,1,1.23,6.62V59.38H332V37.58c0-2.09-.52-3.52-1.57-4.3a6.2,6.2,0,0,0-3.82-1.17,7.58,7.58,0,0,0-5.35,2.08c-1.49,1.38-2.24,3.7-2.24,6.94V59.38h-5.36V38.9a10.78,10.78,0,0,0-.76-4.66q-1.2-2.19-4.49-2.19A7.73,7.73,0,0,0,303,34.36c-1.63,1.54-2.45,4.34-2.45,8.38V59.38h-5.27Z"/><path class="cls-7" d="M345.27,16.34h5.36v6h-5.36Zm0,11.81h5.36V59.38h-5.36Z"/><path class="cls-7" d="M358.6,28h5v4.46a14,14,0,0,1,4.72-4,12.56,12.56,0,0,1,5.53-1.2c4.46,0,7.46,1.55,9,4.66a16.52,16.52,0,0,1,1.29,7.29V59.38h-5.37V39.61A10.8,10.8,0,0,0,378,35a5.15,5.15,0,0,0-5.1-2.93,10.21,10.21,0,0,0-3.08.38A8,8,0,0,0,366,35a7.66,7.66,0,0,0-1.71,3.2,21.84,21.84,0,0,0-.4,4.74V59.38H358.6Z"/><path class="cls-8" d="M155.24,86.87h3.9l5.77,17,5.74-17h3.87V107h-2.6V95.1q0-.61,0-2c0-.94,0-2,0-3L166.24,107h-2.7L157.75,90v.61c0,.49,0,1.24,0,2.25s.05,1.75.05,2.22V107h-2.6Z"/><path class="cls-8" d="M186.15,98.09a1.35,1.35,0,0,0,1.14-.71,2.31,2.31,0,0,0,.16-.94,2,2,0,0,0-.89-1.84A4.79,4.79,0,0,0,184,94a3.21,3.21,0,0,0-2.73,1,3.44,3.44,0,0,0-.59,1.72h-2.3A4.28,4.28,0,0,1,180.14,93,7.16,7.16,0,0,1,184.05,92a8,8,0,0,1,4.19,1,3.34,3.34,0,0,1,1.6,3.06v8.44a1.06,1.06,0,0,0,.16.62.77.77,0,0,0,.66.23l.37,0,.44-.07V107a7.38,7.38,0,0,1-.88.21,5.92,5.92,0,0,1-.82,0,2,2,0,0,1-1.84-.9,3.63,3.63,0,0,1-.43-1.36,6.16,6.16,0,0,1-2.16,1.71,6.56,6.56,0,0,1-3.1.73,4.59,4.59,0,0,1-3.33-1.24,4.09,4.09,0,0,1-1.29-3.09,4,4,0,0,1,1.27-3.16,6.16,6.16,0,0,1,3.34-1.38ZM181,104.74a2.88,2.88,0,0,0,1.84.62,5.51,5.51,0,0,0,2.52-.61,3.37,3.37,0,0,0,2-3.26v-2a3.79,3.79,0,0,1-1.16.48,10.37,10.37,0,0,1-1.39.28l-1.49.19a5.68,5.68,0,0,0-2,.56,2.18,2.18,0,0,0-1.14,2A2,2,0,0,0,181,104.74Z"/><path class="cls-8" d="M193.88,92.31h2.33v2.08a6.73,6.73,0,0,1,2.2-1.85A6,6,0,0,1,201,92q3.12,0,4.21,2.18a7.73,7.73,0,0,1,.6,3.4V107h-2.5V97.73a4.87,4.87,0,0,0-.4-2.16,2.41,2.41,0,0,0-2.38-1.37,4.75,4.75,0,0,0-1.43.18,3.68,3.68,0,0,0-1.78,1.2,3.55,3.55,0,0,0-.8,1.5,10.3,10.3,0,0,0-.18,2.21V107h-2.46Z"/><path class="cls-8" d="M217.29,98.09a1.33,1.33,0,0,0,1.14-.71,2.15,2.15,0,0,0,.16-.94,2,2,0,0,0-.89-1.84,4.79,4.79,0,0,0-2.56-.56,3.24,3.24,0,0,0-2.73,1,3.44,3.44,0,0,0-.58,1.72h-2.3A4.27,4.27,0,0,1,211.28,93,7.19,7.19,0,0,1,215.2,92a8,8,0,0,1,4.19,1A3.36,3.36,0,0,1,221,96v8.44a1.14,1.14,0,0,0,.15.62.79.79,0,0,0,.67.23l.37,0,.43-.07V107a7.32,7.32,0,0,1-.87.21,6,6,0,0,1-.82,0,2,2,0,0,1-1.85-.9,3.46,3.46,0,0,1-.42-1.36,6.16,6.16,0,0,1-2.16,1.71,6.63,6.63,0,0,1-3.11.73,4.58,4.58,0,0,1-3.32-1.24,4.06,4.06,0,0,1-1.3-3.09A4,4,0,0,1,210,100a6.13,6.13,0,0,1,3.33-1.38Zm-5.18,6.65a2.91,2.91,0,0,0,1.85.62,5.47,5.47,0,0,0,2.51-.61,3.38,3.38,0,0,0,2.06-3.26v-2a3.9,3.9,0,0,1-1.16.48,10.51,10.51,0,0,1-1.4.28l-1.48.19a5.55,5.55,0,0,0-2,.56,2.17,2.17,0,0,0-1.15,2A2,2,0,0,0,212.11,104.74Z"/><path class="cls-8" d="M233.16,92.9a7.05,7.05,0,0,1,1.42,1.39V92.45h2.27v13.32a10,10,0,0,1-.82,4.4c-1,2-2.94,3-5.77,3a7.09,7.09,0,0,1-4-1.06,4.15,4.15,0,0,1-1.8-3.32H227a2.81,2.81,0,0,0,.71,1.52,3.57,3.57,0,0,0,2.61.82c1.88,0,3.1-.66,3.68-2a11.15,11.15,0,0,0,.48-4.2,4.84,4.84,0,0,1-1.77,1.67,5.93,5.93,0,0,1-2.74.54,5.79,5.79,0,0,1-4.14-1.69q-1.79-1.68-1.78-5.58a8.49,8.49,0,0,1,1.79-5.74,5.51,5.51,0,0,1,4.32-2.07A5.33,5.33,0,0,1,233.16,92.9Zm.3,2.64a3.77,3.77,0,0,0-6.38,1.12,9.73,9.73,0,0,0-.5,3.4,6.05,6.05,0,0,0,1,3.77,3.21,3.21,0,0,0,2.68,1.29,3.77,3.77,0,0,0,3.72-2.39,7.71,7.71,0,0,0,.6-3.16A6.13,6.13,0,0,0,233.46,95.54Z"/><path class="cls-8" d="M249.64,92.72a5.44,5.44,0,0,1,2.21,1.89,6.52,6.52,0,0,1,1,2.58,17.44,17.44,0,0,1,.22,3.23H242.4a6.34,6.34,0,0,0,1,3.59,3.49,3.49,0,0,0,3,1.35,3.9,3.9,0,0,0,3.05-1.28,4.5,4.5,0,0,0,.9-1.72h2.42a5,5,0,0,1-.63,1.8,6.58,6.58,0,0,1-1.21,1.62,5.71,5.71,0,0,1-2.75,1.48,8.71,8.71,0,0,1-2,.21,6.11,6.11,0,0,1-4.6-2,7.79,7.79,0,0,1-1.89-5.58,8.41,8.41,0,0,1,1.9-5.72,6.26,6.26,0,0,1,5-2.21A6.59,6.59,0,0,1,249.64,92.72Zm.88,5.74a6.46,6.46,0,0,0-.69-2.55,3.54,3.54,0,0,0-3.35-1.78,3.72,3.72,0,0,0-2.82,1.22,4.69,4.69,0,0,0-1.21,3.11Z"/><path class="cls-8" d="M256.16,92.31h2.44v2.08a8.23,8.23,0,0,1,1.58-1.57A4.79,4.79,0,0,1,263,92a4.31,4.31,0,0,1,2.81.87,4.5,4.5,0,0,1,1.1,1.44,5.27,5.27,0,0,1,1.92-1.74,5.37,5.37,0,0,1,2.49-.57,4.08,4.08,0,0,1,4,2.14,7,7,0,0,1,.58,3.09V107h-2.56V96.78a2.41,2.41,0,0,0-.73-2,2.93,2.93,0,0,0-1.79-.54,3.53,3.53,0,0,0-2.49,1,4.23,4.23,0,0,0-1.05,3.24V107h-2.5V97.4a5,5,0,0,0-.36-2.18,2.17,2.17,0,0,0-2.09-1,3.59,3.59,0,0,0-2.53,1.08c-.76.72-1.14,2-1.14,3.91V107h-2.47Z"/><path class="cls-8" d="M288.53,92.72a5.47,5.47,0,0,1,2.22,1.89,6.67,6.67,0,0,1,1,2.58,17.66,17.66,0,0,1,.21,3.23H281.29a6.42,6.42,0,0,0,1,3.59,3.48,3.48,0,0,0,3,1.35,3.9,3.9,0,0,0,3.06-1.28,4.5,4.5,0,0,0,.9-1.72h2.42a5.23,5.23,0,0,1-.64,1.8,6.56,6.56,0,0,1-1.2,1.62,5.7,5.7,0,0,1-2.76,1.48,8.62,8.62,0,0,1-2,.21,6.14,6.14,0,0,1-4.61-2,7.79,7.79,0,0,1-1.89-5.58,8.41,8.41,0,0,1,1.91-5.72,6.24,6.24,0,0,1,5-2.21A6.58,6.58,0,0,1,288.53,92.72Zm.88,5.74a6.46,6.46,0,0,0-.69-2.55,3.53,3.53,0,0,0-3.35-1.78,3.72,3.72,0,0,0-2.82,1.22,4.63,4.63,0,0,0-1.2,3.11Z"/><path class="cls-8" d="M295.06,92.31h2.34v2.08a6.63,6.63,0,0,1,2.2-1.85,5.91,5.91,0,0,1,2.58-.56c2.08,0,3.49.73,4.21,2.18a7.57,7.57,0,0,1,.61,3.4V107h-2.51V97.73a5,5,0,0,0-.39-2.16,2.41,2.41,0,0,0-2.38-1.37,4.86,4.86,0,0,0-1.44.18,3.7,3.7,0,0,0-1.77,1.2,3.55,3.55,0,0,0-.8,1.5,9.58,9.58,0,0,0-.19,2.21V107h-2.46Z"/><path class="cls-8" d="M311.13,88.22h2.48v4.09H316v2h-2.34v9.56a1,1,0,0,0,.52,1,2.21,2.21,0,0,0,1,.15h.38l.48,0v2a4.16,4.16,0,0,1-.88.18,7.74,7.74,0,0,1-1,.06,2.69,2.69,0,0,1-2.34-.88,3.94,3.94,0,0,1-.61-2.29v-9.7h-2v-2h2Z"/><path class="cls-8" d="M340.63,86.87v2.39h-6.77V107h-2.75V89.26h-6.76V86.87Z"/><path class="cls-8" d="M350.31,93.77a7.42,7.42,0,0,1,1.94,5.55,9.57,9.57,0,0,1-1.71,5.85,6.19,6.19,0,0,1-5.31,2.3,6,6,0,0,1-4.76-2A8.08,8.08,0,0,1,338.7,100a8.78,8.78,0,0,1,1.86-5.88,6.25,6.25,0,0,1,5-2.18A6.6,6.6,0,0,1,350.31,93.77Zm-1.53,9.74a9.32,9.32,0,0,0,.9-4.12,7.39,7.39,0,0,0-.65-3.33,3.63,3.63,0,0,0-3.54-2,3.49,3.49,0,0,0-3.25,1.72,8.07,8.07,0,0,0-1,4.15,7.05,7.05,0,0,0,1,3.89,3.56,3.56,0,0,0,3.22,1.56A3.35,3.35,0,0,0,348.78,103.51Z"/><path class="cls-8" d="M365.88,93.77a7.42,7.42,0,0,1,1.94,5.55,9.57,9.57,0,0,1-1.71,5.85,6.19,6.19,0,0,1-5.31,2.3,6,6,0,0,1-4.76-2,8.08,8.08,0,0,1-1.77-5.48,8.78,8.78,0,0,1,1.86-5.88,6.25,6.25,0,0,1,5-2.18A6.58,6.58,0,0,1,365.88,93.77Zm-1.53,9.74a9.32,9.32,0,0,0,.9-4.12,7.26,7.26,0,0,0-.65-3.33,3.63,3.63,0,0,0-3.54-2,3.46,3.46,0,0,0-3.24,1.72,8,8,0,0,0-1,4.15,7,7,0,0,0,1,3.89,3.54,3.54,0,0,0,3.21,1.56A3.35,3.35,0,0,0,364.35,103.51Z"/><path class="cls-8" d="M370.91,86.87h2.46V107h-2.46Z"/><path class="cls-8" d="M378.53,102.36a3.47,3.47,0,0,0,.63,1.89,4,4,0,0,0,3.29,1.19,4.86,4.86,0,0,0,2.45-.6A2,2,0,0,0,386,103a1.56,1.56,0,0,0-.84-1.43,10.63,10.63,0,0,0-2.14-.7l-2-.49a10,10,0,0,1-2.81-1,3.11,3.11,0,0,1-1.61-2.76,4.21,4.21,0,0,1,1.52-3.37,6.13,6.13,0,0,1,4.08-1.28q3.36,0,4.83,1.94a4.24,4.24,0,0,1,.91,2.65h-2.33A2.72,2.72,0,0,0,385,95a3.92,3.92,0,0,0-3-1,3.7,3.7,0,0,0-2.16.53,1.65,1.65,0,0,0-.74,1.4,1.73,1.73,0,0,0,1,1.53,5.69,5.69,0,0,0,1.64.6l1.66.4A12.73,12.73,0,0,1,387,99.75a3.3,3.3,0,0,1,1.44,3,4.48,4.48,0,0,1-1.5,3.37,6.45,6.45,0,0,1-4.58,1.43c-2.2,0-3.77-.5-4.68-1.49a5.59,5.59,0,0,1-1.48-3.67Z"/><path class="cls-8" d="M400,87.84c.58-.84,1.68-1.26,3.32-1.26l.48,0,.56,0v2.24l-.56,0h-.32c-.76,0-1.21.19-1.36.58a11.75,11.75,0,0,0-.22,3h2.46v1.94h-2.46V107h-2.43V94.32h-2V92.38h2v-2.3A4.43,4.43,0,0,1,400,87.84Z"/><path class="cls-8" d="M417.23,93.77a7.38,7.38,0,0,1,1.94,5.55,9.57,9.57,0,0,1-1.71,5.85,6.18,6.18,0,0,1-5.3,2.3,6,6,0,0,1-4.77-2,8.07,8.07,0,0,1-1.76-5.48,8.83,8.83,0,0,1,1.85-5.88,6.25,6.25,0,0,1,5-2.18A6.58,6.58,0,0,1,417.23,93.77Zm-1.53,9.74a9.32,9.32,0,0,0,.9-4.12,7.26,7.26,0,0,0-.65-3.33,3.63,3.63,0,0,0-3.54-2,3.47,3.47,0,0,0-3.24,1.72,8,8,0,0,0-1,4.15,7,7,0,0,0,1,3.89,3.55,3.55,0,0,0,3.22,1.56A3.35,3.35,0,0,0,415.7,103.51Z"/><path class="cls-8" d="M422.26,92.31h2.34v2.53A5.61,5.61,0,0,1,426,93,3.68,3.68,0,0,1,428.59,92l.24,0,.56,0v2.6a2.08,2.08,0,0,0-.41-.05l-.4,0a3.52,3.52,0,0,0-2.86,1.2,4.2,4.2,0,0,0-1,2.75V107h-2.46Z"/><path class="cls-8" d="M439.89,86.87h9a6.09,6.09,0,0,1,4.31,1.51,5.5,5.5,0,0,1,1.64,4.25,6.15,6.15,0,0,1-1.47,4.09,5.5,5.5,0,0,1-4.47,1.74h-6.27V107h-2.72Zm10.55,2.76a5.92,5.92,0,0,0-2.46-.42h-5.37v7H448a5.07,5.07,0,0,0,2.95-.78,3.1,3.1,0,0,0,1.14-2.75A3,3,0,0,0,450.44,89.63Z"/><path class="cls-8" d="M468.58,93.77a7.38,7.38,0,0,1,1.95,5.55,9.51,9.51,0,0,1-1.72,5.85,6.17,6.17,0,0,1-5.3,2.3,6,6,0,0,1-4.77-2A8.07,8.07,0,0,1,457,100a8.78,8.78,0,0,1,1.86-5.88,6.23,6.23,0,0,1,5-2.18A6.56,6.56,0,0,1,468.58,93.77Zm-1.52,9.74a9.32,9.32,0,0,0,.9-4.12,7.39,7.39,0,0,0-.65-3.33,3.65,3.65,0,0,0-3.55-2,3.48,3.48,0,0,0-3.24,1.72,8,8,0,0,0-1,4.15,7,7,0,0,0,1,3.89,3.56,3.56,0,0,0,3.22,1.56A3.36,3.36,0,0,0,467.06,103.51Z"/><path class="cls-8" d="M475,102.36a3.47,3.47,0,0,0,.63,1.89,4,4,0,0,0,3.29,1.19,4.93,4.93,0,0,0,2.46-.6,2,2,0,0,0,1.06-1.84,1.55,1.55,0,0,0-.85-1.43,10.4,10.4,0,0,0-2.14-.7l-2-.49a9.78,9.78,0,0,1-2.8-1,3.1,3.1,0,0,1-1.62-2.76,4.21,4.21,0,0,1,1.52-3.37,6.13,6.13,0,0,1,4.08-1.28q3.36,0,4.84,1.94a4.17,4.17,0,0,1,.9,2.65h-2.33a2.72,2.72,0,0,0-.6-1.51,3.92,3.92,0,0,0-3-1,3.7,3.7,0,0,0-2.16.53,1.64,1.64,0,0,0-.73,1.4,1.72,1.72,0,0,0,1,1.53,5.66,5.66,0,0,0,1.65.6l1.65.4a12.83,12.83,0,0,1,3.63,1.24,3.31,3.31,0,0,1,1.43,3,4.48,4.48,0,0,1-1.5,3.37,6.45,6.45,0,0,1-4.58,1.43q-3.3,0-4.68-1.49a5.59,5.59,0,0,1-1.48-3.67Z"/><path class="cls-8" d="M488,88.22h2.49v4.09h2.34v2h-2.34v9.56a1,1,0,0,0,.52,1,2.19,2.19,0,0,0,.95.15h.39l.48,0v2a4.39,4.39,0,0,1-.89.18,7.52,7.52,0,0,1-1,.06,2.69,2.69,0,0,1-2.34-.88A3.94,3.94,0,0,1,488,104v-9.7h-2v-2h2Z"/><path class="cls-8" d="M503.47,92.9a6.78,6.78,0,0,1,1.41,1.39V92.45h2.27v13.32a10,10,0,0,1-.81,4.4c-1,2-2.94,3-5.77,3a7.09,7.09,0,0,1-4-1.06,4.1,4.1,0,0,1-1.8-3.32h2.5a2.74,2.74,0,0,0,.71,1.52,3.57,3.57,0,0,0,2.61.82c1.87,0,3.1-.66,3.68-2a11.37,11.37,0,0,0,.48-4.2,4.84,4.84,0,0,1-1.77,1.67,6,6,0,0,1-2.74.54,5.83,5.83,0,0,1-4.15-1.69q-1.77-1.68-1.77-5.58a8.43,8.43,0,0,1,1.79-5.74,5.51,5.51,0,0,1,4.32-2.07A5.38,5.38,0,0,1,503.47,92.9Zm.3,2.64a3.56,3.56,0,0,0-2.85-1.31,3.5,3.5,0,0,0-3.53,2.43,9.48,9.48,0,0,0-.51,3.4,6.12,6.12,0,0,0,1,3.77,3.24,3.24,0,0,0,2.69,1.29,3.75,3.75,0,0,0,3.71-2.39,7.71,7.71,0,0,0,.6-3.16A6.14,6.14,0,0,0,503.77,95.54Z"/><path class="cls-8" d="M511,92.31h2.33v2.53a5.91,5.91,0,0,1,1.41-1.8A3.69,3.69,0,0,1,517.3,92l.23,0,.56,0v2.6a2.08,2.08,0,0,0-.4-.05l-.41,0a3.48,3.48,0,0,0-2.85,1.2,4.14,4.14,0,0,0-1,2.75V107H511Z"/><path class="cls-8" d="M529.27,92.72a5.44,5.44,0,0,1,2.21,1.89,6.52,6.52,0,0,1,1,2.58,16.6,16.6,0,0,1,.22,3.23H522a6.34,6.34,0,0,0,1,3.59,3.49,3.49,0,0,0,3,1.35,3.9,3.9,0,0,0,3-1.28,4.37,4.37,0,0,0,.9-1.72h2.42a5,5,0,0,1-.63,1.8,6.34,6.34,0,0,1-1.21,1.62,5.71,5.71,0,0,1-2.75,1.48,8.65,8.65,0,0,1-2,.21,6.11,6.11,0,0,1-4.6-2,7.79,7.79,0,0,1-1.89-5.58,8.41,8.41,0,0,1,1.9-5.72,6.26,6.26,0,0,1,5-2.21A6.59,6.59,0,0,1,529.27,92.72Zm.88,5.74a6.46,6.46,0,0,0-.69-2.55,3.54,3.54,0,0,0-3.35-1.78,3.72,3.72,0,0,0-2.82,1.22,4.69,4.69,0,0,0-1.21,3.11Z"/><path class="cls-8" d="M537.9,100.47a5.6,5.6,0,0,0,.78,2.78q1.3,2,4.59,2a7.9,7.9,0,0,0,2.69-.44,3.09,3.09,0,0,0,2.34-3,2.64,2.64,0,0,0-1-2.33,9.55,9.55,0,0,0-3.15-1.19l-2.64-.62a11.41,11.41,0,0,1-3.65-1.33A4.23,4.23,0,0,1,536,92.54a5.86,5.86,0,0,1,1.83-4.44A7.16,7.16,0,0,1,543,86.37a8.75,8.75,0,0,1,5.22,1.52,5.57,5.57,0,0,1,2.15,4.87h-2.56a5.12,5.12,0,0,0-.84-2.47c-.79-1.05-2.14-1.57-4.05-1.57a4.51,4.51,0,0,0-3.31,1,3.2,3.2,0,0,0-1,2.35,2.33,2.33,0,0,0,1.19,2.16,16.76,16.76,0,0,0,3.54,1.09l2.73.65a8.15,8.15,0,0,1,3,1.27,4.81,4.81,0,0,1,1.86,4.09,5.14,5.14,0,0,1-2.37,4.77,10.46,10.46,0,0,1-5.5,1.43,8.07,8.07,0,0,1-5.72-1.91,6.57,6.57,0,0,1-2-5.16Z"/><path class="cls-8" d="M573.17,106.9l-1.36,1.65-3.11-2.36a11.33,11.33,0,0,1-2.43,1,10.29,10.29,0,0,1-2.85.37,9.18,9.18,0,0,1-7.32-3.06A11.71,11.71,0,0,1,553.76,97a11.9,11.9,0,0,1,2-7,8.78,8.78,0,0,1,7.69-3.72c3.54,0,6.17,1.14,7.87,3.42a11.08,11.08,0,0,1,2,6.82,14.28,14.28,0,0,1-.48,3.73,9.67,9.67,0,0,1-2.44,4.46ZM565.35,105a3.36,3.36,0,0,0,1.29-.47l-2.22-1.72,1.37-1.68,2.62,2A7.5,7.5,0,0,0,570.1,100a13.76,13.76,0,0,0,.45-3.39,8.48,8.48,0,0,0-1.85-5.7,6.35,6.35,0,0,0-5.07-2.17,6.6,6.6,0,0,0-5.15,2.08q-1.9,2.07-1.9,6.38A8.64,8.64,0,0,0,558.4,103a6.63,6.63,0,0,0,5.36,2.15A11.24,11.24,0,0,0,565.35,105Z"/><path class="cls-8" d="M576.58,86.87h2.72v17.69h10.08V107h-12.8Z"/><line class="cls-9" x1="219.17" y1="66.5" x2="384.17" y2="66.5"/></g></svg>
\ No newline at end of file
diff --git a/web/pgadmin/dashboard/static/scss/_dashboard.scss b/web/pgadmin/dashboard/static/scss/_dashboard.scss
index f0505e4a..eeac9c4f 100644
--- a/web/pgadmin/dashboard/static/scss/_dashboard.scss
+++ b/web/pgadmin/dashboard/static/scss/_dashboard.scss
@@ -41,3 +41,8 @@
border-radius: $card-border-radius;
border: $panel-border;
}
+
+.dashboard-link a {
+ cursor: pointer;
+ color: $color-fg-theme;
+}
diff --git a/web/pgadmin/dashboard/templates/dashboard/welcome_dashboard.html b/web/pgadmin/dashboard/templates/dashboard/welcome_dashboard.html
index 1401d8cd..cf358ace 100644
--- a/web/pgadmin/dashboard/templates/dashboard/welcome_dashboard.html
+++ b/web/pgadmin/dashboard/templates/dashboard/welcome_dashboard.html
@@ -5,8 +5,9 @@
<div class="card">
<div class="card-header">{{ _('Welcome') }}</div>
<div class="card-body p-2">
- <img src="{{ url_for('dashboard.static', filename='img/welcome_logo.png') }}"
- alt="{{ config.APP_NAME }} {{ _('logo') }}">
+ <img src="{{ url_for('dashboard.static', filename='img/welcome_logo.svg') }}"
+ alt="{{ config.APP_NAME }} {{ _('logo') }}"
+ width="400" height="100">
<h4>{{ _('Feature rich') }} | {{ _('Maximises PostgreSQL') }} | {{ _('Open Source') }} </h4>
<p>
{{ _('pgAdmin is an Open Source administration and management tool for the PostgreSQL database. It includes a graphical administration interface, an SQL query tool, a procedural code debugger and much more. The tool is designed to answer the needs of developers, DBAs and system administrators alike.') }}
diff --git a/web/pgadmin/misc/file_manager/static/css/file_manager.css b/web/pgadmin/misc/file_manager/static/css/file_manager.css
index 571e90e8..669bca71 100644
--- a/web/pgadmin/misc/file_manager/static/css/file_manager.css
+++ b/web/pgadmin/misc/file_manager/static/css/file_manager.css
@@ -31,10 +31,6 @@
margin: 50px auto;
}
-.fm_file {
- font-size: xx-large !important;
-}
-
.file_manager h1 {
font-size: medium;
}
@@ -72,7 +68,6 @@ x:-o-prefocus, .file-input-container {top:16px;width:198px;}
}
div.clip {
- height: 30px;
margin: 10px auto;
overflow: hidden;
}
diff --git a/web/pgadmin/misc/file_manager/static/js/utility.js b/web/pgadmin/misc/file_manager/static/js/utility.js
index 5e9eb2f0..927c4aa1 100644
--- a/web/pgadmin/misc/file_manager/static/js/utility.js
+++ b/web/pgadmin/misc/file_manager/static/js/utility.js
@@ -264,7 +264,7 @@ define([
}
if ($('.fileinfo').data('view') == 'grid') {
- $('.fileinfo span[data-alt="' + oldPath + '"]').parent().next('p span').text(newName);
+ $('.fileinfo span[data-alt="' + oldPath + '"]').parent().next('div span').text(newName);
$('.fileinfo span[data-alt="' + oldPath + '"]').attr('data-alt', newPath);
} else {
$('.fileinfo td[title="' + oldPath + '"]').text(newName);
@@ -537,7 +537,7 @@ define([
} else if ((data[key]).file_type == 'drive') {
class_type = 'fa fa-hdd-o fm_drive';
} else {
- class_type = 'fa fa-file-text fm_file';
+ class_type = 'fa fa-file-text-o fm_file_grid';
}
var fm_filename = (data[key]).Filename;
@@ -617,7 +617,7 @@ define([
icon_type = 'fa fa-hdd-o';
} else {
class_type = 'tbl_file';
- icon_type = 'fa fa-file-text';
+ icon_type = 'fa fa-file-text-o';
}
result += '<tr class="' + cap_classes + '">';
@@ -641,7 +641,7 @@ define([
} else {
result += '<div><input type="text" class="fm_file_rename"/>'+
'<div class="d-flex">' +
- '<span class="'+icon_type+'"></span>' +
+ '<span class="fm_file_list '+icon_type+'"></span>' +
data_protected +
'<span class="less_text ml-2" title="' + fm_filename + '">' + fm_filename + '</span>' +
'</div>' +
@@ -1582,32 +1582,32 @@ define([
folder_div =
'<li class=\'cap_download cap_delete cap_select_file cap_select_folder cap_rename cap_create cap_upload\'>' +
'<div class=\'clip\'><span data-alt=\'\' class=\'fa fa-folder-open fm_folder_grid\'></span></div>' +
- '<div><input type=\'text\' class=\'fm_file_rename\'><span title=\'\'>New_Folder</span></div>' +
+ '<div><input type=\'text\' class=\'fm_file_rename\'><span class="less_text" title=\'\'>New_Folder</span></div>' +
'<span class=\'meta size\'></span><span class=\'meta created\'></span><span class=\'meta modified\'></span></li>';
path = $('.currentpath').val();
$file_element = $(folder_div);
- $('.fileinfo #contents.grid').append($file_element);
- $file_element.find('p span').toggle();
- $file_element.find('p input').toggle().val(lg.new_folder).select();
+ $('.fileinfo #contents.grid').prepend($file_element);
+ $file_element.find('div span.less_text').toggle();
+ $file_element.find('div input').toggle().val(lg.new_folder).select();
// rename folder/file on pressing enter key
$('.file_manager').on('keyup', function(e) {
if (e.keyCode == 13) {
e.stopPropagation();
- $file_element.find('p input').trigger('blur');
+ $file_element.find('div input').trigger('blur');
}
});
// rename folder/file on blur
- $file_element.find('p input').on('blur', function() {
+ $file_element.find('div input').on('blur', function() {
$('.file_manager button.create').removeAttr('disabled');
- var text_value = $file_element.find('p input').val();
+ var text_value = $file_element.find('div input').val();
path = $('.currentpath').val();
- $file_element.find('p input').toggle();
- $file_element.find('p span').toggle().html(text_value);
+ $file_element.find('div input').toggle();
+ $file_element.find('div span.less_text').toggle().html(text_value);
if (text_value === undefined) {
text_value = lg.new_folder;
}
@@ -1620,9 +1620,9 @@ define([
folder_div = $(
'<tr class=\'cap_download cap_delete cap_select_file cap_select_folder cap_rename cap_create cap_upload\'>' +
'<td title=\'\' class=\' tbl_folder\'>' +
- '<input type=\'text\' class=\'fm_file_rename\'>'+
'<span class="fa fa-folder-open fm_folder_list"></span>' +
- '<span>' + lg.new_folder + '</span>' +
+ '<span class="less_text">' + lg.new_folder + '</span>' +
+ '<input type=\'text\' class=\'fm_file_rename\'>'+
'</td>'+
'<td><span title=\'\'></span></td>' +
'<td></td>' +
@@ -1630,25 +1630,25 @@ define([
);
$file_element_list = $(folder_div);
- $('.fileinfo #contents.list').prepend($file_element_list);
- $file_element_list.find('p span').toggle();
- $file_element_list.find('p input').toggle().val(lg.new_folder).select();
+ $('.fileinfo #contents.file_listing_table tbody').prepend($file_element_list);
+ $file_element_list.find('td span.less_text').toggle();
+ $file_element_list.find('td input').toggle().val(lg.new_folder).select();
// rename folder/file on pressing enter key
$('.file_manager').on('keyup', function(e) {
if (e.keyCode == 13) {
e.stopPropagation();
- $file_element_list.find('p input').trigger('blur');
+ $file_element_list.find('td input').trigger('blur');
}
});
// rename folder/file on blur
- $file_element_list.find('p input').on('blur', function() {
+ $file_element_list.find('td input').on('blur', function() {
$('.file_manager button.create').removeAttr('disabled');
- var text_value = $file_element_list.find('p input').val();
+ var text_value = $file_element_list.find('td input').val();
path = $('.currentpath').val();
- $file_element_list.find('p input').toggle();
- $file_element_list.find('p span').toggle().html(text_value);
+ $file_element_list.find('td input').toggle();
+ $file_element_list.find('td span.less_text').toggle().html(text_value);
if (text_value === undefined) {
text_value = lg.new_folder;
}
diff --git a/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss b/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
index 45bcfebb..3a77bfa1 100644
--- a/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
+++ b/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
@@ -93,13 +93,15 @@
}
}
-.fm_folder_grid {
+.fm_folder_grid, .fm_file_grid {
font-size: xx-large !important;
}
.fm_folder_list,
-.fm_folder_grid {
- color: $color-warning;
+.fm_folder_grid,
+.fm_file_grid,
+.fm_file_list {
+ color: $color-gray-darker;
}
.fm_drive {
@@ -365,4 +367,12 @@
.cap_select_file {
cursor: pointer;
+}
+
+.add-folder-icon {
+ position: relative;
+ top: -8px;
+ left: -6px;
+ font-size: 8px;
+ margin-right: -8px;
}
\ No newline at end of file
diff --git a/web/pgadmin/misc/file_manager/templates/file_manager/index.html b/web/pgadmin/misc/file_manager/templates/file_manager/index.html
index 86cf6fd6..f4186067 100644
--- a/web/pgadmin/misc/file_manager/templates/file_manager/index.html
+++ b/web/pgadmin/misc/file_manager/templates/file_manager/index.html
@@ -43,6 +43,7 @@
<button name="newfolder" type="button" title="{{ _('Create new folder') }}" value="New Folder"
class="btn btn-sm btn-secondary create" tabindex="8">
<span class="fa fa-folder-open sql-icon-lg"></span>
+ <span class="fa fa-plus add-folder-icon"></span>
</button>
<div class="btn-group" role="group">
<button class="ON btn btn-secondary btn-sm grid" type="button" title="{{ _('View as grid') }}" tabindex="9">
diff --git a/web/pgadmin/static/scss/_webcabin.pgadmin.scss b/web/pgadmin/static/scss/_webcabin.pgadmin.scss
index 55e35628..34b55a7b 100644
--- a/web/pgadmin/static/scss/_webcabin.pgadmin.scss
+++ b/web/pgadmin/static/scss/_webcabin.pgadmin.scss
@@ -47,7 +47,7 @@
}
.wcFrameButton .fa {
- margin: auto;
+ align-self: center;
}
.wcFrameButtonBar {
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 05:52 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 09:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
2019-01-03 10:20 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-03 15:09 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 04:51 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 09:23 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 09:58 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 10:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-07 05:14 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-07 08:54 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-07 09:47 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
@ 2019-01-14 05:24 ` Aditya Toshniwal <[email protected]>
2019-01-15 09:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-16 06:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
0 siblings, 2 replies; 29+ messages in thread
From: Aditya Toshniwal @ 2019-01-14 05:24 UTC (permalink / raw)
To: Dave Page <[email protected]>; +Cc: Akshay Joshi <[email protected]>; pgadmin-hackers <[email protected]>
Hi Hackers,
Attached is the patch for further design improvements:
- Process watcher made fixed width with header changes, time details
rounded to 2 decimals
- Query history will show "No query history" if no query fired. Query
editor default size increased.
- Tree improvements - right bold border removed completely. Now click
anywhere on a tree item to perform actions. Please note, single click on
the tiny tree arrow button will not work with this. Clicking anywhere is
more useful than this.
- Fixed a bug where New folder create button not working when in List mode
and No files/folder present.
- Other minor improvements.
Kindly review.
On Mon, Jan 7, 2019 at 3:17 PM Aditya Toshniwal <
[email protected]> wrote:
> Hi Hackers,
>
> Attached is the patch for few more changes:
> - New Folder button was not working in file dialogue. Fixed that.
> - Color, icon changes in file dialogue
> - Also replaced the splash screen image (which is used on main dashboard
> also). It works fine on dashboard. However, I'm not sure of the splash
> screen as the new image is SVG and older was PNG. I have made changes for
> that in runtime code but I'm not able to test (evnvironment issue) runtime
> code :(. It would be helpful if someone else can try it once.
>
> Kindly review.
>
>
> On Mon, Jan 7, 2019 at 2:25 PM Dave Page <[email protected]> wrote:
>
>> Thanks - applied!
>>
>> On Mon, Jan 7, 2019 at 10:44 AM Aditya Toshniwal
>> <[email protected]> wrote:
>> >
>> > Hi Hackers,
>> >
>> > Attached is the patch to incorporate the changes discussed in trailing
>> mail(s).
>> >
>> > Kindly review.
>> >
>> > On Fri, Jan 4, 2019 at 3:31 PM Dave Page <[email protected]> wrote:
>> >>
>> >> On Fri, Jan 4, 2019 at 9:58 AM Aditya Toshniwal
>> >> <[email protected]> wrote:
>> >> >
>> >> > Hi,
>> >> >
>> >> > On Fri, Jan 4, 2019 at 2:53 PM Dave Page <[email protected]> wrote:
>> >> >>
>> >> >> Hi
>> >> >>
>> >> >> On Fri, Jan 4, 2019 at 4:51 AM Aditya Toshniwal <
>> [email protected]> wrote:
>> >> >>>
>> >> >>> Hi Dave,
>> >> >>>
>> >> >>> On Thu, Jan 3, 2019 at 8:39 PM Dave Page <[email protected]>
>> wrote:
>> >> >>>>
>> >> >>>>
>> >> >>>> A few other things that I noticed (or have been bugging me):
>> >> >>>>
>> >> >>>> - The menu bar seems a little cramped. Taking pg-navbar from 32
>> to 40px and setting the font-weight to normal on the menu options (but not
>> the product name) seems much better to me (and adjusting everything else as
>> required of course).
>> >> >>>
>> >> >>> Giving too much space for the navbar will reduce the usable space
>> for other things. It is good enough(32) to be used easily, and is equal to
>> all the other headers in app (including tabs) giving a feel of native
>> desktop application. You'll find even smaller menu heights in native
>> desktop application. We can make font weight to normal and may be slightly
>> increase horizontal spacing between the menu links.
>> >> >>
>> >> >>
>> >> >> 8 pixels isn't going to make a noticeable difference to the
>> workspace for users, and would leave the bar smaller than the 50px it's
>> been for the last couple of years (iirc). I think it needs it to avoid
>> looking cramped - please make the change.
>> >> >
>> >> > Will do.
>> >> > One more doubt regarding bold headers, should I remove bold headers
>> in dashboard graph header, subnode headers (eg.table->columns), properties
>> tab accrordian headers ?
>> >>
>> >> No, please don't. I left them bold and the styling seemed like it
>> >> worked. We can tweak again if others disagree later.
>> >>
>> >> Thanks!
>> >>
>> >> BTW - Chrome 71 shows the offset headers in the file dialogue as well.
>> >>
>> >> >>>>
>> >> >>>> - In the file dialogue, the column headers don't line up with the
>> columns in the rows.
>> >> >>>
>> >> >>> I could not see this on my machine (screenshot attached). Could
>> you please share the screenshot.
>> >> >>
>> >> >>
>> >> >> Attached - thanks! This is Chrome 70.0.3538.102 on MacOS.
>> >> >>
>> >> >> --
>> >> >> Dave Page
>> >> >> Blog: http://pgsnake.blogspot.com
>> >> >> Twitter: @pgsnake
>> >> >>
>> >> >> EnterpriseDB UK: http://www.enterprisedb.com
>> >> >> The Enterprise PostgreSQL Company
>> >> >
>> >> >
>> >> >
>> >> > --
>> >> > Thanks and Regards,
>> >> > Aditya Toshniwal
>> >> > Software Engineer | EnterpriseDB Software Solutions | Pune
>> >> > "Don't Complain about Heat, Plant a tree"
>> >>
>> >>
>> >>
>> >> --
>> >> Dave Page
>> >> Blog: http://pgsnake.blogspot.com
>> >> Twitter: @pgsnake
>> >>
>> >> EnterpriseDB UK: http://www.enterprisedb.com
>> >> The Enterprise PostgreSQL Company
>> >
>> >
>> >
>> > --
>> > Thanks and Regards,
>> > Aditya Toshniwal
>> > Software Engineer | EnterpriseDB Software Solutions | Pune
>> > "Don't Complain about Heat, Plant a tree"
>>
>>
>>
>> --
>> Dave Page
>> Blog: http://pgsnake.blogspot.com
>> Twitter: @pgsnake
>>
>> EnterpriseDB UK: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>>
>
>
> --
> Thanks and Regards,
> Aditya Toshniwal
> Software Engineer | EnterpriseDB Software Solutions | Pune
> "Don't Complain about Heat, Plant a tree"
>
--
Thanks and Regards,
Aditya Toshniwal
Software Engineer | EnterpriseDB Software Solutions | Pune
"Don't Complain about Heat, Plant a tree"
Attachments:
[application/octet-stream] RM3692.part6.patch (27.1K, 3-RM3692.part6.patch)
download | inline diff:
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
index e90af570..6ac7a8a5 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
@@ -108,6 +108,7 @@ define('pgadmin.node.function', [
collection_type: 'coll-function',
hasSQL: true,
hasDepends: true,
+ width: pgBrowser.stdW.md + 'px',
hasStatistics: (treeInformation) => {
return treeInformation.server.server_type !== 'gpdb';
},
diff --git a/web/pgadmin/browser/static/css/wizard.css b/web/pgadmin/browser/static/css/wizard.css
index d293881f..a0c7dd53 100644
--- a/web/pgadmin/browser/static/css/wizard.css
+++ b/web/pgadmin/browser/static/css/wizard.css
@@ -1,7 +1,4 @@
/** CSS for Wizard **/
-.pgadmin_grant_wizard_body .ajs-content {
- padding: 0px !important;
-}
.wizard-header h3 {
font-size: 14px;
diff --git a/web/pgadmin/browser/templates/browser/index.html b/web/pgadmin/browser/templates/browser/index.html
index 89877f59..965ae5ce 100644
--- a/web/pgadmin/browser/templates/browser/index.html
+++ b/web/pgadmin/browser/templates/browser/index.html
@@ -96,7 +96,7 @@ window.onload = function(e){
<div class="row"><div class="col-12 pg-sp-text">{{ _('Loading {0} v{1}...').format(config.APP_NAME, config.APP_VERSION) }}</div></div>
</div>
</div>
-<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-primary pg-navbar">
+<nav class="navbar fixed-top navbar-expand-lg navbar-dark pg-navbar">
<a class="navbar-brand pgadmin_header_logo" onClick="return false;" href="{{ '#' }}"
title="{{ config.APP_NAME }} {{ _('logo') }}">
<i class="app-icon {{ config.APP_ICON }}"></i>
diff --git a/web/pgadmin/misc/bgprocess/processes.py b/web/pgadmin/misc/bgprocess/processes.py
index 8f00a4f7..1996bfa8 100644
--- a/web/pgadmin/misc/bgprocess/processes.py
+++ b/web/pgadmin/misc/bgprocess/processes.py
@@ -606,11 +606,13 @@ class BatchProcess(object):
for arg in args_reader:
args = args + arg
details = desc.details(p.command, args)
+ type_desc = desc.type_desc
desc = desc.message
res.append({
'id': p.pid,
'desc': desc,
+ 'type_desc': type_desc,
'details': details,
'stime': stime,
'etime': p.end_time,
@@ -627,13 +629,7 @@ class BatchProcess(object):
@staticmethod
def total_seconds(dt):
- # Keep backward compatibility with Python 2.6 which doesn't have
- # this method
- if hasattr(dt, 'total_seconds'):
- return dt.total_seconds()
- else:
- return (dt.microseconds + (dt.seconds + dt.days * 24 * 3600) *
- 10**6) / 10**6
+ return round(dt.total_seconds(), 2)
@staticmethod
def acknowledge(_pid):
diff --git a/web/pgadmin/misc/bgprocess/static/js/bgprocess.js b/web/pgadmin/misc/bgprocess/static/js/bgprocess.js
index c5ad5eb8..5a5446ad 100644
--- a/web/pgadmin/misc/bgprocess/static/js/bgprocess.js
+++ b/web/pgadmin/misc/bgprocess/static/js/bgprocess.js
@@ -41,7 +41,7 @@ define('misc.bgprocess', [
<div class="text-body mx-auto pg-bg-status-text"><%-status_text%></div>
</div>`),
failed_status_tpl: _.template(`
- <div class="d-flex px-2 py-1 bg-danger-light border border-danger rounded">
+ <div class="d-flex px-2 py-1 bg-danger-lighter border border-danger rounded">
<div class="pr-2">
<i class="fa fa-close fa-lg text-danger pg-bg-status-icon" aria-hidden="true"></i>
</div>
@@ -63,6 +63,7 @@ define('misc.bgprocess', [
completed: false,
id: info['id'],
+ type_desc: null,
desc: null,
detailed_desc: null,
stime: null,
@@ -145,6 +146,9 @@ define('misc.bgprocess', [
if ('execution_time' in data)
self.execution_time = parseFloat(data.execution_time);
+ if ('type_desc' in data)
+ self.type_desc = data.type_desc;
+
if ('desc' in data)
self.desc = data.desc;
@@ -288,12 +292,13 @@ define('misc.bgprocess', [
let content = $(`
<div class="card">
<div class="card-header bg-primary d-flex">
- <div>${_.unescape(self.desc)}</div>
+ <div>${_.escape(self.type_desc)}</div>
<div class="ml-auto">
<button class="btn btn-sm-sq btn-primary pg-bg-close"><i class="fa fa-lg fa-close"></i></button>
</div>
</div>
<div class="card-body px-2">
+ <div class="py-1">${_.unescape(self.desc)}</div>
<div class="py-1">${self.stime.toString()}</div>
<div class="d-flex py-1">
<div class="my-auto mr-2">
@@ -384,7 +389,7 @@ define('misc.bgprocess', [
panel = this.panel =
pgBrowser.BackgroundProcessObsorver.create_panel();
- panel.title('Process Watcher - ' + _.escape(self.desc));
+ panel.title('Process Watcher - ' + _.escape(self.type_desc));
panel.focus();
}
diff --git a/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss b/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss
index caf54f23..7821853e 100644
--- a/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss
+++ b/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss
@@ -6,6 +6,8 @@ $bgproc-container-pad: 2px;
padding: 0px !important;
text-align: left;
color: $color-fg-theme;
+ min-width: 500px;
+ max-width: 500px;
.card {
border:none;
& .card-header {
diff --git a/web/pgadmin/misc/file_manager/static/js/utility.js b/web/pgadmin/misc/file_manager/static/js/utility.js
index 2466b148..c714f154 100644
--- a/web/pgadmin/misc/file_manager/static/js/utility.js
+++ b/web/pgadmin/misc/file_manager/static/js/utility.js
@@ -670,12 +670,15 @@ define([
if ($('.fileinfo').data('view') == 'grid') {
result += '<ul id="contents" class="grid"></ul>';
} else {
- result += '<table id="contents" class="table table-bordered table-noouter-border table-empty-rows ablesorter">';
+ /* file_listing_table class makes height 100%, because of which No folder message is not displayed
+ * file_listing_table_no_data will be removed when new folder is created
+ */
+ result += '<table id="contents" class="table table-bordered table-noouter-border table-bottom-border table-hover tablesorter file_listing_table file_listing_table_no_data">';
result += '<thead><tr><th><span>' + lg.name + '</span></th>' +
'<th><span>' + lg.size + '</span></th>' +
'<th><span>' + lg.modified + '</span></th>' +
- '</tr></thead>';
- result += '</tbody>';
+ '</tr></thead>' +
+ '<tbody></tbody>';
result += '</table>';
}
result += '<div class="no_folder_found">' + lg.could_not_retrieve_folder + '</div>';
@@ -1576,6 +1579,7 @@ define([
$('.file_manager button.create').attr('disabled', 'disabled');
+ $('.no_folder_found').addClass('d-none');
if ($('.fileinfo').data('view') == 'grid') {
// template for creating new folder
@@ -1630,7 +1634,10 @@ define([
);
$file_element_list = $(folder_div);
- $('.fileinfo #contents.file_listing_table tbody').prepend($file_element_list);
+ let tableEl = $('.fileinfo #contents.file_listing_table');
+ tableEl.removeClass('file_listing_table_no_data');
+ tableEl.find('tbody').prepend($file_element_list);
+
$file_element_list.find('td span.less_text').toggle();
$file_element_list.find('td input').toggle().val(lg.new_folder).select();
diff --git a/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss b/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
index 3a77bfa1..ab48ff98 100644
--- a/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
+++ b/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
@@ -6,6 +6,10 @@
.file_listing {
min-width: 100%;
+ .file_listing_table_no_data {
+ height: unset !important;
+ }
+
.file_listing_table {
height: 100%;
display: block;
diff --git a/web/pgadmin/preferences/static/js/preferences.js b/web/pgadmin/preferences/static/js/preferences.js
index 33b7e747..c3385fac 100644
--- a/web/pgadmin/preferences/static/js/preferences.js
+++ b/web/pgadmin/preferences/static/js/preferences.js
@@ -329,6 +329,17 @@ define('pgadmin.preferences', [
if (!d)
return true;
+ /* Bind events to enable clicking anywhere and not only text, button */
+ item.on('dblclick', function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ api.toggle(item);
+ });
+ item.on('click', function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ api.select(item);
+ });
// We will add the preferences in to the preferences data
// collection.
if (d.preferences && _.isArray(d.preferences)) {
diff --git a/web/pgadmin/static/js/tree/tree.js b/web/pgadmin/static/js/tree/tree.js
index 782f4d59..09d238ba 100644
--- a/web/pgadmin/static/js/tree/tree.js
+++ b/web/pgadmin/static/js/tree/tree.js
@@ -124,10 +124,29 @@ export class Tree {
return this.aciTreeApi.selected();
}
+ toggleNode(aciTreeIdentifier) {
+ this.aciTreeApi.toggle(aciTreeIdentifier);
+ }
+
selectNode(aciTreeIdentifier) {
this.aciTreeApi.select(aciTreeIdentifier);
}
+ bindClickEvents(aciTreeIdentifier) {
+ /* Bind events to enable clicking anywhere and not only text, button */
+ aciTreeIdentifier.off('dblclick').on('dblclick', function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ this.toggleNode(aciTreeIdentifier);
+ }.bind(this));
+
+ aciTreeIdentifier.off('click').on('click', function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ this.selectNode(aciTreeIdentifier);
+ }.bind(this));
+ }
+
createOrUpdateNode(id, data, parent, domNode) {
let oldNodePath = [id];
if(parent !== null && parent !== undefined) {
@@ -140,6 +159,8 @@ export class Tree {
}
const node = new TreeNode(id, data, domNode, parent);
+ this.bindClickEvents(domNode);
+
if (parent === this.rootNode) {
node.parentNode = null;
}
diff --git a/web/pgadmin/static/jsx/history/query_history.jsx b/web/pgadmin/static/jsx/history/query_history.jsx
index b24639bb..cdbf7ae2 100644
--- a/web/pgadmin/static/jsx/history/query_history.jsx
+++ b/web/pgadmin/static/jsx/history/query_history.jsx
@@ -13,6 +13,7 @@ import React from 'react';
import ReactDOM from 'react-dom';
import SplitPane from 'react-split-pane';
import _ from 'underscore';
+import gettext from 'sources/gettext';
import QueryHistoryDetail from './query_history_detail';
import QueryHistoryEntries from './query_history_entries';
@@ -90,17 +91,23 @@ export default class QueryHistory extends React.Component {
}
render() {
- return (
- <SplitPane defaultSize='50%' split='vertical' pane1Style={queryEntryListDivStyle}
- pane2Style={queryDetailDivStyle}>
- <QueryHistoryEntries historyEntries={this.state.history}
- selectedEntry={this.state.selectedEntry}
- onSelectEntry={this.selectHistoryEntry}
- />
- <QueryHistoryDetail historyEntry={this.state.currentHistoryDetail}
- sqlEditorPref={this.props.sqlEditorPref}
- />
- </SplitPane>);
+ if(this.state.history.length == 0) {
+ return(
+ <div className="alert alert-info pg-panel-message">{gettext('No history found')}</div>
+ );
+ } else {
+ return (
+ <SplitPane defaultSize='50%' split='vertical' pane1Style={queryEntryListDivStyle}
+ pane2Style={queryDetailDivStyle}>
+ <QueryHistoryEntries historyEntries={this.state.history}
+ selectedEntry={this.state.selectedEntry}
+ onSelectEntry={this.selectHistoryEntry}
+ />
+ <QueryHistoryDetail historyEntry={this.state.currentHistoryDetail}
+ sqlEditorPref={this.props.sqlEditorPref}
+ />
+ </SplitPane>);
+ }
}
}
diff --git a/web/pgadmin/static/scss/_aci_tree.overrides.scss b/web/pgadmin/static/scss/_aci_tree.overrides.scss
index 70a0c916..c43aef96 100644
--- a/web/pgadmin/static/scss/_aci_tree.overrides.scss
+++ b/web/pgadmin/static/scss/_aci_tree.overrides.scss
@@ -1,22 +1,18 @@
.aciTree .aciTreeLi {
display: grid !important;
+ cursor: pointer;
}
.aciTree .aciTreeText {
font-family: $font-family-primary;
font-size: 0.815rem;
}
.aciTree.aciTreeFocus .aciTreeFocus > .aciTreeLine {
- background-color: $color-primary-light;
- border-right: $active-border;
+ background-color: $color-primary-light !important;
}
+
.aciTree .aciTreeSelected > .aciTreeLine {
- background-color: $color-primary-light;
- border-color: $color-primary-light;
- border-right: $active-border;
- border-left: none !important;
- border-top: none !important;
- border-bottom: none !important;
- -webkit-border-radius: none !important;
+ background-color: $color-primary-light !important;
+ -webkit-border-radius: none !important;
-moz-border-radius: none !important;
border-radius: none !important;
}
diff --git a/web/pgadmin/static/scss/_alert.scss b/web/pgadmin/static/scss/_alert.scss
index 4f59011d..e8676b8c 100644
--- a/web/pgadmin/static/scss/_alert.scss
+++ b/web/pgadmin/static/scss/_alert.scss
@@ -22,7 +22,7 @@
}
.alert.alert-info {
- padding: 15px;
+ padding: 0.5rem;
}
.success-icon {
@@ -48,7 +48,7 @@
.alert-info {
border-color: $color-primary;
background-color: $color-primary-light;
- color : $color-primary;
+ color : $color-fg-theme;
background-image: none;
}
diff --git a/web/pgadmin/static/scss/_alertify.overrides.scss b/web/pgadmin/static/scss/_alertify.overrides.scss
index 235c9fdb..5e488799 100644
--- a/web/pgadmin/static/scss/_alertify.overrides.scss
+++ b/web/pgadmin/static/scss/_alertify.overrides.scss
@@ -28,12 +28,13 @@
& .ajs-content {
top: $title-height;
}
- &.pgadmin_grant_wizard_body {
+ &.pgadmin-wizard-body {
border-top-left-radius: $panel-border-radius;
border-top-right-radius: $panel-border-radius;
& .ajs-content {
top: 0 !important;
border-radius: inherit;
+ padding: 0px;
}
}
}
@@ -221,4 +222,9 @@
.alertify .ajs-dimmer {
background-color: $loading-bg;
+}
+
+/* It sometimes is applied to dialog and blocks the dialog from editing */
+.alertify .ajs-dialog.ajs-capture:before {
+ display: none;
}
\ No newline at end of file
diff --git a/web/pgadmin/static/scss/_bootstrap.overrides.scss b/web/pgadmin/static/scss/_bootstrap.overrides.scss
index febe7ad7..2bd8b760 100644
--- a/web/pgadmin/static/scss/_bootstrap.overrides.scss
+++ b/web/pgadmin/static/scss/_bootstrap.overrides.scss
@@ -285,11 +285,12 @@ td.switch-cell > div.bootstrap-switch {
.navbar-brand {
color: $color-brand !important;
- background: $color-brand-bg !important;
+ background: $navbar-brand-bg !important;
margin-right: 0rem;
padding-left: 0.5rem !important;
padding-right: 1rem !important;
min-height: $navbar-height;
+ height: $navbar-height;
padding: 0rem;
display: flex;
align-items: center !important;
diff --git a/web/pgadmin/static/scss/_pgadmin.style.scss b/web/pgadmin/static/scss/_pgadmin.style.scss
index 1ad4b91f..ba636946 100644
--- a/web/pgadmin/static/scss/_pgadmin.style.scss
+++ b/web/pgadmin/static/scss/_pgadmin.style.scss
@@ -155,6 +155,7 @@
.pg-navbar {
font-size: $navbar-font-size;
+ background-color: $navbar-color-bg;
padding-left: 0rem;
padding-right: 0.5rem;
& .nav-item .nav-link{
@@ -162,7 +163,7 @@
}
.pg-navbar-brand-arrow {
- border: $navbar-height/2 solid $color-fg;
+ border: $navbar-height/2 solid $navbar-brand-arrow-bg;
border-right-color: transparent;
border-bottom-color: transparent;
border-top-color: transparent;
diff --git a/web/pgadmin/static/scss/_webcabin.pgadmin.scss b/web/pgadmin/static/scss/_webcabin.pgadmin.scss
index 34b55a7b..4fd92cdb 100644
--- a/web/pgadmin/static/scss/_webcabin.pgadmin.scss
+++ b/web/pgadmin/static/scss/_webcabin.pgadmin.scss
@@ -63,6 +63,10 @@
}
+.wcLayout {
+ display: block;
+}
+
.wcLayoutGrid, .wcLayoutGrid tr, .wcLayoutGrid td {
border: 1px solid $panel-border-color;
}
diff --git a/web/pgadmin/static/scss/resources/_default.variables.scss b/web/pgadmin/static/scss/resources/_default.variables.scss
index 5aa65333..cf9673af 100644
--- a/web/pgadmin/static/scss/resources/_default.variables.scss
+++ b/web/pgadmin/static/scss/resources/_default.variables.scss
@@ -37,7 +37,6 @@ $color-gray-light: #ebeef3;
$color-gray-lighter: #f3f5f9;
$color-brand: $white !default;
-$color-brand-bg: #222222;
$color-editor-bg: $color-bg !default;
$color-editor-keyword: #908 !default;
@@ -68,6 +67,7 @@ $border-radius: 0.25rem; //no change
$text-color: $color-fg-theme;
$text-muted: $color-gray-dark;
+
$navbar-dark-color: #fff;
$navbar-dark-hover-color: #fff;
$navbar-dark-active-color: #fff;
@@ -153,6 +153,10 @@ $title-height: ($line-height-base*16px) + 5px + 2px + $border-width;
$footer-padding: 0.5rem;
$footer-min-height: 2rem;
$footer-height-calc: $footer-min-height+$footer-padding*2;
+
+$navbar-brand-bg: #222222; //place image url if image
+$navbar-brand-arrow-bg: #222222;
+$navbar-color-bg: $color-primary;
$navbar-font-size: 0.925rem;
$navbar-user-font-size: 0.875rem;
diff --git a/web/pgadmin/tools/backup/__init__.py b/web/pgadmin/tools/backup/__init__.py
index 60bfd5bf..e70eaeda 100644
--- a/web/pgadmin/tools/backup/__init__.py
+++ b/web/pgadmin/tools/backup/__init__.py
@@ -125,6 +125,18 @@ class BackupMessage(IProcessDesc):
return s.name, host, port
+ @property
+ def type_desc(self):
+ if self.backup_type == BACKUP.OBJECT:
+ return _("Backing up an object on the server")
+ if self.backup_type == BACKUP.GLOBALS:
+ return _("Backing up the global objects")
+ elif self.backup_type == BACKUP.SERVER:
+ return _("Backing up the server")
+ else:
+ # It should never reach here.
+ return _("Unknown Backup")
+
@property
def message(self):
name, host, port = self.get_server_details()
@@ -132,7 +144,7 @@ class BackupMessage(IProcessDesc):
if self.backup_type == BACKUP.OBJECT:
return _(
"Backing up an object on the server '{0}' "
- "from database '{1}'..."
+ "from database '{1}'"
).format(
"{0} ({1}:{2})".format(
name, host, port
@@ -141,13 +153,13 @@ class BackupMessage(IProcessDesc):
)
if self.backup_type == BACKUP.GLOBALS:
return _("Backing up the global objects on "
- "the server '{0}'...").format(
+ "the server '{0}'").format(
"{0} ({1}:{2})".format(
name, host, port
)
)
elif self.backup_type == BACKUP.SERVER:
- return _("Backing up the server '{0}'...").format(
+ return _("Backing up the server '{0}'").format(
"{0} ({1}:{2})".format(
name, host, port
)
diff --git a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
index 52806bbf..52ee5011 100644
--- a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
+++ b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
@@ -218,14 +218,6 @@ define([
},
};
},
- hooks: {
- onshow: function() {
-
- // Add pgadmin_grant_wizard_body class to dialog
- $(this.elements.body).addClass('pgadmin_grant_wizard_body');
- },
- },
-
/**
Returns a Paginator Class Object which is again to be rendered
@@ -409,6 +401,7 @@ define([
*/
build: function() {
this.elements.content.appendChild($container.get(0));
+ $(this.elements.body).addClass('pgadmin-wizard-body');
Alertify.pgDialogBuild.apply(this);
},
diff --git a/web/pgadmin/tools/import_export/__init__.py b/web/pgadmin/tools/import_export/__init__.py
index 3a874660..4e9b2d0a 100644
--- a/web/pgadmin/tools/import_export/__init__.py
+++ b/web/pgadmin/tools/import_export/__init__.py
@@ -114,11 +114,15 @@ class IEMessage(IProcessDesc):
return _(
"Copying table data '{0}.{1}' on database '{2}' "
- "and server ({3}:{4})..."
+ "and server ({3}:{4})"
).format(
self.schema, self.table, self.database, s.host, s.port
)
+ @property
+ def type_desc(self):
+ return _("Copying table data")
+
def details(self, cmd, args):
# Fetch the server details like hostname, port, roles etc
s = Server.query.filter_by(
@@ -128,7 +132,7 @@ class IEMessage(IProcessDesc):
res = '<div>'
res += _(
"Copying table data '{0}.{1}' on database '{2}' "
- "for the server '{3}'..."
+ "for the server '{3}'"
).format(
html.safe_str(self.schema),
html.safe_str(self.table),
@@ -140,11 +144,11 @@ class IEMessage(IProcessDesc):
)
)
- res += '</div><div>'
+ res += '</div><div class="py-1">'
res += _("Running command:")
- res += '</b><br><span class="pg-bg-cmd enable-selection">'
+ res += '<div class="pg-bg-cmd enable-selection p-1">'
res += html.safe_str(self._cmd)
- res += '</span></div>'
+ res += '</div></div>'
return res
diff --git a/web/pgadmin/tools/maintenance/__init__.py b/web/pgadmin/tools/maintenance/__init__.py
index 6ae0159e..5d362f9e 100644
--- a/web/pgadmin/tools/maintenance/__init__.py
+++ b/web/pgadmin/tools/maintenance/__init__.py
@@ -93,6 +93,10 @@ class Message(IProcessDesc):
if self.data['op'] == "CLUSTER":
return res.format(_('Cluster'))
+ @property
+ def type_desc(self):
+ return _("Maintenance")
+
def details(self, cmd, args):
res = None
diff --git a/web/pgadmin/tools/sqleditor/static/css/sqleditor.css b/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
index 91c515f4..337c6582 100644
--- a/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
+++ b/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
@@ -14,10 +14,6 @@
bottom: 0;
}
-#editor-panel {
- z-index: 0;
-}
-
.sql-editor-grid-container {
height: 100%;
overflow: auto;
@@ -55,12 +51,6 @@
max-width: 35px !important;
min-width: 35px !important;
}
-
-.sql-editor-history-container {
- height: 100%;
- overflow: auto;
-}
-
.sql-status-cell {
max-width: 30px;
}
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
index 7ff3dc0b..63278df3 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -185,7 +185,7 @@ define('tools.querytool', [
name: 'sql_panel',
title: gettext('Query Editor'),
width: '100%',
- height: '20%',
+ height: '50%',
isCloseable: false,
isPrivate: true,
});
diff --git a/web/pgadmin/tools/sqleditor/static/scss/_history.scss b/web/pgadmin/tools/sqleditor/static/scss/_history.scss
index 01dd0c18..03024f03 100644
--- a/web/pgadmin/tools/sqleditor/static/scss/_history.scss
+++ b/web/pgadmin/tools/sqleditor/static/scss/_history.scss
@@ -2,6 +2,7 @@
height: 100%;
.list-item {
border-bottom: $panel-border;
+ background-color: $color-bg-theme;
}
.entry {
@@ -76,11 +77,19 @@
display: block;
}
+
+.sql-editor-history-container {
+ height: 100%;
+ overflow: auto;
+ background-color: $negative-bg;
+}
+
+
.query-detail {
width: 100%;
display: flex;
flex-direction: column;
-
+ background-color: $color-bg-theme;
.error-message-block {
background: $sql-history-error-bg;
flex: 0.3;
diff --git a/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss b/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
index a1cac04d..d017e667 100644
--- a/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
+++ b/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
@@ -18,6 +18,14 @@
z-index: 0;
}
+
+.editor-title {
+ padding: $sql-title-padding;
+ background: $sql-title-bg;
+ color: $sql-title-fg;
+}
+
+
#editor-panel {
z-index: 0;
position: absolute;
@@ -209,6 +217,7 @@ li.CodeMirror-hint-active {
/* color the first column */
#datagrid .slick-row .slick-cell.l0.r0.selected {
background-color: $color-primary;
+ color: $color-primary-fg;
}
#datagrid .slick-row > .slick-cell:not(.l0):not(.r0).selected {
@@ -233,12 +242,6 @@ li.CodeMirror-hint-active {
box-shadow: $dropdown-box-shadow;
}
-.editor-title {
- padding: $sql-title-padding;
- background: $sql-title-bg;
- color: $sql-title-fg;
-}
-
.pg_text_editor textarea {
resize: both;
}
diff --git a/web/regression/javascript/history/query_history_spec.jsx b/web/regression/javascript/history/query_history_spec.jsx
index 0b179f4f..7def2e43 100644
--- a/web/regression/javascript/history/query_history_spec.jsx
+++ b/web/regression/javascript/history/query_history_spec.jsx
@@ -61,7 +61,7 @@ describe('QueryHistory', () => {
it('nothing is displayed in the history details panel', (done) => {
let foundChildren = historyWrapper.find(QueryHistoryDetail);
- expect(foundChildren.length).toBe(1);
+ expect(foundChildren.length).toBe(0);
done();
});
});
diff --git a/web/regression/javascript/tree/tree_fake.js b/web/regression/javascript/tree/tree_fake.js
index fc94d3f1..437d5378 100644
--- a/web/regression/javascript/tree/tree_fake.js
+++ b/web/regression/javascript/tree/tree_fake.js
@@ -43,6 +43,10 @@ export class TreeFake extends Tree {
['ACITreeApi'], ['setInode', 'unload', 'deselect', 'select']);
}
+ bindClickEvents(domNode) {
+ return domNode;
+ }
+
addNewNode(id, data, domNode, path) {
this.aciTreeToOurTreeTranslator[id] = [id];
if (path !== null && path !== undefined) {
diff --git a/web/regression/javascript/tree/tree_spec.js b/web/regression/javascript/tree/tree_spec.js
index 531525a6..21593824 100644
--- a/web/regression/javascript/tree/tree_spec.js
+++ b/web/regression/javascript/tree/tree_spec.js
@@ -16,6 +16,7 @@ const treeTests = (treeClass, setDefaultCallBack) => {
let tree;
beforeEach(() => {
tree = new treeClass();
+ spyOn(tree, 'bindClickEvents');
});
describe('#addNewNode', () => {
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 05:52 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 09:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
2019-01-03 10:20 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-03 15:09 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 04:51 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 09:23 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 09:58 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 10:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-07 05:14 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-07 08:54 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-07 09:47 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-14 05:24 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
@ 2019-01-15 09:13 ` Aditya Toshniwal <[email protected]>
1 sibling, 0 replies; 29+ messages in thread
From: Aditya Toshniwal @ 2019-01-15 09:13 UTC (permalink / raw)
To: Dave Page <[email protected]>; +Cc: Akshay Joshi <[email protected]>; pgadmin-hackers <[email protected]>
Hi Hackers,
Please find the updated, rebased patch.
Kindly review.
On Mon, Jan 14, 2019 at 10:54 AM Aditya Toshniwal <
[email protected]> wrote:
> Hi Hackers,
>
> Attached is the patch for further design improvements:
> - Process watcher made fixed width with header changes, time details
> rounded to 2 decimals
> - Query history will show "No query history" if no query fired. Query
> editor default size increased.
> - Tree improvements - right bold border removed completely. Now click
> anywhere on a tree item to perform actions. Please note, single click on
> the tiny tree arrow button will not work with this. Clicking anywhere is
> more useful than this.
> - Fixed a bug where New folder create button not working when in List mode
> and No files/folder present.
> - Other minor improvements.
>
> Kindly review.
>
> On Mon, Jan 7, 2019 at 3:17 PM Aditya Toshniwal <
> [email protected]> wrote:
>
>> Hi Hackers,
>>
>> Attached is the patch for few more changes:
>> - New Folder button was not working in file dialogue. Fixed that.
>> - Color, icon changes in file dialogue
>> - Also replaced the splash screen image (which is used on main dashboard
>> also). It works fine on dashboard. However, I'm not sure of the splash
>> screen as the new image is SVG and older was PNG. I have made changes for
>> that in runtime code but I'm not able to test (evnvironment issue) runtime
>> code :(. It would be helpful if someone else can try it once.
>>
>> Kindly review.
>>
>>
>> On Mon, Jan 7, 2019 at 2:25 PM Dave Page <[email protected]> wrote:
>>
>>> Thanks - applied!
>>>
>>> On Mon, Jan 7, 2019 at 10:44 AM Aditya Toshniwal
>>> <[email protected]> wrote:
>>> >
>>> > Hi Hackers,
>>> >
>>> > Attached is the patch to incorporate the changes discussed in trailing
>>> mail(s).
>>> >
>>> > Kindly review.
>>> >
>>> > On Fri, Jan 4, 2019 at 3:31 PM Dave Page <[email protected]> wrote:
>>> >>
>>> >> On Fri, Jan 4, 2019 at 9:58 AM Aditya Toshniwal
>>> >> <[email protected]> wrote:
>>> >> >
>>> >> > Hi,
>>> >> >
>>> >> > On Fri, Jan 4, 2019 at 2:53 PM Dave Page <[email protected]> wrote:
>>> >> >>
>>> >> >> Hi
>>> >> >>
>>> >> >> On Fri, Jan 4, 2019 at 4:51 AM Aditya Toshniwal <
>>> [email protected]> wrote:
>>> >> >>>
>>> >> >>> Hi Dave,
>>> >> >>>
>>> >> >>> On Thu, Jan 3, 2019 at 8:39 PM Dave Page <[email protected]>
>>> wrote:
>>> >> >>>>
>>> >> >>>>
>>> >> >>>> A few other things that I noticed (or have been bugging me):
>>> >> >>>>
>>> >> >>>> - The menu bar seems a little cramped. Taking pg-navbar from 32
>>> to 40px and setting the font-weight to normal on the menu options (but not
>>> the product name) seems much better to me (and adjusting everything else as
>>> required of course).
>>> >> >>>
>>> >> >>> Giving too much space for the navbar will reduce the usable space
>>> for other things. It is good enough(32) to be used easily, and is equal to
>>> all the other headers in app (including tabs) giving a feel of native
>>> desktop application. You'll find even smaller menu heights in native
>>> desktop application. We can make font weight to normal and may be slightly
>>> increase horizontal spacing between the menu links.
>>> >> >>
>>> >> >>
>>> >> >> 8 pixels isn't going to make a noticeable difference to the
>>> workspace for users, and would leave the bar smaller than the 50px it's
>>> been for the last couple of years (iirc). I think it needs it to avoid
>>> looking cramped - please make the change.
>>> >> >
>>> >> > Will do.
>>> >> > One more doubt regarding bold headers, should I remove bold headers
>>> in dashboard graph header, subnode headers (eg.table->columns), properties
>>> tab accrordian headers ?
>>> >>
>>> >> No, please don't. I left them bold and the styling seemed like it
>>> >> worked. We can tweak again if others disagree later.
>>> >>
>>> >> Thanks!
>>> >>
>>> >> BTW - Chrome 71 shows the offset headers in the file dialogue as well.
>>> >>
>>> >> >>>>
>>> >> >>>> - In the file dialogue, the column headers don't line up with
>>> the columns in the rows.
>>> >> >>>
>>> >> >>> I could not see this on my machine (screenshot attached). Could
>>> you please share the screenshot.
>>> >> >>
>>> >> >>
>>> >> >> Attached - thanks! This is Chrome 70.0.3538.102 on MacOS.
>>> >> >>
>>> >> >> --
>>> >> >> Dave Page
>>> >> >> Blog: http://pgsnake.blogspot.com
>>> >> >> Twitter: @pgsnake
>>> >> >>
>>> >> >> EnterpriseDB UK: http://www.enterprisedb.com
>>> >> >> The Enterprise PostgreSQL Company
>>> >> >
>>> >> >
>>> >> >
>>> >> > --
>>> >> > Thanks and Regards,
>>> >> > Aditya Toshniwal
>>> >> > Software Engineer | EnterpriseDB Software Solutions | Pune
>>> >> > "Don't Complain about Heat, Plant a tree"
>>> >>
>>> >>
>>> >>
>>> >> --
>>> >> Dave Page
>>> >> Blog: http://pgsnake.blogspot.com
>>> >> Twitter: @pgsnake
>>> >>
>>> >> EnterpriseDB UK: http://www.enterprisedb.com
>>> >> The Enterprise PostgreSQL Company
>>> >
>>> >
>>> >
>>> > --
>>> > Thanks and Regards,
>>> > Aditya Toshniwal
>>> > Software Engineer | EnterpriseDB Software Solutions | Pune
>>> > "Don't Complain about Heat, Plant a tree"
>>>
>>>
>>>
>>> --
>>> Dave Page
>>> Blog: http://pgsnake.blogspot.com
>>> Twitter: @pgsnake
>>>
>>> EnterpriseDB UK: http://www.enterprisedb.com
>>> The Enterprise PostgreSQL Company
>>>
>>
>>
>> --
>> Thanks and Regards,
>> Aditya Toshniwal
>> Software Engineer | EnterpriseDB Software Solutions | Pune
>> "Don't Complain about Heat, Plant a tree"
>>
>
>
> --
> Thanks and Regards,
> Aditya Toshniwal
> Software Engineer | EnterpriseDB Software Solutions | Pune
> "Don't Complain about Heat, Plant a tree"
>
--
Thanks and Regards,
Aditya Toshniwal
Software Engineer | EnterpriseDB Software Solutions | Pune
"Don't Complain about Heat, Plant a tree"
Attachments:
[application/octet-stream] RM3692.part6.patch (31.2K, 3-RM3692.part6.patch)
download | inline diff:
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
index e90af570..6ac7a8a5 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
@@ -108,6 +108,7 @@ define('pgadmin.node.function', [
collection_type: 'coll-function',
hasSQL: true,
hasDepends: true,
+ width: pgBrowser.stdW.md + 'px',
hasStatistics: (treeInformation) => {
return treeInformation.server.server_type !== 'gpdb';
},
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js
index 4cc48012..6623aafd 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js
@@ -348,7 +348,7 @@ define('pgadmin.node.type', [
id: 'typtype', label: gettext('Type'),
mode: ['create','edit'], disabled: 'inSchemaWithModelCheck',
group: gettext('Definition'),
- select2: { width: '50%', allowClear: false },
+ select2: { allowClear: false },
options: function() {
return [
{label: 'Composite', value: 'c'},
@@ -553,11 +553,13 @@ define('pgadmin.node.type', [
},{
type: 'nested', control: 'tab', group: gettext('Definition'),
label: gettext('External Type'), deps: ['typtype'],
- mode: ['create', 'edit'],
+ mode: ['create', 'edit'], tabPanelExtraClasses:'inline-tab-panel-padded',
visible: function(m) {
return m.get('typtype') === 'b';
},
schema:[{
+ id: 'spacer_ctrl', group: gettext('Required'), mode: ['edit', 'create'], type: 'spacer',
+ },{
id: 'typinput', label: gettext('Input function'),
cell: 'string',type: 'text',
mode: ['properties', 'create', 'edit'], group: gettext('Required'),
@@ -574,6 +576,8 @@ define('pgadmin.node.type', [
,control: 'node-ajax-options', url: 'get_external_functions',
transform: 'external_func_combo',
select2: { allowClear: true, placeholder: '', width: '100%' },
+ },{
+ id: 'spacer_ctrl_optional_1', group: gettext('Optional-1'), mode: ['edit', 'create'], type: 'spacer',
},{
id: 'typreceive', label: gettext('Receive function'),
cell: 'string', type: 'text', group: gettext('Optional-1'),
@@ -675,6 +679,8 @@ define('pgadmin.node.type', [
type: 'switch', mode: ['properties', 'create','edit'],
disabled: 'inSchemaWithModelCheck',
group: gettext('Optional-1'),
+ },{
+ id: 'spacer_ctrl_optional_2', group: gettext('Optional-2'), mode: ['edit', 'create'], type: 'spacer',
},{
id: 'element', label: gettext('Element type'), cell: 'string',
control: 'node-ajax-options', group: gettext('Optional-2'),
diff --git a/web/pgadmin/browser/static/css/wizard.css b/web/pgadmin/browser/static/css/wizard.css
index 29641bc1..a4a7d73f 100644
--- a/web/pgadmin/browser/static/css/wizard.css
+++ b/web/pgadmin/browser/static/css/wizard.css
@@ -1,7 +1,4 @@
/** CSS for Wizard **/
-.pgadmin_grant_wizard_body .ajs-content {
- padding: 0px !important;
-}
.wizard-header h3 {
font-size: 14px;
diff --git a/web/pgadmin/browser/templates/browser/index.html b/web/pgadmin/browser/templates/browser/index.html
index 89877f59..965ae5ce 100644
--- a/web/pgadmin/browser/templates/browser/index.html
+++ b/web/pgadmin/browser/templates/browser/index.html
@@ -96,7 +96,7 @@ window.onload = function(e){
<div class="row"><div class="col-12 pg-sp-text">{{ _('Loading {0} v{1}...').format(config.APP_NAME, config.APP_VERSION) }}</div></div>
</div>
</div>
-<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-primary pg-navbar">
+<nav class="navbar fixed-top navbar-expand-lg navbar-dark pg-navbar">
<a class="navbar-brand pgadmin_header_logo" onClick="return false;" href="{{ '#' }}"
title="{{ config.APP_NAME }} {{ _('logo') }}">
<i class="app-icon {{ config.APP_ICON }}"></i>
diff --git a/web/pgadmin/misc/bgprocess/processes.py b/web/pgadmin/misc/bgprocess/processes.py
index 8f00a4f7..1996bfa8 100644
--- a/web/pgadmin/misc/bgprocess/processes.py
+++ b/web/pgadmin/misc/bgprocess/processes.py
@@ -606,11 +606,13 @@ class BatchProcess(object):
for arg in args_reader:
args = args + arg
details = desc.details(p.command, args)
+ type_desc = desc.type_desc
desc = desc.message
res.append({
'id': p.pid,
'desc': desc,
+ 'type_desc': type_desc,
'details': details,
'stime': stime,
'etime': p.end_time,
@@ -627,13 +629,7 @@ class BatchProcess(object):
@staticmethod
def total_seconds(dt):
- # Keep backward compatibility with Python 2.6 which doesn't have
- # this method
- if hasattr(dt, 'total_seconds'):
- return dt.total_seconds()
- else:
- return (dt.microseconds + (dt.seconds + dt.days * 24 * 3600) *
- 10**6) / 10**6
+ return round(dt.total_seconds(), 2)
@staticmethod
def acknowledge(_pid):
diff --git a/web/pgadmin/misc/bgprocess/static/js/bgprocess.js b/web/pgadmin/misc/bgprocess/static/js/bgprocess.js
index c5ad5eb8..5a5446ad 100644
--- a/web/pgadmin/misc/bgprocess/static/js/bgprocess.js
+++ b/web/pgadmin/misc/bgprocess/static/js/bgprocess.js
@@ -41,7 +41,7 @@ define('misc.bgprocess', [
<div class="text-body mx-auto pg-bg-status-text"><%-status_text%></div>
</div>`),
failed_status_tpl: _.template(`
- <div class="d-flex px-2 py-1 bg-danger-light border border-danger rounded">
+ <div class="d-flex px-2 py-1 bg-danger-lighter border border-danger rounded">
<div class="pr-2">
<i class="fa fa-close fa-lg text-danger pg-bg-status-icon" aria-hidden="true"></i>
</div>
@@ -63,6 +63,7 @@ define('misc.bgprocess', [
completed: false,
id: info['id'],
+ type_desc: null,
desc: null,
detailed_desc: null,
stime: null,
@@ -145,6 +146,9 @@ define('misc.bgprocess', [
if ('execution_time' in data)
self.execution_time = parseFloat(data.execution_time);
+ if ('type_desc' in data)
+ self.type_desc = data.type_desc;
+
if ('desc' in data)
self.desc = data.desc;
@@ -288,12 +292,13 @@ define('misc.bgprocess', [
let content = $(`
<div class="card">
<div class="card-header bg-primary d-flex">
- <div>${_.unescape(self.desc)}</div>
+ <div>${_.escape(self.type_desc)}</div>
<div class="ml-auto">
<button class="btn btn-sm-sq btn-primary pg-bg-close"><i class="fa fa-lg fa-close"></i></button>
</div>
</div>
<div class="card-body px-2">
+ <div class="py-1">${_.unescape(self.desc)}</div>
<div class="py-1">${self.stime.toString()}</div>
<div class="d-flex py-1">
<div class="my-auto mr-2">
@@ -384,7 +389,7 @@ define('misc.bgprocess', [
panel = this.panel =
pgBrowser.BackgroundProcessObsorver.create_panel();
- panel.title('Process Watcher - ' + _.escape(self.desc));
+ panel.title('Process Watcher - ' + _.escape(self.type_desc));
panel.focus();
}
diff --git a/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss b/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss
index caf54f23..7821853e 100644
--- a/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss
+++ b/web/pgadmin/misc/bgprocess/static/scss/_bgprocess.scss
@@ -6,6 +6,8 @@ $bgproc-container-pad: 2px;
padding: 0px !important;
text-align: left;
color: $color-fg-theme;
+ min-width: 500px;
+ max-width: 500px;
.card {
border:none;
& .card-header {
diff --git a/web/pgadmin/misc/file_manager/static/js/utility.js b/web/pgadmin/misc/file_manager/static/js/utility.js
index 2466b148..c714f154 100644
--- a/web/pgadmin/misc/file_manager/static/js/utility.js
+++ b/web/pgadmin/misc/file_manager/static/js/utility.js
@@ -670,12 +670,15 @@ define([
if ($('.fileinfo').data('view') == 'grid') {
result += '<ul id="contents" class="grid"></ul>';
} else {
- result += '<table id="contents" class="table table-bordered table-noouter-border table-empty-rows ablesorter">';
+ /* file_listing_table class makes height 100%, because of which No folder message is not displayed
+ * file_listing_table_no_data will be removed when new folder is created
+ */
+ result += '<table id="contents" class="table table-bordered table-noouter-border table-bottom-border table-hover tablesorter file_listing_table file_listing_table_no_data">';
result += '<thead><tr><th><span>' + lg.name + '</span></th>' +
'<th><span>' + lg.size + '</span></th>' +
'<th><span>' + lg.modified + '</span></th>' +
- '</tr></thead>';
- result += '</tbody>';
+ '</tr></thead>' +
+ '<tbody></tbody>';
result += '</table>';
}
result += '<div class="no_folder_found">' + lg.could_not_retrieve_folder + '</div>';
@@ -1576,6 +1579,7 @@ define([
$('.file_manager button.create').attr('disabled', 'disabled');
+ $('.no_folder_found').addClass('d-none');
if ($('.fileinfo').data('view') == 'grid') {
// template for creating new folder
@@ -1630,7 +1634,10 @@ define([
);
$file_element_list = $(folder_div);
- $('.fileinfo #contents.file_listing_table tbody').prepend($file_element_list);
+ let tableEl = $('.fileinfo #contents.file_listing_table');
+ tableEl.removeClass('file_listing_table_no_data');
+ tableEl.find('tbody').prepend($file_element_list);
+
$file_element_list.find('td span.less_text').toggle();
$file_element_list.find('td input').toggle().val(lg.new_folder).select();
diff --git a/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss b/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
index 3a77bfa1..ab48ff98 100644
--- a/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
+++ b/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
@@ -6,6 +6,10 @@
.file_listing {
min-width: 100%;
+ .file_listing_table_no_data {
+ height: unset !important;
+ }
+
.file_listing_table {
height: 100%;
display: block;
diff --git a/web/pgadmin/preferences/static/js/preferences.js b/web/pgadmin/preferences/static/js/preferences.js
index 33b7e747..c3385fac 100644
--- a/web/pgadmin/preferences/static/js/preferences.js
+++ b/web/pgadmin/preferences/static/js/preferences.js
@@ -329,6 +329,17 @@ define('pgadmin.preferences', [
if (!d)
return true;
+ /* Bind events to enable clicking anywhere and not only text, button */
+ item.on('dblclick', function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ api.toggle(item);
+ });
+ item.on('click', function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ api.select(item);
+ });
// We will add the preferences in to the preferences data
// collection.
if (d.preferences && _.isArray(d.preferences)) {
diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js
index 246b30b7..7da721a9 100644
--- a/web/pgadmin/static/js/backform.pgadmin.js
+++ b/web/pgadmin/static/js/backform.pgadmin.js
@@ -2112,11 +2112,16 @@ define([
tagName: 'div',
className: 'inline-tab-panel',
tabPanelClassName: 'inline-tab-panel',
+ tabPanelExtraClasses: '',
initialize: function(opts) {
Backform.FieldsetControl.prototype.initialize.apply(
this, arguments
);
this.tabIndex = (opts.tabIndex || parseInt(Math.random() * 1000)) + 1;
+ if(opts.field.get('tabPanelExtraClasses')) {
+ this.tabPanelExtraClasses = opts.field.get('tabPanelExtraClasses');
+ }
+ this.tabPanelClassName = this.tabPanelClassName + ' ' + this.tabPanelExtraClasses;
},
// Render using Backform.Dialog (tabular UI) (only if this control is
// visible).
diff --git a/web/pgadmin/static/js/tree/tree.js b/web/pgadmin/static/js/tree/tree.js
index 782f4d59..09d238ba 100644
--- a/web/pgadmin/static/js/tree/tree.js
+++ b/web/pgadmin/static/js/tree/tree.js
@@ -124,10 +124,29 @@ export class Tree {
return this.aciTreeApi.selected();
}
+ toggleNode(aciTreeIdentifier) {
+ this.aciTreeApi.toggle(aciTreeIdentifier);
+ }
+
selectNode(aciTreeIdentifier) {
this.aciTreeApi.select(aciTreeIdentifier);
}
+ bindClickEvents(aciTreeIdentifier) {
+ /* Bind events to enable clicking anywhere and not only text, button */
+ aciTreeIdentifier.off('dblclick').on('dblclick', function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ this.toggleNode(aciTreeIdentifier);
+ }.bind(this));
+
+ aciTreeIdentifier.off('click').on('click', function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ this.selectNode(aciTreeIdentifier);
+ }.bind(this));
+ }
+
createOrUpdateNode(id, data, parent, domNode) {
let oldNodePath = [id];
if(parent !== null && parent !== undefined) {
@@ -140,6 +159,8 @@ export class Tree {
}
const node = new TreeNode(id, data, domNode, parent);
+ this.bindClickEvents(domNode);
+
if (parent === this.rootNode) {
node.parentNode = null;
}
diff --git a/web/pgadmin/static/jsx/history/query_history.jsx b/web/pgadmin/static/jsx/history/query_history.jsx
index b24639bb..cdbf7ae2 100644
--- a/web/pgadmin/static/jsx/history/query_history.jsx
+++ b/web/pgadmin/static/jsx/history/query_history.jsx
@@ -13,6 +13,7 @@ import React from 'react';
import ReactDOM from 'react-dom';
import SplitPane from 'react-split-pane';
import _ from 'underscore';
+import gettext from 'sources/gettext';
import QueryHistoryDetail from './query_history_detail';
import QueryHistoryEntries from './query_history_entries';
@@ -90,17 +91,23 @@ export default class QueryHistory extends React.Component {
}
render() {
- return (
- <SplitPane defaultSize='50%' split='vertical' pane1Style={queryEntryListDivStyle}
- pane2Style={queryDetailDivStyle}>
- <QueryHistoryEntries historyEntries={this.state.history}
- selectedEntry={this.state.selectedEntry}
- onSelectEntry={this.selectHistoryEntry}
- />
- <QueryHistoryDetail historyEntry={this.state.currentHistoryDetail}
- sqlEditorPref={this.props.sqlEditorPref}
- />
- </SplitPane>);
+ if(this.state.history.length == 0) {
+ return(
+ <div className="alert alert-info pg-panel-message">{gettext('No history found')}</div>
+ );
+ } else {
+ return (
+ <SplitPane defaultSize='50%' split='vertical' pane1Style={queryEntryListDivStyle}
+ pane2Style={queryDetailDivStyle}>
+ <QueryHistoryEntries historyEntries={this.state.history}
+ selectedEntry={this.state.selectedEntry}
+ onSelectEntry={this.selectHistoryEntry}
+ />
+ <QueryHistoryDetail historyEntry={this.state.currentHistoryDetail}
+ sqlEditorPref={this.props.sqlEditorPref}
+ />
+ </SplitPane>);
+ }
}
}
diff --git a/web/pgadmin/static/scss/_aci_tree.overrides.scss b/web/pgadmin/static/scss/_aci_tree.overrides.scss
index 70a0c916..c43aef96 100644
--- a/web/pgadmin/static/scss/_aci_tree.overrides.scss
+++ b/web/pgadmin/static/scss/_aci_tree.overrides.scss
@@ -1,22 +1,18 @@
.aciTree .aciTreeLi {
display: grid !important;
+ cursor: pointer;
}
.aciTree .aciTreeText {
font-family: $font-family-primary;
font-size: 0.815rem;
}
.aciTree.aciTreeFocus .aciTreeFocus > .aciTreeLine {
- background-color: $color-primary-light;
- border-right: $active-border;
+ background-color: $color-primary-light !important;
}
+
.aciTree .aciTreeSelected > .aciTreeLine {
- background-color: $color-primary-light;
- border-color: $color-primary-light;
- border-right: $active-border;
- border-left: none !important;
- border-top: none !important;
- border-bottom: none !important;
- -webkit-border-radius: none !important;
+ background-color: $color-primary-light !important;
+ -webkit-border-radius: none !important;
-moz-border-radius: none !important;
border-radius: none !important;
}
diff --git a/web/pgadmin/static/scss/_alert.scss b/web/pgadmin/static/scss/_alert.scss
index 4f59011d..e8676b8c 100644
--- a/web/pgadmin/static/scss/_alert.scss
+++ b/web/pgadmin/static/scss/_alert.scss
@@ -22,7 +22,7 @@
}
.alert.alert-info {
- padding: 15px;
+ padding: 0.5rem;
}
.success-icon {
@@ -48,7 +48,7 @@
.alert-info {
border-color: $color-primary;
background-color: $color-primary-light;
- color : $color-primary;
+ color : $color-fg-theme;
background-image: none;
}
diff --git a/web/pgadmin/static/scss/_alertify.overrides.scss b/web/pgadmin/static/scss/_alertify.overrides.scss
index 38b2c9d3..29c1cea7 100644
--- a/web/pgadmin/static/scss/_alertify.overrides.scss
+++ b/web/pgadmin/static/scss/_alertify.overrides.scss
@@ -28,14 +28,6 @@
& .ajs-content {
top: $title-height;
}
- &.pgadmin_grant_wizard_body {
- border-top-left-radius: $panel-border-radius;
- border-top-right-radius: $panel-border-radius;
- & .ajs-content {
- top: 0 !important;
- border-radius: inherit;
- }
- }
}
& .ajs-header{
@@ -52,6 +44,7 @@
& .ajs-body {
& .ajs-content {
top: 0 !important;
+ padding: 0px;
}
}
}
@@ -231,4 +224,9 @@
.alertify .ajs-dimmer {
background-color: $loading-bg;
+}
+
+/* It sometimes is applied to dialog and blocks the dialog from editing */
+.alertify .ajs-dialog.ajs-capture:before {
+ display: none;
}
\ No newline at end of file
diff --git a/web/pgadmin/static/scss/_bootstrap.overrides.scss b/web/pgadmin/static/scss/_bootstrap.overrides.scss
index febe7ad7..2bd8b760 100644
--- a/web/pgadmin/static/scss/_bootstrap.overrides.scss
+++ b/web/pgadmin/static/scss/_bootstrap.overrides.scss
@@ -285,11 +285,12 @@ td.switch-cell > div.bootstrap-switch {
.navbar-brand {
color: $color-brand !important;
- background: $color-brand-bg !important;
+ background: $navbar-brand-bg !important;
margin-right: 0rem;
padding-left: 0.5rem !important;
padding-right: 1rem !important;
min-height: $navbar-height;
+ height: $navbar-height;
padding: 0rem;
display: flex;
align-items: center !important;
diff --git a/web/pgadmin/static/scss/_pgadmin.style.scss b/web/pgadmin/static/scss/_pgadmin.style.scss
index 1ad4b91f..6ec42939 100644
--- a/web/pgadmin/static/scss/_pgadmin.style.scss
+++ b/web/pgadmin/static/scss/_pgadmin.style.scss
@@ -155,6 +155,7 @@
.pg-navbar {
font-size: $navbar-font-size;
+ background-color: $navbar-color-bg;
padding-left: 0rem;
padding-right: 0.5rem;
& .nav-item .nav-link{
@@ -162,7 +163,7 @@
}
.pg-navbar-brand-arrow {
- border: $navbar-height/2 solid $color-fg;
+ border: $navbar-height/2 solid $navbar-brand-arrow-bg;
border-right-color: transparent;
border-bottom-color: transparent;
border-top-color: transparent;
@@ -436,7 +437,7 @@ fieldset.inline-fieldset {
fieldset.inline-fieldset-without-border {
margin: 0px; margin-left: 0px; margin-right: 0px;
padding-right: 0px; padding-left: 0px; padding-top: 0px; padding-bottom: 0px;
- border: 0px solid; border-radius: 0px; display: inline-block;
+ border: 0px solid; border-radius: 0px;
}
fieldset.inline-fieldset > legend {
@@ -678,12 +679,17 @@ div.rolmembership {
border-bottom-left-radius: 5px; border-style: solid solid;
}
-.inline-tab-panel > .tab-content {
- padding: 0px;
- margin: 0px;
- border-top: none;
- border-bottom-left-radius: 5px;
- border-bottom-right-radius: 5px;
+.inline-tab-panel {
+ & > .tab-content {
+ padding: 0px;
+ margin: 0px;
+ border-top: none;
+ border-bottom-left-radius: 5px;
+ border-bottom-right-radius: 5px;
+ }
+ &.inline-tab-panel-padded > .tab-content {
+ padding: 0.5rem;
+ }
}
.inline-tab-panel > .tab-content > div.tab-pane {
diff --git a/web/pgadmin/static/scss/_webcabin.pgadmin.scss b/web/pgadmin/static/scss/_webcabin.pgadmin.scss
index 34b55a7b..4fd92cdb 100644
--- a/web/pgadmin/static/scss/_webcabin.pgadmin.scss
+++ b/web/pgadmin/static/scss/_webcabin.pgadmin.scss
@@ -63,6 +63,10 @@
}
+.wcLayout {
+ display: block;
+}
+
.wcLayoutGrid, .wcLayoutGrid tr, .wcLayoutGrid td {
border: 1px solid $panel-border-color;
}
diff --git a/web/pgadmin/static/scss/resources/_default.variables.scss b/web/pgadmin/static/scss/resources/_default.variables.scss
index 79a523c3..1bebd5a8 100644
--- a/web/pgadmin/static/scss/resources/_default.variables.scss
+++ b/web/pgadmin/static/scss/resources/_default.variables.scss
@@ -37,7 +37,6 @@ $color-gray-light: #ebeef3;
$color-gray-lighter: #f3f5f9;
$color-brand: $white !default;
-$color-brand-bg: #222222;
$color-editor-bg: $color-bg !default;
$color-editor-keyword: #908 !default;
@@ -68,6 +67,7 @@ $border-radius: 0.25rem; //no change
$text-color: $color-fg-theme;
$text-muted: $color-gray-dark;
+
$navbar-dark-color: #fff;
$navbar-dark-hover-color: #fff;
$navbar-dark-active-color: #fff;
@@ -153,6 +153,10 @@ $title-height: ($line-height-base*16px) + 5px + 2px + $border-width;
$footer-padding: 0.5rem;
$footer-min-height: 2rem;
$footer-height-calc: $footer-min-height+$footer-padding*2;
+
+$navbar-brand-bg: #222222; //place image url if image
+$navbar-brand-arrow-bg: #222222;
+$navbar-color-bg: $color-primary;
$navbar-font-size: 0.925rem;
$navbar-user-font-size: 0.875rem;
diff --git a/web/pgadmin/tools/backup/__init__.py b/web/pgadmin/tools/backup/__init__.py
index 60bfd5bf..e70eaeda 100644
--- a/web/pgadmin/tools/backup/__init__.py
+++ b/web/pgadmin/tools/backup/__init__.py
@@ -125,6 +125,18 @@ class BackupMessage(IProcessDesc):
return s.name, host, port
+ @property
+ def type_desc(self):
+ if self.backup_type == BACKUP.OBJECT:
+ return _("Backing up an object on the server")
+ if self.backup_type == BACKUP.GLOBALS:
+ return _("Backing up the global objects")
+ elif self.backup_type == BACKUP.SERVER:
+ return _("Backing up the server")
+ else:
+ # It should never reach here.
+ return _("Unknown Backup")
+
@property
def message(self):
name, host, port = self.get_server_details()
@@ -132,7 +144,7 @@ class BackupMessage(IProcessDesc):
if self.backup_type == BACKUP.OBJECT:
return _(
"Backing up an object on the server '{0}' "
- "from database '{1}'..."
+ "from database '{1}'"
).format(
"{0} ({1}:{2})".format(
name, host, port
@@ -141,13 +153,13 @@ class BackupMessage(IProcessDesc):
)
if self.backup_type == BACKUP.GLOBALS:
return _("Backing up the global objects on "
- "the server '{0}'...").format(
+ "the server '{0}'").format(
"{0} ({1}:{2})".format(
name, host, port
)
)
elif self.backup_type == BACKUP.SERVER:
- return _("Backing up the server '{0}'...").format(
+ return _("Backing up the server '{0}'").format(
"{0} ({1}:{2})".format(
name, host, port
)
diff --git a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
index 52806bbf..85d78da2 100644
--- a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
+++ b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
@@ -218,14 +218,6 @@ define([
},
};
},
- hooks: {
- onshow: function() {
-
- // Add pgadmin_grant_wizard_body class to dialog
- $(this.elements.body).addClass('pgadmin_grant_wizard_body');
- },
- },
-
/**
Returns a Paginator Class Object which is again to be rendered
diff --git a/web/pgadmin/tools/import_export/__init__.py b/web/pgadmin/tools/import_export/__init__.py
index 3a874660..4e9b2d0a 100644
--- a/web/pgadmin/tools/import_export/__init__.py
+++ b/web/pgadmin/tools/import_export/__init__.py
@@ -114,11 +114,15 @@ class IEMessage(IProcessDesc):
return _(
"Copying table data '{0}.{1}' on database '{2}' "
- "and server ({3}:{4})..."
+ "and server ({3}:{4})"
).format(
self.schema, self.table, self.database, s.host, s.port
)
+ @property
+ def type_desc(self):
+ return _("Copying table data")
+
def details(self, cmd, args):
# Fetch the server details like hostname, port, roles etc
s = Server.query.filter_by(
@@ -128,7 +132,7 @@ class IEMessage(IProcessDesc):
res = '<div>'
res += _(
"Copying table data '{0}.{1}' on database '{2}' "
- "for the server '{3}'..."
+ "for the server '{3}'"
).format(
html.safe_str(self.schema),
html.safe_str(self.table),
@@ -140,11 +144,11 @@ class IEMessage(IProcessDesc):
)
)
- res += '</div><div>'
+ res += '</div><div class="py-1">'
res += _("Running command:")
- res += '</b><br><span class="pg-bg-cmd enable-selection">'
+ res += '<div class="pg-bg-cmd enable-selection p-1">'
res += html.safe_str(self._cmd)
- res += '</span></div>'
+ res += '</div></div>'
return res
diff --git a/web/pgadmin/tools/maintenance/__init__.py b/web/pgadmin/tools/maintenance/__init__.py
index 6ae0159e..5d362f9e 100644
--- a/web/pgadmin/tools/maintenance/__init__.py
+++ b/web/pgadmin/tools/maintenance/__init__.py
@@ -93,6 +93,10 @@ class Message(IProcessDesc):
if self.data['op'] == "CLUSTER":
return res.format(_('Cluster'))
+ @property
+ def type_desc(self):
+ return _("Maintenance")
+
def details(self, cmd, args):
res = None
diff --git a/web/pgadmin/tools/sqleditor/static/css/sqleditor.css b/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
index 91c515f4..337c6582 100644
--- a/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
+++ b/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
@@ -14,10 +14,6 @@
bottom: 0;
}
-#editor-panel {
- z-index: 0;
-}
-
.sql-editor-grid-container {
height: 100%;
overflow: auto;
@@ -55,12 +51,6 @@
max-width: 35px !important;
min-width: 35px !important;
}
-
-.sql-editor-history-container {
- height: 100%;
- overflow: auto;
-}
-
.sql-status-cell {
max-width: 30px;
}
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
index 7ff3dc0b..63278df3 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -185,7 +185,7 @@ define('tools.querytool', [
name: 'sql_panel',
title: gettext('Query Editor'),
width: '100%',
- height: '20%',
+ height: '50%',
isCloseable: false,
isPrivate: true,
});
diff --git a/web/pgadmin/tools/sqleditor/static/scss/_history.scss b/web/pgadmin/tools/sqleditor/static/scss/_history.scss
index 01dd0c18..03024f03 100644
--- a/web/pgadmin/tools/sqleditor/static/scss/_history.scss
+++ b/web/pgadmin/tools/sqleditor/static/scss/_history.scss
@@ -2,6 +2,7 @@
height: 100%;
.list-item {
border-bottom: $panel-border;
+ background-color: $color-bg-theme;
}
.entry {
@@ -76,11 +77,19 @@
display: block;
}
+
+.sql-editor-history-container {
+ height: 100%;
+ overflow: auto;
+ background-color: $negative-bg;
+}
+
+
.query-detail {
width: 100%;
display: flex;
flex-direction: column;
-
+ background-color: $color-bg-theme;
.error-message-block {
background: $sql-history-error-bg;
flex: 0.3;
diff --git a/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss b/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
index a1cac04d..d017e667 100644
--- a/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
+++ b/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
@@ -18,6 +18,14 @@
z-index: 0;
}
+
+.editor-title {
+ padding: $sql-title-padding;
+ background: $sql-title-bg;
+ color: $sql-title-fg;
+}
+
+
#editor-panel {
z-index: 0;
position: absolute;
@@ -209,6 +217,7 @@ li.CodeMirror-hint-active {
/* color the first column */
#datagrid .slick-row .slick-cell.l0.r0.selected {
background-color: $color-primary;
+ color: $color-primary-fg;
}
#datagrid .slick-row > .slick-cell:not(.l0):not(.r0).selected {
@@ -233,12 +242,6 @@ li.CodeMirror-hint-active {
box-shadow: $dropdown-box-shadow;
}
-.editor-title {
- padding: $sql-title-padding;
- background: $sql-title-bg;
- color: $sql-title-fg;
-}
-
.pg_text_editor textarea {
resize: both;
}
diff --git a/web/regression/javascript/history/query_history_spec.jsx b/web/regression/javascript/history/query_history_spec.jsx
index 0b179f4f..7def2e43 100644
--- a/web/regression/javascript/history/query_history_spec.jsx
+++ b/web/regression/javascript/history/query_history_spec.jsx
@@ -61,7 +61,7 @@ describe('QueryHistory', () => {
it('nothing is displayed in the history details panel', (done) => {
let foundChildren = historyWrapper.find(QueryHistoryDetail);
- expect(foundChildren.length).toBe(1);
+ expect(foundChildren.length).toBe(0);
done();
});
});
diff --git a/web/regression/javascript/tree/tree_fake.js b/web/regression/javascript/tree/tree_fake.js
index fc94d3f1..437d5378 100644
--- a/web/regression/javascript/tree/tree_fake.js
+++ b/web/regression/javascript/tree/tree_fake.js
@@ -43,6 +43,10 @@ export class TreeFake extends Tree {
['ACITreeApi'], ['setInode', 'unload', 'deselect', 'select']);
}
+ bindClickEvents(domNode) {
+ return domNode;
+ }
+
addNewNode(id, data, domNode, path) {
this.aciTreeToOurTreeTranslator[id] = [id];
if (path !== null && path !== undefined) {
diff --git a/web/regression/javascript/tree/tree_spec.js b/web/regression/javascript/tree/tree_spec.js
index 531525a6..21593824 100644
--- a/web/regression/javascript/tree/tree_spec.js
+++ b/web/regression/javascript/tree/tree_spec.js
@@ -16,6 +16,7 @@ const treeTests = (treeClass, setDefaultCallBack) => {
let tree;
beforeEach(() => {
tree = new treeClass();
+ spyOn(tree, 'bindClickEvents');
});
describe('#addNewNode', () => {
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 05:52 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 09:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
2019-01-03 10:20 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-03 15:09 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 04:51 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 09:23 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 09:58 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 10:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-07 05:14 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-07 08:54 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-07 09:47 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-14 05:24 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
@ 2019-01-16 06:29 ` Akshay Joshi <[email protected]>
2019-01-16 14:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
1 sibling, 1 reply; 29+ messages in thread
From: Akshay Joshi @ 2019-01-16 06:29 UTC (permalink / raw)
To: Aditya Toshniwal <[email protected]>; Dave Page <[email protected]>; +Cc: pgadmin-hackers <[email protected]>
Thanks patch applied without Tree Changes.
On Mon, Jan 14, 2019 at 10:55 AM Aditya Toshniwal <aditya.toshniwal@
enterprisedb.com> wrote:
> Hi Hackers,
>
> Attached is the patch for further design improvements:
> - Process watcher made fixed width with header changes, time details
> rounded to 2 decimals
> - Query history will show "No query history" if no query fired. Query
> editor default size increased.
> - Tree improvements - right bold border removed completely. Now click
> anywhere on a tree item to perform actions. Please note, single click on
> the tiny tree arrow button will not work with this. Clicking anywhere is
> more useful than this.
>
@Dave Should we proceed with this behaviour, I haven't commit it.
> - Fixed a bug where New folder create button not working when in List mode
> and No files/folder present.
> - Other minor improvements.
>
> Kindly review.
>
> On Mon, Jan 7, 2019 at 3:17 PM Aditya Toshniwal <
> [email protected]> wrote:
>
>> Hi Hackers,
>>
>> Attached is the patch for few more changes:
>> - New Folder button was not working in file dialogue. Fixed that.
>> - Color, icon changes in file dialogue
>> - Also replaced the splash screen image (which is used on main dashboard
>> also). It works fine on dashboard. However, I'm not sure of the splash
>> screen as the new image is SVG and older was PNG. I have made changes for
>> that in runtime code but I'm not able to test (evnvironment issue) runtime
>> code :(. It would be helpful if someone else can try it once.
>>
>> Kindly review.
>>
>>
>> On Mon, Jan 7, 2019 at 2:25 PM Dave Page <[email protected]> wrote:
>>
>>> Thanks - applied!
>>>
>>> On Mon, Jan 7, 2019 at 10:44 AM Aditya Toshniwal
>>> <[email protected]> wrote:
>>> >
>>> > Hi Hackers,
>>> >
>>> > Attached is the patch to incorporate the changes discussed in trailing
>>> mail(s).
>>> >
>>> > Kindly review.
>>> >
>>> > On Fri, Jan 4, 2019 at 3:31 PM Dave Page <[email protected]> wrote:
>>> >>
>>> >> On Fri, Jan 4, 2019 at 9:58 AM Aditya Toshniwal
>>> >> <[email protected]> wrote:
>>> >> >
>>> >> > Hi,
>>> >> >
>>> >> > On Fri, Jan 4, 2019 at 2:53 PM Dave Page <[email protected]> wrote:
>>> >> >>
>>> >> >> Hi
>>> >> >>
>>> >> >> On Fri, Jan 4, 2019 at 4:51 AM Aditya Toshniwal <
>>> [email protected]> wrote:
>>> >> >>>
>>> >> >>> Hi Dave,
>>> >> >>>
>>> >> >>> On Thu, Jan 3, 2019 at 8:39 PM Dave Page <[email protected]>
>>> wrote:
>>> >> >>>>
>>> >> >>>>
>>> >> >>>> A few other things that I noticed (or have been bugging me):
>>> >> >>>>
>>> >> >>>> - The menu bar seems a little cramped. Taking pg-navbar from 32
>>> to 40px and setting the font-weight to normal on the menu options (but not
>>> the product name) seems much better to me (and adjusting everything else as
>>> required of course).
>>> >> >>>
>>> >> >>> Giving too much space for the navbar will reduce the usable space
>>> for other things. It is good enough(32) to be used easily, and is equal to
>>> all the other headers in app (including tabs) giving a feel of native
>>> desktop application. You'll find even smaller menu heights in native
>>> desktop application. We can make font weight to normal and may be slightly
>>> increase horizontal spacing between the menu links.
>>> >> >>
>>> >> >>
>>> >> >> 8 pixels isn't going to make a noticeable difference to the
>>> workspace for users, and would leave the bar smaller than the 50px it's
>>> been for the last couple of years (iirc). I think it needs it to avoid
>>> looking cramped - please make the change.
>>> >> >
>>> >> > Will do.
>>> >> > One more doubt regarding bold headers, should I remove bold headers
>>> in dashboard graph header, subnode headers (eg.table->columns), properties
>>> tab accrordian headers ?
>>> >>
>>> >> No, please don't. I left them bold and the styling seemed like it
>>> >> worked. We can tweak again if others disagree later.
>>> >>
>>> >> Thanks!
>>> >>
>>> >> BTW - Chrome 71 shows the offset headers in the file dialogue as well.
>>> >>
>>> >> >>>>
>>> >> >>>> - In the file dialogue, the column headers don't line up with
>>> the columns in the rows.
>>> >> >>>
>>> >> >>> I could not see this on my machine (screenshot attached). Could
>>> you please share the screenshot.
>>> >> >>
>>> >> >>
>>> >> >> Attached - thanks! This is Chrome 70.0.3538.102 on MacOS.
>>> >> >>
>>> >> >> --
>>> >> >> Dave Page
>>> >> >> Blog: http://pgsnake.blogspot.com
>>> >> >> Twitter: @pgsnake
>>> >> >>
>>> >> >> EnterpriseDB UK: http://www.enterprisedb.com
>>> >> >> The Enterprise PostgreSQL Company
>>> >> >
>>> >> >
>>> >> >
>>> >> > --
>>> >> > Thanks and Regards,
>>> >> > Aditya Toshniwal
>>> >> > Software Engineer | EnterpriseDB Software Solutions | Pune
>>> >> > "Don't Complain about Heat, Plant a tree"
>>> >>
>>> >>
>>> >>
>>> >> --
>>> >> Dave Page
>>> >> Blog: http://pgsnake.blogspot.com
>>> >> Twitter: @pgsnake
>>> >>
>>> >> EnterpriseDB UK: http://www.enterprisedb.com
>>> >> The Enterprise PostgreSQL Company
>>> >
>>> >
>>> >
>>> > --
>>> > Thanks and Regards,
>>> > Aditya Toshniwal
>>> > Software Engineer | EnterpriseDB Software Solutions | Pune
>>> > "Don't Complain about Heat, Plant a tree"
>>>
>>>
>>>
>>> --
>>> Dave Page
>>> Blog: http://pgsnake.blogspot.com
>>> Twitter: @pgsnake
>>>
>>> EnterpriseDB UK: http://www.enterprisedb.com
>>> The Enterprise PostgreSQL Company
>>>
>>
>>
>> --
>> Thanks and Regards,
>> Aditya Toshniwal
>> Software Engineer | EnterpriseDB Software Solutions | Pune
>> "Don't Complain about Heat, Plant a tree"
>>
>
>
> --
> Thanks and Regards,
> Aditya Toshniwal
> Software Engineer | EnterpriseDB Software Solutions | Pune
> "Don't Complain about Heat, Plant a tree"
>
--
*Akshay Joshi*
*Sr. Software Architect *
*Phone: +91 20-3058-9517Mobile: +91 976-788-8246*
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 05:52 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 09:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
2019-01-03 10:20 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-03 15:09 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 04:51 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 09:23 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 09:58 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 10:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-07 05:14 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-07 08:54 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-07 09:47 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-14 05:24 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-16 06:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
@ 2019-01-16 14:59 ` Dave Page <[email protected]>
2019-01-17 06:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Dave Page @ 2019-01-16 14:59 UTC (permalink / raw)
To: Akshay Joshi <[email protected]>; +Cc: Aditya Toshniwal <[email protected]>; pgadmin-hackers <[email protected]>
On Wed, Jan 16, 2019 at 6:29 AM Akshay Joshi <[email protected]>
wrote:
> Thanks patch applied without Tree Changes.
>
> On Mon, Jan 14, 2019 at 10:55 AM Aditya Toshniwal <aditya.toshniwal@
> enterprisedb.com> wrote:
>
>> Hi Hackers,
>>
>> Attached is the patch for further design improvements:
>> - Process watcher made fixed width with header changes, time details
>> rounded to 2 decimals
>> - Query history will show "No query history" if no query fired. Query
>> editor default size increased.
>> - Tree improvements - right bold border removed completely. Now click
>> anywhere on a tree item to perform actions. Please note, single click on
>> the tiny tree arrow button will not work with this. Clicking anywhere is
>> more useful than this.
>>
> @Dave Should we proceed with this behaviour, I haven't commit it.
>
I like the blue bit, so that should come back.
I would say that a single-click on the arrow should open/close the node,
whilst a double-click on the icon or label should open/close it.
> - Fixed a bug where New folder create button not working when in List mode
>> and No files/folder present.
>> - Other minor improvements.
>>
>> Kindly review.
>>
>> On Mon, Jan 7, 2019 at 3:17 PM Aditya Toshniwal <
>> [email protected]> wrote:
>>
>>> Hi Hackers,
>>>
>>> Attached is the patch for few more changes:
>>> - New Folder button was not working in file dialogue. Fixed that.
>>> - Color, icon changes in file dialogue
>>> - Also replaced the splash screen image (which is used on main dashboard
>>> also). It works fine on dashboard. However, I'm not sure of the splash
>>> screen as the new image is SVG and older was PNG. I have made changes for
>>> that in runtime code but I'm not able to test (evnvironment issue) runtime
>>> code :(. It would be helpful if someone else can try it once.
>>>
>>> Kindly review.
>>>
>>>
>>> On Mon, Jan 7, 2019 at 2:25 PM Dave Page <[email protected]> wrote:
>>>
>>>> Thanks - applied!
>>>>
>>>> On Mon, Jan 7, 2019 at 10:44 AM Aditya Toshniwal
>>>> <[email protected]> wrote:
>>>> >
>>>> > Hi Hackers,
>>>> >
>>>> > Attached is the patch to incorporate the changes discussed in
>>>> trailing mail(s).
>>>> >
>>>> > Kindly review.
>>>> >
>>>> > On Fri, Jan 4, 2019 at 3:31 PM Dave Page <[email protected]> wrote:
>>>> >>
>>>> >> On Fri, Jan 4, 2019 at 9:58 AM Aditya Toshniwal
>>>> >> <[email protected]> wrote:
>>>> >> >
>>>> >> > Hi,
>>>> >> >
>>>> >> > On Fri, Jan 4, 2019 at 2:53 PM Dave Page <[email protected]>
>>>> wrote:
>>>> >> >>
>>>> >> >> Hi
>>>> >> >>
>>>> >> >> On Fri, Jan 4, 2019 at 4:51 AM Aditya Toshniwal <
>>>> [email protected]> wrote:
>>>> >> >>>
>>>> >> >>> Hi Dave,
>>>> >> >>>
>>>> >> >>> On Thu, Jan 3, 2019 at 8:39 PM Dave Page <[email protected]>
>>>> wrote:
>>>> >> >>>>
>>>> >> >>>>
>>>> >> >>>> A few other things that I noticed (or have been bugging me):
>>>> >> >>>>
>>>> >> >>>> - The menu bar seems a little cramped. Taking pg-navbar from 32
>>>> to 40px and setting the font-weight to normal on the menu options (but not
>>>> the product name) seems much better to me (and adjusting everything else as
>>>> required of course).
>>>> >> >>>
>>>> >> >>> Giving too much space for the navbar will reduce the usable
>>>> space for other things. It is good enough(32) to be used easily, and is
>>>> equal to all the other headers in app (including tabs) giving a feel of
>>>> native desktop application. You'll find even smaller menu heights in native
>>>> desktop application. We can make font weight to normal and may be slightly
>>>> increase horizontal spacing between the menu links.
>>>> >> >>
>>>> >> >>
>>>> >> >> 8 pixels isn't going to make a noticeable difference to the
>>>> workspace for users, and would leave the bar smaller than the 50px it's
>>>> been for the last couple of years (iirc). I think it needs it to avoid
>>>> looking cramped - please make the change.
>>>> >> >
>>>> >> > Will do.
>>>> >> > One more doubt regarding bold headers, should I remove bold
>>>> headers in dashboard graph header, subnode headers (eg.table->columns),
>>>> properties tab accrordian headers ?
>>>> >>
>>>> >> No, please don't. I left them bold and the styling seemed like it
>>>> >> worked. We can tweak again if others disagree later.
>>>> >>
>>>> >> Thanks!
>>>> >>
>>>> >> BTW - Chrome 71 shows the offset headers in the file dialogue as
>>>> well.
>>>> >>
>>>> >> >>>>
>>>> >> >>>> - In the file dialogue, the column headers don't line up with
>>>> the columns in the rows.
>>>> >> >>>
>>>> >> >>> I could not see this on my machine (screenshot attached). Could
>>>> you please share the screenshot.
>>>> >> >>
>>>> >> >>
>>>> >> >> Attached - thanks! This is Chrome 70.0.3538.102 on MacOS.
>>>> >> >>
>>>> >> >> --
>>>> >> >> Dave Page
>>>> >> >> Blog: http://pgsnake.blogspot.com
>>>> >> >> Twitter: @pgsnake
>>>> >> >>
>>>> >> >> EnterpriseDB UK: http://www.enterprisedb.com
>>>> >> >> The Enterprise PostgreSQL Company
>>>> >> >
>>>> >> >
>>>> >> >
>>>> >> > --
>>>> >> > Thanks and Regards,
>>>> >> > Aditya Toshniwal
>>>> >> > Software Engineer | EnterpriseDB Software Solutions | Pune
>>>> >> > "Don't Complain about Heat, Plant a tree"
>>>> >>
>>>> >>
>>>> >>
>>>> >> --
>>>> >> Dave Page
>>>> >> Blog: http://pgsnake.blogspot.com
>>>> >> Twitter: @pgsnake
>>>> >>
>>>> >> EnterpriseDB UK: http://www.enterprisedb.com
>>>> >> The Enterprise PostgreSQL Company
>>>> >
>>>> >
>>>> >
>>>> > --
>>>> > Thanks and Regards,
>>>> > Aditya Toshniwal
>>>> > Software Engineer | EnterpriseDB Software Solutions | Pune
>>>> > "Don't Complain about Heat, Plant a tree"
>>>>
>>>>
>>>>
>>>> --
>>>> Dave Page
>>>> Blog: http://pgsnake.blogspot.com
>>>> Twitter: @pgsnake
>>>>
>>>> EnterpriseDB UK: http://www.enterprisedb.com
>>>> The Enterprise PostgreSQL Company
>>>>
>>>
>>>
>>> --
>>> Thanks and Regards,
>>> Aditya Toshniwal
>>> Software Engineer | EnterpriseDB Software Solutions | Pune
>>> "Don't Complain about Heat, Plant a tree"
>>>
>>
>>
>> --
>> Thanks and Regards,
>> Aditya Toshniwal
>> Software Engineer | EnterpriseDB Software Solutions | Pune
>> "Don't Complain about Heat, Plant a tree"
>>
>
>
> --
> *Akshay Joshi*
>
> *Sr. Software Architect *
>
>
>
> *Phone: +91 20-3058-9517Mobile: +91 976-788-8246*
>
--
Dave Page
VP, Chief Architect, Tools & Installers
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 05:52 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 09:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
2019-01-03 10:20 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-03 15:09 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 04:51 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 09:23 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 09:58 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 10:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-07 05:14 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-07 08:54 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-07 09:47 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-14 05:24 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-16 06:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
2019-01-16 14:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
@ 2019-01-17 06:29 ` Aditya Toshniwal <[email protected]>
2019-01-17 07:57 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
0 siblings, 1 reply; 29+ messages in thread
From: Aditya Toshniwal @ 2019-01-17 06:29 UTC (permalink / raw)
To: Dave Page <[email protected]>; +Cc: Akshay Joshi <[email protected]>; pgadmin-hackers <[email protected]>
Hi Hackers,
Attached is the small patch (and probably the final for this mail chain) to
accommodate the changes suggested in previous mail.
Kindly review.
On Wed, Jan 16, 2019 at 8:30 PM Dave Page <[email protected]>
wrote:
>
>
> On Wed, Jan 16, 2019 at 6:29 AM Akshay Joshi <
> [email protected]> wrote:
>
>> Thanks patch applied without Tree Changes.
>>
>> On Mon, Jan 14, 2019 at 10:55 AM Aditya Toshniwal <aditya.toshniwal@
>> enterprisedb.com> wrote:
>>
>>> Hi Hackers,
>>>
>>> Attached is the patch for further design improvements:
>>> - Process watcher made fixed width with header changes, time details
>>> rounded to 2 decimals
>>> - Query history will show "No query history" if no query fired. Query
>>> editor default size increased.
>>> - Tree improvements - right bold border removed completely. Now click
>>> anywhere on a tree item to perform actions. Please note, single click on
>>> the tiny tree arrow button will not work with this. Clicking anywhere is
>>> more useful than this.
>>>
>> @Dave Should we proceed with this behaviour, I haven't commit it.
>>
>
> I like the blue bit, so that should come back.
>
> I would say that a single-click on the arrow should open/close the node,
> whilst a double-click on the icon or label should open/close it.
>
>
>> - Fixed a bug where New folder create button not working when in List
>>> mode and No files/folder present.
>>> - Other minor improvements.
>>>
>>> Kindly review.
>>>
>>> On Mon, Jan 7, 2019 at 3:17 PM Aditya Toshniwal <
>>> [email protected]> wrote:
>>>
>>>> Hi Hackers,
>>>>
>>>> Attached is the patch for few more changes:
>>>> - New Folder button was not working in file dialogue. Fixed that.
>>>> - Color, icon changes in file dialogue
>>>> - Also replaced the splash screen image (which is used on main
>>>> dashboard also). It works fine on dashboard. However, I'm not sure of the
>>>> splash screen as the new image is SVG and older was PNG. I have made
>>>> changes for that in runtime code but I'm not able to test (evnvironment
>>>> issue) runtime code :(. It would be helpful if someone else can try it once.
>>>>
>>>> Kindly review.
>>>>
>>>>
>>>> On Mon, Jan 7, 2019 at 2:25 PM Dave Page <[email protected]> wrote:
>>>>
>>>>> Thanks - applied!
>>>>>
>>>>> On Mon, Jan 7, 2019 at 10:44 AM Aditya Toshniwal
>>>>> <[email protected]> wrote:
>>>>> >
>>>>> > Hi Hackers,
>>>>> >
>>>>> > Attached is the patch to incorporate the changes discussed in
>>>>> trailing mail(s).
>>>>> >
>>>>> > Kindly review.
>>>>> >
>>>>> > On Fri, Jan 4, 2019 at 3:31 PM Dave Page <[email protected]> wrote:
>>>>> >>
>>>>> >> On Fri, Jan 4, 2019 at 9:58 AM Aditya Toshniwal
>>>>> >> <[email protected]> wrote:
>>>>> >> >
>>>>> >> > Hi,
>>>>> >> >
>>>>> >> > On Fri, Jan 4, 2019 at 2:53 PM Dave Page <[email protected]>
>>>>> wrote:
>>>>> >> >>
>>>>> >> >> Hi
>>>>> >> >>
>>>>> >> >> On Fri, Jan 4, 2019 at 4:51 AM Aditya Toshniwal <
>>>>> [email protected]> wrote:
>>>>> >> >>>
>>>>> >> >>> Hi Dave,
>>>>> >> >>>
>>>>> >> >>> On Thu, Jan 3, 2019 at 8:39 PM Dave Page <[email protected]>
>>>>> wrote:
>>>>> >> >>>>
>>>>> >> >>>>
>>>>> >> >>>> A few other things that I noticed (or have been bugging me):
>>>>> >> >>>>
>>>>> >> >>>> - The menu bar seems a little cramped. Taking pg-navbar from
>>>>> 32 to 40px and setting the font-weight to normal on the menu options (but
>>>>> not the product name) seems much better to me (and adjusting everything
>>>>> else as required of course).
>>>>> >> >>>
>>>>> >> >>> Giving too much space for the navbar will reduce the usable
>>>>> space for other things. It is good enough(32) to be used easily, and is
>>>>> equal to all the other headers in app (including tabs) giving a feel of
>>>>> native desktop application. You'll find even smaller menu heights in native
>>>>> desktop application. We can make font weight to normal and may be slightly
>>>>> increase horizontal spacing between the menu links.
>>>>> >> >>
>>>>> >> >>
>>>>> >> >> 8 pixels isn't going to make a noticeable difference to the
>>>>> workspace for users, and would leave the bar smaller than the 50px it's
>>>>> been for the last couple of years (iirc). I think it needs it to avoid
>>>>> looking cramped - please make the change.
>>>>> >> >
>>>>> >> > Will do.
>>>>> >> > One more doubt regarding bold headers, should I remove bold
>>>>> headers in dashboard graph header, subnode headers (eg.table->columns),
>>>>> properties tab accrordian headers ?
>>>>> >>
>>>>> >> No, please don't. I left them bold and the styling seemed like it
>>>>> >> worked. We can tweak again if others disagree later.
>>>>> >>
>>>>> >> Thanks!
>>>>> >>
>>>>> >> BTW - Chrome 71 shows the offset headers in the file dialogue as
>>>>> well.
>>>>> >>
>>>>> >> >>>>
>>>>> >> >>>> - In the file dialogue, the column headers don't line up with
>>>>> the columns in the rows.
>>>>> >> >>>
>>>>> >> >>> I could not see this on my machine (screenshot attached). Could
>>>>> you please share the screenshot.
>>>>> >> >>
>>>>> >> >>
>>>>> >> >> Attached - thanks! This is Chrome 70.0.3538.102 on MacOS.
>>>>> >> >>
>>>>> >> >> --
>>>>> >> >> Dave Page
>>>>> >> >> Blog: http://pgsnake.blogspot.com
>>>>> >> >> Twitter: @pgsnake
>>>>> >> >>
>>>>> >> >> EnterpriseDB UK: http://www.enterprisedb.com
>>>>> >> >> The Enterprise PostgreSQL Company
>>>>> >> >
>>>>> >> >
>>>>> >> >
>>>>> >> > --
>>>>> >> > Thanks and Regards,
>>>>> >> > Aditya Toshniwal
>>>>> >> > Software Engineer | EnterpriseDB Software Solutions | Pune
>>>>> >> > "Don't Complain about Heat, Plant a tree"
>>>>> >>
>>>>> >>
>>>>> >>
>>>>> >> --
>>>>> >> Dave Page
>>>>> >> Blog: http://pgsnake.blogspot.com
>>>>> >> Twitter: @pgsnake
>>>>> >>
>>>>> >> EnterpriseDB UK: http://www.enterprisedb.com
>>>>> >> The Enterprise PostgreSQL Company
>>>>> >
>>>>> >
>>>>> >
>>>>> > --
>>>>> > Thanks and Regards,
>>>>> > Aditya Toshniwal
>>>>> > Software Engineer | EnterpriseDB Software Solutions | Pune
>>>>> > "Don't Complain about Heat, Plant a tree"
>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> Dave Page
>>>>> Blog: http://pgsnake.blogspot.com
>>>>> Twitter: @pgsnake
>>>>>
>>>>> EnterpriseDB UK: http://www.enterprisedb.com
>>>>> The Enterprise PostgreSQL Company
>>>>>
>>>>
>>>>
>>>> --
>>>> Thanks and Regards,
>>>> Aditya Toshniwal
>>>> Software Engineer | EnterpriseDB Software Solutions | Pune
>>>> "Don't Complain about Heat, Plant a tree"
>>>>
>>>
>>>
>>> --
>>> Thanks and Regards,
>>> Aditya Toshniwal
>>> Software Engineer | EnterpriseDB Software Solutions | Pune
>>> "Don't Complain about Heat, Plant a tree"
>>>
>>
>>
>> --
>> *Akshay Joshi*
>>
>> *Sr. Software Architect *
>>
>>
>>
>> *Phone: +91 20-3058-9517Mobile: +91 976-788-8246*
>>
>
>
> --
> Dave Page
> VP, Chief Architect, Tools & Installers
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
--
Thanks and Regards,
Aditya Toshniwal
Software Engineer | EnterpriseDB Software Solutions | Pune
"Don't Complain about Heat, Plant a tree"
Attachments:
[application/octet-stream] RM3692.part7.patch (1.9K, 3-RM3692.part7.patch)
download | inline diff:
diff --git a/web/pgadmin/preferences/static/js/preferences.js b/web/pgadmin/preferences/static/js/preferences.js
index c3385fac..88a50bd1 100644
--- a/web/pgadmin/preferences/static/js/preferences.js
+++ b/web/pgadmin/preferences/static/js/preferences.js
@@ -329,19 +329,8 @@ define('pgadmin.preferences', [
if (!d)
return true;
- /* Bind events to enable clicking anywhere and not only text, button */
- item.on('dblclick', function(e) {
- e.preventDefault();
- e.stopPropagation();
- api.toggle(item);
- });
- item.on('click', function(e) {
- e.preventDefault();
- e.stopPropagation();
- api.select(item);
- });
- // We will add the preferences in to the preferences data
- // collection.
+ // We will add the preferences in to the preferences data
+ // collection.
if (d.preferences && _.isArray(d.preferences)) {
_.each(d.preferences, function(p) {
preferences.add({
diff --git a/web/pgadmin/static/scss/_aci_tree.overrides.scss b/web/pgadmin/static/scss/_aci_tree.overrides.scss
index c43aef96..e8de8eab 100644
--- a/web/pgadmin/static/scss/_aci_tree.overrides.scss
+++ b/web/pgadmin/static/scss/_aci_tree.overrides.scss
@@ -8,10 +8,16 @@
}
.aciTree.aciTreeFocus .aciTreeFocus > .aciTreeLine {
background-color: $color-primary-light !important;
+ border-right: $active-border !important;
}
.aciTree .aciTreeSelected > .aciTreeLine {
background-color: $color-primary-light !important;
+ border-color: $color-primary-light;
+ border-right: $active-border !important;
+ border-left: none !important;
+ border-top: none !important;
+ border-bottom: none !important;
-webkit-border-radius: none !important;
-moz-border-radius: none !important;
border-radius: none !important;
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:13 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 14:18 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 05:52 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-02 09:39 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
2019-01-03 10:20 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-03 15:09 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 04:51 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 09:23 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-04 09:58 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-04 10:01 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-07 05:14 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-07 08:54 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-07 09:47 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-14 05:24 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2019-01-16 06:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Akshay Joshi <[email protected]>
2019-01-16 14:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2019-01-17 06:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
@ 2019-01-17 07:57 ` Akshay Joshi <[email protected]>
0 siblings, 0 replies; 29+ messages in thread
From: Akshay Joshi @ 2019-01-17 07:57 UTC (permalink / raw)
To: Aditya Toshniwal <[email protected]>; +Cc: Dave Page <[email protected]>; pgadmin-hackers <[email protected]>
Thanks patch applied.
On Thu, Jan 17, 2019 at 11:59 AM Aditya Toshniwal <
[email protected]> wrote:
> Hi Hackers,
>
> Attached is the small patch (and probably the final for this mail chain)
> to accommodate the changes suggested in previous mail.
>
> Kindly review.
>
> On Wed, Jan 16, 2019 at 8:30 PM Dave Page <[email protected]>
> wrote:
>
>>
>>
>> On Wed, Jan 16, 2019 at 6:29 AM Akshay Joshi <
>> [email protected]> wrote:
>>
>>> Thanks patch applied without Tree Changes.
>>>
>>> On Mon, Jan 14, 2019 at 10:55 AM Aditya Toshniwal <aditya.toshniwal@
>>> enterprisedb.com> wrote:
>>>
>>>> Hi Hackers,
>>>>
>>>> Attached is the patch for further design improvements:
>>>> - Process watcher made fixed width with header changes, time details
>>>> rounded to 2 decimals
>>>> - Query history will show "No query history" if no query fired. Query
>>>> editor default size increased.
>>>> - Tree improvements - right bold border removed completely. Now click
>>>> anywhere on a tree item to perform actions. Please note, single click on
>>>> the tiny tree arrow button will not work with this. Clicking anywhere is
>>>> more useful than this.
>>>>
>>> @Dave Should we proceed with this behaviour, I haven't commit it.
>>>
>>
>> I like the blue bit, so that should come back.
>>
>> I would say that a single-click on the arrow should open/close the node,
>> whilst a double-click on the icon or label should open/close it.
>>
>>
>>> - Fixed a bug where New folder create button not working when in List
>>>> mode and No files/folder present.
>>>> - Other minor improvements.
>>>>
>>>> Kindly review.
>>>>
>>>> On Mon, Jan 7, 2019 at 3:17 PM Aditya Toshniwal <
>>>> [email protected]> wrote:
>>>>
>>>>> Hi Hackers,
>>>>>
>>>>> Attached is the patch for few more changes:
>>>>> - New Folder button was not working in file dialogue. Fixed that.
>>>>> - Color, icon changes in file dialogue
>>>>> - Also replaced the splash screen image (which is used on main
>>>>> dashboard also). It works fine on dashboard. However, I'm not sure of the
>>>>> splash screen as the new image is SVG and older was PNG. I have made
>>>>> changes for that in runtime code but I'm not able to test (evnvironment
>>>>> issue) runtime code :(. It would be helpful if someone else can try it once.
>>>>>
>>>>> Kindly review.
>>>>>
>>>>>
>>>>> On Mon, Jan 7, 2019 at 2:25 PM Dave Page <[email protected]> wrote:
>>>>>
>>>>>> Thanks - applied!
>>>>>>
>>>>>> On Mon, Jan 7, 2019 at 10:44 AM Aditya Toshniwal
>>>>>> <[email protected]> wrote:
>>>>>> >
>>>>>> > Hi Hackers,
>>>>>> >
>>>>>> > Attached is the patch to incorporate the changes discussed in
>>>>>> trailing mail(s).
>>>>>> >
>>>>>> > Kindly review.
>>>>>> >
>>>>>> > On Fri, Jan 4, 2019 at 3:31 PM Dave Page <[email protected]> wrote:
>>>>>> >>
>>>>>> >> On Fri, Jan 4, 2019 at 9:58 AM Aditya Toshniwal
>>>>>> >> <[email protected]> wrote:
>>>>>> >> >
>>>>>> >> > Hi,
>>>>>> >> >
>>>>>> >> > On Fri, Jan 4, 2019 at 2:53 PM Dave Page <[email protected]>
>>>>>> wrote:
>>>>>> >> >>
>>>>>> >> >> Hi
>>>>>> >> >>
>>>>>> >> >> On Fri, Jan 4, 2019 at 4:51 AM Aditya Toshniwal <
>>>>>> [email protected]> wrote:
>>>>>> >> >>>
>>>>>> >> >>> Hi Dave,
>>>>>> >> >>>
>>>>>> >> >>> On Thu, Jan 3, 2019 at 8:39 PM Dave Page <[email protected]>
>>>>>> wrote:
>>>>>> >> >>>>
>>>>>> >> >>>>
>>>>>> >> >>>> A few other things that I noticed (or have been bugging me):
>>>>>> >> >>>>
>>>>>> >> >>>> - The menu bar seems a little cramped. Taking pg-navbar from
>>>>>> 32 to 40px and setting the font-weight to normal on the menu options (but
>>>>>> not the product name) seems much better to me (and adjusting everything
>>>>>> else as required of course).
>>>>>> >> >>>
>>>>>> >> >>> Giving too much space for the navbar will reduce the usable
>>>>>> space for other things. It is good enough(32) to be used easily, and is
>>>>>> equal to all the other headers in app (including tabs) giving a feel of
>>>>>> native desktop application. You'll find even smaller menu heights in native
>>>>>> desktop application. We can make font weight to normal and may be slightly
>>>>>> increase horizontal spacing between the menu links.
>>>>>> >> >>
>>>>>> >> >>
>>>>>> >> >> 8 pixels isn't going to make a noticeable difference to the
>>>>>> workspace for users, and would leave the bar smaller than the 50px it's
>>>>>> been for the last couple of years (iirc). I think it needs it to avoid
>>>>>> looking cramped - please make the change.
>>>>>> >> >
>>>>>> >> > Will do.
>>>>>> >> > One more doubt regarding bold headers, should I remove bold
>>>>>> headers in dashboard graph header, subnode headers (eg.table->columns),
>>>>>> properties tab accrordian headers ?
>>>>>> >>
>>>>>> >> No, please don't. I left them bold and the styling seemed like it
>>>>>> >> worked. We can tweak again if others disagree later.
>>>>>> >>
>>>>>> >> Thanks!
>>>>>> >>
>>>>>> >> BTW - Chrome 71 shows the offset headers in the file dialogue as
>>>>>> well.
>>>>>> >>
>>>>>> >> >>>>
>>>>>> >> >>>> - In the file dialogue, the column headers don't line up with
>>>>>> the columns in the rows.
>>>>>> >> >>>
>>>>>> >> >>> I could not see this on my machine (screenshot attached).
>>>>>> Could you please share the screenshot.
>>>>>> >> >>
>>>>>> >> >>
>>>>>> >> >> Attached - thanks! This is Chrome 70.0.3538.102 on MacOS.
>>>>>> >> >>
>>>>>> >> >> --
>>>>>> >> >> Dave Page
>>>>>> >> >> Blog: http://pgsnake.blogspot.com
>>>>>> >> >> Twitter: @pgsnake
>>>>>> >> >>
>>>>>> >> >> EnterpriseDB UK: http://www.enterprisedb.com
>>>>>> >> >> The Enterprise PostgreSQL Company
>>>>>> >> >
>>>>>> >> >
>>>>>> >> >
>>>>>> >> > --
>>>>>> >> > Thanks and Regards,
>>>>>> >> > Aditya Toshniwal
>>>>>> >> > Software Engineer | EnterpriseDB Software Solutions | Pune
>>>>>> >> > "Don't Complain about Heat, Plant a tree"
>>>>>> >>
>>>>>> >>
>>>>>> >>
>>>>>> >> --
>>>>>> >> Dave Page
>>>>>> >> Blog: http://pgsnake.blogspot.com
>>>>>> >> Twitter: @pgsnake
>>>>>> >>
>>>>>> >> EnterpriseDB UK: http://www.enterprisedb.com
>>>>>> >> The Enterprise PostgreSQL Company
>>>>>> >
>>>>>> >
>>>>>> >
>>>>>> > --
>>>>>> > Thanks and Regards,
>>>>>> > Aditya Toshniwal
>>>>>> > Software Engineer | EnterpriseDB Software Solutions | Pune
>>>>>> > "Don't Complain about Heat, Plant a tree"
>>>>>>
>>>>>>
>>>>>>
>>>>>> --
>>>>>> Dave Page
>>>>>> Blog: http://pgsnake.blogspot.com
>>>>>> Twitter: @pgsnake
>>>>>>
>>>>>> EnterpriseDB UK: http://www.enterprisedb.com
>>>>>> The Enterprise PostgreSQL Company
>>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> Thanks and Regards,
>>>>> Aditya Toshniwal
>>>>> Software Engineer | EnterpriseDB Software Solutions | Pune
>>>>> "Don't Complain about Heat, Plant a tree"
>>>>>
>>>>
>>>>
>>>> --
>>>> Thanks and Regards,
>>>> Aditya Toshniwal
>>>> Software Engineer | EnterpriseDB Software Solutions | Pune
>>>> "Don't Complain about Heat, Plant a tree"
>>>>
>>>
>>>
>>> --
>>> *Akshay Joshi*
>>>
>>> *Sr. Software Architect *
>>>
>>>
>>>
>>> *Phone: +91 20-3058-9517Mobile: +91 976-788-8246*
>>>
>>
>>
>> --
>> Dave Page
>> VP, Chief Architect, Tools & Installers
>> EnterpriseDB: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>>
>> Blog: http://pgsnake.blogspot.com
>> Twitter: @pgsnake
>>
>
>
> --
> Thanks and Regards,
> Aditya Toshniwal
> Software Engineer | EnterpriseDB Software Solutions | Pune
> "Don't Complain about Heat, Plant a tree"
>
--
*Akshay Joshi*
*Sr. Software Architect *
*Phone: +91 20-3058-9517Mobile: +91 976-788-8246*
^ permalink raw reply [nested|flat] 29+ messages in thread
* Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 12:29 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
2018-12-21 13:59 ` Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica Dave Page <[email protected]>
@ 2018-12-21 14:02 ` Dave Page <[email protected]>
1 sibling, 0 replies; 29+ messages in thread
From: Dave Page @ 2018-12-21 14:02 UTC (permalink / raw)
To: Aditya Toshniwal <[email protected]>; +Cc: Ashesh Vashi <[email protected]>; pgadmin-hackers <[email protected]>; Akshay Joshi <[email protected]>; Chethana Kumar <[email protected]>; Khushboo Vashi <[email protected]>
And hopefully finally; it looks like the pop-out text editor on the
query tool results grid hasn't been updated.
On Fri, Dec 21, 2018 at 1:59 PM Dave Page <[email protected]> wrote:
>
> One other issue: I'm seeing that standard sized dialogues (e.g. the
> Server or Database Properties dialogues) are wrapping their labels and
> controls at the default size. That should not be the case.
>
> On Fri, Dec 21, 2018 at 12:46 PM Dave Page <[email protected]> wrote:
> >
> > Hi
> >
> > On Fri, Dec 21, 2018 at 12:29 PM Aditya Toshniwal
> > <[email protected]> wrote:
> > >
> > > Hi Dave,
> > >
> > > On Fri, Dec 21, 2018 at 5:51 PM Dave Page <[email protected]> wrote:
> > >>
> > >> Nice! Thanks Ashesh.
> > >>
> > >> Some small issues I spotted:
> > >>
> > >> - The font looks somewhat small. How does it compare in size to, say,
> > >> Gmail? I think it needs to be increased to at least that size.
> > >
> > > Gmail uses 0.875rem (14px) for the left panel (Inbox, Sent). We are using 0.875rem (14px) for main navbar links and 0.815rem(13.04px) for all other text.
> >
> > Let's increase the default to 0.875, and make the main links
> > proportionally bigger.
> >
> > >> - Dialogues have 2 close buttons next to each other in the top-right.
> > >> Looks like an icon and a text version?
> > >
> > > You need to do a yarn install. wcDocker code is changed to fix that.
> >
> > Yup, that fixed it.
> >
> > >> - Why do some Preferences panels use alternate line colouring, whilst
> > >> others don't? I suspect it's because some are actually tables under
> > >> the hood? I think we need consistency there.
> > >
> > > Noted.
> > >>
> > >>
> > >> - The Maintenance dialogue looks terrible - it needs to be made much
> > >> more compact. I also seem to be getting a failure to create
> > >> maintenance jobs (backups etc work fine).
> > >
> > > Noted.
> > >>
> > >>
> > >> - I think the buttons on the Browser need borders to match other buttons.
> > >
> > > It is made consistent with other wcDocker buttons like close, right arrow, left arrow. However, we can make it look like other buttons.
> >
> > I think they're a different class of buttons - control/navigation vs.
> > function. I think we should make this change as the browser buttons
> > really are a toolbar just like the larger on on the query tool.
> >
> > Thanks!
> >
> > >> Thanks!
> > >>
> > >> On Fri, Dec 21, 2018 at 12:01 PM Ashesh Vashi
> > >> <[email protected]> wrote:
> > >> >
> > >> > Improvement in the look and feel of the whole application
> > >> >
> > >> > Changed the SCSS/CSS for the below third party libraries to adopt the
> > >> > new look 'n' feel:
> > >> > - wcDocker
> > >> > - Alertify dialogs, and notifications
> > >> > - AciTree
> > >> > - Bootstrap Navbar
> > >> > - Bootstrap Tabs
> > >> > - Bootstrap Drop-Down menu
> > >> > - Backgrid
> > >> > - Select2
> > >> >
> > >> > Adopated the new the look 'n' feel for the dialogs, wizard, properties,
> > >> > tab panels, tabs, fieldset, subnode control, spinner control, HTML
> > >> > table, and other form controls.
> > >> >
> > >> > - Font is changed to Roboto
> > >> > - Using SCSS variables to define the look 'n' feel
> > >> > - Designer background images for the Login, and Forget password pages in
> > >> > 'web' mode
> > >> > - Improved the look 'n' feel for the key selection in the preferences
> > >> > dialog
> > >> > - Table classes consistency changes across the application
> > >> > - File Open and Save dialog list view changes
> > >> >
> > >> > Author(s): Aditya Toshniwal & Khushboo Vashi
> > >> >
> > >> > Branch
> > >> > ------
> > >> > master
> > >> >
> > >> > Details
> > >> > -------
> > >> > https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5799ac14ba17dc25fbec184b3b2c6afbe37f...
> > >> >
> > >> > Modified Files
> > >> > --------------
> > >> > web/package.json | 2 +-
> > >> > .../static/js/fts_configuration.js | 2 +-
> > >> > .../databases/schemas/functions/__init__.py | 4 +-
> > >> > .../function => static}/css/function.css | 0
> > >> > .../templates/trigger_function/css/function.css | 3 -
> > >> > .../{templates/edbfunc => static}/css/edbfunc.css | 0
> > >> > .../static/js/exclusion_constraint.js | 18 +-
> > >> > .../foreign_key/static/js/foreign_key.js | 17 +-
> > >> > .../schemas/tables/rules/static/css/rule.css | 7 +
> > >> > .../tables/rules/templates/rules/css/rule.css | 8 -
> > >> > .../databases/schemas/views/static/css/view.css | 7 +
> > >> > .../schemas/views/templates/mview/css/mview.css | 4 -
> > >> > .../schemas/views/templates/view/css/view.css | 4 -
> > >> > .../pgagent/schedules/static/js/pga_schedule.js | 3 +-
> > >> > .../servers/pgagent/static/css/pga_job.css | 3 +
> > >> > .../pgagent/templates/pga_job/css/pga_job.css | 13 -
> > >> > .../server_groups/servers/static/css/servers.css | 4 +
> > >> > .../server_groups/servers/static/js/server.js | 22 +-
> > >> > .../server_groups/servers/static/js/variable.js | 4 +-
> > >> > .../servers/tablespaces/static/js/tablespace.js | 13 +-
> > >> > .../servers/templates/css/servers.css | 4 -
> > >> > web/pgadmin/browser/static/css/browser.css | 13 -
> > >> > web/pgadmin/browser/static/css/wizard.css | 21 +-
> > >> > web/pgadmin/browser/static/js/browser.js | 26 +-
> > >> > web/pgadmin/browser/static/js/collection.js | 16 +-
> > >> > web/pgadmin/browser/static/js/keyboard.js | 14 +-
> > >> > web/pgadmin/browser/static/js/menu.js | 28 +-
> > >> > web/pgadmin/browser/static/js/node.js | 53 +-
> > >> > web/pgadmin/browser/static/js/node.ui.js | 4 +-
> > >> > web/pgadmin/browser/static/js/panel.js | 15 +-
> > >> > web/pgadmin/browser/static/js/toolbar.js | 3 -
> > >> > web/pgadmin/browser/static/js/wizard.js | 58 +-
> > >> > web/pgadmin/browser/static/scss/_browser.scss | 43 +-
> > >> > web/pgadmin/browser/static/scss/_wizard.scss | 41 +-
> > >> > web/pgadmin/browser/templates/browser/css/node.css | 2 +-
> > >> > web/pgadmin/browser/templates/browser/index.html | 9 +-
> > >> > web/pgadmin/dashboard/__init__.py | 2 +-
> > >> > web/pgadmin/dashboard/static/css/dashboard.css | 21 +-
> > >> > web/pgadmin/dashboard/static/js/dashboard.js | 120 +-
> > >> > web/pgadmin/dashboard/static/scss/_dashboard.scss | 44 +-
> > >> > .../templates/dashboard/database_dashboard.html | 171 ++-
> > >> > .../templates/dashboard/server_dashboard.html | 197 ++-
> > >> > .../templates/dashboard/welcome_dashboard.html | 30 +-
> > >> > web/pgadmin/feature_tests/browser_tool_bar_test.py | 23 +-
> > >> > web/pgadmin/feature_tests/file_manager_test.py | 23 +-
> > >> > .../feature_tests/keyboard_shortcut_test.py | 5 +-
> > >> > .../feature_tests/pg_datatype_validation_test.py | 5 +-
> > >> > .../pg_utilities_backup_restore_test.py | 28 +-
> > >> > .../feature_tests/pg_utilities_maintenance_test.py | 16 +-
> > >> > .../feature_tests/query_tool_journey_test.py | 5 +-
> > >> > web/pgadmin/feature_tests/query_tool_tests.py | 117 +-
> > >> > web/pgadmin/feature_tests/view_data_dml_queries.py | 16 +-
> > >> > .../misc/bgprocess/static/css/bgprocess.css | 11 -
> > >> > web/pgadmin/misc/bgprocess/static/js/bgprocess.js | 173 ++-
> > >> > .../misc/bgprocess/static/scss/_bgprocess.scss | 81 +-
> > >> > web/pgadmin/misc/depends/static/js/depends.js | 3 +-
> > >> > .../misc/file_manager/static/css/file_manager.css | 141 +-
> > >> > .../misc/file_manager/static/js/create_dialogue.js | 9 +-
> > >> > .../misc/file_manager/static/js/select_dialogue.js | 19 +-
> > >> > web/pgadmin/misc/file_manager/static/js/utility.js | 77 +-
> > >> > .../file_manager/static/scss/_file_manager.scss | 157 +--
> > >> > .../file_manager/templates/file_manager/index.html | 95 +-
> > >> > .../misc/statistics/static/js/statistics.js | 3 +-
> > >> > web/pgadmin/preferences/static/css/preferences.css | 14 -
> > >> > web/pgadmin/preferences/static/js/preferences.js | 31 +-
> > >> > .../preferences/static/scss/_preferences.scss | 16 +
> > >> > web/pgadmin/static/css/pgadmin.css | 81 +-
> > >> > web/pgadmin/static/fonts/Roboto-Bold.ttf | Bin 0 -> 170760 bytes
> > >> > web/pgadmin/static/fonts/Roboto-Medium.ttf | Bin 0 -> 172064 bytes
> > >> > web/pgadmin/static/fonts/Roboto-Regular.ttf | Bin 0 -> 171676 bytes
> > >> > web/pgadmin/static/img/collapse_expand.svg | 15 +
> > >> > web/pgadmin/static/img/forgot_password.svg | 283 ++++
> > >> > web/pgadmin/static/img/login.svg | 1 +
> > >> > web/pgadmin/static/js/alertify.pgadmin.defaults.js | 82 +-
> > >> > web/pgadmin/static/js/backform.pgadmin.js | 80 +-
> > >> > web/pgadmin/static/js/backgrid.pgadmin.js | 33 +-
> > >> > web/pgadmin/static/js/slickgrid/editors.js | 8 +-
> > >> > web/pgadmin/static/js/sqleditor/filter_dialog.js | 33 +-
> > >> > .../static/js/sqleditor/query_tool_preferences.js | 15 +-
> > >> > web/pgadmin/static/scss/_aci_tree.overrides.scss | 75 +-
> > >> > web/pgadmin/static/scss/_alert.scss | 12 +-
> > >> > web/pgadmin/static/scss/_alertify.overrides.scss | 150 +-
> > >> > web/pgadmin/static/scss/_backform.overrides.scss | 8 +
> > >> > web/pgadmin/static/scss/_backgrid.overrides.scss | 251 +++-
> > >> > web/pgadmin/static/scss/_bootstrap.overrides.scss | 230 ++--
> > >> > web/pgadmin/static/scss/_codemirror.overrides.scss | 94 +-
> > >> > web/pgadmin/static/scss/_pgadmin.grid.scss | 56 +
> > >> > web/pgadmin/static/scss/_pgadmin.style.scss | 1440 +++++---------------
> > >> > web/pgadmin/static/scss/_select2.overrides.scss | 24 +-
> > >> > web/pgadmin/static/scss/_webcabin.overrides.scss | 368 -----
> > >> > web/pgadmin/static/scss/_webcabin.pgadmin.scss | 250 ++++
> > >> > web/pgadmin/static/scss/pgadmin.scss | 10 +-
> > >> > .../static/scss/resources/_default.style.scss | 90 +-
> > >> > .../static/scss/resources/_default.variables.scss | 203 ++-
> > >> > web/pgadmin/static/vendor/backform/backform.js | 645 +++++++++
> > >> > .../templates/security/change_password.html | 43 +-
> > >> > .../templates/security/forgot_password.html | 9 +-
> > >> > web/pgadmin/templates/security/login_user.html | 16 +-
> > >> > web/pgadmin/templates/security/panel.html | 23 +-
> > >> > web/pgadmin/tools/backup/__init__.py | 6 +-
> > >> > web/pgadmin/tools/backup/static/js/backup.js | 8 +-
> > >> > .../backup/static/js/backup_dialog_wrapper.js | 22 +-
> > >> > web/pgadmin/tools/datagrid/__init__.py | 1 -
> > >> > web/pgadmin/tools/datagrid/static/js/datagrid.js | 38 +-
> > >> > .../tools/datagrid/templates/datagrid/filter.html | 2 -
> > >> > .../tools/datagrid/templates/datagrid/index.html | 193 ++-
> > >> > web/pgadmin/tools/debugger/static/css/debugger.css | 34 +-
> > >> > web/pgadmin/tools/debugger/static/js/debugger.js | 2 +-
> > >> > .../tools/debugger/static/js/debugger_ui.js | 28 +-
> > >> > web/pgadmin/tools/debugger/static/js/direct.js | 13 +-
> > >> > .../tools/debugger/static/scss/_debugger.scss | 8 -
> > >> > .../tools/debugger/templates/debugger/direct.html | 89 +-
> > >> > .../tools/grant_wizard/static/js/grant_wizard.js | 27 +-
> > >> > .../grant_wizard/static/scss/_grant_wizard.scss | 31 +-
> > >> > .../tools/import_export/static/js/import_export.js | 24 +-
> > >> > web/pgadmin/tools/maintenance/__init__.py | 10 +-
> > >> > .../tools/maintenance/static/js/maintenance.js | 24 +-
> > >> > .../maintenance/static/scss/_maintenance.scss | 2 +-
> > >> > web/pgadmin/tools/restore/__init__.py | 14 +-
> > >> > web/pgadmin/tools/restore/static/js/restore.js | 8 +-
> > >> > .../restore/static/js/restore_dialog_wrapper.js | 24 +-
> > >> > .../tools/sqleditor/static/css/sqleditor.css | 128 +-
> > >> > web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 35 +-
> > >> > .../tools/sqleditor/static/scss/_history.scss | 42 +-
> > >> > .../tools/sqleditor/static/scss/_sqleditor.scss | 128 +-
> > >> > .../user_management/static/css/user_management.css | 37 -
> > >> > .../user_management/static/js/user_management.js | 53 +-
> > >> > .../static/scss/_user_management.scss | 12 +-
> > >> > .../javascript/alerts/alertify_wrapper_spec.js | 4 +-
> > >> > .../backup/backup_dialog_wrapper_spec.js | 8 +-
> > >> > .../restore/restore_dialog_wrapper_spec.js | 8 +-
> > >> > web/webpack.config.js | 2 +-
> > >> > web/webpack.shim.js | 2 +-
> > >> > web/webpack.test.config.js | 1 +
> > >> > web/yarn.lock | 1015 +++++++++++++-
> > >> > 135 files changed, 5002 insertions(+), 3850 deletions(-)
> > >> >
> > >>
> > >>
> > >> --
> > >> Dave Page
> > >> Blog: http://pgsnake.blogspot.com
> > >> Twitter: @pgsnake
> > >>
> > >> EnterpriseDB UK: http://www.enterprisedb.com
> > >> The Enterprise PostgreSQL Company
> > >
> > >
> > >
> > > --
> > > Thanks and Regards,
> > > Aditya Toshniwal
> > > Software Engineer | EnterpriseDB Software Solutions | Pune
> > > "Don't Complain about Heat, Plant a tree"
> >
> >
> >
> > --
> > Dave Page
> > Blog: http://pgsnake.blogspot.com
> > Twitter: @pgsnake
> >
> > EnterpriseDB UK: http://www.enterprisedb.com
> > The Enterprise PostgreSQL Company
>
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
^ permalink raw reply [nested|flat] 29+ messages in thread
end of thread, other threads:[~2019-01-17 07:57 UTC | newest]
Thread overview: 29+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2018-12-21 12:01 pgAdmin 4 commit: Improvement in the look and feel of the whole applica Ashesh Vashi <[email protected]>
2018-12-21 12:21 ` Dave Page <[email protected]>
2018-12-21 12:29 ` Aditya Toshniwal <[email protected]>
2018-12-21 12:46 ` Dave Page <[email protected]>
2018-12-21 13:59 ` Dave Page <[email protected]>
2018-12-21 14:01 ` Aditya Toshniwal <[email protected]>
2018-12-21 14:05 ` Dave Page <[email protected]>
2018-12-21 14:13 ` Aditya Toshniwal <[email protected]>
2018-12-21 14:16 ` Dave Page <[email protected]>
2018-12-21 14:18 ` Aditya Toshniwal <[email protected]>
2019-01-01 05:39 ` Aditya Toshniwal <[email protected]>
2019-01-02 05:52 ` Aditya Toshniwal <[email protected]>
2019-01-02 09:39 ` Akshay Joshi <[email protected]>
2019-01-03 10:20 ` Aditya Toshniwal <[email protected]>
2019-01-03 15:09 ` Dave Page <[email protected]>
2019-01-04 04:51 ` Aditya Toshniwal <[email protected]>
2019-01-04 09:23 ` Dave Page <[email protected]>
2019-01-04 09:58 ` Aditya Toshniwal <[email protected]>
2019-01-04 10:01 ` Dave Page <[email protected]>
2019-01-07 05:14 ` Aditya Toshniwal <[email protected]>
2019-01-07 08:54 ` Dave Page <[email protected]>
2019-01-07 09:47 ` Aditya Toshniwal <[email protected]>
2019-01-14 05:24 ` Aditya Toshniwal <[email protected]>
2019-01-15 09:13 ` Aditya Toshniwal <[email protected]>
2019-01-16 06:29 ` Akshay Joshi <[email protected]>
2019-01-16 14:59 ` Dave Page <[email protected]>
2019-01-17 06:29 ` Aditya Toshniwal <[email protected]>
2019-01-17 07:57 ` Akshay Joshi <[email protected]>
2018-12-21 14:02 ` Dave Page <[email protected]>
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox