Index: .htaccess
===================================================================
RCS file: /cvsroot/pukiwiki/pukiwiki/.htaccess,v
retrieving revision 1.14
diff -u -b -r1.14 .htaccess
--- .htaccess	29 Apr 2005 11:51:31 -0000	1.14
+++ .htaccess	14 Oct 2012 14:36:03 -0000
@@ -8,6 +8,8 @@
 #
 # NOTE: Correct permission of this file 644(or 604)
 
+DirectoryIndex index.php index.html
+
 ## Access control by Order/Allow/Deny directives
 ## needs 'AllowOverride Limit' at httpd.conf
 
@@ -26,11 +28,13 @@
 
 ## Authentication to this directory with basic-auth
 ## needs 'AllowOverride AuthConfig' at httpd.conf
-#AuthType Basic
-#AuthName      "Authentication required"
-#AuthUserFile  /path/to/.htpasswd
+<Limit POST>
+AuthType Basic
+AuthName      "JSIK - Authentication required"
+AuthUserFile  /home/jsik/www/.htpasswd
 #AuthGroupFile /dev/null
-#Require       valid-user
+Require       valid-user
+</Limit>
 
 ## Using zlib.output_compression per directory (via .htaccess)
 ## needs 'AllowOverride Options' at httpd.conf
Index: default.ini.php
===================================================================
RCS file: /cvsroot/pukiwiki/pukiwiki/default.ini.php,v
retrieving revision 1.26
diff -u -b -r1.26 default.ini.php
--- default.ini.php	1 Feb 2011 15:01:18 -0000	1.26
+++ default.ini.php	14 Oct 2012 14:36:03 -0000
@@ -19,7 +19,7 @@
 
 /////////////////////////////////////////////////
 // 雛形とするページの読み込みを可能にする
-$load_template_func = 1;
+$load_template_func = 0;
 
 /////////////////////////////////////////////////
 // 検索文字列を色分けする
@@ -37,15 +37,17 @@
 $_ol_margin = 16;       // リストの階層間の間隔(px)
 $_dl_left_margin = 0;   // リストと画面左端との間隔(px)
 $_dl_margin = 16;        // リストの階層間の間隔(px)
-$_list_pad_str = ' class="list%d" style="padding-left:%dpx;margin-left:%dpx"';
+
+//$_list_pad_str = ' class="list%d" style="padding-left:%dpx;margin-left:%dpx"';
+$_list_pad_str = ' class="list%d" ';
 
 /////////////////////////////////////////////////
 // テキストエリアのカラム数
-$cols = 80;
+$cols = 100;
 
 /////////////////////////////////////////////////
 // テキストエリアの行数
-$rows = 20;
+$rows = 30;
 
 /////////////////////////////////////////////////
 // 大・小見出しから目次へ戻るリンクの文字
@@ -53,11 +55,13 @@
 
 /////////////////////////////////////////////////
 // 添付ファイルの一覧を常に表示する (負担がかかります)
-$attach_link = 1;
+//$attach_link = 1;
+$attach_link = 0;
 
 /////////////////////////////////////////////////
 // 関連するページのリンク一覧を常に表示する(負担がかかります)
-$related_link = 1;
+//$related_link = 1;
+$related_link = 0;
 
 // リンク一覧の区切り文字
 $related_str = "\n ";
@@ -86,7 +90,8 @@
 
 /////////////////////////////////////////////////
 // WikiName,BracketNameに経過時間を付加する
-$show_passage = 1;
+//$show_passage = 1;
+$show_passage = 0;
 
 /////////////////////////////////////////////////
 // リンク表示をコンパクトにする
Index: pukiwiki.ini.php
===================================================================
RCS file: /cvsroot/pukiwiki/pukiwiki/pukiwiki.ini.php,v
retrieving revision 1.149
diff -u -b -r1.149 pukiwiki.ini.php
--- pukiwiki.ini.php	26 Aug 2007 15:19:48 -0000	1.149
+++ pukiwiki.ini.php	14 Oct 2012 14:36:03 -0000
@@ -53,7 +53,7 @@
 //   argsN+1
 //   }}
 //   #memo(This makes '#memo(foo)' to this)
-define('PKWKEXP_DISABLE_MULTILINE_PLUGIN_HACK', 1); // 1 = Disabled
+define('PKWKEXP_DISABLE_MULTILINE_PLUGIN_HACK', 0); // 1 = Disabled
 
 /////////////////////////////////////////////////
 // Language / Encoding settings
@@ -110,19 +110,19 @@
 /////////////////////////////////////////////////
 // Title of your Wikisite (Name this)
 // Also used as RSS feed's channel name etc
