// PukiWiki - Yet another WikiWikiWeb clone.
// tdiary.skin.php
// Copyright
-// 2002-2016 PukiWiki Development Team
+// 2002-2017 PukiWiki Development Team
// 2001-2002 Originally written by yu-ji
// License: GPL v2 or (at your option) any later version
//
$image = & $_IMAGE['skin'];
$rw = ! PKWK_READONLY;
-// Decide charset for CSS
-$css_charset = 'iso-8859-1';
-switch(UI_LANG){
- case 'ja': $css_charset = 'Shift_JIS'; break;
-}
-
// ------------------------------------------------------------
// Output
header('Pragma: no-cache');
header('Content-Type: text/html; charset=' . CONTENT_CHARSET);
-// HTML DTD, <html>, and receive content-type
-if (isset($pkwk_dtd)) {
- $meta_content_type = pkwk_output_dtd($pkwk_dtd);
-} else {
- $meta_content_type = pkwk_output_dtd();
-}
-
?>
+<!DOCTYPE html>
+<html lang="<?php echo LANG ?>">
<head>
- <?php echo $meta_content_type ?>
- <meta http-equiv="content-style-type" content="text/css" />
+ <meta http-equiv="Content-Type" content="text/html; charset=<?php echo CONTENT_CHARSET ?>" />
<?php if ($nofollow || ! $is_read) { ?> <meta name="robots" content="NOINDEX,NOFOLLOW" /><?php } ?>
-<?php if (PKWK_ALLOW_JAVASCRIPT && isset($javascript)) { ?> <meta http-equiv="Content-Script-Type" content="text/javascript" /><?php } ?>
+<?php if ($html_meta_referrer_policy) { ?> <meta name="referrer" content="<?php echo htmlsc(html_meta_referrer_policy) ?>" /><?php } ?>
<title><?php echo $title ?> - <?php echo $page_title ?></title>
<link rel="SHORTCUT ICON" href="<?php echo $image['favicon'] ?>" />
<link rel="stylesheet" type="text/css" media="all" href="<?php echo SKIN_DIR ?>theme/base.css" />
<link rel="stylesheet" type="text/css" media="all" href="<?php echo SKIN_DIR ?>theme/<?php echo $theme ?>/<?php echo $theme ?>.css" />
- <link rel="stylesheet" type="text/css" media="screen" href="<?php echo SKIN_DIR ?>tdiary.css.php?charset=<?php echo $css_charset ?>&color=<?php echo $css_theme ?>" charset="<?php echo $css_charset ?>" />
- <link rel="stylesheet" type="text/css" media="print" href="<?php echo SKIN_DIR ?>tdiary.css.php?charset=<?php echo $css_charset ?>&color=<?php echo $css_theme ?>&media=print" charset="<?php echo $css_charset ?>" />
+ <link rel="stylesheet" type="text/css" href="<?php echo SKIN_DIR ?>tdiary.css" />
+<?php if ($css_theme === 'black') { ?> <link rel="stylesheet" type="text/css" href="<?php echo SKIN_DIR ?>tdiary_black.css" /><?php } ?>
<link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $link['rss'] ?>" /><?php // RSS auto-discovery ?>
<?php echo $head_tag ?>
</head>
-<body><!-- Theme:<?php echo htmlsc($theme) . ' Sidebar:' . $sidebar ?> -->
+<body>
+<?php echo $html_scripting_data ?>
+<!-- Theme:<?php echo htmlsc($theme) . ' Sidebar:' . $sidebar ?> -->
<?php if ($menu && $sidebar == 'strict') { ?>
<!-- Sidebar top -->
$link = $GLOBALS['_LINK'];
if (! isset($lang[$key])) { echo 'LANG NOT FOUND'; return FALSE; }
if (! isset($link[$key])) { echo 'LINK NOT FOUND'; return FALSE; }
- if (! PKWK_ALLOW_JAVASCRIPT) $javascript = '';
echo '<span class="adminmenu"><a href="' . $link[$key] . '" ' . $javascript . '>' .
(($value === '') ? $lang[$key] : $value) .
<div class="calendar">
<?php if ($is_page && TDIARY_CALENDAR_DESIGN !== NULL) { ?>
<?php if(TDIARY_CALENDAR_DESIGN) { ?>
- <a href="<?php echo $link['reload'] ?>"><span class="small"><?php echo $link['reload'] ?></span></a>
+ <a href="<?php echo $link['canonical_url'] ?>"><span class="small"><?php echo $link['canonical_url'] ?></span></a>
<?php } else { ?>
<?php require_once(PLUGIN_DIR . 'topicpath.inc.php'); echo plugin_topicpath_inline(); ?>
<?php } ?>
<?php } // PKWK_SKIN_SHOW_TOOLBAR ?>
<!-- Copyright etc -->
- Site admin: <a href="<?php echo $modifierlink ?>"><?php echo $modifier ?></a><p />
+ Site admin: <a href="<?php echo $modifierlink ?>"><?php echo $modifier ?></a>
+ <p>
<?php echo S_COPYRIGHT ?>.
Powered by PHP <?php echo PHP_VERSION ?><br />
HTML convert time: <?php echo elapsedtime() ?> sec.
-
+ </p>
</div><!-- class="footer" -->
<?php if ($menu && ($sidebar != 'top' && $sidebar != 'bottom')) { ?>
</div><!-- class="pkwk_body" -->
<?php } ?>
-
</body>
</html>