[Pyukiwiki-cvs 0006396] CVS update: PyukiWiki-Devel-UTF8/sample

Back to archive index

PyukiWiki CVS Commit pyuki****@lists*****
2012年 2月 19日 (日) 22:04:28 JST


Index: PyukiWiki-Devel-UTF8/sample/mikachan.skin.cgi
diff -u PyukiWiki-Devel-UTF8/sample/mikachan.skin.cgi:1.222 PyukiWiki-Devel-UTF8/sample/mikachan.skin.cgi:1.223
--- PyukiWiki-Devel-UTF8/sample/mikachan.skin.cgi:1.222	Sun Feb 19 16:40:41 2012
+++ PyukiWiki-Devel-UTF8/sample/mikachan.skin.cgi	Sun Feb 19 22:04:27 2012
@@ -1,6 +1,6 @@
 ######################################################################
 # mikachan.skin.cgi - This is PyukiWiki, yet another Wiki clone.
-# $Id: mikachan.skin.cgi,v 1.222 2012/02/19 07:40:41 papu Exp $
+# $Id: mikachan.skin.cgi,v 1.223 2012/02/19 13:04:27 papu Exp $
 #
 # "PyukiWiki" version 0.2.0-p2-preview3 $$
 # Copyright (C) 2004-2012 Nekyo
@@ -42,28 +42,35 @@
 
 	# MenuBar, :Header, :Footer, :BodyHeader, :BodyFooter
 	# , :Sidebar, :SkinFooter:のHTML生成
+	$::pushedpage = $::form{mypage};	# push;
 	if($is_page || $::allview eq 1) {
-		$headerbody=&print_content($::database{$::Header}, $::form{mypage})
+		$::form{mypage}=$::Header;
+		$headerbody=$::headerbody . &print_content($::database{$::Header}, $::form{mypage})
 			if(&is_exist_page($::Header));
-		$::pushedpage = $::form{mypage};	# push;
 		$::form{mypage}=$::MenuBar;
-		$menubarbody=&print_content($::database{$::MenuBar}, $::pushedpage)
+		$menubarbody=$::menubarbody . &print_content($::database{$::MenuBar}, $::pushedpage)
 			if(&is_exist_page($::MenuBar));
-		$sidebarbody=&print_content($::database{$::SideBar}, $::pushedpage)
+		$::form{mypage}=$::SideBar;
+		$sidebarbody=$::sidebarbody . &print_content($::database{$::SideBar}, $::pushedpage)
 			if(&is_exist_page($::SideBar));
-		$::form{mypage}=$::pushedpage;	# pop;
-		$::pushedpage="";
-		$bodyheaderbody=&print_content($::database{$::BodyHeader}, $::form{mypage})
+		$::form{mypage}=$::BodyHeader;
+		$bodyheaderbody=$::bodyheaderbody . &print_content($::database{$::BodyHeader}, $::form{mypage})
 			if(&is_exist_page($::BodyHeader));
-		$bodyfooterbody=&print_content($::database{$::BodyFooter}, $::form{mypage})
+		$::form{mypage}=$::BodyFooter;
+		$bodyfooterbody=$::bodyfooterbody . &print_content($::database{$::BodyFooter}, $::form{mypage})
 			if(&is_exist_page($::BodyFooter));
-		$footerbody=&print_content($::database{$::Footer}, $::form{mypage})
+		$::form{mypage}=$::Footer;
+		$footerbody=$::bodyfooterbody . &print_content($::database{$::Footer}, $::form{mypage})
 			if(&is_exist_page($::Footer));
 	}
 	# :TitleHeader
+	$::form{mypage}=$::TitleHeader;
 	$titleheaderbody=&print_content($::database{$::TitleHeader}, $::form{mypage})
 			if(&is_exist_page($::TitleHeader));
 
+	$::form{mypage}=$::pushedpage;	# pop;
+	$::pushedpage="";
+
 	# add v 0.1.9
 	$skinfooterbody=$::database{$::SkinFooter}
 		if(&is_exist_page($::SkinFooter));
@@ -91,7 +98,7 @@
 	# <title>タグの生成
 	my($title, $title_tag)=&maketitle($page, $message);
 
-	# HTML <head>〜</head> から、画像リンクまで
+	# HTML <head>佤</head> から、画像リンクまで
 	$htmlbody=<<"EOD";
 $::dtd
 <title>$title_tag</title>



Pyukiwiki-cvs メーリングリストの案内
Back to archive index