-$page_title = 'PukiWiki';
+$page_title = '情報知識学会';
 
 // Specify PukiWiki URL (default: auto)
-//$script = 'http://example.com/pukiwiki/';
+$script = 'http://www.jsik.jp/';
 
 // Shorten $script: Cut its file name (default: not cut)
 //$script_directory_index = 'index.php';
 
 // Site admin's name (CHANGE THIS)
-$modifier = 'anonymous';
+$modifier = '情報知識学会';
 
 // Site admin's Web page (CHANGE THIS)
-$modifierlink = 'http://pukiwiki.example.com/';
+$modifierlink = './?contactus';
 
 // Default page name
 $defaultpage  = 'FrontPage';     // Top / Default page
@@ -157,7 +157,7 @@
 /////////////////////////////////////////////////
 // Spam URI insertion filtering
 
-$spam = 1;	// 1 = On
+$spam = 0;	// 1 = On
 
 if ($spam) {
 	$spam = array();
@@ -198,7 +198,7 @@
 
 /////////////////////////////////////////////////
 // _Disable_ WikiName auto-linking
-$nowikiname = 0;
+$nowikiname = 1;
 
 /////////////////////////////////////////////////
 // AutoLink feature
@@ -219,18 +219,19 @@
 
 /////////////////////////////////////////////////
 // Enable Freeze / Unfreeze feature
-$function_freeze = 1;
+$function_freeze = 0;
 
 /////////////////////////////////////////////////
 // Allow to use 'Do not change timestamp' checkbox
 // (0:Disable, 1:For everyone,  2:Only for the administrator)
-$notimeupdate = 1;
+$notimeupdate = 0;
 
 /////////////////////////////////////////////////
 // Admin password for this Wikisite
 
 // Default: always fail
-$adminpass = '{x-php-md5}!';
+//$adminpass = '{x-php-md5}!';
+$adminpass = '{x-php-md5}' . md5('jsik');
 
 // Sample:
 //$adminpass = 'pass'; // Cleartext
@@ -398,7 +399,7 @@
 // Mail related settings
 
 // Send mail per update of pages
-$notify = 0;
+$notify = 1;
 
 // Send diff only
 $notify_diff_only = 1;
@@ -407,11 +408,11 @@
 $smtp_server = 'localhost';
 
 // Mail recipient (To:) and sender (From:)
-$notify_to   = 'to@example.com';	// To:
-$notify_from = 'from@example.com';	// From:
+$notify_to   = 'TAKAKU.Masao@nims.go.jp,yuka@nier.go.jp';	// To:
+$notify_from = 'yuka@nier.go.jp';	// From:
 
 // Subject: ($page = Page name wll be replaced)
-$notify_subject = '[PukiWiki] $page';
+$notify_subject = '[JSIK-Wiki] $page';
 
 // Mail header
 // NOTE: Multiple items must be divided by "\r\n", not "\n".
@@ -446,7 +447,7 @@
 /////////////////////////////////////////////////
 // Template setting
 
-$auto_template_func = 1;
+$auto_template_func = 0;
 $auto_template_rules = array(
 	'((.+)\/([^\/]+))' => '\2/template'
 );
Index: lib/convert_html.php
===================================================================
RCS file: /cvsroot/pukiwiki/pukiwiki/lib/convert_html.php,v
retrieving revision 1.21
diff -u -b -r1.21 convert_html.php
--- lib/convert_html.php	25 Jan 2011 15:01:01 -0000	1.21
+++ lib/convert_html.php	14 Oct 2012 14:36:03 -0000
@@ -808,6 +808,28 @@
 		return $this->wrap(parent::toString(), 'div', ' style="text-align:' . $this->align . '"');
 	}
 }
+// FLEFT:/FRIGHT:
+class FloatAlign extends Element
+{
+	var $align;
+
+	function FloatAlign($align)
+	{
+		parent::Element();
+		$this->align = substr( $align, 1 );
+	}
+
+	function canContain(& $obj)
+	{
+		return is_a($obj, 'Inline');
+	}
+
+	function toString()
+	{
+		return $this->wrap(parent::toString(), 'div', ' style="float:' . $this->align . '"');
+	}
+}
+
 
 // Body
 class Body extends Element
@@ -852,6 +874,11 @@
 				if ($matches[2] == '') continue;
 				$line = $matches[2];
 			}
+			if (preg_match('/^(FLEFT|FRIGHT):(.*)$/', $line, $matches)) {
+				$this->last = & $this->last->add(new FloatAlign(strtolower($matches[1])));
+				if ($matches[2] == '') continue;
+				$line = $matches[2];
+			}
 
 			$line = rtrim($line, "\r\n");
 
