Commit 151bd22d authored by Philipp's avatar Philipp

fixed bug not displaying inside/outside at sidebar

parent ebbf5497
......@@ -59,7 +59,8 @@ module.exports = function (grunt) {
exclude: ['assets/', 'bower_components/', 'devextreme_bundler/', 'i18n/', 'skin.conf', 'i18n*.html.tmpl'],
locales: ['de', 'en'],
locale: grunt.config.get('lang'),
localesPath: 'src/i18n'
localesPath: 'src/i18n',
allowHtml: true
}
},
htmlmin: {
......
This diff is collapsed.
......@@ -23,7 +23,7 @@
#if $day.PM25.has_data
<div class="col-md-6"><div class="gauge_container circular"><h4>Feinstaub 2,5μm</h4><div><div id="gauge_pm25"></div><div class="value_container"><span class="value" id="value_pm25">$current.PM25.format("%.1f")</span><span class="sup">μg/m³</span></div></div></div></div><div class="col-md-6"><div class="gauge_container circular"><h4>Feinstaub 10μm</h4><div><div id="gauge_pm10"></div><div class="value_container"><span class="value" id="value_pm10">$current.PM10.format("%.1f")</span><span class="sup">μg/m³</span></div></div></div></div>
#end if
</div></div></div><div class="col-md-3"><div class="whitebg we_current"><h3>Aktuell</h3><div class="row"><div class="col-md-12 current_meta"><h5>$station.location</h5><em><span id="we_lastupdate">$current.dateTime.format('%Y-%m-%d %H:%M')</span></em></div></div><div class="row"><div class="col-xs-8"><div class="whitebg current_temp"><h4>Temperatur</h4><span id="we_temp-value">$current.outTemp.formatted</span><span class="sup we_tempunit">$unit.label.outTemp</span></div></div><div class="col-xs-4"><div class="whitebg current_temptrend"><h4>Trend</h4><span class="glyphicon glyphicon-arrow-right" id="we_temp-trend"></span></div></div></div><div class="row"><div class="col-xs-8"><div class="whitebg current_baro"><h4>Barometer</h4><span id="we_barometer-value">$current.barometer.formatted</span><span class="sup we_pressunit">$unit.label.barometer</span></div></div><div class="col-xs-4"><div class="whitebg current_barotrend"><h4>Trend</h4><span class="glyphicon glyphicon-arrow-right" id="we_barometer-trend"></span></div></div></div><div class="row"><div class="col-sm-6 col-xs-7"><div class="whitebg current_windspeed"><h4>Windgeschw.</h4><span id="we_windspeed-value">$current.windSpeed.formatted</span><span class="sup we_windunit">$unit.label.windSpeed</span></div></div><div class="col-sm-6 col-xs-5"><div class="whitebg current_winddir"><h4>Windrichtung</h4><span id="we_winddir-value" data-toggle="tooltip" title="$current.windDir.ordinal_compass"><span class="glyphicon glyphicon-arrow-down"></span></span></div></div></div><div class="row"><div class="col-xs-6"><div class="whitebg current_hum"><h4>Luftfeuchte</h4><span id="we_humidity-value">$current.outHumidity.formatted</span><span class="sup we_humunit">$unit.label.outHumidity</span></div></div><div class="col-xs-6"><div class="whitebg current_rain"><h4>Regen</h4><span id="we_rain-value">$day.rain.sum.formatted</span><span class="sup we_rainunit">$unit.label.rain</span></div></div></div>
</div></div></div><div class="col-md-3"><div class="whitebg we_current"><h3>Aktuell</h3><div class="row"><div class="col-md-12 current_meta"><h5>$station.location</h5><em><span id="we_lastupdate">$current.dateTime.format('%Y-%m-%d %H:%M')</span></em></div></div><div class="row"><div class="col-xs-8"><div class="whitebg current_temp"><h4>Temperatur <span>Außen</span></h4><span id="we_temp-value">$current.outTemp.formatted</span><span class="sup we_tempunit">$unit.label.outTemp</span></div></div><div class="col-xs-4"><div class="whitebg current_temptrend"><h4>Trend</h4><span class="glyphicon glyphicon-arrow-right" id="we_temp-trend"></span></div></div></div><div class="row"><div class="col-xs-8"><div class="whitebg current_baro"><h4>Barometer</h4><span id="we_barometer-value">$current.barometer.formatted</span><span class="sup we_pressunit">$unit.label.barometer</span></div></div><div class="col-xs-4"><div class="whitebg current_barotrend"><h4>Trend</h4><span class="glyphicon glyphicon-arrow-right" id="we_barometer-trend"></span></div></div></div><div class="row"><div class="col-sm-6 col-xs-7"><div class="whitebg current_windspeed"><h4>Windgeschw.</h4><span id="we_windspeed-value">$current.windSpeed.formatted</span><span class="sup we_windunit">$unit.label.windSpeed</span></div></div><div class="col-sm-6 col-xs-5"><div class="whitebg current_winddir"><h4>Windrichtung</h4><span id="we_winddir-value" data-toggle="tooltip" title="$current.windDir.ordinal_compass"><span class="glyphicon glyphicon-arrow-down"></span></span></div></div></div><div class="row"><div class="col-xs-6"><div class="whitebg current_hum"><h4>Luftfeuchte</h4><span id="we_humidity-value">$current.outHumidity.formatted</span><span class="sup we_humunit">$unit.label.outHumidity</span></div></div><div class="col-xs-6"><div class="whitebg current_rain"><h4>Regen</h4><span id="we_rain-value">$day.rain.sum.formatted</span><span class="sup we_rainunit">$unit.label.rain</span></div></div></div>
#if $day.PM25.has_data
<div class="row"><div class="col-xs-6"><div class="whitebg current_pm25"><h4>Staub 2,5μm</h4><span id="we_pm25-value">$current.PM25.format("%.1f")</span><span class="sup we_pmunit">µg/m³</span></div></div><div class="col-xs-6"><div class="whitebg current_pm10"><h4>Staub 10μm</h4><span id="we_pm10-value">$current.PM10.format("%.1f")</span><span class="sup we_pmunit">µg/m³</span></div></div></div>
#end if
......
This diff is collapsed.
......@@ -23,7 +23,7 @@
#if $day.PM25.has_data
<div class="col-md-6"><div class="gauge_container circular"><h4>Fine dust 2,5μm</h4><div><div id="gauge_pm25"></div><div class="value_container"><span class="value" id="value_pm25">$current.PM25.format("%.1f")</span><span class="sup">μg/m³</span></div></div></div></div><div class="col-md-6"><div class="gauge_container circular"><h4>Fine dust 10μm</h4><div><div id="gauge_pm10"></div><div class="value_container"><span class="value" id="value_pm10">$current.PM10.format("%.1f")</span><span class="sup">μg/m³</span></div></div></div></div>
#end if
</div></div></div><div class="col-md-3"><div class="whitebg we_current"><h3>Current</h3><div class="row"><div class="col-md-12 current_meta"><h5>$station.location</h5><em><span id="we_lastupdate">$current.dateTime.format('%Y-%m-%d %H:%M')</span></em></div></div><div class="row"><div class="col-xs-8"><div class="whitebg current_temp"><h4>Temperature</h4><span id="we_temp-value">$current.outTemp.formatted</span><span class="sup we_tempunit">$unit.label.outTemp</span></div></div><div class="col-xs-4"><div class="whitebg current_temptrend"><h4>Trend</h4><span class="glyphicon glyphicon-arrow-right" id="we_temp-trend"></span></div></div></div><div class="row"><div class="col-xs-8"><div class="whitebg current_baro"><h4>Barometer</h4><span id="we_barometer-value">$current.barometer.formatted</span><span class="sup we_pressunit">$unit.label.barometer</span></div></div><div class="col-xs-4"><div class="whitebg current_barotrend"><h4>Trend</h4><span class="glyphicon glyphicon-arrow-right" id="we_barometer-trend"></span></div></div></div><div class="row"><div class="col-sm-6 col-xs-7"><div class="whitebg current_windspeed"><h4>Wind spd.</h4><span id="we_windspeed-value">$current.windSpeed.formatted</span><span class="sup we_windunit">$unit.label.windSpeed</span></div></div><div class="col-sm-6 col-xs-5"><div class="whitebg current_winddir"><h4>Wind dir.</h4><span id="we_winddir-value" data-toggle="tooltip" title="$current.windDir.ordinal_compass"><span class="glyphicon glyphicon-arrow-down"></span></span></div></div></div><div class="row"><div class="col-xs-6"><div class="whitebg current_hum"><h4>Humidity</h4><span id="we_humidity-value">$current.outHumidity.formatted</span><span class="sup we_humunit">$unit.label.outHumidity</span></div></div><div class="col-xs-6"><div class="whitebg current_rain"><h4>Rain</h4><span id="we_rain-value">$day.rain.sum.formatted</span><span class="sup we_rainunit">$unit.label.rain</span></div></div></div>
</div></div></div><div class="col-md-3"><div class="whitebg we_current"><h3>Current</h3><div class="row"><div class="col-md-12 current_meta"><h5>$station.location</h5><em><span id="we_lastupdate">$current.dateTime.format('%Y-%m-%d %H:%M')</span></em></div></div><div class="row"><div class="col-xs-8"><div class="whitebg current_temp"><h4>Temperature <span>Outside</span></h4><span id="we_temp-value">$current.outTemp.formatted</span><span class="sup we_tempunit">$unit.label.outTemp</span></div></div><div class="col-xs-4"><div class="whitebg current_temptrend"><h4>Trend</h4><span class="glyphicon glyphicon-arrow-right" id="we_temp-trend"></span></div></div></div><div class="row"><div class="col-xs-8"><div class="whitebg current_baro"><h4>Barometer</h4><span id="we_barometer-value">$current.barometer.formatted</span><span class="sup we_pressunit">$unit.label.barometer</span></div></div><div class="col-xs-4"><div class="whitebg current_barotrend"><h4>Trend</h4><span class="glyphicon glyphicon-arrow-right" id="we_barometer-trend"></span></div></div></div><div class="row"><div class="col-sm-6 col-xs-7"><div class="whitebg current_windspeed"><h4>Wind spd.</h4><span id="we_windspeed-value">$current.windSpeed.formatted</span><span class="sup we_windunit">$unit.label.windSpeed</span></div></div><div class="col-sm-6 col-xs-5"><div class="whitebg current_winddir"><h4>Wind dir.</h4><span id="we_winddir-value" data-toggle="tooltip" title="$current.windDir.ordinal_compass"><span class="glyphicon glyphicon-arrow-down"></span></span></div></div></div><div class="row"><div class="col-xs-6"><div class="whitebg current_hum"><h4>Humidity</h4><span id="we_humidity-value">$current.outHumidity.formatted</span><span class="sup we_humunit">$unit.label.outHumidity</span></div></div><div class="col-xs-6"><div class="whitebg current_rain"><h4>Rain</h4><span id="we_rain-value">$day.rain.sum.formatted</span><span class="sup we_rainunit">$unit.label.rain</span></div></div></div>
#if $day.PM25.has_data
<div class="row"><div class="col-xs-6"><div class="whitebg current_pm25"><h4>Dust 2,5μm</h4><span id="we_pm25-value">$current.PM25.format("%.1f")</span><span class="sup we_pmunit">µg/m³</span></div></div><div class="col-xs-6"><div class="whitebg current_pm10"><h4>Dust 10μm</h4><span id="we_pm10-value">$current.PM10.format("%.1f")</span><span class="sup we_pmunit">µg/m³</span></div></div></div>
#end if
......
......@@ -106,7 +106,7 @@
<button type="button" class="btn btn-secondary" value="l"><span class="glyphicon glyphicon-chevron-left"></span></button>
<button type="button" class="btn btn-secondary" value="r"><span class="glyphicon glyphicon-chevron-right"></span></button>
</div>
<h4 data-t="amb.temperature">Temperature <span class="chart_datetime">($current.dateTime.format('%Y-%n-%d'))</span></h4>
<h4 data-t="amb.temperatureoutside">Temperature <span class="chart_datetime">($current.dateTime.format('%Y-%n-%d'))</span></h4>
<div id="chart_temp"></div>
</div>
<div class="chart_container">
......
......@@ -35,6 +35,7 @@
"day": "Tag",
"week": "Woche",
"month": "Monat",
"year": "Jahr"
"year": "Jahr",
"temperatureoutside": "Temperatur <span>Außen</span>"
}
}
\ No newline at end of file
......@@ -35,6 +35,7 @@
"day": "Day",
"week": "Week",
"month": "Month",
"year": "Year"
"year": "Year",
"temperatureoutside": "Temperature <span>Outside</span>"
}
}
\ No newline at end of file
......@@ -245,7 +245,7 @@
<div class="row">
<div class="col-xs-8">
<div class="whitebg current_temp">
<h4 data-t="amb.temperature">Temperature <span data-t="amb.outside">Outside</span></h4>
<h4 data-t="amb.temperatureoutside">Temperature <span data-t="amb.outside">Outside</span></h4>
<span id="we_temp-value">$current.outTemp.formatted</span><span class="sup we_tempunit">$unit.label.outTemp</span>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment