PyukiWiki CVS Commit
pyuki****@lists*****
2012年 4月 9日 (月) 00:02:54 JST
Index: PyukiWiki-Devel/sample/mikachan.skin.cgi
diff -u PyukiWiki-Devel/sample/mikachan.skin.cgi:1.293 PyukiWiki-Devel/sample/mikachan.skin.cgi:1.294
--- PyukiWiki-Devel/sample/mikachan.skin.cgi:1.293 Sun Apr 8 16:59:12 2012
+++ PyukiWiki-Devel/sample/mikachan.skin.cgi Mon Apr 9 00:02:54 2012
@@ -1,6 +1,6 @@
######################################################################
# mikachan.skin.cgi - This is PyukiWiki, yet another Wiki clone.
-# $Id: mikachan.skin.cgi,v 1.293 2012/04/08 07:59:12 papu Exp $
+# $Id: mikachan.skin.cgi,v 1.294 2012/04/08 15:02:54 papu Exp $
#
# "PyukiWiki" ver 0.2.0-p3-dev4 $$
# Copyright (C) 2004-2012 Nekyo
@@ -35,9 +35,7 @@
# CSSの設定
$csscharset=qq( charset="$::charset");
if($::use_blosxom eq 1) {
- $::IN_HEAD.=<<EOD;
-<link rel="stylesheet" href="$::skin_url/blosxom.css" type="text/css" media="screen"$csscharset />
-EOD
+ $::IN_HEAD.=&jscss_include("blosxom");
}
# MenuBar, :Header, :Footer, :BodyHeader, :BodyFooter
@@ -98,12 +96,28 @@
$notesbody.="</div>\n";
}
-
# changed on v0.2.0 moved on v0.2.0-p2
# <title>タグの生成
my($title, $title_tag)=&maketitle($page, $message);
- # HTML <head>¡¦</head> ¤«¤é¡¢²èÁü¥ê¥ó¥¯¤Þ¤Ç
+ # add v0.2.0-p4
+ if($::IN_CSSHEAD) {
+ $::IN_HEAD.=<<EOM;
+<style type="text/css"><!--
+$::IN_CSSHEAD
+//--></style>
+EOM
+ }
+ if($::IN_JSHEAD) {
+ $::IN_HEAD.=<<EOM;
+<script type="text/javascript"><!--
+$::IN_JSHEAD
+//--></script>
+@{[&htmlspecialchars($::IN_JSHEAD)]}
+EOM
+ }
+
+ # HTML <head>〜</head> から、画像リンクまで
$htmlbody=<<"EOD";
$::dtd
<title>$title_tag</title>
@@ -113,7 +127,7 @@
@{[$::AntiSpam ne "" ? '' : qq(<link rev="made" href="mailto:$::modifier_mail" />)]}
<link rel="top" href="$::script" />
<link rel="index" href="$::script?cmd=list" />
-@{[$::use_SiteMap eq 1 ? qq(<link rel="contents" href="$::script?cmd=sitemap" />) : '']}
+@{[$::use_SiteMap eq 1 ? qq(<link rel="contents" href="$::script?cmd=sitemap" />) : '<link rel="contents" href="$::script?cmd=list" />']}
<link rel="search" href="$::script?cmd=search" />
<link rel="help" href="$::script?$HelpPage" />
<link rel="author" href="$::modifierlink" />