Index: lib/func.php
===================================================================
RCS file: /cvsroot/pukiwiki/pukiwiki/lib/func.php,v
retrieving revision 1.104
diff -u -b -r1.104 func.php
--- lib/func.php	25 Jan 2011 15:01:01 -0000	1.104
+++ lib/func.php	14 Oct 2012 14:36:03 -0000
@@ -286,7 +286,7 @@
 	$retval = '<ul>' . "\n";
 	foreach (array_keys($pages) as $page) {
 		$r_page  = rawurlencode($page);
-		$s_page  = htmlsc($page);
+		$s_page  = htmlsc(get_pagetitle($page));
 		$passage = $show_passage ? ' ' . get_passage(get_filetime($page)) : '';
 		if ($search_word_color) {
 			$uri =  $script . '?' . 'cmd=read&amp;page=' . $r_page . '&amp;word=' . $r_word;
@@ -918,4 +918,14 @@
 		}
 	}
 }
+
+function get_pagetitle($page) {
+	$cont = get_source( $page, null, TRUE );
+	$matches = array();
+	if ( preg_match('/^#title\((.+)\)\s*$/m', $cont, $match) ) {
+		return htmlsc($match[1]);
+	} else {
+		return $page;
+	}
+}
 ?>
Index: lib/html.php
===================================================================
RCS file: /cvsroot/pukiwiki/pukiwiki/lib/html.php,v
retrieving revision 1.66
diff -u -b -r1.66 html.php
--- lib/html.php	25 Jan 2011 15:01:01 -0000	1.66
+++ lib/html.php	14 Oct 2012 14:36:03 -0000
@@ -256,13 +256,7 @@
 </div>
 EOD;
 
-	if (isset($vars['help'])) {
 		$body .= $hr . catrule();
-	} else {
-		$body .= '<ul><li><a href="' .
-			$script . '?cmd=edit&amp;help=true&amp;page=' . $r_page .
-			'">' . $_msg_help . '</a></li></ul>';
-	}
 
 	return $body;
 }
Index: plugin/attach.inc.php
===================================================================
RCS file: /cvsroot/pukiwiki/pukiwiki/plugin/attach.inc.php,v
retrieving revision 1.92
diff -u -b -r1.92 attach.inc.php
--- plugin/attach.inc.php	25 Jan 2011 15:01:01 -0000	1.92
+++ plugin/attach.inc.php	14 Oct 2012 14:36:03 -0000
@@ -14,16 +14,18 @@
 //    This feature is disabled at newer version of PHP.
 //    Set this at php.ini if you want.
 // Max file size for upload on PHP (PHP default: 2MB)
-ini_set('upload_max_filesize', '2M');
+//ini_set('upload_max_filesize', '2M');
+ini_set('upload_max_filesize', '8M');
 
 // Max file size for upload on script of PukiWikiX_FILESIZE
-define('PLUGIN_ATTACH_MAX_FILESIZE', (1024 * 1024)); // default: 1MB
+// define('PLUGIN_ATTACH_MAX_FILESIZE', (1024 * 1024)); // default: 1MB
+define('PLUGIN_ATTACH_MAX_FILESIZE', (8 * 1024 * 1024)); 
 
 // 管理者だけが添付ファイルをアップロードできるようにする
-define('PLUGIN_ATTACH_UPLOAD_ADMIN_ONLY', TRUE); // FALSE or TRUE
+define('PLUGIN_ATTACH_UPLOAD_ADMIN_ONLY', FALSE); // FALSE or TRUE
 
 // 管理者だけが添付ファイルを削除できるようにする
-define('PLUGIN_ATTACH_DELETE_ADMIN_ONLY', TRUE); // FALSE or TRUE
+define('PLUGIN_ATTACH_DELETE_ADMIN_ONLY', FALSE); // FALSE or TRUE
 
 // 管理者が添付ファイルを削除するときは、バックアップを作らない
 // PLUGIN_ATTACH_DELETE_ADMIN_ONLY=TRUEのとき有効
Index: plugin/nofollow.inc.php
===================================================================
RCS file: /cvsroot/pukiwiki/pukiwiki/plugin/nofollow.inc.php,v
retrieving revision 1.2
diff -u -b -r1.2 nofollow.inc.php
--- plugin/nofollow.inc.php	29 Jul 2007 05:22:36 -0000	1.2
+++ plugin/nofollow.inc.php	14 Oct 2012 14:36:03 -0000
@@ -12,11 +12,11 @@
 	global $vars, $nofollow;
 
 	$page = isset($vars['page']) ? $vars['page'] : '';
