New Version 1.6.1

- B #223 Hide database not working message - B #230 dropdown-menu removed. fixing UICustomizer
OllisGit · Jan 31, 2022 · 6e343ea · 6e343ea
1 parent 02e6231
commit 6e343ea
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/.github/workflows/github-release-actions.yml b/.github/workflows/github-release-actions.yml
@@ -60,6 +60,12 @@ jobs:
 
             ## Counter
             ![downloaded](https://img.shields.io/github/downloads/OllisGit/${{ steps.branch.outputs.repo_name }}/${{ steps.version.outputs.version }}/total)
+
+            ## Support my Efforts
+            This plugin, as well as my [other plugins](https://github.com/OllisGit/) were developed in my spare time.
+            If you like it, I would be thankful about a cup of coffee :)
+
+            [![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)
 #          body_path: RELEASE_TEMPLATE.md
 
       - name: upload master.zip to release

diff --git a/octoprint_SpoolManager/static/css/SpoolManager.css b/octoprint_SpoolManager/static/css/SpoolManager.css
@@ -90,13 +90,6 @@
     text-overflow: ellipsis;
 }
 
-/* TODO Maybe not needed any more*/
-.dropdown-menu {
-    max-height: 120px;
-    overflow-y: auto;
-    overflow-x: hidden;
-}
-
 /*   use of own span elemenst so that no one can break it (e.g. UI Customizer) */
 .myspan12{width:940px}
 .myspan11{width:860px}

diff --git a/octoprint_SpoolManager/templates/SpoolManager_dialog_selectSpool.jinja2 b/octoprint_SpoolManager/templates/SpoolManager_dialog_selectSpool.jinja2
@@ -66,7 +66,7 @@
                         <span class="dropdown  tabdrop">
                             <a href="#" data-toggle="dropdown" class="dropdown-toggle">Material (<span data-bind="text: sidebarFilterSorter.buildFilterLabel('material')" ></span>)
                             <b class="caret"></b></a>
-                            <ul class="dropdown-menu keep-open" style="padding-left:10px" >
+                            <ul class="dropdown-menu keep-open pre-scrollable" style="padding-left:10px" >
                                 <li>
                                     <div class="checkbox">
                                         <label>
@@ -89,7 +89,7 @@
                         <span class="dropdown  tabdrop">
                             |  <a href="#" data-toggle="dropdown" class="dropdown-toggle">Vendor (<span data-bind="text: sidebarFilterSorter.buildFilterLabel('vendor')" ></span>)
                                 <b class="caret"></b></a>
-                            <ul class="dropdown-menu keep-open" style="padding-left:10px" >
+                            <ul class="dropdown-menu keep-open pre-scrollable" style="padding-left:10px" >
                                 <li>
                                     <div class="checkbox">
                                         <label>
@@ -113,7 +113,7 @@
                             |  <a href="#" data-toggle="dropdown" class="dropdown-toggle">Color (<span data-bind="text: sidebarFilterSorter.buildFilterLabel('color')" ></span>)
                                 <b class="caret"></b></a>
 
-                            <ul class="dropdown-menu keep-open" style="padding-left:10px" >
+                            <ul class="dropdown-menu keep-open pre-scrollable" style="padding-left:10px" >
                                 <li>
                                     <div class="checkbox">
                                         <label>

diff --git a/octoprint_SpoolManager/templates/SpoolManager_tab.jinja2 b/octoprint_SpoolManager/templates/SpoolManager_tab.jinja2
@@ -4,8 +4,8 @@
 
 
     <!-- Filter / Sorting -->
-    <div class="row-fluid" data-bind="visible: pluginNotWorking()==true">
-        <div>
+    <div data-bind="visible: pluginNotWorking()==true">
+        <div class="row-fluid" >
             <font color="red"><b>Plugin not working, because of Database issues. Check Plugin-Settings!</b></font>
         </div>
     </div>
@@ -56,7 +56,7 @@
 {#                                                                                                                        ? 'all' : spoolItemTableHelper.selectedMaterialsForFilter().length" ></span>)#}
                             <a href="#" data-toggle="dropdown" class="dropdown-toggle">Material (<span data-bind="text: spoolItemTableHelper.buildFilterLabel('material')" ></span>)
                             <b class="caret"></b></a>
-                            <ul class="dropdown-menu keep-open" style="padding-left:10px" >
+                            <ul class="dropdown-menu keep-open pre-scrollable" style="padding-left:10px" >
                                 <li>
                                     <div class="checkbox">
                                         <label>
@@ -79,7 +79,7 @@
                         <span class="dropdown  tabdrop">
                             |  <a href="#" data-toggle="dropdown" class="dropdown-toggle">Vendor (<span data-bind="text: spoolItemTableHelper.buildFilterLabel('vendor')" ></span>)
                                 <b class="caret"></b></a>
-                            <ul class="dropdown-menu keep-open" style="padding-left:10px" >
+                            <ul class="dropdown-menu keep-open pre-scrollable" style="padding-left:10px" >
                                 <li>
                                     <div class="checkbox">
                                         <label>
@@ -103,7 +103,7 @@
                             |  <a href="#" data-toggle="dropdown" class="dropdown-toggle">Color (<span data-bind="text: spoolItemTableHelper.buildFilterLabel('color')" ></span>)
                                 <b class="caret"></b></a>
 
-                            <ul class="dropdown-menu keep-open" style="padding-left:10px" >
+                            <ul class="dropdown-menu keep-open pre-scrollable" style="padding-left:10px" >
                                 <li>
                                     <div class="checkbox">
                                         <label>

diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
 #
-plugin_version = "1.6.0"
+plugin_version = "1.6.1"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module