flashii/misuzu
flashii/misuzu
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Templating wrapper updates.

Browse source
This commit is contained in:
flash 2018-10-19 23:38:32 +02:00
parent df77983a7c
commit 74712f96fb
4 changed files with 39 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
misuzu.php
View file

@ -260,6 +260,9 @@ MIG;
'cache' => MSZ_DEBUG ? false : create_directory(build_path(sys_get_temp_dir(), 'msz-tpl-cache-' . md5(MSZ_ROOT))), 'cache' => MSZ_DEBUG ? false : create_directory(build_path(sys_get_temp_dir(), 'msz-tpl-cache-' . md5(MSZ_ROOT))),
]); ]);
// Remove this when the new style is kinda ready
use_legacy_style();
tpl_var('globals', [ tpl_var('globals', [
'site_name' => config_get_default('Misuzu', 'Site', 'name'), 'site_name' => config_get_default('Misuzu', 'Site', 'name'),
'site_description' => config_get('Site', 'description'), 'site_description' => config_get('Site', 'description'),
@ -267,35 +270,35 @@ MIG;
'site_url' => config_get('Site', 'url'), 'site_url' => config_get('Site', 'url'),
]); ]);
tpl_add_function('json_decode', true); tpl_add_filter('json_decode');
tpl_add_function('byte_symbol', true); tpl_add_filter('byte_symbol');
tpl_add_function('html_link', true); tpl_add_filter('html_link');
tpl_add_function('html_colour', true); tpl_add_filter('html_colour');
tpl_add_function('url_construct', true); tpl_add_filter('url_construct');
tpl_add_function('country_name', true, 'get_country_name'); tpl_add_filter('country_name', 'get_country_name');
tpl_add_function('flip', true, 'array_flip'); tpl_add_filter('flip', 'array_flip');
tpl_add_function('first_paragraph', true); tpl_add_filter('first_paragraph');
tpl_add_function('colour_get_css', true); tpl_add_filter('colour_get_css');
tpl_add_function('colour_get_css_contrast', true); tpl_add_filter('colour_get_css_contrast');
tpl_add_function('colour_get_inherit', true); tpl_add_filter('colour_get_inherit');
tpl_add_function('colour_get_red', true); tpl_add_filter('colour_get_red');
tpl_add_function('colour_get_green', true); tpl_add_filter('colour_get_green');
tpl_add_function('colour_get_blue', true); tpl_add_filter('colour_get_blue');
tpl_add_function('parse_line', true); tpl_add_filter('parse_line');
tpl_add_function('parse_text', true); tpl_add_filter('parse_text');
tpl_add_function('asset_url', true); tpl_add_filter('asset_url');
tpl_add_function('vsprintf', true); tpl_add_filter('vsprintf');
tpl_add_function('perms_check', true); tpl_add_filter('perms_check');
tpl_add_function('bg_settings', true, 'user_background_settings_strings'); tpl_add_filter('bg_settings', 'user_background_settings_strings');
tpl_add_function('csrf', true, 'csrf_html'); tpl_add_filter('csrf', 'csrf_html');
tpl_add_function('git_commit_hash'); tpl_add_function('git_commit_hash');
tpl_add_function('git_tag'); tpl_add_function('git_tag');
tpl_add_function('csrf_token'); tpl_add_function('csrf_token');
tpl_add_function('startup_time', false, function (float $time = MSZ_STARTUP) { tpl_add_function('startup_time', function (float $time = MSZ_STARTUP) {
return microtime(true) - $time; return microtime(true) - $time;
}); });
tpl_add_function('sql_query_count', false, 'db_query_count'); tpl_add_function('sql_query_count', 'db_query_count');
tpl_add_path(MSZ_ROOT . '/templates'); tpl_add_path(MSZ_ROOT . '/templates');

13
src/tpl.php
View file

@ -45,15 +45,14 @@ function tpl_sanitise_path(string $path): string
return str_replace('.', '/', $path) . MSZ_TPL_FILE_EXT; return str_replace('.', '/', $path) . MSZ_TPL_FILE_EXT;
} }
function tpl_add_function(string $name, bool $isFilter = false, callable $callable = null): void function tpl_add_function(string $name, callable $callable = null): void
{ {
$twig = Twig::instance(); Twig::instance()->addFunction(new Twig_SimpleFunction($name, $callable === null ? $name : $callable));
}
if ($isFilter) { function tpl_add_filter(string $name, callable $callable = null): void
$twig->addFilter(new Twig_SimpleFilter($name, $callable === null ? $name : $callable)); {
} else { Twig::instance()->addFilter(new Twig_SimpleFilter($name, $callable === null ? $name : $callable));
$twig->addFunction(new Twig_SimpleFunction($name, $callable === null ? $name : $callable));
}
} }
function tpl_exists(string $path): bool function tpl_exists(string $path): bool

3
templates/master.twig
View file

@ -14,7 +14,8 @@
</style> </style>
{% endif %} {% endif %}
</head> </head>
<body class="main{% if current_user.user_background_settings is defined %} {{ current_user.user_background_settings|bg_settings('main--bg-%s')|join(' ') }}{% endif %}">
<body class="main {{ use_legacy_style|default(false) ? 'main--legacy' : 'main--default' }}{% if current_user.user_background_settings is defined %} {{ current_user.user_background_settings|bg_settings('main--bg-%s')|join(' ') }}{% endif %}">
{% include '_layout/header.twig' %} {% include '_layout/header.twig' %}
<div class="main__wrapper"> <div class="main__wrapper">

5
utility.php
View file

@ -1,4 +1,9 @@
<?php <?php
function use_legacy_style(): void
{
tpl_var('use_legacy_style', true);
}
function set_cookie_m(string $name, string $value, int $expires): void function set_cookie_m(string $name, string $value, int $expires): void
{ {
setcookie( setcookie(