-	if (is_freeze($page)) {
+	//if (is_freeze($page)) {
 		$nofollow = 1;
-		return '';
-	} else {
-		return '#nofollow: Page not freezed';
-	}
+	//	return '';
+	//} else {
+	//	return '#nofollow: Page not freezed';
+	//}
 }
 ?>
Index: plugin/ref.inc.php
===================================================================
RCS file: /cvsroot/pukiwiki/pukiwiki/plugin/ref.inc.php,v
retrieving revision 1.56
diff -u -b -r1.56 ref.inc.php
--- plugin/ref.inc.php	14 Feb 2011 15:45:07 -0000	1.56
+++ plugin/ref.inc.php	14 Oct 2012 14:36:03 -0000
@@ -117,6 +117,7 @@
 {
 	global $script, $vars;
 	global $WikiName, $BracketName;
+	global $head_tags;
 
 	$page = isset($vars['page']) ? $vars['page'] : '';
 
@@ -229,7 +230,9 @@
 			return $params;
 		}
 		$matches = array();
+		if (!isset($params['_title'])) {
 		$params['_title'] = preg_match('#([^/]+)$#', $url, $matches) ? $matches[1] : $url;
+		}
 
 		if ($seems_image && PLUGIN_REF_URL_GET_IMAGE_SIZE && (bool)ini_get('allow_url_fopen')) {
 			$size = @getimagesize($name);
@@ -243,7 +246,9 @@
 		$url  = $script . '?plugin=attach' . '&refer=' . rawurlencode($page) .
 			'&openfile=' . rawurlencode($name); // Show its filename at the last
 		$url2 = '';
+		if (!isset($params['_title'])) {
 		$params['_title'] = $name;
+		}
 
 		if ($seems_image) {
 			// URI for in-line image output
@@ -264,6 +269,9 @@
 	}
 
 	$s_url   = htmlsc($url);
+	if ($seems_image) {
+		$head_tags[] = '<meta property="og:image" content="'. $s_url .'" />';
+	}
 	$s_title = isset($params['_title']) ? htmlsc($params['_title']) : '';
 	$s_info  = '';
 	if ($seems_image) {
@@ -327,7 +335,7 @@
 			$params['_h']    = intval($matches[2]);
 		} else if (preg_match('/^([0-9.]+)%$/', $arg, $matches) && $matches[1] > 0) {
 			$params['_%']    = intval($matches[1]);
-		} else {
+		} elseif (!empty($arg)) {
 			$_title[] = $arg;
 		}
 	}
