fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 19:21:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Replace cumbersome noescape filter with {!! $content !!} syntax in common templates

Browse source
This commit is contained in:
Kijin Sung 2023-10-26 13:01:47 +09:00
parent e0c396bb3e
commit 6416499d34
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
common/tpl/common_layout.html
View file

@ -1,6 +1,6 @@
<config version="2" /> <config version="2" />
<!DOCTYPE html> <!DOCTYPE html>
<html lang="{{ $lang_type = Context::getLangType() }}" class="xe-mobilelayout"|if="$m"> <html lang="{!! $lang_type = Context::getLangType() !!}" class="xe-mobilelayout"|if="$m">
<head> <head>
<!-- META --> <!-- META -->
@ -11,19 +11,19 @@
@foreach (Context::getMetaTag() as $val) @foreach (Context::getMetaTag() as $val)
<meta http-equiv="{{ $val['name'] }}"|if="$val['is_http_equiv']" name="{{ $val['name'] }}"|if="!$val['is_http_equiv']" content="{{ $val['content'] }}" /> <meta http-equiv="{{ $val['name'] }}"|if="$val['is_http_equiv']" name="{{ $val['name'] }}"|if="!$val['is_http_equiv']" content="{{ $val['content'] }}" />
@endforeach @endforeach
<meta name="csrf-token" content="{{ \Rhymix\Framework\Session::getGenericToken()|noescape }}" /> <meta name="csrf-token" content="{!! \Rhymix\Framework\Session::getGenericToken() !!}" />
<!-- TITLE --> <!-- TITLE -->
<title>{{ Context::getBrowserTitle() }}</title> <title>{{ Context::getBrowserTitle() }}</title>
<!-- CSS --> <!-- CSS -->
@foreach (Context::getCssFile(true) as $css_file) @foreach (Context::getCssFile(true) as $css_file)
<link rel="stylesheet" href="{{ $css_file['file']|noescape }}" media="{{ $css_file['media']|noescape }}"|if="$css_file['media'] !== 'all'" /> <link rel="stylesheet" href="{!! $css_file['file'] !!}" media="{{ $css_file['media'] }}"|if="$css_file['media'] !== 'all'" />
@endforeach @endforeach
<!-- JS --> <!-- JS -->
@foreach (Context::getJsFile('head', true) as $js_file) @foreach (Context::getJsFile('head', true) as $js_file)
<script src="{{ $js_file['file']|noescape }}"></script> <script src="{!! $js_file['file'] !!}"></script>
@endforeach @endforeach
<!-- RSS --> <!-- RSS -->
@ -45,21 +45,21 @@
<link rel="canonical" href="{{ $canonical_url }}" /> <link rel="canonical" href="{{ $canonical_url }}" />
@endif @endif
@if (!empty($favicon_url)) @if (!empty($favicon_url))
<link rel="shortcut icon" href="{$favicon_url}" /> <link rel="shortcut icon" href="{{ $favicon_url }}" />
@endif @endif
@if (!empty($mobicon_url)) @if (!empty($mobicon_url))
<link rel="apple-touch-icon" href="{$mobicon_url}" /> <link rel="apple-touch-icon" href="{{ $mobicon_url }}" />
@endif @endif
<!-- OTHER HEADERS --> <!-- OTHER HEADERS -->
@foreach (Context::getOpenGraphData() as $og_metadata) @foreach (Context::getOpenGraphData() as $og_metadata)
<meta property="{$og_metadata['property']}" content="{$og_metadata['content']}" /> <meta property="{{ $og_metadata['property'] }}" content="{{ $og_metadata['content'] }}" />
@endforeach @endforeach
{{ Context::getHtmlHeader()|noescape }} {!! Context::getHtmlHeader() !!}
</head> </head>
<!-- BODY START --> <!-- BODY START -->
<body{{ Context::getBodyClass()|noescape }}> <body{!! Context::getBodyClass() !!}>
<!-- COMMON JS VARIABLES --> <!-- COMMON JS VARIABLES -->
<script> <script>
@ -77,10 +77,10 @@
</script> </script>
<!-- PAGE CONTENT --> <!-- PAGE CONTENT -->
{{ Context::getBodyHeader()|noescape }} {!! Context::getBodyHeader() !!}
{{ $content|noescape }} {!! $content !!}
{{ Context::getHtmlFooter()|noescape }} {!! Context::getHtmlFooter() !!}
{{ "\n\n" }} {!! "\n\n" !!}
<!-- ETC --> <!-- ETC -->
@desktop @desktop
@ -92,7 +92,7 @@
<!-- BODY JS --> <!-- BODY JS -->
@foreach (Context::getJsFile('body', true) as $js_file) @foreach (Context::getJsFile('body', true) as $js_file)
<script src="{{ $js_file['file']|noescape }}"></script> <script src="{!! $js_file['file'] !!}"></script>
@endforeach @endforeach
</body> </body>

2
common/tpl/default_layout.html
View file

@ -1,2 +1,2 @@
@version(2) @version(2)
{{ $content|noescape }} {!! $content !!}

2
common/tpl/popup_layout.html
View file

@ -2,7 +2,7 @@
@load('../../modules/admin/tpl/css/admin.bootstrap.css') @load('../../modules/admin/tpl/css/admin.bootstrap.css')
@load('../../modules/admin/tpl/css/admin.css') @load('../../modules/admin/tpl/css/admin.css')
<div class="x popup"> <div class="x popup">
{{ $content|noescape }} {!! $content !!}
</div> </div>
<script> <script>
jQuery(function() { jQuery(function() {