Hi Hackers,
Attached is part 3 of the patch, to be applied after part 2. Urgh, I know
this is annoying, but I am trying to fix and send patches as and when I
find them. This patch includes fix for hiding controls. Backform used
"hidden" class for hiding elements, and hidden is replaced with d-none in
Bootstrap 4.
One more big miss - debugger button toolbar was not visible/or in position.
Fixed that as well.
Let me know if you find more. :/
On Thu, Oct 11, 2018 at 3:38 PM Aditya Toshniwal <
aditya.toshni...@enterprisedb.com> wrote:
> Hi Hackers,
>
> Team found few more issues. Calendar control totally messed up. The
> bootstrap-datetimepicker package does not work with Bootstrap 4.
> Fortunately, there exists one package which is advanced version of the
> same - https://tempusdominus.github.io/bootstrap-4/. With minimum changes
> I am able bring back the calendar control. (Create Role -> Account expiry)
> Also fixed sort filter dropdown in query tool.
>
> Kindly review.
>
>
> On Wed, Oct 10, 2018 at 5:16 PM Dave Page <dp...@pgadmin.org> wrote:
>
>> Thanks, patch applied.
>>
>> On Wed, Oct 10, 2018 at 11:41 AM Aditya Toshniwal <
>> aditya.toshni...@enterprisedb.com> wrote:
>>
>>> Ohh :/
>>> Attached is the rebased patch - v4.
>>>
>>> On Wed, Oct 10, 2018 at 3:55 PM Dave Page <dp...@pgadmin.org> wrote:
>>>
>>>> Hi
>>>>
>>>> Did you rebase this? It doesn't apply for me:
>>>>
>>>> (pgadmin4) dpage@hal:*~/git/pgadmin4*$ git apply
>>>> ~/Downloads/RM3562_v3.patch
>>>>
>>>> error: patch failed: web/pgadmin/static/scss/_select2.overrides.scss:2
>>>>
>>>> error: web/pgadmin/static/scss/_select2.overrides.scss: patch does not
>>>> apply
>>>>
>>>> /Users/dpage/Downloads/RM3562_v3.patch:6137: new blank line at EOF.
>>>>
>>>> +
>>>>
>>>> On Wed, Oct 10, 2018 at 11:23 AM Aditya Toshniwal <
>>>> aditya.toshni...@enterprisedb.com> wrote:
>>>>
>>>>> Hi,
>>>>>
>>>>> Attached is the updated patch - v3. I missed the user login related
>>>>> stuffs. The patch includes changes for those.
>>>>> I have also changed the colour style of login page.
>>>>>
>>>>> Kindly review.
>>>>>
>>>>> On Tue, Oct 9, 2018 at 4:18 PM Dave Page <dp...@pgadmin.org> wrote:
>>>>>
>>>>>> Hi
>>>>>>
>>>>>> Almost there - unfortunately I found another couple of issues in
>>>>>> server mode (placement of the username, and formatting of the menu).
>>>>>> Please
>>>>>> see the attached screenshot.
>>>>>>
>>>>>> Regards, Dave.
>>>>>>
>>>>>> On Tue, Oct 9, 2018 at 10:13 AM Aditya Toshniwal <
>>>>>> aditya.toshni...@enterprisedb.com> wrote:
>>>>>>
>>>>>>> Hi Hackers,
>>>>>>>
>>>>>>> Attached it the updated patch v2.
>>>>>>> Kindly review.
>>>>>>>
>>>>>>>
>>>>>>> On Mon, Oct 8, 2018 at 5:55 PM Aditya Toshniwal <
>>>>>>> aditya.toshni...@enterprisedb.com> wrote:
>>>>>>>
>>>>>>>> Hi,
>>>>>>>>
>>>>>>>> On Mon, Oct 8, 2018 at 4:06 PM Dave Page <dp...@pgadmin.org> wrote:
>>>>>>>>
>>>>>>>>> Hi
>>>>>>>>>
>>>>>>>>> On Fri, Oct 5, 2018 at 1:51 PM Aditya Toshniwal <
>>>>>>>>> aditya.toshni...@enterprisedb.com> wrote:
>>>>>>>>>
>>>>>>>>>> Hi Hackers,
>>>>>>>>>>
>>>>>>>>>> Attached is the patch to migrate pgAdmin4 currently based on
>>>>>>>>>> Bootstrap 3, to be Bootstrap 4 compatible. The idea is to move to
>>>>>>>>>> Bootstrap
>>>>>>>>>> 4 with minimum possible changes in pgAdmin4. I have also used
>>>>>>>>>> bootstrap
>>>>>>>>>> scss (and not the dist file of bootstrap) to customize bootstrap as
>>>>>>>>>> per the
>>>>>>>>>> need of pgAdmin4.
>>>>>>>>>> I have done a basic testing. It may not look alike to that with
>>>>>>>>>> Bootstrap 3, but it is possible that you may find some discrepancy
>>>>>>>>>> (which
>>>>>>>>>> was proper before :P ). Kindly let me know.
>>>>>>>>>>
>>>>>>>>>
>>>>>>>>> Looks good. I spotted a couple of issues though:
>>>>>>>>>
>>>>>>>>> - The menu bar is a different colour now (dark grey rather than
>>>>>>>>> black). Not the end of the world, but I thought I'd mention it.
>>>>>>>>>
>>>>>>>> I thought of keeping the bootstrap default dark color. Will customize
>>>>>>>> it to black.
>>>>>>>>
>>>>>>>
>>>>>>>>> - The subnode control has lost some of it's styling. This does
>>>>>>>>> need to be fixed I think. See the attached screenshot ( boostrap 3 is
>>>>>>>>> on
>>>>>>>>> the left).
>>>>>>>>>
>>>>>>>> Yes. Will send the fix with updated patch.
>>>>>>>>
>>>>>>>
>>>>>>>>> Thanks.
>>>>>>>>>
>>>>>>>>>
>>>>>>>>> --
>>>>>>>>> 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"
>>>>>>>
>>>>>>
>>>>>>
>>>>>> --
>>>>>> 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"
diff --git a/web/pgadmin/browser/static/js/node.js b/web/pgadmin/browser/static/js/node.js
index a7f43974..695d6636 100644
--- a/web/pgadmin/browser/static/js/node.js
+++ b/web/pgadmin/browser/static/js/node.js
@@ -395,7 +395,7 @@ define('pgadmin.browser.node', [
success: function() {
// Clear timeout and remove message
clearTimeout(timer);
- $msgDiv.addClass('hidden');
+ $msgDiv.addClass('d-none');
// We got the latest attributes of the object. Render the view
// now.
diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js
index 7bfbcb90..06154c14 100644
--- a/web/pgadmin/static/js/backform.pgadmin.js
+++ b/web/pgadmin/static/js/backform.pgadmin.js
@@ -28,6 +28,7 @@ define([
setGroupClassName: 'set-group pg-el-xs-12',
tabClassName: 'backform-tab pg-el-xs-12',
setGroupContentClassName: 'fieldset-content pg-el-xs-12',
+ hiddenClassName: 'd-none',
});
Backform.controlMapper = {
diff --git a/web/pgadmin/static/scss/_bootstrap.overrides.scss b/web/pgadmin/static/scss/_bootstrap.overrides.scss
index 078053bc..22dd377d 100644
--- a/web/pgadmin/static/scss/_bootstrap.overrides.scss
+++ b/web/pgadmin/static/scss/_bootstrap.overrides.scss
@@ -250,3 +250,8 @@ td.switch-cell > div.bootstrap-switch {
background-color: $input-disabled-bg !important;
opacity: 1;
}
+
+
+.btn-toolbar {
+ min-width: 100%;
+}
diff --git a/web/pgadmin/static/scss/_pgadmin.style.scss b/web/pgadmin/static/scss/_pgadmin.style.scss
index 92cdf46a..63867e69 100644
--- a/web/pgadmin/static/scss/_pgadmin.style.scss
+++ b/web/pgadmin/static/scss/_pgadmin.style.scss
@@ -935,6 +935,7 @@ lgg-el-container[el=md] .pg-el-lg-8,
}
.pg-prop-btn-group {
+ min-width: 100%;
left: 0px;
right: 0px;
padding: 2px;
diff --git a/web/pgadmin/tools/debugger/templates/debugger/direct.html b/web/pgadmin/tools/debugger/templates/debugger/direct.html
index f1a64032..efbff876 100644
--- a/web/pgadmin/tools/debugger/templates/debugger/direct.html
+++ b/web/pgadmin/tools/debugger/templates/debugger/direct.html
@@ -36,8 +36,8 @@ try {
</style>
{% endif %}
<div class="debugger_main_container" tabindex="0">
- <nav class="navbar-inverse navbar-fixed-top">
- <div id="btn-toolbar" class="btn-toolbar pg-prop-btn-group bg-gray-lighter border-gray-light" role="toolbar" aria-label="">
+ <nav class="navbar navbar-expand-lg fixed-top">
+ <div id="btn-toolbar" class="pg-prop-btn-group bg-gray-lighter border-gray-light" role="toolbar" aria-label="">
<div class="btn-group" role="group" aria-label="">
<button type="button" class="btn btn-default btn-step-into" id="btn-step-into"
title=""