Index: plugin/rss.inc.php
===================================================================
RCS file: /cvsroot/pukiwiki/pukiwiki/plugin/rss.inc.php,v
retrieving revision 1.21
diff -u -b -r1.21 rss.inc.php
--- plugin/rss.inc.php	11 Feb 2007 05:53:31 -0000	1.21
+++ plugin/rss.inc.php	14 Oct 2012 14:36:03 -0000
@@ -39,7 +39,17 @@
 	foreach (file_head($recent, $rss_max) as $line) {
 		list($time, $page) = explode("\t", rtrim($line));
 		$r_page = rawurlencode($page);
-		$title  = mb_convert_encoding($page, 'UTF-8', SOURCE_ENCODING);
+		$title  = mb_convert_encoding(get_pagetitle($page), 'UTF-8', SOURCE_ENCODING);
+		$content = "";
+                if (check_readable($page)) {
+		    $content = get_source($page);
+		    if (count($content) > $rss_max) {
+			$content = array_slice( $content, 0, $rss_max );
+			$content[] = "...";
+		    }
+		    $content = htmlsc(trim(join("\n", $content)));
+		}
+		$description  = mb_convert_encoding($content, 'UTF-8', SOURCE_ENCODING);
 
 		switch ($version) {
 		case '0.91': /* FALLTHROUGH */
@@ -70,6 +80,7 @@
  <link>$self?$r_page</link>
  <dc:date>$date</dc:date>
  <dc:identifier>$self?$r_page</dc:identifier>
+ <dc:description>$description</dc:description>
 </item>
 
 EOD;
Index: plugin/search.inc.php
===================================================================
RCS file: /cvsroot/pukiwiki/pukiwiki/plugin/search.inc.php,v
retrieving revision 1.14
diff -u -b -r1.14 search.inc.php
--- plugin/search.inc.php	25 Jan 2011 15:01:01 -0000	1.14
+++ plugin/search.inc.php	14 Oct 2012 14:36:03 -0000
@@ -6,7 +6,7 @@
 
 // Allow search via GET method 'index.php?plugin=search&word=keyword'
 // NOTE: Also allows DoS to your site more easily by SPAMbot or worm or ...
-define('PLUGIN_SEARCH_DISABLE_GET_ACCESS', 1); // 1, 0
+define('PLUGIN_SEARCH_DISABLE_GET_ACCESS', 0); // 1, 0
 
 define('PLUGIN_SEARCH_MAX_LENGTH', 80);
 define('PLUGIN_SEARCH_MAX_BASE',   16); // #search(1,2,3,...,15,16)
@@ -100,8 +100,9 @@
 	}
 
 	return <<<EOD
-<form action="$script?cmd=search" method="post">
+<form action="$script" method="GET">
  <div>
+  <input type="hidden" name="cmd" value="search"/>
   <input type="text"  name="word" value="$s_word" size="20" />
   <input type="radio" name="type" id="_p_search_AND" value="AND" $and_check />
   <label for="_p_search_AND">$_btn_and</label>
Index: skin/pukiwiki.css.php
===================================================================
RCS file: /cvsroot/pukiwiki/pukiwiki/skin/pukiwiki.css.php,v
retrieving revision 1.12
diff -u -b -r1.12 pukiwiki.css.php
--- skin/pukiwiki.css.php	12 Oct 2005 13:06:27 -0000	1.12
+++ skin/pukiwiki.css.php	14 Oct 2012 14:36:03 -0000
@@ -31,47 +31,60 @@
 ?>
 @charset "<?php echo $charset ?>";
 
-pre, dl, ol, p, blockquote { line-height:130%; }
+pre, dl, ol, p, blockquote { 
+  line-height:130%; 
+  margin-left:.4em;
+}
+p {
+  text-indent:1em;
+}
+.menubar p {
+  text-indent:0px;
+}
+
 
 blockquote { margin-left:32px; }
 
+
+body{
+/*width:1000px;*/
+}
+
 body,td {
 	color:black;
 	background-color:white;
-	margin-left:2%;
+	margin-left:1%;
 	margin-right:2%;
 	font-size:90%;
-	font-family:verdana, arial, helvetica, Sans-Serif;
+	font-family:verdana, arial, helvetica, 'Hiragino Kaku Gothic Pro', Meiryo, '���C���I', Sans-Serif;
 }
 
 a:link {
 <?php	if ($media == 'print') { ?>
 	text-decoration: underline;
 <?php	} else { ?>
-	color:#215dc6;
+/*	color:#215dc6;*/
+	color:#00F;
 	background-color:inherit;
-	text-decoration:none;
 <?php	} ?>
 }
 
 a:active {
 	color:#215dc6;
 	background-color:#CCDDEE;
-	text-decoration:none;
 }
 
 a:visited {
 <?php	if ($media == 'print') { ?>
-	text-decoration: underline;
 <?php	} else { ?>
-	color:#a63d21;
+/*	color:#a63d21;*/
 	background-color:inherit;
-	text-decoration:none;
 <?php	} ?>
 }
 
 a:hover {
-	color:#215dc6;
+/*	color:#215dc6;*/
+	color:#00F;
 	background-color:#CCDDEE;
 	text-decoration:underline;
 }
@@ -79,17 +92,17 @@
 h1, h2 {
 	font-family:verdana, arial, helvetica, Sans-Serif;
 	color:inherit;
-	background-color:#DDEEFF;
+	background-color:#B6C5F6;
 	padding:.3em;
 	border:0px;
 	margin:0px 0px .5em 0px;
 }
 h3 {
 	font-family:verdana, arial, helvetica, Sans-Serif;
-	border-bottom:  3px solid #DDEEFF;
-	border-top:     1px solid #DDEEFF;
-	border-left:   10px solid #DDEEFF;
-	border-right:   5px solid #DDEEFF;
+	border-bottom:  3px solid #B6C5F6;
+	border-top:     1px solid #B6C5F6;
+	border-left:   10px solid #B6C5F6;
+	border-right:   5px solid #B6C5F6;
 
 	color:inherit;
 	background-color:#FFFFFF;
@@ -98,7 +111,7 @@
 }
 h4 {
 	font-family:verdana, arial, helvetica, Sans-Serif;
-	border-left:   18px solid #DDEEFF;
+	border-left:   18px solid #B6C5F6;
 
 	color:inherit;
 	background-color:#FFFFFF;
@@ -108,7 +121,7 @@
 h5, h6 {
 	font-family:verdana, arial, helvetica, Sans-Serif;
 	color:inherit;
-	background-color:#DDEEFF;
+	background-color:#B6C5F6;
  	padding:.3em;
  	border:0px;
  	margin:0px 0px .5em 0px;
@@ -139,7 +152,7 @@
 	margin-right:2em;
 	white-space:pre;
 	color:black;
-	background-color:#F0F8FF;
+	background-color:#FBFCFE;
 }
 
 img {
@@ -153,14 +166,25 @@
 	line-height:130%;
 }
 
+
 em { font-style:italic; }
 
 strong { font-weight:bold; }
 
+/*.jumpmenu, .anchor_super {*/
+.jumpmenu{
+	    display:none;
+}
+
+
+#main{
+	padding-top:10px;
+}
+
 thead td.style_td,
 tfoot td.style_td {
 	color:inherit;
-	background-color:#D0D8E0;
+/*	background-color:#D0D8E0;*/
 }
 thead th.style_th,
 tfoot th.style_th {
@@ -170,7 +194,7 @@
 .style_table {
 	padding:0px;
 	border:0px;
-	margin:auto;
+	margin: auto;
 	text-align:left;
 	color:inherit;
 	background-color:#ccd5dd;
@@ -186,7 +210,6 @@
 	padding:5px;
 	margin:1px;
 	color:inherit;
-	background-color:#EEF5FF;
 }
 
 ul.list1 { list-style-type:disc; }
@@ -227,6 +250,8 @@
 }
 
 hr.full_hr {
+	   clear:both;
+
 	border-style:ridge;
 	border-color:#333333;
 	border-width:1px 0px;
@@ -330,8 +355,7 @@
 
 /* pukiwiki.skin.php */
 div#header {
-	padding:0px;
-	margin:0px;
+	background-color: #163AB2;
 }
 
 div#navigator {
@@ -348,33 +372,58 @@
 <?php   if ($media == 'print') { ?>
 	display:none;
 <?php   } else { ?>
-	width:9em;
+	width:14em;
+	min-width:14em;
 	vertical-align:top;
+	padding:0;
 <?php   } ?>
 }
 
