Added a new config option for energy unit display (closes #2109)

This commit is contained in:
Bernd Bestel
2023-02-05 15:55:45 +01:00
parent 0bd698c968
commit b64d726c42
8 changed files with 17 additions and 11 deletions

View File

@@ -95,6 +95,7 @@
Grocy.CurrentUrlRelative = "/" + window.location.href.split('?')[0].replace(Grocy.BaseUrl, "");
Grocy.ActiveNav = '@yield('activeNav', '')';
Grocy.Currency = '{{ GROCY_CURRENCY }}';
Grocy.EnergyUnit = '{{ GROCY_ENERGY_UNIT }}';
Grocy.CalendarFirstDayOfWeek = '{{ GROCY_CALENDAR_FIRST_DAY_OF_WEEK }}';
Grocy.CalendarShowWeekNumbers = {{ BoolToString(GROCY_CALENDAR_SHOW_WEEK_OF_YEAR) }};
Grocy.LocalizationStrings = {!! $LocalizationStrings !!};

View File

@@ -478,7 +478,7 @@
@php if($mode == 'edit') { $value = $product->calories; } else { $value = 0; } @endphp
@include('components.numberpicker', array(
'id' => 'calories',
'label' => 'Energy (kcal)',
'label' => 'Energy',
'min' => '0.' . str_repeat('0', $userSettings['stock_decimal_places_amounts']),
'decimals' => $userSettings['stock_decimal_places_amounts'],
'value' => $value,

View File

@@ -388,7 +388,7 @@
<div class="row ml-1">
@if(!empty($calories) && intval($calories) > 0)
<div class="col-4">
<label>{{ $__t('Energy (kcal)') }}</label>&nbsp;
<label>{{ GROCY_ENERGY_UNIT }}</label>&nbsp;
<i class="fa-solid fa-question-circle text-muted d-print-none"
data-toggle="tooltip"
data-trigger="hover click"