Removed experimental support for hiding hotends

j7126 · Sep 20, 2019 · a3ff4c6 · a3ff4c6
1 parent d17bd69
commit a3ff4c6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/octoprint_dashboard/static/js/dashboard.js b/octoprint_dashboard/static/js/dashboard.js
@@ -34,9 +34,9 @@ $(function() {
         self.virtualMemPercent = ko.observable(0);
         self.diskUsagePercent = ko.observable(0);
         self.cpuTemp = ko.observable(0);
-        //self.flipH = ko.observable();
 
-
+
+
         //Notify user if displaylayerprogress plugin is not installed
         self.DisplayLayerProgressAvailable = function() {
             if (self.settingsViewModel.settings.plugins.DisplayLayerProgress)
@@ -50,7 +50,7 @@ $(function() {
                     });
                 return "Warning: Can't get stats from <a href='https://plugins.octoprint.org/plugins/DisplayLayerProgress/' target='_blank'>DisplayLayerProgress</a>. Is it installed, enabled and on the latest version?";                
             }
-        }
+        };
 
         //Events from displaylayerprogress Plugin
         self.onDataUpdaterPluginMessage = function(plugin, data) {

diff --git a/octoprint_dashboard/templates/dashboard_settings.jinja2 b/octoprint_dashboard/templates/dashboard_settings.jinja2
@@ -54,7 +54,7 @@
             </label>
         </div>
    </div>
-
+<!--
    <legend>{{ _('Advanced Settings') }}</legend>
     <div class="control-group">
         <div >
@@ -63,7 +63,7 @@
             </label>
         </div>
    </div>
-
+-->
 </form>
 
 
diff --git a/octoprint_dashboard/templates/dashboard_tab.jinja2 b/octoprint_dashboard/templates/dashboard_tab.jinja2
@@ -1,4 +1,3 @@
-
 <!-- HTML grid-based layout. Set to 3 columns wide in css -->
 <div class="dasboardGridContainer">
 
@@ -36,7 +35,7 @@
   <!-- Temps and Fan -->
 
   <!-- ko foreach: temperatureModel.tools -->
-  <div class="dashboardGridItem" data-bind="visible: $parent.temperatureModel.isOperational() && ($parent.settingsViewModel.settings.plugins.dashboard.hideHotend() && target() > 0)">
+  <div class="dashboardGridItem" data-bind="visible: $parent.temperatureModel.isOperational()">
      <img class="dashboardIcon" title="Hotend temp (target temp)" src="/plugin/dashboard/static/img/hotend-icon.png"></img>   
       <svg  xmlns="http://www.w3.org/2000/svg" height="120" width="120" viewBox="0 0 200 200">
         <path class="bg" stroke="#ccc" d="M41 149.5a77 77 0 1 1 117.93 0" fill="none"/>

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