+tbody tr td{
+      padding:0;
+}
+
 div#menubar {
 <?php   if ($media == 'print') { ?>
 	display:none;
 <?php   } else { ?>
-	width:9em;
 	padding:0px;
-	margin:4px;
-	word-break:break-all;
-	font-size:90%;
-	overflow:hidden;
+	border-left: 4px solid #1E288E;
+	border-right: 4px solid #1E288E;
 <?php   } ?>
 }
 
 div#menubar ul {
-	margin:0px 0px 0px .5em;
+	margin:0px 0px 10px .5em;
 	padding:0px 0px 0px .5em;
 }
 
-div#menubar ul li { line-height:110%; }
+div#menubar ul li {
+	    line-height:150%;
+	    list-style-type:none;
+	    margin-bottom:3px;
+}
+div#menubar ul li li {
+	list-style-image: url( "../image/icon_next.png" );
+	list-style-position: inside;
+}
+
+div#menubar h2 {
+	    background-color:#1e288e;
+	    color:white;
+	    font-size:110%;
+}
 
 div#menubar h4 { font-size:110%; }
 
+div#search { 
+	text-align: center; 
+}
+div#search input[type="text"] {
+	width: 8em;
+}
+
+
 div#body {
 	padding:0px;
 	margin:0px 0px 0px .5em;
@@ -409,8 +458,21 @@
 
 div#lastmodified {
 	font-size:80%;
-	padding:0px;
-	margin:0px;
+	margin-top: 1em;
+	text-align: right;
+}
+
+ul#social-service {
+	/*text-align: right;*/
+	padding: 5px;
+	height: 1.5em;
+	vertical-align: bottom;
+}
+ul#social-service li {
+	display: block;
+	width: 100px;
+	float: right;
+	margin-left: 10px;
 }
 
 div#related {
@@ -424,13 +486,17 @@
 }
 
 div#footer {
-	font-size:70%;
+	font-size:80%;
 	padding:0px;
 	margin:16px 0px 0px 0px;
+	text-align: right;
+}
+div#footer a {
+	text-decoration: none;
 }
 
 div#banner {
-	float:right;
+	text-align: center;
 	margin-top:24px;
 }
 
@@ -441,10 +507,7 @@
 
 img#logo {
 <?php   if ($media == 'print') { ?>
-	display:none;
 <?php   } else { ?>
-	float:left;
-	margin-right:20px;
 <?php   } ?>
 }
 
