Skip to content

Commit 6e343ea

Browse files
committed
New Version 1.6.1
- B #223 Hide database not working message - B #230 dropdown-menu removed. fixing UICustomizer
1 parent 02e6231 commit 6e343ea

File tree

5 files changed

+15
-16
lines changed

5 files changed

+15
-16
lines changed

.github/workflows/github-release-actions.yml

+6
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ jobs:
6060
6161
## Counter
6262
![downloaded](https://img.shields.io/github/downloads/OllisGit/${{ steps.branch.outputs.repo_name }}/${{ steps.version.outputs.version }}/total)
63+
64+
## Support my Efforts
65+
This plugin, as well as my [other plugins](https://github.com/OllisGit/) were developed in my spare time.
66+
If you like it, I would be thankful about a cup of coffee :)
67+
68+
[![More coffee, more code](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6SW5R6ZUKLB5E&source=url)
6369
# body_path: RELEASE_TEMPLATE.md
6470

6571
- name: upload master.zip to release

octoprint_SpoolManager/static/css/SpoolManager.css

-7
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,6 @@
9090
text-overflow: ellipsis;
9191
}
9292

93-
/* TODO Maybe not needed any more*/
94-
.dropdown-menu {
95-
max-height: 120px;
96-
overflow-y: auto;
97-
overflow-x: hidden;
98-
}
99-
10093
/* use of own span elemenst so that no one can break it (e.g. UI Customizer) */
10194
.myspan12{width:940px}
10295
.myspan11{width:860px}

octoprint_SpoolManager/templates/SpoolManager_dialog_selectSpool.jinja2

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<span class="dropdown tabdrop">
6767
<a href="#" data-toggle="dropdown" class="dropdown-toggle">Material (<span data-bind="text: sidebarFilterSorter.buildFilterLabel('material')" ></span>)
6868
<b class="caret"></b></a>
69-
<ul class="dropdown-menu keep-open" style="padding-left:10px" >
69+
<ul class="dropdown-menu keep-open pre-scrollable" style="padding-left:10px" >
7070
<li>
7171
<div class="checkbox">
7272
<label>
@@ -89,7 +89,7 @@
8989
<span class="dropdown tabdrop">
9090
| <a href="#" data-toggle="dropdown" class="dropdown-toggle">Vendor (<span data-bind="text: sidebarFilterSorter.buildFilterLabel('vendor')" ></span>)
9191
<b class="caret"></b></a>
92-
<ul class="dropdown-menu keep-open" style="padding-left:10px" >
92+
<ul class="dropdown-menu keep-open pre-scrollable" style="padding-left:10px" >
9393
<li>
9494
<div class="checkbox">
9595
<label>
@@ -113,7 +113,7 @@
113113
| <a href="#" data-toggle="dropdown" class="dropdown-toggle">Color (<span data-bind="text: sidebarFilterSorter.buildFilterLabel('color')" ></span>)
114114
<b class="caret"></b></a>
115115

116-
<ul class="dropdown-menu keep-open" style="padding-left:10px" >
116+
<ul class="dropdown-menu keep-open pre-scrollable" style="padding-left:10px" >
117117
<li>
118118
<div class="checkbox">
119119
<label>

octoprint_SpoolManager/templates/SpoolManager_tab.jinja2

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55

66
<!-- Filter / Sorting -->
7-
<div class="row-fluid" data-bind="visible: pluginNotWorking()==true">
8-
<div>
7+
<div data-bind="visible: pluginNotWorking()==true">
8+
<div class="row-fluid" >
99
<font color="red"><b>Plugin not working, because of Database issues. Check Plugin-Settings!</b></font>
1010
</div>
1111
</div>
@@ -56,7 +56,7 @@
5656
{# ? 'all' : spoolItemTableHelper.selectedMaterialsForFilter().length" ></span>)#}
5757
<a href="#" data-toggle="dropdown" class="dropdown-toggle">Material (<span data-bind="text: spoolItemTableHelper.buildFilterLabel('material')" ></span>)
5858
<b class="caret"></b></a>
59-
<ul class="dropdown-menu keep-open" style="padding-left:10px" >
59+
<ul class="dropdown-menu keep-open pre-scrollable" style="padding-left:10px" >
6060
<li>
6161
<div class="checkbox">
6262
<label>
@@ -79,7 +79,7 @@
7979
<span class="dropdown tabdrop">
8080
| <a href="#" data-toggle="dropdown" class="dropdown-toggle">Vendor (<span data-bind="text: spoolItemTableHelper.buildFilterLabel('vendor')" ></span>)
8181
<b class="caret"></b></a>
82-
<ul class="dropdown-menu keep-open" style="padding-left:10px" >
82+
<ul class="dropdown-menu keep-open pre-scrollable" style="padding-left:10px" >
8383
<li>
8484
<div class="checkbox">
8585
<label>
@@ -103,7 +103,7 @@
103103
| <a href="#" data-toggle="dropdown" class="dropdown-toggle">Color (<span data-bind="text: spoolItemTableHelper.buildFilterLabel('color')" ></span>)
104104
<b class="caret"></b></a>
105105

106-
<ul class="dropdown-menu keep-open" style="padding-left:10px" >
106+
<ul class="dropdown-menu keep-open pre-scrollable" style="padding-left:10px" >
107107
<li>
108108
<div class="checkbox">
109109
<label>

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
# The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
1717
#
18-
plugin_version = "1.6.0"
18+
plugin_version = "1.6.1"
1919

2020
# The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
2121
# module

0 commit comments

Comments
 (0)