Beanz/flatpress
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into responsiveadmin

Browse Source 
# Resolved conflicts:
#	admin/panels/config/admin.config.tpl
This commit is contained in:
azett 2022-06-18 20:49:38 +02:00
commit d16a6eb69b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/panels/config/admin.config.tpl
View File

@ -101,7 +101,10 @@
<dd> <p> <input type="text" name="timeformat" id="timeformat" <dd> <p> <input type="text" name="timeformat" id="timeformat"
class="form-control input_gray textinput{if isset($error)}{$error.timeformat|notempty:" field-error"}{/if}" class="form-control input_gray textinput{if isset($error)}{$error.timeformat|notempty:" field-error"}{/if}"
value="{$fp_config.locale.timeformat}" /> </p> value="{$fp_config.locale.timeformat}" /> </p>
<p> {$panelstrings.output}: {$smarty.now|date_format:$fp_config.locale.timeformat} </p> {assign var=currentTime value=$smarty.now}
{assign var=timeDiff value=$fp_config.locale.timeoffset}
{assign var=TimeDiffUTC value=$currentTime+$timeDiff*3600}
<p> {$panelstrings.output}: {$TimeDiffUTC|date_format:$fp_config.locale.timeformat} </p>
</dd> </dd>