Index: skin/pukiwiki.skin.php
===================================================================
RCS file: /cvsroot/pukiwiki/pukiwiki/skin/pukiwiki.skin.php,v
retrieving revision 1.56
diff -u -b -r1.56 pukiwiki.skin.php
--- skin/pukiwiki.skin.php	26 Jul 2007 00:57:00 -0000	1.56
+++ skin/pukiwiki.skin.php	14 Oct 2012 14:36:03 -0000
@@ -12,7 +12,7 @@
 // Settings (define before here, if you want)
 
 // Set site identities
-$_IMAGE['skin']['logo']     = 'pukiwiki.png';
+$_IMAGE['skin']['logo']     = 'jsik-logo.png';
 $_IMAGE['skin']['favicon']  = ''; // Sample: 'image/favicon.ico';
 
 // SKIN_DEFAULT_DISABLE_TOPICPATH
@@ -53,6 +53,9 @@
 // MenuBar
 $menu = arg_check('read') && exist_plugin_convert('menu') ? do_plugin_convert('menu') : FALSE;
 
+
+$banner = arg_check('read') && exist_plugin_convert('include') ? do_plugin_convert('include','banner,notitle') : FALSE;
+
 // ------------------------------------------------------------
 // Output
 
@@ -70,7 +73,7 @@
 }
 
 ?>
-<head>
+<head xmlns:og="http://ogp.me/ns#">
  <?php echo $meta_content_type ?>
  <meta http-equiv="content-style-type" content="text/css" />
 <?php if ($nofollow || ! $is_read)  { ?> <meta name="robots" content="NOINDEX,NOFOLLOW" /><?php } ?>
@@ -81,89 +84,42 @@
  <link rel="SHORTCUT ICON" href="<?php echo $image['favicon'] ?>" />
  <link rel="stylesheet" type="text/css" media="screen" href="<?php echo SKIN_DIR ?>pukiwiki.css.php?charset=<?php echo $css_charset ?>" charset="<?php echo $css_charset ?>" />
  <link rel="stylesheet" type="text/css" media="print"  href="<?php echo SKIN_DIR ?>pukiwiki.css.php?charset=<?php echo $css_charset ?>&amp;media=print" charset="<?php echo $css_charset ?>" />
- <link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $link['rss'] ?>" /><?php // RSS auto-discovery ?>
+ <link rel="stylesheet" type="text/css" href="./jsik.css"/>
+ <link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $link['rss10'] ?>" /><?php // RSS auto-discovery ?>
+ <meta property="og:image" content="<?php echo $script . IMAGE_DIR . "jsik-logo-og.png" ?>" />
 
 <?php echo $head_tag ?>
 </head>
 <body>
