Context Navigation

← Previous Revision
Latest Revision
Next Revision →
Blame
Revision Log

ここの情報は古いです。ご理解頂いた上でお取り扱いください。

OpenPNE_2_5_5_to_2_5_6.patch @ 1115

Last change on this file since 1115 was 1115, checked in by takanashi, 16 years ago
2.5.6パッチ
File size: 589.6 KB

Line
1	Index: setup/sql/update/new_biz_schedule_converter.php
2	===================================================================
3	--- setup/sql/update/new_biz_schedule_converter.php (.../2_5_5) (revision 0)
4	+++ setup/sql/update/new_biz_schedule_converter.php (.../2_5_6) (revision 1114)
5	@@ -0,0 +1,41 @@
6	+<?php
7	+/**
8	+ * OpenPNE2.5ä»¥åã®BIZã¹ã±ã¸ã¥ã¼ã«ãã¼ã¿ããOpenPNE2.6ä»¥éåãã«å¤æããã¹ã¯ãªãã
9	+ */
10	+
11	+set_time_limit(0);
12	+
13	+//OpenPNEããconfig.phpã®æå ±ãèªã¿è¾¼ã
14	+define('OPENPNE_DIR', realpath('../../../'));
15	+require_once OPENPNE_DIR . '/config.php';
16	+require_once OPENPNE_WEBAPP_DIR . '/init.inc';
17	+
18	+//biz_schedule_idã®ãªã¹ããåå¾
19	+$sql = 'SELECT biz_schedule_id FROM biz_schedule';
20	+$biz_schedule_id_list = db_get_col($sql);
21	+$result = array();
22	+
23	+foreach ($biz_schedule_id_list as $biz_schedule_id) {
24	+ //ã¹ã±ã¸ã¥ã¼ã«ã®åå®¹ãå¾ã
25	+ $sql = 'SELECT * FROM biz_schedule WHERE biz_schedule_id = ?';
26	+ $schedule = db_get_row($sql, array($biz_schedule_id));
27	+ array_shift($schedule);
28	+
29	+ //ã¹ã±ã¸ã¥ã¼ã«ã®åå èãå¾ã
30	+ $sql = 'SELECT c_member_id FROM biz_schedule_member WHERE biz_schedule_id = ?';
31	+ $schedule_member_list = db_get_col($sql, array($biz_schedule_id));
32	+
33	+ //æ°è¦ã¹ã±ã¸ã¥ã¼ã«æ¿å¥
34	+ foreach ($schedule_member_list as $c_member_id) {
35	+ $schedule['c_member_id'] = $c_member_id;
36	+ db_insert('biz_schedule', $schedule);
37	+ }
38	+
39	+ //æ¢åã®ã¹ã±ã¸ã¥ã¼ã«ã®åé¤
40	+ if (!empty($schedule_member_list))
41	+ {
42	+ $sql = 'DELETE FROM biz_schedule WHERE biz_schedule_id = ?';
43	+ db_query($sql, array($biz_schedule_id));
44	+ }
45	+}
46	+?>
47	\ No newline at end of file
48	Index: setup/sql/update/mysql40/update09-for2.5.6_insert_c_cmd.sql
49	===================================================================
50	--- setup/sql/update/mysql40/update09-for2.5.6_insert_c_cmd.sql (.../2_5_5) (revision 0)
51	+++ setup/sql/update/mysql40/update09-for2.5.6_insert_c_cmd.sql (.../2_5_6) (revision 1114)
52	@@ -0,0 +1,12 @@
53	+INSERT INTO c_cmd VALUES ('','youtube',7);
54	+INSERT INTO c_cmd VALUES ('','www.youtube.com',7);
55	+INSERT INTO c_cmd VALUES ('','watchme',7);
56	+INSERT INTO c_cmd VALUES ('','www.watchme.tv',7);
57	+INSERT INTO c_cmd VALUES ('','www.grouper.com',7);
58	+INSERT INTO c_cmd VALUES ('','www.flipclip.net',7);
59	+INSERT INTO c_cmd VALUES ('','www.ebitv.jp',7);
60	+INSERT INTO c_cmd VALUES ('','video.google.com',7);
61	+INSERT INTO c_cmd VALUES ('','kakaku.com',7);
62	+INSERT INTO c_cmd VALUES ('','grouper.com',7);
63	+INSERT INTO c_cmd VALUES ('','flipclip.net',7);
64	+INSERT INTO c_cmd VALUES ('','youtube.com',7);
65	Index: setup/sql/update/mysql40/update07-for2.5.6_insert_c_api.sql
66	===================================================================
67	--- setup/sql/update/mysql40/update07-for2.5.6_insert_c_api.sql (.../2_5_5) (revision 0)
68	+++ setup/sql/update/mysql40/update07-for2.5.6_insert_c_api.sql (.../2_5_6) (revision 1114)
69	@@ -0,0 +1,5 @@
70	+INSERT INTO c_api VALUES ('','000_auth','');
71	+INSERT INTO c_api VALUES ('','001_get_c_member','');
72	+INSERT INTO c_api VALUES ('','002_get_member_point','');
73	+INSERT INTO c_api VALUES ('','101_add_point','');
74	+INSERT INTO c_api VALUES ('','smtp2pne','');
75	Index: setup/sql/update/mysql40/update08-for2.5.6_create_table_c_cmd.sql
76	===================================================================
77	--- setup/sql/update/mysql40/update08-for2.5.6_create_table_c_cmd.sql (.../2_5_5) (revision 0)
78	+++ setup/sql/update/mysql40/update08-for2.5.6_create_table_c_cmd.sql (.../2_5_6) (revision 1114)
79	@@ -0,0 +1,8 @@
80	+CREATE TABLE `c_cmd` (
81	+ `c_cmd_id` int(11) NOT NULL auto_increment,
82	+ `name` text NOT NULL,
83	+ `permit` int NOT NULL DEFAULT 0,
84	+ PRIMARY KEY (`c_cmd_id`),
85	+ KEY `name` (`name`(100)),
86	+ UNIQUE KEY (`name`(100))
87	+) ENGINE=MyISAM;
88	Index: setup/sql/update/mysql40/update02-for2.5.3-alter_table_biz_shisetsu_add_info.sql
89	===================================================================
90	--- setup/sql/update/mysql40/update02-for2.5.3-alter_table_biz_shisetsu_add_info.sql (.../2_5_5) (revision 0)
91	+++ setup/sql/update/mysql40/update02-for2.5.3-alter_table_biz_shisetsu_add_info.sql (.../2_5_6) (revision 1114)
92	@@ -0,0 +1 @@
93	+ALTER TABLE `biz_shisetsu` ADD `info` TEXT NOT NULL;
94	\ No newline at end of file
95	Index: setup/sql/update/mysql40/update04-for2.5.4-create_table_c_free_page.sql
96	===================================================================
97	--- setup/sql/update/mysql40/update04-for2.5.4-create_table_c_free_page.sql (.../2_5_5) (revision 0)
98	+++ setup/sql/update/mysql40/update04-for2.5.4-create_table_c_free_page.sql (.../2_5_6) (revision 1114)
99	@@ -0,0 +1,5 @@
100	+CREATE TABLE c_free_page (
101	+ c_free_page_id bigint(20) NOT NULL auto_increment,
102	+ body text NOT NULL,
103	+ PRIMARY KEY (c_free_page_id)
104	+) TYPE=MyISAM;
105	Index: setup/sql/update/mysql40/update01-for2.5.2.3-add_index.sql
106	===================================================================
107	--- setup/sql/update/mysql40/update01-for2.5.2.3-add_index.sql (.../2_5_5) (revision 0)
108	+++ setup/sql/update/mysql40/update01-for2.5.2.3-add_index.sql (.../2_5_6) (revision 1114)
109	@@ -0,0 +1,2 @@
110	+ALTER TABLE c_diary ADD INDEX c_member_id_r_datetime_public_flag(c_member_id, r_datetime, public_flag);
111	+ALTER TABLE c_commu ADD INDEX c_commu_category_id_r_datetime(c_commu_category_id, r_datetime);
112	\ No newline at end of file
113	Index: setup/sql/update/mysql40/update06-for2.5.6_create_table_c_api.sql
114	===================================================================
115	--- setup/sql/update/mysql40/update06-for2.5.6_create_table_c_api.sql (.../2_5_5) (revision 0)
116	+++ setup/sql/update/mysql40/update06-for2.5.6_create_table_c_api.sql (.../2_5_6) (revision 1114)
117	@@ -0,0 +1,7 @@
118	+CREATE TABLE `c_api` (
119	+ `c_api_id` int(11) NOT NULL auto_increment,
120	+ `name` text NOT NULL,
121	+ `ip` text,
122	+ PRIMARY KEY (`c_api_id`),
123	+ KEY `name` (`name`(100))
124	+) ENGINE=MyISAM;
125	Index: setup/sql/update/mysql40/update03-for2.5.4-alter_table_c_profile.sql
126	===================================================================
127	--- setup/sql/update/mysql40/update03-for2.5.4-alter_table_c_profile.sql (.../2_5_5) (revision 0)
128	+++ setup/sql/update/mysql40/update03-for2.5.4-alter_table_c_profile.sql (.../2_5_6) (revision 1114)
129	@@ -0,0 +1,2 @@
130	+ALTER TABLE c_profile ADD COLUMN info text NOT NULL after caption;
131	+ALTER TABLE c_profile MODIFY form_type enum('text','textlong','textarea','select','checkbox','radio') NOT NULL default 'text';
132	Index: setup/sql/update/mysql40/update10-for2.5.6_alter_table_biz_schedule.sql
133	===================================================================
134	--- setup/sql/update/mysql40/update10-for2.5.6_alter_table_biz_schedule.sql (.../2_5_5) (revision 0)
135	+++ setup/sql/update/mysql40/update10-for2.5.6_alter_table_biz_schedule.sql (.../2_5_6) (revision 1114)
136	@@ -0,0 +1,2 @@
137	+ALTER TABLE `biz_schedule` ADD `public_flag` ENUM( 'public', 'group', 'private' ) NOT NULL DEFAULT 'public',
138	+ADD `biz_group_id` INT NULL ;
139	\ No newline at end of file
140	Index: setup/sql/update/mysql40/update05-for2.5.5_diary_category-mysql40.sql
141	===================================================================
142	--- setup/sql/update/mysql40/update05-for2.5.5_diary_category-mysql40.sql (.../2_5_5) (revision 0)
143	+++ setup/sql/update/mysql40/update05-for2.5.5_diary_category-mysql40.sql (.../2_5_6) (revision 1114)
144	@@ -0,0 +1,14 @@
145	+CREATE TABLE `c_diary_category` (
146	+ `c_diary_category_id` int(11) NOT NULL auto_increment,
147	+ `category_name` text NOT NULL,
148	+ `c_member_id` int(11) NOT NULL,
149	+ `r_datetime` datetime NOT NULL,
150	+ PRIMARY KEY (`c_diary_category_id`)
151	+) ENGINE=MyISAM;
152	+
153	+CREATE TABLE `c_diary_category_diary` (
154	+ `c_diary_category_diary_id` int(11) NOT NULL auto_increment,
155	+ `c_diary_category_id` int(11) NOT NULL,
156	+ `c_diary_id` int(11) NOT NULL,
157	+ PRIMARY KEY (`c_diary_category_diary_id`)
158	+) ENGINE=MyISAM;
159	Index: setup/sql/update/mysql41/update09-for2.5.6_insert_c_cmd.sql
160	===================================================================
161	--- setup/sql/update/mysql41/update09-for2.5.6_insert_c_cmd.sql (.../2_5_5) (revision 0)
162	+++ setup/sql/update/mysql41/update09-for2.5.6_insert_c_cmd.sql (.../2_5_6) (revision 1114)
163	@@ -0,0 +1,12 @@
164	+INSERT INTO c_cmd VALUES ('','youtube',7);
165	+INSERT INTO c_cmd VALUES ('','www.youtube.com',7);
166	+INSERT INTO c_cmd VALUES ('','watchme',7);
167	+INSERT INTO c_cmd VALUES ('','www.watchme.tv',7);
168	+INSERT INTO c_cmd VALUES ('','www.grouper.com',7);
169	+INSERT INTO c_cmd VALUES ('','www.flipclip.net',7);
170	+INSERT INTO c_cmd VALUES ('','www.ebitv.jp',7);
171	+INSERT INTO c_cmd VALUES ('','video.google.com',7);
172	+INSERT INTO c_cmd VALUES ('','kakaku.com',7);
173	+INSERT INTO c_cmd VALUES ('','grouper.com',7);
174	+INSERT INTO c_cmd VALUES ('','flipclip.net',7);
175	+INSERT INTO c_cmd VALUES ('','youtube.com',7);
176	Index: setup/sql/update/mysql41/update07-for2.5.6_insert_c_api.sql
177	===================================================================
178	--- setup/sql/update/mysql41/update07-for2.5.6_insert_c_api.sql (.../2_5_5) (revision 0)
179	+++ setup/sql/update/mysql41/update07-for2.5.6_insert_c_api.sql (.../2_5_6) (revision 1114)
180	@@ -0,0 +1,5 @@
181	+INSERT INTO c_api VALUES ('','000_auth','');
182	+INSERT INTO c_api VALUES ('','001_get_c_member','');
183	+INSERT INTO c_api VALUES ('','002_get_member_point','');
184	+INSERT INTO c_api VALUES ('','101_add_point','');
185	+INSERT INTO c_api VALUES ('','smtp2pne','');
186	Index: setup/sql/update/mysql41/update08-for2.5.6_create_table_c_cmd.sql
187	===================================================================
188	--- setup/sql/update/mysql41/update08-for2.5.6_create_table_c_cmd.sql (.../2_5_5) (revision 0)
189	+++ setup/sql/update/mysql41/update08-for2.5.6_create_table_c_cmd.sql (.../2_5_6) (revision 1114)
190	@@ -0,0 +1,8 @@
191	+CREATE TABLE `c_cmd` (
192	+ `c_cmd_id` int(11) NOT NULL auto_increment,
193	+ `name` text NOT NULL,
194	+ `permit` int NOT NULL DEFAULT 0,
195	+ PRIMARY KEY (`c_cmd_id`),
196	+ KEY `name` (`name`(100)),
197	+ UNIQUE KEY (`name`(100))
198	+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
199	Index: setup/sql/update/mysql41/update02-for2.5.3-alter_table_biz_shisetsu_add_info.sql
200	===================================================================
201	--- setup/sql/update/mysql41/update02-for2.5.3-alter_table_biz_shisetsu_add_info.sql (.../2_5_5) (revision 0)
202	+++ setup/sql/update/mysql41/update02-for2.5.3-alter_table_biz_shisetsu_add_info.sql (.../2_5_6) (revision 1114)
203	@@ -0,0 +1 @@
204	+ALTER TABLE `biz_shisetsu` ADD `info` TEXT NOT NULL;
205	\ No newline at end of file
206	Index: setup/sql/update/mysql41/update04-for2.5.4-create_table_c_free_page.sql
207	===================================================================
208	--- setup/sql/update/mysql41/update04-for2.5.4-create_table_c_free_page.sql (.../2_5_5) (revision 0)
209	+++ setup/sql/update/mysql41/update04-for2.5.4-create_table_c_free_page.sql (.../2_5_6) (revision 1114)
210	@@ -0,0 +1,5 @@
211	+CREATE TABLE c_free_page (
212	+ c_free_page_id bigint(20) NOT NULL auto_increment,
213	+ body text NOT NULL,
214	+ PRIMARY KEY (c_free_page_id)
215	+) TYPE=MyISAM;
216	Index: setup/sql/update/mysql41/update05-for2.5.5_diary_category.sql
217	===================================================================
218	--- setup/sql/update/mysql41/update05-for2.5.5_diary_category.sql (.../2_5_5) (revision 0)
219	+++ setup/sql/update/mysql41/update05-for2.5.5_diary_category.sql (.../2_5_6) (revision 1114)
220	@@ -0,0 +1,14 @@
221	+CREATE TABLE `c_diary_category` (
222	+ `c_diary_category_id` int(11) NOT NULL auto_increment,
223	+ `category_name` text collate utf8_unicode_ci NOT NULL,
224	+ `c_member_id` int(11) NOT NULL,
225	+ `r_datetime` datetime NOT NULL,
226	+ PRIMARY KEY (`c_diary_category_id`)
227	+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
228	+
229	+CREATE TABLE `c_diary_category_diary` (
230	+ `c_diary_category_diary_id` int(11) NOT NULL auto_increment,
231	+ `c_diary_category_id` int(11) NOT NULL,
232	+ `c_diary_id` int(11) NOT NULL,
233	+ PRIMARY KEY (`c_diary_category_diary_id`)
234	+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
235	Index: setup/sql/update/mysql41/update01-for2.5.2.3-add_index.sql
236	===================================================================
237	--- setup/sql/update/mysql41/update01-for2.5.2.3-add_index.sql (.../2_5_5) (revision 0)
238	+++ setup/sql/update/mysql41/update01-for2.5.2.3-add_index.sql (.../2_5_6) (revision 1114)
239	@@ -0,0 +1,2 @@
240	+ALTER TABLE c_diary ADD INDEX c_member_id_r_datetime_public_flag(c_member_id, r_datetime, public_flag);
241	+ALTER TABLE c_commu ADD INDEX c_commu_category_id_r_datetime(c_commu_category_id, r_datetime);
242	\ No newline at end of file
243	Index: setup/sql/update/mysql41/update06-for2.5.6_create_table_c_api.sql
244	===================================================================
245	--- setup/sql/update/mysql41/update06-for2.5.6_create_table_c_api.sql (.../2_5_5) (revision 0)
246	+++ setup/sql/update/mysql41/update06-for2.5.6_create_table_c_api.sql (.../2_5_6) (revision 1114)
247	@@ -0,0 +1,7 @@
248	+CREATE TABLE `c_api` (
249	+ `c_api_id` int(11) NOT NULL auto_increment,
250	+ `name` text NOT NULL,
251	+ `ip` text,
252	+ PRIMARY KEY (`c_api_id`),
253	+ KEY `name` (`name`(100))
254	+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
255	Index: setup/sql/update/mysql41/update03-for2.5.4-alter_table_c_profile.sql
256	===================================================================
257	--- setup/sql/update/mysql41/update03-for2.5.4-alter_table_c_profile.sql (.../2_5_5) (revision 0)
258	+++ setup/sql/update/mysql41/update03-for2.5.4-alter_table_c_profile.sql (.../2_5_6) (revision 1114)
259	@@ -0,0 +1,2 @@
260	+ALTER TABLE c_profile ADD COLUMN info text NOT NULL after caption;
261	+ALTER TABLE c_profile MODIFY form_type enum('text','textlong','textarea','select','checkbox','radio') NOT NULL default 'text';
262	Index: setup/sql/update/mysql41/update10-for2.5.6_alter_table_biz_schedule.sql
263	===================================================================
264	--- setup/sql/update/mysql41/update10-for2.5.6_alter_table_biz_schedule.sql (.../2_5_5) (revision 0)
265	+++ setup/sql/update/mysql41/update10-for2.5.6_alter_table_biz_schedule.sql (.../2_5_6) (revision 1114)
266	@@ -0,0 +1,2 @@
267	+ALTER TABLE `biz_schedule` ADD `public_flag` ENUM( 'public', 'group', 'private' ) NOT NULL DEFAULT 'public',
268	+ADD `biz_group_id` INT NULL ;
269	\ No newline at end of file
270	Index: setup/sql/update/update02-for2.5.3-alter_table_biz_shisetsu_add_info.sql
271	===================================================================
272	--- setup/sql/update/update02-for2.5.3-alter_table_biz_shisetsu_add_info.sql (.../2_5_5) (revision 1114)
273	+++ setup/sql/update/update02-for2.5.3-alter_table_biz_shisetsu_add_info.sql (.../2_5_6) (revision 1114)
274	@@ -1 +0,0 @@
275	-ALTER TABLE `biz_shisetsu` ADD `info` TEXT NOT NULL;
276	\ No newline at end of file
277	Index: setup/sql/update/update04-for2.5.4-create_table_c_free_page.sql
278	===================================================================
279	--- setup/sql/update/update04-for2.5.4-create_table_c_free_page.sql (.../2_5_5) (revision 1114)
280	+++ setup/sql/update/update04-for2.5.4-create_table_c_free_page.sql (.../2_5_6) (revision 1114)
281	@@ -1,5 +0,0 @@
282	-CREATE TABLE c_free_page (
283	- c_free_page_id bigint(20) NOT NULL auto_increment,
284	- body text NOT NULL,
285	- PRIMARY KEY (c_free_page_id)
286	-) TYPE=MyISAM;
287	Index: setup/sql/update/update05-for2.5.5_diary_category.sql
288	===================================================================
289	--- setup/sql/update/update05-for2.5.5_diary_category.sql (.../2_5_5) (revision 1114)
290	+++ setup/sql/update/update05-for2.5.5_diary_category.sql (.../2_5_6) (revision 1114)
291	@@ -1,14 +0,0 @@
292	-CREATE TABLE `c_diary_category` (
293	- `c_diary_category_id` int(11) NOT NULL auto_increment,
294	- `category_name` text collate utf8_unicode_ci NOT NULL,
295	- `c_member_id` int(11) NOT NULL,
296	- `r_datetime` datetime NOT NULL,
297	- PRIMARY KEY (`c_diary_category_id`)
298	-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
299	-
300	-CREATE TABLE `c_diary_category_diary` (
301	- `c_diary_category_diary_id` int(11) NOT NULL auto_increment,
302	- `c_diary_category_id` int(11) NOT NULL,
303	- `c_diary_id` int(11) NOT NULL,
304	- PRIMARY KEY (`c_diary_category_diary_id`)
305	-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
306	Index: setup/sql/update/update01-for2.5.2.3-add_index.sql
307	===================================================================
308	--- setup/sql/update/update01-for2.5.2.3-add_index.sql (.../2_5_5) (revision 1114)
309	+++ setup/sql/update/update01-for2.5.2.3-add_index.sql (.../2_5_6) (revision 1114)
310	@@ -1,2 +0,0 @@
311	-ALTER TABLE c_diary ADD INDEX c_member_id_r_datetime_public_flag(c_member_id, r_datetime, public_flag);
312	-ALTER TABLE c_commu ADD INDEX c_commu_category_id_r_datetime(c_commu_category_id, r_datetime);
313	\ No newline at end of file
314	Index: setup/sql/update/update03-for2.5.4-alter_table_c_profile.sql
315	===================================================================
316	--- setup/sql/update/update03-for2.5.4-alter_table_c_profile.sql (.../2_5_5) (revision 1114)
317	+++ setup/sql/update/update03-for2.5.4-alter_table_c_profile.sql (.../2_5_6) (revision 1114)
318	@@ -1,2 +0,0 @@
319	-ALTER TABLE c_profile ADD COLUMN info text NOT NULL after caption;
320	-ALTER TABLE c_profile MODIFY form_type enum('text','textlong','textarea','select','checkbox','radio') NOT NULL default 'text';
321	Index: setup/OpenPNE_Update.html
322	===================================================================
323	--- setup/OpenPNE_Update.html (.../2_5_5) (revision 0)
324	+++ setup/OpenPNE_Update.html (.../2_5_6) (revision 1114)
325	@@ -0,0 +1,145 @@
326	+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
327	+<html>
328	+<head>
329	+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
330	+<meta http-equiv="Content-Style-Type" content="text/css">
331	+<title>OpenPNE 2.5.6ã¢ãããã¼ãã¬ã¤ã</title>
332	+<style type="text/css">
333	+<!--
334	+body {
335	+ background-color: #fff;
336	+ color: #000;
337	+ margin: 0px;
338	+ padding: 1em;
339	+ padding-right: 2em;
340	+}
341	+h2 {
342	+ margin: 1em 0 1em;
343	+}
344	+p.caution {
345	+ margin: 1em;
346	+ padding: 0.8em;
347	+ border: solid 1px #f63;
348	+}
349	+pre {
350	+ margin: 0.5em;
351	+ padding: 1em 2em;
352	+ background-color: #eee;
353	+}
354	+dl {
355	+ margin: 1em;
356	+}
357	+dt {
358	+ font-weight: bold;
359	+}
360	+dd {
361	+ margin: 0 0 0.5em 1em;
362	+}
363	+table {
364	+ margin: 1em;
365	+ border-collapse: collapse;
366	+}
367	+th {
368	+ background-color: #ddd;
369	+}
370	+th, td {
371	+ padding: 5px 10px;
372	+ border: solid 1px #000;
373	+}
374	+var {
375	+ color: #c33;
376	+}
377	+-->
378	+</style>
379	+</head>
380	+
381	+<body>
382	+
383	+<h1>OpenPNE2.5.6 ã¢ãããã¼ãã¬ã¤ã</h1>
384	+
385	+<p>ä½ææ¥: 2006/12/9</p>
386	+
387	+<h2>ç®æ¬¡</h2>
388	+<ul>
389	+<li><a href="#section0">0. ã¯ããã«</a></li>
390	+<li><a href="#section1">1. æé </a></li>
391	+<li><a href="#section2">2. ä½æ¥æ¹æ³</a>
392	+ <ul>
393	+ <li><a href="#section2-1">2-1. ã³ã³ãã¼ãSQLã®å®è¡</a></li>
394	+ <li><a href="#section2-2">2-2. ã½ã¼ã¹ã³ã¼ãã®ç½®ãæã</a></li>
395	+ <li><a href="#section2-3">2-3. è¨å®ãã¡ã¤ã«ã®å¤æ´</a></li>
396	+ <li><a href="#section2-4">2-4. BIZã¹ã±ã¸ã¥ã¼ã«ã³ã³ãã¼ã¿å®è¡(BIZã¢ã¼ãä½¿ç¨æ)</a></li>
397	+ <li><a href="#section2-5">2-5. OpenPNE2.5.5ããã®ã¢ãããã¼ã</a></li>
398	+ </ul></li>
399	+</ul>
400	+
401	+<hr>
402	+
403	+<h2 id="section0">0. ã¯ããã«</h2>
404	+
405	+<p>ãã®ææ¸ã¯ãOpenPNE ãã¼ã¸ã§ã³2.4.*/2.5.5 ãã ãã¼ã¸ã§ã³2.5.6 ã¸ã®ã¢ãããã¼ãæé ãæ¸ãããã®ã§ãã</p>
406	+
407	+<h2 id="section1">1. æé </h2>
408	+
409	+<p>ã¢ãããã¼ãã¯ä»¥ä¸ã®ãããªæé ã§é²ãã¾ãã</p>
410	+
411	+<ol>
412	+<li>ã¢ãããã¼ãSQLã®å®è¡</li>
413	+<li>ã½ã¼ã¹ã³ã¼ãã®ç½®ãæã</li>
414	+<li>è¨å®ãã¡ã¤ã«ã®å¤æ´</li>
415	+<li>BIZã¹ã±ã¸ã¥ã¼ã«ã³ã³ãã¼ã¿å®è¡(BIZã¢ã¼ãä½¿ç¨æ)</li>
416	+</ol>
417	+
418	+
419	+<h2 id="section2">2. ä½æ¥æ¹æ³</h2>
420	+
421	+<h3 id="section2-1">2-1. ã¢ãããã¼ãSQLã®å®è¡</h3>
422	+
423	+<p>
424	+setup/update/mysql4*/éä¸ã«ããSQLãã¡ã¤ã«ãå®è¡ãã¾ãã<br>
425	+MySQLã®ãã¼ã¸ã§ã³4.0/4.1ã§ã¹ã¯ãªãããåããã¦ãã¾ãã<br>
426	+ãä½¿ç¨ã®MySQLã«ãã£ãã¹ã¯ãªãããå®è¡ãã¦ãã ããã<br>
427	+BIZã¢ã¼ããä½¿ç¨ããªãå ´åã¯update02,update10ã¯ä¸è¦ã§ãã<br>
428	+</p>
429	+
430	+
431	+<h3 id="section2-2">2-2. ã½ã¼ã¹ã³ã¼ãã®ç½®ãæã</h3>
432	+
433	+<p>ãµã¼ãä¸ã« OpenPNE 2.5.6 ã®ã½ã¼ã¹ãã¡ã¤ã«ãè¨ç½®ãã¾ãã<br>
434	+ã½ã¼ã¹ã¯é¨åçã«å¥ãæ¿ããã«å¨ã¦äº¤æãã¦ãã ããã<br>
435	+è©³ããã¯ãã<a href="./OpenPNE_Setup.html">OpenPNE ã»ããã¢ããã¬ã¤ã</a>ããåèã«ãã¦ãã ããã</p>
436	+
437	+<h3 id="section2-3">2-3. è¨å®ãã¡ã¤ã«ã®å¤æ´</h3>
438	+
439	+<p>OpenPNE 2.4 ã®è¨å®ãã¡ã¤ã«ãåèã«ãã¦ 2.5.6 ç¨ã®è¨å®ãã¡ã¤ã«ãä½æãã¾ãã</p>
440	+
441	+<p class="caution">PHPã®è¨å®ã§ã»ã¼ãã¢ã¼ããæå¹ãªå ´åã¯ãMAIL_SET_ENVFROM ã false ã«è¨å®ãã¦ãã ããã</p>
442	+
443	+<h3 id="section2-4">2-4. BIZã¹ã±ã¸ã¥ã¼ã«ã³ã³ãã¼ã¿å®è¡(BIZã¢ã¼ãä½¿ç¨æ)</h3>
444	+
445	+<p>
446	+BIZã¢ã¼ãä½¿ç¨æã«ã¯ãBIZã¹ã±ã¸ã¥ã¼ã«ã³ã³ãã¼ã¿ setup/update/new_biz_schedule_converter.php ãå®è¡ãã¾ãã<br>
447	+2.4ã§ã¯è¤æ°äººã§å±æãã¦ããã¹ã±ã¸ã¥ã¼ã«ããããããã®åäººã¹ã±ã¸ã¥ã¼ã«ã«å¤æ´ãã¾ãã<br>
448	+(2.5.6ä»¥éã§ã¯å±æã¹ã±ã¸ã¥ã¼ã«ã¯ã°ã«ã¼ãã«ç´ã¥ãããããã¨ã«ãªãã¾ã)
449	+</p>
450	+
451	+<h3 id="section2-5">2-5. OpenPNE2.5.5ããã®ã¢ãããã¼ã</h3>
452	+
453	+<p>
454	+OpenPNE2.5.5ããã®ã¢ãããã¼ãä½æ¥ã2.4ããã®ã¢ãããã¼ãã¨åºæ¬çã«ã¯åæ§ãªä½æ¥ã«ãªãã¾ãã
455	+<br>
456	+ã¢ãããã¼ãSQLã®update06ï½update10ãå®è¡ãã¦ãã ããã
457	+BIZã¢ã¼ããä½¿ç¨ããªãå ´åã¯update10ã¯ä¸è¦ã§ãã<br>
458	+<br>
459	+2.5.5ãã2.5.6ã¸ã®config.phpè¿½å é ç®ã¯ããã¾ããããã®ã¾ã¾ãå©ç¨ããã ãã¾ãã
460	+<br>
461	+ã½ã¼ã¹ã³ã¼ããå¨ã¦ç½®ãæãã¦ãã ããã<br>
462	+BIZã¢ã¼ãä½¿ç¨æã«ã¯ãBIZã¹ã±ã¸ã¥ã¼ã«ã³ã³ãã¼ã¿ setup/update/new_biz_schedule_converter.php ãå®è¡ãã¾ãã<br>
463	+</p>
464	+
465	+
466	+<hr>
467	+<p>ä»¥ä¸ã§ã¢ãããã¼ãä½æ¥ã¯å®äºã§ãã</p>
468	+
469	+</body>
470	+</html>
471	\ No newline at end of file
472
473	Property changes on: setup/OpenPNE_Update.html
474	___________________________________________________________________
475	Name: svn:keywords
476	+ Id Date Author Rev URL
477	Name: svn:eol-style
478	+ LF
479
480	Index: public_html/skin/icon_event_R.gif
481	===================================================================
482	Cannot display: file marked as a binary type.
483	svn:mime-type = application/octet-stream
484	Index: public_html/skin/biz/checkbox_nochecked_share_2.gif
485	===================================================================
486	Cannot display: file marked as a binary type.
487	svn:mime-type = image/gif
488	Index: public_html/skin/biz/delete_2.gif
489	===================================================================
490	Cannot display: file marked as a binary type.
491	svn:mime-type = image/gif
492	Index: public_html/skin/biz/edit_2.gif
493	===================================================================
494	Cannot display: file marked as a binary type.
495	svn:mime-type = image/gif
496	Index: public_html/skin/biz/checkbox_nochecked_2.gif
497	===================================================================
498	Cannot display: file marked as a binary type.
499	svn:mime-type = image/gif
500	Index: public_html/skin/biz/delete.gif
501	===================================================================
502	Cannot display: file marked as a binary type.
503	svn:mime-type = image/gif
504	Index: public_html/skin/biz/edit.gif
505	===================================================================
506	Cannot display: file marked as a binary type.
507	svn:mime-type = image/gif
508	Index: public_html/skin/biz/shared.gif
509	===================================================================
510	Cannot display: file marked as a binary type.
511	svn:mime-type = image/gif
512	Index: public_html/skin/button_search_1.gif
513	===================================================================
514	Cannot display: file marked as a binary type.
515	svn:mime-type = application/octet-stream
516	Index: public_html/skin/button_search_3.gif
517	===================================================================
518	Cannot display: file marked as a binary type.
519	svn:mime-type = application/octet-stream
520	Index: public_html/skin/button_search_4.gif
521	===================================================================
522	Cannot display: file marked as a binary type.
523	svn:mime-type = application/octet-stream
524	Index: public_html/js/prototype.js
525	===================================================================
526	--- public_html/js/prototype.js (.../2_5_5) (revision 0)
527	+++ public_html/js/prototype.js (.../2_5_6) (revision 1114)
528	@@ -0,0 +1,1781 @@
529	+/* Prototype JavaScript framework, version 1.4.0
530	+ * (c) 2005 Sam Stephenson <sam@conio.net>
531	+ *
532	+ * Prototype is freely distributable under the terms of an MIT-style license.
533	+ * For details, see the Prototype web site: http://prototype.conio.net/
534	+ *
535	+/--------------------------------------------------------------------------/
536	+
537	+var Prototype = {
538	+ Version: '1.4.0',
539	+ ScriptFragment: '(?:<script.?>)((\n\|\r\|.)?)(?:<\/script>)',
540	+
541	+ emptyFunction: function() {},
542	+ K: function(x) {return x}
543	+}
544	+
545	+var Class = {
546	+ create: function() {
547	+ return function() {
548	+ this.initialize.apply(this, arguments);
549	+ }
550	+ }
551	+}
552	+
553	+var Abstract = new Object();
554	+
555	+Object.extend = function(destination, source) {
556	+ for (property in source) {
557	+ destination[property] = source[property];
558	+ }
559	+ return destination;
560	+}
561	+
562	+Object.inspect = function(object) {
563	+ try {
564	+ if (object == undefined) return 'undefined';
565	+ if (object == null) return 'null';
566	+ return object.inspect ? object.inspect() : object.toString();
567	+ } catch (e) {
568	+ if (e instanceof RangeError) return '...';
569	+ throw e;
570	+ }
571	+}
572	+
573	+Function.prototype.bind = function() {
574	+ var __method = this, args = $A(arguments), object = args.shift();
575	+ return function() {
576	+ return __method.apply(object, args.concat($A(arguments)));
577	+ }
578	+}
579	+
580	+Function.prototype.bindAsEventListener = function(object) {
581	+ var __method = this;
582	+ return function(event) {
583	+ return __method.call(object, event \|\| window.event);
584	+ }
585	+}
586	+
587	+Object.extend(Number.prototype, {
588	+ toColorPart: function() {
589	+ var digits = this.toString(16);
590	+ if (this < 16) return '0' + digits;
591	+ return digits;
592	+ },
593	+
594	+ succ: function() {
595	+ return this + 1;
596	+ },
597	+
598	+ times: function(iterator) {
599	+ $R(0, this, true).each(iterator);
600	+ return this;
601	+ }
602	+});
603	+
604	+var Try = {
605	+ these: function() {
606	+ var returnValue;
607	+
608	+ for (var i = 0; i < arguments.length; i++) {
609	+ var lambda = arguments[i];
610	+ try {
611	+ returnValue = lambda();
612	+ break;
613	+ } catch (e) {}
614	+ }
615	+
616	+ return returnValue;
617	+ }
618	+}
619	+
620	+/--------------------------------------------------------------------------/
621	+
622	+var PeriodicalExecuter = Class.create();
623	+PeriodicalExecuter.prototype = {
624	+ initialize: function(callback, frequency) {
625	+ this.callback = callback;
626	+ this.frequency = frequency;
627	+ this.currentlyExecuting = false;
628	+
629	+ this.registerCallback();
630	+ },
631	+
632	+ registerCallback: function() {
633	+ setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
634	+ },
635	+
636	+ onTimerEvent: function() {
637	+ if (!this.currentlyExecuting) {
638	+ try {
639	+ this.currentlyExecuting = true;
640	+ this.callback();
641	+ } finally {
642	+ this.currentlyExecuting = false;
643	+ }
644	+ }
645	+ }
646	+}
647	+
648	+/--------------------------------------------------------------------------/
649	+
650	+function $() {
651	+ var elements = new Array();
652	+
653	+ for (var i = 0; i < arguments.length; i++) {
654	+ var element = arguments[i];
655	+ if (typeof element == 'string')
656	+ element = document.getElementById(element);
657	+
658	+ if (arguments.length == 1)
659	+ return element;
660	+
661	+ elements.push(element);
662	+ }
663	+
664	+ return elements;
665	+}
666	+Object.extend(String.prototype, {
667	+ stripTags: function() {
668	+ return this.replace(/<\/?[^>]+>/gi, '');
669	+ },
670	+
671	+ stripScripts: function() {
672	+ return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
673	+ },
674	+
675	+ extractScripts: function() {
676	+ var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
677	+ var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
678	+ return (this.match(matchAll) \|\| []).map(function(scriptTag) {
679	+ return (scriptTag.match(matchOne) \|\| ['', ''])[1];
680	+ });
681	+ },
682	+
683	+ evalScripts: function() {
684	+ return this.extractScripts().map(eval);
685	+ },
686	+
687	+ escapeHTML: function() {
688	+ var div = document.createElement('div');
689	+ var text = document.createTextNode(this);
690	+ div.appendChild(text);
691	+ return div.innerHTML;
692	+ },
693	+
694	+ unescapeHTML: function() {
695	+ var div = document.createElement('div');
696	+ div.innerHTML = this.stripTags();
697	+ return div.childNodes[0] ? div.childNodes[0].nodeValue : '';
698	+ },
699	+
700	+ toQueryParams: function() {
701	+ var pairs = this.match(/^\??(.*)$/)[1].split('&');
702	+ return pairs.inject({}, function(params, pairString) {
703	+ var pair = pairString.split('=');
704	+ params[pair[0]] = pair[1];
705	+ return params;
706	+ });
707	+ },
708	+
709	+ toArray: function() {
710	+ return this.split('');
711	+ },
712	+
713	+ camelize: function() {
714	+ var oStringList = this.split('-');
715	+ if (oStringList.length == 1) return oStringList[0];
716	+
717	+ var camelizedString = this.indexOf('-') == 0
718	+ ? oStringList[0].charAt(0).toUpperCase() + oStringList[0].substring(1)
719	+ : oStringList[0];
720	+
721	+ for (var i = 1, len = oStringList.length; i < len; i++) {
722	+ var s = oStringList[i];
723	+ camelizedString += s.charAt(0).toUpperCase() + s.substring(1);
724	+ }
725	+
726	+ return camelizedString;
727	+ },
728	+
729	+ inspect: function() {
730	+ return "'" + this.replace('\\', '\\\\').replace("'", '\\\'') + "'";
731	+ }
732	+});
733	+
734	+String.prototype.parseQuery = String.prototype.toQueryParams;
735	+
736	+var $break = new Object();
737	+var $continue = new Object();
738	+
739	+var Enumerable = {
740	+ each: function(iterator) {
741	+ var index = 0;
742	+ try {
743	+ this._each(function(value) {
744	+ try {
745	+ iterator(value, index++);
746	+ } catch (e) {
747	+ if (e != $continue) throw e;
748	+ }
749	+ });
750	+ } catch (e) {
751	+ if (e != $break) throw e;
752	+ }
753	+ },
754	+
755	+ all: function(iterator) {
756	+ var result = true;
757	+ this.each(function(value, index) {
758	+ result = result && !!(iterator \|\| Prototype.K)(value, index);
759	+ if (!result) throw $break;
760	+ });
761	+ return result;
762	+ },
763	+
764	+ any: function(iterator) {
765	+ var result = true;
766	+ this.each(function(value, index) {
767	+ if (result = !!(iterator \|\| Prototype.K)(value, index))
768	+ throw $break;
769	+ });
770	+ return result;
771	+ },
772	+
773	+ collect: function(iterator) {
774	+ var results = [];
775	+ this.each(function(value, index) {
776	+ results.push(iterator(value, index));
777	+ });
778	+ return results;
779	+ },
780	+
781	+ detect: function (iterator) {
782	+ var result;
783	+ this.each(function(value, index) {
784	+ if (iterator(value, index)) {
785	+ result = value;
786	+ throw $break;
787	+ }
788	+ });
789	+ return result;
790	+ },
791	+
792	+ findAll: function(iterator) {
793	+ var results = [];
794	+ this.each(function(value, index) {
795	+ if (iterator(value, index))
796	+ results.push(value);
797	+ });
798	+ return results;
799	+ },
800	+
801	+ grep: function(pattern, iterator) {
802	+ var results = [];
803	+ this.each(function(value, index) {
804	+ var stringValue = value.toString();
805	+ if (stringValue.match(pattern))
806	+ results.push((iterator \|\| Prototype.K)(value, index));
807	+ })
808	+ return results;
809	+ },
810	+
811	+ include: function(object) {
812	+ var found = false;
813	+ this.each(function(value) {
814	+ if (value == object) {
815	+ found = true;
816	+ throw $break;
817	+ }
818	+ });
819	+ return found;
820	+ },
821	+
822	+ inject: function(memo, iterator) {
823	+ this.each(function(value, index) {
824	+ memo = iterator(memo, value, index);
825	+ });
826	+ return memo;
827	+ },
828	+
829	+ invoke: function(method) {
830	+ var args = $A(arguments).slice(1);
831	+ return this.collect(function(value) {
832	+ return value[method].apply(value, args);
833	+ });
834	+ },
835	+
836	+ max: function(iterator) {
837	+ var result;
838	+ this.each(function(value, index) {
839	+ value = (iterator \|\| Prototype.K)(value, index);
840	+ if (value >= (result \|\| value))
841	+ result = value;
842	+ });
843	+ return result;
844	+ },
845	+
846	+ min: function(iterator) {
847	+ var result;
848	+ this.each(function(value, index) {
849	+ value = (iterator \|\| Prototype.K)(value, index);
850	+ if (value <= (result \|\| value))
851	+ result = value;
852	+ });
853	+ return result;
854	+ },
855	+
856	+ partition: function(iterator) {
857	+ var trues = [], falses = [];
858	+ this.each(function(value, index) {
859	+ ((iterator \|\| Prototype.K)(value, index) ?
860	+ trues : falses).push(value);
861	+ });
862	+ return [trues, falses];
863	+ },
864	+
865	+ pluck: function(property) {
866	+ var results = [];
867	+ this.each(function(value, index) {
868	+ results.push(value[property]);
869	+ });
870	+ return results;
871	+ },
872	+
873	+ reject: function(iterator) {
874	+ var results = [];
875	+ this.each(function(value, index) {
876	+ if (!iterator(value, index))
877	+ results.push(value);
878	+ });
879	+ return results;
880	+ },
881	+
882	+ sortBy: function(iterator) {
883	+ return this.collect(function(value, index) {
884	+ return {value: value, criteria: iterator(value, index)};
885	+ }).sort(function(left, right) {
886	+ var a = left.criteria, b = right.criteria;
887	+ return a < b ? -1 : a > b ? 1 : 0;
888	+ }).pluck('value');
889	+ },
890	+
891	+ toArray: function() {
892	+ return this.collect(Prototype.K);
893	+ },
894	+
895	+ zip: function() {
896	+ var iterator = Prototype.K, args = $A(arguments);
897	+ if (typeof args.last() == 'function')
898	+ iterator = args.pop();
899	+
900	+ var collections = [this].concat(args).map($A);
901	+ return this.map(function(value, index) {
902	+ iterator(value = collections.pluck(index));
903	+ return value;
904	+ });
905	+ },
906	+
907	+ inspect: function() {
908	+ return '#<Enumerable:' + this.toArray().inspect() + '>';
909	+ }
910	+}
911	+
912	+Object.extend(Enumerable, {
913	+ map: Enumerable.collect,
914	+ find: Enumerable.detect,
915	+ select: Enumerable.findAll,
916	+ member: Enumerable.include,
917	+ entries: Enumerable.toArray
918	+});
919	+var $A = Array.from = function(iterable) {
920	+ if (!iterable) return [];
921	+ if (iterable.toArray) {
922	+ return iterable.toArray();
923	+ } else {
924	+ var results = [];
925	+ for (var i = 0; i < iterable.length; i++)
926	+ results.push(iterable[i]);
927	+ return results;
928	+ }
929	+}
930	+
931	+Object.extend(Array.prototype, Enumerable);
932	+
933	+Array.prototype._reverse = Array.prototype.reverse;
934	+
935	+Object.extend(Array.prototype, {
936	+ _each: function(iterator) {
937	+ for (var i = 0; i < this.length; i++)
938	+ iterator(this[i]);
939	+ },
940	+
941	+ clear: function() {
942	+ this.length = 0;
943	+ return this;
944	+ },
945	+
946	+ first: function() {
947	+ return this[0];
948	+ },
949	+
950	+ last: function() {
951	+ return this[this.length - 1];
952	+ },
953	+
954	+ compact: function() {
955	+ return this.select(function(value) {
956	+ return value != undefined \|\| value != null;
957	+ });
958	+ },
959	+
960	+ flatten: function() {
961	+ return this.inject([], function(array, value) {
962	+ return array.concat(value.constructor == Array ?
963	+ value.flatten() : [value]);
964	+ });
965	+ },
966	+
967	+ without: function() {
968	+ var values = $A(arguments);
969	+ return this.select(function(value) {
970	+ return !values.include(value);
971	+ });
972	+ },
973	+
974	+ indexOf: function(object) {
975	+ for (var i = 0; i < this.length; i++)
976	+ if (this[i] == object) return i;
977	+ return -1;
978	+ },
979	+
980	+ reverse: function(inline) {
981	+ return (inline !== false ? this : this.toArray())._reverse();
982	+ },
983	+
984	+ shift: function() {
985	+ var result = this[0];
986	+ for (var i = 0; i < this.length - 1; i++)
987	+ this[i] = this[i + 1];
988	+ this.length--;
989	+ return result;
990	+ },
991	+
992	+ inspect: function() {
993	+ return '[' + this.map(Object.inspect).join(', ') + ']';
994	+ }
995	+});
996	+var Hash = {
997	+ _each: function(iterator) {
998	+ for (key in this) {
999	+ var value = this[key];
1000	+ if (typeof value == 'function') continue;
1001	+
1002	+ var pair = [key, value];
1003	+ pair.key = key;
1004	+ pair.value = value;
1005	+ iterator(pair);
1006	+ }
1007	+ },
1008	+
1009	+ keys: function() {
1010	+ return this.pluck('key');
1011	+ },
1012	+
1013	+ values: function() {
1014	+ return this.pluck('value');
1015	+ },
1016	+
1017	+ merge: function(hash) {
1018	+ return $H(hash).inject($H(this), function(mergedHash, pair) {
1019	+ mergedHash[pair.key] = pair.value;
1020	+ return mergedHash;
1021	+ });
1022	+ },
1023	+
1024	+ toQueryString: function() {
1025	+ return this.map(function(pair) {
1026	+ return pair.map(encodeURIComponent).join('=');
1027	+ }).join('&');
1028	+ },
1029	+
1030	+ inspect: function() {
1031	+ return '#<Hash:{' + this.map(function(pair) {
1032	+ return pair.map(Object.inspect).join(': ');
1033	+ }).join(', ') + '}>';
1034	+ }
1035	+}
1036	+
1037	+function $H(object) {
1038	+ var hash = Object.extend({}, object \|\| {});
1039	+ Object.extend(hash, Enumerable);
1040	+ Object.extend(hash, Hash);
1041	+ return hash;
1042	+}
1043	+ObjectRange = Class.create();
1044	+Object.extend(ObjectRange.prototype, Enumerable);
1045	+Object.extend(ObjectRange.prototype, {
1046	+ initialize: function(start, end, exclusive) {
1047	+ this.start = start;
1048	+ this.end = end;
1049	+ this.exclusive = exclusive;
1050	+ },
1051	+
1052	+ _each: function(iterator) {
1053	+ var value = this.start;
1054	+ do {
1055	+ iterator(value);
1056	+ value = value.succ();
1057	+ } while (this.include(value));
1058	+ },
1059	+
1060	+ include: function(value) {
1061	+ if (value < this.start)
1062	+ return false;
1063	+ if (this.exclusive)
1064	+ return value < this.end;
1065	+ return value <= this.end;
1066	+ }
1067	+});
1068	+
1069	+var $R = function(start, end, exclusive) {
1070	+ return new ObjectRange(start, end, exclusive);
1071	+}
1072	+
1073	+var Ajax = {
1074	+ getTransport: function() {
1075	+ return Try.these(
1076	+ function() {return new ActiveXObject('Msxml2.XMLHTTP')},
1077	+ function() {return new ActiveXObject('Microsoft.XMLHTTP')},
1078	+ function() {return new XMLHttpRequest()}
1079	+ ) \|\| false;
1080	+ },
1081	+
1082	+ activeRequestCount: 0
1083	+}
1084	+
1085	+Ajax.Responders = {
1086	+ responders: [],
1087	+
1088	+ _each: function(iterator) {
1089	+ this.responders._each(iterator);
1090	+ },
1091	+
1092	+ register: function(responderToAdd) {
1093	+ if (!this.include(responderToAdd))
1094	+ this.responders.push(responderToAdd);
1095	+ },
1096	+
1097	+ unregister: function(responderToRemove) {
1098	+ this.responders = this.responders.without(responderToRemove);
1099	+ },
1100	+
1101	+ dispatch: function(callback, request, transport, json) {
1102	+ this.each(function(responder) {
1103	+ if (responder[callback] && typeof responder[callback] == 'function') {
1104	+ try {
1105	+ responder[callback].apply(responder, [request, transport, json]);
1106	+ } catch (e) {}
1107	+ }
1108	+ });
1109	+ }
1110	+};
1111	+
1112	+Object.extend(Ajax.Responders, Enumerable);
1113	+
1114	+Ajax.Responders.register({
1115	+ onCreate: function() {
1116	+ Ajax.activeRequestCount++;
1117	+ },
1118	+
1119	+ onComplete: function() {
1120	+ Ajax.activeRequestCount--;
1121	+ }
1122	+});
1123	+
1124	+Ajax.Base = function() {};
1125	+Ajax.Base.prototype = {
1126	+ setOptions: function(options) {
1127	+ this.options = {
1128	+ method: 'post',
1129	+ asynchronous: true,
1130	+ parameters: ''
1131	+ }
1132	+ Object.extend(this.options, options \|\| {});
1133	+ },
1134	+
1135	+ responseIsSuccess: function() {
1136	+ return this.transport.status == undefined
1137	+ \|\| this.transport.status == 0
1138	+ \|\| (this.transport.status >= 200 && this.transport.status < 300);
1139	+ },
1140	+
1141	+ responseIsFailure: function() {
1142	+ return !this.responseIsSuccess();
1143	+ }
1144	+}
1145	+
1146	+Ajax.Request = Class.create();
1147	+Ajax.Request.Events =
1148	+ ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
1149	+
1150	+Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
1151	+ initialize: function(url, options) {
1152	+ this.transport = Ajax.getTransport();
1153	+ this.setOptions(options);
1154	+ this.request(url);
1155	+ },
1156	+
1157	+ request: function(url) {
1158	+ var parameters = this.options.parameters \|\| '';
1159	+ if (parameters.length > 0) parameters += '&_=';
1160	+
1161	+ try {
1162	+ this.url = url;
1163	+ if (this.options.method == 'get' && parameters.length > 0)
1164	+ this.url += (this.url.match(/\?/) ? '&' : '?') + parameters;
1165	+
1166	+ Ajax.Responders.dispatch('onCreate', this, this.transport);
1167	+
1168	+ this.transport.open(this.options.method, this.url,
1169	+ this.options.asynchronous);
1170	+
1171	+ if (this.options.asynchronous) {
1172	+ this.transport.onreadystatechange = this.onStateChange.bind(this);
1173	+ setTimeout((function() {this.respondToReadyState(1)}).bind(this), 10);
1174	+ }
1175	+
1176	+ this.setRequestHeaders();
1177	+
1178	+ var body = this.options.postBody ? this.options.postBody : parameters;
1179	+ this.transport.send(this.options.method == 'post' ? body : null);
1180	+
1181	+ } catch (e) {
1182	+ this.dispatchException(e);
1183	+ }
1184	+ },
1185	+
1186	+ setRequestHeaders: function() {
1187	+ var requestHeaders =
1188	+ ['X-Requested-With', 'XMLHttpRequest',
1189	+ 'X-Prototype-Version', Prototype.Version];
1190	+
1191	+ if (this.options.method == 'post') {
1192	+ requestHeaders.push('Content-type',
1193	+ 'application/x-www-form-urlencoded');
1194	+
1195	+ /* Force "Connection: close" for Mozilla browsers to work around
1196	+ * a bug where XMLHttpReqeuest sends an incorrect Content-length
1197	+ * header. See Mozilla Bugzilla #246651.
1198	+ */
1199	+ if (this.transport.overrideMimeType)
1200	+ requestHeaders.push('Connection', 'close');
1201	+ }
1202	+
1203	+ if (this.options.requestHeaders)
1204	+ requestHeaders.push.apply(requestHeaders, this.options.requestHeaders);
1205	+
1206	+ for (var i = 0; i < requestHeaders.length; i += 2)
1207	+ this.transport.setRequestHeader(requestHeaders[i], requestHeaders[i+1]);
1208	+ },
1209	+
1210	+ onStateChange: function() {
1211	+ var readyState = this.transport.readyState;
1212	+ if (readyState != 1)
1213	+ this.respondToReadyState(this.transport.readyState);
1214	+ },
1215	+
1216	+ header: function(name) {
1217	+ try {
1218	+ return this.transport.getResponseHeader(name);
1219	+ } catch (e) {}
1220	+ },
1221	+
1222	+ evalJSON: function() {
1223	+ try {
1224	+ return eval(this.header('X-JSON'));
1225	+ } catch (e) {}
1226	+ },
1227	+
1228	+ evalResponse: function() {
1229	+ try {
1230	+ return eval(this.transport.responseText);
1231	+ } catch (e) {
1232	+ this.dispatchException(e);
1233	+ }
1234	+ },
1235	+
1236	+ respondToReadyState: function(readyState) {
1237	+ var event = Ajax.Request.Events[readyState];
1238	+ var transport = this.transport, json = this.evalJSON();
1239	+
1240	+ if (event == 'Complete') {
1241	+ try {
1242	+ (this.options['on' + this.transport.status]
1243	+ \|\| this.options['on' + (this.responseIsSuccess() ? 'Success' : 'Failure')]
1244	+ \|\| Prototype.emptyFunction)(transport, json);
1245	+ } catch (e) {
1246	+ this.dispatchException(e);
1247	+ }
1248	+
1249	+ if ((this.header('Content-type') \|\| '').match(/^text\/javascript/i))
1250	+ this.evalResponse();
1251	+ }
1252	+
1253	+ try {
1254	+ (this.options['on' + event] \|\| Prototype.emptyFunction)(transport, json);
1255	+ Ajax.Responders.dispatch('on' + event, this, transport, json);
1256	+ } catch (e) {
1257	+ this.dispatchException(e);
1258	+ }
1259	+
1260	+ /* Avoid memory leak in MSIE: clean up the oncomplete event handler */
1261	+ if (event == 'Complete')
1262	+ this.transport.onreadystatechange = Prototype.emptyFunction;
1263	+ },
1264	+
1265	+ dispatchException: function(exception) {
1266	+ (this.options.onException \|\| Prototype.emptyFunction)(this, exception);
1267	+ Ajax.Responders.dispatch('onException', this, exception);
1268	+ }
1269	+});
1270	+
1271	+Ajax.Updater = Class.create();
1272	+
1273	+Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), {
1274	+ initialize: function(container, url, options) {
1275	+ this.containers = {
1276	+ success: container.success ? $(container.success) : $(container),
1277	+ failure: container.failure ? $(container.failure) :
1278	+ (container.success ? null : $(container))
1279	+ }
1280	+
1281	+ this.transport = Ajax.getTransport();
1282	+ this.setOptions(options);
1283	+
1284	+ var onComplete = this.options.onComplete \|\| Prototype.emptyFunction;
1285	+ this.options.onComplete = (function(transport, object) {
1286	+ this.updateContent();
1287	+ onComplete(transport, object);
1288	+ }).bind(this);
1289	+
1290	+ this.request(url);
1291	+ },
1292	+
1293	+ updateContent: function() {
1294	+ var receiver = this.responseIsSuccess() ?
1295	+ this.containers.success : this.containers.failure;
1296	+ var response = this.transport.responseText;
1297	+
1298	+ if (!this.options.evalScripts)
1299	+ response = response.stripScripts();
1300	+
1301	+ if (receiver) {
1302	+ if (this.options.insertion) {
1303	+ new this.options.insertion(receiver, response);
1304	+ } else {
1305	+ Element.update(receiver, response);
1306	+ }
1307	+ }
1308	+
1309	+ if (this.responseIsSuccess()) {
1310	+ if (this.onComplete)
1311	+ setTimeout(this.onComplete.bind(this), 10);
1312	+ }
1313	+ }
1314	+});
1315	+
1316	+Ajax.PeriodicalUpdater = Class.create();
1317	+Ajax.PeriodicalUpdater.prototype = Object.extend(new Ajax.Base(), {
1318	+ initialize: function(container, url, options) {
1319	+ this.setOptions(options);
1320	+ this.onComplete = this.options.onComplete;
1321	+
1322	+ this.frequency = (this.options.frequency \|\| 2);
1323	+ this.decay = (this.options.decay \|\| 1);
1324	+
1325	+ this.updater = {};
1326	+ this.container = container;
1327	+ this.url = url;
1328	+
1329	+ this.start();
1330	+ },
1331	+
1332	+ start: function() {
1333	+ this.options.onComplete = this.updateComplete.bind(this);
1334	+ this.onTimerEvent();
1335	+ },
1336	+
1337	+ stop: function() {
1338	+ this.updater.onComplete = undefined;
1339	+ clearTimeout(this.timer);
1340	+ (this.onComplete \|\| Prototype.emptyFunction).apply(this, arguments);
1341	+ },
1342	+
1343	+ updateComplete: function(request) {
1344	+ if (this.options.decay) {
1345	+ this.decay = (request.responseText == this.lastText ?
1346	+ this.decay * this.options.decay : 1);
1347	+
1348	+ this.lastText = request.responseText;
1349	+ }
1350	+ this.timer = setTimeout(this.onTimerEvent.bind(this),
1351	+ this.decay * this.frequency * 1000);
1352	+ },
1353	+
1354	+ onTimerEvent: function() {
1355	+ this.updater = new Ajax.Updater(this.container, this.url, this.options);
1356	+ }
1357	+});
1358	+document.getElementsByClassName = function(className, parentElement) {
1359	+ var children = ($(parentElement) \|\| document.body).getElementsByTagName('*');
1360	+ return $A(children).inject([], function(elements, child) {
1361	+ if (child.className.match(new RegExp("(^\|\\s)" + className + "(\\s\|$)")))
1362	+ elements.push(child);
1363	+ return elements;
1364	+ });
1365	+}
1366	+
1367	+/--------------------------------------------------------------------------/
1368	+
1369	+if (!window.Element) {
1370	+ var Element = new Object();
1371	+}
1372	+
1373	+Object.extend(Element, {
1374	+ visible: function(element) {
1375	+ return $(element).style.display != 'none';
1376	+ },
1377	+
1378	+ toggle: function() {
1379	+ for (var i = 0; i < arguments.length; i++) {
1380	+ var element = $(arguments[i]);
1381	+ Element[Element.visible(element) ? 'hide' : 'show'](element);
1382	+ }
1383	+ },
1384	+
1385	+ hide: function() {
1386	+ for (var i = 0; i < arguments.length; i++) {
1387	+ var element = $(arguments[i]);
1388	+ element.style.display = 'none';
1389	+ }
1390	+ },
1391	+
1392	+ show: function() {
1393	+ for (var i = 0; i < arguments.length; i++) {
1394	+ var element = $(arguments[i]);
1395	+ element.style.display = '';
1396	+ }
1397	+ },
1398	+
1399	+ remove: function(element) {
1400	+ element = $(element);
1401	+ element.parentNode.removeChild(element);
1402	+ },
1403	+
1404	+ update: function(element, html) {
1405	+ $(element).innerHTML = html.stripScripts();
1406	+ setTimeout(function() {html.evalScripts()}, 10);
1407	+ },
1408	+
1409	+ getHeight: function(element) {
1410	+ element = $(element);
1411	+ return element.offsetHeight;
1412	+ },
1413	+
1414	+ classNames: function(element) {
1415	+ return new Element.ClassNames(element);
1416	+ },
1417	+
1418	+ hasClassName: function(element, className) {
1419	+ if (!(element = $(element))) return;
1420	+ return Element.classNames(element).include(className);
1421	+ },
1422	+
1423	+ addClassName: function(element, className) {
1424	+ if (!(element = $(element))) return;
1425	+ return Element.classNames(element).add(className);
1426	+ },
1427	+
1428	+ removeClassName: function(element, className) {
1429	+ if (!(element = $(element))) return;
1430	+ return Element.classNames(element).remove(className);
1431	+ },
1432	+
1433	+ // removes whitespace-only text node children
1434	+ cleanWhitespace: function(element) {
1435	+ element = $(element);
1436	+ for (var i = 0; i < element.childNodes.length; i++) {
1437	+ var node = element.childNodes[i];
1438	+ if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
1439	+ Element.remove(node);
1440	+ }
1441	+ },
1442	+
1443	+ empty: function(element) {
1444	+ return $(element).innerHTML.match(/^\s*$/);
1445	+ },
1446	+
1447	+ scrollTo: function(element) {
1448	+ element = $(element);
1449	+ var x = element.x ? element.x : element.offsetLeft,
1450	+ y = element.y ? element.y : element.offsetTop;
1451	+ window.scrollTo(x, y);
1452	+ },
1453	+
1454	+ getStyle: function(element, style) {
1455	+ element = $(element);
1456	+ var value = element.style[style.camelize()];
1457	+ if (!value) {
1458	+ if (document.defaultView && document.defaultView.getComputedStyle) {
1459	+ var css = document.defaultView.getComputedStyle(element, null);
1460	+ value = css ? css.getPropertyValue(style) : null;
1461	+ } else if (element.currentStyle) {
1462	+ value = element.currentStyle[style.camelize()];
1463	+ }
1464	+ }
1465	+
1466	+ if (window.opera && ['left', 'top', 'right', 'bottom'].include(style))
1467	+ if (Element.getStyle(element, 'position') == 'static') value = 'auto';
1468	+
1469	+ return value == 'auto' ? null : value;
1470	+ },
1471	+
1472	+ setStyle: function(element, style) {
1473	+ element = $(element);
1474	+ for (name in style)
1475	+ element.style[name.camelize()] = style[name];
1476	+ },
1477	+
1478	+ getDimensions: function(element) {
1479	+ element = $(element);
1480	+ if (Element.getStyle(element, 'display') != 'none')
1481	+ return {width: element.offsetWidth, height: element.offsetHeight};
1482	+
1483	+ // All Width and Height properties give 0 on elements with display none,
1484	+ // so enable the element temporarily
1485	+ var els = element.style;
1486	+ var originalVisibility = els.visibility;
1487	+ var originalPosition = els.position;
1488	+ els.visibility = 'hidden';
1489	+ els.position = 'absolute';
1490	+ els.display = '';
1491	+ var originalWidth = element.clientWidth;
1492	+ var originalHeight = element.clientHeight;
1493	+ els.display = 'none';
1494	+ els.position = originalPosition;
1495	+ els.visibility = originalVisibility;
1496	+ return {width: originalWidth, height: originalHeight};
1497	+ },
1498	+
1499	+ makePositioned: function(element) {
1500	+ element = $(element);
1501	+ var pos = Element.getStyle(element, 'position');
1502	+ if (pos == 'static' \|\| !pos) {
1503	+ element._madePositioned = true;
1504	+ element.style.position = 'relative';
1505	+ // Opera returns the offset relative to the positioning context, when an
1506	+ // element is position relative but top and left have not been defined
1507	+ if (window.opera) {
1508	+ element.style.top = 0;
1509	+ element.style.left = 0;
1510	+ }
1511	+ }
1512	+ },
1513	+
1514	+ undoPositioned: function(element) {
1515	+ element = $(element);
1516	+ if (element._madePositioned) {
1517	+ element._madePositioned = undefined;
1518	+ element.style.position =
1519	+ element.style.top =
1520	+ element.style.left =
1521	+ element.style.bottom =
1522	+ element.style.right = '';
1523	+ }
1524	+ },
1525	+
1526	+ makeClipping: function(element) {
1527	+ element = $(element);
1528	+ if (element._overflow) return;
1529	+ element._overflow = element.style.overflow;
1530	+ if ((Element.getStyle(element, 'overflow') \|\| 'visible') != 'hidden')
1531	+ element.style.overflow = 'hidden';
1532	+ },
1533	+
1534	+ undoClipping: function(element) {
1535	+ element = $(element);
1536	+ if (element._overflow) return;
1537	+ element.style.overflow = element._overflow;
1538	+ element._overflow = undefined;
1539	+ }
1540	+});
1541	+
1542	+var Toggle = new Object();
1543	+Toggle.display = Element.toggle;
1544	+
1545	+/--------------------------------------------------------------------------/
1546	+
1547	+Abstract.Insertion = function(adjacency) {
1548	+ this.adjacency = adjacency;
1549	+}
1550	+
1551	+Abstract.Insertion.prototype = {
1552	+ initialize: function(element, content) {
1553	+ this.element = $(element);
1554	+ this.content = content.stripScripts();
1555	+
1556	+ if (this.adjacency && this.element.insertAdjacentHTML) {
1557	+ try {
1558	+ this.element.insertAdjacentHTML(this.adjacency, this.content);
1559	+ } catch (e) {
1560	+ if (this.element.tagName.toLowerCase() == 'tbody') {
1561	+ this.insertContent(this.contentFromAnonymousTable());
1562	+ } else {
1563	+ throw e;
1564	+ }
1565	+ }
1566	+ } else {
1567	+ this.range = this.element.ownerDocument.createRange();
1568	+ if (this.initializeRange) this.initializeRange();
1569	+ this.insertContent([this.range.createContextualFragment(this.content)]);
1570	+ }
1571	+
1572	+ setTimeout(function() {content.evalScripts()}, 10);
1573	+ },
1574	+
1575	+ contentFromAnonymousTable: function() {
1576	+ var div = document.createElement('div');
1577	+ div.innerHTML = '<table><tbody>' + this.content + '</tbody></table>';
1578	+ return $A(div.childNodes[0].childNodes[0].childNodes);
1579	+ }
1580	+}
1581	+
1582	+var Insertion = new Object();
1583	+
1584	+Insertion.Before = Class.create();
1585	+Insertion.Before.prototype = Object.extend(new Abstract.Insertion('beforeBegin'), {
1586	+ initializeRange: function() {
1587	+ this.range.setStartBefore(this.element);
1588	+ },
1589	+
1590	+ insertContent: function(fragments) {
1591	+ fragments.each((function(fragment) {
1592	+ this.element.parentNode.insertBefore(fragment, this.element);
1593	+ }).bind(this));
1594	+ }
1595	+});
1596	+
1597	+Insertion.Top = Class.create();
1598	+Insertion.Top.prototype = Object.extend(new Abstract.Insertion('afterBegin'), {
1599	+ initializeRange: function() {
1600	+ this.range.selectNodeContents(this.element);
1601	+ this.range.collapse(true);
1602	+ },
1603	+
1604	+ insertContent: function(fragments) {
1605	+ fragments.reverse(false).each((function(fragment) {
1606	+ this.element.insertBefore(fragment, this.element.firstChild);
1607	+ }).bind(this));
1608	+ }
1609	+});
1610	+
1611	+Insertion.Bottom = Class.create();
1612	+Insertion.Bottom.prototype = Object.extend(new Abstract.Insertion('beforeEnd'), {
1613	+ initializeRange: function() {
1614	+ this.range.selectNodeContents(this.element);
1615	+ this.range.collapse(this.element);
1616	+ },
1617	+
1618	+ insertContent: function(fragments) {
1619	+ fragments.each((function(fragment) {
1620	+ this.element.appendChild(fragment);
1621	+ }).bind(this));
1622	+ }
1623	+});
1624	+
1625	+Insertion.After = Class.create();
1626	+Insertion.After.prototype = Object.extend(new Abstract.Insertion('afterEnd'), {
1627	+ initializeRange: function() {
1628	+ this.range.setStartAfter(this.element);
1629	+ },
1630	+
1631	+ insertContent: function(fragments) {
1632	+ fragments.each((function(fragment) {
1633	+ this.element.parentNode.insertBefore(fragment,
1634	+ this.element.nextSibling);
1635	+ }).bind(this));
1636	+ }
1637	+});
1638	+
1639	+/--------------------------------------------------------------------------/
1640	+
1641	+Element.ClassNames = Class.create();
1642	+Element.ClassNames.prototype = {
1643	+ initialize: function(element) {
1644	+ this.element = $(element);
1645	+ },
1646	+
1647	+ _each: function(iterator) {
1648	+ this.element.className.split(/\s+/).select(function(name) {
1649	+ return name.length > 0;
1650	+ })._each(iterator);
1651	+ },
1652	+
1653	+ set: function(className) {
1654	+ this.element.className = className;
1655	+ },
1656	+
1657	+ add: function(classNameToAdd) {
1658	+ if (this.include(classNameToAdd)) return;
1659	+ this.set(this.toArray().concat(classNameToAdd).join(' '));
1660	+ },
1661	+
1662	+ remove: function(classNameToRemove) {
1663	+ if (!this.include(classNameToRemove)) return;
1664	+ this.set(this.select(function(className) {
1665	+ return className != classNameToRemove;
1666	+ }).join(' '));
1667	+ },
1668	+
1669	+ toString: function() {
1670	+ return this.toArray().join(' ');
1671	+ }
1672	+}
1673	+
1674	+Object.extend(Element.ClassNames.prototype, Enumerable);
1675	+var Field = {
1676	+ clear: function() {
1677	+ for (var i = 0; i < arguments.length; i++)
1678	+ $(arguments[i]).value = '';
1679	+ },
1680	+
1681	+ focus: function(element) {
1682	+ $(element).focus();
1683	+ },
1684	+
1685	+ present: function() {
1686	+ for (var i = 0; i < arguments.length; i++)
1687	+ if ($(arguments[i]).value == '') return false;
1688	+ return true;
1689	+ },
1690	+
1691	+ select: function(element) {
1692	+ $(element).select();
1693	+ },
1694	+
1695	+ activate: function(element) {
1696	+ element = $(element);
1697	+ element.focus();
1698	+ if (element.select)
1699	+ element.select();
1700	+ }
1701	+}
1702	+
1703	+/--------------------------------------------------------------------------/
1704	+
1705	+var Form = {
1706	+ serialize: function(form) {
1707	+ var elements = Form.getElements($(form));
1708	+ var queryComponents = new Array();
1709	+
1710	+ for (var i = 0; i < elements.length; i++) {
1711	+ var queryComponent = Form.Element.serialize(elements[i]);
1712	+ if (queryComponent)
1713	+ queryComponents.push(queryComponent);
1714	+ }
1715	+
1716	+ return queryComponents.join('&');
1717	+ },
1718	+
1719	+ getElements: function(form) {
1720	+ form = $(form);
1721	+ var elements = new Array();
1722	+
1723	+ for (tagName in Form.Element.Serializers) {
1724	+ var tagElements = form.getElementsByTagName(tagName);
1725	+ for (var j = 0; j < tagElements.length; j++)
1726	+ elements.push(tagElements[j]);
1727	+ }
1728	+ return elements;
1729	+ },
1730	+
1731	+ getInputs: function(form, typeName, name) {
1732	+ form = $(form);
1733	+ var inputs = form.getElementsByTagName('input');
1734	+
1735	+ if (!typeName && !name)
1736	+ return inputs;
1737	+
1738	+ var matchingInputs = new Array();
1739	+ for (var i = 0; i < inputs.length; i++) {
1740	+ var input = inputs[i];
1741	+ if ((typeName && input.type != typeName) \|\|
1742	+ (name && input.name != name))
1743	+ continue;
1744	+ matchingInputs.push(input);
1745	+ }
1746	+
1747	+ return matchingInputs;
1748	+ },
1749	+
1750	+ disable: function(form) {
1751	+ var elements = Form.getElements(form);
1752	+ for (var i = 0; i < elements.length; i++) {
1753	+ var element = elements[i];
1754	+ element.blur();
1755	+ element.disabled = 'true';
1756	+ }
1757	+ },
1758	+
1759	+ enable: function(form) {
1760	+ var elements = Form.getElements(form);
1761	+ for (var i = 0; i < elements.length; i++) {
1762	+ var element = elements[i];
1763	+ element.disabled = '';
1764	+ }
1765	+ },
1766	+
1767	+ findFirstElement: function(form) {
1768	+ return Form.getElements(form).find(function(element) {
1769	+ return element.type != 'hidden' && !element.disabled &&
1770	+ ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
1771	+ });
1772	+ },
1773	+
1774	+ focusFirstElement: function(form) {
1775	+ Field.activate(Form.findFirstElement(form));
1776	+ },
1777	+
1778	+ reset: function(form) {
1779	+ $(form).reset();
1780	+ }
1781	+}
1782	+
1783	+Form.Element = {
1784	+ serialize: function(element) {
1785	+ element = $(element);
1786	+ var method = element.tagName.toLowerCase();
1787	+ var parameter = Form.Element.Serializers[method](element);
1788	+
1789	+ if (parameter) {
1790	+ var key = encodeURIComponent(parameter[0]);
1791	+ if (key.length == 0) return;
1792	+
1793	+ if (parameter[1].constructor != Array)
1794	+ parameter[1] = [parameter[1]];
1795	+
1796	+ return parameter[1].map(function(value) {
1797	+ return key + '=' + encodeURIComponent(value);
1798	+ }).join('&');
1799	+ }
1800	+ },
1801	+
1802	+ getValue: function(element) {
1803	+ element = $(element);
1804	+ var method = element.tagName.toLowerCase();
1805	+ var parameter = Form.Element.Serializers[method](element);
1806	+
1807	+ if (parameter)
1808	+ return parameter[1];
1809	+ }
1810	+}
1811	+
1812	+Form.Element.Serializers = {
1813	+ input: function(element) {
1814	+ switch (element.type.toLowerCase()) {
1815	+ case 'submit':
1816	+ case 'hidden':
1817	+ case 'password':
1818	+ case 'text':
1819	+ return Form.Element.Serializers.textarea(element);
1820	+ case 'checkbox':
1821	+ case 'radio':
1822	+ return Form.Element.Serializers.inputSelector(element);
1823	+ }
1824	+ return false;
1825	+ },
1826	+
1827	+ inputSelector: function(element) {
1828	+ if (element.checked)
1829	+ return [element.name, element.value];
1830	+ },
1831	+
1832	+ textarea: function(element) {
1833	+ return [element.name, element.value];
1834	+ },
1835	+
1836	+ select: function(element) {
1837	+ return Form.Element.Serializers[element.type == 'select-one' ?
1838	+ 'selectOne' : 'selectMany'](element);
1839	+ },
1840	+
1841	+ selectOne: function(element) {
1842	+ var value = '', opt, index = element.selectedIndex;
1843	+ if (index >= 0) {
1844	+ opt = element.options[index];
1845	+ value = opt.value;
1846	+ if (!value && !('value' in opt))
1847	+ value = opt.text;
1848	+ }
1849	+ return [element.name, value];
1850	+ },
1851	+
1852	+ selectMany: function(element) {
1853	+ var value = new Array();
1854	+ for (var i = 0; i < element.length; i++) {
1855	+ var opt = element.options[i];
1856	+ if (opt.selected) {
1857	+ var optValue = opt.value;
1858	+ if (!optValue && !('value' in opt))
1859	+ optValue = opt.text;
1860	+ value.push(optValue);
1861	+ }
1862	+ }
1863	+ return [element.name, value];
1864	+ }
1865	+}
1866	+
1867	+/--------------------------------------------------------------------------/
1868	+
1869	+var $F = Form.Element.getValue;
1870	+
1871	+/--------------------------------------------------------------------------/
1872	+
1873	+Abstract.TimedObserver = function() {}
1874	+Abstract.TimedObserver.prototype = {
1875	+ initialize: function(element, frequency, callback) {
1876	+ this.frequency = frequency;
1877	+ this.element = $(element);
1878	+ this.callback = callback;
1879	+
1880	+ this.lastValue = this.getValue();
1881	+ this.registerCallback();
1882	+ },
1883	+
1884	+ registerCallback: function() {
1885	+ setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
1886	+ },
1887	+
1888	+ onTimerEvent: function() {
1889	+ var value = this.getValue();
1890	+ if (this.lastValue != value) {
1891	+ this.callback(this.element, value);
1892	+ this.lastValue = value;
1893	+ }
1894	+ }
1895	+}
1896	+
1897	+Form.Element.Observer = Class.create();
1898	+Form.Element.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {
1899	+ getValue: function() {
1900	+ return Form.Element.getValue(this.element);
1901	+ }
1902	+});
1903	+
1904	+Form.Observer = Class.create();
1905	+Form.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {
1906	+ getValue: function() {
1907	+ return Form.serialize(this.element);
1908	+ }
1909	+});
1910	+
1911	+/--------------------------------------------------------------------------/
1912	+
1913	+Abstract.EventObserver = function() {}
1914	+Abstract.EventObserver.prototype = {
1915	+ initialize: function(element, callback) {
1916	+ this.element = $(element);
1917	+ this.callback = callback;
1918	+
1919	+ this.lastValue = this.getValue();
1920	+ if (this.element.tagName.toLowerCase() == 'form')
1921	+ this.registerFormCallbacks();
1922	+ else
1923	+ this.registerCallback(this.element);
1924	+ },
1925	+
1926	+ onElementEvent: function() {
1927	+ var value = this.getValue();
1928	+ if (this.lastValue != value) {
1929	+ this.callback(this.element, value);
1930	+ this.lastValue = value;
1931	+ }
1932	+ },
1933	+
1934	+ registerFormCallbacks: function() {
1935	+ var elements = Form.getElements(this.element);
1936	+ for (var i = 0; i < elements.length; i++)
1937	+ this.registerCallback(elements[i]);
1938	+ },
1939	+
1940	+ registerCallback: function(element) {
1941	+ if (element.type) {
1942	+ switch (element.type.toLowerCase()) {
1943	+ case 'checkbox':
1944	+ case 'radio':
1945	+ Event.observe(element, 'click', this.onElementEvent.bind(this));
1946	+ break;
1947	+ case 'password':
1948	+ case 'text':
1949	+ case 'textarea':
1950	+ case 'select-one':
1951	+ case 'select-multiple':
1952	+ Event.observe(element, 'change', this.onElementEvent.bind(this));
1953	+ break;
1954	+ }
1955	+ }
1956	+ }
1957	+}
1958	+
1959	+Form.Element.EventObserver = Class.create();
1960	+Form.Element.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {
1961	+ getValue: function() {
1962	+ return Form.Element.getValue(this.element);
1963	+ }
1964	+});
1965	+
1966	+Form.EventObserver = Class.create();
1967	+Form.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {
1968	+ getValue: function() {
1969	+ return Form.serialize(this.element);
1970	+ }
1971	+});
1972	+if (!window.Event) {
1973	+ var Event = new Object();
1974	+}
1975	+
1976	+Object.extend(Event, {
1977	+ KEY_BACKSPACE: 8,
1978	+ KEY_TAB: 9,
1979	+ KEY_RETURN: 13,
1980	+ KEY_ESC: 27,
1981	+ KEY_LEFT: 37,
1982	+ KEY_UP: 38,
1983	+ KEY_RIGHT: 39,
1984	+ KEY_DOWN: 40,
1985	+ KEY_DELETE: 46,
1986	+
1987	+ element: function(event) {
1988	+ return event.target \|\| event.srcElement;
1989	+ },
1990	+
1991	+ isLeftClick: function(event) {
1992	+ return (((event.which) && (event.which == 1)) \|\|
1993	+ ((event.button) && (event.button == 1)));
1994	+ },
1995	+
1996	+ pointerX: function(event) {
1997	+ return event.pageX \|\| (event.clientX +
1998	+ (document.documentElement.scrollLeft \|\| document.body.scrollLeft));
1999	+ },
2000	+
2001	+ pointerY: function(event) {
2002	+ return event.pageY \|\| (event.clientY +
2003	+ (document.documentElement.scrollTop \|\| document.body.scrollTop));
2004	+ },
2005	+
2006	+ stop: function(event) {
2007	+ if (event.preventDefault) {
2008	+ event.preventDefault();
2009	+ event.stopPropagation();
2010	+ } else {
2011	+ event.returnValue = false;
2012	+ event.cancelBubble = true;
2013	+ }
2014	+ },
2015	+
2016	+ // find the first node with the given tagName, starting from the
2017	+ // node the event was triggered on; traverses the DOM upwards
2018	+ findElement: function(event, tagName) {
2019	+ var element = Event.element(event);
2020	+ while (element.parentNode && (!element.tagName \|\|
2021	+ (element.tagName.toUpperCase() != tagName.toUpperCase())))
2022	+ element = element.parentNode;
2023	+ return element;
2024	+ },
2025	+
2026	+ observers: false,
2027	+
2028	+ _observeAndCache: function(element, name, observer, useCapture) {
2029	+ if (!this.observers) this.observers = [];
2030	+ if (element.addEventListener) {
2031	+ this.observers.push([element, name, observer, useCapture]);
2032	+ element.addEventListener(name, observer, useCapture);
2033	+ } else if (element.attachEvent) {
2034	+ this.observers.push([element, name, observer, useCapture]);
2035	+ element.attachEvent('on' + name, observer);
2036	+ }
2037	+ },
2038	+
2039	+ unloadCache: function() {
2040	+ if (!Event.observers) return;
2041	+ for (var i = 0; i < Event.observers.length; i++) {
2042	+ Event.stopObserving.apply(this, Event.observers[i]);
2043	+ Event.observers[i][0] = null;
2044	+ }
2045	+ Event.observers = false;
2046	+ },
2047	+
2048	+ observe: function(element, name, observer, useCapture) {
2049	+ var element = $(element);
2050	+ useCapture = useCapture \|\| false;
2051	+
2052	+ if (name == 'keypress' &&
2053	+ (navigator.appVersion.match(/Konqueror\|Safari\|KHTML/)
2054	+ \|\| element.attachEvent))
2055	+ name = 'keydown';
2056	+
2057	+ this._observeAndCache(element, name, observer, useCapture);
2058	+ },
2059	+
2060	+ stopObserving: function(element, name, observer, useCapture) {
2061	+ var element = $(element);
2062	+ useCapture = useCapture \|\| false;
2063	+
2064	+ if (name == 'keypress' &&
2065	+ (navigator.appVersion.match(/Konqueror\|Safari\|KHTML/)
2066	+ \|\| element.detachEvent))
2067	+ name = 'keydown';
2068	+
2069	+ if (element.removeEventListener) {
2070	+ element.removeEventListener(name, observer, useCapture);
2071	+ } else if (element.detachEvent) {
2072	+ element.detachEvent('on' + name, observer);
2073	+ }
2074	+ }
2075	+});
2076	+
2077	+/* prevent memory leaks in IE */
2078	+Event.observe(window, 'unload', Event.unloadCache, false);
2079	+var Position = {
2080	+ // set to true if needed, warning: firefox performance problems
2081	+ // NOT neeeded for page scrolling, only if draggable contained in
2082	+ // scrollable elements
2083	+ includeScrollOffsets: false,
2084	+
2085	+ // must be called before calling withinIncludingScrolloffset, every time the
2086	+ // page is scrolled
2087	+ prepare: function() {
2088	+ this.deltaX = window.pageXOffset
2089	+ \|\| document.documentElement.scrollLeft
2090	+ \|\| document.body.scrollLeft
2091	+ \|\| 0;
2092	+ this.deltaY = window.pageYOffset
2093	+ \|\| document.documentElement.scrollTop
2094	+ \|\| document.body.scrollTop
2095	+ \|\| 0;
2096	+ },
2097	+
2098	+ realOffset: function(element) {
2099	+ var valueT = 0, valueL = 0;
2100	+ do {
2101	+ valueT += element.scrollTop \|\| 0;
2102	+ valueL += element.scrollLeft \|\| 0;
2103	+ element = element.parentNode;
2104	+ } while (element);
2105	+ return [valueL, valueT];
2106	+ },
2107	+
2108	+ cumulativeOffset: function(element) {
2109	+ var valueT = 0, valueL = 0;
2110	+ do {
2111	+ valueT += element.offsetTop \|\| 0;
2112	+ valueL += element.offsetLeft \|\| 0;
2113	+ element = element.offsetParent;
2114	+ } while (element);
2115	+ return [valueL, valueT];
2116	+ },
2117	+
2118	+ positionedOffset: function(element) {
2119	+ var valueT = 0, valueL = 0;
2120	+ do {
2121	+ valueT += element.offsetTop \|\| 0;
2122	+ valueL += element.offsetLeft \|\| 0;
2123	+ element = element.offsetParent;
2124	+ if (element) {
2125	+ p = Element.getStyle(element, 'position');
2126	+ if (p == 'relative' \|\| p == 'absolute') break;
2127	+ }
2128	+ } while (element);
2129	+ return [valueL, valueT];
2130	+ },
2131	+
2132	+ offsetParent: function(element) {
2133	+ if (element.offsetParent) return element.offsetParent;
2134	+ if (element == document.body) return element;
2135	+
2136	+ while ((element = element.parentNode) && element != document.body)
2137	+ if (Element.getStyle(element, 'position') != 'static')
2138	+ return element;
2139	+
2140	+ return document.body;
2141	+ },
2142	+
2143	+ // caches x/y coordinate pair to use with overlap
2144	+ within: function(element, x, y) {
2145	+ if (this.includeScrollOffsets)
2146	+ return this.withinIncludingScrolloffsets(element, x, y);
2147	+ this.xcomp = x;
2148	+ this.ycomp = y;
2149	+ this.offset = this.cumulativeOffset(element);
2150	+
2151	+ return (y >= this.offset[1] &&
2152	+ y < this.offset[1] + element.offsetHeight &&
2153	+ x >= this.offset[0] &&
2154	+ x < this.offset[0] + element.offsetWidth);
2155	+ },
2156	+
2157	+ withinIncludingScrolloffsets: function(element, x, y) {
2158	+ var offsetcache = this.realOffset(element);
2159	+
2160	+ this.xcomp = x + offsetcache[0] - this.deltaX;
2161	+ this.ycomp = y + offsetcache[1] - this.deltaY;
2162	+ this.offset = this.cumulativeOffset(element);
2163	+
2164	+ return (this.ycomp >= this.offset[1] &&
2165	+ this.ycomp < this.offset[1] + element.offsetHeight &&
2166	+ this.xcomp >= this.offset[0] &&
2167	+ this.xcomp < this.offset[0] + element.offsetWidth);
2168	+ },
2169	+
2170	+ // within must be called directly before
2171	+ overlap: function(mode, element) {
2172	+ if (!mode) return 0;
2173	+ if (mode == 'vertical')
2174	+ return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
2175	+ element.offsetHeight;
2176	+ if (mode == 'horizontal')
2177	+ return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
2178	+ element.offsetWidth;
2179	+ },
2180	+
2181	+ clone: function(source, target) {
2182	+ source = $(source);
2183	+ target = $(target);
2184	+ target.style.position = 'absolute';
2185	+ var offsets = this.cumulativeOffset(source);
2186	+ target.style.top = offsets[1] + 'px';
2187	+ target.style.left = offsets[0] + 'px';
2188	+ target.style.width = source.offsetWidth + 'px';
2189	+ target.style.height = source.offsetHeight + 'px';
2190	+ },
2191	+
2192	+ page: function(forElement) {
2193	+ var valueT = 0, valueL = 0;
2194	+
2195	+ var element = forElement;
2196	+ do {
2197	+ valueT += element.offsetTop \|\| 0;
2198	+ valueL += element.offsetLeft \|\| 0;
2199	+
2200	+ // Safari fix
2201	+ if (element.offsetParent==document.body)
2202	+ if (Element.getStyle(element,'position')=='absolute') break;
2203	+
2204	+ } while (element = element.offsetParent);
2205	+
2206	+ element = forElement;
2207	+ do {
2208	+ valueT -= element.scrollTop \|\| 0;
2209	+ valueL -= element.scrollLeft \|\| 0;
2210	+ } while (element = element.parentNode);
2211	+
2212	+ return [valueL, valueT];
2213	+ },
2214	+
2215	+ clone: function(source, target) {
2216	+ var options = Object.extend({
2217	+ setLeft: true,
2218	+ setTop: true,
2219	+ setWidth: true,
2220	+ setHeight: true,
2221	+ offsetTop: 0,
2222	+ offsetLeft: 0
2223	+ }, arguments[2] \|\| {})
2224	+
2225	+ // find page position of source
2226	+ source = $(source);
2227	+ var p = Position.page(source);
2228	+
2229	+ // find coordinate system to use
2230	+ target = $(target);
2231	+ var delta = [0, 0];
2232	+ var parent = null;
2233	+ // delta [0,0] will do fine with position: fixed elements,
2234	+ // position:absolute needs offsetParent deltas
2235	+ if (Element.getStyle(target,'position') == 'absolute') {
2236	+ parent = Position.offsetParent(target);
2237	+ delta = Position.page(parent);
2238	+ }
2239	+
2240	+ // correct by body offsets (fixes Safari)
2241	+ if (parent == document.body) {
2242	+ delta[0] -= document.body.offsetLeft;
2243	+ delta[1] -= document.body.offsetTop;
2244	+ }
2245	+
2246	+ // set position
2247	+ if(options.setLeft) target.style.left = (p[0] - delta[0] + options.offsetLeft) + 'px';
2248	+ if(options.setTop) target.style.top = (p[1] - delta[1] + options.offsetTop) + 'px';
2249	+ if(options.setWidth) target.style.width = source.offsetWidth + 'px';
2250	+ if(options.setHeight) target.style.height = source.offsetHeight + 'px';
2251	+ },
2252	+
2253	+ absolutize: function(element) {
2254	+ element = $(element);
2255	+ if (element.style.position == 'absolute') return;
2256	+ Position.prepare();
2257	+
2258	+ var offsets = Position.positionedOffset(element);
2259	+ var top = offsets[1];
2260	+ var left = offsets[0];
2261	+ var width = element.clientWidth;
2262	+ var height = element.clientHeight;
2263	+
2264	+ element._originalLeft = left - parseFloat(element.style.left \|\| 0);
2265	+ element._originalTop = top - parseFloat(element.style.top \|\| 0);
2266	+ element._originalWidth = element.style.width;
2267	+ element._originalHeight = element.style.height;
2268	+
2269	+ element.style.position = 'absolute';
2270	+ element.style.top = top + 'px';;
2271	+ element.style.left = left + 'px';;
2272	+ element.style.width = width + 'px';;
2273	+ element.style.height = height + 'px';;
2274	+ },
2275	+
2276	+ relativize: function(element) {
2277	+ element = $(element);
2278	+ if (element.style.position == 'relative') return;
2279	+ Position.prepare();
2280	+
2281	+ element.style.position = 'relative';
2282	+ var top = parseFloat(element.style.top \|\| 0) - (element._originalTop \|\| 0);
2283	+ var left = parseFloat(element.style.left \|\| 0) - (element._originalLeft \|\| 0);
2284	+
2285	+ element.style.top = top + 'px';
2286	+ element.style.left = left + 'px';
2287	+ element.style.height = element._originalHeight;
2288	+ element.style.width = element._originalWidth;
2289	+ }
2290	+}
2291	+
2292	+// Safari returns margins on body which is incorrect if the child is absolutely
2293	+// positioned. For performance reasons, redefine Position.cumulativeOffset for
2294	+// KHTML/WebKit only.
2295	+if (/Konqueror\|Safari\|KHTML/.test(navigator.userAgent)) {
2296	+ Position.cumulativeOffset = function(element) {
2297	+ var valueT = 0, valueL = 0;
2298	+ do {
2299	+ valueT += element.offsetTop \|\| 0;
2300	+ valueL += element.offsetLeft \|\| 0;
2301	+ if (element.offsetParent == document.body)
2302	+ if (Element.getStyle(element, 'position') == 'absolute') break;
2303	+
2304	+ element = element.offsetParent;
2305	+ } while (element);
2306	+
2307	+ return [valueL, valueT];
2308	+ }
2309	+}
2310	\ No newline at end of file
2311	Index: webapp_biz/modules/pc/page/f_home.php
2312	===================================================================
2313	--- webapp_biz/modules/pc/page/f_home.php (.../2_5_5) (revision 1114)
2314	+++ webapp_biz/modules/pc/page/f_home.php (.../2_5_6) (revision 1114)
2315	@@ -90,7 +90,7 @@
2316	$todolist = biz_getTodoList($target_c_member_id, "f", $c_member['nickname']);
2317	$this->set("todolist", $todolist);
2318
2319	- $this->set('calendar', biz_getScheduleWeek($target_c_member_id, $requests['w'], 'f', true, true, true, $target_c_member));
2320	+ $this->set('calendar', biz_getScheduleWeek($target_c_member_id, $u, $requests['w'], 'f', true, true, true, $target_c_member));
2321
2322	$group_list = biz_getHomeGroupList($target_c_member_id);
2323	$this->set('group_list', $group_list);
2324	Index: webapp_biz/modules/pc/page/h_prof.php
2325	===================================================================
2326	--- webapp_biz/modules/pc/page/h_prof.php (.../2_5_5) (revision 1114)
2327	+++ webapp_biz/modules/pc/page/h_prof.php (.../2_5_6) (revision 1114)
2328	@@ -52,7 +52,7 @@
2329	$biz_dir = OPENPNE_MODULES_BIZ_DIR.'/biz/'; //bizã¢ã¸ã¥ã¼ã«ãã£ã¬ã¯ããªã®å®ç¾©
2330	include_once($biz_dir.'lib/smarty_functions.php'); //bizã¢ã¸ã¥ã¼ã«ããã©ã¤ãã©ãªãæå
2331	include_once $biz_dir . 'lib/mysql_functions.php'; //bizã¢ã¸ã¥ã¼ã«ããã©ã¤ãã©ãªãæå
2332	- $this->set('calendar', biz_getScheduleWeek($u, $requests['w'], 'p', true, true, true, $target_c_member));
2333	+ $this->set('calendar', biz_getScheduleWeek($u, $u, $requests['w'], 'p', true, true, true, $target_c_member));
2334
2335	$todolist = biz_getTodoList($u, "h", $target_c_member['nickname']);
2336	$this->set("todolist", $todolist);
2337	Index: webapp_biz/modules/pc/page/h_home.php
2338	===================================================================
2339	--- webapp_biz/modules/pc/page/h_home.php (.../2_5_5) (revision 1114)
2340	+++ webapp_biz/modules/pc/page/h_home.php (.../2_5_6) (revision 1114)
2341	@@ -100,7 +100,7 @@
2342	// $this->set('calendar', $this->get_calendar($u, $requests['w']));
2343
2344	//--- biz ãããã
2345	- $this->set('calendar_biz', biz_getScheduleWeek($u, $requests['w'], 'h', true, true, true, $c_member));
2346	+ $this->set('calendar_biz', biz_getScheduleWeek($u, $u, $requests['w'], 'h', true, true, true, $c_member));
2347	//--- biz ããã¾ã§
2348
2349
2350	Index: webapp_biz/modules/pc/templates/inc_f_home_h_prof.tpl
2351	===================================================================
2352	--- webapp_biz/modules/pc/templates/inc_f_home_h_prof.tpl (.../2_5_5) (revision 1114)
2353	+++ webapp_biz/modules/pc/templates/inc_f_home_h_prof.tpl (.../2_5_6) (revision 1114)
2354	@@ -1,32 +1,4 @@
2355	-({$inc_html_header\|smarty:nodefaults})
2356	-<body>
2357	-({ext_include file="inc_extension_pagelayout_top.tpl"})
2358	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
2359	-<tr>
2360	-<td class="container inc_page_header">
2361	-({$inc_page_header\|smarty:nodefaults})
2362	-</td>
2363	-</tr>
2364	-({if $inc_entry_point[1]})
2365	-<tr>
2366	-<td class="container">
2367	-({$inc_entry_point[1]\|smarty:nodefaults})
2368	-</td>
2369	-</tr>
2370	-({/if})
2371	-<tr>
2372	-<td class="container inc_navi">
2373	-({$inc_navi\|smarty:nodefaults})
2374	-</td>
2375	-</tr>
2376	-({if $inc_entry_point[2]})
2377	-<tr>
2378	-<td class="container">
2379	-({$inc_entry_point[2]\|smarty:nodefaults})
2380	-</td>
2381	-</tr>
2382	-({/if})
2383	-
2384	+({ext_include file="inc_header.tpl"})
2385	({if $is_h_prof})({* -------- èªåã®ãããã£ã¼ã«ç¢ºèªæ:ãããã -------- *})
2386
2387	<tr>
2388	@@ -271,7 +243,6 @@
2389
2390	({/if})({* -------- ä»ã¡ã³ãã¼ã®ãããã£ã¼ã«:ããã¾ã§ -------- *})
2391
2392	-
2393	({if $calendar})
2394	<tr>
2395	<td class="container" align="center">
2396	@@ -288,13 +259,8 @@
2397	</tr>
2398	({/if})
2399
2400	+({ext_include file="inc_layoutcolumn_top_270px.tpl"})
2401
2402	-<tr>
2403	-<td class="container main_content">
2404	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
2405	-<tr>
2406	-<td style="width:5px;"><img src="./skin/dummy.gif" style="width:5px;" class="dummy"></td>({<--spacer})
2407	-<td class="left_content" valign="top">
2408	({********************************})
2409	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å·¦ï¼})
2410	({********************************})
2411	@@ -830,9 +796,7 @@
2412	({********************************})
2413	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å·¦ï¼})
2414	({********************************})
2415	-</td>
2416	-<td style="width:5px;"><img src="./skin/dummy.gif" style="width:5px;" class="dummy"></td>({<--spacer})
2417	-<td class="right_content" valign="top">
2418	+({ext_include file="inc_layoutcolumn_middle_270px.tpl"})
2419	({********************************})
2420	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å³ï¼})
2421	({********************************})
2422	@@ -963,7 +927,7 @@
2423	<td class="border_01 bg_02 padding_s" style="width:332px;border-top:none;">
2424
2425	({if $item.form_type == 'textarea'})
2426	- ({$item.value\|t_url2a\|nl2br})
2427	+ ({$item.value\|nl2br\|t_url2cmd\|t_cmd})
2428	({elseif $item.form_type == 'checkbox'})
2429	({$item.value\|@t_implode:", "})
2430	({else})
2431	@@ -1227,17 +1191,5 @@
2432	({********************************})
2433	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å³ï¼})
2434	({********************************})
2435	-</td>
2436	-</tr>
2437	-</table>({END:container})
2438	-</td>
2439	-</tr>
2440	-<tr>
2441	-<td class="container inc_page_footer">
2442	-({$inc_page_footer\|smarty:nodefaults})
2443	-</td>
2444	-</tr>
2445	-</table>
2446	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
2447	-</body>
2448	-</html>
2449	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
2450	+({ext_include file="inc_footer.tpl"})
2451	Index: webapp_biz/modules/pc/templates/inc_footer.tpl
2452	===================================================================
2453	--- webapp_biz/modules/pc/templates/inc_footer.tpl (.../2_5_5) (revision 0)
2454	+++ webapp_biz/modules/pc/templates/inc_footer.tpl (.../2_5_6) (revision 1114)
2455	@@ -0,0 +1,78 @@
2456	+({if !$INC_FOOTER_is_login})
2457	+<tr>
2458	+<td class="container inc_page_footer">
2459	+
2460	+
2461	+({***************************************})
2462	+({ããããï¼æ§inc_page_footer.tplã®åå®¹})
2463	+({***************************************})
2464	+<table class="inc_page_footer" border="0" cellspacing="0" cellpadding="0">
2465	+<tr>
2466	+<td class="bg_page_footer" style="background: url(({t_img_url_skin filename=skin_footer})) no-repeat ;">
2467	+
2468	+({$INC_FOOTER_inc_page_footer\|smarty:nodefaults})
2469	+
2470	+</td>
2471	+</tr>
2472	+</table>
2473	+({***************************************})
2474	+({ããã¾ã§ï¼æ§inc_page_footer.tplã®åå®¹})
2475	+({***************************************})
2476	+
2477	+</td>
2478	+</tr>
2479	+({/if})
2480	+</table>
2481	+</td>
2482	+
2483	+({if $INC_FOOTER_side_banner_html_before \|\| $INC_FOOTER_side_banner_html_after \|\| $INC_FOOTER_inc_side_banner})
2484	+
2485	+<td class="ext_sub_container_right" align="center" valign="top">
2486	+({**********************************})
2487	+({ããããï¼ãµã¤ãã³ã³ãã³ãé å})
2488	+({**********************************})
2489	+
2490	+({strip})
2491	+({if $INC_FOOTER_side_banner_html_before \|\| $INC_FOOTER_side_banner_html_after})
2492	+ ({if $before_after == 'before'})
2493	+ ({$INC_FOOTER_side_banner_html_before\|smarty:nodefaults})
2494	+ ({else})
2495	+ ({$INC_FOOTER_side_banner_html_after\|smarty:nodefaults})
2496	+ ({/if})
2497	+({else})
2498	+ ({if $INC_FOOTER_inc_side_banner.a_href})
2499	+ ({if $PHPSESSID})
2500	+ <a href="({t_url m=pc a=do_h_click_banner})&target_c_banner_id=({$INC_FOOTER_inc_side_banner.c_banner_id})&sessid=({$PHPSESSID})" target="_blank">
2501	+ ({else})
2502	+ <a href="({t_url m=pc a=do_o_click_banner})&target_c_banner_id=({$INC_FOOTER_inc_side_banner.c_banner_id})" target="_blank">
2503	+ ({/if})
2504	+ <img src="({t_img_url filename=$INC_FOOTER_inc_side_banner.image_filename})">
2505	+ </a>
2506	+ ({else})
2507	+ <img src="({t_img_url filename=$INC_FOOTER_inc_side_banner.image_filename})">
2508	+ ({/if})
2509	+({/if})
2510	+({/strip})
2511	+
2512	+({if $newschedule })
2513	+({$newschedule\|smarty:nodefaults})
2514	+({/if})
2515	+
2516	+({if $todolist })
2517	+({$todolist\|smarty:nodefaults})
2518	+({/if})
2519	+
2520	+({**********************************})
2521	+({ããã¾ã§ï¼ãµã¤ãã³ã³ãã³ãé å})
2522	+({**********************************})
2523	+</td>
2524	+({/if})
2525	+</tr>
2526	+</table>
2527	+
2528	+</div>
2529	+
2530	+({$INC_FOOTER_inc_page_bottom\|smarty:nodefaults})
2531	+
2532	+</body>
2533	+</html>
2534	Index: webapp_biz/modules/pc/templates/h_com_find_all.tpl
2535	===================================================================
2536	--- webapp_biz/modules/pc/templates/h_com_find_all.tpl (.../2_5_5) (revision 1114)
2537	+++ webapp_biz/modules/pc/templates/h_com_find_all.tpl (.../2_5_6) (revision 1114)
2538	@@ -1,22 +1,6 @@
2539	-({$inc_html_header\|smarty:nodefaults})
2540	-<body>
2541	-({ext_include file="inc_extension_pagelayout_top.tpl"})
2542	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
2543	-<tr>
2544	-<td class="container inc_page_header">
2545	-({$inc_page_header\|smarty:nodefaults})
2546	-</td>
2547	-</tr>
2548	-<tr>
2549	-<td class="container inc_navi">
2550	-({$inc_navi\|smarty:nodefaults})
2551	-</td>
2552	-</tr>
2553	-<tr>
2554	-<td class="container main_content">
2555	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
2556	-<tr>
2557	-<td class="full_content" align="center">
2558	+({ext_include file="inc_header.tpl"})
2559	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
2560	+
2561	({***************************})
2562	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
2563	({***************************})
2564	@@ -76,7 +60,7 @@
2565	<img src="./skin/dummy.gif" class="v_spacer_l">
2566
2567	ãã¼ã¯ã¼ã<img src="({t_img_url_skin filename=icon_arrow_2})" class="icon">
2568	-<input name="keyword" size="15" value="({$keyword})">
2569	+<input class="text" name="keyword" size="15" value="({$keyword})">
2570	ã«ãã´ãª<img src="({t_img_url_skin filename=icon_arrow_2})" class="icon">
2571	<select name="category_id">
2572	<option value="0">æå®ãªã</option>
2573	@@ -469,17 +453,5 @@
2574	({***************************})
2575	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
2576	({***************************})
2577	-</td>
2578	-</tr>
2579	-</table>({END:container})
2580	-</td>
2581	-</tr>
2582	-<tr>
2583	-<td class="container inc_page_footer">
2584	-({$inc_page_footer\|smarty:nodefaults})
2585	-</td>
2586	-</tr>
2587	-</table>
2588	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
2589	-</body>
2590	-</html>
2591	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
2592	+({ext_include file="inc_footer.tpl"})
2593	Index: webapp_biz/modules/pc/templates/h_home.tpl
2594	===================================================================
2595	--- webapp_biz/modules/pc/templates/h_home.tpl (.../2_5_5) (revision 1114)
2596	+++ webapp_biz/modules/pc/templates/h_home.tpl (.../2_5_6) (revision 1114)
2597	@@ -1,56 +1,151 @@
2598	-({$inc_html_header\|smarty:nodefaults})
2599	-<body>
2600	-({ext_include file="inc_extension_pagelayout_top.tpl"})
2601	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
2602	+({ext_include file="inc_header.tpl"})
2603	+({if $smarty.const.DISPLAY_SEARCH_HOME})
2604	<tr>
2605	-<td class="container inc_page_header">
2606	-({$inc_page_header\|smarty:nodefaults})
2607	+<td class="container inc_search_box">
2608	+({**************************************})
2609	+({ããããï¼æ§inc_search_box.tplã®åå®¹})
2610	+({**************************************})
2611	+<table border="0" cellspacing="0" cellpadding="0" style="width:720px;">
2612	+<tr>
2613	+<td style="width:720px;height:2px;"><img src="./skin/dummy.gif" style="width:720px;height:2px;" class="dummy"></td>
2614	+</tr>
2615	+<tr>
2616	+<td align="center">
2617	+
2618	+({ããããï¼æ¬ä½})
2619	+<div class="bg_09" style="width:680px;height:24px;border-left:none 0px;border-right:none 0px;border-top:none 0px;">
2620	+({t_form m=pc a=do_h_home_search})
2621	+<input type="hidden" name="sessid" value="({$PHPSESSID})">
2622	+
2623	+<table border="0" cellspacing="0" cellpadding="0" class="search_bar" style="width:680px;height:24px;">
2624	+<tr>
2625	+<td align="center" style="height:24px;">
2626	+<img src="({t_img_url_skin filename=icon_search})" alt="search" style="width:62px;height:20px;" class="icon">
2627	+<input type="text" size="30" name="q" class="text border_01" value="" style="width:180px;">
2628	+<input type="image" src="({t_img_url_skin filename=button_search_1})" value="diary" alt="æ¥è¨" border="0" name="diary" class="button" style="width:62px;height:20px;">
2629	+<input type="image" src="({t_img_url_skin filename=button_search_2})" value="community" alt="ã³ãã¥ããã£" border="0" name="community" class="button" style="width:62px;height:20px;">
2630	+<input type="image" src="({t_img_url_skin filename=button_search_4})" value="message" alt="ã¡ãã»ã¼ã¸" border="0" name="message" class="button" style="width:62px;height:20px;">
2631	+<input type="image" src="./skin/biz/button_search_4.gif" value="group" alt="ã°ã«ã¼ã" border="0" name="group" class="button" style="width:62px;height:20px;">
2632	+({if $smarty.const.USE_EXTRA_SERVICE})
2633	+<input type="image" src="({t_img_url_skin filename=button_search_3})" value="web" alt="web" border="0" name="web" class="button" style="width:62px;height:20px;">
2634	+({/if})
2635	</td>
2636	</tr>
2637	-({if $inc_entry_point[1]})
2638	+</table>
2639	+
2640	+</form>
2641	+</div>
2642	+({ããã¾ã§ï¼æ¬ä½})
2643	+
2644	+</td>
2645	+</tr>
2646	+</table>
2647	+({**************************************})
2648	+({ããã¾ã§ï¼æ§inc_search_box.tplã®åå®¹})
2649	+({**************************************})
2650	+</td>
2651	+</tr>
2652	+({/if})
2653	+({if $birthday_flag})
2654	<tr>
2655	-<td class="container">
2656	-({$inc_entry_point[1]\|smarty:nodefaults})
2657	+<td class="container" align="center">
2658	+
2659	+<div class="padding_s">
2660	+
2661	+<img src="({t_img_url_skin filename=birthday_h})">
2662	+
2663	+</div>
2664	+
2665	</td>
2666	</tr>
2667	({/if})
2668	<tr>
2669	-<td class="container inc_navi">
2670	-({$inc_navi\|smarty:nodefaults})
2671	+<td class="container inc_info">
2672	+
2673	+({********************************})
2674	+({ããããï¼æ§inc_info.tplã®åå®¹})
2675	+({********************************})
2676	+<!--ãã¤ã³ãã©ã¡ã¼ã·ã§ã³ãï¼ãã«ã¬ã³ãã¼ã-->
2677	+<table border="0" cellspacing="0" cellpadding="0" style="width:720px;" class="info">
2678	+<tr>
2679	+<td style="width:5px;"><img src="./skin/dummy.gif" style="width:5px;height:1px;" class="dummy"></td>
2680	+<td style="width:715px;" align="center" valign="middle">
2681	+
2682	+<!--ããããï¼éå¶èããã®ãç¥ãã-->
2683	+<table border="0" cellspacing="0" cellpadding="0" style="width:715px;" class="info_body">
2684	+<tr>
2685	+<td align="center" class="border_07 bg_11" style="width:105px;border-right:none;"><img src="({t_img_url_skin filename=icon_information})" alt="ãç¥ãã"></td>
2686	+<td class="border_07 bg_02" style="width:610px;">
2687	+
2688	+<table border="0" cellspacing="0" cellpadding="0" style="width:610px;">
2689	+<tr>
2690	+<td class="padding_s">
2691	+
2692	+({$site_info\|smarty:nodefaults\|default:" "})
2693	+
2694	</td>
2695	</tr>
2696	-({if $inc_entry_point[2]})
2697	+({if $num_f_confirm_list})
2698	<tr>
2699	-<td class="container">
2700	-({$inc_entry_point[2]\|smarty:nodefaults})
2701	+<td class="padding_s">
2702	+
2703	+â<span class="caution">æ¿èªå¾ã¡ã®ã¡ã³ãã¼ã({$num_f_confirm_list})åãã¾ãï¼</span> <a href="({t_url m=pc a=page_h_confirm_list})"><span class="b_b">æ¿èªã»æå¦</span></a>
2704	+
2705	</td>
2706	</tr>
2707	({/if})
2708	-({if $smarty.const.DISPLAY_SEARCH_HOME})
2709	+({if $num_message_not_is_read})
2710	<tr>
2711	-<td class="container inc_search_box">
2712	-({ext_include file="inc_search_box.tpl"})
2713	+<td class="padding_s">
2714	+
2715	+â<span class="caution">æ°çã¡ãã»ã¼ã¸ã({$num_message_not_is_read})ä»¶ããã¾ãï¼</span> <a href="({t_url m=pc a=page_h_message_box})"><span class="b_b">ã¡ãã»ã¼ã¸ãèªã</span></a>
2716	+
2717	</td>
2718	</tr>
2719	({/if})
2720	-({if $birthday_flag})
2721	+({if $num_diary_not_is_read})
2722	<tr>
2723	-<td class="container" align="center">
2724	+<td class="padding_s">
2725
2726	-<div class="padding_s">
2727	+â<span class="caution">({$num_diary_not_is_read})ä»¶ã®æ¥è¨ã«å¯¾ãã¦æ°çã³ã¡ã³ããããã¾ãï¼</span> <a href="({t_url m=pc a=page_fh_diary})&target_c_diary_id=({$first_diary_read})"><span class="caution">æ¥è¨ãè¦ã</span></a>
2728
2729	-<img src="({t_img_url_skin filename=birthday_h})">
2730	+</td>
2731	+</tr>
2732	+({/if})
2733	+({if $num_h_confirm_list})
2734	+<tr>
2735	+<td class="padding_s">
2736
2737	-</div>
2738	+â<span class="caution">ã³ãã¥ããã£åå æ¿èªå¾ã¡ã®ã¡ã³ãã¼ã({$num_h_confirm_list})åãã¾ãï¼</span> <a href="({t_url m=pc a=page_h_confirm_list})"><span class="b_b">æ¿èªã»æå¦</span></a>
2739
2740	</td>
2741	</tr>
2742	({/if})
2743	+({if $anatani_c_commu_admin_confirm_list})
2744	<tr>
2745	-<td class="container inc_info">
2746	-({ext_include file="inc_info.tpl"})
2747	+<td class="padding_s">
2748	+
2749	+â<span class="caution">ã³ãã¥ããã£ç®¡çäººäº¤ä»£ä¾é ¼ã({$num_anatani_c_commu_admin_confirm_list})ä»¶ãã¦ãã¾ãã</span> <a href="({t_url m=pc a=page_h_confirm_list})"><span class="b_b">æ¿èªã»æå¦</span></a>
2750	+
2751	</td>
2752	</tr>
2753	+({/if})
2754	+</table>
2755	+
2756	+</td>
2757	+</tr>
2758	+</table>
2759	+<!--ããã¾ã§ï¼éå¶èããã®ãç¥ãã-->
2760	+
2761	+</td>
2762	+</tr>
2763	+</table>
2764	+({********************************})
2765	+({ããã¾ã§ï¼æ§inc_info.tplã®åå®¹})
2766	+({********************************})
2767	+
2768	+</td>
2769	+</tr>
2770	({if $inc_entry_point[3]})
2771	<tr>
2772	<td class="container">
2773	@@ -71,12 +166,8 @@
2774	<!-- ****ããã¾ã§ï¼bizã¢ã¸ã¥ã¼ã«::ã¹ã±ã¸ã¥ã¼ã«**** -->
2775	<!-- ******************************** -->
2776
2777	-<tr>
2778	-<td class="container main_content">
2779	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
2780	-<tr>
2781	-<td style="width:5px;"><img src="./skin/dummy.gif" style="width:5px;" class="dummy"></td>({<--spacer})
2782	-<td class="left_content" valign="top">
2783	+({ext_include file="inc_layoutcolumn_top_270px.tpl"})
2784	+
2785	({********************************})
2786	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å·¦ï¼})
2787	({********************************})
2788	@@ -801,9 +892,7 @@
2789	({********************************})
2790	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å·¦ï¼})
2791	({********************************})
2792	-</td>
2793	-<td style="width:5px;"><img src="./skin/dummy.gif" style="width:5px;" class="dummy"></td>({<--spacer})
2794	-<td class="right_content" valign="top">
2795	+({ext_include file="inc_layoutcolumn_middle_270px.tpl"})
2796	({********************************})
2797	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å³ï¼})
2798	({********************************})
2799	@@ -840,7 +929,7 @@
2800	({/if})
2801	<div class="border_01 bg_02 padding_s" align="left">
2802
2803	-äºå® <input type="text" name="title" value="" size="24">
2804	+äºå® <input class="text" type="text" name="title" value="" size="24">
2805	<select name="start_date">
2806	({foreach from=$calendar item=item})
2807	<option value="({$item.year})-({$item.month})-({$item.day})"({if $item.now}) selected="selected"({/if})>({$item.month})/({$item.day})(({$item.dayofweek}))</option>
2808	@@ -962,7 +1051,7 @@
2809	<td class="border_01 bg_02 padding_s" style="width:332px;border-top:none;">
2810
2811	({foreach from=$c_diary_friend_list item=item})
2812	-<img src="./skin/dummy.gif" style="width:14px;height:14px;" class="icon icon_1">({$item.r_datetime\|date_format:"%mæ%dæ¥"})â¦ <a href="({t_url m=pc a=page_fh_diary})&target_c_diary_id=({$item.c_diary_id})&comment_count=({$item.count_comments})">({$item.subject\|default:" "}) (({$item.count_comments\|default:0}))</a>
2813	+<img src="./skin/dummy.gif" style="width:14px;height:14px;clear:both;" class="icon icon_1">({$item.r_datetime\|date_format:"%mæ%dæ¥"})â¦ <a href="({t_url m=pc a=page_fh_diary})&target_c_diary_id=({$item.c_diary_id})&comment_count=({$item.count_comments})">({$item.subject\|default:" "}) (({$item.count_comments\|default:0}))</a>
2814	(({$item.nickname\|default:" "}))
2815	({if $item.image_filename_1 \|\| $item.image_filename_2 \|\| $item.image_filename_3})<img src="({t_img_url_skin filename=icon_camera})" class="icon">({/if})<br>
2816	({/foreach})
2817	@@ -1518,17 +1607,5 @@
2818	({********************************})
2819	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å³ï¼})
2820	({********************************})
2821	-</td>
2822	-</tr>
2823	-</table>({END:container})
2824	-</td>
2825	-</tr>
2826	-<tr>
2827	-<td class="container inc_page_footer">
2828	-({$inc_page_footer\|smarty:nodefaults})
2829	-</td>
2830	-</tr>
2831	-</table>
2832	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
2833	-</body>
2834	-</html>
2835	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
2836	+({ext_include file="inc_footer.tpl"})
2837	Index: webapp_biz/modules/pc/templates/inc_extension_pagelayout_bottom.tpl
2838	===================================================================
2839	--- webapp_biz/modules/pc/templates/inc_extension_pagelayout_bottom.tpl (.../2_5_5) (revision 1114)
2840	+++ webapp_biz/modules/pc/templates/inc_extension_pagelayout_bottom.tpl (.../2_5_6) (revision 1114)
2841	@@ -1,54 +0,0 @@
2842	-</td>
2843	-
2844	-<td class="ext_sub_container_right" align="left" valign="top">
2845	-
2846	-({**********************************})
2847	-({ããããï¼ãµã¤ãã³ã³ãã³ãé å})
2848	-({**********************************})
2849	-
2850	-({if $side_banner_html_before \|\| $side_banner_html_after \|\| $inc_side_banner})
2851	-
2852	-<div style="margin-left:10px">
2853	-({strip})
2854	-({if $side_banner_html_before \|\| $side_banner_html_after})
2855	- ({if $before_after == 'before'})
2856	- ({$side_banner_html_before\|smarty:nodefaults})
2857	- ({else})
2858	- ({$side_banner_html_after\|smarty:nodefaults})
2859	- ({/if})
2860	-({else})
2861	- ({if $inc_side_banner.a_href})
2862	- ({if $PHPSESSID})
2863	- <a href="({t_url m=pc a=do_h_click_banner})&target_c_banner_id=({$inc_side_banner.c_banner_id})&sessid=({$PHPSESSID})" target="_blank">
2864	- ({else})
2865	- <a href="({t_url m=pc a=do_o_click_banner})&target_c_banner_id=({$inc_side_banner.c_banner_id})" target="_blank">
2866	- ({/if})
2867	- <img src="({t_img_url filename=$inc_side_banner.image_filename})">
2868	- </a>
2869	- ({else})
2870	- <img src="({t_img_url filename=$inc_side_banner.image_filename})">
2871	- ({/if})
2872	-({/if})
2873	-({/strip})
2874	-</div>
2875	-
2876	-({/if})
2877	-
2878	-({if $newschedule })
2879	-({$newschedule\|smarty:nodefaults})
2880	-({/if})
2881	-
2882	-({if $todolist })
2883	-({$todolist\|smarty:nodefaults})
2884	-({/if})
2885	-
2886	-({**********************************})
2887	-({ããã¾ã§ï¼ãµã¤ãã³ã³ãã³ãé å})
2888	-({**********************************})
2889	-</td>
2890	-</tr>
2891	-</table>
2892	-
2893	-</div>
2894	-
2895	-({$inc_extension_pagelayout_bottom\|smarty:nodefaults})
2896	Index: webapp_biz/modules/pc/templates/inc_search_box.tpl
2897	===================================================================
2898	--- webapp_biz/modules/pc/templates/inc_search_box.tpl (.../2_5_5) (revision 1114)
2899	+++ webapp_biz/modules/pc/templates/inc_search_box.tpl (.../2_5_6) (revision 1114)
2900	@@ -1,32 +0,0 @@
2901	-<table border="0" cellspacing="0" cellpadding="0" style="width:720px;">
2902	-<tr>
2903	-<td style="width:720px;height:2px;"><img src="./skin/dummy.gif" style="width:720px;height:2px;" class="dummy"></td>
2904	-</tr>
2905	-<tr>
2906	-<td align="center">
2907	-
2908	-({ããããï¼æ¬ä½})
2909	-<div class="bg_09" style="width:680px;height:24px;border-left:none 0px;border-right:none 0px;border-top:none 0px;">
2910	-({t_form m=pc a=do_h_home_search})
2911	-<input type="hidden" name="sessid" value="({$PHPSESSID})">
2912	-
2913	-<table border="0" cellspacing="0" cellpadding="0" class="search_bar" style="width:680px;height:24px;">
2914	-<tr>
2915	-<td align="center" style="height:24px;">
2916	-<img src="({t_img_url_skin filename=icon_search})" alt="search" style="width:62px;height:20px;" class="icon">
2917	-<input type="text" size="30" name="q" class="text border_01" value="" style="width:180px;">
2918	-<input type="image" src="({t_img_url_skin filename=button_search_1})" value="diary" alt="æ¥è¨" border="0" name="diary" class="button" style="width:62px;height:20px;">
2919	-<input type="image" src="({t_img_url_skin filename=button_search_2})" value="community" alt="ã³ãã¥ããã£" border="0" name="community" class="button" style="width:62px;height:20px;">
2920	-<input type="image" src="({t_img_url_skin filename=button_search_3})" value="web" alt="web" border="0" name="web" class="button" style="width:62px;height:20px;">
2921	-<input type="image" src="./skin/biz/button_search_4.gif" value="group" alt="ã°ã«ã¼ã" border="0" name="group" class="button" style="width:62px;height:20px;">
2922	-</td>
2923	-</tr>
2924	-</table>
2925	-
2926	-</form>
2927	-</div>
2928	-({ããã¾ã§ï¼æ¬ä½})
2929	-
2930	-</td>
2931	-</tr>
2932	-</table>
2933	Index: webapp_biz/modules/biz/do/h_biz_schedule_delete.php
2934	===================================================================
2935	--- webapp_biz/modules/biz/do/h_biz_schedule_delete.php (.../2_5_5) (revision 1114)
2936	+++ webapp_biz/modules/biz/do/h_biz_schedule_delete.php (.../2_5_6) (revision 1114)
2937	@@ -11,6 +11,10 @@
2938	$u = $GLOBALS['AUTH']->uid();
2939	$sessid = session_id();
2940
2941	+ if (!biz_isPermissionSchedule($u, $requests['schedule_id'])) {
2942	+ handle_kengen_error();
2943	+ }
2944	+
2945	if ($requests['is_rep']) {
2946	$rep_schedule = biz_getRepeatScheduleID($requests['schedule_id']);
2947	foreach ($rep_schedule as $value) {
2948	Index: webapp_biz/modules/biz/do/fhg_biz_schedule_add.php
2949	===================================================================
2950	--- webapp_biz/modules/biz/do/fhg_biz_schedule_add.php (.../2_5_5) (revision 1114)
2951	+++ webapp_biz/modules/biz/do/fhg_biz_schedule_add.php (.../2_5_6) (revision 1114)
2952	@@ -68,16 +68,6 @@
2953	}
2954	//--------------------
2955
2956	- //æ½è¨ãåå èã®ãã§ãã¯
2957	- if (in_array('0', $requests['sc_j_mem'])) {
2958	- //ãå¨å¡ããå«ã¾ãã¦ããå ´åã¯ãéåãç©ºã«
2959	- $requests['sc_j_mem'] = array();
2960	- }
2961	-
2962	- if (!$requests['sc_j_plc']) {
2963	- $requests['sc_j_plc'] = 0;
2964	- }
2965	-
2966	if ($requests['sc_b_hour'] && !$requests['sc_b_minute']) {
2967	$requests['sc_b_minute'] = '00';
2968	}
2969	@@ -115,6 +105,31 @@
2970	}
2971	//--------------------
2972
2973	+ //ERROR---------------
2974	+ //ã°ã«ã¼ãã¾ã§å¬éã®äºå®ãªã®ã«ã°ã«ã¼ããæå®ããã¦ããªã
2975	+ //--------------------
2976	+ if(($requests['public_flag'] == 'group') && empty($requests['biz_group_id'])) {
2977	+ $msg = 'ãã°ã«ã¼ãã¾ã§å¬éãäºå®ã®å ´åã¯ã°ã«ã¼ããæå®ãã¦ãã ãã';
2978	+ $begin_date = $requests['sc_b_year'].'-'.$requests['sc_b_month'].'-'.$requests['sc_b_date'];
2979	+ $begin_time = $requests['sc_b_hour'].':'.$requests['sc_b_minute'];
2980	+ $finish_time = $requests['sc_f_hour'].':'.$requests['sc_f_minute'];
2981	+ $url = $redirect_script.
2982	+ '&msg='.$msg.
2983	+ '&begin_date='.$begin_date.
2984	+ '&sc_title='.$requests['sc_title'].
2985	+ '&sc_rp='.$requests['sc_rp'].
2986	+ '&sc_memo='.$requests['sc_memo'].
2987	+ '&sc_j_mem_enc='.serialize($requests['sc_j_mem']).
2988	+ '&sc_rwk_enc='.serialize($requests['sc_rwk_enc']).
2989	+ '&sc_rcount='.$requests['sc_rcount'];
2990	+
2991	+ $p = array('msg' => $msg, 'begin_date' => $begin_date, 'sc_rp' => $requests['sc_rp'],
2992	+ 'sc_memo' => $requests['sc_memo'], 'sc_j_mem_enc' => serialize($requests['sc_j_mem']),
2993	+ 'sc_rwk_enc' => serialize($requests['sc_rwk_enc']), 'sc_rcount' => $requests['sc_rcount']);
2994	+ openpne_redirect('biz', 'page_fh_biz_schedule_add', $p);
2995	+ exit(); //å¼·å¶çã«ã¹ã¯ãªãããçµäºããªããã°ãããªã
2996	+ }
2997	+
2998	if (!$requests['sc_rp'] && ($requests['sc_bn'] == 1)) {
2999	//å½æ¥ä¸ã«çµããäºå®ã¯ãéå§æ¥ã¨çµäºæ¥ã¯åä¸ã§ãªããã°ãªããªã
3000	$finish_date = $begin_date;
3001	@@ -149,7 +164,7 @@
3002
3003	if (!$requests['sc_rp']) {
3004	//ç¹°ãè¿ããããªãäºå®ç»é²
3005	- biz_insertSchedule($requests['sc_title'], $u, $begin_date, $finish_date, $begin_time, $finish_time, $requests['sc_memo'], $rp_rule, 0, $requests['sc_j_mem'], $requests['sc_j_plc']);
3006	+ biz_insertSchedule($requests['sc_title'], $u, $begin_date, $finish_date, $begin_time, $finish_time, $requests['sc_memo'], $rp_rule, 0, $requests['biz_group_id'], $requests['public_flag']);
3007	} else {
3008	//ç¹°ãè¿ãäºå®
3009	$tmp = $begin_date; //å¦çä¸ã®æ¥ä»
3010	@@ -158,7 +173,7 @@
3011	$nowday = strtotime($requests['sc_b_year'].'-'.$requests['sc_b_month'].'-'.($requests['sc_b_date']+$i));
3012	$tmp = date("Ymd", $nowday);
3013	if ($rp_rule & (1 << date("w",$nowday))) {
3014	- biz_insertSchedule($requests['sc_title'], $u, $tmp, $tmp, $begin_time, $finish_time, $requests['sc_memo'], $rp_rule, $first_id, $requests['sc_j_mem'], $requests['sc_j_plc']);
3015	+ biz_insertSchedule($requests['sc_title'], $u, $tmp, $tmp, $begin_time, $finish_time, $requests['sc_memo'], $rp_rule, $first_id, $requests['biz_group_id'], $requests['public_flag']);
3016	}
3017	}
3018	}
3019	Index: webapp_biz/modules/biz/do/fh_biz_schedule_edit.php
3020	===================================================================
3021	--- webapp_biz/modules/biz/do/fh_biz_schedule_edit.php (.../2_5_5) (revision 1114)
3022	+++ webapp_biz/modules/biz/do/fh_biz_schedule_edit.php (.../2_5_6) (revision 1114)
3023	@@ -12,6 +12,10 @@
3024	$u = $GLOBALS['AUTH']->uid();
3025	$sessid = session_id();
3026
3027	+ if (!biz_isPermissionSchedule($u, $requests['schedule_id'])) {
3028	+ handle_kengen_error();
3029	+ }
3030	+
3031	//ERROR----------------
3032	//åå¨ããªãæ¥ä»
3033	if (!checkdate($requests['sc_b_month'], $requests['sc_b_date'], $requests['sc_b_year'])) {
3034	@@ -62,17 +66,6 @@
3035	}
3036	//--------------------
3037
3038	-
3039	- //æ½è¨ãåå èã®ãã§ãã¯
3040	- if (in_array('0', $requests['sc_j_mem'])) {
3041	- //ãå¨å¡ããå«ã¾ãã¦ããå ´åã¯ãéåãç©ºã«
3042	- $requests['sc_j_mem'] = array();
3043	- }
3044	-
3045	- if (!$requests['sc_j_plc']) {
3046	- $requests['sc_j_plc'] = 0;
3047	- }
3048	-
3049	if ($requests['sc_b_hour'] && !$requests['sc_b_minute']) {
3050	$requests['sc_b_minute'] = '00';
3051	}
3052	@@ -101,6 +94,22 @@
3053	}
3054	//--------------------
3055
3056	+ //ERROR---------------
3057	+ //ã°ã«ã¼ãã¾ã§å¬éã®äºå®ãªã®ã«ã°ã«ã¼ããæå®ããã¦ããªã
3058	+ //--------------------
3059	+ if(($requests['public_flag'] == 'group') && empty($requests['biz_group_id'])) {
3060	+ $msg = 'ãã°ã«ã¼ãã¾ã§å¬éãäºå®ã®å ´åã¯ã°ã«ã¼ããæå®ãã¦ãã ãã';
3061	+ $begin_date = $requests['sc_b_year'].'-'.$requests['sc_b_month'].'-'.$requests['sc_b_date'];
3062	+
3063	+ $p = array('msg' => $msg, 'begin_date' => $begin_date, 'title' => $requests['sc_title'],
3064	+ 'sc_rp' => $requests['sc_rp'], 'value' => $requests['sc_memo'], 'members' => serialize($requests['sc_j_mem']),
3065	+ 'sc_rwk_enc' => serialize($requests['sc_rwk_enc']), 'sc_rcount' => $requests['sc_rcount'],
3066	+ 'schedule_id' => $requests['schedule_id']);
3067	+ openpne_redirect('biz', 'page_fh_biz_schedule_edit', $p);
3068	+
3069	+ exit(); //å¼·å¶çã«ã¹ã¯ãªãããçµäºããªããã°ãããªã
3070	+ }
3071	+
3072	if (!($requests['sc_b_hour'] \|\| $requests['sc_b_minute'] \|\| $requests['sc_f_hour'] \|\| $requests['sc_f_minute'])) {
3073	//æå»æå®ãªã
3074	$begin_time = $finish_time = null;
3075	@@ -119,7 +128,7 @@
3076	//ç¹°ãè¿ããªã
3077	$finish_date = date("Y-m-d", strtotime($requests['sc_b_year'].'-'.$requests['sc_b_month'].'-'.($requests['sc_b_date']+($requests['sc_bn']-1))));
3078	//ç¹°ãè¿ããããªãäºå®ç»é²
3079	- biz_editSchedule($requests['sc_title'], $u, $begin_date, $finish_date, $begin_time, $finish_time, $requests['sc_memo'], $rp_rule, 0, $requests['sc_j_mem'], $requests['sc_j_plc'], $requests['schedule_id']);
3080	+ biz_editSchedule($requests['sc_title'], $u, $begin_date, $finish_date, $begin_time, $finish_time, $requests['sc_memo'], $rp_rule, 0, $requests['biz_group_id'], $requests['public_flag'], $requests['schedule_id']);
3081	$schedule_id = $requests['schedule_id'];
3082	} else {
3083	//çµäºæ¥ã®æ±ºå®
3084	@@ -148,7 +157,7 @@
3085	$tmp = $nowday;
3086
3087	if ($rp_rule & (1 << date("w", $nowday))) {
3088	- biz_insertSchedule($requests['sc_title'], $u, date("Y-m-d", $tmp), date("Y-m-d", $tmp), $begin_time, $finish_time, $requests['sc_memo'], $rp_rule, $first_id, $requests['sc_j_mem']);
3089	+ biz_insertSchedule($requests['sc_title'], $u, date("Y-m-d", $tmp), date("Y-m-d", $tmp), $begin_time, $finish_time, $requests['sc_memo'], $rp_rule, $first_id, $requests['biz_group_id'], $requests['public_flag']);
3090	}
3091	}
3092
3093	@@ -156,11 +165,6 @@
3094	}
3095	$week = date("W", abs(strtotime($begin_date) - strtotime(date("Y-m-d")))) - 1;
3096
3097	- if (in_array($u,$requests['sc_j_mem'])) {
3098	- $target_id = $u;
3099	- } else {
3100	- $target_id = $requests['sc_j_mem'][0];
3101	- }
3102	$p = array('w' => $week, 'msg' => 'äºå®ãç·¨éãã¾ããã',
3103	'id' => $schedule_id, 'target_id' => $target_id);
3104	openpne_redirect('biz', 'page_fh_biz_schedule_view', $p);
3105	Index: webapp_biz/modules/biz/do/g_home_add_biz_schedule.php
3106	===================================================================
3107	--- webapp_biz/modules/biz/do/g_home_add_biz_schedule.php (.../2_5_5) (revision 1114)
3108	+++ webapp_biz/modules/biz/do/g_home_add_biz_schedule.php (.../2_5_6) (revision 1114)
3109	@@ -35,18 +35,13 @@
3110	$begin_time = $finish_time = null;
3111	}
3112
3113	- $members = biz_getGroupMember($target_id);
3114	- $members_id = array();
3115	- foreach ($members as $key => $values) {
3116	- array_push($members_id, $values['c_member_id']);
3117	- }
3118	if (empty($text)) {
3119	$p = array('target_c_commu_id' => $target_id, 'msg' => 'ã¿ã¤ãã«ãå¥åãã¦ãã ããã');
3120	openpne_redirect('biz', 'page_g_home', $p);
3121	exit(); //å¼·å¶çã«ã¹ã¯ãªãããçµäºããªããã°ãããªã
3122	}
3123
3124	- biz_insertSchedule($title, $u, $begin_date, $finish_date, $begin_time, $finish_time, '', 0, 0, $members_id); //äºå®ã®ç»é²
3125	+ biz_insertSchedule($title, $u, $begin_date, $finish_date, $begin_time, $finish_time, '', 0, 0, $target_id, 'group'); //äºå®ã®ç»é²
3126	biz_readSchedule($u, biz_getScheduleMax()); //æ¢èªæ¸ã¿ã«
3127
3128	$p = array('target_c_commu_id' => $target_id);
3129	Index: webapp_biz/modules/biz/do/h_home_add_biz_schedule.php
3130	===================================================================
3131	--- webapp_biz/modules/biz/do/h_home_add_biz_schedule.php (.../2_5_5) (revision 1114)
3132	+++ webapp_biz/modules/biz/do/h_home_add_biz_schedule.php (.../2_5_6) (revision 1114)
3133	@@ -61,7 +61,7 @@
3134	openpne_redirect('pc', 'page_h_home', $p);
3135	}
3136
3137	- biz_insertSchedule($title, $u, $begin_date, $finish_date, $begin_time, $finish_time, '', 0, 0, array($u)); //äºå®ã®ç»é²
3138	+ biz_insertSchedule($title, $u, $begin_date, $finish_date, $begin_time, $finish_time, '', 0, 0); //äºå®ã®ç»é²
3139	biz_readSchedule($u, biz_getScheduleMax()); //æ¢èªã«
3140
3141	$p = array();
3142	Index: webapp_biz/modules/biz/lib/mysql_functions.php
3143	===================================================================
3144	--- webapp_biz/modules/biz/lib/mysql_functions.php (.../2_5_5) (revision 1114)
3145	+++ webapp_biz/modules/biz/lib/mysql_functions.php (.../2_5_6) (revision 1114)
3146	@@ -135,19 +135,57 @@
3147	return $schedule;
3148	}
3149
3150	+//æå®ãããäºå®ã«é¢ããæ¨©éããããã©ããããã§ãã¯ããé¢æ°
3151	+function biz_isPermissionSchedule($u, $biz_schedule_id)
3152	+{
3153	+ $biz_schedule = biz_getScheduleInfo($biz_schedule_id);
3154	+ $public_flag = $biz_schedule['public_flag'];
3155	+ $biz_group_id = $biz_schedule['biz_group_id'];
3156	+ $target_c_member_id = $biz_schedule['c_member_id'];
3157	+
3158	+ switch ($public_flag) {
3159	+ case 'group' : //ã°ã«ã¼ãã®ã¡ã³ãã¼ã«ã®ã¿æ¨©éãä¸ããããäºå®
3160	+ if (biz_isGroupMember($u, $biz_group_id)) {
3161	+ return true;
3162	+ } else {
3163	+ return false;
3164	+ }
3165	+ break;
3166	+ case 'private' : //äºå®ä½æèã«ã®ã¿æ¨©éãä¸ããããäºå®
3167	+ if ($target_c_member_id == $u) {
3168	+ return true;
3169	+ } else {
3170	+ return false;
3171	+ }
3172	+ break;
3173	+ default : //ãã¹ã¦ã®ã¦ã¼ã¶ã«æ¨©éãä¸ããããäºå®
3174	+ return true;
3175	+ }
3176	+}
3177	+
3178	//æå®ãããæ¥ä»ã«åå¨ããç¹å®ã¦ã¼ã¶ã®äºå®idã®ã¿ãå¾ãé¢æ°
3179	-function biz_getDateMemberSchedule($y, $m, $d, $id)
3180	+function biz_getDateMemberSchedule($y, $m, $d, $target_c_member_id, $u)
3181	{
3182	$schedule = array();
3183	$contain = array();
3184
3185	- $tmp = biz_getDateSchedule($y,$m,$d);
3186	+ $tmp = biz_getDateSchedule($y, $m, $d);
3187	$sc_list = array();
3188	+
3189	+ $biz_group_id_list = array();
3190	+ foreach(biz_getJoinGroup($target_c_member_id) as $value) {
3191	+ $biz_group_id_list[] = $value['biz_group_id'];
3192	+ }
3193
3194	- foreach ($tmp as $value) {
3195	- $members = biz_getJoinIdSchedule($value);
3196	- if (in_array($id, $members)) {
3197	- $contain[] = $value;
3198	+ foreach ($tmp as $biz_schedule_id) {
3199	+ $biz_schedule = biz_getScheduleInfo($biz_schedule_id);
3200	+
3201	+ if (biz_isPermissionSchedule($u, $biz_schedule_id)) {
3202	+ if ($biz_schedule['c_member_id'] == $target_c_member_id) {
3203	+ $contain[] = $biz_schedule_id;
3204	+ } elseif(in_array($biz_schedule['biz_group_id'], $biz_group_id_list) && ($value['public_flag'] != 'private')) {
3205	+ $contain[] = $biz_schedule_id;
3206	+ }
3207	}
3208	}
3209
3210	@@ -155,6 +193,7 @@
3211
3212	foreach ($contain as $key => $value) {
3213	if (!is_null($value)) {
3214	+
3215	//ãã®idã®äºå®ãå¾ã
3216	$sql = 'SELECT * FROM biz_schedule WHERE biz_schedule_id = ?';
3217	$params = array(
3218	@@ -336,7 +375,7 @@
3219	return $list;
3220	}
3221
3222	-//æå®ãããã°ã«ã¼ãã®ã¡ã³ãã¼ãè¿ãé¢æ°
3223	+//æå®ã¡ã³ãã¼ãã°ã«ã¼ãã«æå±ãã¦ãããã©ãããè¿ãé¢æ°
3224	function biz_isGroupMember($member_id, $group_id)
3225	{
3226	$sql = 'SELECT * FROM biz_group_member WHERE c_member_id = ? AND biz_group_id = ?';
3227	@@ -681,22 +720,13 @@
3228	//ã¹ã±ã¸ã¥ã¼ã«ç»é²
3229	function biz_insertSchedule($title, $member_id, $begin_date, $finish_date, $begin_time = null, $finish_time = null,
3230	$value = '', $rep_type, $first_id = 0,
3231	- $join_members = array(), $join_shisetsu = array())
3232	+ $biz_group_id = 0, $public_flag = "public")
3233	{
3234	//ç»é²å¤ã®ã»ããããã§ãã¯
3235	if (!$value) {
3236	$value = '';
3237	}
3238
3239	- //åå èãæå®ããã¦ããªã
3240	- if (empty($join_members)) {
3241	- $join_members = db_get_col('SELECT c_member_id FROM c_member'); //å¼·å¶çã«å¨å¡åå ã¨è¦ãªã
3242	- }
3243	-
3244	- if (empty($join_shisetsu)) {
3245	- $join_shisetsu = array();
3246	- }
3247	-
3248	if (!$rep_type) {
3249	$rep_type = 0;
3250	}
3251	@@ -712,21 +742,10 @@
3252	'value' => $value,
3253	'rep_type' => $rep_type,
3254	'rep_first' => $first_id,
3255	+ 'biz_group_id' => $biz_group_id,
3256	+ 'public_flag' => $public_flag,
3257	);
3258	db_insert('biz_schedule', $data);
3259	-
3260	- //biz_schedule_memberã§äºå®ã¨ã¡ã³ãã¼ãé¢é£ã¥ãã
3261	-
3262	- $new_schedule_id = mysql_insert_id();
3263	-
3264	- foreach ($join_members as $value) {
3265	- $data = array(
3266	- 'c_member_id' => $value,
3267	- 'biz_schedule_id' => $new_schedule_id,
3268	- 'is_read' => 0,
3269	- );
3270	- db_insert('biz_schedule_member', $data);
3271	- }
3272	}
3273
3274	//ã¹ã±ã¸ã¥ã¼ã«åé¤
3275	@@ -767,10 +786,10 @@
3276	//ã¹ã±ã¸ã¥ã¼ã«ç·¨é
3277	function biz_editSchedule($title, $member_id, $begin_date, $finish_date, $begin_time = null, $finish_time = null,
3278	$value = '', $rep_type, $first_id = 0,
3279	- $join_members = array(), $join_shisetsu,
3280	+ $biz_group_id = 0, $public_flag = "public",
3281	$id)
3282	{
3283	- $sql = 'UPDATE `biz_schedule` SET `title` = ?,`c_member_id` = ?,`begin_date` = ?,`finish_date` = ?,`begin_time` = ?,`finish_time` = ?,`value` = ?,`rep_type` = ?,`rep_first` = ?,`is_read` = 0 WHERE `biz_schedule_id` = ?';
3284	+ $sql = 'UPDATE `biz_schedule` SET `title` = ?,`c_member_id` = ?,`begin_date` = ?,`finish_date` = ?,`begin_time` = ?,`finish_time` = ?,`value` = ?,`rep_type` = ?,`rep_first` = ?, `biz_group_id` = ?, `public_flag` = ?, `is_read` = 0 WHERE `biz_schedule_id` = ?';
3285	$params = array(
3286	$title,
3287	$member_id,
3288	@@ -781,24 +800,11 @@
3289	$value,
3290	$rep_type,
3291	$first_id,
3292	+ $biz_group_id,
3293	+ $public_flag,
3294	$id,
3295	);
3296	db_query($sql, $params);
3297	-
3298	- $sql = 'DELETE FROM `biz_schedule_member` WHERE `biz_schedule_id` = ?';
3299	- $params = array(
3300	- intval($id),
3301	- );
3302	- db_query($sql, $params);
3303	-
3304	- foreach ($join_members as $value) {
3305	- $data = array(
3306	- 'c_member_id' => $value,
3307	- 'biz_schedule_id' => intval($id),
3308	- 'is_read' => 0,
3309	- );
3310	- db_insert('biz_schedule_member', $data);
3311	- }
3312	}
3313
3314	//ã¹ã±ã¸ã¥ã¼ã«ãæ¢èªæ¸ã¿ã«
3315	@@ -903,6 +909,9 @@
3316	$params = array(
3317	intval($group_id),
3318	); $result = db_query($sql, $params);
3319	+
3320	+ $sql = 'UPDATE biz_schedule SET public_flag = "private", biz_group_id = NULL WHERE biz_group_id = ?';
3321	+ db_query($sql, array(intval($group_id)));
3322	}
3323
3324	//ã°ã«ã¼ãã«åå
3325	Index: webapp_biz/modules/biz/lib/smarty_functions.php
3326	===================================================================
3327	--- webapp_biz/modules/biz/lib/smarty_functions.php (.../2_5_5) (revision 1114)
3328	+++ webapp_biz/modules/biz/lib/smarty_functions.php (.../2_5_6) (revision 1114)
3329	@@ -46,7 +46,7 @@
3330	//GET---------------------------------------------
3331
3332	//ã¹ã±ã¸ã¥ã¼ã«ç¨ã«ã¬ã³ãã¼ãå¾ã
3333	-function biz_getScheduleWeek($member_id, $w, $cmd, $head = true, $value = true, $foot = true, $member_info = false)
3334	+function biz_getScheduleWeek($member_id, $u, $w, $cmd, $head = true, $value = true, $foot = true, $member_info = false)
3335	{
3336	if ($cmd != 'p') {
3337	//ãããã£ã¼ã«ç¢ºèªãã©ãã
3338	@@ -85,7 +85,7 @@
3339	$d_disp = sprintf("%2d",$Day->thisDay());
3340
3341	if ($cmd != 's_list') {
3342	- $schedule = biz_getDateMemberSchedule($y, $m, $d, $member_id);
3343	+ $schedule = biz_getDateMemberSchedule($y, $m, $d, $member_id, $u);
3344	$banner = biz_isBannerSchedule($y, $m, $d, $member_id);
3345
3346	if (!empty($banner)) {
3347	Index: webapp_biz/modules/biz/validate/do/fh_biz_schedule_edit.ini
3348	===================================================================
3349	--- webapp_biz/modules/biz/validate/do/fh_biz_schedule_edit.ini (.../2_5_5) (revision 1114)
3350	+++ webapp_biz/modules/biz/validate/do/fh_biz_schedule_edit.ini (.../2_5_6) (revision 1114)
3351	@@ -63,17 +63,13 @@
3352	required = 0
3353	capiton = "ã¡ã¢"
3354
3355	-[sc_j_mem]
3356	-type= "string"
3357	-is_array = 1
3358	-required = 0
3359	-capiton = "ã¡ã³ãã¼"
3360	+[biz_group_id]
3361	+type="int"
3362	+default=0
3363
3364	-[sc_j_plc]
3365	+[public_flag]
3366	type= "string"
3367	-is_array = 1
3368	-required = 0
3369	-capiton = "æ½è¨"
3370	+default="public"
3371
3372	[sc_rwk]
3373	type= "string"
3374	Index: webapp_biz/modules/biz/validate/do/fhg_biz_schedule_add.ini
3375	===================================================================
3376	--- webapp_biz/modules/biz/validate/do/fhg_biz_schedule_add.ini (.../2_5_5) (revision 1114)
3377	+++ webapp_biz/modules/biz/validate/do/fhg_biz_schedule_add.ini (.../2_5_6) (revision 1114)
3378	@@ -63,17 +63,13 @@
3379	required = 0
3380	capiton = "ã¡ã¢"
3381
3382	-[sc_j_mem]
3383	-type= "string"
3384	-is_array = 1
3385	-required = 0
3386	-capiton = "ã¡ã³ãã¼"
3387	+[biz_group_id]
3388	+type="int"
3389	+default=0
3390
3391	-[sc_j_plc]
3392	+[public_flag]
3393	type= "string"
3394	-is_array = 1
3395	-required = 0
3396	-capiton = "æ½è¨"
3397	+default="public"
3398
3399	[sc_rwk]
3400	type= "string"
3401	Index: webapp_biz/modules/biz/init.inc
3402	===================================================================
3403	--- webapp_biz/modules/biz/init.inc (.../2_5_5) (revision 1114)
3404	+++ webapp_biz/modules/biz/init.inc (.../2_5_6) (revision 1114)
3405	@@ -39,17 +39,7 @@
3406
3407	$is_secure = $GLOBALS['__Framework']['is_secure'];
3408
3409	- //---- inc_ ãã³ãã¬ã¼ãç¨ å¤æ° ----//
3410	- $smarty->assign('inc_html_header', fetch_inc_html_header());
3411	- $smarty->assign('inc_page_footer', fetch_inc_page_footer($is_secure));
3412	- $smarty->assign('inc_extension_pagelayout_top', p_common_c_siteadmin4target_pagename('inc_page_top'));
3413	- $smarty->assign('inc_extension_pagelayout_bottom', p_common_c_siteadmin4target_pagename('inc_page_bottom'));
3414	- $smarty->assign('inc_side_banner', db_banner_get_side_banner($is_secure));
3415	- $smarty->assign('side_banner_html_before', p_common_c_siteadmin4target_pagename('side_banner_html_before'));
3416	- $smarty->assign('side_banner_html_after', p_common_c_siteadmin4target_pagename('side_banner_html_after'));
3417	-
3418	if ($is_secure) {
3419	- $smarty->assign('inc_page_header', fetch_inc_page_header());
3420	@session_start();
3421	$smarty->assign('PHPSESSID', md5(session_id()));
3422	$smarty->assign('before_after', 'after');
3423	@@ -60,7 +50,38 @@
3424	$smarty->assign('before_after', 'before');
3425	}
3426
3427	+ // INC_HEADER_* (inc_header.tpl)
3428
3429	+ if (SNS_TITLE) {
3430	+ $title = SNS_TITLE;
3431	+ } else {
3432	+ $title = SNS_NAME;
3433	+ }
3434	+ $smarty->assign('INC_HEADER_title', $title);
3435	+ $smarty->assign('INC_HEADER_inc_html_head', p_common_c_siteadmin4target_pagename('inc_html_head'));
3436	+ $smarty->assign('INC_HEADER_inc_custom_css', p_common_c_siteadmin4target_pagename('inc_custom_css'));
3437	+ $smarty->assign('INC_HEADER_color_config', db_select_c_sns_config());
3438	+ $smarty->assign('INC_HEADER_top_banner', db_banner_get_top_banner($is_secure));
3439	+ if ($is_secure) {
3440	+ $smarty->assign('INC_HEADER_top_banner_html_after', p_common_c_siteadmin4target_pagename('top_banner_html_after'));
3441	+ $smarty->assign('INC_HEADER_global_navi', util_get_c_navi('global'));
3442	+ } else {
3443	+ $smarty->assign('INC_HEADER_top_banner_html_before', p_common_c_siteadmin4target_pagename('top_banner_html_before'));
3444	+ }
3445	+ $smarty->assign('INC_HEADER_inc_page_top', p_common_c_siteadmin4target_pagename('inc_page_top'));
3446	+
3447	+ // INC_FOOTER_* (inc_footer.tpl)
3448	+
3449	+ if ($is_secure) {
3450	+ $name = 'inc_page_footer_after';
3451	+ } else {
3452	+ $name = 'inc_page_footer_before';
3453	+ }
3454	+ $smarty->assign('INC_FOOTER_inc_page_footer', p_common_c_siteadmin4target_pagename($name));
3455	+ $smarty->assign('INC_FOOTER_inc_page_bottom', p_common_c_siteadmin4target_pagename('inc_page_bottom'));
3456	+ $smarty->assign('INC_FOOTER_inc_side_banner', db_banner_get_side_banner($is_secure));
3457	+ $smarty->assign('INC_FOOTER_side_banner_html_before', p_common_c_siteadmin4target_pagename('side_banner_html_before'));
3458	+ $smarty->assign('INC_FOOTER_side_banner_html_after', p_common_c_siteadmin4target_pagename('side_banner_html_after'));
3459	}
3460
3461	function init_biz_do()
3462	Index: webapp_biz/modules/biz/page/h_biz_todo_posted_list.php
3463	===================================================================
3464	--- webapp_biz/modules/biz/page/h_biz_todo_posted_list.php (.../2_5_5) (revision 1114)
3465	+++ webapp_biz/modules/biz/page/h_biz_todo_posted_list.php (.../2_5_6) (revision 1114)
3466	@@ -24,9 +24,7 @@
3467
3468	$lst = biz_getPostedTodo($u);
3469	$this->set("posted_list", $lst);
3470	- /*
3471	- $this->set("is_prev", $lst[1]);
3472	- $this->set("is_next", $lst[2]);*/
3473	+
3474	$this->set("total_num", count($lst));
3475
3476	$this->set("page", $page);
3477	Index: webapp_biz/modules/biz/page/h_biz_schedule_delete.php
3478	===================================================================
3479	--- webapp_biz/modules/biz/page/h_biz_schedule_delete.php (.../2_5_5) (revision 1114)
3480	+++ webapp_biz/modules/biz/page/h_biz_schedule_delete.php (.../2_5_6) (revision 1114)
3481	@@ -13,6 +13,11 @@
3482	$u = $GLOBALS['AUTH']->uid();
3483
3484	$this->set('inc_navi', fetch_inc_navi("h"));
3485	+ if (!biz_isPermissionSchedule($u, $requests['schedule_id'])) {
3486	+ handle_kengen_error();
3487	+ }
3488	+
3489	+ $this->set('inc_navi', fetch_inc_navi('h'));
3490	$this->set('schedule_id',$requests['schedule_id']);
3491	$this->set("is_rep", $requests['is_rep']);
3492
3493	Index: webapp_biz/modules/biz/page/h_biz_group_delete.php
3494	===================================================================
3495	--- webapp_biz/modules/biz/page/h_biz_group_delete.php (.../2_5_5) (revision 1114)
3496	+++ webapp_biz/modules/biz/page/h_biz_group_delete.php (.../2_5_6) (revision 1114)
3497	@@ -13,6 +13,7 @@
3498
3499	$id = $requests['target_id'];
3500	$this->set("target_id", $id);
3501	+ $this->set('inc_navi', fetch_inc_navi('h'));
3502
3503	return 'success';
3504	}
3505	Index: webapp_biz/modules/biz/page/s_list.php
3506	===================================================================
3507	--- webapp_biz/modules/biz/page/s_list.php (.../2_5_5) (revision 1114)
3508	+++ webapp_biz/modules/biz/page/s_list.php (.../2_5_6) (revision 1114)
3509	@@ -11,7 +11,6 @@
3510	$u = $GLOBALS['AUTH']->uid();
3511
3512	// --- ãªã¯ã¨ã¹ãå¤æ°
3513	- // ----------
3514
3515	$this->set("list", biz_getShisetsuList());
3516	//ã«ã¬ã³ãã¼è¡¨ç¤ºç¨
3517	@@ -59,7 +58,7 @@
3518
3519	$calendar = '';
3520	foreach ($list as $key => $value) {
3521	- $calendar .= biz_getScheduleWeek($value['biz_shisetsu_id'], $requests['w'], 's_list', true, true, true);
3522	+ $calendar .= biz_getScheduleWeek($value['biz_shisetsu_id'], $u, $requests['w'], 's_list', true, true, true);
3523	}
3524
3525	$this->set('calendar', $calendar);
3526	@@ -69,6 +68,7 @@
3527
3528	$config = biz_getConfig();
3529
3530	+ $this->set('inc_navi', fetch_inc_navi('h'));
3531	$this->set('is_closed_shisetsu', $config['IS_CLOSED_SHISETSU']);
3532
3533	return 'success';
3534	Index: webapp_biz/modules/biz/page/g_home.php
3535	===================================================================
3536	--- webapp_biz/modules/biz/page/g_home.php (.../2_5_5) (revision 1114)
3537	+++ webapp_biz/modules/biz/page/g_home.php (.../2_5_6) (revision 1114)
3538	@@ -16,14 +16,12 @@
3539	// ----------
3540	$group = biz_getGroupData($target_id);
3541
3542	- //ã³ãã¥ããã£ã®åå¨ã®æç¡
3543	if (!$group) {
3544	$p = array();
3545	openpne_redirect('pc', 'page_h_err_c_home', $p);
3546	exit;
3547	}
3548
3549	- //ã³ãã¥ããã£ããã
3550	$this->set("group", $group);
3551
3552	$member_list = biz_getGroupMember($target_id, 9);
3553	@@ -36,19 +34,20 @@
3554	$member_list_full[$key]['last_login'] = p_f_home_last_login4access_date($member_list_full[$key]['access_date']);
3555	}
3556
3557	- //ã³ãã¥ããã£ã¡ã³ãã¼
3558	+ $this->set('inc_navi', fetch_inc_navi('h'));
3559	+
3560	$this->set("member_list", $member_list);
3561	$this->set("member_count", count($member_list_full));
3562	$this->set("admin_data", db_common_c_member4c_member_id_LIGHT($group['admin_id']));
3563
3564	- $this->set('calendar_head', biz_getScheduleWeek($target_id, $requests['w'], 'g', ture, false, false));
3565	+ $this->set('calendar_head', biz_getScheduleWeek($target_id, $u, $requests['w'], 'g', ture, false, false));
3566
3567	foreach ($member_list_full as $key => $value) {
3568	- $calendar_value .= biz_getScheduleWeek($value['c_member_id'], $requests['w'], 'g', false, true, false, $value);
3569	+ $calendar_value .= biz_getScheduleWeek($value['c_member_id'], $u, $requests['w'], 'g', false, true, false, $value);
3570	}
3571
3572	$this->set('calendar_value', $calendar_value);
3573	- $this->set('calendar_foot', biz_getScheduleWeek($target_id, $requests['w'], 'g', false, false, true));
3574	+ $this->set('calendar_foot', biz_getScheduleWeek($target_id, $u, $requests['w'], 'g', false, false, true));
3575
3576	if ($u == $group['admin_id']) {
3577	$this->set("is_admin", true);
3578	Index: webapp_biz/modules/biz/page/s_edit_shisetsu.php
3579	===================================================================
3580	--- webapp_biz/modules/biz/page/s_edit_shisetsu.php (.../2_5_5) (revision 1114)
3581	+++ webapp_biz/modules/biz/page/s_edit_shisetsu.php (.../2_5_6) (revision 1114)
3582	@@ -18,6 +18,7 @@
3583	$this->set("id", $id);
3584	$config = biz_getConfig();
3585
3586	+ $this->set('inc_navi', fetch_inc_navi('h'));
3587	if ($config['IS_CLOSED_SHISETSU']) {
3588	$p = array('msg' => 'æ½è¨é¢é£ã®æä½ã¯ç¦æ¢ããã¦ãã¾ãã');
3589	openpne_redirect('biz', 'page_s_list', $p);
3590	Index: webapp_biz/modules/biz/page/s_delete_schedule.php
3591	===================================================================
3592	--- webapp_biz/modules/biz/page/s_delete_schedule.php (.../2_5_5) (revision 1114)
3593	+++ webapp_biz/modules/biz/page/s_delete_schedule.php (.../2_5_6) (revision 1114)
3594	@@ -11,6 +11,7 @@
3595	{
3596	$u = $GLOBALS['AUTH']->uid();
3597
3598	+ $this->set('inc_navi', fetch_inc_navi('h'));
3599	$this->set('target_id',$requests['target_id']);
3600
3601	return 'success';
3602	Index: webapp_biz/modules/biz/page/s_add_shisetsu.php
3603	===================================================================
3604	--- webapp_biz/modules/biz/page/s_add_shisetsu.php (.../2_5_5) (revision 1114)
3605	+++ webapp_biz/modules/biz/page/s_add_shisetsu.php (.../2_5_6) (revision 1114)
3606	@@ -10,6 +10,7 @@
3607	{
3608	$u = $GLOBALS['AUTH']->uid();
3609	$config = biz_getConfig();
3610	+ $this->set('inc_navi', fetch_inc_navi('h'));
3611
3612	if ($config['IS_CLOSED_SHISETSU']) {
3613	$p = array('msg' => 'æ½è¨é¢é£ã®æä½ã¯ç¦æ¢ããã¦ãã¾ãã');
3614	Index: webapp_biz/modules/biz/page/fh_biz_schedule_calendar.php
3615	===================================================================
3616	--- webapp_biz/modules/biz/page/fh_biz_schedule_calendar.php (.../2_5_5) (revision 1114)
3617	+++ webapp_biz/modules/biz/page/fh_biz_schedule_calendar.php (.../2_5_6) (revision 1114)
3618	@@ -60,7 +60,7 @@
3619	} else {
3620	$day = $Day->thisDay();
3621
3622	- $schedule = biz_getDateMemberSchedule($year, sprintf("%02d", $month), sprintf("%02d", $day), $target_id);
3623	+ $schedule = biz_getDateMemberSchedule($year, sprintf("%02d", $month), sprintf("%02d", $day), $target_id, $u);
3624	$banner = biz_isBannerSchedule($year, sprintf("%02d", $month), sprintf("%02d", $day), $target_id);
3625
3626	if (!empty($banner)) {
3627	Index: webapp_biz/modules/biz/page/fh_biz_schedule_view.php
3628	===================================================================
3629	--- webapp_biz/modules/biz/page/fh_biz_schedule_view.php (.../2_5_5) (revision 1114)
3630	+++ webapp_biz/modules/biz/page/fh_biz_schedule_view.php (.../2_5_6) (revision 1114)
3631	@@ -10,6 +10,10 @@
3632	{
3633	$u = $GLOBALS['AUTH']->uid();
3634
3635	+ if (!biz_isPermissionSchedule($u, $requests['id'])) {
3636	+ handle_kengen_error();
3637	+ }
3638	+
3639	$form_val['subject'] = $requests['subject'];
3640	$form_val['body'] = $requests['body'];
3641
3642	@@ -66,18 +70,12 @@
3643	$list['writer_name'] = biz_getMemberNickname($list['c_member_id']);
3644	$list['begin_time'] = substr($list['begin_time'], 0, 5);
3645	$list['finish_time'] = substr($list['finish_time'], 0, 5);
3646	-
3647	- $jmembers = biz_getJoinMemberSchedule($requests['id']);
3648	- if (array_search($target_member['nickname'], $jmembers)) {
3649	- $jmembers[$target_member['c_member_id']] = $target_member['nickname'];
3650	+ if($list['biz_group_id']) {
3651	+ $biz_group = biz_getGroupData($list['biz_group_id']);
3652	+ $list['biz_group_name'] = $biz_group['name'];
3653	}
3654	- $jshisetsu = biz_getJoinShisetsuSchedule($requests['id']);
3655
3656	$this->set('schedule', $list);
3657	- $this->set('jmembers', $jmembers);
3658	- $this->set('jmembers_enc', serialize($jmembers));
3659	- $this->set('jshisetsu', $jshisetsu);
3660	- $this->set('jshisetsu_enc', serialize($jshisetsu));
3661	$this->set('schedule_id', $requests['id']);
3662	$this->set('w', $requests['w']);
3663	$this->set('is_h', true);
3664	Index: webapp_biz/modules/biz/page/g_member_list.php
3665	===================================================================
3666	--- webapp_biz/modules/biz/page/g_member_list.php (.../2_5_5) (revision 1114)
3667	+++ webapp_biz/modules/biz/page/g_member_list.php (.../2_5_6) (revision 1114)
3668	@@ -35,10 +35,6 @@
3669	//æ¬¡ãã¼ã¸ã¸ã®ã¤ã³ã¯ãªã¡ã³ã
3670	$page += $direc;
3671
3672	- //ã³ãã¥ããã£ã¡ã³ããªã¹ã
3673	- //$list = p_c_member_list_c_members4c_commu_id($target_c_commu_id, $page_size, $page);
3674	-/* list($c_member_list, $is_prev, $is_next, $total_num, $start_num, $end_num)
3675	- = p_c_member_list_c_members4c_commu_id($target_c_commu_id, $page_size, $page);*/
3676
3677	$c_member_list = biz_getGroupMember($target_c_commu_id, $page_size, $start);
3678
3679	@@ -48,9 +44,9 @@
3680
3681	$total_num = count(biz_getGroupMember($target_c_commu_id));
3682
3683	+ $this->set('inc_navi', fetch_inc_navi('h'));
3684	+
3685	$this->set("c_member_list", $c_member_list);
3686	-// $this->set("is_prev", $is_prev);
3687	-// $this->set("is_next", $is_next);
3688	$this->set("page", $page);
3689	$this->set("total_num", $total_num);
3690	$this->set('start_num', $start);
3691	Index: webapp_biz/modules/biz/page/s_view_schedule.php
3692	===================================================================
3693	--- webapp_biz/modules/biz/page/s_view_schedule.php (.../2_5_5) (revision 1114)
3694	+++ webapp_biz/modules/biz/page/s_view_schedule.php (.../2_5_6) (revision 1114)
3695	@@ -19,6 +19,7 @@
3696	$list = biz_getShisetsuData($shisetsu_id);
3697	$schedule = biz_getShisetsuScheduleID($id);
3698
3699	+ $this->set('inc_navi', fetch_inc_navi('h'));
3700	$this->set("list", $list);
3701	$this->set('schedule', $schedule);
3702	$this->set("id", $id);
3703	Index: webapp_biz/modules/biz/page/s_delete_shisetsu.php
3704	===================================================================
3705	--- webapp_biz/modules/biz/page/s_delete_shisetsu.php (.../2_5_5) (revision 1114)
3706	+++ webapp_biz/modules/biz/page/s_delete_shisetsu.php (.../2_5_6) (revision 1114)
3707	@@ -15,6 +15,7 @@
3708	$this->set('target_id',$requests['target_id']);
3709	$config = biz_getConfig();
3710
3711	+ $this->set('inc_navi', fetch_inc_navi('h'));
3712	if ($config['IS_CLOSED_SHISETSU']) {
3713	$p = array('msg' => 'æ½è¨é¢é£ã®æä½ã¯ç¦æ¢ããã¦ãã¾ãã');
3714	openpne_redirect('biz', 'page_s_list', $p);
3715	Index: webapp_biz/modules/biz/page/h_biz_group_edit.php
3716	===================================================================
3717	--- webapp_biz/modules/biz/page/h_biz_group_edit.php (.../2_5_5) (revision 1114)
3718	+++ webapp_biz/modules/biz/page/h_biz_group_edit.php (.../2_5_6) (revision 1114)
3719	@@ -41,6 +41,7 @@
3720	$members[$key]['joined'] = false;
3721	}
3722	}
3723	+ $this->set('inc_navi', fetch_inc_navi('h'));
3724	$this->set("c_invite_list", $members);
3725	$this->set("group", $group);
3726	$this->set("c_member_id", $u);
3727	Index: webapp_biz/modules/biz/page/h_biz_group_add.php
3728	===================================================================
3729	--- webapp_biz/modules/biz/page/h_biz_group_add.php (.../2_5_5) (revision 1114)
3730	+++ webapp_biz/modules/biz/page/h_biz_group_add.php (.../2_5_6) (revision 1114)
3731	@@ -25,6 +25,8 @@
3732
3733	array_unshift($members, $my_info);
3734
3735	+ $this->set('inc_navi', fetch_inc_navi('h'));
3736	+
3737	$this->set("c_invite_list", $members);
3738	$this->set("c_member_id", $u);
3739
3740	Index: webapp_biz/modules/biz/page/g_join_group.php
3741	===================================================================
3742	--- webapp_biz/modules/biz/page/g_join_group.php (.../2_5_5) (revision 1114)
3743	+++ webapp_biz/modules/biz/page/g_join_group.php (.../2_5_6) (revision 1114)
3744	@@ -12,30 +12,8 @@
3745
3746	// --- ãªã¯ã¨ã¹ãå¤æ°
3747	$target_id = $requests['target_id'];
3748	- // ----------
3749
3750	-/* $status = do_common_get_c_join_status($u, $target_id);
3751	- switch($status){
3752	- //æ¿èªå¿è¦ãªã
3753	- case STATUS_C_JOIN_REQUEST_FREE:
3754	- break;
3755	-
3756	- //ç®¡çèæ¿èªå¿è¦
3757	- case STATUS_C_JOIN_REQUEST_NEED:
3758	- client_redirect_absolute("page.php?p=c_join_request&target_c_commu_id=$target_c_commu_id");
3759	- exit;
3760	-
3761	- //æ¿èªå¾ã¡
3762	- case STATUS_C_JOIN_WAIT:
3763	- client_redirect_absolute("page.php?p=c_join_err_wait&target_c_commu_id=$target_c_commu_id");
3764	- exit;
3765	-
3766	- //æ¢ã«åå
3767	- case STATUS_C_JOIN_ALREADY:
3768	- client_redirect_absolute("page.php?p=c_join_err_already&target_c_commu_id=$target_c_commu_id");
3769	- exit;
3770	- }*/
3771	-
3772	+ $this->set('inc_navi', fetch_inc_navi('h'));
3773	$this->set('group', biz_getGroupData($target_id));
3774
3775	return 'success';
3776	Index: webapp_biz/modules/biz/page/fh_biz_schedule_edit.php
3777	===================================================================
3778	--- webapp_biz/modules/biz/page/fh_biz_schedule_edit.php (.../2_5_5) (revision 1114)
3779	+++ webapp_biz/modules/biz/page/fh_biz_schedule_edit.php (.../2_5_6) (revision 1114)
3780	@@ -11,11 +11,17 @@
3781
3782	$u = $GLOBALS['AUTH']->uid();
3783
3784	+ if (!biz_isPermissionSchedule($u, $requests['schedule_id'])) {
3785	+ handle_kengen_error();
3786	+ }
3787	+
3788	$form_val['subject'] = $requests['subject'];
3789	$form_val['body'] = $requests['body'];
3790
3791	$sessid = session_id();
3792
3793	+ $schedule = biz_getScheduleInfo($requests['schedule_id']);
3794	+
3795	if (empty($requests['target_id']) \|\| ($requests['target_id'] == $u)) {
3796	//èªåèªèº«
3797	$target_id = $u;
3798	@@ -159,45 +165,8 @@
3799	$this->set('rep_type', $dayofweek);
3800	$this->set('is_rep', $is_rep);
3801
3802	- $j_members = array_keys(unserialize($requests['members']));
3803	- sort($j_members);
3804	-
3805	- $this->set('j_members', $j_members);
3806	-
3807	$this->set('schedule_id', $requests['schedule_id']);
3808
3809	- //è¿½å
3810	- $members = array();
3811	-
3812	- $sql = 'SELECT c_member_id, nickname FROM c_member WHERE c_member_id <> ?';
3813	-
3814	- $params = array(
3815	- intval($target_id),
3816	- );
3817	- $members = db_get_all($sql, $params);
3818	-
3819	- $sql = 'SELECT c_member_id, nickname FROM c_member WHERE c_member_id = ?';
3820	- $params = array(
3821	- intval($target_id),
3822	- );
3823	- $my_info = db_get_row($sql, $params);
3824	- array_unshift($members, $my_info);
3825	- $i = 0;
3826	-
3827	- foreach ($members as $key => $value) {
3828	- if ($j_members[$i] == $value['c_member_id']) {
3829	- $members[$key]['checkflag'] = 1;
3830	- $i++;
3831	- }
3832	-
3833	- if (count($j_members) < $i) {
3834	- break;
3835	- }
3836	- }
3837	-
3838	- $members[0]['checkflag'] = 1;
3839	- $this->set('members', $members);
3840	-
3841	$repeat_begin = biz_getRepeatBegin($requests['schedule_id']);
3842	$repeat_finish = biz_getRepeatFinish($requests['schedule_id']);
3843	$repeat_term = strtotime($repeat_finish) - strtotime($repeat_begin);
3844	@@ -207,6 +176,14 @@
3845	$this->set('repeat_begin_date', $repeat_begin);
3846	$this->set('repeat_term', intval($daycount));
3847
3848	+ $biz_group_count = biz_getGroupCount($target_id);
3849	+ $biz_group_list = biz_getJoinGroupList($target_id, 1, $biz_group_count);
3850	+
3851	+ $this->set('biz_group_list', $biz_group_list[0]);
3852	+ $this->set('target_biz_group_id', $schedule['biz_group_id']);
3853	+
3854	+ $this->set('public_flag', $schedule['public_flag']);
3855	+
3856	return 'success';
3857	}
3858	}
3859	Index: webapp_biz/modules/biz/page/fh_biz_schedule_add.php
3860	===================================================================
3861	--- webapp_biz/modules/biz/page/fh_biz_schedule_add.php (.../2_5_5) (revision 1114)
3862	+++ webapp_biz/modules/biz/page/fh_biz_schedule_add.php (.../2_5_6) (revision 1114)
3863	@@ -125,35 +125,11 @@
3864	$this->set('my_id', $u);
3865	$this->set('is_h', true);
3866
3867	- //è¿½å
3868	- $members = array();
3869	+ $biz_group_count = biz_getGroupCount($target_id);
3870	+ $biz_group_list = biz_getJoinGroupList($target_id, 1, $biz_group_count);
3871
3872	- $sql = 'SELECT c_member_id, nickname FROM c_member WHERE c_member_id != '.$target_id;
3873	- $members = db_get_all($sql);
3874	+ $this->set('biz_group_list', $biz_group_list[0]);
3875
3876	- $sql = 'SELECT c_member_id, nickname FROM c_member WHERE c_member_id = '.$target_id;
3877	- $my_info = db_get_row($sql);
3878	-
3879	- array_unshift($members, $my_info);
3880	-
3881	- $members[0]['checkflag'] = 1;
3882	-
3883	- $jmembers = unserialize($requests['sc_j_mem_enc']);
3884	-
3885	- $i = 0;
3886	-
3887	- foreach ($members as $key => $value) {
3888	- if ($jmembers[$i] == $value['c_member_id']) {
3889	- $members[$key]['checkflag'] = 1;
3890	- $i++;
3891	- }
3892	-
3893	- if (count($jmembers) < $i) {
3894	- break;
3895	- }
3896	- }
3897	- $this->set('members', $members);
3898	-
3899	return 'success';
3900	}
3901	}
3902	Index: webapp_biz/modules/biz/templates/inc_header.tpl
3903	===================================================================
3904	--- webapp_biz/modules/biz/templates/inc_header.tpl (.../2_5_5) (revision 0)
3905	+++ webapp_biz/modules/biz/templates/inc_header.tpl (.../2_5_6) (revision 1114)
3906	@@ -0,0 +1,492 @@
3907	+({***************************************})
3908	+({ããããï¼æ§inc_html_header.tplã®åå®¹})
3909	+({***************************************})
3910	+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
3911	+<html>
3912	+<head>
3913	+<meta http-equiv="Pragma" content="no-cache">
3914	+<meta http-equiv="Cache-Control" content="no-cache">
3915	+<meta http-equiv="Expires" content="Thu, 01 Dec 1994 16:00:00 GMT">
3916	+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
3917	+<meta http-equiv="Content-Style-Type" content="text/css">
3918	+<title>({$INC_HEADER_title})</title>
3919	+({if $smarty.const.SKIN_VERSION=='1.8'})
3920	+<link rel="stylesheet" href="./css/default_1_8.css?v=2.2.5" type="text/css">
3921	+({else})
3922	+<link rel="stylesheet" href="./css/default.css?v=2.2.5" type="text/css">
3923	+({/if})
3924	+<style type="text/css">
3925	+<!--
3926	+/æ ç·è¦ç´ /
3927	+.border_00 { border: #({$INC_HEADER_color_config.border_00}) 1px solid ; }
3928	+.border_01 { border: #({$INC_HEADER_color_config.border_01}) 1px solid ; }
3929	+.border_02 { border: #({$INC_HEADER_color_config.border_02}) 1px solid ; }
3930	+.border_03 { border: #({$INC_HEADER_color_config.border_03}) 1px solid ; }
3931	+.border_04 { border: #({$INC_HEADER_color_config.border_04}) 1px solid ; }
3932	+.border_05 { border: #({$INC_HEADER_color_config.border_05}) 1px solid ; }
3933	+.border_06 { border: #({$INC_HEADER_color_config.border_06}) 1px solid ; }
3934	+.border_07 { border: #({$INC_HEADER_color_config.border_07}) 1px solid ; }
3935	+.border_08 { border: #({$INC_HEADER_color_config.border_08}) 1px solid ; }
3936	+.border_09 { border: #({$INC_HEADER_color_config.border_09}) 1px solid ; }
3937	+.border_10 { border: #({$INC_HEADER_color_config.border_10}) 1px solid ; }
3938	+
3939	+/èæ¯è¦ç´ /
3940	+.bg_00 { background-color: #({$INC_HEADER_color_config.bg_00}) ; }
3941	+.bg_01 { background-color: #({$INC_HEADER_color_config.bg_01}) ; }
3942	+.bg_02 { background-color: #({$INC_HEADER_color_config.bg_02}) ; }
3943	+.bg_03 { background-color: #({$INC_HEADER_color_config.bg_03}) ; }
3944	+.bg_04 { background-color: #({$INC_HEADER_color_config.bg_04}) ; }
3945	+.bg_05 { background-color: #({$INC_HEADER_color_config.bg_05}) ; }
3946	+.bg_06 { background-color: #({$INC_HEADER_color_config.bg_06}) ; }
3947	+.bg_07 { background-color: #({$INC_HEADER_color_config.bg_07}) ; }
3948	+.bg_08 { background-color: #({$INC_HEADER_color_config.bg_08}) ; }
3949	+.bg_09 { background-color: #({$INC_HEADER_color_config.bg_09}) ; }
3950	+.bg_10 { background-color: #({$INC_HEADER_color_config.bg_10}) ; }
3951	+.bg_11 { background-color: #({$INC_HEADER_color_config.bg_11}) ; }
3952	+.bg_12 { background-color: #({$INC_HEADER_color_config.bg_12}) ; }
3953	+.bg_13 { background-color: #({$INC_HEADER_color_config.bg_13}) ; }
3954	+
3955	+body { background-color: #({$INC_HEADER_color_config.bg_12}) ; }
3956	+.container { background-color: #({$INC_HEADER_color_config.bg_13}) ; }
3957	+
3958	+.arrow_1 {
3959	+ width: 17px ;
3960	+ height: 14px ;
3961	+ background: url(({t_img_url_skin filename=icon_arrow_1})) 0% 100% no-repeat ;
3962	+}
3963	+.icon_1 {
3964	+ width: 14px ;
3965	+ height: 14px ;
3966	+ background: url(({t_img_url_skin filename=icon_1})) 50% 70% no-repeat ;
3967	+}
3968	+.icon_2 {
3969	+ width: 14px ;
3970	+ height: 14px ;
3971	+ background: url(({t_img_url_skin filename=icon_2})) 50% 70% no-repeat ;
3972	+}
3973	+.icon_3 {
3974	+ width: 14px ;
3975	+ height: 14px ;
3976	+ background: url(({t_img_url_skin filename=icon_3})) 50% 70% no-repeat ;
3977	+}
3978	+
3979	+* { font-family: "ï¼ï¼³ ï¼°ã´ã·ãã¯", "ãã©ã®ãè§ã´ Pro W3", Osaka, sans-serif ; }
3980	+
3981	+/ãã¿ã³ã«å¯¾ããèæ¯ç»åã®æå®/
3982	+input.submit {
3983	+ background: #DADCE6 url(({t_img_url_skin filename=bg_button})) 50% 0 repeat-x ;
3984	+}
3985	+
3986	+({if $smarty.const.OPENPNE_ENABLE_ROLLOVER})
3987	+/ãã¼ã¸ããããã¼ã«ãªã¼ãã¼è¨å®/
3988	+div.inc_page_header div.navi_global a.navi_global_1:active ,
3989	+div.inc_page_header div.navi_global a.navi_global_1:hover {
3990	+ background: url(({t_img_url_skin filename=skin_after_header_2})) 0 -70px no-repeat ;
3991	+}
3992	+
3993	+div.inc_page_header div.navi_global a.navi_global_2:active ,
3994	+div.inc_page_header div.navi_global a.navi_global_2:hover {
3995	+ background: url(({t_img_url_skin filename=skin_after_header_2})) -90px -70px no-repeat ;
3996	+}
3997	+
3998	+div.inc_page_header div.navi_global a.navi_global_3:active ,
3999	+div.inc_page_header div.navi_global a.navi_global_3:hover {
4000	+ background: url(({t_img_url_skin filename=skin_after_header_2})) -180px -70px no-repeat ;
4001	+}
4002	+
4003	+div.inc_page_header div.navi_global a.navi_global_4:active ,
4004	+div.inc_page_header div.navi_global a.navi_global_4:hover {
4005	+ background: url(({t_img_url_skin filename=skin_after_header_2})) -288px -70px no-repeat ;
4006	+}
4007	+
4008	+div.inc_page_header div.navi_global a.navi_global_5:active ,
4009	+div.inc_page_header div.navi_global a.navi_global_5:hover {
4010	+ background: url(({t_img_url_skin filename=skin_after_header_2})) -360px -70px no-repeat ;
4011	+}
4012	+
4013	+div.inc_page_header div.navi_global a.navi_global_6:active ,
4014	+div.inc_page_header div.navi_global a.navi_global_6:hover {
4015	+ background: url(({t_img_url_skin filename=skin_after_header_2})) -432px -70px no-repeat ;
4016	+}
4017	+
4018	+div.inc_page_header div.navi_global a.navi_global_7:active ,
4019	+div.inc_page_header div.navi_global a.navi_global_7:hover {
4020	+ background: url(({t_img_url_skin filename=skin_after_header_2})) -504px -70px no-repeat ;
4021	+}
4022	+
4023	+div.inc_page_header div.navi_global a.navi_global_8:active ,
4024	+div.inc_page_header div.navi_global a.navi_global_8:hover {
4025	+ background: url(({t_img_url_skin filename=skin_after_header_2})) -576px -70px no-repeat ;
4026	+}
4027	+
4028	+div.inc_page_header div.navi_global a.navi_global_9:active ,
4029	+div.inc_page_header div.navi_global a.navi_global_9:hover {
4030	+ background: url(({t_img_url_skin filename=skin_after_header_2})) -648px -70px no-repeat ;
4031	+}
4032	+
4033	+/hç³»ãããã¼ã«ãªã¼ãã¼è¨å®/
4034	+.inc_navi div.h a.navi_h_1:active ,
4035	+.inc_navi div.h a.navi_h_1:hover {
4036	+ background: url(({t_img_url_skin filename=skin_navi_h_2})) 0 0 no-repeat ;
4037	+}
4038	+
4039	+.inc_navi div.h a.navi_h_2:active ,
4040	+.inc_navi div.h a.navi_h_2:hover {
4041	+ background: url(({t_img_url_skin filename=skin_navi_h_2})) -80px 0 no-repeat ;
4042	+}
4043	+
4044	+.inc_navi div.h a.navi_h_3:active ,
4045	+.inc_navi div.h a.navi_h_3:hover {
4046	+ background: url(({t_img_url_skin filename=skin_navi_h_2})) -160px 0 no-repeat ;
4047	+}
4048	+
4049	+.inc_navi div.h a.navi_h_4:active ,
4050	+.inc_navi div.h a.navi_h_4:hover {
4051	+ background: url(({t_img_url_skin filename=skin_navi_h_2})) -240px 0 no-repeat ;
4052	+}
4053	+
4054	+.inc_navi div.h a.navi_h_5:active ,
4055	+.inc_navi div.h a.navi_h_5:hover {
4056	+ background: url(({t_img_url_skin filename=skin_navi_h_2})) -320px 0 no-repeat ;
4057	+}
4058	+
4059	+.inc_navi div.h a.navi_h_6:active ,
4060	+.inc_navi div.h a.navi_h_6:hover {
4061	+ background: url(({t_img_url_skin filename=skin_navi_h_2})) -400px 0 no-repeat ;
4062	+}
4063	+
4064	+.inc_navi div.h a.navi_h_7:active ,
4065	+.inc_navi div.h a.navi_h_7:hover {
4066	+ background: url(({t_img_url_skin filename=skin_navi_h_2})) -480px 0 no-repeat ;
4067	+}
4068	+
4069	+.inc_navi div.h a.navi_h_8:active ,
4070	+.inc_navi div.h a.navi_h_8:hover {
4071	+ background: url(({t_img_url_skin filename=skin_navi_h_2})) -560px 0 no-repeat ;
4072	+}
4073	+
4074	+.inc_navi div.h a.navi_h_9:active ,
4075	+.inc_navi div.h a.navi_h_9:hover {
4076	+ background: url(({t_img_url_skin filename=skin_navi_h_2})) -640px 0 no-repeat ;
4077	+}
4078	+
4079	+/fç³»ãããã¼ã«ãªã¼ãã¼è¨å®/
4080	+.inc_navi div.f a.navi_f_1:active ,
4081	+.inc_navi div.f a.navi_f_1:hover {
4082	+ background: url(({t_img_url_skin filename=skin_navi_f_2})) 0 0 no-repeat ;
4083	+}
4084	+
4085	+.inc_navi div.f a.navi_f_2:active ,
4086	+.inc_navi div.f a.navi_f_2:hover {
4087	+ background: url(({t_img_url_skin filename=skin_navi_f_2})) -80px 0 no-repeat ;
4088	+}
4089	+
4090	+.inc_navi div.f a.navi_f_3:active ,
4091	+.inc_navi div.f a.navi_f_3:hover {
4092	+ background: url(({t_img_url_skin filename=skin_navi_f_2})) -160px 0 no-repeat ;
4093	+}
4094	+
4095	+.inc_navi div.f a.navi_f_4:active ,
4096	+.inc_navi div.f a.navi_f_4:hover {
4097	+ background: url(({t_img_url_skin filename=skin_navi_f_2})) -240px 0 no-repeat ;
4098	+}
4099	+
4100	+.inc_navi div.f a.navi_f_5:active ,
4101	+.inc_navi div.f a.navi_f_5:hover {
4102	+ background: url(({t_img_url_skin filename=skin_navi_f_2})) -320px 0 no-repeat ;
4103	+}
4104	+
4105	+.inc_navi div.f a.navi_f_6:active ,
4106	+.inc_navi div.f a.navi_f_6:hover {
4107	+ background: url(({t_img_url_skin filename=skin_navi_f_2})) -400px 0 no-repeat ;
4108	+}
4109	+
4110	+.inc_navi div.f a.navi_f_7:active ,
4111	+.inc_navi div.f a.navi_f_7:hover {
4112	+ background: url(({t_img_url_skin filename=skin_navi_f_2})) -480px 0 no-repeat ;
4113	+}
4114	+
4115	+.inc_navi div.f a.navi_f_8:active ,
4116	+.inc_navi div.f a.navi_f_8:hover {
4117	+ background: url(({t_img_url_skin filename=skin_navi_f_2})) -560px 0 no-repeat ;
4118	+}
4119	+
4120	+.inc_navi div.f a.navi_f_9:active ,
4121	+.inc_navi div.f a.navi_f_9:hover {
4122	+ background: url(({t_img_url_skin filename=skin_navi_f_2})) -640px 0 no-repeat ;
4123	+}
4124	+
4125	+/cç³»ãããã¼ã«ãªã¼ãã¼è¨å®/
4126	+.inc_navi div.c a.navi_c_1:active ,
4127	+.inc_navi div.c a.navi_c_1:hover {
4128	+ background: url(({t_img_url_skin filename=skin_navi_c_2})) 0 0 no-repeat ;
4129	+}
4130	+
4131	+.inc_navi div.c a.navi_c_2:active ,
4132	+.inc_navi div.c a.navi_c_2:hover {
4133	+ background: url(({t_img_url_skin filename=skin_navi_c_2})) -120px 0 no-repeat ;
4134	+}
4135	+
4136	+.inc_navi div.c a.navi_c_3:active ,
4137	+.inc_navi div.c a.navi_c_3:hover {
4138	+ background: url(({t_img_url_skin filename=skin_navi_c_2})) -240px 0 no-repeat ;
4139	+}
4140	+
4141	+.inc_navi div.c a.navi_c_4:active ,
4142	+.inc_navi div.c a.navi_c_4:hover {
4143	+ background: url(({t_img_url_skin filename=skin_navi_c_2})) -360px 0 no-repeat ;
4144	+}
4145	+
4146	+.inc_navi div.c a.navi_c_5:active ,
4147	+.inc_navi div.c a.navi_c_5:hover {
4148	+ background: url(({t_img_url_skin filename=skin_navi_c_2})) -480px 0 no-repeat ;
4149	+}
4150	+
4151	+.inc_navi div.c a.navi_c_6:active ,
4152	+.inc_navi div.c a.navi_c_6:hover {
4153	+ background: url(({t_img_url_skin filename=skin_navi_c_2})) -600px 0 no-repeat ;
4154	+}
4155	+({/if})
4156	+
4157	+({$INC_HEADER_inc_custom_css\|smarty:nodefaults})
4158	+
4159	+-->
4160	+</style>
4161	+({$INC_HEADER_inc_html_head\|smarty:nodefaults})
4162	+</head>
4163	+({***************************************})
4164	+({ããã¾ã§ï¼æ§inc_html_header.tplã®åå®¹})
4165	+({***************************************})
4166	+
4167	+({if $smarty.const.OPENPNE_USE_COMMU_MAP && $c_commu.is_display_map})
4168	+<script src="http://maps.google.co.jp/maps?file=api&v=2&key=({$smarty.const.GOOGLE_MAPS_API_KEY})" type="text/javascript"></script>
4169	+<script type="text/javascript">
4170	+<!--
4171	+function load() {
4172	+ if (GBrowserIsCompatible()) {
4173	+ var point = new GLatLng(({$c_commu.map_latitude}), ({$c_commu.map_longitude}));
4174	+ var zoom = ({$c_commu.map_zoom});
4175	+ var html = '<div><img src="({t_img_url filename=$c_commu.image_filename w=120 h=120 noimg=no_logo})" width="60" height="60" align="left" hspace="5">({$c_commu.name})</div>';
4176	+
4177	+ var map = new GMap2(document.getElementById("map"));
4178	+ map.addControl(new GSmallMapControl());
4179	+ map.addControl(new GMapTypeControl());
4180	+ map.setCenter(point, zoom);
4181	+
4182	+ var marker = new GMarker(point);
4183	+ map.addOverlay(marker);
4184	+ GEvent.addListener(marker, "click", function() {
4185	+ marker.openInfoWindowHtml(html);
4186	+ });
4187	+ }
4188	+}
4189	+//-->
4190	+</script>
4191	+<body onLoad="load()" onUnload="GUnload()" class="({$INC_HEADER_type})">
4192	+({else})
4193	+<body class="({$INC_HEADER_type})">
4194	+({/if})
4195	+<div align="left">
4196	+
4197	+<table class="ext_sub_container" border="0" cellspacing="0" cellpadding="0">
4198	+<tr>
4199	+<td class="ext_sub_container_left" align="left" valign="top">
4200	+
4201	+({$INC_HEADER_inc_page_top\|smarty:nodefaults})
4202	+<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
4203	+<tr>
4204	+<td class="container inc_page_header">
4205	+
4206	+({if !$INC_HEADER_is_login})
4207	+({***************************************})
4208	+({ããããï¼æ§inc_page_header.tplã®åå®¹})
4209	+({***************************************})
4210	+({* before_login / after_login *})
4211	+<div class="w_screen inc_page_header ({$before_after})_login">
4212	+
4213	+({* skin_before_header / skin_after_header *})
4214	+({* bg_before / bg_after *})
4215	+<img src="({t_img_url_skin filename=skin_`$before_after`_header})" class="bg_({$before_after})">
4216	+
4217	+({if $INC_HEADER_top_banner_html_before \|\| $INC_HEADER_top_banner_html_after})
4218	+<div class="banner">
4219	+({if $before_after == 'before'})
4220	+({$INC_HEADER_top_banner_html_before\|smarty:nodefaults})
4221	+({else})
4222	+({$INC_HEADER_top_banner_html_after\|smarty:nodefaults})
4223	+({/if})
4224	+</div>
4225	+({elseif $INC_HEADER_top_banner.c_banner_id})
4226	+<div class="banner">
4227	+({strip})
4228	+({if $INC_HEADER_top_banner.a_href})
4229	+ ({if $before_after == "before"})
4230	+ <a href="({t_url m=pc a=do_o_click_banner})&target_c_banner_id=({$INC_HEADER_top_banner.c_banner_id})" target="_blank">
4231	+ ({else})
4232	+ <a href="({t_url m=pc a=do_h_click_banner})&target_c_banner_id=({$INC_HEADER_top_banner.c_banner_id})&sessid=({$PHPSESSID})" target="_blank">
4233	+ ({/if})
4234	+ <img src="({t_img_url filename=$INC_HEADER_top_banner.image_filename})">
4235	+ </a>
4236	+({else})
4237	+ <img src="({t_img_url filename=$INC_HEADER_top_banner.image_filename})">
4238	+({/if})
4239	+({/strip})
4240	+</div>
4241	+({/if})
4242	+
4243	+<a class="logo_home" href="({t_url})"><img src="./skin/dummy.gif" alt="({$smarty.const.SNS_NAME})"></a>
4244	+
4245	+({if $before_after == "after"})
4246	+<div class="navi_global">
4247	+({foreach from=$INC_HEADER_global_navi key=key item=item})
4248	+({if $item.url})
4249	+<a class="navi_global_({$key+1})" href="({$item.url})"><img src="./skin/dummy.gif" alt="({$item.caption})"></a>
4250	+({/if})
4251	+({/foreach})
4252	+<a class="navi_global_9" href="({t_url m=pc a=do_inc_page_header_logout})&sessid=({$PHPSESSID})"><img src="./skin/dummy.gif" alt="ãã°ã¢ã¦ã"></a>
4253	+</div>
4254	+({/if})
4255	+
4256	+</div>
4257	+({***************************************})
4258	+({ããã¾ã§ï¼æ§inc_page_header.tplã®åå®¹})
4259	+({***************************************})
4260	+
4261	+</td>
4262	+</tr>
4263	+({if $inc_entry_point[1]})
4264	+<tr>
4265	+<td class="container">
4266	+({$inc_entry_point[1]\|smarty:nodefaults})
4267	+</td>
4268	+</tr>
4269	+({/if})
4270	+({if $inc_navi})
4271	+<tr>
4272	+<td class="container inc_navi">
4273	+({$inc_navi\|smarty:nodefaults})
4274	+</td>
4275	+</tr>
4276	+({/if})
4277	+({if $inc_entry_point[2]})
4278	+<tr>
4279	+<td class="container">
4280	+({$inc_entry_point[2]\|smarty:nodefaults})
4281	+</td>
4282	+</tr>
4283	+({/if})
4284	+({if !$no_use_alert && $msg})
4285	+<tr>
4286	+<td class="container main_content" align="center">
4287	+
4288	+({*************************************})
4289	+({ããããï¼æ§inc_alert_box.tplã®åå®¹})
4290	+({*************************************})
4291	+({if $msg \|\| $msg1 \|\| $msg2 \|\| $msg3 \|\| $err_msg})
4292	+<img src="./skin/dummy.gif" class="v_spacer_l">
4293	+
4294	+<!-- ************************* -->
4295	+<!-- ****ããããï¼è¦å**** -->
4296	+<table border="0" cellspacing="0" cellpadding="0" style="width:({if $width})({$width})({else})580({/if})px;margin:0px auto;" class="border_07">
4297	+<tr>
4298	+<td style="width:7px;" class="bg_00"><img src="./skin/dummy.gif" style="width:7px;height:7px;" class="dummy"></td>
4299	+<td style="width:({if $width})({$width-14})({else})566({/if})px;" class="bg_00"><img src="./skin/dummy.gif" style="width:7px;height:7px;" class="dummy"></td>
4300	+<td style="width:7px;" class="bg_00"><img src="./skin/dummy.gif" style="width:7px;height:7px;" class="dummy"></td>
4301	+</tr>
4302	+<tr>
4303	+<td class="bg_00"><img src="./skin/dummy.gif" style="width:7px;height:7px;" class="dummy"></td>
4304	+<td class="bg_01" align="center">
4305	+<!-- ããããï¼è¦åï¼åå®¹ -->
4306	+({ããããï¼header})
4307	+<!-- ç¡ã -->
4308	+({ããã¾ã§ï¼header})
4309	+({ããããï¼body})
4310	+<!-- ããããï¼ä¸»åå®¹ -->
4311	+({if !INC_HEADER_is_no_alert})
4312	+<table border="0" cellspacing="0" cellpadding="0" style="width:({if $width})({$width-16})({else})564({/if})px;">
4313	+<tr>
4314	+<td style="width:({if $width})({$width-16})({else})564({/if})px;height:1px;" class="bg_01" colspan="5"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
4315	+</tr>
4316	+<tr>
4317	+<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
4318	+<td style="width:150px;" class="bg_03" align="center" valign="middle">
4319	+<!-- ããããï¼ä¸»åå®¹ï¼è¦åã¢ã¤ã³ã³ -->
4320	+<img src="./skin/dummy.gif" class="v_spacer_l">
4321	+<img src="({t_img_url_skin filename=icon_alert_l})" class="icon">
4322	+<img src="./skin/dummy.gif" class="v_spacer_l">
4323	+<!-- ããã¾ã§ï¼ä¸»åå®¹ï¼è¦åã¢ã¤ã³ã³ -->
4324	+</td>
4325	+<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
4326	+<td style="width:({if $width})({$width-153})({else})427({/if})px;height:50px;" class="bg_02" align="left" valign="middle">
4327	+<div style="padding:8px 6px;" class="caution">
4328	+<!-- ããããï¼ä¸»åå®¹ï¼è¦åææ¬ä½ -->
4329	+({if $msg})({$msg})<br>({/if})
4330	+({if $msg1})({$msg1})<br>({/if})
4331	+({if $msg2})({$msg2})<br>({/if})
4332	+({if $msg3})({$msg3})<br>({/if})
4333	+({foreach from=$err_msg item=item})
4334	+({$item})</br>
4335	+({/foreach})
4336	+<!-- ããã¾ã§ï¼ä¸»åå®¹ï¼è¦åææ¬ä½ -->
4337	+</div>
4338	+</td>
4339	+<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
4340	+</tr>
4341	+<tr>
4342	+<td style="height:1px;" class="bg_01" colspan="5"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
4343	+</tr>
4344	+</table>
4345	+({else})
4346	+<table border="0" cellspacing="0" cellpadding="0" style="width:({if $width})({$width-16})({else})564({/if})px;">
4347	+<tr>
4348	+<td style="width:({if $width})({$width-16})({else})564({/if})px;height:1px;" class="bg_01" colspan="5"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
4349	+</tr>
4350	+<tr>
4351	+<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
4352	+<td style="width:({if $width})({$width-18})({else})562({/if})px;height:50px;" class="bg_02" align="left" valign="middle">
4353	+<div style="padding:8px 30px;">
4354	+<!-- ããããï¼ä¸»åå®¹ï¼ã¡ãã»ã¼ã¸ææ¬ä½ -->
4355	+({if $msg})({$msg})<br>({/if})
4356	+({if $msg1})({$msg1})<br>({/if})
4357	+({if $msg2})({$msg2})<br>({/if})
4358	+({if $msg3})({$msg3})<br>({/if})
4359	+({foreach from=$err_msg item=item})
4360	+({$item})</br>
4361	+({/foreach})
4362	+<!-- ããã¾ã§ï¼ä¸»åå®¹ï¼ã¡ãã»ã¼ã¸ææ¬ä½ -->
4363	+</div>
4364	+</td>
4365	+<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
4366	+</tr>
4367	+<tr>
4368	+<td style="height:1px;" class="bg_01" colspan="5"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
4369	+</tr>
4370	+</table>
4371	+({/if})
4372	+<!-- ããã¾ã§ï¼ä¸»åå®¹ -->
4373	+({ããã¾ã§ï¼body})
4374	+({ããããï¼footer})
4375	+<!-- ç¡ã -->
4376	+({ããã¾ã§ï¼footer})
4377	+<!-- ããã¾ã§ï¼è¦åï¼ï¼åå®¹ -->
4378	+</td>
4379	+<td class="bg_00"><img src="./skin/dummy.gif" style="width:7px;height:7px;" class="dummy"></td>
4380	+</tr>
4381	+<tr>
4382	+<td class="bg_00"><img src="./skin/dummy.gif" style="width:7px;height:7px;" class="dummy"></td>
4383	+<td class="bg_00"><img src="./skin/dummy.gif" style="width:7px;height:7px;" class="dummy"></td>
4384	+<td class="bg_00"><img src="./skin/dummy.gif" style="width:7px;height:7px;" class="dummy"></td>
4385	+</tr>
4386	+</table>
4387	+<!-- ****ããã¾ã§ï¼è¦å**** -->
4388	+<!-- ************************* -->
4389	+
4390	+({/if})
4391	+({*************************************})
4392	+({ããã¾ã§ï¼æ§inc_alert_box.tplã®åå®¹})
4393	+({*************************************})
4394	+
4395	+</td>
4396	+</tr>
4397	+({/if})
4398	+({/if})
4399	Index: webapp_biz/modules/biz/templates/g_join_group.tpl
4400	===================================================================
4401	--- webapp_biz/modules/biz/templates/g_join_group.tpl (.../2_5_5) (revision 1114)
4402	+++ webapp_biz/modules/biz/templates/g_join_group.tpl (.../2_5_6) (revision 1114)
4403	@@ -1,22 +1,5 @@
4404	-({$inc_html_header\|smarty:nodefaults})
4405	-<body>
4406	-({ext_include file="inc_extension_pagelayout_top.tpl"})
4407	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
4408	-<tr>
4409	-<td class="container inc_page_header">
4410	-({$inc_page_header\|smarty:nodefaults})
4411	-</td>
4412	-</tr>
4413	-<tr>
4414	-<td class="container inc_navi">
4415	-({$inc_navi\|smarty:nodefaults})
4416	-</td>
4417	-</tr>
4418	-<tr>
4419	-<td class="container main_content">
4420	-
4421	-<table class="container" border="0" cellspacing="0" cellpadding="0">
4422	-<tr><td class="full_content" align="center">
4423	+({ext_include file="inc_header.tpl"})
4424	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
4425	({***************************})
4426	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
4427	({***************************})
4428	@@ -97,16 +80,5 @@
4429	({***************************})
4430	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
4431	({***************************})
4432	-</td></tr>
4433	-</table>({END:container})
4434	-</td>
4435	-</tr>
4436	-<tr>
4437	-<td class="container inc_page_footer">
4438	-({$inc_page_footer\|smarty:nodefaults})
4439	-</td>
4440	-</tr>
4441	-</table>
4442	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
4443	-</body>
4444	-</html>
4445	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
4446	+({ext_include file="inc_footer.tpl"})
4447	Index: webapp_biz/modules/biz/templates/fh_biz_schedule_edit.tpl
4448	===================================================================
4449	--- webapp_biz/modules/biz/templates/fh_biz_schedule_edit.tpl (.../2_5_5) (revision 1114)
4450	+++ webapp_biz/modules/biz/templates/fh_biz_schedule_edit.tpl (.../2_5_6) (revision 1114)
4451	@@ -1,26 +1,5 @@
4452	-({$inc_html_header\|smarty:nodefaults})
4453	-<body>
4454	-({ext_include file="inc_extension_pagelayout_top.tpl"})
4455	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
4456	-<tr>
4457	-<td class="container inc_page_header">
4458	-({$inc_page_header\|smarty:nodefaults})
4459	-</td>
4460	-</tr>
4461	-<tr>
4462	-<td class="container inc_navi">
4463	-({$inc_navi\|smarty:nodefaults})
4464	-</td>
4465	-</tr>
4466	-<tr>
4467	-<td class="container main_content" align="center">
4468	-
4469	-({assign var=is_no_alert value=true})
4470	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
4471	-
4472	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
4473	-<tr>
4474	-<td class="full_content" align="center">
4475	+({ext_include file="inc_header.tpl" INC_HEADER_is_no_alert=true})
4476	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
4477	({***************************})
4478	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
4479	({***************************})
4480	@@ -234,7 +213,7 @@
4481	<td class="bg_02" align="left" valign="middle">
4482	<div style="padding:4px 3px;">
4483
4484	-<input type='text' name='sc_title' value="({$title})" size="60">
4485	+<input class="text" type='text' name='sc_title' value="({$title})" size="60">
4486	</div>
4487	</td>
4488	<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
4489	@@ -257,7 +236,7 @@
4490	<td class="bg_02" align="left" valign="middle">
4491	<div style="padding:4px 3px;">
4492
4493	-<textarea name='sc_memo' cols="50" rows="5">({$value})</textarea>
4494	+<textarea class="text" name='sc_memo' cols="50" rows="5">({$value})</textarea>
4495	</div>
4496	</td>
4497	<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
4498	@@ -266,46 +245,62 @@
4499	<tr>
4500	<td class="bg_01" colspan="5"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
4501	</tr>
4502	-({*********})
4503	+<tr>
4504	+<td style="width:1px;" class="bg_01"><img src="./skin/dummy.gif" style="width:1px; height:1px;" class="dummy"></td>
4505	+<td style="width:150px;" class="bg_05">
4506
4507	-({ããããï¼æ°è¦äºå®})
4508	+<div class="padding_s" align="center">
4509
4510	+ã°ã«ã¼ã
4511	+
4512	+</div>
4513	+
4514	+</td>
4515	+<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
4516	+<td style="width:412px;" class="bg_02">
4517	+
4518	+<table border="0" cellspacing="0" cellpadding="0" style="width:100%;">
4519	<tr>
4520	+<td class="padding_ss">
4521	+<select name="biz_group_id">
4522	+ <option type="radio" value="0">æå®ãªã
4523	+({foreach from=$biz_group_list item=biz_group})
4524	+ <option type="radio" value="({$biz_group.biz_group_id})"
4525	+ ({if $biz_group.biz_group_id == $target_biz_group_id})
4526	+ selected
4527	+ ({/if})
4528	+ >({$biz_group.name})
4529	+({/foreach})
4530	+</select>
4531	+</td>
4532	+</tr>
4533	+</table>
4534	+
4535	+</td>
4536	+<td style="width:1px;" class="bg_01"><img src="./skin/dummy.gif" style="width:1px; height:1px;" class="dummy"></td>
4537	+</tr>
4538	+({*********})
4539	+<tr>
4540	+<td style="height:1px;" class="bg_01" colspan="5"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
4541	+</tr>
4542	+({*********})
4543	+<tr>
4544	<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
4545	<td class="bg_05" align="center" valign="middle">
4546	<div style="padding:4px 3px;">
4547	-åå è
4548	+
4549	+å¬éç¯å²
4550	</div>
4551	</td>
4552	<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
4553	<td class="bg_02" align="left" valign="middle">
4554	+<div style="padding:4px 3px;">
4555
4556	-<table border="0" cellspacing="0" cellpadding="0">
4557	-<tr>
4558	-({foreach name=i from=$members item=item})
4559	-({if $item})
4560	-<td class="padding_ss" style="width:33%;" valign="top">
4561	-<input name='sc_j_mem[]' value='({$item.c_member_id})' type='checkbox' class='no_bg'({if $item.checkflag}) checked="checked"({/if})>({$item.nickname})
4562	-</td>
4563	-({else})
4564	-<td class="padding_ss" style="width:33%;"> </td>
4565	-({/if})
4566	+<input type='radio' name='public_flag' value='public' ({if $public_flag == 'public'})checked({/if}) class="no_bg">å¨ä½ã«å¬é<br>
4567	+<input type='radio' name='public_flag' value='group' ({if $public_flag == 'group'})checked({/if}) class="no_bg">ã°ã«ã¼ãã¾ã§å¬é<br>
4568	+<input type='radio' name='public_flag' value='private' ({if $public_flag == 'private'})checked({/if}) class="no_bg">å¬éããªã<br>
4569
4570	-({if $smarty.foreach.i.last && ($smarty.foreach.i.iteration%3==1 \|\| $smarty.foreach.i.iteration%3==2)})
4571	-<td class="padding_ss" style="width:33%;"> </td>
4572	-({/if})
4573	-({if $smarty.foreach.i.last && $smarty.foreach.i.iteration%3==1 })
4574	-<td class="padding_ss" style="width:33%;"> </td>
4575	-({/if})
4576	-({if !$smarty.foreach.i.last && $smarty.foreach.i.iteration%3==0})
4577	-</tr><tr>
4578	-({/if})
4579	-({/foreach})
4580	-</tr>
4581	-</table>
4582	-
4583	-({ããã¾ã§ï¼æ°è¦äºå®})
4584	-
4585	+</div>
4586	</td>
4587	<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
4588	</tr>
4589	@@ -364,17 +359,5 @@
4590	({***************************})
4591	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
4592	({***************************})
4593	-</td>
4594	-</tr>
4595	-</table>({END:container})
4596	-</td>
4597	-</tr>
4598	-<tr>
4599	-<td class="container inc_page_footer">
4600	-({$inc_page_footer\|smarty:nodefaults})
4601	-</td>
4602	-</tr>
4603	-</table>
4604	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
4605	-</body>
4606	-</html>
4607	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
4608	+({ext_include file="inc_footer.tpl"})
4609	Index: webapp_biz/modules/biz/templates/h_biz_todo_posted_list.tpl
4610	===================================================================
4611	--- webapp_biz/modules/biz/templates/h_biz_todo_posted_list.tpl (.../2_5_5) (revision 1114)
4612	+++ webapp_biz/modules/biz/templates/h_biz_todo_posted_list.tpl (.../2_5_6) (revision 1114)
4613	@@ -1,22 +1,5 @@
4614	-({$inc_html_header\|smarty:nodefaults})
4615	-<body>
4616	-({ext_include file='inc_extension_pagelayout_top.tpl'})
4617	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
4618	-<tr>
4619	-<td class="container inc_page_header">
4620	-({$inc_page_header\|smarty:nodefaults})
4621	-</td>
4622	-</tr>
4623	-<tr>
4624	-<td class="container inc_navi">
4625	-({$inc_navi\|smarty:nodefaults})
4626	-</td>
4627	-</tr>
4628	-<tr>
4629	-<td class="container main_content">
4630	-
4631	-<table class="container" border="0" cellspacing="0" cellpadding="0">
4632	-<tr><td class="full_content" align="center">
4633	+({ext_include file="inc_header.tpl"})
4634	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
4635	({***************************})
4636	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
4637	({***************************})
4638	@@ -173,16 +156,5 @@
4639	({***************************})
4640	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
4641	({***************************})
4642	-</td></tr>
4643	-</table>({END:container})
4644	-</td>
4645	-</tr>
4646	-<tr>
4647	-<td class="container inc_page_footer">
4648	-({$inc_page_footer\|smarty:nodefaults})
4649	-</td>
4650	-</tr>
4651	-</table>
4652	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
4653	-</body>
4654	-</html>
4655	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
4656	+({ext_include file="inc_footer.tpl"})
4657	Index: webapp_biz/modules/biz/templates/s_list.tpl
4658	===================================================================
4659	--- webapp_biz/modules/biz/templates/s_list.tpl (.../2_5_5) (revision 1114)
4660	+++ webapp_biz/modules/biz/templates/s_list.tpl (.../2_5_6) (revision 1114)
4661	@@ -1,45 +1,5 @@
4662	-({$inc_html_header\|smarty:nodefaults})
4663	-<body>
4664	-({ext_include file="inc_extension_pagelayout_top.tpl"})
4665	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
4666	-<tr>
4667	-<td class="container inc_page_header">
4668	-({$inc_page_header\|smarty:nodefaults})
4669	-</td>
4670	-</tr>
4671	-({if $inc_entry_point[1]})
4672	-<tr>
4673	-<td class="container">
4674	-({$inc_entry_point[1]\|smarty:nodefaults})
4675	-</td>
4676	-</tr>
4677	-({/if})
4678	-<tr>
4679	-<td class="container inc_navi">
4680	-({$inc_navi\|smarty:nodefaults})
4681	-</td>
4682	-</tr>
4683	-({if $inc_entry_point[2]})
4684	-<tr>
4685	-<td class="container">
4686	-({$inc_entry_point[2]\|smarty:nodefaults})
4687	-</td>
4688	-</tr>
4689	-({/if})
4690	-<tr>
4691	-<td class="container main_content" align="center">
4692	-
4693	-({assign var=is_no_alert value=true})
4694	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
4695	-
4696	-</td>
4697	-</tr>
4698	-<tr>
4699	-<td class="container main_content">
4700	-
4701	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
4702	-<tr>
4703	-<td class="full_content" align="center" style="width:720px;">
4704	+({ext_include file="inc_header.tpl" INC_HEADER_is_no_alert=true})
4705	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
4706	({***************************})
4707	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
4708	({***************************})
4709	@@ -81,17 +41,5 @@
4710	({***************************})
4711	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
4712	({***************************})
4713	-</td>
4714	-</tr>
4715	-</table>({END:container})
4716	-</td>
4717	-</tr>
4718	-<tr>
4719	-<td class="container inc_page_footer">
4720	-({$inc_page_footer\|smarty:nodefaults})
4721	-</td>
4722	-</tr>
4723	-</table>
4724	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
4725	-</body>
4726	-</html>
4727	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
4728	+({ext_include file="inc_footer.tpl"})
4729	Index: webapp_biz/modules/biz/templates/h_biz_group_find_all.tpl
4730	===================================================================
4731	--- webapp_biz/modules/biz/templates/h_biz_group_find_all.tpl (.../2_5_5) (revision 1114)
4732	+++ webapp_biz/modules/biz/templates/h_biz_group_find_all.tpl (.../2_5_6) (revision 1114)
4733	@@ -1,22 +1,5 @@
4734	-({$inc_html_header\|smarty:nodefaults})
4735	-<body>
4736	-({ext_include file="inc_extension_pagelayout_top.tpl"})
4737	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
4738	-<tr>
4739	-<td class="container inc_page_header">
4740	-({$inc_page_header\|smarty:nodefaults})
4741	-</td>
4742	-</tr>
4743	-<tr>
4744	-<td class="container inc_navi">
4745	-({$inc_navi\|smarty:nodefaults})
4746	-</td>
4747	-</tr>
4748	-<tr>
4749	-<td class="container main_content">
4750	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
4751	-<tr>
4752	-<td class="full_content" align="center">
4753	+({ext_include file="inc_header.tpl"})
4754	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
4755	({***************************})
4756	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
4757	({***************************})
4758	@@ -68,7 +51,7 @@
4759	({t_form _method=get m=biz a=page_h_biz_group_find_all})
4760
4761	ãã¼ã¯ã¼ã<img src="./skin/icon_arrow_2.gif" class="icon">
4762	-<input name="keyword" size="15" value="({$keyword})">
4763	+<input type="text" class="text" name="keyword" size="15" value="({$keyword})">
4764	<input type="submit" class="submit" value=" æ¤ ç´¢ ">
4765
4766	<a href="({t_url m=pc a=page_h_diary_list_all})&keyword=({$smarty.capture.keyword_url\|smarty:nodefaults})">æ¥è¨æ¤ç´¢</a>
4767	@@ -399,17 +382,5 @@
4768	({***************************})
4769	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
4770	({***************************})
4771	-</td>
4772	-</tr>
4773	-</table>({END:container})
4774	-</td>
4775	-</tr>
4776	-<tr>
4777	-<td class="container inc_page_footer">
4778	-({$inc_page_footer\|smarty:nodefaults})
4779	-</td>
4780	-</tr>
4781	-</table>
4782	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
4783	-</body>
4784	-</html>
4785	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
4786	+({ext_include file="inc_footer.tpl"})
4787	Index: webapp_biz/modules/biz/templates/s_delete_schedule.tpl
4788	===================================================================
4789	--- webapp_biz/modules/biz/templates/s_delete_schedule.tpl (.../2_5_5) (revision 1114)
4790	+++ webapp_biz/modules/biz/templates/s_delete_schedule.tpl (.../2_5_6) (revision 1114)
4791	@@ -1,25 +1,5 @@
4792	-({$inc_html_header\|smarty:nodefaults})
4793	-<body>
4794	-({ext_include file="inc_extension_pagelayout_top.tpl"})
4795	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
4796	-<tr>
4797	-<td class="container inc_page_header">
4798	-({$inc_page_header\|smarty:nodefaults})
4799	-</td>
4800	-</tr>
4801	-<tr>
4802	-<td class="container inc_navi">
4803	-({$inc_navi\|smarty:nodefaults})
4804	-</td>
4805	-</tr>
4806	-<tr>
4807	-<td class="container main_content" align="center">
4808	-
4809	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
4810	-
4811	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
4812	-<tr>
4813	-<td class="full_content" align="center">
4814	+({ext_include file="inc_header.tpl"})
4815	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
4816	({***************************})
4817	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
4818	({***************************})
4819	@@ -125,17 +105,5 @@
4820	({***************************})
4821	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
4822	({***************************})
4823	-</td>
4824	-</tr>
4825	-</table>({END:container})
4826	-</td>
4827	-</tr>
4828	-<tr>
4829	-<td class="container inc_page_footer">
4830	-({$inc_page_footer\|smarty:nodefaults})
4831	-</td>
4832	-</tr>
4833	-</table>
4834	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
4835	-</body>
4836	-</html>
4837	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
4838	+({ext_include file="inc_footer.tpl"})
4839	Index: webapp_biz/modules/biz/templates/s_add_shisetsu.tpl
4840	===================================================================
4841	--- webapp_biz/modules/biz/templates/s_add_shisetsu.tpl (.../2_5_5) (revision 1114)
4842	+++ webapp_biz/modules/biz/templates/s_add_shisetsu.tpl (.../2_5_6) (revision 1114)
4843	@@ -1,25 +1,5 @@
4844	-({$inc_html_header\|smarty:nodefaults})
4845	-<body>
4846	-({ext_include file="inc_extension_pagelayout_top.tpl"})
4847	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
4848	-<tr>
4849	-<td class="container inc_page_header">
4850	-({$inc_page_header\|smarty:nodefaults})
4851	-</td>
4852	-</tr>
4853	-<tr>
4854	-<td class="container inc_navi">
4855	-({$inc_navi\|smarty:nodefaults})
4856	-</td>
4857	-</tr>
4858	-<tr>
4859	-<td class="container main_content" align="center">
4860	-
4861	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
4862	-
4863	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
4864	-<tr>
4865	-<td class="full_content" align="center">
4866	+({ext_include file="inc_header.tpl"})
4867	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
4868	({***************************})
4869	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
4870	({***************************})
4871	@@ -78,7 +58,7 @@
4872
4873	<div class="padding_s">
4874
4875	-<input name="name" size="50">
4876	+<input type="text" class="text" name="name" size="50">
4877
4878	</div>
4879
4880	@@ -195,17 +175,5 @@
4881	({***************************})
4882	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
4883	({***************************})
4884	-</td>
4885	-</tr>
4886	-</table>({END:container})
4887	-</td>
4888	-</tr>
4889	-<tr>
4890	-<td class="container inc_page_footer">
4891	-({$inc_page_footer\|smarty:nodefaults})
4892	-</td>
4893	-</tr>
4894	-</table>
4895	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
4896	-</body>
4897	-</html>
4898	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
4899	+({ext_include file="inc_footer.tpl"})
4900	Index: webapp_biz/modules/biz/templates/fh_home_edit_biz_todo.tpl
4901	===================================================================
4902	--- webapp_biz/modules/biz/templates/fh_home_edit_biz_todo.tpl (.../2_5_5) (revision 1114)
4903	+++ webapp_biz/modules/biz/templates/fh_home_edit_biz_todo.tpl (.../2_5_6) (revision 1114)
4904	@@ -1,25 +1,5 @@
4905	-({$inc_html_header\|smarty:nodefaults})
4906	-<body>
4907	-({ext_include file="inc_extension_pagelayout_top.tpl"})
4908	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
4909	-<tr>
4910	-<td class="container inc_page_header">
4911	-({$inc_page_header\|smarty:nodefaults})
4912	-</td>
4913	-</tr>
4914	-<tr>
4915	-<td class="container inc_navi">
4916	-({$inc_navi\|smarty:nodefaults})
4917	-</td>
4918	-</tr>
4919	-<tr>
4920	-<td class="container main_content" align="center">
4921	-
4922	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
4923	-
4924	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
4925	-<tr>
4926	-<td class="full_content" align="center">
4927	+({ext_include file="inc_header.tpl"})
4928	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
4929	({***************************})
4930	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
4931	({***************************})
4932	@@ -84,9 +64,9 @@
4933
4934	<div class="padding_s">
4935
4936	-<textarea name="memo" style="width:30em;height:6em;">({$todo.memo})</textarea>
4937	+<textarea class="text" name="memo" style="width:30em;height:6em;">({$todo.memo})</textarea>
4938
4939	-({<input type="text" name="memo" value="({$todo.memo})" size="90">})
4940	+({<input type="text" class="text" name="memo" value="({$todo.memo})" size="90">})
4941
4942	</div>
4943
4944	@@ -152,17 +132,5 @@
4945	({***************************})
4946	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
4947	({***************************})
4948	-</td>
4949	-</tr>
4950	-</table>({END:container})
4951	-</td>
4952	-</tr>
4953	-<tr>
4954	-<td class="container inc_page_footer">
4955	-({$inc_page_footer\|smarty:nodefaults})
4956	-</td>
4957	-</tr>
4958	-</table>
4959	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
4960	-</body>
4961	-</html>
4962	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
4963	+({ext_include file="inc_footer.tpl"})
4964	Index: webapp_biz/modules/biz/templates/fh_group_list.tpl
4965	===================================================================
4966	--- webapp_biz/modules/biz/templates/fh_group_list.tpl (.../2_5_5) (revision 1114)
4967	+++ webapp_biz/modules/biz/templates/fh_group_list.tpl (.../2_5_6) (revision 1114)
4968	@@ -1,22 +1,5 @@
4969	-({$inc_html_header\|smarty:nodefaults})
4970	-<body>
4971	-({ext_include file="inc_extension_pagelayout_top.tpl"})
4972	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
4973	-<tr>
4974	-<td class="container inc_page_header">
4975	-({$inc_page_header\|smarty:nodefaults})
4976	-</td>
4977	-</tr>
4978	-<tr>
4979	-<td class="container inc_navi">
4980	-({$inc_navi\|smarty:nodefaults})
4981	-</td>
4982	-</tr>
4983	-<tr>
4984	-<td class="container main_content">
4985	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
4986	-<tr>
4987	-<td class="full_content" align="center">
4988	+({ext_include file="inc_header.tpl"})
4989	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
4990	({***************************})
4991	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
4992	({***************************})
4993	@@ -690,17 +673,5 @@
4994	({***************************})
4995	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
4996	({***************************})
4997	-</td>
4998	-</tr>
4999	-</table>({END:container})
5000	-</td>
5001	-</tr>
5002	-<tr>
5003	-<td class="container inc_page_footer">
5004	-({$inc_page_footer\|smarty:nodefaults})
5005	-</td>
5006	-</tr>
5007	-</table>
5008	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
5009	-</body>
5010	-</html>
5011	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
5012	+({ext_include file="inc_footer.tpl"})
5013	Index: webapp_biz/modules/biz/templates/inc_layoutcolumn_middle_165px.tpl
5014	===================================================================
5015	--- webapp_biz/modules/biz/templates/inc_layoutcolumn_middle_165px.tpl (.../2_5_5) (revision 0)
5016	+++ webapp_biz/modules/biz/templates/inc_layoutcolumn_middle_165px.tpl (.../2_5_6) (revision 1114)
5017	@@ -0,0 +1,3 @@
5018	+</td>
5019	+<td style="width:8px;"><img src="./skin/dummy.gif" style="width:8px;" class="dummy"></td>({<--spacer})
5020	+<td class="right_content_540" align="left" valign="top">
5021	Index: webapp_biz/modules/biz/templates/fh_biz_schedule_calendar.tpl
5022	===================================================================
5023	--- webapp_biz/modules/biz/templates/fh_biz_schedule_calendar.tpl (.../2_5_5) (revision 1114)
5024	+++ webapp_biz/modules/biz/templates/fh_biz_schedule_calendar.tpl (.../2_5_6) (revision 1114)
5025	@@ -1,22 +1,5 @@
5026	-({$inc_html_header\|smarty:nodefaults})
5027	-<body>
5028	-({ext_include file="inc_extension_pagelayout_top.tpl"})
5029	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
5030	-<tr>
5031	-<td class="container inc_page_header">
5032	-({$inc_page_header\|smarty:nodefaults})
5033	-</td>
5034	-</tr>
5035	-<tr>
5036	-<td class="container inc_navi">
5037	-({$inc_navi\|smarty:nodefaults})
5038	-</td>
5039	-</tr>
5040	-<tr>
5041	-<td class="container main_content">
5042	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
5043	-<tr>
5044	-<td class="full_content" align="center">
5045	+({ext_include file="inc_header.tpl"})
5046	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
5047	({***************************})
5048	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
5049	({***************************})
5050	@@ -226,17 +209,5 @@
5051	({***************************})
5052	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
5053	({***************************})
5054	-</td>
5055	-</tr>
5056	-</table>({END:container})
5057	-</td>
5058	-</tr>
5059	-<tr>
5060	-<td class="container inc_page_footer">
5061	-({$inc_page_footer\|smarty:nodefaults})
5062	-</td>
5063	-</tr>
5064	-</table>
5065	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
5066	-</body>
5067	-</html>
5068	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
5069	+({ext_include file="inc_footer.tpl"})
5070	Index: webapp_biz/modules/biz/templates/inc_layoutcolumn_top_270px.tpl
5071	===================================================================
5072	--- webapp_biz/modules/biz/templates/inc_layoutcolumn_top_270px.tpl (.../2_5_5) (revision 0)
5073	+++ webapp_biz/modules/biz/templates/inc_layoutcolumn_top_270px.tpl (.../2_5_6) (revision 1114)
5074	@@ -0,0 +1,7 @@
5075	+<tr>
5076	+<td class="container main_content">
5077	+
5078	+<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
5079	+<tr>
5080	+<td style="width:5px;"><img src="./skin/dummy.gif" style="width:5px;" class="dummy"></td>({<--spacer})
5081	+<td class="left_content" valign="top">
5082	Index: webapp_biz/modules/biz/templates/inc_layoutcolumn_top_175px.tpl
5083	===================================================================
5084	--- webapp_biz/modules/biz/templates/inc_layoutcolumn_top_175px.tpl (.../2_5_5) (revision 0)
5085	+++ webapp_biz/modules/biz/templates/inc_layoutcolumn_top_175px.tpl (.../2_5_6) (revision 1114)
5086	@@ -0,0 +1,7 @@
5087	+<tr>
5088	+<td class="container main_content">
5089	+
5090	+<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
5091	+<tr>
5092	+<td style="width:5px;"><img src="./skin/dummy.gif" style="width:5px;" class="dummy"></td>({<--spacer})
5093	+<td class="left_content_175" align="center" valign="top">
5094	Index: webapp_biz/modules/biz/templates/s_delete_shisetsu.tpl
5095	===================================================================
5096	--- webapp_biz/modules/biz/templates/s_delete_shisetsu.tpl (.../2_5_5) (revision 1114)
5097	+++ webapp_biz/modules/biz/templates/s_delete_shisetsu.tpl (.../2_5_6) (revision 1114)
5098	@@ -1,26 +1,5 @@
5099	-
5100	-({$inc_html_header\|smarty:nodefaults})
5101	-<body>
5102	-({ext_include file="inc_extension_pagelayout_top.tpl"})
5103	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
5104	-<tr>
5105	-<td class="container inc_page_header">
5106	-({$inc_page_header\|smarty:nodefaults})
5107	-</td>
5108	-</tr>
5109	-<tr>
5110	-<td class="container inc_navi">
5111	-({$inc_navi\|smarty:nodefaults})
5112	-</td>
5113	-</tr>
5114	-<tr>
5115	-<td class="container main_content" align="center">
5116	-
5117	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
5118	-
5119	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
5120	-<tr>
5121	-<td class="full_content" align="center">
5122	+({ext_include file="inc_header.tpl"})
5123	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
5124	({***************************})
5125	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
5126	({***************************})
5127	@@ -126,17 +105,5 @@
5128	({***************************})
5129	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
5130	({***************************})
5131	-</td>
5132	-</tr>
5133	-</table>({END:container})
5134	-</td>
5135	-</tr>
5136	-<tr>
5137	-<td class="container inc_page_footer">
5138	-({$inc_page_footer\|smarty:nodefaults})
5139	-</td>
5140	-</tr>
5141	-</table>
5142	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
5143	-</body>
5144	-</html>
5145	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
5146	+({ext_include file="inc_footer.tpl"})
5147	Index: webapp_biz/modules/biz/templates/h_biz_group_edit.tpl
5148	===================================================================
5149	--- webapp_biz/modules/biz/templates/h_biz_group_edit.tpl (.../2_5_5) (revision 1114)
5150	+++ webapp_biz/modules/biz/templates/h_biz_group_edit.tpl (.../2_5_6) (revision 1114)
5151	@@ -1,25 +1,5 @@
5152	-({$inc_html_header\|smarty:nodefaults})
5153	-<body>
5154	-({ext_include file="inc_extension_pagelayout_top.tpl"})
5155	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
5156	-<tr>
5157	-<td class="container inc_page_header">
5158	-({$inc_page_header\|smarty:nodefaults})
5159	-</td>
5160	-</tr>
5161	-<tr>
5162	-<td class="container inc_navi">
5163	-({$inc_navi\|smarty:nodefaults})
5164	-</td>
5165	-</tr>
5166	-<tr>
5167	-<td class="container main_content" align="center">
5168	-
5169	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
5170	-
5171	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
5172	-<tr>
5173	-<td class="full_content" align="center">
5174	+({ext_include file="inc_header.tpl"})
5175	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
5176	({***************************})
5177	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
5178	({***************************})
5179	@@ -100,7 +80,7 @@
5180
5181	<div class="padding_s">
5182
5183	-<input name="name" size="50" value="({$group.name})">
5184	+<input type="text" class="text" name="name" size="50" value="({$group.name})">
5185
5186	</div>
5187
5188	@@ -128,7 +108,7 @@
5189
5190	<div class="padding_s">
5191
5192	-<textarea name="info" rows="6" cols="50">({$group.info})</textarea>
5193	+<textarea class="text" name="info" rows="6" cols="50">({$group.info})</textarea>
5194
5195	</div>
5196
5197	@@ -301,7 +281,7 @@
5198	</td>
5199	<td class="padding_s" style="text-align:left;">
5200
5201	-({t_form _enctype=file m=biz a=do_h_biz_group_delete})
5202	+({t_form _enctype=file m=biz a=page_h_biz_group_delete})
5203	<input type="hidden" name="sessid" value="({$PHPSESSID})">
5204	<input name="target_id" type="hidden" value="({$group.biz_group_id})" />
5205	<input type="submit" class="submit" value="ãåãé¤ã">
5206	@@ -347,17 +327,5 @@
5207	({***************************})
5208	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
5209	({***************************})
5210	-</td>
5211	-</tr>
5212	-</table>({END:container})
5213	-</td>
5214	-</tr>
5215	-<tr>
5216	-<td class="container inc_page_footer">
5217	-({$inc_page_footer\|smarty:nodefaults})
5218	-</td>
5219	-</tr>
5220	-</table>
5221	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
5222	-</body>
5223	-</html>
5224	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
5225	+({ext_include file="inc_footer.tpl"})
5226	Index: webapp_biz/modules/biz/templates/h_biz_schedule_edit.tpl
5227	===================================================================
5228	--- webapp_biz/modules/biz/templates/h_biz_schedule_edit.tpl (.../2_5_5) (revision 1114)
5229	+++ webapp_biz/modules/biz/templates/h_biz_schedule_edit.tpl (.../2_5_6) (revision 1114)
5230	@@ -1,25 +1,5 @@
5231	-({$inc_html_header\|smarty:nodefaults})
5232	-<body>
5233	-({ext_include file="inc_extension_pagelayout_top.tpl"})
5234	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
5235	-<tr>
5236	-<td class="container inc_page_header">
5237	-({$inc_page_header\|smarty:nodefaults})
5238	-</td>
5239	-</tr>
5240	-<tr>
5241	-<td class="container inc_navi">
5242	-({$inc_navi\|smarty:nodefaults})
5243	-</td>
5244	-</tr>
5245	-<tr>
5246	-<td class="container main_content" align="center">
5247	-
5248	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
5249	-
5250	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
5251	-<tr>
5252	-<td class="full_content" align="center">
5253	+({ext_include file="inc_header.tpl"})
5254	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
5255	({***************************})
5256	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
5257	({***************************})
5258	@@ -232,7 +212,7 @@
5259	<td class="bg_02" align="left" valign="middle">
5260	<div style="padding:4px 3px;">
5261
5262	-<input type='text' name='sc_title' value="({$title})" size="60">
5263	+<input class="text" type='text' name='sc_title' value="({$title})" size="60">
5264	</div>
5265	</td>
5266	<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
5267	@@ -255,7 +235,7 @@
5268	<td class="bg_02" align="left" valign="middle">
5269	<div style="padding:4px 3px;">
5270
5271	-<textarea name='sc_memo' cols="50" rows="5">({$value})</textarea>
5272	+<textarea class="text" name='sc_memo' cols="50" rows="5">({$value})</textarea>
5273	</div>
5274	</td>
5275	<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
5276	@@ -362,17 +342,5 @@
5277	({***************************})
5278	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
5279	({***************************})
5280	-</td>
5281	-</tr>
5282	-</table>({END:container})
5283	-</td>
5284	-</tr>
5285	-<tr>
5286	-<td class="container inc_page_footer">
5287	-({$inc_page_footer\|smarty:nodefaults})
5288	-</td>
5289	-</tr>
5290	-</table>
5291	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
5292	-</body>
5293	-</html>
5294	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
5295	+({ext_include file="inc_footer.tpl"})
5296	Index: webapp_biz/modules/biz/templates/g_biz_schedule_add.tpl
5297	===================================================================
5298	--- webapp_biz/modules/biz/templates/g_biz_schedule_add.tpl (.../2_5_5) (revision 1114)
5299	+++ webapp_biz/modules/biz/templates/g_biz_schedule_add.tpl (.../2_5_6) (revision 1114)
5300	@@ -1,25 +1,5 @@
5301	-({$inc_html_header\|smarty:nodefaults})
5302	-<body>
5303	-({ext_include file="inc_extension_pagelayout_top.tpl"})
5304	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
5305	-<tr>
5306	-<td class="container inc_page_header">
5307	-({$inc_page_header\|smarty:nodefaults})
5308	-</td>
5309	-</tr>
5310	-<tr>
5311	-<td class="container inc_navi">
5312	-({$inc_navi\|smarty:nodefaults})
5313	-</td>
5314	-</tr>
5315	-<tr>
5316	-<td class="container main_content" align="center">
5317	-
5318	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
5319	-
5320	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
5321	-<tr>
5322	-<td class="full_content" align="center">
5323	+({ext_include file="inc_header.tpl"})
5324	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
5325	({***************************})
5326	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
5327	({***************************})
5328	@@ -222,7 +202,7 @@
5329	<td class="bg_02" align="left" valign="middle">
5330	<div style="padding:4px 3px;">
5331
5332	-<input type='text' name='sc_title' size="60">
5333	+<input class="text" type='text' name='sc_title' size="60">
5334	</div>
5335	</td>
5336	<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
5337	@@ -245,7 +225,7 @@
5338	<td class="bg_02" align="left" valign="middle">
5339	<div style="padding:4px 3px;">
5340
5341	-<textarea name='sc_memo' cols="50" rows="5"></textarea>
5342	+<textarea class="text" name='sc_memo' cols="50" rows="5"></textarea>
5343	</div>
5344	</td>
5345	<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
5346	@@ -354,17 +334,5 @@
5347	({***************************})
5348	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
5349	({***************************})
5350	-</td>
5351	-</tr>
5352	-</table>({END:container})
5353	-</td>
5354	-</tr>
5355	-<tr>
5356	-<td class="container inc_page_footer">
5357	-({$inc_page_footer\|smarty:nodefaults})
5358	-</td>
5359	-</tr>
5360	-</table>
5361	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
5362	-</body>
5363	-</html>
5364	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
5365	+({ext_include file="inc_footer.tpl"})
5366	Index: webapp_biz/modules/biz/templates/fh_biz_schedule_add.tpl
5367	===================================================================
5368	--- webapp_biz/modules/biz/templates/fh_biz_schedule_add.tpl (.../2_5_5) (revision 1114)
5369	+++ webapp_biz/modules/biz/templates/fh_biz_schedule_add.tpl (.../2_5_6) (revision 1114)
5370	@@ -1,28 +1,5 @@
5371	-({$inc_html_header\|smarty:nodefaults})
5372	-<body>
5373	-({ext_include file="inc_extension_pagelayout_top.tpl"})
5374	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
5375	-<tr>
5376	-<td class="container inc_page_header">
5377	-({$inc_page_header\|smarty:nodefaults})
5378	-</td>
5379	-</tr>
5380	-<tr>
5381	-<td class="container inc_navi">
5382	-({$inc_navi\|smarty:nodefaults})
5383	-</td>
5384	-</tr>
5385	-<tr>
5386	-<td class="container main_content" align="center">
5387	-
5388	-({if $msg \|\| $msg1 \|\| $msg2 \|\| $msg3 \|\| $err_msg})
5389	-({assign var=is_no_alert value=true})
5390	-({/if})
5391	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
5392	-
5393	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
5394	-<tr>
5395	-<td class="full_content" align="center">
5396	+({ext_include file="inc_header.tpl"})
5397	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
5398	({***************************})
5399	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
5400	({***************************})
5401	@@ -223,7 +200,7 @@
5402	<td class="bg_02" align="left" valign="middle">
5403	<div style="padding:4px 3px;">
5404
5405	-<input type='text' name='sc_title' size="60" value="({$sc_title})">
5406	+<input class="text" type='text' name='sc_title' size="60" value="({$sc_title})">
5407
5408	</div>
5409	</td>
5410	@@ -247,7 +224,7 @@
5411	<td class="bg_02" align="left" valign="middle">
5412	<div style="padding:4px 3px;">
5413
5414	-<textarea name='sc_memo' cols="50" rows="5">({$sc_memo})</textarea>
5415	+<textarea class="text" name='sc_memo' cols="50" rows="5">({$sc_memo})</textarea>
5416	</div>
5417	</td>
5418	<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
5419	@@ -256,76 +233,13 @@
5420	<tr>
5421	<td class="bg_01" colspan="5"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
5422	</tr>
5423	-<!--
5424	-({*********})
5425	-<script type="text/javascript" src="./modules/biz/schedule_member_form.js"></script>
5426	<tr>
5427	-<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
5428	-<td class="bg_05" align="center" valign="middle">
5429	-<div style="padding:4px 3px;">
5430	-åå è<br>
5431	-</div>
5432	-</td>
5433	-<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
5434	-<td class="bg_02" align="left" valign="middle">
5435	-<div style="padding:4px 3px;">
5436	-
5437	-<table name="join">
5438	-<tr>
5439	- <td>
5440	- <select id="groupSelect" onchange="">
5441	- <option value="0">(å¨å¡)</option>
5442	- </select>
5443	- </td>
5444	-</tr>
5445	-<tr>
5446	- <td>
5447	- <select name="sc_j_mem[]" size="5" multiple="multiple">
5448	- <option value='({$my_id})' selected>({$members[$my_id]})</option>
5449	- </select>
5450	- </td>
5451	- <td>
5452	- <input value="â è¿½å " onclick="addMember(this.form, 'members', 'sc_j_mem[]')" type="button" class="submit"><br>
5453	- <input value="åé¤ â" onclick="deleteMember(this.form, 'sc_j_mem[]')" type="button" class="submit">
5454	- <td>
5455	- <td>
5456	- <select name="members" size="5" multiple="multiple">
5457	- <option value='({$my_id})' selected>({$members[$my_id]})</option>
5458	- ({section name=i start=1 loop=$members})
5459	- ({if $smarty.section.i.index != $my_id})
5460	- <option value='({$smarty.section.i.index})' selected>({$members[i]})</option>
5461	- ({/if})
5462	- ({/section})
5463	- </select>
5464	- </td>
5465	-</tr>
5466	-</table>-->
5467	-<!-- <input name='sc_j_mem[]' value='({$my_id})' type='checkbox' class='no_bg' checked>({$members[$my_id]})<br>
5468	- <input name='sc_j_mem[]' value='({$my_id})' type='checkbox' class='no_bg' checked>({$members[$my_id]})<br>
5469	- ({section name=i start=1 loop=$members})
5470	- ({if $smarty.section.i.index != $my_id})
5471	- <input name='sc_j_mem[]' value='({$smarty.section.i.index})' type='checkbox' class='no_bg' ({if $smarty.section.i.index == $my_id})checked({/if})>({$members[i]})<br>
5472	- ({/if})
5473	- ({/section})-->
5474	-<!--</div>
5475	-</td>
5476	-<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
5477	-</tr>
5478	-({*********})
5479	-<tr>
5480	-<td style="height:1px;" class="bg_01" colspan="5"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
5481	-</tr>
5482	-({*********})-->
5483	-
5484	-({ããããï¼æ°è¦äºå®})
5485	-
5486	-<tr>
5487	<td style="width:1px;" class="bg_01"><img src="./skin/dummy.gif" style="width:1px; height:1px;" class="dummy"></td>
5488	<td style="width:150px;" class="bg_05">
5489
5490	<div class="padding_s" align="center">
5491
5492	-åå è<br>â»æªé¸æã¯å¨å¡
5493	+ã°ã«ã¼ã
5494
5495	</div>
5496
5497	@@ -335,24 +249,14 @@
5498
5499	<table border="0" cellspacing="0" cellpadding="0" style="width:100%;">
5500	<tr>
5501	-({foreach from=$members item=item name=mem})
5502	-({if $item})
5503	-<td class="padding_ss" style="width:33%;" valign="top">
5504	-
5505	-<input name='sc_j_mem[]' value='({$item.c_member_id})' type='checkbox' class='no_bg'({if $item.checkflag}) checked="checked"({/if})>({$item.nickname})
5506	-
5507	-</td>
5508	-({else})
5509	-<td class="padding_ss" style="width:33%;"> </td>
5510	-({/if})
5511	-
5512	-
5513	-({if $smarty.foreach.mem.last && ($smarty.foreach.mem.iteration%3 == 1 \|\| $smarty.foreach.mem.iteration%3 == 2)})<td> </td>({/if})
5514	-
5515	-({if $smarty.foreach.mem.last && $smarty.foreach.mem.iteration%3 == 1})<td> </td>({/if})
5516	-
5517	-({if !$smarty.foreach.mem.last && $smarty.foreach.mem.iteration%3 == 0})</tr><tr>({/if})
5518	+<td class="padding_ss">
5519	+<select name="biz_group_id">
5520	+ <option type="radio" value="0">æå®ãªã
5521	+({foreach from=$biz_group_list item=biz_group})
5522	+ <option type="radio" value="({$biz_group.biz_group_id})">({$biz_group.name})
5523	({/foreach})
5524	+</select>
5525	+</td>
5526	</tr>
5527	</table>
5528
5529	@@ -364,29 +268,27 @@
5530	<td style="height:1px;" class="bg_01" colspan="5"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
5531	</tr>
5532	({*********})
5533	-
5534	-({ããã¾ã§ï¼æ°è¦äºå®})
5535	-
5536	-
5537	-<!--
5538	<tr>
5539	<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
5540	<td class="bg_05" align="center" valign="middle">
5541	<div style="padding:4px 3px;">
5542	-è¨å
5543	+
5544	+å¬éç¯å²
5545	</div>
5546	</td>
5547	<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
5548	<td class="bg_02" align="left" valign="middle">
5549	<div style="padding:4px 3px;">
5550	- ({foreach item=shisetsu name=i from=$shisetsu})
5551	- <input name='sc_j_plc[]' value='({$shisetsu.biz_shisetsu_id})' type='checkbox' class='no_bg'>({$shisetsu.name})<br>
5552	- ({/foreach})
5553	+
5554	+<input type='radio' name='public_flag' value='public' checked class="no_bg">å¨ä½ã«å¬é<br>
5555	+<input type='radio' name='public_flag' value='group' class="no_bg">ã°ã«ã¼ãã¾ã§å¬é<br>
5556	+<input type='radio' name='public_flag' value='private' class="no_bg">å¬éããªã<br>
5557	+
5558	</div>
5559	</td>
5560	<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
5561	</tr>
5562	-({*********})-->
5563	+({*********})
5564	<tr>
5565	<td style="height:1px;" class="bg_01" colspan="5"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
5566	</tr>
5567	@@ -440,17 +342,5 @@
5568	({***************************})
5569	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
5570	({***************************})
5571	-</td>
5572	-</tr>
5573	-</table>({END:container})
5574	-</td>
5575	-</tr>
5576	-<tr>
5577	-<td class="container inc_page_footer">
5578	-({$inc_page_footer\|smarty:nodefaults})
5579	-</td>
5580	-</tr>
5581	-</table>
5582	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
5583	-</body>
5584	-</html>
5585	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
5586	+({ext_include file="inc_footer.tpl"})
5587	Index: webapp_biz/modules/biz/templates/inc_footer.tpl
5588	===================================================================
5589	--- webapp_biz/modules/biz/templates/inc_footer.tpl (.../2_5_5) (revision 0)
5590	+++ webapp_biz/modules/biz/templates/inc_footer.tpl (.../2_5_6) (revision 1114)
5591	@@ -0,0 +1,70 @@
5592	+({if !$INC_FOOTER_is_login})
5593	+<tr>
5594	+<td class="container inc_page_footer">
5595	+
5596	+
5597	+({***************************************})
5598	+({ããããï¼æ§inc_page_footer.tplã®åå®¹})
5599	+({***************************************})
5600	+<table class="inc_page_footer" border="0" cellspacing="0" cellpadding="0">
5601	+<tr>
5602	+<td class="bg_page_footer" style="background: url(({t_img_url_skin filename=skin_footer})) no-repeat ;">
5603	+
5604	+({$INC_FOOTER_inc_page_footer\|smarty:nodefaults})
5605	+
5606	+</td>
5607	+</tr>
5608	+</table>
5609	+({***************************************})
5610	+({ããã¾ã§ï¼æ§inc_page_footer.tplã®åå®¹})
5611	+({***************************************})
5612	+
5613	+</td>
5614	+</tr>
5615	+({/if})
5616	+</table>
5617	+</td>
5618	+
5619	+({if $INC_FOOTER_side_banner_html_before \|\| $INC_FOOTER_side_banner_html_after \|\| $INC_FOOTER_inc_side_banner})
5620	+
5621	+<td class="ext_sub_container_right" align="center" valign="top">
5622	+({**********************************})
5623	+({ããããï¼ãµã¤ãã³ã³ãã³ãé å})
5624	+({**********************************})
5625	+
5626	+({strip})
5627	+({if $INC_FOOTER_side_banner_html_before \|\| $INC_FOOTER_side_banner_html_after})
5628	+ ({if $before_after == 'before'})
5629	+ ({$INC_FOOTER_side_banner_html_before\|smarty:nodefaults})
5630	+ ({else})
5631	+ ({$INC_FOOTER_side_banner_html_after\|smarty:nodefaults})
5632	+ ({/if})
5633	+({else})
5634	+ ({if $INC_FOOTER_inc_side_banner.a_href})
5635	+ ({if $PHPSESSID})
5636	+ <a href="({t_url m=pc a=do_h_click_banner})&target_c_banner_id=({$INC_FOOTER_inc_side_banner.c_banner_id})&sessid=({$PHPSESSID})" target="_blank">
5637	+ ({else})
5638	+ <a href="({t_url m=pc a=do_o_click_banner})&target_c_banner_id=({$INC_FOOTER_inc_side_banner.c_banner_id})" target="_blank">
5639	+ ({/if})
5640	+ <img src="({t_img_url filename=$INC_FOOTER_inc_side_banner.image_filename})">
5641	+ </a>
5642	+ ({else})
5643	+ <img src="({t_img_url filename=$INC_FOOTER_inc_side_banner.image_filename})">
5644	+ ({/if})
5645	+({/if})
5646	+({/strip})
5647	+
5648	+({**********************************})
5649	+({ããã¾ã§ï¼ãµã¤ãã³ã³ãã³ãé å})
5650	+({**********************************})
5651	+</td>
5652	+({/if})
5653	+</tr>
5654	+</table>
5655	+
5656	+</div>
5657	+
5658	+({$INC_FOOTER_inc_page_bottom\|smarty:nodefaults})
5659	+
5660	+</body>
5661	+</html>
5662	Index: webapp_biz/modules/biz/templates/h_biz_group_delete.tpl
5663	===================================================================
5664	--- webapp_biz/modules/biz/templates/h_biz_group_delete.tpl (.../2_5_5) (revision 1114)
5665	+++ webapp_biz/modules/biz/templates/h_biz_group_delete.tpl (.../2_5_6) (revision 1114)
5666	@@ -1,25 +1,5 @@
5667	-({$inc_html_header\|smarty:nodefaults})
5668	-<body>
5669	-({ext_include file="inc_extension_pagelayout_top.tpl"})
5670	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
5671	-<tr>
5672	-<td class="container inc_page_header">
5673	-({$inc_page_header\|smarty:nodefaults})
5674	-</td>
5675	-</tr>
5676	-<tr>
5677	-<td class="container inc_navi">
5678	-({$inc_navi\|smarty:nodefaults})
5679	-</td>
5680	-</tr>
5681	-<tr>
5682	-<td class="container main_content" align="center">
5683	-
5684	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
5685	-
5686	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
5687	-<tr>
5688	-<td class="full_content" align="center">
5689	+({ext_include file="inc_header.tpl"})
5690	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
5691	({***************************})
5692	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
5693	({***************************})
5694	@@ -65,7 +45,7 @@
5695	<table border="0" cellspacing="0" cellpadding="2" style="width:200px;height:2em;">
5696	<tr>
5697
5698	-({t_form m=biz a=do_h_biz_delete_group})
5699	+({t_form m=biz a=do_h_biz_group_delete})
5700	<input type="hidden" name="sessid" value="({$PHPSESSID})">
5701	<input type="hidden" name="target_id" value="({$target_id})">
5702
5703	@@ -126,17 +106,5 @@
5704	({***************************})
5705	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
5706	({***************************})
5707	-</td>
5708	-</tr>
5709	-</table>({END:container})
5710	-</td>
5711	-</tr>
5712	-<tr>
5713	-<td class="container inc_page_footer">
5714	-({$inc_page_footer\|smarty:nodefaults})
5715	-</td>
5716	-</tr>
5717	-</table>
5718	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
5719	-</body>
5720	-</html>
5721	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
5722	+({ext_include file="inc_footer.tpl"})
5723	Index: webapp_biz/modules/biz/templates/h_biz_schedule_delete.tpl
5724	===================================================================
5725	--- webapp_biz/modules/biz/templates/h_biz_schedule_delete.tpl (.../2_5_5) (revision 1114)
5726	+++ webapp_biz/modules/biz/templates/h_biz_schedule_delete.tpl (.../2_5_6) (revision 1114)
5727	@@ -1,25 +1,5 @@
5728	-({$inc_html_header\|smarty:nodefaults})
5729	-<body>
5730	-({ext_include file="inc_extension_pagelayout_top.tpl"})
5731	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
5732	-<tr>
5733	-<td class="container inc_page_header">
5734	-({$inc_page_header\|smarty:nodefaults})
5735	-</td>
5736	-</tr>
5737	-<tr>
5738	-<td class="container inc_navi">
5739	-({$inc_navi\|smarty:nodefaults})
5740	-</td>
5741	-</tr>
5742	-<tr>
5743	-<td class="container main_content" align="center">
5744	-
5745	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
5746	-
5747	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
5748	-<tr>
5749	-<td class="full_content" align="center">
5750	+({ext_include file="inc_header.tpl"})
5751	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
5752	({***************************})
5753	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
5754	({***************************})
5755	@@ -128,17 +108,5 @@
5756	({***************************})
5757	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
5758	({***************************})
5759	-</td>
5760	-</tr>
5761	-</table>({END:container})
5762	-</td>
5763	-</tr>
5764	-<tr>
5765	-<td class="container inc_page_footer">
5766	-({$inc_page_footer\|smarty:nodefaults})
5767	-</td>
5768	-</tr>
5769	-</table>
5770	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
5771	-</body>
5772	-</html>
5773	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
5774	+({ext_include file="inc_footer.tpl"})
5775	Index: webapp_biz/modules/biz/templates/g_home.tpl
5776	===================================================================
5777	--- webapp_biz/modules/biz/templates/g_home.tpl (.../2_5_5) (revision 1114)
5778	+++ webapp_biz/modules/biz/templates/g_home.tpl (.../2_5_6) (revision 1114)
5779	@@ -1,32 +1,5 @@
5780	-({$inc_html_header\|smarty:nodefaults})
5781	-<body>
5782	-({ext_include file="inc_extension_pagelayout_top.tpl"})
5783	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
5784	-<tr>
5785	-<td class="container inc_page_header">
5786	-({$inc_page_header\|smarty:nodefaults})
5787	-</td>
5788	-</tr>
5789	-<tr>
5790	-<td class="container inc_navi">
5791	-({$inc_navi\|smarty:nodefaults})
5792	-</td>
5793	-</tr>
5794	-<tr>
5795	-<td class="container main_content" align="center">
5796	-
5797	-({assign var=is_no_alert value=true})
5798	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
5799	-
5800	-</td>
5801	-</tr>
5802	-<tr>
5803	-<td class="container main_content">
5804	-
5805	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
5806	-<tr>
5807	-<td style="width:5px;"><img src="./skin/dummy.gif" style="width:5px;" class="dummy"></td>({<--spacer})
5808	-<td class="left_content" valign="top">
5809	+({ext_include file="inc_header.tpl"})
5810	+({ext_include file="inc_layoutcolumn_top_270px.tpl"})
5811	({********************************})
5812	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å·¦ï¼})
5813	({********************************})
5814	@@ -97,9 +70,7 @@
5815	({********************************})
5816	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å·¦ï¼})
5817	({********************************})
5818	-</td>
5819	-<td style="width:5px;"><img src="./skin/dummy.gif" style="width:5px;" class="dummy"></td>({<--spacer})
5820	-<td class="right_content" valign="top">
5821	+({ext_include file="inc_layoutcolumn_middle_270px.tpl"})
5822	({********************************})
5823	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å³ï¼})
5824	({********************************})
5825	@@ -223,32 +194,22 @@
5826	({********************************})
5827	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å³ï¼})
5828	({********************************})
5829	-</td>
5830	-</tr>
5831	-</table>({END:container})
5832	-</td>
5833	-</tr>
5834	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
5835	+
5836	<tr>
5837	<td class="container main_content" align="center">
5838
5839	({if $calendar_head})
5840	<!-- ******************************** -->
5841	<!-- ****ããããï¼bizã¢ã¸ã¥ã¼ã«::ã¹ã±ã¸ã¥ã¼ã«**** -->
5842	- ({$calendar_head\|smarty:nodefaults})
5843	- ({$calendar_value\|smarty:nodefaults})
5844	- ({$calendar_foot\|smarty:nodefaults})
5845	+ ({$calendar_head\|smarty:nodefaults})
5846	+ ({$calendar_value\|smarty:nodefaults})
5847	+ ({$calendar_foot\|smarty:nodefaults})
5848	<!-- ****ããã¾ã§ï¼bizã¢ã¸ã¥ã¼ã«::ã¹ã±ã¸ã¥ã¼ã«**** -->
5849	<!-- ******************************** -->
5850	({/if})
5851
5852	</td>
5853	</tr>
5854	-<tr>
5855	-<td class="container inc_page_footer">
5856	-({$inc_page_footer\|smarty:nodefaults})
5857	-</td>
5858	-</tr>
5859	-</table>
5860	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
5861	-</body>
5862	-</html>
5863	+
5864	+({ext_include file="inc_footer.tpl"})
5865	Index: webapp_biz/modules/biz/templates/s_edit_shisetsu.tpl
5866	===================================================================
5867	--- webapp_biz/modules/biz/templates/s_edit_shisetsu.tpl (.../2_5_5) (revision 1114)
5868	+++ webapp_biz/modules/biz/templates/s_edit_shisetsu.tpl (.../2_5_6) (revision 1114)
5869	@@ -1,25 +1,5 @@
5870	-({$inc_html_header\|smarty:nodefaults})
5871	-<body>
5872	-({ext_include file="inc_extension_pagelayout_top.tpl"})
5873	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
5874	-<tr>
5875	-<td class="container inc_page_header">
5876	-({$inc_page_header\|smarty:nodefaults})
5877	-</td>
5878	-</tr>
5879	-<tr>
5880	-<td class="container inc_navi">
5881	-({$inc_navi\|smarty:nodefaults})
5882	-</td>
5883	-</tr>
5884	-<tr>
5885	-<td class="container main_content" align="center">
5886	-
5887	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
5888	-
5889	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
5890	-<tr>
5891	-<td class="full_content" align="center">
5892	+({ext_include file="inc_header.tpl"})
5893	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
5894	({***************************})
5895	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
5896	({***************************})
5897	@@ -82,7 +62,7 @@
5898
5899	<div class="padding_s">
5900
5901	-<input name="name" size="50" value="({$list.name})">
5902	+<input type="text" class="text" name="name" size="50" value="({$list.name})">
5903
5904	</div>
5905
5906	@@ -207,17 +187,5 @@
5907	({***************************})
5908	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
5909	({***************************})
5910	-</td>
5911	-</tr>
5912	-</table>({END:container})
5913	-</td>
5914	-</tr>
5915	-<tr>
5916	-<td class="container inc_page_footer">
5917	-({$inc_page_footer\|smarty:nodefaults})
5918	-</td>
5919	-</tr>
5920	-</table>
5921	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
5922	-</body>
5923	-</html>
5924	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
5925	+({ext_include file="inc_footer.tpl"})
5926	Index: webapp_biz/modules/biz/templates/inc_layoutcolumn_middle_270px.tpl
5927	===================================================================
5928	--- webapp_biz/modules/biz/templates/inc_layoutcolumn_middle_270px.tpl (.../2_5_5) (revision 0)
5929	+++ webapp_biz/modules/biz/templates/inc_layoutcolumn_middle_270px.tpl (.../2_5_6) (revision 1114)
5930	@@ -0,0 +1,3 @@
5931	+</td>
5932	+<td style="width:5px;"><img src="./skin/dummy.gif" style="width:5px;" class="dummy"></td>({<--spacer})
5933	+<td class="right_content" valign="top">
5934	Index: webapp_biz/modules/biz/templates/inc_biz_todo.tpl
5935	===================================================================
5936	--- webapp_biz/modules/biz/templates/inc_biz_todo.tpl (.../2_5_5) (revision 1114)
5937	+++ webapp_biz/modules/biz/templates/inc_biz_todo.tpl (.../2_5_6) (revision 1114)
5938	@@ -27,7 +27,7 @@
5939	<tr>
5940	<td class="bg_02 border_01 padding_ss" style="width:228px;border-top:none;border-bottom:none;" align="center">
5941
5942	-<textarea name="todo" value="" style="width:100%;height:3em;"></textarea>
5943	+<textarea class="text" name="todo" value="" style="width:100%;height:3em;"></textarea>
5944
5945	</td>
5946	</tr>
5947	Index: webapp_biz/modules/biz/templates/inc_biz_schedule_week.tpl
5948	===================================================================
5949	--- webapp_biz/modules/biz/templates/inc_biz_schedule_week.tpl (.../2_5_5) (revision 1114)
5950	+++ webapp_biz/modules/biz/templates/inc_biz_schedule_week.tpl (.../2_5_6) (revision 1114)
5951	@@ -45,7 +45,7 @@
5952	<td class="border_01 bg_02 padding_ss" style="border-left:none;" align="right">
5953
5954	äºå®ï¼
5955	-<input type="text" name="title" value="" size="30">
5956	+<input type="text" class="text" name="title" value="" size="30">
5957	<select name="start_date">
5958	({foreach from=$daylist item=item})
5959	<option value="({$item.year})-({$item.month})-({$item.day})"({if $item.now}) selected="selected"({/if})>({$item.month})/({$item.day})(({$item.dayofweek}))</option>
5960	@@ -316,7 +316,7 @@
5961	<input type="hidden" name="sessid" value="({$PHPSESSID})">
5962	<input type="hidden" name="target_id" value="({$target_id})">
5963	äºå®ï¼
5964	-<input type="text" name="title" value="" size="30">
5965	+<input type="text" class="text" name="title" value="" size="30">
5966	<select name="start_date">
5967	({foreach from=$daylist item=item})
5968	<option value="({$item.year})-({$item.month})-({$item.day})"({if $item.now}) selected="selected"({/if})>({$item.month})/({$item.day})(({$item.dayofweek}))</option>
5969	Index: webapp_biz/modules/biz/templates/inc_layoutcolumn_middle_175px.tpl
5970	===================================================================
5971	--- webapp_biz/modules/biz/templates/inc_layoutcolumn_middle_175px.tpl (.../2_5_5) (revision 0)
5972	+++ webapp_biz/modules/biz/templates/inc_layoutcolumn_middle_175px.tpl (.../2_5_6) (revision 1114)
5973	@@ -0,0 +1,3 @@
5974	+</td>
5975	+<td style="width:5px;"><img src="./skin/dummy.gif" style="width:5px;" class="dummy"></td>({<--spacer})
5976	+<td class="right_content_535" align="center" valign="top">
5977	Index: webapp_biz/modules/biz/templates/inc_layoutcolumn_top_720px.tpl
5978	===================================================================
5979	--- webapp_biz/modules/biz/templates/inc_layoutcolumn_top_720px.tpl (.../2_5_5) (revision 0)
5980	+++ webapp_biz/modules/biz/templates/inc_layoutcolumn_top_720px.tpl (.../2_5_6) (revision 1114)
5981	@@ -0,0 +1,6 @@
5982	+<tr>
5983	+<td class="container main_content" align="center">
5984	+
5985	+<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
5986	+<tr>
5987	+<td class="full_content" align="center">
5988	Index: webapp_biz/modules/biz/templates/fh_biz_schedule_view.tpl
5989	===================================================================
5990	--- webapp_biz/modules/biz/templates/fh_biz_schedule_view.tpl (.../2_5_5) (revision 1114)
5991	+++ webapp_biz/modules/biz/templates/fh_biz_schedule_view.tpl (.../2_5_6) (revision 1114)
5992	@@ -1,29 +1,5 @@
5993	-({$inc_html_header\|smarty:nodefaults})
5994	-<body>
5995	-({ext_include file="inc_extension_pagelayout_top.tpl"})
5996	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
5997	-<tr>
5998	-<td class="container inc_page_header">
5999	-({$inc_page_header\|smarty:nodefaults})
6000	-</td>
6001	-</tr>
6002	-<tr>
6003	-<td class="container inc_navi">
6004	-({$inc_navi\|smarty:nodefaults})
6005	-</td>
6006	-</tr>
6007	-<tr>
6008	-<td class="container main_content" align="center">
6009	-
6010	-({if $msg \|\| $msg1 \|\| $msg2 \|\| $msg3 \|\| $err_msg})
6011	-({assign var=is_no_alert value=true})
6012	-({/if})
6013	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
6014	-
6015	-
6016	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
6017	-<tr>
6018	-<td class="full_content" align="center">
6019	+({ext_include file="inc_header.tpl" INC_HEADER_is_no_alert=true})
6020	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
6021	({***************************})
6022	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
6023	({***************************})
6024	@@ -196,13 +172,15 @@
6025	<td style="height:1px;" class="bg_01" colspan="5"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
6026	</tr>
6027	({*********})
6028	-({if $is_h})
6029	<tr>
6030	<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
6031	<td class="bg_05" align="center" valign="middle">
6032	<div style="padding:4px 3px;">
6033	-
6034	+({if $schedule.biz_group_id})
6035	ç»é²è
6036	+({else})
6037	+åå è
6038	+({/if})
6039	</div>
6040	</td>
6041	<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
6042	@@ -220,23 +198,46 @@
6043	<td style="height:1px;" class="bg_01" colspan="5"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
6044	</tr>
6045	({*********})
6046	+({if $schedule.biz_group_id})
6047	+<tr>
6048	+<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
6049	+<td class="bg_05" align="center" valign="middle">
6050	+<div style="padding:4px 3px;">
6051	+ã°ã«ã¼ã
6052	+</div>
6053	+</td>
6054	+<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
6055	+<td class="bg_02" align="left" valign="middle">
6056	+<div style="padding:4px 3px;">
6057	+ <a href="({t_url m=biz a=page_g_home})&target_c_commu_id=({$schedule.biz_group_id})">({$schedule.biz_group_name})</a><br>
6058	+</div>
6059	+</td>
6060	+<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
6061	+</tr>
6062	+({*********})
6063	+<tr>
6064	+<td style="height:1px;" class="bg_01" colspan="5"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
6065	+</tr>
6066	+({*********})
6067	({/if})
6068	+({*********})
6069	<tr>
6070	<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
6071	<td class="bg_05" align="center" valign="middle">
6072	<div style="padding:4px 3px;">
6073	-
6074	-åå è
6075	+å¬éç¯å²
6076	</div>
6077	</td>
6078	<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
6079	<td class="bg_02" align="left" valign="middle">
6080	<div style="padding:4px 3px;">
6081	-
6082	-({foreach item=name key=id from=$jmembers})
6083	- <a href="({t_url m=pc a=page_f_home})&target_c_member_id=({$id})">({$name})</a> <br>
6084	-({/foreach})
6085	-
6086	+({if $schedule.public_flag == "public"})
6087	+å¨å¡ã«å¬é
6088	+({elseif $schedule.public_flag == "group"})
6089	+ã°ã«ã¼ãã¾ã§å¬é
6090	+({elseif $schedule.public_flag == "private"})
6091	+å¬éããªã
6092	+({/if})
6093	</div>
6094	</td>
6095	<td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
6096	@@ -252,14 +253,16 @@
6097
6098	<img src="./skin/dummy.gif" class="v_spacer_m">
6099
6100	-({if $is_f})
6101	<table border="0" cellspacing="0" cellpadding="0">
6102	<tr>
6103
6104	<td class="padding_ss" align="left">
6105
6106	-({t_form _method=get m=pc a=page_h_home})
6107	-<input value="ãã¤ãã¼ã ã«æ»ã" type="submit" class="submit">
6108	+({t_form _method=get m=biz a=page_fh_biz_schedule_calendar})
6109	+<input type="hidden" name="target_id" value="({$target_c_member_id})">
6110	+<input type="hidden" name="year" value="({$schedule.begin_date\|date_format:'%Y'})">
6111	+<input type="hidden" name="month" value="({$schedule.begin_date\|date_format:'%m'})">
6112	+<input value="æéã«ã¬ã³ãã¼ãè¡¨ç¤ºãã" type="submit" class="submit">
6113	</form>
6114
6115	</td>
6116	@@ -282,35 +285,7 @@
6117	</form>
6118
6119	</td>
6120	-</tr>
6121	-</table>
6122	-({elseif !$msg})
6123	-<table border="0" cellspacing="0" cellpadding="0">
6124	-<tr>
6125	-<td class="padding_ss" align="left">
6126
6127	-({t_form _method=get m=pc a=page_h_home})
6128	-<input value="ãã¤ãã¼ã ã«æ»ã" type="submit" class="submit">
6129	-</form>
6130	-
6131	-</td>
6132	-
6133	-<td class="padding_ss" align="center">
6134	-
6135	-({t_form m=biz a=page_fh_biz_schedule_edit})
6136	-<input type="hidden" name="rep_type" value="({$schedule.rep_type})">
6137	-<input type="hidden" name="begin_date" value="({$schedule.begin_date})">
6138	-<input type="hidden" name="begin_time" value="({$schedule.begin_time})">
6139	-<input type="hidden" name="finish_date" value="({$schedule.finish_date})">
6140	-<input type="hidden" name="finish_time" value="({$schedule.finish_time})">
6141	-<input type="hidden" name="title" value="({$schedule.title})">
6142	-<input type="hidden" name="value" value="({$schedule.value})">
6143	-<input type="hidden" name="members" value="({$jmembers_enc})">
6144	-<input type="hidden" name="schedule_id" value="({$schedule_id})">
6145	-<input value="ä¿®æ£ãã" type="submit" class="submit">
6146	-</form>
6147	-
6148	-</td>
6149	<td class="padding_ss" align="left">
6150
6151	({t_form m=biz a=page_h_biz_schedule_delete})
6152	@@ -329,38 +304,9 @@
6153	</td>
6154	</tr>
6155	({/if})
6156	-
6157	</form>
6158	</table>
6159	-({else})
6160	-<table border="0" cellspacing="0" cellpadding="0">
6161	-<tr>
6162	-<td class="padding_ss" align="right">
6163
6164	-({t_form m=biz a=page_fh_biz_schedule_add})
6165	-<input value="æ°è¦ã®äºå®ç»é²ããã" type="submit" class="submit">
6166	-</form>
6167	-
6168	-</td>
6169	-<td class="padding_ss" align="center">
6170	-
6171	-({t_form m=biz a=page_s_list})
6172	-<input type="hidden" name="w" value="({$w})">
6173	-<input value="æ½è¨äºç´ããã" type="submit" class="submit">
6174	-</form>
6175	-
6176	-</td>
6177	-<td class="padding_ss" align="left">
6178	-
6179	-({t_form _method=get m=pc a=page_h_home})
6180	-<input value="ãã¤ãã¼ã ã«æ»ã" type="submit" class="submit">
6181	-</form>
6182	-
6183	-</td>
6184	-</tr>
6185	-</table>
6186	-({/if})
6187	-
6188	<img src="./skin/dummy.gif" class="v_spacer_m">
6189
6190	</td>
6191	@@ -398,17 +344,5 @@
6192	({***************************})
6193	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
6194	({***************************})
6195	-</td>
6196	-</tr>
6197	-</table>({END:container})
6198	-</td>
6199	-</tr>
6200	-<tr>
6201	-<td class="container inc_page_footer">
6202	-({$inc_page_footer\|smarty:nodefaults})
6203	-</td>
6204	-</tr>
6205	-</table>
6206	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
6207	-</body>
6208	-</html>
6209	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
6210	+({ext_include file="inc_footer.tpl"})
6211	Index: webapp_biz/modules/biz/templates/g_member_list.tpl
6212	===================================================================
6213	--- webapp_biz/modules/biz/templates/g_member_list.tpl (.../2_5_5) (revision 1114)
6214	+++ webapp_biz/modules/biz/templates/g_member_list.tpl (.../2_5_6) (revision 1114)
6215	@@ -1,22 +1,5 @@
6216	-({$inc_html_header\|smarty:nodefaults})
6217	-<body>
6218	-({ext_include file="inc_extension_pagelayout_top.tpl"})
6219	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
6220	-<tr>
6221	-<td class="container inc_page_header">
6222	-({$inc_page_header\|smarty:nodefaults})
6223	-</td>
6224	-</tr>
6225	-<tr>
6226	-<td class="container inc_navi">
6227	-({$inc_navi\|smarty:nodefaults})
6228	-</td>
6229	-</tr>
6230	-<tr>
6231	-<td class="container main_content">
6232	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
6233	-<tr>
6234	-<td class="full_content" align="center">
6235	+({ext_include file="inc_header.tpl"})
6236	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
6237	({***************************})
6238	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
6239	({***************************})
6240	@@ -667,17 +650,5 @@
6241	({***************************})
6242	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
6243	({***************************})
6244	-</td>
6245	-</tr>
6246	-</table>({END:container})
6247	-</td>
6248	-</tr>
6249	-<tr>
6250	-<td class="container inc_page_footer">
6251	-({$inc_page_footer\|smarty:nodefaults})
6252	-</td>
6253	-</tr>
6254	-</table>
6255	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
6256	-</body>
6257	-</html>
6258	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
6259	+({ext_include file="inc_footer.tpl"})
6260	Index: webapp_biz/modules/biz/templates/s_view_schedule.tpl
6261	===================================================================
6262	--- webapp_biz/modules/biz/templates/s_view_schedule.tpl (.../2_5_5) (revision 1114)
6263	+++ webapp_biz/modules/biz/templates/s_view_schedule.tpl (.../2_5_6) (revision 1114)
6264	@@ -1,27 +1,5 @@
6265	-({$inc_html_header\|smarty:nodefaults})
6266	-<body>
6267	-({ext_include file="inc_extension_pagelayout_top.tpl"})
6268	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
6269	-<tr>
6270	-<td class="container inc_page_header">
6271	-({$inc_page_header\|smarty:nodefaults})
6272	-</td>
6273	-</tr>
6274	-<tr>
6275	-<td class="container inc_navi">
6276	-({$inc_navi\|smarty:nodefaults})
6277	-</td>
6278	-</tr>
6279	-<tr>
6280	-<td class="container main_content" align="center">
6281	-
6282	-({assign var=is_no_alert value=true})
6283	-
6284	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
6285	-
6286	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
6287	-<tr>
6288	-<td class="full_content" align="center">
6289	+({ext_include file="inc_header.tpl" INC_HEADER_is_no_alert=true})
6290	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
6291	({***************************})
6292	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
6293	({***************************})
6294	@@ -223,17 +201,5 @@
6295	({***************************})
6296	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
6297	({***************************})
6298	-</td>
6299	-</tr>
6300	-</table>({END:container})
6301	-</td>
6302	-</tr>
6303	-<tr>
6304	-<td class="container inc_page_footer">
6305	-({$inc_page_footer\|smarty:nodefaults})
6306	-</td>
6307	-</tr>
6308	-</table>
6309	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
6310	-</body>
6311	-</html>
6312	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
6313	+({ext_include file="inc_footer.tpl"})
6314	Index: webapp_biz/modules/biz/templates/inc_layoutcolumn_top_165px.tpl
6315	===================================================================
6316	--- webapp_biz/modules/biz/templates/inc_layoutcolumn_top_165px.tpl (.../2_5_5) (revision 0)
6317	+++ webapp_biz/modules/biz/templates/inc_layoutcolumn_top_165px.tpl (.../2_5_6) (revision 1114)
6318	@@ -0,0 +1,7 @@
6319	+<tr>
6320	+<td class="container main_content" align="center">
6321	+
6322	+<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
6323	+<tr>
6324	+<td style="width:7px;"><img src="./skin/dummy.gif" style="width:7px;" class="dummy"></td>({<--spacer})
6325	+<td class="left_content_165" align="center" valign="top">
6326	\ No newline at end of file
6327	Index: webapp_biz/modules/biz/templates/inc_biz_state.tpl
6328	===================================================================
6329	--- webapp_biz/modules/biz/templates/inc_biz_state.tpl (.../2_5_5) (revision 1114)
6330	+++ webapp_biz/modules/biz/templates/inc_biz_state.tpl (.../2_5_6) (revision 1114)
6331	@@ -4,7 +4,7 @@
6332	<input type="hidden" name="sessid" value="({$PHPSESSID})">
6333	<input type="hidden" name="member_id" value="({$target_id})">
6334	({if $is_form})
6335	-<input type="text" name="state" value="({$c_member.nickname})" style="width:112px;text-align:center;" class="bg_02">
6336	+<input type="text" class="text" name="state" value="({$c_member.nickname})" style="width:112px;text-align:center;">
6337	<img src="./skin/dummy.gif" class="v_spacer_s">
6338	<input type="submit" class="submit" value="ãååå¤æ´ã" style="width:112px;">
6339	({/if})
6340	Index: webapp_biz/modules/biz/templates/inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl
6341	===================================================================
6342	--- webapp_biz/modules/biz/templates/inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl (.../2_5_5) (revision 0)
6343	+++ webapp_biz/modules/biz/templates/inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl (.../2_5_6) (revision 1114)
6344	@@ -0,0 +1,5 @@
6345	+</td>
6346	+</tr>
6347	+</table>({END:container})
6348	+</td>
6349	+</tr>
6350	Index: webapp_biz/modules/biz/templates/h_biz_group_add.tpl
6351	===================================================================
6352	--- webapp_biz/modules/biz/templates/h_biz_group_add.tpl (.../2_5_5) (revision 1114)
6353	+++ webapp_biz/modules/biz/templates/h_biz_group_add.tpl (.../2_5_6) (revision 1114)
6354	@@ -1,25 +1,5 @@
6355	-({$inc_html_header\|smarty:nodefaults})
6356	-<body>
6357	-({ext_include file="inc_extension_pagelayout_top.tpl"})
6358	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
6359	-<tr>
6360	-<td class="container inc_page_header">
6361	-({$inc_page_header\|smarty:nodefaults})
6362	-</td>
6363	-</tr>
6364	-<tr>
6365	-<td class="container inc_navi">
6366	-({$inc_navi\|smarty:nodefaults})
6367	-</td>
6368	-</tr>
6369	-<tr>
6370	-<td class="container main_content" align="center">
6371	-
6372	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
6373	-
6374	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
6375	-<tr>
6376	-<td class="full_content" align="center">
6377	+({ext_include file="inc_header.tpl"})
6378	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
6379	({***************************})
6380	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
6381	({***************************})
6382	@@ -78,7 +58,7 @@
6383
6384	<div class="padding_s">
6385
6386	-<input name="name" size="50" value="({$name})">
6387	+<input type="text" class="text" name="name" size="50" value="({$name})">
6388
6389	</div>
6390
6391	@@ -106,7 +86,7 @@
6392
6393	<div class="padding_s">
6394
6395	-<textarea name="info" rows="6" cols="50">({$info})</textarea>
6396	+<textarea class="text" name="info" rows="6" cols="50">({$info})</textarea>
6397
6398	</div>
6399
6400	@@ -306,17 +286,5 @@
6401	({***************************})
6402	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
6403	({***************************})
6404	-</td>
6405	-</tr>
6406	-</table>({END:container})
6407	-</td>
6408	-</tr>
6409	-<tr>
6410	-<td class="container inc_page_footer">
6411	-({$inc_page_footer\|smarty:nodefaults})
6412	-</td>
6413	-</tr>
6414	-</table>
6415	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
6416	-</body>
6417	-</html>
6418	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
6419	+({ext_include file="inc_footer.tpl"})
6420	Index: webapp_biz/modules/biz/templates/inc_extension_pagelayout_bottom.tpl
6421	===================================================================
6422	--- webapp_biz/modules/biz/templates/inc_extension_pagelayout_bottom.tpl (.../2_5_5) (revision 1114)
6423	+++ webapp_biz/modules/biz/templates/inc_extension_pagelayout_bottom.tpl (.../2_5_6) (revision 1114)
6424	@@ -1,44 +0,0 @@
6425	-</td>
6426	-
6427	-({if $side_banner_html_before \|\| $side_banner_html_after \|\| $inc_side_banner})
6428	-
6429	-<td class="ext_sub_container_right" align="left" valign="top">
6430	-({**********************************})
6431	-({ããããï¼ãµã¤ãã³ã³ãã³ãé å})
6432	-({**********************************})
6433	-
6434	-<div style="margin-left:10px">
6435	-({strip})
6436	-({if $side_banner_html_before \|\| $side_banner_html_after})
6437	- ({if $before_after == 'before'})
6438	- ({$side_banner_html_before\|smarty:nodefaults})
6439	- ({else})
6440	- ({$side_banner_html_after\|smarty:nodefaults})
6441	- ({/if})
6442	-({else})
6443	- ({if $inc_side_banner.a_href})
6444	- ({if $PHPSESSID})
6445	- <a href="({t_url m=pc a=do_h_click_banner})&target_c_banner_id=({$inc_side_banner.c_banner_id})&sessid=({$PHPSESSID})" target="_blank">
6446	- ({else})
6447	- <a href="({t_url m=pc a=do_o_click_banner})&target_c_banner_id=({$inc_side_banner.c_banner_id})" target="_blank">
6448	- ({/if})
6449	- <img src="({t_img_url filename=$inc_side_banner.image_filename})">
6450	- </a>
6451	- ({else})
6452	- <img src="({t_img_url filename=$inc_side_banner.image_filename})">
6453	- ({/if})
6454	-({/if})
6455	-({/strip})
6456	-</div>
6457	-
6458	-({**********************************})
6459	-({ããã¾ã§ï¼ãµã¤ãã³ã³ãã³ãé å})
6460	-({**********************************})
6461	-</td>
6462	-({/if})
6463	-</tr>
6464	-</table>
6465	-
6466	-</div>
6467	-
6468	-({$inc_extension_pagelayout_bottom\|smarty:nodefaults})
6469	Index: webapp_biz/modules/biz/templates/inc_extension_pagelayout_top.tpl
6470	===================================================================
6471	--- webapp_biz/modules/biz/templates/inc_extension_pagelayout_top.tpl (.../2_5_5) (revision 1114)
6472	+++ webapp_biz/modules/biz/templates/inc_extension_pagelayout_top.tpl (.../2_5_6) (revision 1114)
6473	@@ -1,7 +0,0 @@
6474	-<div align="left">
6475	-
6476	-<table class="ext_sub_container" border="0" cellspacing="0" cellpadding="0">
6477	-<tr>
6478	-<td class="ext_sub_container_left" align="left" valign="top">
6479	-
6480	-({$inc_extension_pagelayout_top\|smarty:nodefaults})
6481	\ No newline at end of file
6482	Index: webapp_biz/modules/ktai_biz/page/fh_calendar_week.php
6483	===================================================================
6484	--- webapp_biz/modules/ktai_biz/page/fh_calendar_week.php (.../2_5_5) (revision 1114)
6485	+++ webapp_biz/modules/ktai_biz/page/fh_calendar_week.php (.../2_5_6) (revision 1114)
6486	@@ -61,7 +61,7 @@
6487	$birth_list = p_h_calendar_birth4c_member_id($m, $target_id);
6488
6489	//ã¹ã±ã¸ã¥ã¼ã«
6490	- $schedule = biz_getDateMemberSchedule($y,$m,$d,$target_id);
6491	+ $schedule = biz_getDateMemberSchedule($y,$m,$d,$target_id,$u);
6492
6493	$banner = biz_isBannerSchedule($y, $m, $d, $target_id);
6494
6495	Index: webapp_biz/modules/ktai_biz/templates/fh_biz_schedule_add.tpl
6496	===================================================================
6497	--- webapp_biz/modules/ktai_biz/templates/fh_biz_schedule_add.tpl (.../2_5_5) (revision 1114)
6498	+++ webapp_biz/modules/ktai_biz/templates/fh_biz_schedule_add.tpl (.../2_5_6) (revision 1114)
6499	@@ -8,15 +8,15 @@
6500	({t_form m=ktai_biz a=do_fhg_biz_schedule_add})
6501	<input type="hidden" name="ksid" value="({$PHPSESSID})">
6502
6503	-äºå®æ¥ï¼<input type="text" name='sc_b_year' size="2" value="({$now.year})">å¹´
6504	- <input type="text" name='sc_b_month' size="2" value="({$now.month})">æ
6505	- <input type="text" name='sc_b_date' size="2" value="({$now.day})">æ¥<br>
6506	+äºå®æ¥ï¼<input type="text" name='sc_b_year' size="2" value="({$now.year})" istyle="4" mode="numeric">å¹´
6507	+ <input type="text" name='sc_b_month' size="2" value="({$now.month})" istyle="4" mode="numeric">æ
6508	+ <input type="text" name='sc_b_date' size="2" value="({$now.day})" istyle="4" mode="numeric">æ¥<br>
6509
6510	-æå»ï¼<input type="text" name='sc_b_hour' size="2">æ
6511	- <input type="text" name='sc_b_minute' size="2">å
6512	+æå»ï¼<input type="text" name='sc_b_hour' size="2" istyle="4" mode="numeric">æ
6513	+ <input type="text" name='sc_b_minute' size="2" istyle="4" mode="numeric">å
6514	ï½
6515	- <input type="text" name='sc_f_hour' size="2">æ
6516	- <input type="text" name='sc_f_minute' size="2">å<br>
6517	+ <input type="text" name='sc_f_hour' size="2" istyle="4" mode="numeric">æ
6518	+ <input type="text" name='sc_f_minute' size="2" istyle="4" mode="numeric">å<br>
6519
6520	ï¾ï½²ï¾ï¾ï¼<input type="text" name='sc_title' size="30"><br>
6521
6522	Index: webapp/lib/smarty_plugins/modifier.t_cmd.php
6523	===================================================================
6524	--- webapp/lib/smarty_plugins/modifier.t_cmd.php (.../2_5_5) (revision 1114)
6525	+++ webapp/lib/smarty_plugins/modifier.t_cmd.php (.../2_5_6) (revision 1114)
6526	@@ -4,19 +4,24 @@
6527	* @license http://www.php.net/license/3_01.txt PHP License 3.01
6528	*/
6529
6530	-function smarty_modifier_t_cmd($string)
6531	+function smarty_modifier_t_cmd($string, $type = '')
6532	{
6533	if (!OPENPNE_USE_CMD_TAG) {
6534	return $string;
6535	}
6536	+
6537	$regexp = '/<cmd\s+src="([\w\.]+)"\s+args="([\w-\+%]+(,[\w-\+%]+))"\s>/i';
6538	- $string = preg_replace_callback($regexp, '_smarty_modifier_t_cmd_make_js', $string);
6539	- return $string;
6540	+ $GLOBALS['_CMD']['type'] = $type;
6541
6542	+ return preg_replace_callback($regexp, '_smarty_modifier_t_cmd_make_js', $string);
6543	+
6544	}
6545
6546	function _smarty_modifier_t_cmd_make_js($matches)
6547	{
6548	+ if (!db_is_use_cmd($matches[1], $GLOBALS['_CMD']['type'])) {
6549	+ return $matches[0];
6550	+ }
6551
6552	$src = $matches[1];
6553	$args = $matches[2];
6554	Index: webapp/lib/smarty_plugins/function.ext_include.php
6555	===================================================================
6556	--- webapp/lib/smarty_plugins/function.ext_include.php (.../2_5_5) (revision 1114)
6557	+++ webapp/lib/smarty_plugins/function.ext_include.php (.../2_5_6) (revision 1114)
6558	@@ -25,9 +25,13 @@
6559	}
6560	$tpl = 'file:' . $tpl;
6561
6562	- $params['smarty_include_tpl_file'] = $tpl;
6563	- $params['smarty_include_vars'] = array();
6564	- $smarty->_smarty_include($params);
6565	+ $arg_list = $params;
6566	+ unset($arg_list['file']);
6567	+
6568	+ $p = array();
6569	+ $p['smarty_include_tpl_file'] = $tpl;
6570	+ $p['smarty_include_vars'] = $arg_list;
6571	+ $smarty->_smarty_include($p);
6572	return;
6573	}
6574
6575	Index: webapp/lib/smarty_plugins/modifier.t_url2cmd.php
6576	===================================================================
6577	--- webapp/lib/smarty_plugins/modifier.t_url2cmd.php (.../2_5_5) (revision 1114)
6578	+++ webapp/lib/smarty_plugins/modifier.t_url2cmd.php (.../2_5_6) (revision 1114)
6579	@@ -4,7 +4,7 @@
6580	* @license http://www.php.net/license/3_01.txt PHP License 3.01
6581	*/
6582
6583	-function smarty_modifier_t_url2cmd($string)
6584	+function smarty_modifier_t_url2cmd($string, $type = '')
6585	{
6586	// "(") ã¨ '(') ãåã«æ»ã
6587	$search = array('"', ''');
6588	@@ -12,6 +12,8 @@
6589	$string = str_replace($search, $replace, $string);
6590
6591	$url_pattern = "/https?:\/\/([a-zA-Z0-9-.]+)\/?[\w\-.,:;\~\^\/?\@&=+\$%#!()]*/";
6592	+ $GLOBALS['_CMD']['type'] = $type;
6593	+
6594	return preg_replace_callback($url_pattern, '_smarty_modifier_t_cmd_make_url_js', $string);
6595	}
6596
6597	@@ -21,7 +23,7 @@
6598	$file = $matches[1] . '.js';
6599	$path = './cmd/' . $file;
6600
6601	- if (!OPENPNE_USE_CMD_TAG \|\| !is_readable($path)) {
6602	+ if (!OPENPNE_USE_CMD_TAG \|\| !db_is_use_cmd($matches[1], $GLOBALS['_CMD']['type']) \|\| !is_readable($path)) {
6603	// t_url2a
6604	return pne_url2a($url);
6605	}
6606	Index: webapp/lib/db/diary.php
6607	===================================================================
6608	--- webapp/lib/db/diary.php (.../2_5_5) (revision 1114)
6609	+++ webapp/lib/db/diary.php (.../2_5_6) (revision 1114)
6610	@@ -930,13 +930,6 @@
6611	return array($lst, $prev, $next, $total_num);
6612	}
6613
6614	-?>
6615	-<?php
6616	-/**
6617	- * @copyright 2005-2006 OpenPNE Project
6618	- * @license http://www.php.net/license/3_01.txt PHP License 3.01
6619	- */
6620	-
6621	//--- diary
6622
6623	/**
6624	Index: webapp/lib/db/api.php
6625	===================================================================
6626	--- webapp/lib/db/api.php (.../2_5_5) (revision 1114)
6627	+++ webapp/lib/db/api.php (.../2_5_6) (revision 1114)
6628	@@ -15,13 +15,6 @@
6629	}
6630	}
6631
6632	-?>
6633	-<?php
6634	-/**
6635	- * @copyright 2005-2006 OpenPNE Project
6636	- * @license http://www.php.net/license/3_01.txt PHP License 3.01
6637	- */
6638	-
6639	function db_api_insert_token($c_member_id, $token = '')
6640	{
6641	if (!$token) $token = create_hash();
6642	@@ -63,4 +56,27 @@
6643	return $api_session_id;
6644	}
6645
6646	+
6647	+//APIðêÂæ¾
6648	+function db_api_get_c_api_one($name)
6649	+{
6650	+ $sql = 'SELECT * FROM c_api WHERE name = ?';
6651	+ $params = array(strval($name));
6652	+
6653	+ return db_get_row($sql, $params);
6654	+}
6655	+
6656	+//APIªÂµÄ¢éIP©Ç¤©`FbN·é
6657	+function db_api_check_ip($name, $ip)
6658	+{
6659	+ $api = db_api_get_c_api_one($name);
6660	+ if ($api['ip'] == '*' \|\| $api['ip'] == $ip) {
6661	+ return true;
6662	+ } else {
6663	+ return false;
6664	+ }
6665	+}
6666	+
6667	+
6668	+
6669	?>
6670	Index: webapp/lib/db/etc.php
6671	===================================================================
6672	--- webapp/lib/db/etc.php (.../2_5_5) (revision 1114)
6673	+++ webapp/lib/db/etc.php (.../2_5_6) (revision 1114)
6674	@@ -701,4 +701,34 @@
6675	return db_insert('c_navi', $data);
6676	}
6677
6678	+//å°çªã®ä½¿ç¨ç¯å²ããã§ãã¯
6679	+function db_is_use_cmd($src, $type)
6680	+{
6681	+ $sql = 'SELECT * FROM c_cmd WHERE name = ?';
6682	+ $params = array(strval($src));
6683	+ $c_cmd = db_get_row($sql, $params);
6684	+
6685	+ $permit_list = db_get_permit_list();
6686	+
6687	+ foreach ($permit_list as $key => $name) {
6688	+ if (($c_cmd['permit'] & $key)
6689	+ && preg_match('/'.$c_cmd['name'].'/', $src)
6690	+ && $name == $type) {
6691	+ return true;
6692	+ }
6693	+ }
6694	+
6695	+ return false;
6696	+}
6697	+
6698	+//å°çªã®ä½¿ç¨ç¯å²ã®ãªã¹ã
6699	+function db_get_permit_list()
6700	+{
6701	+ return array(
6702	+ '1' => 'community',
6703	+ '2' => 'diary',
6704	+ '4' => 'profile',
6705	+ );
6706	+}
6707	+
6708	?>
6709	Index: webapp/modules/pc/init.inc
6710	===================================================================
6711	--- webapp/modules/pc/init.inc (.../2_5_5) (revision 1114)
6712	+++ webapp/modules/pc/init.inc (.../2_5_6) (revision 1114)
6713	@@ -24,17 +24,7 @@
6714
6715	$is_secure = $GLOBALS['__Framework']['is_secure'];
6716
6717	- //---- inc_ ãã³ãã¬ã¼ãç¨ å¤æ° ----//
6718	- $smarty->assign('inc_html_header', fetch_inc_html_header());
6719	- $smarty->assign('inc_page_footer', fetch_inc_page_footer($is_secure));
6720	- $smarty->assign('inc_extension_pagelayout_top', p_common_c_siteadmin4target_pagename('inc_page_top'));
6721	- $smarty->assign('inc_extension_pagelayout_bottom', p_common_c_siteadmin4target_pagename('inc_page_bottom'));
6722	- $smarty->assign('inc_side_banner', db_banner_get_side_banner($is_secure));
6723	- $smarty->assign('side_banner_html_before', p_common_c_siteadmin4target_pagename('side_banner_html_before'));
6724	- $smarty->assign('side_banner_html_after', p_common_c_siteadmin4target_pagename('side_banner_html_after'));
6725	-
6726	if ($is_secure) {
6727	- $smarty->assign('inc_page_header', fetch_inc_page_header());
6728	@session_start();
6729	$smarty->assign('PHPSESSID', md5(session_id()));
6730	$smarty->assign('before_after', 'after');
6731	@@ -44,6 +34,39 @@
6732	} else {
6733	$smarty->assign('before_after', 'before');
6734	}
6735	+
6736	+ // INC_HEADER_* (inc_header.tpl)
6737	+
6738	+ if (SNS_TITLE) {
6739	+ $title = SNS_TITLE;
6740	+ } else {
6741	+ $title = SNS_NAME;
6742	+ }
6743	+ $smarty->assign('INC_HEADER_title', $title);
6744	+ $smarty->assign('INC_HEADER_inc_html_head', p_common_c_siteadmin4target_pagename('inc_html_head'));
6745	+ $smarty->assign('INC_HEADER_inc_custom_css', p_common_c_siteadmin4target_pagename('inc_custom_css'));
6746	+ $smarty->assign('INC_HEADER_color_config', db_select_c_sns_config());
6747	+ $smarty->assign('INC_HEADER_top_banner', db_banner_get_top_banner($is_secure));
6748	+ if ($is_secure) {
6749	+ $smarty->assign('INC_HEADER_top_banner_html_after', p_common_c_siteadmin4target_pagename('top_banner_html_after'));
6750	+ $smarty->assign('INC_HEADER_global_navi', util_get_c_navi('global'));
6751	+ } else {
6752	+ $smarty->assign('INC_HEADER_top_banner_html_before', p_common_c_siteadmin4target_pagename('top_banner_html_before'));
6753	+ }
6754	+ $smarty->assign('INC_HEADER_inc_page_top', p_common_c_siteadmin4target_pagename('inc_page_top'));
6755	+
6756	+ // INC_FOOTER_* (inc_footer.tpl)
6757	+
6758	+ if ($is_secure) {
6759	+ $name = 'inc_page_footer_after';
6760	+ } else {
6761	+ $name = 'inc_page_footer_before';
6762	+ }
6763	+ $smarty->assign('INC_FOOTER_inc_page_footer', p_common_c_siteadmin4target_pagename($name));
6764	+ $smarty->assign('INC_FOOTER_inc_page_bottom', p_common_c_siteadmin4target_pagename('inc_page_bottom'));
6765	+ $smarty->assign('INC_FOOTER_inc_side_banner', db_banner_get_side_banner($is_secure));
6766	+ $smarty->assign('INC_FOOTER_side_banner_html_before', p_common_c_siteadmin4target_pagename('side_banner_html_before'));
6767	+ $smarty->assign('INC_FOOTER_side_banner_html_after', p_common_c_siteadmin4target_pagename('side_banner_html_after'));
6768	}
6769
6770	function init_pc_do()
6771	Index: webapp/modules/pc/templates/c_join_commu_2.tpl
6772	===================================================================
6773	--- webapp/modules/pc/templates/c_join_commu_2.tpl (.../2_5_5) (revision 1114)
6774	+++ webapp/modules/pc/templates/c_join_commu_2.tpl (.../2_5_6) (revision 1114)
6775	@@ -1,22 +1,5 @@
6776	-({$inc_html_header\|smarty:nodefaults})
6777	-<body>
6778	-({ext_include file="inc_extension_pagelayout_top.tpl"})
6779	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
6780	-<tr>
6781	-<td class="container inc_page_header">
6782	-({$inc_page_header\|smarty:nodefaults})
6783	-</td>
6784	-</tr>
6785	-<tr>
6786	-<td class="container inc_navi">
6787	-({$inc_navi\|smarty:nodefaults})
6788	-</td>
6789	-</tr>
6790	-<tr>
6791	-<td class="container main_content">
6792	-
6793	-<table class="container" border="0" cellspacing="0" cellpadding="0">
6794	-<tr><td class="full_content" align="center">
6795	+({ext_include file="inc_header.tpl"})
6796	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
6797	({***************************})
6798	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
6799	({***************************})
6800	@@ -108,16 +91,5 @@
6801	({***************************})
6802	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
6803	({***************************})
6804	-</td></tr>
6805	-</table>({END:container})
6806	-</td>
6807	-</tr>
6808	-<tr>
6809	-<td class="container inc_page_footer">
6810	-({$inc_page_footer\|smarty:nodefaults})
6811	-</td>
6812	-</tr>
6813	-</table>
6814	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
6815	-</body>
6816	-</html>
6817	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
6818	+({ext_include file="inc_footer.tpl"})
6819	Index: webapp/modules/pc/templates/h_home.tpl
6820	===================================================================
6821	--- webapp/modules/pc/templates/h_home.tpl (.../2_5_5) (revision 1114)
6822	+++ webapp/modules/pc/templates/h_home.tpl (.../2_5_6) (revision 1114)
6823	@@ -1,56 +1,150 @@
6824	-({$inc_html_header\|smarty:nodefaults})
6825	-<body>
6826	-({ext_include file="inc_extension_pagelayout_top.tpl"})
6827	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
6828	+({ext_include file="inc_header.tpl" no_use_alert=true})
6829	+({if $smarty.const.DISPLAY_SEARCH_HOME})
6830	<tr>
6831	-<td class="container inc_page_header">
6832	-({$inc_page_header\|smarty:nodefaults})
6833	+<td class="container inc_search_box">
6834	+({**************************************})
6835	+({ããããï¼æ§inc_search_box.tplã®åå®¹})
6836	+({**************************************})
6837	+<table border="0" cellspacing="0" cellpadding="0" style="width:720px;">
6838	+<tr>
6839	+<td style="width:720px;height:2px;"><img src="./skin/dummy.gif" style="width:720px;height:2px;" class="dummy"></td>
6840	+</tr>
6841	+<tr>
6842	+<td align="center">
6843	+
6844	+({ããããï¼æ¬ä½})
6845	+<div class="bg_09" style="width:680px;height:24px;border-left:none 0px;border-right:none 0px;border-top:none 0px;">
6846	+({t_form m=pc a=do_h_home_search})
6847	+<input type="hidden" name="sessid" value="({$PHPSESSID})">
6848	+
6849	+<table border="0" cellspacing="0" cellpadding="0" class="search_bar" style="width:680px;height:24px;">
6850	+<tr>
6851	+<td align="center" style="height:24px;">
6852	+<img src="({t_img_url_skin filename=icon_search})" alt="search" style="width:62px;height:20px;" class="icon">
6853	+<input type="text" size="30" name="q" class="text border_01" value="" style="width:180px;">
6854	+<input type="image" src="({t_img_url_skin filename=button_search_1})" value="diary" alt="æ¥è¨" border="0" name="diary" class="button" style="width:62px;height:20px;">
6855	+<input type="image" src="({t_img_url_skin filename=button_search_2})" value="community" alt="ã³ãã¥ããã£" border="0" name="community" class="button" style="width:62px;height:20px;">
6856	+<input type="image" src="({t_img_url_skin filename=button_search_4})" value="message" alt="ã¡ãã»ã¼ã¸" border="0" name="message" class="button" style="width:62px;height:20px;">
6857	+({if $smarty.const.USE_EXTRA_SERVICE})
6858	+<input type="image" src="({t_img_url_skin filename=button_search_3})" value="web" alt="web" border="0" name="web" class="button" style="width:62px;height:20px;">
6859	+({/if})
6860	</td>
6861	</tr>
6862	-({if $inc_entry_point[1]})
6863	+</table>
6864	+
6865	+</form>
6866	+</div>
6867	+({ããã¾ã§ï¼æ¬ä½})
6868	+
6869	+</td>
6870	+</tr>
6871	+</table>
6872	+({**************************************})
6873	+({ããã¾ã§ï¼æ§inc_search_box.tplã®åå®¹})
6874	+({**************************************})
6875	+</td>
6876	+</tr>
6877	+({/if})
6878	+({if $birthday_flag})
6879	<tr>
6880	-<td class="container">
6881	-({$inc_entry_point[1]\|smarty:nodefaults})
6882	+<td class="container" align="center">
6883	+
6884	+<div class="padding_s">
6885	+
6886	+<img src="({t_img_url_skin filename=birthday_h})">
6887	+
6888	+</div>
6889	+
6890	</td>
6891	</tr>
6892	({/if})
6893	<tr>
6894	-<td class="container inc_navi">
6895	-({$inc_navi\|smarty:nodefaults})
6896	+<td class="container inc_info">
6897	+
6898	+({********************************})
6899	+({ããããï¼æ§inc_info.tplã®åå®¹})
6900	+({********************************})
6901	+<!--ãã¤ã³ãã©ã¡ã¼ã·ã§ã³ãï¼ãã«ã¬ã³ãã¼ã-->
6902	+<table border="0" cellspacing="0" cellpadding="0" style="width:720px;" class="info">
6903	+<tr>
6904	+<td style="width:5px;"><img src="./skin/dummy.gif" style="width:5px;height:1px;" class="dummy"></td>
6905	+<td style="width:715px;" align="center" valign="middle">
6906	+
6907	+<!--ããããï¼éå¶èããã®ãç¥ãã-->
6908	+<table border="0" cellspacing="0" cellpadding="0" style="width:715px;" class="info_body">
6909	+<tr>
6910	+<td align="center" class="border_07 bg_11" style="width:105px;border-right:none;"><img src="({t_img_url_skin filename=icon_information})" alt="ãç¥ãã"></td>
6911	+<td class="border_07 bg_02" style="width:610px;">
6912	+
6913	+<table border="0" cellspacing="0" cellpadding="0" style="width:610px;">
6914	+<tr>
6915	+<td class="padding_s">
6916	+
6917	+({$site_info\|smarty:nodefaults\|default:" "})
6918	+
6919	</td>
6920	</tr>
6921	-({if $inc_entry_point[2]})
6922	+({if $num_f_confirm_list})
6923	<tr>
6924	-<td class="container">
6925	-({$inc_entry_point[2]\|smarty:nodefaults})
6926	+<td class="padding_s">
6927	+
6928	+â<span class="caution">æ¿èªå¾ã¡ã®ã¡ã³ãã¼ã({$num_f_confirm_list})åãã¾ãï¼</span> <a href="({t_url m=pc a=page_h_confirm_list})"><span class="b_b">æ¿èªã»æå¦</span></a>
6929	+
6930	</td>
6931	</tr>
6932	({/if})
6933	-({if $smarty.const.DISPLAY_SEARCH_HOME})
6934	+({if $num_message_not_is_read})
6935	<tr>
6936	-<td class="container inc_search_box">
6937	-({ext_include file="inc_search_box.tpl"})
6938	+<td class="padding_s">
6939	+
6940	+â<span class="caution">æ°çã¡ãã»ã¼ã¸ã({$num_message_not_is_read})ä»¶ããã¾ãï¼</span> <a href="({t_url m=pc a=page_h_message_box})"><span class="b_b">ã¡ãã»ã¼ã¸ãèªã</span></a>
6941	+
6942	</td>
6943	</tr>
6944	({/if})
6945	-({if $birthday_flag})
6946	+({if $num_diary_not_is_read})
6947	<tr>
6948	-<td class="container" align="center">
6949	+<td class="padding_s">
6950
6951	-<div class="padding_s">
6952	+â<span class="caution">({$num_diary_not_is_read})ä»¶ã®æ¥è¨ã«å¯¾ãã¦æ°çã³ã¡ã³ããããã¾ãï¼</span> <a href="({t_url m=pc a=page_fh_diary})&target_c_diary_id=({$first_diary_read})"><span class="caution">æ¥è¨ãè¦ã</span></a>
6953
6954	-<img src="({t_img_url_skin filename=birthday_h})">
6955	+</td>
6956	+</tr>
6957	+({/if})
6958	+({if $num_h_confirm_list})
6959	+<tr>
6960	+<td class="padding_s">
6961
6962	-</div>
6963	+â<span class="caution">ã³ãã¥ããã£åå æ¿èªå¾ã¡ã®ã¡ã³ãã¼ã({$num_h_confirm_list})åãã¾ãï¼</span> <a href="({t_url m=pc a=page_h_confirm_list})"><span class="b_b">æ¿èªã»æå¦</span></a>
6964
6965	</td>
6966	</tr>
6967	({/if})
6968	+({if $anatani_c_commu_admin_confirm_list})
6969	<tr>
6970	-<td class="container inc_info">
6971	-({ext_include file="inc_info.tpl"})
6972	+<td class="padding_s">
6973	+
6974	+â<span class="caution">ã³ãã¥ããã£ç®¡çäººäº¤ä»£ä¾é ¼ã({$num_anatani_c_commu_admin_confirm_list})ä»¶ãã¦ãã¾ãã</span> <a href="({t_url m=pc a=page_h_confirm_list})"><span class="b_b">æ¿èªã»æå¦</span></a>
6975	+
6976	</td>
6977	</tr>
6978	+({/if})
6979	+</table>
6980	+
6981	+</td>
6982	+</tr>
6983	+</table>
6984	+<!--ããã¾ã§ï¼éå¶èããã®ãç¥ãã-->
6985	+
6986	+</td>
6987	+</tr>
6988	+</table>
6989	+({********************************})
6990	+({ããã¾ã§ï¼æ§inc_info.tplã®åå®¹})
6991	+({********************************})
6992	+
6993	+</td>
6994	+</tr>
6995	({if $inc_entry_point[3]})
6996	<tr>
6997	<td class="container">
6998	@@ -58,12 +152,8 @@
6999	</td>
7000	</tr>
7001	({/if})
7002	-<tr>
7003	-<td class="container main_content">
7004	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
7005	-<tr>
7006	-<td style="width:5px;"><img src="./skin/dummy.gif" style="width:5px;" class="dummy"></td>({<--spacer})
7007	-<td class="left_content" valign="top">
7008	+({ext_include file="inc_layoutcolumn_top_270px.tpl"})
7009	+
7010	({********************************})
7011	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å·¦ï¼})
7012	({********************************})
7013	@@ -778,9 +868,7 @@
7014	({********************************})
7015	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å·¦ï¼})
7016	({********************************})
7017	-</td>
7018	-<td style="width:5px;"><img src="./skin/dummy.gif" style="width:5px;" class="dummy"></td>({<--spacer})
7019	-<td class="right_content" valign="top">
7020	+({ext_include file="inc_layoutcolumn_middle_270px.tpl"})
7021	({********************************})
7022	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å³ï¼})
7023	({********************************})
7024	@@ -817,7 +905,7 @@
7025	({/if})
7026	<div class="border_01 bg_02 padding_s" align="left">
7027
7028	-äºå® <input type="text" name="title" value="" size="24">
7029	+äºå® <input type="text" class="text" name="title" value="" size="24">
7030	<select name="start_date">
7031	({foreach from=$calendar item=item})
7032	<option value="({$item.year})-({$item.month})-({$item.day})"({if $item.now}) selected="selected"({/if})>({$item.month})/({$item.day})(({$item.dayofweek}))</option>
7033	@@ -939,7 +1027,7 @@
7034	<td class="border_01 bg_02 padding_s" style="width:332px;border-top:none;">
7035
7036	({foreach from=$c_diary_friend_list item=item})
7037	-<img src="./skin/dummy.gif" style="width:14px;height:14px;" class="icon icon_1">({$item.r_datetime\|date_format:"%mæ%dæ¥"})â¦ <a href="({t_url m=pc a=page_fh_diary})&target_c_diary_id=({$item.c_diary_id})&comment_count=({$item.count_comments})">({$item.subject\|default:" "}) (({$item.count_comments\|default:0}))</a>
7038	+<img src="./skin/dummy.gif" style="width:14px;height:14px;clear:both;" class="icon icon_1">({$item.r_datetime\|date_format:"%mæ%dæ¥"})â¦ <a href="({t_url m=pc a=page_fh_diary})&target_c_diary_id=({$item.c_diary_id})&comment_count=({$item.count_comments})">({$item.subject\|default:" "}) (({$item.count_comments\|default:0}))</a>
7039	(({$item.nickname\|default:" "}))
7040	({if $item.image_filename_1 \|\| $item.image_filename_2 \|\| $item.image_filename_3})<img src="({t_img_url_skin filename=icon_camera})" class="icon">({/if})<br>
7041	({/foreach})
7042	@@ -1486,17 +1574,5 @@
7043	({********************************})
7044	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å³ï¼})
7045	({********************************})
7046	-</td>
7047	-</tr>
7048	-</table>({END:container})
7049	-</td>
7050	-</tr>
7051	-<tr>
7052	-<td class="container inc_page_footer">
7053	-({$inc_page_footer\|smarty:nodefaults})
7054	-</td>
7055	-</tr>
7056	-</table>
7057	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
7058	-</body>
7059	-</html>
7060	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
7061	+({ext_include file="inc_footer.tpl"})
7062	Index: webapp/modules/pc/templates/c_invite.tpl
7063	===================================================================
7064	--- webapp/modules/pc/templates/c_invite.tpl (.../2_5_5) (revision 1114)
7065	+++ webapp/modules/pc/templates/c_invite.tpl (.../2_5_6) (revision 1114)
7066	@@ -1,25 +1,6 @@
7067	-({$inc_html_header\|smarty:nodefaults})
7068	-<body>
7069	-({ext_include file="inc_extension_pagelayout_top.tpl"})
7070	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
7071	-<tr>
7072	-<td class="container inc_page_header">
7073	-({$inc_page_header\|smarty:nodefaults})
7074	-</td>
7075	-</tr>
7076	-<tr>
7077	-<td class="container inc_navi">
7078	-({$inc_navi\|smarty:nodefaults})
7079	-</td>
7080	-</tr>
7081	-<tr>
7082	-<td class="container main_content" align="center">
7083	+({ext_include file="inc_header.tpl"})
7084	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
7085
7086	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
7087	-
7088	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
7089	-<tr>
7090	-<td class="full_content" align="center">
7091	({***************************})
7092	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
7093	({***************************})
7094	@@ -171,7 +152,7 @@
7095
7096	<div class="padding_s">
7097
7098	-<textarea name="body" rows="6" cols="50"></textarea>
7099	+<textarea class="text" name="body" rows="6" cols="50"></textarea>
7100
7101	</div>
7102
7103	@@ -230,19 +211,5 @@
7104	({***************************})
7105	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
7106	({***************************})
7107	-</td>
7108	-</tr>
7109	-</table>({END:container})
7110	-</td>
7111	-</tr>
7112	-<tr>
7113	-<td class="container inc_page_footer">
7114	-({$inc_page_footer\|smarty:nodefaults})
7115	-</td>
7116	-</tr>
7117	-</table>
7118	-
7119	-
7120	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
7121	-</body>
7122	-</html>
7123	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
7124	+({ext_include file="inc_footer.tpl"})
7125	Index: webapp/modules/pc/templates/h_config_prof.tpl
7126	===================================================================
7127	--- webapp/modules/pc/templates/h_config_prof.tpl (.../2_5_5) (revision 1114)
7128	+++ webapp/modules/pc/templates/h_config_prof.tpl (.../2_5_6) (revision 1114)
7129	@@ -1,25 +1,6 @@
7130	-({$inc_html_header\|smarty:nodefaults})
7131	-<body>
7132	-({ext_include file="inc_extension_pagelayout_top.tpl"})
7133	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
7134	-<tr>
7135	-<td class="container inc_page_header">
7136	-({$inc_page_header\|smarty:nodefaults})
7137	-</td>
7138	-</tr>
7139	-<tr>
7140	-<td class="container inc_navi">
7141	-({$inc_navi\|smarty:nodefaults})
7142	-</td>
7143	-</tr>
7144	-<tr>
7145	-<td class="container main_content" align="center">
7146	+({ext_include file="inc_header.tpl"})
7147	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
7148
7149	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
7150	-
7151	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
7152	-<tr>
7153	-<td class="full_content" align="center">
7154	({***************************})
7155	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
7156	({***************************})
7157	@@ -83,7 +64,7 @@
7158
7159	<div class="padding_s">
7160
7161	-<input name="nickname" value="({$c_member.nickname})" size="30"><br>
7162	+<input type="text" class="text" name="nickname" value="({$c_member.nickname})" size="30"><br>
7163
7164	</div>
7165
7166	@@ -117,7 +98,7 @@
7167
7168	<div class="padding_s">
7169
7170	-<input name="birth_year" value="({$c_member.birth_year})" size="10" maxlength="4">å¹´
7171	+<input type="text" class="text" name="birth_year" value="({$c_member.birth_year})" size="10" maxlength="4">å¹´
7172
7173	</div>
7174
7175	@@ -234,11 +215,11 @@
7176
7177	({strip})
7178	({if $profile.form_type == 'text'})
7179	- <input type="text" size="30" name="profile[({$profile.name})]" value="({$c_member.profile[$profile.name].value})">
7180	+ <input type="text" class="text" size="30" name="profile[({$profile.name})]" value="({$c_member.profile[$profile.name].value})">
7181	({elseif $profile.form_type == 'textlong'})
7182	<input type="text" size="60" name="profile[({$profile.name})]" value="({$c_member.profile[$profile.name].value})">
7183	({elseif $profile.form_type == 'textarea'})
7184	- <textarea name="profile[({$profile.name})]" rows="6" cols="50">({$c_member.profile[$profile.name].value})</textarea>
7185	+ <textarea class="text" name="profile[({$profile.name})]" rows="6" cols="50">({$c_member.profile[$profile.name].value})</textarea>
7186	({elseif $profile.form_type == 'select'})
7187	<select name="profile[({$profile.name})]">
7188	<option value="">é¸æãã¦ãã ãã</option>
7189	@@ -373,17 +354,5 @@
7190	({***************************})
7191	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
7192	({***************************})
7193	-</td>
7194	-</tr>
7195	-</table>({END:container})
7196	-</td>
7197	-</tr>
7198	-<tr>
7199	-<td class="container inc_page_footer">
7200	-({$inc_page_footer\|smarty:nodefaults})
7201	-</td>
7202	-</tr>
7203	-</table>
7204	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
7205	-</body>
7206	-</html>
7207	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
7208	+({ext_include file="inc_footer.tpl"})
7209	Index: webapp/modules/pc/templates/h_bookmark_diary_blog_list.tpl
7210	===================================================================
7211	--- webapp/modules/pc/templates/h_bookmark_diary_blog_list.tpl (.../2_5_5) (revision 1114)
7212	+++ webapp/modules/pc/templates/h_bookmark_diary_blog_list.tpl (.../2_5_6) (revision 1114)
7213	@@ -1,22 +1,5 @@
7214	-({$inc_html_header\|smarty:nodefaults})
7215	-<body>
7216	-({ext_include file="inc_extension_pagelayout_top.tpl"})
7217	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
7218	-<tr>
7219	-<td class="container inc_page_header">
7220	-({$inc_page_header\|smarty:nodefaults})
7221	-</td>
7222	-</tr>
7223	-<tr>
7224	-<td class="container inc_navi">
7225	-({$inc_navi\|smarty:nodefaults})
7226	-</td>
7227	-</tr>
7228	-<tr>
7229	-<td class="container main_content">
7230	-
7231	-<table class="container" border="0" cellspacing="0" cellpadding="0">
7232	-<tr><td class="full_content" align="center">
7233	+({ext_include file="inc_header.tpl"})
7234	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
7235	({***************************})
7236	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
7237	({***************************})
7238	@@ -292,16 +275,5 @@
7239	({***************************})
7240	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
7241	({***************************})
7242	-</td></tr>
7243	-</table>({END:container})
7244	-</td>
7245	-</tr>
7246	-<tr>
7247	-<td class="container inc_page_footer">
7248	-({$inc_page_footer\|smarty:nodefaults})
7249	-</td>
7250	-</tr>
7251	-</table>
7252	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
7253	-</body>
7254	-</html>
7255	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
7256	+({ext_include file="inc_footer.tpl"})
7257	Index: webapp/modules/pc/templates/f_link_request_err_yet.tpl
7258	===================================================================
7259	--- webapp/modules/pc/templates/f_link_request_err_yet.tpl (.../2_5_5) (revision 1114)
7260	+++ webapp/modules/pc/templates/f_link_request_err_yet.tpl (.../2_5_6) (revision 1114)
7261	@@ -1,25 +1,6 @@
7262	-({$inc_html_header\|smarty:nodefaults})
7263	-<body>
7264	-({ext_include file="inc_extension_pagelayout_top.tpl"})
7265	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
7266	-<tr>
7267	-<td class="container inc_page_header">
7268	-({$inc_page_header\|smarty:nodefaults})
7269	-</td>
7270	-</tr>
7271	-<tr>
7272	-<td class="container inc_navi">
7273	-({$inc_navi\|smarty:nodefaults})
7274	-</td>
7275	-</tr>
7276	-<tr>
7277	-<td class="container main_content" align="center">
7278	+({ext_include file="inc_header.tpl"})
7279	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
7280
7281	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
7282	-
7283	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
7284	-<tr>
7285	-<td class="full_content" align="center">
7286	({***************************})
7287	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
7288	({***************************})
7289	@@ -157,17 +138,5 @@
7290	({***************************})
7291	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
7292	({***************************})
7293	-</td>
7294	-</tr>
7295	-</table>({END:container})
7296	-</td>
7297	-</tr>
7298	-<tr>
7299	-<td class="container inc_page_footer">
7300	-({$inc_page_footer\|smarty:nodefaults})
7301	-</td>
7302	-</tr>
7303	-</table>
7304	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
7305	-</body>
7306	-</html>
7307	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
7308	+({ext_include file="inc_footer.tpl"})
7309	Index: webapp/modules/pc/templates/h_diary_add_confirm.tpl
7310	===================================================================
7311	--- webapp/modules/pc/templates/h_diary_add_confirm.tpl (.../2_5_5) (revision 1114)
7312	+++ webapp/modules/pc/templates/h_diary_add_confirm.tpl (.../2_5_6) (revision 1114)
7313	@@ -1,25 +1,6 @@
7314	-({$inc_html_header\|smarty:nodefaults})
7315	-<body>
7316	-({ext_include file="inc_extension_pagelayout_top.tpl"})
7317	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
7318	-<tr>
7319	-<td class="container inc_page_header">
7320	-({$inc_page_header\|smarty:nodefaults})
7321	-</td>
7322	-</tr>
7323	-<tr>
7324	-<td class="container inc_navi">
7325	-({$inc_navi\|smarty:nodefaults})
7326	-</td>
7327	-</tr>
7328	-<tr>
7329	-<td class="container main_content" align="center">
7330	+({ext_include file="inc_header.tpl"})
7331	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
7332
7333	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
7334	-
7335	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
7336	-<tr>
7337	-<td class="full_content" align="center">
7338	({***************************})
7339	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
7340	({***************************})
7341	@@ -321,17 +302,5 @@
7342	({***************************})
7343	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
7344	({***************************})
7345	-</td>
7346	-</tr>
7347	-</table>({END:container})
7348	-</td>
7349	-</tr>
7350	-<tr>
7351	-<td class="container inc_page_footer">
7352	-({$inc_page_footer\|smarty:nodefaults})
7353	-</td>
7354	-</tr>
7355	-</table>
7356	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
7357	-</body>
7358	-</html>
7359	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
7360	+({ext_include file="inc_footer.tpl"})
7361	Index: webapp/modules/pc/templates/h_review_add_write_confirm.tpl
7362	===================================================================
7363	--- webapp/modules/pc/templates/h_review_add_write_confirm.tpl (.../2_5_5) (revision 1114)
7364	+++ webapp/modules/pc/templates/h_review_add_write_confirm.tpl (.../2_5_6) (revision 1114)
7365	@@ -1,25 +1,6 @@
7366	-({$inc_html_header\|smarty:nodefaults})
7367	-<body>
7368	-({ext_include file="inc_extension_pagelayout_top.tpl"})
7369	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
7370	-<tr>
7371	-<td class="container inc_page_header">
7372	-({$inc_page_header\|smarty:nodefaults})
7373	-</td>
7374	-</tr>
7375	-<tr>
7376	-<td class="container inc_navi">
7377	-({$inc_navi\|smarty:nodefaults})
7378	-</td>
7379	-</tr>
7380	-<tr>
7381	-<td class="container main_content" align="center">
7382	+({ext_include file="inc_header.tpl"})
7383	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
7384
7385	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
7386	-
7387	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
7388	-<tr>
7389	-<td class="full_content" align="center">
7390	({***************************})
7391	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
7392	({***************************})
7393	@@ -175,20 +156,8 @@
7394	({***************************})
7395	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
7396	({***************************})
7397	-</td>
7398	-</tr>
7399	-</table>({END:container})
7400	-</td>
7401	-</tr>
7402	-<tr>
7403	-<td class="container inc_page_footer">
7404	-({$inc_page_footer\|smarty:nodefaults})
7405	-</td>
7406	-</tr>
7407	-</table>
7408	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
7409	-</body>
7410	-</html>
7411	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
7412	+({ext_include file="inc_footer.tpl"})
7413
7414
7415
7416	Index: webapp/modules/pc/templates/h_err_diary_access.tpl
7417	===================================================================
7418	--- webapp/modules/pc/templates/h_err_diary_access.tpl (.../2_5_5) (revision 1114)
7419	+++ webapp/modules/pc/templates/h_err_diary_access.tpl (.../2_5_6) (revision 1114)
7420	@@ -1,22 +1,6 @@
7421	-({$inc_html_header\|smarty:nodefaults})
7422	-<body>
7423	-({ext_include file="inc_extension_pagelayout_top.tpl"})
7424	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
7425	-<tr>
7426	-<td class="container inc_page_header">
7427	-({$inc_page_header\|smarty:nodefaults})
7428	-</td>
7429	-</tr>
7430	-<tr>
7431	-<td class="container inc_navi">
7432	-({$inc_navi\|smarty:nodefaults})
7433	-</td>
7434	-</tr>
7435	-<tr>
7436	-<td class="container main_content">
7437	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
7438	-<tr>
7439	-<td class="full_content" align="center">
7440	+({ext_include file="inc_header.tpl"})
7441	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
7442	+
7443	({***************************})
7444	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
7445	({***************************})
7446	@@ -45,17 +29,5 @@
7447	({***************************})
7448	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
7449	({***************************})
7450	-</td>
7451	-</tr>
7452	-</table>({END:container})
7453	-</td>
7454	-</tr>
7455	-<tr>
7456	-<td class="container inc_page_footer">
7457	-({$inc_page_footer\|smarty:nodefaults})
7458	-</td>
7459	-</tr>
7460	-</table>
7461	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
7462	-</body>
7463	-</html>
7464	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
7465	+({ext_include file="inc_footer.tpl"})
7466	Index: webapp/modules/pc/templates/h_err_f_home.tpl
7467	===================================================================
7468	--- webapp/modules/pc/templates/h_err_f_home.tpl (.../2_5_5) (revision 1114)
7469	+++ webapp/modules/pc/templates/h_err_f_home.tpl (.../2_5_6) (revision 1114)
7470	@@ -1,22 +1,6 @@
7471	-({$inc_html_header\|smarty:nodefaults})
7472	-<body>
7473	-({ext_include file="inc_extension_pagelayout_top.tpl"})
7474	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
7475	-<tr>
7476	-<td class="container inc_page_header">
7477	-({$inc_page_header\|smarty:nodefaults})
7478	-</td>
7479	-</tr>
7480	-<tr>
7481	-<td class="container inc_navi">
7482	-({$inc_navi\|smarty:nodefaults})
7483	-</td>
7484	-</tr>
7485	-<tr>
7486	-<td class="container main_content">
7487	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
7488	-<tr>
7489	-<td class="full_content" align="center">
7490	+({ext_include file="inc_header.tpl"})
7491	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
7492	+
7493	({***************************})
7494	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
7495	({***************************})
7496	@@ -46,18 +30,6 @@
7497	({***************************})
7498	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
7499	({***************************})
7500	-</td>
7501	-</tr>
7502	-</table>({END:container})
7503	-</td>
7504	-</tr>
7505	-<tr>
7506	-<td class="container inc_page_footer">
7507	-({$inc_page_footer\|smarty:nodefaults})
7508	-</td>
7509	-</tr>
7510	-</table>
7511	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
7512	-</body>
7513	-</html>
7514	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
7515	+({ext_include file="inc_footer.tpl"})
7516
7517	Index: webapp/modules/pc/templates/o_sns_privacy.tpl
7518	===================================================================
7519	--- webapp/modules/pc/templates/o_sns_privacy.tpl (.../2_5_5) (revision 1114)
7520	+++ webapp/modules/pc/templates/o_sns_privacy.tpl (.../2_5_6) (revision 1114)
7521	@@ -1,22 +1,6 @@
7522	-({$inc_html_header\|smarty:nodefaults})
7523	-<body>
7524	-({ext_include file="inc_extension_pagelayout_top.tpl"})
7525	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
7526	-<tr>
7527	-<td class="container inc_page_header">
7528	-({$inc_page_header\|smarty:nodefaults})
7529	-</td>
7530	-</tr>
7531	-<tr>
7532	-<td class="container inc_navi">
7533	-({$inc_navi\|smarty:nodefaults})
7534	-</td>
7535	-</tr>
7536	-<tr>
7537	-<td class="container main_content">
7538	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
7539	-<tr>
7540	-<td class="full_content" align="center">
7541	+({ext_include file="inc_header.tpl"})
7542	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
7543	+
7544	({***************************})
7545	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
7546	({***************************})
7547	@@ -81,19 +65,5 @@
7548	({***************************})
7549	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
7550	({***************************})
7551	-</td>
7552	-</tr>
7553	-</table>({END:container})
7554	-</td>
7555	-</tr>
7556	-<tr>
7557	-<td class="container inc_page_footer">
7558	-({$inc_page_footer\|smarty:nodefaults})
7559	-</td>
7560	-</tr>
7561	-</table>
7562	-
7563	-
7564	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
7565	-</body>
7566	-</html>
7567	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
7568	+({ext_include file="inc_footer.tpl"})
7569	Index: webapp/modules/pc/templates/h_review_add.tpl
7570	===================================================================
7571	--- webapp/modules/pc/templates/h_review_add.tpl (.../2_5_5) (revision 1114)
7572	+++ webapp/modules/pc/templates/h_review_add.tpl (.../2_5_6) (revision 1114)
7573	@@ -1,25 +1,6 @@
7574	-({$inc_html_header\|smarty:nodefaults})
7575	-<body>
7576	-({ext_include file="inc_extension_pagelayout_top.tpl"})
7577	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
7578	-<tr>
7579	-<td class="container inc_page_header">
7580	-({$inc_page_header\|smarty:nodefaults})
7581	-</td>
7582	-</tr>
7583	-<tr>
7584	-<td class="container inc_navi">
7585	-({$inc_navi\|smarty:nodefaults})
7586	-</td>
7587	-</tr>
7588	-<tr>
7589	-<td class="container main_content" align="center">
7590	+({ext_include file="inc_header.tpl"})
7591	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
7592
7593	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
7594	-
7595	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
7596	-<tr>
7597	-<td class="full_content" align="center">
7598	({***************************})
7599	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
7600	({***************************})
7601	@@ -82,7 +63,7 @@
7602	({t_form m=pc a=page_h_review_add})
7603	<input type="hidden" name="search_flag" value="1">
7604	ãã¼ã¯ã¼ã <img src="./skin/dummy.gif" style="width:14px;height:14px;" class="icon icon_1">
7605	-<input name="keyword" size="15" value="({$keyword})">
7606	+<input type="text" class="text" name="keyword" size="15" value="({$keyword})">
7607	ã«ãã´ãª <img src="./skin/dummy.gif" style="width:14px;height:14px;" class="icon icon_1">
7608	<select name="category_id">
7609	<option value="" selected="selected">é¸æ
7610	@@ -349,17 +330,5 @@
7611	({***************************})
7612	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
7613	({***************************})
7614	-</td>
7615	-</tr>
7616	-</table>({END:container})
7617	-</td>
7618	-</tr>
7619	-<tr>
7620	-<td class="container inc_page_footer">
7621	-({$inc_page_footer\|smarty:nodefaults})
7622	-</td>
7623	-</tr>
7624	-</table>
7625	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
7626	-</body>
7627	-</html>
7628	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
7629	+({ext_include file="inc_footer.tpl"})
7630	Index: webapp/modules/pc/templates/c_event_delete_confirm.tpl
7631	===================================================================
7632	--- webapp/modules/pc/templates/c_event_delete_confirm.tpl (.../2_5_5) (revision 1114)
7633	+++ webapp/modules/pc/templates/c_event_delete_confirm.tpl (.../2_5_6) (revision 1114)
7634	@@ -1,22 +1,5 @@
7635	-({$inc_html_header\|smarty:nodefaults})
7636	-<body>
7637	-({ext_include file="inc_extension_pagelayout_top.tpl"})
7638	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
7639	-<tr>
7640	-<td class="container inc_page_header">
7641	-({$inc_page_header\|smarty:nodefaults})
7642	-</td>
7643	-</tr>
7644	-<tr>
7645	-<td class="container inc_navi">
7646	-({$inc_navi\|smarty:nodefaults})
7647	-</td>
7648	-</tr>
7649	-<tr>
7650	-<td class="container main_content">
7651	-
7652	-<table class="container" border="0" cellspacing="0" cellpadding="0">
7653	-<tr><td class="full_content" align="center">
7654	+({ext_include file="inc_header.tpl"})
7655	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
7656	({***************************})
7657	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
7658	({***************************})
7659	@@ -107,16 +90,5 @@
7660	({***************************})
7661	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
7662	({***************************})
7663	-</td></tr>
7664	-</table>({END:container})
7665	-</td>
7666	-</tr>
7667	-<tr>
7668	-<td class="container inc_page_footer">
7669	-({$inc_page_footer\|smarty:nodefaults})
7670	-</td>
7671	-</tr>
7672	-</table>
7673	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
7674	-</body>
7675	-</html>
7676	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
7677	+({ext_include file="inc_footer.tpl"})
7678	Index: webapp/modules/pc/templates/c_topic_edit.tpl
7679	===================================================================
7680	--- webapp/modules/pc/templates/c_topic_edit.tpl (.../2_5_5) (revision 1114)
7681	+++ webapp/modules/pc/templates/c_topic_edit.tpl (.../2_5_6) (revision 1114)
7682	@@ -1,25 +1,6 @@
7683	-({$inc_html_header\|smarty:nodefaults})
7684	-<body>
7685	-({ext_include file="inc_extension_pagelayout_top.tpl"})
7686	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
7687	-<tr>
7688	-<td class="container inc_page_header">
7689	-({$inc_page_header\|smarty:nodefaults})
7690	-</td>
7691	-</tr>
7692	-<tr>
7693	-<td class="container inc_navi">
7694	-({$inc_navi\|smarty:nodefaults})
7695	-</td>
7696	-</tr>
7697	-<tr>
7698	-<td class="container main_content" align="center">
7699	+({ext_include file="inc_header.tpl"})
7700	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
7701
7702	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
7703	-
7704	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
7705	-<tr>
7706	-<td class="full_content" align="center">
7707	({***************************})
7708	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
7709	({***************************})
7710	@@ -76,7 +57,7 @@
7711
7712	<div class="padding_s">
7713
7714	-<input type="text" name="title" value="({$c_topic.name})" size="50" maxlength="126">
7715	+<input type="text" class="text" name="title" value="({$c_topic.name})" size="50" maxlength="126">
7716
7717	</div>
7718
7719	@@ -104,7 +85,7 @@
7720
7721	<div class="padding_s">
7722
7723	-<textarea name="body" rows="10" cols="50" style="width:415px">({$c_topic.body})</textarea>
7724	+<textarea class="text" name="body" rows="10" cols="50" style="width:415px">({$c_topic.body})</textarea>
7725
7726	</div>
7727
7728	@@ -329,19 +310,7 @@
7729	({***************************})
7730	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
7731	({***************************})
7732	-</td>
7733	-</tr>
7734	-</table>({END:container})
7735	-</td>
7736	-</tr>
7737	-<tr>
7738	-<td class="container inc_page_footer">
7739	-({$inc_page_footer\|smarty:nodefaults})
7740	-</td>
7741	-</tr>
7742	-</table>
7743	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
7744	-</body>
7745	-</html>
7746	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
7747	+({ext_include file="inc_footer.tpl"})
7748
7749
7750	Index: webapp/modules/pc/templates/o_url_changed.tpl
7751	===================================================================
7752	--- webapp/modules/pc/templates/o_url_changed.tpl (.../2_5_5) (revision 1114)
7753	+++ webapp/modules/pc/templates/o_url_changed.tpl (.../2_5_6) (revision 1114)
7754	@@ -1,16 +1,9 @@
7755	-({$inc_html_header\|smarty:nodefaults})
7756	+({ext_include file="inc_header.tpl"})
7757	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
7758	+({***************************})
7759	+({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
7760	+({***************************})
7761
7762	-<body>
7763	-({ext_include file="inc_extension_pagelayout_top.tpl"})
7764	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
7765	-<tr>
7766	-<td class="container inc_page_header">
7767	-({$inc_page_header\|smarty:nodefaults})
7768	-</td>
7769	-</tr>
7770	-<tr>
7771	-<td class="container main_content" align="center">
7772	-
7773	<img src="./skin/dummy.gif" class="v_spacer_l">
7774
7775	<!-- ************************* -->
7776	@@ -82,14 +75,8 @@
7777
7778	<img src="./skin/dummy.gif" class="v_spacer_l">
7779
7780	-</td>
7781	-</tr>
7782	-<tr>
7783	-<td class="container inc_page_footer">
7784	-({$inc_page_footer\|smarty:nodefaults})
7785	-</td>
7786	-</tr>
7787	-</table>
7788	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
7789	-</body>
7790	-</html>
7791	+({***************************})
7792	+({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
7793	+({***************************})
7794	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
7795	+({ext_include file="inc_footer.tpl"})
7796	Index: webapp/modules/pc/templates/h_message.tpl
7797	===================================================================
7798	--- webapp/modules/pc/templates/h_message.tpl (.../2_5_5) (revision 1114)
7799	+++ webapp/modules/pc/templates/h_message.tpl (.../2_5_6) (revision 1114)
7800	@@ -1,23 +1,5 @@
7801	-({$inc_html_header\|smarty:nodefaults})
7802	-<body>
7803	-({ext_include file="inc_extension_pagelayout_top.tpl"})
7804	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
7805	-<tr>
7806	-<td class="container inc_page_header">
7807	-({$inc_page_header\|smarty:nodefaults})
7808	-</td>
7809	-</tr>
7810	-<tr>
7811	-<td class="container inc_navi">
7812	-({$inc_navi\|smarty:nodefaults})
7813	-</td>
7814	-</tr>
7815	-<tr>
7816	-<td class="container main_content">
7817	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
7818	-<tr>
7819	-<td style="width:5px;"><img src="./skin/dummy.gif" style="width:5px;" class="dummy"></td>
7820	-<td class="left_content_175" align="center" valign="top">
7821	+({ext_include file="inc_header.tpl"})
7822	+({ext_include file="inc_layoutcolumn_top_175px.tpl"})
7823	({***********************************})
7824	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã(å·¦)*****})
7825	({***********************************})
7826	@@ -100,10 +82,7 @@
7827	({********************************})
7828	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å·¦ï¼})
7829	({********************************})
7830	-</td>
7831	-<td style="width:5px;"><img src="./skin/dummy.gif" style="width:5px;" class="dummy"></td>
7832	-<td class="right_content_535" align="center" valign="top">
7833	-({********************************})
7834	+({ext_include file="inc_layoutcolumn_middle_175px.tpl"})
7835	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å³ï¼})
7836	({********************************})
7837
7838	@@ -338,17 +317,5 @@
7839	({********************************})
7840	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ãï¼å³ï¼})
7841	({********************************})
7842	-</td>
7843	-</tr>
7844	-</table>({END:container})
7845	-</td>
7846	-</tr>
7847	-<tr>
7848	-<td class="container inc_page_footer">
7849	-({$inc_page_footer\|smarty:nodefaults})
7850	-</td>
7851	-</tr>
7852	-</table>
7853	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
7854	-</body>
7855	-</html>
7856	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
7857	+({ext_include file="inc_footer.tpl"})
7858	Index: webapp/modules/pc/templates/h_invite_end.tpl
7859	===================================================================
7860	--- webapp/modules/pc/templates/h_invite_end.tpl (.../2_5_5) (revision 1114)
7861	+++ webapp/modules/pc/templates/h_invite_end.tpl (.../2_5_6) (revision 1114)
7862	@@ -1,25 +1,6 @@
7863	-({$inc_html_header\|smarty:nodefaults})
7864	-<body>
7865	-({ext_include file="inc_extension_pagelayout_top.tpl"})
7866	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
7867	-<tr>
7868	-<td class="container inc_page_header">
7869	-({$inc_page_header\|smarty:nodefaults})
7870	-</td>
7871	-</tr>
7872	-<tr>
7873	-<td class="container inc_navi">
7874	-({$inc_navi\|smarty:nodefaults})
7875	-</td>
7876	-</tr>
7877	-<tr>
7878	-<td class="container main_content" align="center">
7879	+({ext_include file="inc_header.tpl"})
7880	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
7881
7882	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
7883	-
7884	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
7885	-<tr>
7886	-<td class="full_content" align="center">
7887	({***************************})
7888	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
7889	({***************************})
7890	@@ -123,18 +104,6 @@
7891	({***************************})
7892	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
7893	({***************************})
7894	-</td>
7895	-</tr>
7896	-</table>({END:container})
7897	-</td>
7898	-</tr>
7899	-<tr>
7900	-<td class="container inc_page_footer">
7901	-({$inc_page_footer\|smarty:nodefaults})
7902	-</td>
7903	-</tr>
7904	-</table>
7905	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
7906	-</body>
7907	-</html>
7908	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
7909	+({ext_include file="inc_footer.tpl"})
7910
7911	Index: webapp/modules/pc/templates/o_public_invite_end.tpl
7912	===================================================================
7913	--- webapp/modules/pc/templates/o_public_invite_end.tpl (.../2_5_5) (revision 1114)
7914	+++ webapp/modules/pc/templates/o_public_invite_end.tpl (.../2_5_6) (revision 1114)
7915	@@ -1,20 +1,5 @@
7916	-({$inc_html_header\|smarty:nodefaults})
7917	-<body>
7918	-({ext_include file="inc_extension_pagelayout_top.tpl"})
7919	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
7920	-<tr>
7921	-<td class="container inc_page_header">
7922	-({$inc_page_header\|smarty:nodefaults})
7923	-</td>
7924	-</tr>
7925	-<tr>
7926	-<td class="container main_content" align="center">
7927	-
7928	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
7929	-
7930	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
7931	-<tr>
7932	-<td class="full_content" align="center">
7933	+({ext_include file="inc_header.tpl"})
7934	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
7935	({***************************})
7936	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
7937	({***************************})
7938	@@ -100,17 +85,5 @@
7939	({***************************})
7940	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
7941	({***************************})
7942	-</td>
7943	-</tr>
7944	-</table>({END:container})
7945	-</td>
7946	-</tr>
7947	-<tr>
7948	-<td class="container inc_page_footer">
7949	-({$inc_page_footer\|smarty:nodefaults})
7950	-</td>
7951	-</tr>
7952	-</table>
7953	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
7954	-</body>
7955	-</html>
7956	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
7957	+({ext_include file="inc_footer.tpl"})
7958	Index: webapp/modules/pc/templates/h_diary_edit_confirm.tpl
7959	===================================================================
7960	--- webapp/modules/pc/templates/h_diary_edit_confirm.tpl (.../2_5_5) (revision 1114)
7961	+++ webapp/modules/pc/templates/h_diary_edit_confirm.tpl (.../2_5_6) (revision 1114)
7962	@@ -1,25 +1,5 @@
7963	-({$inc_html_header\|smarty:nodefaults})
7964	-<body>
7965	-({ext_include file="inc_extension_pagelayout_top.tpl"})
7966	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
7967	-<tr>
7968	-<td class="container inc_page_header">
7969	-({$inc_page_header\|smarty:nodefaults})
7970	-</td>
7971	-</tr>
7972	-<tr>
7973	-<td class="container inc_navi">
7974	-({$inc_navi\|smarty:nodefaults})
7975	-</td>
7976	-</tr>
7977	-<tr>
7978	-<td class="container main_content">
7979	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
7980	-<tr>
7981	-<td class="full_content" align="center">
7982	-
7983	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
7984	-
7985	+({ext_include file="inc_header.tpl"})
7986	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
7987	({***************************})
7988	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
7989	({***************************})
7990	@@ -305,19 +285,7 @@
7991	({***************************})
7992	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
7993	({***************************})
7994	-</td>
7995	-</tr>
7996	-</table>({END:container})
7997	-</td>
7998	-</tr>
7999	-<tr>
8000	-<td class="container inc_page_footer">
8001	-({$inc_page_footer\|smarty:nodefaults})
8002	-</td>
8003	-</tr>
8004	-</table>
8005	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
8006	-</body>
8007	-</html>
8008	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
8009	+({ext_include file="inc_footer.tpl"})
8010
8011
8012	Index: webapp/modules/pc/templates/c_member_review_add.tpl
8013	===================================================================
8014	--- webapp/modules/pc/templates/c_member_review_add.tpl (.../2_5_5) (revision 1114)
8015	+++ webapp/modules/pc/templates/c_member_review_add.tpl (.../2_5_6) (revision 1114)
8016	@@ -1,22 +1,6 @@
8017	-({$inc_html_header\|smarty:nodefaults})
8018	-<body>
8019	-({ext_include file="inc_extension_pagelayout_top.tpl"})
8020	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
8021	-<tr>
8022	-<td class="container inc_page_header">
8023	-({$inc_page_header\|smarty:nodefaults})
8024	-</td>
8025	-</tr>
8026	-<tr>
8027	-<td class="container inc_navi">
8028	-({$inc_navi\|smarty:nodefaults})
8029	-</td>
8030	-</tr>
8031	-<tr>
8032	-<td class="container main_content">
8033	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
8034	-<tr>
8035	-<td class="full_content" align="center">
8036	+({ext_include file="inc_header.tpl"})
8037	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
8038	+
8039	({***************************})
8040	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
8041	({***************************})
8042	@@ -409,17 +393,5 @@
8043	({***************************})
8044	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
8045	({***************************})
8046	-</td>
8047	-</tr>
8048	-</table>({END:container})
8049	-</td>
8050	-</tr>
8051	-<tr>
8052	-<td class="container inc_page_footer">
8053	-({$inc_page_footer\|smarty:nodefaults})
8054	-</td>
8055	-</tr>
8056	-</table>
8057	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
8058	-</body>
8059	-</html>
8060	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
8061	+({ext_include file="inc_footer.tpl"})
8062	Index: webapp/modules/pc/templates/c_admin_request.tpl
8063	===================================================================
8064	--- webapp/modules/pc/templates/c_admin_request.tpl (.../2_5_5) (revision 1114)
8065	+++ webapp/modules/pc/templates/c_admin_request.tpl (.../2_5_6) (revision 1114)
8066	@@ -1,25 +1,6 @@
8067	-({$inc_html_header\|smarty:nodefaults})
8068	-<body>
8069	-({ext_include file="inc_extension_pagelayout_top.tpl"})
8070	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
8071	-<tr>
8072	-<td class="container inc_page_header">
8073	-({$inc_page_header\|smarty:nodefaults})
8074	-</td>
8075	-</tr>
8076	-<tr>
8077	-<td class="container inc_navi">
8078	-({$inc_navi\|smarty:nodefaults})
8079	-</td>
8080	-</tr>
8081	-<tr>
8082	-<td class="container main_content" align="center">
8083	+({ext_include file="inc_header.tpl"})
8084	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
8085
8086	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
8087	-
8088	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
8089	-<tr>
8090	-<td class="full_content" align="center">
8091	({***************************})
8092	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
8093	({***************************})
8094	@@ -198,7 +179,7 @@
8095	<input type="hidden" name="sessid" value="({$PHPSESSID})">
8096	<input type="hidden" name="target_c_member_id" value="({$member.c_member_id})">
8097	<input type="hidden" name="target_c_commu_id" value="({$c_commu.c_commu_id})">
8098	-<td align="right"><input type=submit class="submit" name="yes_button" value="ãéãä¿¡ã">
8099	+<td align="right"><input type="submit" class="submit" name="yes_button" value="ãéãä¿¡ã">
8100	</td>
8101	</form>
8102
8103	@@ -262,17 +243,5 @@
8104	({***************************})
8105	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
8106	({***************************})
8107	-</td>
8108	-</tr>
8109	-</table>({END:container})
8110	-</td>
8111	-</tr>
8112	-<tr>
8113	-<td class="container inc_page_footer">
8114	-({$inc_page_footer\|smarty:nodefaults})
8115	-</td>
8116	-</tr>
8117	-</table>
8118	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
8119	-</body>
8120	-</html>
8121	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
8122	+({ext_include file="inc_footer.tpl"})
8123	Index: webapp/modules/pc/templates/f_invite.tpl
8124	===================================================================
8125	--- webapp/modules/pc/templates/f_invite.tpl (.../2_5_5) (revision 1114)
8126	+++ webapp/modules/pc/templates/f_invite.tpl (.../2_5_6) (revision 1114)
8127	@@ -1,25 +1,6 @@
8128	-({$inc_html_header\|smarty:nodefaults})
8129	-<body>
8130	-({ext_include file="inc_extension_pagelayout_top.tpl"})
8131	-<table class="mainframe" border="0" cellspacing="0" cellpadding="0">
8132	-<tr>
8133	-<td class="container inc_page_header">
8134	-({$inc_page_header\|smarty:nodefaults})
8135	-</td>
8136	-</tr>
8137	-<tr>
8138	-<td class="container inc_navi">
8139	-({$inc_navi\|smarty:nodefaults})
8140	-</td>
8141	-</tr>
8142	-<tr>
8143	-<td class="container main_content" align="center">
8144	+({ext_include file="inc_header.tpl"})
8145	+({ext_include file="inc_layoutcolumn_top_720px.tpl"})
8146
8147	-({ext_include file="inc_alert_box.tpl"})({* ã¨ã©ã¼ã¡ãã»ã¼ã¸ã³ã³ãã *})
8148	-
8149	-<table class="container" border="0" cellspacing="0" cellpadding="0">({BEGIN:container})
8150	-<tr>
8151	-<td class="full_content" align="center">
8152	({***************************})
8153	({ããããï¼ã¡ã¤ã³ã³ã³ãã³ã})
8154	({***************************})
8155	@@ -188,7 +169,7 @@
8156
8157	<div class="padding_s">
8158
8159	-<textarea name="body" rows="5" cols="50">({$target_member.nickname})ãããç´¹ä»ãã¾ãã</textarea>
8160	+<textarea class="text" name="body" rows="5" cols="50">({$target_member.nickname})ãããç´¹ä»ãã¾ãã</textarea>
8161
8162	</div>
8163
8164	@@ -250,17 +231,5 @@
8165	({***************************})
8166	({ããã¾ã§ï¼ã¡ã¤ã³ã³ã³ãã³ã})
8167	({***************************})
8168	-</td>
8169	-</tr>
8170	-</table>({END:container})
8171	-</td>
8172	-</tr>
8173	-<tr>
8174	-<td class="container inc_page_footer">
8175	-({$inc_page_footer\|smarty:nodefaults})
8176	-</td>
8177	-</tr>
8178	-</table>
8179	-({ext_include file="inc_extension_pagelayout_bottom.tpl"})
8180	-</body>
8181	-</html>
8182	+({ext_include file="inc_layoutcolumn_bottom_270px_165px_175px_720px.tpl"})
8183	+({ext_include file="inc_footer.tpl"})
8184	Index: webapp/modules/pc/templates/c_topic_add_confirm.tpl
8185	===================================================================
8186	--- webapp/modules/pc/templates/c_topic_add_confirm.tpl (.../2_5_5) (revision 1114)
8187	+++ webapp/modules/pc/templates/c_topic_add_confirm.tpl (.../2_5_6) (revision 1114)
8188	@@ -1,25 +1,6 @@
8189	-({$inc_html_header\|smarty:nodefaults})
8190	-<body>
8191	-({ext_include file="i