Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make sidebar collapsible #201

Merged
merged 9 commits into from
Oct 18, 2021
Merged

make sidebar collapsible #201

merged 9 commits into from
Oct 18, 2021

Conversation

TiziG
Copy link
Contributor

@TiziG TiziG commented Sep 22, 2021

remove unnecessary overflow:visible (#sidebar_plugin_SpoolManager) css rule because it overrides the visibility setting in the .collapse class.

This fixes issue #197

@TiziG
make sidebar collapsible
e92afe4 
remove unnecessary overflow:visible (#sidebar_plugin_SpoolManager) css rule because it overrides the visibility setting in the .collapse class.
@TiziG TiziG marked this pull request as ready for review September 22, 2021 00:43
@Alokin90
Copy link

Alokin90 commented Sep 28, 2021 •
edited
Loading

This will make the dropdown-menu being cut at the bottom as a result of it. In order to avoid this, the button dropdown-toggle and the dropdown-menu can be moved on the right side of the accordion-heading, just like the "Files" widget does.
When the widget is collapsed the dropdown-toggle button should disappear.
With dropdown-menu out of the collapsible accordion-body, it will not suffer from overflow:hidden and this commit is acceptable.

I was looking for a way to include code in the heading of the sidebar widget, probably a solution like the one used for the Files widget here https://github.com/OctoPrint/OctoPrint/blob/a811f191f2992b8e8f4a10ed337ce1f2421fd165/src/octoprint/templates/sidebar/files_header.jinja2

@Alokin90 Alokin90 mentioned this pull request Sep 29, 2021
Closed
MarloSM added a commit to MarloSM/OctoPrint-SpoolManager that referenced this pull request Oct 11, 2021
@MarloSM
Make sidebar collapsible
aff9097 
After looking at OllisGit#201, I realise that simply removing the overflow won't do. Changing it to #sidebar_plugin_SpoolManager.collapse.in makes it work.
@MarloSM MarloSM mentioned this pull request Oct 11, 2021
Merged
TiziG added 3 commits October 16, 2021 02:28
@TiziG
use a modal dialog for sidebar spool selection
06d0c33
@TiziG
disable the pointer style cursor when hovering over color preview (si…
72bc334 
…debar)

- set cursor to auto because the color preview is not clickable
@TiziG
change css margin of the selected spools list (sidebar)
c8cbcfa 
- results in a more balanced whitespace distribution
@TiziG
Copy link
Contributor Author

TiziG commented Oct 16, 2021 •
edited
Loading

I replaced the dropdown with a modal dialog.

Please let me know if I missed something.

Changes

  • Removed the dropdown buttons
  • Created a modal dialog for selecting spools
  • Added change filament buttons
  • Moved the filter checkboxes into the new dialog

Screenshots

sidebar

sidebar_modal

@TiziG
Copy link
Contributor Author

TiziG commented Oct 16, 2021

Also fixed #190

OllisGit pushed a commit that referenced this pull request Oct 17, 2021
@MarloSM
Make sidebar collapsible (#204)
00293e9 
After looking at #201, I realise that simply removing the overflow won't do. Changing it to #sidebar_plugin_SpoolManager.collapse.in makes it work.
@OllisGit
Copy link
Owner

Hi @TiziG,
thanks a lot for your effort!

Adding a separate selection dialog was also on my list, because in the dialog it's possible to add more filters for the selection.
And, maybe the best thing of this "feature" is that it is now possible to reuse this dialog for the confirmation-dialog before printing.
The drawback of course is, it is now not possible to do a "quick-selection" from the sidebar...maybe a later enhancement as well.

I will take a closer look into implementation, after that it is in the next release.

@OllisGit OllisGit added status: inNextRelease Will be implemented/fixed in next release and removed status: analysing labels Oct 18, 2021
@OllisGit OllisGit merged commit 0715e5f into OllisGit:master Oct 18, 2021
OllisGit added a commit that referenced this pull request Oct 24, 2021
@OllisGit
New Version 1.5.0
b1d9080 
- PR #204, #201 redesign of the Spool-Selection in the sidebar. Huge thanks to @TiziG @MarloSM
- E #125 New field "Serialnumber"
- E Spool selection from Edit-Dialog
- E #141 New Filter: Material, Vendor and Color
- E #44 Sidebar filament usage in grams instead of volume

- B #199, #198, #163, #156 some QR-Code optimisations
- B #197, #196, #188, #181, #178, #177, #172, #162, #142,  Some UI optimisations
- B #194 CSV import, behind reverse proxy
- B #175 Confirm dialog not shown
@OllisGit
Copy link
Owner

Hi @TiziG,

the new release 1.5.0 with you PR is out now....next part is your PR about weight-management #206

...but I think I need to switch to PrintJobHistory-Plugin there is also a lot of stuff to do.

@OllisGit OllisGit removed the status: inNextRelease Will be implemented/fixed in next release label Oct 24, 2021
@TiziG
Copy link
Contributor Author

TiziG commented Oct 24, 2021

@OllisGit thanks for merging. Let me know if I can help with something.

@OllisGit
Copy link
Owner

OllisGit commented Nov 3, 2021

@TiziG

Let me know if I can help with something.

Well...maybe you can update your other pull request #206 , so that there is no merge conflict ay more ;-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TiziG @Alokin90 @OllisGit