#204 User sub-menu added to sidebar + focus issue fixed
Merged by jflory7. Opened by phoenixabhishek.
fedora-commops/ phoenixabhishek/fedora-happiness-packets master  into  master

Download 204.patch

As per discussed here

User submenu has been added to sidebar with a rotating (based on expand/collapse state) arrow.
Send some happiness link is always visible (removed not logged-in condition)

Other fixes:
Focus issue on the sidebar links fixed.

(The bootstrap.bundle and jQuery 3.x files added are needed for this change to work)

rebased onto 2f95aaa9c4ab77b3ba08aa41befaa1863da5249c

Metadata Update from @jflory7:
- Pull-request tagged with: PASSED, improvement, needs testing, type - frontend, type - summer coding

Metadata Update from @jflory7:
- Pull-request untagged with: needs testing
- Pull-request tagged with: needs changes

Hey @phoenixabhishek, a merge conflict came up. :confused: Could you take a look and rebase your pull request on master? Thanks for your patience.

rebased onto c0d7c0686b001f5dd525e9eff6b49c05d85d4429

phoenixabhishek commented

Hi @jflory7 ,
I rebased the PR; but while resolving the conflict in templates/base.html there was a script tag for jquery.
This script was loaded from a third-party site.
In my PR, I have included the jQuery file in our own assets; so for now I have just commented it out since I don't know what was it added for.

Will this work, or should I uncomment it and let it be..???

Hi @jflory7 ,
I rebased the PR; but while resolving the conflict in templates/base.html there was a script tag for jquery.
This script was loaded from a third-party site.
In my PR, I have included the jQuery file in our own assets; so for now I have just commented it out since I don't know what was it added for.
Will this work, or should I uncomment it and let it be..???

jQuery is used by the fas_deatils.js file, which is necessary for the working of FAS-Search. Since the working is not tested with the jQuery file that is included by you, it might break the code. For now can you use the linked JQuery instead of including it in our own assets. I suppose after testing we can include it. Am I making sense @phoenix1796 ?

phoenixabhishek commented

@alishapapun will you be able to test FAS-Search with jQuery v3.3.1 ?
The code included serves jQuery v1.11.1 so it should work with v3.3.1 which is the version of file I have included.

Thanks :smile:

rebased onto 1b775a05303dd476dc61f23a7eb3000ed4b3f328

Hi @phoenixabhishek, I tested this and the changes look great. Thanks for working on this! :tada: Merging.

Metadata Update from @jflory7:
- Pull-request untagged with: needs changes
- Request assigned

Pull-Request has been merged by jflory7