M_Viper/ts-website
M_Viper
/
ts-website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.0' into 2.0

This commit is contained in:
Wruczek 2021-04-16 16:58:01 +02:00
parent 223309c428 c0b32f5992
commit 51639a48bf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/script.js
View File

@ -124,7 +124,7 @@ function escapeHtml(text) {
"'": ''' "'": '''
}; };
return text.replace(/[&<>"']/g, function(m) { return map[m]; }); return text.toString().replace(/[&<>"']/g, function(m) { return map[m]; });
} }
function updateTooltip(el, text) { function updateTooltip(el, text) {

4
src/private/templates/body.latte
View File

@ -20,7 +20,7 @@ $navActiveIndex = isset($navActiveIndex) ? (int) $navActiveIndex : 0;
<!-- Bootstrap 4.6.0 --> <!-- Bootstrap 4.6.0 -->
{$tplutils::includeStylesheet("{cdnjs}/twitter-bootstrap/4.6.0/css/bootstrap.min.css", "sha256-T/zFmO5s/0aSwc6ics2KLxlfbewyRz6UNw1s3Ppf5gE=")} {$tplutils::includeStylesheet("{cdnjs}/twitter-bootstrap/4.6.0/css/bootstrap.min.css", "sha256-T/zFmO5s/0aSwc6ics2KLxlfbewyRz6UNw1s3Ppf5gE=")}
<!-- FontAwesome CSS 5.8.2 --> <!-- FontAwesome CSS 5.15.2 -->
{$tplutils::includeStylesheet("{cdnjs}/font-awesome/5.15.2/css/all.min.css", "sha256-0fuNgzfNIlaClbDtmYyFxY8LTNCDrwsNshywr4AALy0=")} {$tplutils::includeStylesheet("{cdnjs}/font-awesome/5.15.2/css/all.min.css", "sha256-0fuNgzfNIlaClbDtmYyFxY8LTNCDrwsNshywr4AALy0=")}
<!-- DataTables 1.10.21 --> <!-- DataTables 1.10.21 -->
@ -191,7 +191,7 @@ $navActiveIndex = isset($navActiveIndex) ? (int) $navActiveIndex : 0;
{var $dayjslang = __get("DAYJS_LANG", [], true)} {var $dayjslang = __get("DAYJS_LANG", [], true)}
{if $dayjslang !== null && $dayjslang !== "en"} {if $dayjslang !== null && $dayjslang !== "en"}
{$tplutils::includeScript("{cdnjs}/dayjs/1.10.4/locale/$dayjslang.js")} {$tplutils::includeScript("{cdnjs}/dayjs/1.10.4/locale/$dayjslang.min.js")}
<script> <script>
dayjs.locale({$dayjslang} || navigator.languages || navigator.language) dayjs.locale({$dayjslang} || navigator.languages || navigator.language)
</script> </script>