-
+<div id="fb-root"></div>
+<script>(function(d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (d.getElementById(id)) return;
+  js = d.createElement(s); js.id = id;
+  js.src = "//connect.facebook.net/ja_JP/all.js#xfbml=1";
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
 <div id="header">
- <a href="<?php echo $link['top'] ?>"><img id="logo" src="<?php echo IMAGE_DIR . $image['logo'] ?>" width="80" height="80" alt="[PukiWiki]" title="[PukiWiki]" /></a>
-
- <h1 class="title"><?php echo $page ?></h1>
-
-<?php if ($is_page) { ?>
- <?php if(SKIN_DEFAULT_DISABLE_TOPICPATH) { ?>
-   <a href="<?php echo $link['reload'] ?>"><span class="small"><?php echo $link['reload'] ?></span></a>
- <?php } else { ?>
-   <span class="small">
-   <?php require_once(PLUGIN_DIR . 'topicpath.inc.php'); echo plugin_topicpath_inline(); ?>
-   </span>
- <?php } ?>
-<?php } ?>
-
+ <a href="./"><img id="logo" src="<?php echo IMAGE_DIR . $image['logo'] ?>" alt=""/></a> 
 </div>
 
-<div id="navigator">
-<?php if(PKWK_SKIN_SHOW_NAVBAR) { ?>
-<?php
-function _navigator($key, $value = '', $javascript = ''){
-	$lang = & $GLOBALS['_LANG']['skin'];
-	$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 '<a href="' . $link[$key] . '" ' . $javascript . '>' .
-		(($value === '') ? $lang[$key] : $value) .
-		'</a>';
-
-	return TRUE;
-}
-?>
- [ <?php _navigator('top') ?> ] &nbsp;
-
-<?php if ($is_page) { ?>
- [
- <?php if ($rw) { ?>
-	<?php _navigator('edit') ?> |
-	<?php if ($is_read && $function_freeze) { ?>
-		<?php (! $is_freeze) ? _navigator('freeze') : _navigator('unfreeze') ?> |
-	<?php } ?>
- <?php } ?>
- <?php _navigator('diff') ?>
- <?php if ($do_backup) { ?>
-	| <?php _navigator('backup') ?>
- <?php } ?>
- <?php if ($rw && (bool)ini_get('file_uploads')) { ?>
-	| <?php _navigator('upload') ?>
- <?php } ?>
- | <?php _navigator('reload') ?>
- ] &nbsp;
-<?php } ?>
-
- [
- <?php if ($rw) { ?>
-	<?php _navigator('new') ?> |
- <?php } ?>
-   <?php _navigator('list') ?>
- <?php if (arg_check('list')) { ?>
-	| <?php _navigator('filelist') ?>
- <?php } ?>
- | <?php _navigator('search') ?>
- | <?php _navigator('recent') ?>
- | <?php _navigator('help')   ?>
- ]
-<?php } // PKWK_SKIN_SHOW_NAVBAR ?>
-</div>
-
-<?php echo $hr ?>
+<div style="clear:both;"></div>
 
 <?php if ($menu !== FALSE) { ?>
-<table border="0" style="width:100%">
+<table border="0" style="width:100%;" id="main">
  <tr>
   <td class="menubar">
    <div id="menubar"><?php echo $menu ?></div>
+   <div id="search">
+   <form action="./" method="get">
+     <div>
+     <input type="hidden" name="cmd" value="search"/> 
+     <input type="text" name="word" size="18" />
+     <input type="submit" value="検索"/>
+     </div>
+   </form>
+   </div>
+   <div id="banner"><?php echo $banner ?></div>
   </td>
   <td valign="top">
    <div id="body"><?php echo $body ?></div>
@@ -185,6 +141,24 @@
 </div>
 <?php } ?>
 
+<?php if ($lastmodified != '') { ?>
+<div id="lastmodified">最終更新日: <?php echo $lastmodified ?></div>
+<?php } ?>
+<?php if ($is_page && $is_read) { ?>
+<ul id="social-service">
+<li class="hatena-bookmark">
+<a href="http://b.hatena.ne.jp/entry/" class="hatena-bookmark-button" data-hatena-bookmark-layout="standard-balloon" title="このエントリーをはてなブックマークに追加"><img src="http://b.st-hatena.com/images/entry-button/button-only.gif" alt="このエントリーをはてなブックマークに追加" width="20" height="20" style="border: none;" /></a><script type="text/javascript" src="http://b.st-hatena.com/js/bookmark_button.js" charset="utf-8" async="async"></script>
+</li>
+<li class="twitter-button">
+<a href="https://twitter.com/share" class="twitter-share-button" data-lang="ja">ツイート</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+</li>
+<li class="facebook-button">
+<div class="fb-like" data-href="<?php echo $link['reload'] ?>" data-send="false" data-layout="button_count" data-width="100" data-show-faces="true"></div>
+</li>
+</ul>
+<?php } ?>
+
 <?php echo $hr ?>
 
 <?php if (PKWK_SKIN_SHOW_TOOLBAR) { ?>
@@ -263,19 +237,26 @@
 </div>
 <?php } // PKWK_SKIN_SHOW_TOOLBAR ?>
 
-<?php if ($lastmodified != '') { ?>
-<div id="lastmodified">Last-modified: <?php echo $lastmodified ?></div>
-<?php } ?>
-
-<?php if ($related != '') { ?>
-<div id="related">Link: <?php echo $related ?></div>
-<?php } ?>
 
 <div id="footer">
- Site admin: <a href="<?php echo $modifierlink ?>"><?php echo $modifier ?></a><p />
- <?php echo S_COPYRIGHT ?>.
- Powered by PHP <?php echo PHP_VERSION ?>. HTML convert time: <?php echo elapsedtime() ?> sec.
-</div>
+<p><a href="<?php echo $modifierlink ?>"><?php echo $modifier ?></a><br />
+〒110-8560　東京都台東区台東1-5-1（凸版印刷(株)内) (<a href="./?access">アクセス</a>)<br />
+TEL.03-3835-5692 (<a href="./?contactus">在席時間</a>)　FAX.03-3837-0368<br />
+<a href="http://www.jsik.jp/">http://www.jsik.jp/</a><br/>
+<img height="18" src="./?plugin=attach&amp;pcmd=open&amp;file=emailaddress-arb-b.gif&amp;refer=FrontPage" alt="mail"/>
+</p>
 
+
+</div>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-21499591-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
 </body>
 </html>