From 4264d5bcde7c504595fa41093351c557ff93e1fe Mon Sep 17 00:00:00 2001 From: zero Date: Wed, 27 Feb 2008 16:29:45 +0000 Subject: [PATCH] =?UTF-8?q?zbXE=20=EA=B8=B0=EB=B3=B8=20=EB=B0=A9=EB=AA=85?= =?UTF-8?q?=EB=A1=9D=20=EC=8A=A4=ED=82=A8=20=EC=88=98=EC=A0=95=20(xe=5Fgue?= =?UTF-8?q?stbook)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3862 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/template/TemplateHandler.class.php | 3 +- modules/board/skins/xe_guestbook/comment.html | 36 ++-- .../skins/xe_guestbook/comment_form.html | 68 ++++--- .../board/skins/xe_guestbook/css/common.css | 49 +++-- .../xe_guestbook/input_password_form.html | 1 + modules/board/skins/xe_guestbook/js/board.js | 12 +- modules/board/skins/xe_guestbook/list.html | 42 ++-- modules/board/skins/xe_guestbook/skin.xml | 10 +- .../skins/xe_guestbook/view_document.html | 33 ++-- .../board/skins/xe_guestbook/write_form.html | 184 +++++++++--------- 10 files changed, 223 insertions(+), 215 deletions(-) diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php index 00971499f..46ce27ddb 100644 --- a/classes/template/TemplateHandler.class.php +++ b/classes/template/TemplateHandler.class.php @@ -85,7 +85,7 @@ $source_ftime = filemtime($tpl_file); $target_ftime = filemtime($compiled_tpl_file); - if($source_ftime>$target_ftime) return $this->_compileTplFile($tpl_file, $compiled_tpl_file); + if($source_ftime>$target_ftime || $target_ftime < filemtime('./classes/template/TemplateHandler.class.php') ) return $this->_compileTplFile($tpl_file, $compiled_tpl_file); } /** @@ -157,6 +157,7 @@ * @brief {@와 } 안의 @... 함수를 print func(..)로 변경 **/ function _compileVarToSilenceExecute($matches) { + if(strtolower(trim(str_replace(array(';',' '),'', $matches[1])))=='return') return ''; return ']+)/i','$__Context->\\1', trim($matches[1])).';?>'; } diff --git a/modules/board/skins/xe_guestbook/comment.html b/modules/board/skins/xe_guestbook/comment.html index 14c2492c5..ea341d2ac 100644 --- a/modules/board/skins/xe_guestbook/comment.html +++ b/modules/board/skins/xe_guestbook/comment.html @@ -1,6 +1,7 @@
+ {@ $_comment_list = $oDocument->getComments() } @@ -9,24 +10,6 @@
- - -
- - {$lang->cmd_delete} - {$lang->cmd_modify} - - {$lang->cmd_reply} -
- -
- - {$comment->getRegdate('Y.m.d')} {$comment->getRegdate('H:i:s')} - - - ({$comment->get('ipaddress')}) - -
@@ -40,6 +23,23 @@
+
+ + {$lang->cmd_delete} + {$lang->cmd_modify} + + {$lang->cmd_reply} +
+ +
+ + {$comment->getRegdate('Y.m.d')} {$comment->getRegdate('H:i:s')} + + + ({$comment->get('ipaddress')}) + +
+
({$lang->voted_count}: diff --git a/modules/board/skins/xe_guestbook/comment_form.html b/modules/board/skins/xe_guestbook/comment_form.html index ececd1007..c764982b3 100644 --- a/modules/board/skins/xe_guestbook/comment_form.html +++ b/modules/board/skins/xe_guestbook/comment_form.html @@ -18,6 +18,24 @@
+ + +
+
+
{$oDocument->getNickName()}
+
+ {$oDocument->getRegdate("Y.m.d H:i")} + + ({$oDocument->get('ipaddress')}) + +
+
+ +
+ {$oDocument->getContent(false)} +
+
+
@@ -31,36 +49,42 @@
-
- - - - - - - - - - - - - - useNotify())-->checked="checked" id="notify_message" /> - + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ + useNotify())-->checked="checked" id="notify_message" /> + - isSecret())-->checked="checked" id="is_secret" />
{$oComment->getEditor()}
-
-
- - -
+
+ + +
+
+
diff --git a/modules/board/skins/xe_guestbook/css/common.css b/modules/board/skins/xe_guestbook/css/common.css index 78beca3fa..ef670709a 100644 --- a/modules/board/skins/xe_guestbook/css/common.css +++ b/modules/board/skins/xe_guestbook/css/common.css @@ -44,14 +44,17 @@ Jeong, Chan Myeong 070601~070630 .blogNotice .item .replyAndTrackback { color:#AAAAAA; font-size:.9em; } /* boardRead */ -.viewDocument { border:1px solid #e0e1db; padding:10px; border-bottom:2px solid #AAAAAA; margin-bottom:20px; } +.viewDocument { border:1px solid #e0e1db; margin-bottom:20px; overflow:hidden;} +.boardRead { padding:10px; } .boardRead .contentInfo .userInfo { float:left; white-space:nowrap; } .boardRead .contentInfo .userInfo .author { color:#3074a5; } .boardRead .contentInfo .userInfo .author a { color:#3074a5; text-decoration:none; } .boardRead .contentInfo { clear:both; white-space:nowrap; color:#444444; float:left; font-size:.9em; font-family:tahoma; line-height:17px; padding-bottom:10px; width:100%;} -.boardRead .contentInfo .date { float:right; background:url("../images/common/calendar.gif") no-repeat left top; padding-left:18px; margin-left:10px; } +.boardRead .contentInfo .date { font:.8em Tahoma; color:#cccccc; float:right; margin-top:3px; } +.boardRead .contentInfo .replyOption { height:20px; float:right; white-space:nowrap; margin-left:.2em;} +.boardRead .contentInfo .replyOption img { vertical-align:middle;} /* extraVars list */ .boardRead .extraVarsList { width:100%; border:1px solid #e0e1db; border-bottom:none; margin:0 0 5px 0; table-layout:fixed;} @@ -60,7 +63,6 @@ Jeong, Chan Myeong 070601~070630 .boardRead .extraVarsList td a { color:#555555; } .boardRead .readBody { color:#555555; } -.boardRead .readBody .contentBody .ipaddress { text-align:right; margin-top:10px; color:#bbbbbb; font-family:tahoma;} .boardRead .fileAttached { border:1px solid #EFEFEF; background-color:#F4F4F4; padding:5px; margin-top:10px;} .boardRead .fileAttached ul { margin:0; padding:0; } @@ -71,19 +73,9 @@ Jeong, Chan Myeong 070601~070630 .boardRead .contentButton { text-align:right;padding-top:10px;} -.trackbackBox { padding:.6em .6em; color:#666666; border:1px solid #e0e1db;;margin-top:.5em; } -.trackbackBox .trackbackUrl { color:#1F3DAE; font-size:.9em; background:url("../images/common/iconTrackback.gif") no-repeat left top; padding-left:18px; margin:0 0 3px 10px; } -.trackbackBox .trackbackItem { background-color:#F3F3F3; padding:.6em .8em .6em .6em; line-height:1.25em; border-top:1px dotted #EEEEEE; list-style:none;} -.trackbackBox p { display:inline; margin-bottom:1em;} -.trackbackBox a { color:#666666; text-decoration:none;} -.trackbackBox div { clear:both; } -.trackbackBox address { display:block; padding:0 .3em 0 0; } -.trackbackBox address a { font-size:.9em; color:#3074a5; margin-right:.3em; float:left;} -.trackbackBox address .date { font:.8em Tahoma; color:#cccccc; float:right;} - -.replyBox { color:#666666; border-top:1px solid #e0e1db; margin-top:.5em;} -.replyBox .replyItem { background-color:#FFFFFF; padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none;} -.replyBox p { display:inline; margin-bottom:1em;} +.replyBox { color:#666666; margin-top:10px;} +.replyBox .replyItem { background-color:#FFFFFF; padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; list-style:none; border-top:1px solid #e0e1db;} +.replyBox p { margin:0; padding:0; display:inline; margin-bottom:1em;} .replyBox .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;} .replyBox .author a { color:#3074a5; margin-right:.3em; text-decoration:none; } .replyBox .voted { float:left; font-size:.9em; color:#AAAAAA; margin:0 .3em .5em 1em;} @@ -93,8 +85,8 @@ Jeong, Chan Myeong 070601~070630 .replyBox .replyOption img { vertical-align:middle;} .replyBox .replyContent { clear:left; } -.replyBox .replyContent p { display:block; } -.replyBox .reply { background-color:#F4F4F4; border-bottom:1px dotted #DDDDDD;} +.replyBox .replyContent p { margin:0; padding:0; display:block; } +.replyBox .reply { background-color:#F4F4F4; border-top:1px dotted #e0e1db; } .replyBox .replyIndent { background:url(../images/common/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;} .replyBox .fileAttached { border:1px solid #EFEFEF; background-color:#F4F4F4; padding:5px; margin-top:10px;} @@ -224,23 +216,24 @@ Jeong, Chan Myeong 070601~070630 /* boardWrite */ .boardEditor { margin-bottom:10px; } -.commentEditor { margin-top:10px; } +.commentEditor { margin-top:10px; clear:both; } + .boardWrite { border:1px solid #e0e1db; padding-bottom:10px;} .boardWrite fieldset { border:none; } -.boardWrite .userNameAndPw { margin:10px 10px 0 10px; } -.boardWrite .userNameAndPw .userName {width:60px; margin-right:10px; } -.boardWrite .userNameAndPw .userPw {width:60px; margin-right:10px; } -.boardWrite .userNameAndPw .emailAddress {width:60px; margin-right:10px; } -.boardWrite .userNameAndPw .homePage {width:60px; margin-right:10px; } +.boardWrite .inputItem { margin:10px 10px 0 10px; } +.boardWrite .inputItem .userName {width:220px; margin-right:10px; } +.boardWrite .inputItem .userPw {width:220px; margin-right:10px; } +.boardWrite .inputItem .emailAddress {width:220px; margin-right:10px; } +.boardWrite .inputItem .homePage {width:220px; margin-right:10px; } .boardWrite .title { margin-top:5px; } .boardWrite .title .category { margin-left:10px; } -.boardWrite .title label.title { margin:0 10px 0 10px; } +.boardWrite .title label.title { padding:0; margin:0 10px 0 10px; } .boardWrite .title input.title { width:60%;} .boardWrite dl.option { margin:10px 0 3px 10px; padding:0;} -.boardWrite dl.option dd { display:inline; margin-right:5px; } -.boardWrite dl.option dd * { vertical-align:middle;} +.boardWrite dl.option dd { padding:0; margin:0; display:inline; margin-right:5px; } +.boardWrite dl.option dd * { padding:0; margin:0; vertical-align:middle;} .boardWrite dl.option dd select { width:8em; font-size:.95em; } .boardWrite .tag { margin-top:10px; margin-left:10px; } @@ -281,3 +274,5 @@ h5 { padding:2px; } .tags .tagTypeD a { font-weight:bold; margin:0; background-color:#EFEFEF;} .tags .tagTypeE a { font-weight:normal; margin:0;} + +.listWrite { margin-bottom:20px; } diff --git a/modules/board/skins/xe_guestbook/input_password_form.html b/modules/board/skins/xe_guestbook/input_password_form.html index 0f935eb92..2617d680b 100644 --- a/modules/board/skins/xe_guestbook/input_password_form.html +++ b/modules/board/skins/xe_guestbook/input_password_form.html @@ -1,6 +1,7 @@ +sadf
diff --git a/modules/board/skins/xe_guestbook/js/board.js b/modules/board/skins/xe_guestbook/js/board.js index f23633952..6b4d69475 100644 --- a/modules/board/skins/xe_guestbook/js/board.js +++ b/modules/board/skins/xe_guestbook/js/board.js @@ -14,9 +14,9 @@ function completeDocumentInserted(ret_obj) { //alert(message); - var url = current_url.setQuery('mid',mid).setQuery('act',''); + var url = current_url.setQuery('mid',mid).setQuery('act','').setQuery('document_srl','').setQuery('rnd',document_srl); if(category_srl) url = url.setQuery('category',category_srl); - location.href = url; + location.href = url+'#document_'+document_srl; } /* 글 삭제 */ @@ -62,7 +62,7 @@ function completeInsertComment(ret_obj) { var document_srl = ret_obj['document_srl']; var comment_srl = ret_obj['comment_srl']; - var url = current_url.setQuery('mid',mid).setQuery('act',''); + var url = current_url.setQuery('mid',mid).setQuery('act','').setQuery('document_srl',''); if(comment_srl) url = url.setQuery('rnd',comment_srl)+"#comment_"+comment_srl; //alert(message); @@ -78,12 +78,12 @@ function completeDeleteComment(ret_obj) { var document_srl = ret_obj['document_srl']; var page = ret_obj['page']; - var url = current_url.setQuery('mid',mid).setQuery('document_srl',document_srl).setQuery('act',''); + var url = current_url.setQuery('mid',mid).setQuery('document_srl','').setQuery('act','').setQuery('rnd',document_srl); if(page) url = url.setQuery('page',page); //alert(message); - location.href = url; + location.href = url+'#document_'+document_srl; } /* 트랙백 삭제 */ @@ -94,7 +94,7 @@ function completeDeleteTrackback(ret_obj) { var document_srl = ret_obj['document_srl']; var page = ret_obj['page']; - var url = current_url.setQuery('mid',mid).setQuery('document_srl',document_srl).setQuery('act',''); + var url = current_url.setQuery('mid',mid).setQuery('document_srl','').setQuery('act',''); if(page) url = url.setQuery('page',page); //alert(message); diff --git a/modules/board/skins/xe_guestbook/list.html b/modules/board/skins/xe_guestbook/list.html index f4165bf06..dd080c4a8 100644 --- a/modules/board/skins/xe_guestbook/list.html +++ b/modules/board/skins/xe_guestbook/list.html @@ -5,43 +5,31 @@ + + + +
+ +
+ -
- -
- [{$document->getRegdate("Y-m-d")}] - {$document->getContentText(20)} - - - {$document->getCommentCount()} - - - - {$document->getTrackbackCount()} - - - {$document->printExtraImages(60*60*$module_info->duration_new)} + +
+ +
-
- - - -
- -
- -
- -
- +
+ +
+
diff --git a/modules/board/skins/xe_guestbook/skin.xml b/modules/board/skins/xe_guestbook/skin.xml index 46d9f2b21..8b363a574 100644 --- a/modules/board/skins/xe_guestbook/skin.xml +++ b/modules/board/skins/xe_guestbook/skin.xml @@ -1,15 +1,15 @@ - 방명록 기본 스킨 - 留言本默认皮肤 - ゲストブックのデフォルトスキン - Zeroboard XE Basic Guestbook Skin + zbXE 방명록 기본 스킨 + zbXE 留言本默认皮肤 + zbXE ゲストブックのデフォルトスキン + zbXE Basic Guestbook Skin 제로 Zero Zero Zero - board모듈의 default스킨 + board모듈의 기본 방명록 스킨 留言本模块的默认皮肤。 ボード(board)モジュールのデフォルトスキンです。 This is the basic guestbook skin of Zeroboard XE. diff --git a/modules/board/skins/xe_guestbook/view_document.html b/modules/board/skins/xe_guestbook/view_document.html index d073ff0b9..ff8518884 100644 --- a/modules/board/skins/xe_guestbook/view_document.html +++ b/modules/board/skins/xe_guestbook/view_document.html @@ -19,9 +19,19 @@
+
+ + {$lang->cmd_delete} + {$lang->cmd_modify} + + {$lang->cmd_reply} +
{$oDocument->getRegdate('Y.m.d')} {$oDocument->getRegdate('H:i:s')} + + ({$oDocument->get('ipaddress')}) +
@@ -52,6 +62,7 @@
+ @@ -69,10 +80,6 @@ {$oDocument->getContent(false,false)} - - -
ipaddress : {$oDocument->get('ipaddress')}
-
@@ -88,18 +95,8 @@
- - -
- {$lang->cmd_reply} - - {$lang->cmd_modify} - {$lang->cmd_delete} - -
- - - - - + + + + diff --git a/modules/board/skins/xe_guestbook/write_form.html b/modules/board/skins/xe_guestbook/write_form.html index c7a66a096..08ead726f 100644 --- a/modules/board/skins/xe_guestbook/write_form.html +++ b/modules/board/skins/xe_guestbook/write_form.html @@ -1,102 +1,104 @@ - - + + + +
-
- -
- - +
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+ - - +
+ + {@ $_color = array('555555','222288','226622','2266EE','8866CC','88AA66','EE2222','EE6622','EEAA22','EEEE22') } +
+
+ get('title_bold')=='Y')-->checked="checked" /> + +
+
+ isNotice())-->checked="checked" id="is_notice" /> + +
+
+ isLocked())-->checked="checked" id="lock_comment" /> + +
+ +
+ isSecret())-->checked="checked" id="is_secret" /> + +
+
+ allowComment())-->checked="checked" id="allow_comment" /> + +
+ +
+ useNotify())-->checked="checked" id="notify_message" /> + +
+ +
- - + + + + + + + + + + + + +
{$val->name} *
+ + +
{$oDocument->getEditor()}
+ +
+   + + + + + + + +
+ +
- -
- - -
- - {@ $_color = array('555555','222288','226622','2266EE','8866CC','88AA66','EE2222','EE6622','EEAA22','EEEE22') } -
-
- get('title_bold')=='Y')-->checked="checked" /> - -
-
- isNotice())-->checked="checked" id="is_notice" /> - -
-
- isLocked())-->checked="checked" id="lock_comment" /> - -
- -
- isSecret())-->checked="checked" id="is_secret" /> - -
-
- allowComment())-->checked="checked" id="allow_comment" /> - -
-
- allowTrackback())-->checked="checked" id="allow_trackback" /> - -
- -
- useNotify())-->checked="checked" id="notify_message" /> - -
- -
- - - - - - - - - - - - - -
{$val->name} *
- - -
{$oDocument->getEditor()}
- -
- -
- - - - -
- -
- - - -
- -
- + + + +