Fix icon align and help text

LazeMSS · Sep 7, 2021 · c67baeb · c67baeb
1 parent 3d1c8c3
commit c67baeb
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/octoprint_toptemp/__init__.py b/octoprint_toptemp/__init__.py
@@ -570,6 +570,23 @@ def runPSUtil(self,indx,cmd,returnData = False):
         # 'swapused'  : ['Used swap memory'],
         # 'swapfree'  : ['Free swap memory'],
         # 'swapperc'  : ['Free swap percentage']
+        #  Icons to the above
+        # <i class="fas fa-microchip"></i>
+        # <i class="fas fa-microchip"></i>
+        # <i class="fas fa-tachometer-alt"></i>
+        # <i class="fas fa-tachometer-alt"></i>
+        # <i class="fas fa-tachometer-alt"></i>
+        # <i class="fas fa-memory"></i>
+        # <i class="fas fa-memory"></i>
+        # <i class="fas fa-memory"></i>
+        # <i class="fas fa-memory"></i>
+        # <i class="fas fa-memory"></i>
+        # exchange-alt
+        #
+        # disk: <i class="fas fa-hdd"></i>
+        # temp: <i class="fas fa-thermometer-half"></i>
+        # fan: <i class="fas fa-fan"></i>
+        # battery: <i class="fas fa-battery-half"></i>
         # self.psutilList['diskfree_'+str(count)] = ["Disk free "+partition['mountpoint'],partition['mountpoint']]
         # self.psutilList['disktotal_'+str(count)] = ["Disk total "+partition['mountpoint'],partition['mountpoint']]
         # self.psutilList['diskused_'+str(count)] = ["Disk used "+partition['mountpoint'],partition['mountpoint']]

diff --git a/octoprint_toptemp/static/css/TopTemp.css b/octoprint_toptemp/static/css/TopTemp.css
@@ -231,4 +231,8 @@ body.TopTemPreviewON div#settings_dialog {
     color: #333;
 }
 
+#navbar_plugin_toptemp > div:not(.IconsLeft) .navbar-text{
+    line-height: 15px;
+}
+
 /* TopTemp END */
diff --git a/octoprint_toptemp/templates/toptemp_settings.jinja2 b/octoprint_toptemp/templates/toptemp_settings.jinja2
@@ -520,8 +520,8 @@
                         <option value="psutil">Server data</option>
                     </select>
                     <span class="help-inline">
-                        "Command" is a command executed on the RPI/PC. "GCode sent" will look at the GCode sent to the printer and return a value based on the reg. exp.
-                        "From printer" will look at the data returned from the printer and return a value based on the reg. exp. "Server data" will get data from RPI/PC.
+                        "Command" is a command executed on the RPI/PC. "GCode sent" will look at the GCode sent to the printer and return a value based on the Regexp.
+                        "From printer" will look at the data returned from the printer and return a value based on the Regexp. "Server data" will get data from built-in sensors and hardware info on the RPI/PC.
                     </span>
                 </div>
             </div>