Skip to content

Commit

Permalink
Merge branch 'scottmudge-fix-temp-units' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
j7126 committed Jan 7, 2022
2 parents 81e0a8b + 9a330c8 commit cc1b7b8
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion octoprint_dashboard/templates/dashboard_tab.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,14 @@
src="plugin/dashboard/static/img/ambient-sensor-icon.png">
<div class="inline">
<span id="HumiditySensorInfo" data-bind="text: label, attr: {title: label}"></span><br />
<!-- ko if: use_fahrenheit -->
<span id="TempSensorInfo"
title="{{ _('Ambient Temp Sensor') }}" data-bind="html: temp_sensor_temp() + '°C'"></span>
title="{{ _('Ambient Temp Sensor') }}" data-bind="html: temp_sensor_temp() + '°F'"></span>
<!-- /ko -->
<!-- ko ifnot: use_fahrenheit -->
<span id="TempSensorInfo"
title="{{ _('Ambient Temp Sensor') }}" data-bind="html: temp_sensor_temp() + '°C'"></span>
<!-- /ko -->
<!-- ko if: temp_sensor_humidity -->
<span class="dashboardSmall" id="HumiditySensorInfo"
title="{{ _('Ambient Humidity Sensor') }}" data-bind="html: temp_sensor_humidity() + '%'"></span>
Expand Down

0 comments on commit cc1b7b8

Please sign in to comment.