Improvements
This commit is contained in:
parent
9ceb37a8af
commit
955a31ca29
5 changed files with 59 additions and 95 deletions
18
index.php
18
index.php
|
@ -1,15 +1,7 @@
|
||||||
<?php
|
<?php require_once 'site-header.php'; ?>
|
||||||
|
|
||||||
require_once 'site-header.php';
|
<section id="">
|
||||||
|
asd
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<?php require_once 'site-footer.php'; ?>
|
||||||
|
|
||||||
echo '<section id="">';
|
|
||||||
echo '';
|
|
||||||
echo '</section>';
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
require_once 'site-footer.php';
|
|
||||||
|
|
||||||
?>
|
|
|
@ -1,19 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
require_once 'site-header.php';
|
require_once 'site-header.php';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$get_error = safetag($_GET['err']);
|
$get_error = safetag($_GET['err']);
|
||||||
|
?>
|
||||||
|
|
||||||
|
<section id="errors">
|
||||||
|
asd
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<?php require_once 'site-footer.php'; ?>
|
||||||
echo '<section id="errors">';
|
|
||||||
echo $get_error;
|
|
||||||
echo '</section>';
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
require_once 'site-footer.php';
|
|
||||||
|
|
||||||
?>
|
|
|
@ -4,7 +4,7 @@
|
||||||
$site_protocol = 'https';
|
$site_protocol = 'https';
|
||||||
$site_domain = null;
|
$site_domain = null;
|
||||||
$site_subdomain = null;
|
$site_subdomain = null;
|
||||||
$site_url = $site_protocol.'://'.(empty($site_subdomain) ? null : $site_subdomain.'.') . $site_domain;
|
$site_url = (empty($site_domain) ? null : $site_protocol.'://'.(empty($site_subdomain) ? null : $site_subdomain.'.') . $site_domain);
|
||||||
$site_url_current = sprintf(
|
$site_url_current = sprintf(
|
||||||
'%s://%s/%s',
|
'%s://%s/%s',
|
||||||
isset($_SERVER['HTTPS']) ? 'https' : 'http',
|
isset($_SERVER['HTTPS']) ? 'https' : 'http',
|
||||||
|
|
|
@ -1,17 +1,5 @@
|
||||||
<?php
|
</main>
|
||||||
|
</section>
|
||||||
|
|
||||||
echo '</main>';
|
</body>
|
||||||
echo '</section>';
|
</html>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
echo '</body>';
|
|
||||||
echo '</html>';
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#echo '<script type="text/javascript" src="'.url('js/jquery.min.js').'"></script>';
|
|
||||||
#echo '<script type="text/javascript" src="'.url('js/main'.($minified == true ? '.min.js' : '.js?'.time()), true).'"></script>';
|
|
||||||
#echo (!file_exists('js/pages/'.str_replace('.php', '', $filename).'.js') ? null : '<script type="text/javascript" src="'.url('js/pages'.($minified == true ? '/minified' : '').'/'.str_replace('.php', '', $filename) . ($minified == true ? '.min.js' : '.js?'.time()), true).'"></script>');
|
|
||||||
|
|
||||||
?>
|
|
|
@ -1,67 +1,59 @@
|
||||||
<?php
|
<?php require_once 'site-settings.php'; ?><!DOCTYPE html>
|
||||||
|
<html lang="<?php echo $config_sitelang; ?>">
|
||||||
|
|
||||||
require_once 'site-settings.php';
|
<head>
|
||||||
|
<title><?php echo (empty($site_title) ? 'Template' : $site_title); ?></title>
|
||||||
|
|
||||||
echo '<!DOCTYPE html>';
|
<meta charset="UTF-8">
|
||||||
echo '<html lang="'.$config_sitelang.'">';
|
<meta name="theme-color" content="#272e33">
|
||||||
|
|
||||||
echo '<head>';
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes, maximum-scale=3">
|
||||||
echo '<title>';
|
<meta name="robots" content="<?php echo implode(',', $robots) . (empty($google) ? '' : (empty($robots) ? '' : ',') . implode(',', $google)); ?>">
|
||||||
echo (empty($site_title) ? 'Template' : $site_title);
|
<meta name="description" content="<?php echo $lang['metadata']['description']; ?>">
|
||||||
echo '</title>';
|
|
||||||
|
|
||||||
echo '<meta charset="UTF-8">';
|
<meta http-equiv="cache-control" content="cache">
|
||||||
echo '<meta name="theme-color" content="#272e33">';
|
<meta http-equiv="expires" content="<?php echo (60*60*24); ?>">
|
||||||
|
|
||||||
echo '<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes, maximum-scale=3">';
|
<meta property="og:locale" content="<?php echo $lang['metadata']['locale']; ?>">
|
||||||
echo (count($robots) == 0 ? null : '<meta name="robots" content="'.implode(',', $robots).'">');
|
<meta property="og:title" content="<?php echo $site_title; ?>">
|
||||||
echo (count($google) == 0 ? null : '<meta name="robots" content="'.implode(',', $google).'">');
|
<meta property="og:site_name" content="<?php echo $site_title; ?>">
|
||||||
echo '<meta name="description" content="'.$lang['metadata']['description'].'">';
|
<meta property="og:type" content="website">
|
||||||
|
<meta property="og:url" content="<?php echo $site_url_current; ?>">
|
||||||
|
<meta property="og:description" content="<?php echo $lang['metadata']['description']; ?>">
|
||||||
|
|
||||||
echo '<meta http-equiv="cache-control" content="cache">';
|
<?php if(!empty($metadata_image)) { ?>
|
||||||
echo '<meta http-equiv="expires" content="'.(60*60*24).'">';
|
<meta property="og:image" content="<?php echo $metadata_image; ?>">
|
||||||
|
<meta property="og:image:secure_url" content="<?php echo $metadata_image; ?>">
|
||||||
|
<meta property="og:image:height" content="<?php echo ($filename == null ? '512' : '256'); ?>">
|
||||||
|
<meta property="og:image:width" content="<?php echo ($filename == null ? '512' : '256'); ?>">
|
||||||
|
<meta property="og:image:type" content="image/jpeg">
|
||||||
|
<?php } ?>
|
||||||
|
|
||||||
echo '<meta property="og:locale" content="'.$lang['metadata']['locale'].'">';
|
<meta property="twitter:card" content="summary_large_image">
|
||||||
echo '<meta property="og:title" content="'.$site_title.'">';
|
<meta property="twitter:url" content="<?php echo $site_url_current; ?>">
|
||||||
echo '<meta property="og:site_name" content="'.$site_title.'">';
|
<meta property="twitter:title" content="<?php echo $site_title; ?>">
|
||||||
echo '<meta property="og:type" content="website">';
|
<meta property="twitter:description" content="<?php echo $lang['metadata']['description']; ?>">
|
||||||
echo '<meta property="og:url" content="'.$site_url_current.'">';
|
<?php echo (empty($metadata_image) ? null : '<meta property="twitter:image" content="'.$metadata_image.'">'); ?>
|
||||||
echo '<meta property="og:description" content="'.$lang['metadata']['description'].'">';
|
|
||||||
|
|
||||||
if(!empty($metadata_image)) {
|
<link rel="canonical" href="<?php echo $site_url_current; ?>"><?php if(!empty($site_url)) { ?>
|
||||||
echo '<meta property="og:image" content="'.$metadata_image.'">';
|
|
||||||
echo '<meta property="og:image:secure_url" content="'.$metadata_image.'">';
|
|
||||||
echo '<meta property="og:image:height" content="'.($filename == null ? '512' : '256').'">';
|
|
||||||
echo '<meta property="og:image:width" content="'.($filename == null ? '512' : '256').'">';
|
|
||||||
echo '<meta property="og:image:type" content="image/jpeg">';
|
|
||||||
}
|
|
||||||
|
|
||||||
echo '<meta property="twitter:card" content="summary_large_image">';
|
<link href="<?php echo $site_url; ?>" rel="me"><?php } ?>
|
||||||
echo '<meta property="twitter:url" content="'.$site_url_current.'">';
|
<?php if(file_exists('manifest.json')) { ?><link rel="manifest" href="<?php echo url('manifest.json'); ?>" crossorigin="use-credentials"><?php } ?>
|
||||||
echo '<meta property="twitter:title" content="'.$site_title.'">';
|
|
||||||
echo '<meta property="twitter:description" content="'.$lang['metadata']['description'].'">';
|
|
||||||
echo (empty($metadata_image) ? null : '<meta property="twitter:image" content="'.$metadata_image.'">');
|
|
||||||
|
|
||||||
echo '<link rel="canonical" href="'.$site_url_current.'">';
|
<link type="image/x-icon" rel="icon" href="<?php echo $site_favicon; ?>">
|
||||||
echo '<link href="'.$site_url.'" rel="me">';
|
<?php echo (empty($site_url_cdn) ? null : '<link rel="dns-prefetch" href="'.$site_url_cdn.'" crossorigin="">'); ?>
|
||||||
echo (file_exists('manifest.json') ? '<link rel="manifest" href="'.url('manifest.json').'" crossorigin="use-credentials">' : null);
|
|
||||||
|
|
||||||
echo '<link type="image/x-icon" rel="icon" href="'.$site_favicon.'">';
|
<script type="text/javascript" src="<?php echo url('js/jquery.min.js'); ?>"></script>
|
||||||
echo (empty($site_url_cdn) ? null : '<link rel="dns-prefetch" href="'.$site_url_cdn.'" crossorigin="">');
|
<script type="text/javascript" src="<?php echo url('js/main'.($minified == true ? '.min.js' : '.js?'.time()), true); ?>"></script><?php
|
||||||
|
echo (!file_exists('js/pages/'.str_replace('.php', '', $filename).'.js') ? null : '<script type="text/javascript" src="'.url('js/pages'.($minified == true ? '/minified' : '').'/'.str_replace('.php', '', $filename) . ($minified == true ? '.min.js' : '.js?'.time()), true).'"></script>'); ?>
|
||||||
echo '<link type="text/css" rel="stylesheet preload" as="style" href="'.url((file_exists('css/desktop.min.css') ? 'css/desktop.min.css' : 'css/desktop.css?'.time())).'">';
|
|
||||||
echo (!file_exists('css/pages/'.str_replace('.php', '.css', $filename)) ? null : '<link type="text/css" rel="stylesheet preload" as="style" href="'.url((file_exists('css/pages/minified/'.str_replace('.php', '.css', $filename)) ? 'css/pages/minified/'.str_replace('.php', '.css', $filename) : 'css/pages/'.str_replace('.php', '.css', $filename).'?'.time())).'">');
|
|
||||||
echo '<link type="text/css" rel="stylesheet preload" as="style" href="'.url((file_exists('css/portable.min.css') ? 'css/portable.min.css' : 'css/portable.css?'.time())).'">';
|
|
||||||
echo '</head>';
|
|
||||||
|
|
||||||
echo '<body';
|
|
||||||
echo ' data-folder="'.(empty($config_folder) ? '/' : '/'.$config_folder.'/').'"';
|
|
||||||
echo ' data-debugging="'.($debugging == false ? 'n' : 'y').'"';
|
|
||||||
echo '>';
|
|
||||||
|
|
||||||
|
|
||||||
|
<link type="text/css" rel="stylesheet preload" as="style" href="<?php echo url((file_exists('css/desktop.min.css') ? 'css/desktop.min.css' : 'css/desktop.css?'.time())); ?>">
|
||||||
|
<?php echo (!file_exists('css/pages/'.str_replace('.php', '.css', $filename)) ? null : '<link type="text/css" rel="stylesheet preload" as="style" href="'.url((file_exists('css/pages/minified/'.str_replace('.php', '.css', $filename)) ? 'css/pages/minified/'.str_replace('.php', '.css', $filename) : 'css/pages/'.str_replace('.php', '.css', $filename).'?'.time())).'">');
|
||||||
|
?><link type="text/css" rel="stylesheet preload" as="style" href="<?php echo url((file_exists('css/portable.min.css') ? 'css/portable.min.css' : 'css/portable.css?'.time())); ?>">
|
||||||
|
</head>
|
||||||
|
|
||||||
echo '<section id="website">';
|
<body data-folder="<?php echo (empty($config_folder) ? '/' : '/'.$config_folder.'/'); ?>" data-debugging="<?php echo ($debugging == false ? 'n' : 'y'); ?>">
|
||||||
echo '<main>';
|
|
||||||
|
|
||||||
?>
|
<section id="website">
|
||||||
|
<main>
|
||||||
|
|
Loading…
Reference in a new issue