From bc3fba33b20fef7adef6ce363e84059aa2cde84e Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 3 Jul 2007 13:10:40 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1850 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/db/DB.class.php | 11 + classes/module/ModuleObject.class.php | 9 +- classes/xml/XmlJsFilter.class.php | 3 +- common/css/button.css | 166 ++++++++++ common/css/default.css | 66 ++-- common/js/common.js | 3 +- common/lang/en.lang.php | 214 ++++++++++++ common/tpl/common_layout.html | 1 + common/tpl/images/form_buttons.gif | Bin 0 -> 4635 bytes common/tpl/images/form_buttons.png | Bin 0 -> 7524 bytes common/tpl/popup_layout.html | 3 +- config/config.inc.php | 7 + layouts/zb5_site/css/blue.css | 14 +- layouts/zb5_site/css/green.css | 22 +- layouts/zb5_site/css/purple.css | 20 +- layouts/zb5_site/css/red.css | 18 +- modules/addon/conf/info.xml | 3 + modules/addon/lang/en.lang.php | 15 + modules/addon/tpl/addon_info.html | 4 +- modules/addon/tpl/addon_list.html | 4 +- modules/addon/tpl/setup_addon.html | 8 +- modules/admin/conf/info.xml | 3 + modules/admin/lang/en.lang.php | 66 ++++ modules/admin/lang/zh-CN.lang.php | 66 ++++ modules/admin/tpl/css/admin.css | 41 +-- modules/admin/tpl/css/admin_layout.css | 18 +- modules/admin/tpl/layout.html | 2 +- modules/admin/tpl/shortcut_list.html | 2 +- modules/blog/conf/info.xml | 14 + modules/blog/conf/module.xml | 6 + modules/blog/lang/en.lang.php | 33 ++ modules/blog/lang/jp.lang.php | 33 ++ modules/blog/lang/zh-CN.lang.php | 33 ++ modules/blog/skins/xe_blog/comment_form.html | 6 +- modules/blog/skins/xe_blog/css/layout.css | 22 +- modules/blog/skins/xe_blog/css/white.css | 7 +- .../skins/xe_blog/delete_comment_form.html | 12 +- modules/blog/skins/xe_blog/delete_form.html | 12 +- .../skins/xe_blog/delete_trackback_form.html | 8 +- .../skins/xe_blog/input_password_form.html | 16 +- modules/blog/skins/xe_blog/layout.html | 7 +- modules/blog/skins/xe_blog/view_document.html | 10 +- modules/blog/skins/xe_blog/write_form.html | 6 +- modules/blog/tpl/blog_delete.html | 8 +- modules/blog/tpl/blog_info.html | 6 +- modules/blog/tpl/blog_insert.html | 4 +- modules/blog/tpl/category_info.html | 17 +- modules/blog/tpl/category_list.html | 16 +- modules/blog/tpl/grant_list.html | 4 +- modules/blog/tpl/index.html | 10 +- modules/blog/tpl/js/blog_admin.js | 4 + modules/blog/tpl/skin_info.html | 4 +- modules/board/conf/info.xml | 6 + modules/board/lang/en.lang.php | 17 + modules/board/lang/zh-CN.lang.php | 17 + modules/board/skins/default/skin.xml | 13 +- .../board/skins/xe_gallery/comment_form.html | 8 +- modules/board/skins/xe_gallery/css/white.css | 114 +++---- .../skins/xe_gallery/delete_comment_form.html | 10 +- .../board/skins/xe_gallery/delete_form.html | 12 +- modules/board/skins/xe_gallery/header.html | 13 +- .../skins/xe_gallery/input_password_form.html | 13 +- modules/board/skins/xe_gallery/list.html | 62 ++-- modules/board/skins/xe_gallery/skin.xml | 14 + .../board/skins/xe_gallery/view_document.html | 14 +- .../board/skins/xe_gallery/write_form.html | 7 +- modules/board/skins/xe_list/comment_form.html | 8 +- modules/board/skins/xe_list/css/white.css | 98 ++---- .../skins/xe_list/delete_comment_form.html | 10 +- modules/board/skins/xe_list/delete_form.html | 12 +- modules/board/skins/xe_list/header.html | 13 +- .../images/white/buttonTypeACenter.gif | Bin 188 -> 0 bytes .../xe_list/images/white/buttonTypeALeft.gif | Bin 169 -> 0 bytes .../xe_list/images/white/buttonTypeARight.gif | Bin 170 -> 0 bytes .../images/white/buttonTypeBCenter.gif | Bin 183 -> 0 bytes .../xe_list/images/white/buttonTypeBLeft.gif | Bin 166 -> 0 bytes .../xe_list/images/white/buttonTypeBRight.gif | Bin 166 -> 0 bytes .../skins/xe_list/input_password_form.html | 13 +- modules/board/skins/xe_list/list.html | 94 +++--- modules/board/skins/xe_list/skin.xml | 18 + .../board/skins/xe_list/view_document.html | 14 +- modules/board/skins/xe_list/write_form.html | 7 +- .../board/skins/xe_webzine/comment_form.html | 8 +- modules/board/skins/xe_webzine/css/white.css | 100 ++---- .../skins/xe_webzine/delete_comment_form.html | 10 +- .../board/skins/xe_webzine/delete_form.html | 12 +- modules/board/skins/xe_webzine/header.html | 13 +- .../skins/xe_webzine/input_password_form.html | 13 +- modules/board/skins/xe_webzine/list.html | 90 +++-- modules/board/skins/xe_webzine/skin.xml | 16 + .../board/skins/xe_webzine/view_document.html | 14 +- .../board/skins/xe_webzine/write_form.html | 7 +- modules/board/tpl/board_delete.html | 8 +- modules/board/tpl/board_info.html | 8 +- modules/board/tpl/board_insert.html | 4 +- modules/board/tpl/category_list.html | 4 +- modules/board/tpl/category_update_form.html | 4 +- modules/board/tpl/checked_list.html | 10 +- modules/board/tpl/grant_list.html | 4 +- modules/board/tpl/index.html | 8 +- modules/board/tpl/skin_info.html | 4 +- modules/comment/conf/info.xml | 6 + modules/comment/lang/en.lang.php | 23 ++ modules/comment/lang/zh-CN.lang.php | 23 ++ modules/comment/tpl/comment_list.html | 34 +- modules/counter/conf/info.xml | 3 + modules/counter/lang/zh-CN.lang.php | 22 ++ modules/document/document.item.php | 2 + modules/document/tpl/document_list.html | 31 +- .../components/colorpicker_bg/tpl/popup.css | 9 +- .../components/colorpicker_bg/tpl/popup.html | 14 +- .../components/colorpicker_text/tpl/popup.css | 8 +- .../colorpicker_text/tpl/popup.html | 14 +- .../editor/components/emoticon/tpl/popup.css | 2 + .../editor/components/emoticon/tpl/popup.html | 6 +- .../components/html_editor/tpl/popup.css | 1 + .../components/html_editor/tpl/popup.html | 10 +- .../components/image_gallery/tpl/popup.css | 5 +- .../components/image_gallery/tpl/popup.html | 12 +- .../components/image_link/tpl/popup.css | 3 + .../components/image_link/tpl/popup.html | 14 +- .../components/multimedia_link/tpl/popup.css | 1 + .../components/multimedia_link/tpl/popup.html | 10 +- .../editor/components/naver_map/tpl/popup.css | 1 + .../components/naver_map/tpl/popup.html | 12 +- .../components/poll_maker/tpl/popup.css | 4 + .../components/poll_maker/tpl/popup.html | 22 +- .../editor/components/quotation/tpl/popup.css | 3 + .../components/quotation/tpl/popup.html | 10 +- .../components/table_maker/tpl/popup.css | 3 + .../components/table_maker/tpl/popup.html | 10 +- .../editor/components/url_link/tpl/popup.css | 1 + .../editor/components/url_link/tpl/popup.html | 10 +- modules/editor/editor.model.php | 4 +- modules/editor/lang/zh-CN.lang.php | 30 ++ modules/editor/tpl/admin_index.html | 6 +- modules/editor/tpl/css/editor.css | 22 +- modules/editor/tpl/editor.html | 33 +- modules/editor/tpl/js/editor.js | 3 +- modules/editor/tpl/setup_component.html | 8 +- modules/editor/tpl/view_component.html | 5 +- modules/file/conf/info.xml | 3 + modules/file/file.controller.php | 2 +- modules/file/lang/zh-CN.lang.php | 39 +++ modules/file/tpl/file_config.html | 6 +- modules/file/tpl/file_list.html | 20 +- modules/importer/tpl/index.html | 36 +- modules/install/tpl/check_env.html | 52 ++- modules/install/tpl/css/install.css | 50 +-- modules/install/tpl/footer.html | 3 + modules/install/tpl/form.cubrid.html | 126 ++++--- modules/install/tpl/form.mysql.html | 126 ++++--- modules/install/tpl/form.mysql_innodb.html | 127 ++++--- modules/install/tpl/form.sqlite2.html | 101 +++--- modules/install/tpl/form.sqlite3_pdo.html | 102 +++--- modules/install/tpl/header.html | 3 + .../install/tpl/images/buttonTypeACenter.gif | Bin 188 -> 0 bytes .../install/tpl/images/buttonTypeALeft.gif | Bin 169 -> 0 bytes .../install/tpl/images/buttonTypeARight.gif | Bin 170 -> 0 bytes modules/install/tpl/introduce.html | 18 +- modules/install/tpl/select_db.html | 43 +-- modules/krzip/tpl/index.html | 6 +- .../layout/tpl/downloaded_layout_list.html | 2 +- modules/layout/tpl/index.html | 12 +- modules/layout/tpl/insert_layout.html | 4 +- modules/layout/tpl/layout_detail_info.html | 4 +- modules/layout/tpl/layout_edit.html | 16 +- modules/layout/tpl/layout_modify.html | 28 +- modules/member/skins/default/add_friend.html | 62 ++-- .../skins/default/add_friend_group.html | 19 +- modules/member/skins/default/css/normal.css | 313 +++++++----------- .../member/skins/default/friends_list.html | 83 ++--- .../images/normal/buttonTypeACenter.gif | Bin 188 -> 0 bytes .../default/images/normal/buttonTypeALeft.gif | Bin 169 -> 0 bytes .../images/normal/buttonTypeARight.gif | Bin 170 -> 0 bytes .../images/normal/buttonTypeBCenter.gif | Bin 183 -> 0 bytes .../default/images/normal/buttonTypeBLeft.gif | Bin 166 -> 0 bytes .../images/normal/buttonTypeBRight.gif | Bin 166 -> 0 bytes modules/member/skins/default/leave_form.html | 10 +- modules/member/skins/default/login_form.html | 28 +- modules/member/skins/default/logout.html | 11 +- modules/member/skins/default/member_info.html | 46 ++- .../member/skins/default/member_messages.html | 32 +- .../skins/default/member_new_message.html | 60 ++-- modules/member/skins/default/modify_info.html | 67 ++-- .../member/skins/default/modify_password.html | 10 +- .../member/skins/default/send_message.html | 72 ++-- modules/member/skins/default/signup_form.html | 47 ++- modules/member/tpl/delete_form.html | 8 +- modules/member/tpl/denied_id_list.html | 6 +- modules/member/tpl/group_list.html | 8 +- modules/member/tpl/group_update_form.html | 4 +- modules/member/tpl/insert_join_form.html | 6 +- modules/member/tpl/insert_member.html | 40 +-- modules/member/tpl/join_form_list.html | 10 +- modules/member/tpl/member_config.html | 8 +- modules/member/tpl/member_info.html | 34 +- modules/member/tpl/member_list.html | 31 +- modules/menu/tpl/index.html | 6 +- modules/menu/tpl/js/menu_admin.js | 4 + modules/menu/tpl/menu_insert.html | 6 +- modules/menu/tpl/menu_item_info.html | 22 +- modules/menu/tpl/menu_management.html | 30 +- modules/menu/tpl/mid_list.html | 24 +- modules/message/tpl/config.html | 6 +- modules/module/tpl/category_list.html | 8 +- modules/module/tpl/category_update_form.html | 4 +- modules/module/tpl/module_info.html | 4 +- modules/module/tpl/module_list.html | 8 +- modules/page/tpl/content.html | 7 +- modules/page/tpl/css/page.css | 10 - modules/page/tpl/header.html | 1 - modules/page/tpl/index.html | 8 +- modules/page/tpl/page_delete.html | 8 +- modules/page/tpl/page_info.html | 8 +- modules/page/tpl/page_insert.html | 13 +- modules/poll/tpl/config.html | 6 +- modules/poll/tpl/poll_list.html | 43 +-- modules/spamfilter/tpl/denied_ip_list.html | 6 +- modules/spamfilter/tpl/denied_word_list.html | 6 +- modules/spamfilter/tpl/index.html | 6 +- modules/trackback/tpl/trackback_list.html | 37 +-- modules/ttimporter/tpl/index.html | 12 +- .../widget/tpl/downloaded_widget_list.html | 4 +- modules/widget/tpl/widget_detail_info.html | 5 +- modules/widget/tpl/widget_generate_code.html | 9 +- .../tpl/widget_generate_code_in_page.html | 10 +- .../login_info/skins/default/css/default.css | 31 +- .../login_info/skins/default/login_info.html | 26 +- .../skins/default/blue/style.css | 5 - .../skins/default/normal/style.css | 5 - 231 files changed, 2671 insertions(+), 2132 deletions(-) create mode 100644 common/css/button.css create mode 100644 common/lang/en.lang.php create mode 100755 common/tpl/images/form_buttons.gif create mode 100755 common/tpl/images/form_buttons.png create mode 100644 modules/addon/lang/en.lang.php create mode 100644 modules/admin/lang/en.lang.php create mode 100644 modules/admin/lang/zh-CN.lang.php create mode 100644 modules/blog/lang/en.lang.php create mode 100644 modules/blog/lang/jp.lang.php create mode 100644 modules/blog/lang/zh-CN.lang.php create mode 100644 modules/board/lang/en.lang.php create mode 100644 modules/board/lang/zh-CN.lang.php delete mode 100644 modules/board/skins/xe_list/images/white/buttonTypeACenter.gif delete mode 100644 modules/board/skins/xe_list/images/white/buttonTypeALeft.gif delete mode 100644 modules/board/skins/xe_list/images/white/buttonTypeARight.gif delete mode 100644 modules/board/skins/xe_list/images/white/buttonTypeBCenter.gif delete mode 100644 modules/board/skins/xe_list/images/white/buttonTypeBLeft.gif delete mode 100644 modules/board/skins/xe_list/images/white/buttonTypeBRight.gif create mode 100644 modules/comment/lang/en.lang.php create mode 100644 modules/comment/lang/zh-CN.lang.php create mode 100644 modules/counter/lang/zh-CN.lang.php create mode 100644 modules/editor/lang/zh-CN.lang.php create mode 100644 modules/file/lang/zh-CN.lang.php create mode 100644 modules/install/tpl/footer.html delete mode 100644 modules/install/tpl/images/buttonTypeACenter.gif delete mode 100644 modules/install/tpl/images/buttonTypeALeft.gif delete mode 100644 modules/install/tpl/images/buttonTypeARight.gif delete mode 100644 modules/member/skins/default/images/normal/buttonTypeACenter.gif delete mode 100644 modules/member/skins/default/images/normal/buttonTypeALeft.gif delete mode 100644 modules/member/skins/default/images/normal/buttonTypeARight.gif delete mode 100644 modules/member/skins/default/images/normal/buttonTypeBCenter.gif delete mode 100644 modules/member/skins/default/images/normal/buttonTypeBLeft.gif delete mode 100644 modules/member/skins/default/images/normal/buttonTypeBRight.gif diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php index d5b5cb7ac..466594559 100644 --- a/classes/db/DB.class.php +++ b/classes/db/DB.class.php @@ -136,6 +136,17 @@ if($this->isError()) { $str .= sprintf("\t Query Failed : %d\n\t\t\t %s\n", $this->errno, $this->errstr); + + if(__DEBUG_DB_OUTPUT==1) { + $debug_file = "./files/_debug_db_query.php"; + $buff = sprintf("%s\n",print_r($buff,true)); + + if($display_line) $buff = "\n====================================\n".$buff."------------------------------------\n"; + + if(@!$fp = fopen($debug_file,"a")) return; + fwrite($fp, $buff); + fclose($fp); + } } else { $str .= "\t Query Success\n"; } diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php index db58e10f1..e96ad2dad 100644 --- a/classes/module/ModuleObject.class.php +++ b/classes/module/ModuleObject.class.php @@ -277,7 +277,8 @@ // 현재 모듈에 act값이 있으면 해당 act를 실행 if(method_exists($this, $this->act)) { //$output = call_user_method($this->act, $this); - $output = call_user_func(array($this, $this->act)); + //$output = call_user_func(array($this, $this->act)); + $output = $this->{$this->act}(); // act가 없으면 action_forward에서 해당하는 act가 있는지 찾아서 대신 실행 } else if(Context::isInstalled()) { @@ -294,7 +295,8 @@ $oModule->setModuleInfo($this->module_info, $xml_info); //$output = call_user_method($forward->act, $oModule); - $output = call_user_func(array($oModule, $forward->act)); + //$output = call_user_func(array($oModule, $forward->act)); + $output = $oModule->{$forward->act}(); $this->setTemplatePath($oModule->getTemplatePath()); $this->setTemplateFile($oModule->getTemplateFile()); @@ -302,7 +304,8 @@ } else { if($this->xml_info->default_index_act) { //$output = call_user_method($this->xml_info->default_index_act, $this); - $output = call_user_func(array($this, $this->xml_info->default_index_act)); + //$output = call_user_func(array($this, $this->xml_info->default_index_act)); + $output = $this->{$this->xml_info->default_index_act}(); } else { return false; } diff --git a/classes/xml/XmlJsFilter.class.php b/classes/xml/XmlJsFilter.class.php index 3ca62cfb9..9d7487616 100644 --- a/classes/xml/XmlJsFilter.class.php +++ b/classes/xml/XmlJsFilter.class.php @@ -104,7 +104,8 @@ if(method_exists($oExtendFilter, $method)) { // 결과를 받음 //$extend_filter_list = call_user_method($method, $oExtendFilter, true); - $extend_filter_list = call_user_func(array($oExtendFilter, $method)); + //$extend_filter_list = call_user_func(array($oExtendFilter, $method)); + $extend_filter_list = $oExtendFilter->{$method}(); $extend_filter_count = count($extend_filter_list); // 결과에서 lang값을 이용 문서 변수에 적용 diff --git a/common/css/button.css b/common/css/button.css new file mode 100644 index 000000000..fc8d8bead --- /dev/null +++ b/common/css/button.css @@ -0,0 +1,166 @@ +/* + http://www.hedgerwow.com/360/dhtml/css-round-button/demo.php +*/ + +a.button, span.button, del.button { + display:-moz-inline-box; + display:inline-block; + cursor:pointer; + border:none; + font-size:0; + line-height:0; + + /* + for Safari, read this first + http://creativebits.org/webdev/safari_background_repeat_bug_fix + */ + background-position:0 -3px; + background-repeat:no-repeat; + height:24px; + text-decoration:none; + color:#2e523b; + font-style:normal; + margin:0 6px 0px 0; + padding:0 10px 0 0; + vertical-align:middle; + + padding-top:-2px; + _position:relative; + _width:10px; + _overflow-y:hidden; +} + +a.button, span.button, del.button, a.button span, span.button button, span.button input, del.button span { + background-image:url(../tpl/images/form_buttons.png); + _background-image:url(../tpl/images/form_buttons.gif); +} + + +a.button span, span.button button, span.button input, del.button span { + white-space:nowrap; + cursor:pointer; + color:#222; + display:-moz-inline-box; + display:inline-block; + line-height:1; + letter-spacing:0 !important; + font-size:12px !important; + font-style:normal; + background-color:transparent; + background-position:100% -3px; + background-repeat:no-repeat; + height:24px; + padding:4px 10px 0 4px; + margin:0 -16px 0 7px; + border:none; + vertical-align:text-top; + zoom:1; + _position:relative; + _padding-left:0px; + _padding-right:10px; + _padding-top:6px; + _margin-right:-10px; + _margin-left:6px; + _display:block; + _top:0; + _right:-5px; +} + +*:first-child+html a.button span, span.button button, span.button input, del.button span { padding-top:6px; } + + +span.button button { + line-height:2.5;/*Opera need this*/ +} + +html.safari a.button span, html.safari del.button span { + line-height:1.3; +} + +html.safari span.button button { + line-height:2.6; +} + +html.safari a.button:focus, html.safari span.button button:focus { + outline:none; +} + +del.button{ + /* cursor:not-allowed; */ + background-position:0 -123px; + +} + +del.button span { + cursor:default; + color:#aaa !important; + background-position:100% -123px; +} + + +span.button button, span.button input { + padding-top:0px; + line-height:2.5;/*Opera need this*/ +} + +/** optional **/ +/* +a.button:visited{ + color:#aaa; +} +*/ + +/*Hover Style*/ +a.button:hover, span.button:hover, a.button:focus, a.dom-button-focus, span.button-behavior-hover { + background-position:0 -63px; + color:#222; + text-decoration:none; +} + +a.button:hover span, span.button:hover button, a.button:focus span, span.button-behavior-hover button, span.button-behavior-hover input { + background-position:100% -63px; +} + + +a.button:active, a.button:focus span { + color:#444; +} + +del.button-behavior-hover, del.button:hover { + background-position:0 -183px; + /* cursor:not-allowed; */ +} + +del.button-behavior-hover span, del.button:hover span { + background-position:100% -183px; + /* cursor:not-allowed; */ +} + +/*Optional hack for IE6 to simulate :hover selector*/ + +span.button button, del.button span, span.button input { + _behavior:expression( + (function(el){ + if( typeof( behavior_onMouseEnter) == 'undefined'){ + behavior_onMouseEnter = function(el) { + var dEl = this.parentNode; + var sClass = dEl.className ; + dEl.__defaultClassName = sClass ; + dEl.className = sClass + ' button-behavior-hover'; + this.setCapture(); + }; + + behavior_onMouseLeave = function(el) { + var dEl = this.parentNode; + dEl.className = dEl.__defaultClassName ; + dEl.__defaultClassName = undefined; + this.releaseCapture(); + }; + }; + + el.runtimeStyle.behavior = 'none'; + el.onmouseenter = behavior_onMouseEnter; + el.onmouseleave = behavior_onMouseLeave; + } + )(this)); +} diff --git a/common/css/default.css b/common/css/default.css index b36fcef5f..7112afafb 100644 --- a/common/css/default.css +++ b/common/css/default.css @@ -3,7 +3,7 @@ /* Used Hack IE6 & Below -{ property:value; _property:value;} +{ property:value; _property:value; } IE7 Only *:first-child+html #selector IE7 & IE6 & Below @@ -12,58 +12,64 @@ IE7 & IE6 & Below */ /* Special Class Selector */ -.fr { float:right;} -.fl { float:left;} +.fr { float:right; } +.fl { float:left; } +.clear { clear:both; } +.fwB { font-weight:bold;} +.tCenter { text-align:center; } +.tRight { text-align:right; } +.tLeft { text-align:left; } +.gap1 { margin-top:.8em; } /* default.css - Type Selector Definition */ * { margin:0; padding:0; } -html, body { } html { width:100%; position:relative;} -body { font-size:.75em; margin:0;} -img { border:none;} -label { cursor:pointer;} -/*select { height:1.6em;}*/ -option { padding-right:.5em;} -li { list-style:none;} -a { text-decoration:none;} -a:hover { text-decoration:underline;} -address { font-style:normal;} +body { margin:0; font-size:.75em;} +img { border:none; } +label { cursor:pointer; } +form { margin:0; padding:0; } -.iePngFix { behavior:url(./common/js/iePngFix.htc);} +input,textarea,button { font-size:1em; } + +.iePngFix { behavior:url(./common/js/iePngFix.htc); } /* Input Style Definition */ -.inputTypeText { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px; height:1em; line-height:1em; background:#ffffff;} +.inputTypeText { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px; height:1.2em; line-height:1em; background:#ffffff; font-size:1em;} .inputTypeText:hover, -.inputTypeText:focus { background:#f4f4f4;} -.inputTypeTextArea { border:1px solid !important; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6 !important; padding:3px; background:#ffffff;} +.inputTypeText:focus { background:#f4f4f4; } +.inputTypeTextArea { border:1px solid !important; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6 !important; padding:3px; background:#ffffff; } +.w40 { width:40px; } +.w60 { width:60px; } +.w80 { width:80px; } +.w100 { width:100px; } +.w120 { width:120px; } +.w140 { width:140px; } +.w200 { width:200px; } +.w300 { width:300px; } +.w400 { width:400px; } + + +/* editor style */ a.bold { font-weight:bold; } -.editor_blue_text { color: #145ff9; text-decoration:none; border-bottom:2px solid #4a7fec;} -.editor_red_text { color: #f42126; text-decoration:none; border-bottom:2px solid #e54347;} -.editor_yellow_text { color: #c9bd00; text-decoration:none; border-bottom:2px solid #ece460;} -.editor_green_text { color: #08830B; text-decoration:none; border-bottom:2px solid #08830B;} +.editor_blue_text { color: #145ff9; text-decoration:none; border-bottom:2px solid #4a7fec; } +.editor_red_text { color: #f42126; text-decoration:none; border-bottom:2px solid #e54347; } +.editor_yellow_text { color: #c9bd00; text-decoration:none; border-bottom:2px solid #ece460; } +.editor_green_text { color: #08830B; text-decoration:none; border-bottom:2px solid #08830B; } .folder_opener { display: block; } .folder_closer { display: none; } .folder_area { display: none; } .zbxe_widget_output { background:url(../tpl/images/widget.gif) no-repeat center; background-color:#FFFFFF; border:3px dotted #039311; display:block; } - .member_signature { margin-top:10px; border:1px solid #DDDDDD; padding:10px; } -#waitingforserverresponse { display:inline; border:2px solid #444444; background-color:#FFFFFF; padding:15px 20px 13px 20px; font-weight:bold; font-size:9pt; color:#444444; top:40px; left:40px; position:absolute; z-index:100; visibility:hidden; } - +#waitingforserverresponse { display:inline; border:2px solid #444444; background-color:#FFFFFF; padding:15px 20px 13px 20px; font-weight:bold; color:#444444; top:40px; left:40px; position:absolute; z-index:100; visibility:hidden; } #fororiginalimageareabg { z-index:1001; background-color:#FFFFFF; width:100%; height:100%; top:0px; left:0px; position:relative; padding:20px 10px 10px 10px; border:8px solid #DDDDDD; } - #fororiginalimagearea { visibility:hidden; padding:0px; margin:0px; width:100%; height:100%; top:0px; left:0px; position:absolute; z-index:1000; text-align:left; overflow:hidden; } - #fororiginalimage { z-index:1002; } - #closeOriginalImageBtn { position:absolute; right:8px; top:5px; cursor:pointer; width:50px; height:12px; z-index:1003; } - #membermenuarea { position:absolute; left:0px; top:0px; z-index:1003; visibility:hidden; border:1px solid #555555; background-color:#FFFFFF; padding:2px; width:110px; } - #membermenuarea .item { color:#353249; cursor:pointer; padding:3px 2px 1px 18px; height:17px; margin-left:2px; } - #membermenuarea .item_on { color:#2911B8; font-weight:bold; letter-spacing:-1px; cursor:pointer; padding:3px 2px 1px 18px; height:17px; margin-left:2px; } diff --git a/common/js/common.js b/common/js/common.js index d3cfcce47..9aeffa87a 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -246,7 +246,6 @@ function setFixedPopupSize() { xGetElementById('popBody').style.overflowX = 'hidden'; xHeight('popBody', 600); } - } var w = xWidth("popup_content"); @@ -270,6 +269,8 @@ function setFixedPopupSize() { var h1 = xHeight(window.document.body); window.resizeBy(0,h-h1); + + window.scrollTo(0,0); } /** diff --git a/common/lang/en.lang.php b/common/lang/en.lang.php new file mode 100644 index 000000000..7da5f5bc7 --- /dev/null +++ b/common/lang/en.lang.php @@ -0,0 +1,214 @@ +cmd_write = 'Write'; + $lang->cmd_reply = 'Reply'; + $lang->cmd_delete = 'Delete'; + $lang->cmd_modify = 'Modify'; + $lang->cmd_edit = 'Edit'; + $lang->cmd_view = 'View'; + $lang->cmd_view_all = 'View All'; + $lang->cmd_list = 'List'; + $lang->cmd_prev = 'Prev'; + $lang->cmd_next = 'Next'; + $lang->cmd_send_trackback = 'Send Trackback'; + $lang->cmd_registration = $lang->cmd_submit = 'Submit'; + $lang->cmd_comment_registration = 'Add Comment'; + $lang->cmd_insert = 'Insert'; + $lang->cmd_save = 'Save'; + $lang->cmd_input = 'Input'; + $lang->cmd_search = 'Search'; + $lang->cmd_cancel = 'Cancel'; + $lang->cmd_back = 'Go Back'; + $lang->cmd_vote = 'Vote'; + $lang->cmd_move = 'Move'; + $lang->cmd_move_up = 'Up'; + $lang->cmd_move_down = 'Down'; + $lang->cmd_add_indent = 'Indent'; + $lang->cmd_remove_indent = 'Outdent'; + $lang->cmd_management = 'Manage'; + $lang->cmd_make = 'Create'; + $lang->cmd_select = 'Select'; + $lang->cmd_select_all = 'Select All'; + $lang->cmd_unselect_all = 'Deselect All'; + $lang->cmd_close_all = 'Close All'; + $lang->cmd_open_all = 'Open All'; + $lang->cmd_reload = 'Reload'; + $lang->cmd_close = 'Close'; + $lang->cmd_open = 'Open'; + $lang->cmd_setup = 'Configure'; + $lang->cmd_apply = 'Apply'; + $lang->cmd_open_calendar = 'Select a Date'; + $lang->cmd_send = 'Send'; + + $lang->enable = 'Enable'; + $lang->disable = 'Disable'; + + // Essencial Words + $lang->no = 'No'; + $lang->notice = 'Notice'; + $lang->secret = 'Secret'; + $lang->category = 'Category'; + $lang->document_srl = 'Doc. No.'; + $lang->user_id = 'ID'; + $lang->author = 'Author'; + $lang->password = 'Password'; + $lang->password1 = 'Password'; + $lang->password2 = 'Confirm Password'; + $lang->admin_id = 'Admin ID'; + $lang->writer = 'Writer'; + $lang->user_name = 'User Name'; + $lang->nick_name = 'Nick Name'; + $lang->email_address = 'Email'; + $lang->homepage = 'Homepage'; + $lang->blog = 'Blog'; + $lang->birthday = 'Birthdate'; + $lang->browser_title = 'Browser Title'; + $lang->title = 'Title'; + $lang->title_content = 'Title+Content'; + $lang->content = 'Content'; + $lang->document = 'Entry'; + $lang->comment = 'Comment'; + $lang->description = 'Description'; + $lang->trackback = 'Trackback'; + $lang->tag = 'Tag'; + $lang->allow_comment = 'Allow Comment'; + $lang->lock_comment = 'Lock Comment'; + $lang->allow_trackback = 'Allow Trackback'; + $lang->uploaded_file = 'Attachment'; + $lang->grant = 'Authority'; + $lang->target = 'Target'; + $lang->total = 'Total'; + $lang->total_count = 'Count Total'; + $lang->ipaddress = 'IP Address'; + $lang->path = 'Path'; + $lang->cart = 'Selected Item'; + $lang->friend = 'Friends'; + + $lang->mid = 'Module Name'; + $lang->layout = 'Layout'; + $lang->widget = 'Widget'; + $lang->module = 'Module'; + $lang->skin = 'Theme'; + $lang->colorset = 'Colorset'; + $lang->extra_vars = 'Extra Vars'; + + $lang->document_url = 'Entry URL'; + $lang->trackback_url = 'Trackback URL'; + $lang->blog_name = 'Blog Title'; + $lang->excerpt = 'Quotation'; + + $lang->document_count = 'Entry Count'; + $lang->page_count = 'Page Count'; + $lang->list_count = 'List Count'; + $lang->readed_count = 'Count Referred'; + $lang->voted_count = 'Count Voted'; + $lang->member_count = 'Member Count'; + $lang->date = 'Date'; + $lang->regdate = 'Date Published'; + $lang->last_update = 'Last Update'; + $lang->signup_date = 'Signup Date'; + $lang->last_login = 'Last Login'; + $lang->first_page = 'First Page'; + $lang->last_page = 'Last Page'; + $lang->search_target = 'Searching Target'; + $lang->search_keyword = 'Searching Keyword'; + $lang->is_default = 'Default'; + + $lang->no_documents = 'No Entries!'; + + $lang->board_manager = 'Board Setting'; + $lang->member_manager = 'Member Setting'; + $lang->layout_manager = 'Layout Setting'; + + $lang->use = 'Use'; + $lang->notuse = 'Disuse'; + $lang->not_exists = 'Not exists'; + + $lang->unit_sec = 'sec'; + $lang->unit_min = 'min'; + $lang->unit_hour = 'hr'; + $lang->unit_day = 'day'; + $lang->unit_week = 'week'; + $lang->unit_month = 'month'; + $lang->unit_year = 'year'; + + // Related to Description + $lang->about_tag = 'When typing tags, inserting a comma(,) between each tag allows you to input multiple tags'; + $lang->about_layout = 'Layout decorates an appearance of your module. you could configure it from Layout menu on the top'; + + // Related to Message + $lang->msg_call_server = 'Requesting to the server, please wait'; + $lang->msg_db_not_setted = 'DB configuration has not been set'; + $lang->msg_invalid_queryid = 'Query ID value specified wrong'; + $lang->msg_not_permitted = 'You have no permission'; + $lang->msg_input_password = 'Please enter your password'; + $lang->msg_invalid_document = 'Invalid Entry Number'; + $lang->msg_invalid_request = 'Invalid Request'; + $lang->msg_invalid_password = 'Invalid Password'; + $lang->msg_error_occured = 'Error has been Occured'; + $lang->msg_not_founded = 'Target could not be found'; + $lang->msg_no_result = 'This search has no result'; + + $lang->msg_not_permitted_act = 'You are not permitted to request the action to be executed'; + $lang->msg_module_is_not_exists = 'Could not find the module you requested'; + $lang->msg_module_is_not_standalone = 'The module you requested could not behave independently'; + + $lang->success_registed = 'Successfully Registered'; + $lang->success_updated = 'Successfully Updated'; + $lang->success_deleted = 'Successfully Deleted'; + $lang->success_voted = 'Successfully Voted'; + $lang->success_moved = 'Successfully Moved'; + $lang->success_sended = 'Successfully Sent'; + $lang->success_reset = 'Successfully Reset'; + $lang->success_leaved = 'Successfully Seceded'; + + $lang->fail_to_delete = 'Deletion Failed'; + $lang->fail_to_move = 'Moving Failed'; + + $lang->failed_voted = 'Could not be voted'; + $lang->fail_to_delete_have_children = 'Deletion Failed, since there are one or more replies'; + + $lang->confirm_submit = 'Confirm to Submit?'; + $lang->confirm_logout = 'Confirm to Logout?'; + $lang->confirm_vote = 'Confirm to Vote?'; + $lang->confirm_delete = 'Confirm to Delete?'; + $lang->confirm_move = 'Confirm to Move?'; + $lang->confirm_reset = 'Confirm to Reset?'; + $lang->confirm_leave = 'Confirm to Secede?'; + + $lang->column_type = 'Column Type'; + $lang->column_type_list['text'] = 'one-line text'; + $lang->column_type_list['homepage'] = 'url'; + $lang->column_type_list['email_address'] = 'email'; + $lang->column_type_list['tel'] = 'phone number'; + $lang->column_type_list['textarea'] = 'multi-line textarea'; + $lang->column_type_list['checkbox'] = 'checkbox (multiple selection)'; + $lang->column_type_list['select'] = 'select box (single selection)'; + $lang->column_type_list['kr_zip'] = 'zip code (Korean)'; + $lang->column_type_list['date'] = 'date (yyyy/mm/dd)'; + //$lang->column_type_list['jp_zip'] = 'zip code (Japanese)'; + $lang->column_name = 'Column Name'; + $lang->column_title = 'Column Title'; + $lang->default_value = 'Default Value'; + $lang->is_active = 'Present tense'; + $lang->is_required = 'Required field'; + + // Alert messages for Javascript using by XML filter + $lang->filter->isnull = 'Input a value for %s'; + $lang->filter->outofrange = 'Align the text lenghth of %s'; + $lang->filter->equalto = 'Invalid value assigned for %s'; + $lang->filter->invalid_email = '%s got an invalid format (eg. zbxe@zeroboard.com)'; + $lang->filter->invalid_user_id = $lang->filter->invalid_userid = "%s got an invalid format.\\nIt takes English letters, numbers, and underbar(_) of which should start with English letters"; + $lang->filter->invalid_homepage = '%s got an invalid format. (ex: http://www.zeroboard.com)'; + $lang->filter->invalid_korean = '%s got an invalid format. Only Korean letters are accepted'; + $lang->filter->invalid_korean_number = '%s got an invalid format. Only a combination of Korean letters and numbers is accepted'; + $lang->filter->invalid_alpha = '%s got an invalid format. Only English letters are accepted'; + $lang->filter->invalid_alpha_number = '%s got an invalid format. Only a combination of English letters and numbers is accepted'; + $lang->filter->invalid_number = '%s got an invalid format. Only numbers are accepted'; +?> diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html index 042723abd..139bb268f 100644 --- a/common/tpl/common_layout.html +++ b/common/tpl/common_layout.html @@ -16,6 +16,7 @@ + + + diff --git a/modules/member/skins/default/modify_info.html b/modules/member/skins/default/modify_info.html index 6d224eb05..b6616b5cd 100644 --- a/modules/member/skins/default/modify_info.html +++ b/modules/member/skins/default/modify_info.html @@ -21,9 +21,9 @@ - - - +
+ + @@ -49,13 +49,13 @@
image_name
-
{$lang->cmd_delete}
+ {$lang->cmd_delete}
-
{$lang->cmd_registration}
+ {$lang->cmd_registration}
@@ -67,14 +67,13 @@
image_mark
-
{$lang->cmd_delete}
+ {$lang->cmd_delete}
- -
{$lang->cmd_registration}
+ {$lang->cmd_registration}
@@ -92,13 +91,13 @@ - + @@ -118,9 +117,9 @@
{$lang->member_default_info}
{$lang->user_id}
{zdate($member_info->birthday,"Y-m-d")}
-
{$lang->cmd_open_calendar}
+ {$lang->cmd_open_calendar}

{$lang->about_birthday}
{$lang->allow_mailing}allow_mailing!='N')-->checked="checked" />

{$lang->about_allow_mailing}

allow_mailing!='N')-->checked="checked" />

{$lang->about_allow_mailing}
{$lang->allow_message}
- - - +
+ + {@ $dummy_chk = 0 } @@ -132,25 +131,25 @@
{$lang->member_extend_info}
- + - + - + - - - + + + - + @@ -176,33 +175,33 @@
- +
- +
{zdate($val->value,"Y-m-d")}
-
{$lang->cmd_open_calendar}
+ {$lang->cmd_open_calendar} @@ -213,11 +212,9 @@
-
- +
+ + {$lang->cmd_cancel}
diff --git a/modules/member/skins/default/modify_password.html b/modules/member/skins/default/modify_password.html index 32527ff10..3a9c6093a 100644 --- a/modules/member/skins/default/modify_password.html +++ b/modules/member/skins/default/modify_password.html @@ -1,7 +1,7 @@ -
+

{$lang->cmd_modify_member_password}

@@ -39,11 +39,9 @@
-
- +
+ + 취소
diff --git a/modules/member/skins/default/send_message.html b/modules/member/skins/default/send_message.html index 832879bb0..527b2e842 100644 --- a/modules/member/skins/default/send_message.html +++ b/modules/member/skins/default/send_message.html @@ -1,41 +1,47 @@ + -
-

{$lang->cmd_send_message}

+
+ +
+

{$lang->cmd_send_message}

+
+ +
+ + + +
+ + + + + + + + + + + +
{$receiver_info->nick_name} ({$receiver_info->user_id})
제 목
+ +
+ {$editor} +
+ +
+ +
+ + {$lang->cmd_close} +
+ +
-
- - - -
- - - - - - - - - - - - - - -
{$receiver_info->nick_name} ({$receiver_info->user_id})
제 목
{$editor}
-
- -
- -
- -
- + + diff --git a/modules/member/skins/default/signup_form.html b/modules/member/skins/default/signup_form.html index 2f2300717..74eaa308a 100644 --- a/modules/member/skins/default/signup_form.html +++ b/modules/member/skins/default/signup_form.html @@ -15,15 +15,14 @@
{nl2br($member_config->agreement)} - -
- - -
+
+
+ +
- +
@@ -64,7 +63,7 @@ @@ -76,7 +75,7 @@ -
{$lang->member_default_info}
 
-
{$lang->cmd_open_calendar}
+ {$lang->cmd_open_calendar}

{$lang->about_birthday}
+
@@ -90,25 +89,25 @@
{$lang->member_extend_info}
- + - + - + - - - + + + - + @@ -135,16 +134,16 @@
@@ -160,7 +159,7 @@
{zdate($val->value,"Y-m-d")}
-
{$lang->cmd_open_calendar}
+ {$lang->cmd_open_calendar} @@ -171,11 +170,9 @@
-
- +
+ + {$lang->cmd_cancel}
diff --git a/modules/member/tpl/delete_form.html b/modules/member/tpl/delete_form.html index 01020018a..b3a4b3a7b 100644 --- a/modules/member/tpl/delete_form.html +++ b/modules/member/tpl/delete_form.html @@ -25,10 +25,10 @@ - +
+ + {$lang->cmd_back} +
diff --git a/modules/member/tpl/denied_id_list.html b/modules/member/tpl/denied_id_list.html index d3595e5db..05518d784 100644 --- a/modules/member/tpl/denied_id_list.html +++ b/modules/member/tpl/denied_id_list.html @@ -26,7 +26,7 @@ {$val->user_id} {zdate($val->regdate,"Y-m-d")} {$val->description}  - {$lang->cmd_delete} + {$lang->cmd_delete} @@ -63,8 +63,8 @@ -
- +
+
diff --git a/modules/member/tpl/group_list.html b/modules/member/tpl/group_list.html index fc85eddb6..255a4697e 100644 --- a/modules/member/tpl/group_list.html +++ b/modules/member/tpl/group_list.html @@ -33,8 +33,8 @@ {zdate($group_info->regdate,"Y-m-d H:i:s")} {nl2br($group_info->description)}  {$group_info->is_default} - {$lang->cmd_modify} - + {$lang->cmd_modify} + {$lang->cmd_delete} @@ -69,8 +69,8 @@ -
- +
+
diff --git a/modules/member/tpl/group_update_form.html b/modules/member/tpl/group_update_form.html index 352e9e0d5..728687483 100644 --- a/modules/member/tpl/group_update_form.html +++ b/modules/member/tpl/group_update_form.html @@ -26,8 +26,8 @@ -
- +
+
diff --git a/modules/member/tpl/insert_join_form.html b/modules/member/tpl/insert_join_form.html index 1e97b530c..0e0794bfb 100644 --- a/modules/member/tpl/insert_join_form.html +++ b/modules/member/tpl/insert_join_form.html @@ -80,8 +80,8 @@ -
    -
    • -
+
+ +
diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html index 9898a36ec..c3fadbec0 100644 --- a/modules/member/tpl/insert_member.html +++ b/modules/member/tpl/insert_member.html @@ -71,10 +71,8 @@ - +
{zdate($member_info->birthday,"Y-m-d")}
+ {$lang->cmd_open_calendar}

{$lang->about_birthday}

@@ -113,10 +111,8 @@ {$lang->limit_date} - +
{zdate($member_info->limit_date,"Y-m-d")}
+ {$lang->cmd_open_calendar}

{$lang->about_limit_date}

@@ -208,16 +204,16 @@
- +
- +
@@ -231,13 +227,11 @@ - +
{zdate($val->value,"Y-m-d")}
+ {$lang->cmd_open_calendar} -

{htmlspecialchars($val->description)}

+

{htmlspecialchars($val->description)}

@@ -245,14 +239,12 @@ - +
diff --git a/modules/member/tpl/join_form_list.html b/modules/member/tpl/join_form_list.html index ea6324b80..fea32c14d 100644 --- a/modules/member/tpl/join_form_list.html +++ b/modules/member/tpl/join_form_list.html @@ -35,14 +35,14 @@ {$lang->cmd_move_up} {$lang->cmd_move_down} - {$lang->cmd_modify} - {$lang->cmd_delete} + {$lang->cmd_modify} + {$lang->cmd_delete} - +
+ {$lang->cmd_make} +
diff --git a/modules/member/tpl/member_config.html b/modules/member/tpl/member_config.html index 91909abbf..4b2bf561f 100644 --- a/modules/member/tpl/member_config.html +++ b/modules/member/tpl/member_config.html @@ -77,11 +77,11 @@ - +
diff --git a/modules/member/tpl/member_info.html b/modules/member/tpl/member_info.html index c48f817a8..fefa3e810 100644 --- a/modules/member/tpl/member_info.html +++ b/modules/member/tpl/member_info.html @@ -26,10 +26,8 @@ {$lang->image_name} - + image_name + {$lang->cmd_delete}   @@ -41,10 +39,8 @@ -
    -
    • -
    • -
+ + @@ -52,10 +48,8 @@ {$lang->image_mark} - + image_mark + {$lang->cmd_delete}   @@ -67,10 +61,8 @@ -
    -
    • -
    • -
+ + @@ -152,14 +144,14 @@ - +
diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html index 1bd72d993..a9fbcdd73 100644 --- a/modules/member/tpl/member_list.html +++ b/modules/member/tpl/member_list.html @@ -27,16 +27,16 @@ {$val->denied} {zdate($val->regdate,"Y-m-d")} {zdate($val->last_login,"Y-m-d H:i:s")} - {$lang->cmd_delete} + {$lang->cmd_delete} - +
+ {$lang->cmd_make} +
@@ -72,19 +72,14 @@ - -
    -
  • - -
    • -
    • -
    • -
  • {$lang->cmd_cancel}
    • -
+ + + + {$lang->cmd_cancel} diff --git a/modules/menu/tpl/index.html b/modules/menu/tpl/index.html index c9f3fa907..26ecd5cf3 100644 --- a/modules/menu/tpl/index.html +++ b/modules/menu/tpl/index.html @@ -37,9 +37,9 @@ - +
+ {$lang->cmd_make} +
diff --git a/modules/menu/tpl/js/menu_admin.js b/modules/menu/tpl/js/menu_admin.js index 8bb862361..10368d3f3 100644 --- a/modules/menu/tpl/js/menu_admin.js +++ b/modules/menu/tpl/js/menu_admin.js @@ -86,6 +86,8 @@ function completeGetMenuItemTplInfo(ret_obj, response_tags) { if(xGetElementById('cBody') && xHeight('cBody')< y+xHeight(obj)+50) { xHeight('cBody', y + xHeight(obj) + 50); } + + if(typeof('fixAdminLayoutFooter')=="function") fixAdminLayoutFooter(); } /* 메뉴 아이템 입력후 */ @@ -106,6 +108,8 @@ function completeInsertMenuItem(ret_obj) { var params = {node_srl:menu_item_srl, parent_srl:parent_srl} doGetMenuItemInfo('menu', params) } + + if(typeof('fixAdminLayoutFooter')=="function") fixAdminLayoutFooter(); } diff --git a/modules/menu/tpl/menu_insert.html b/modules/menu/tpl/menu_insert.html index 39d01feec..732332902 100644 --- a/modules/menu/tpl/menu_insert.html +++ b/modules/menu/tpl/menu_insert.html @@ -19,8 +19,8 @@ -
    -
    • -
+
+ +
diff --git a/modules/menu/tpl/menu_item_info.html b/modules/menu/tpl/menu_item_info.html index d60042a9e..3a77214f5 100644 --- a/modules/menu/tpl/menu_item_info.html +++ b/modules/menu/tpl/menu_item_info.html @@ -20,10 +20,8 @@ {$lang->menu_url} -
    -
    • -
    • -
+ + {$lang->cmd_search_mid}

{$lang->about_menu_url}

@@ -69,16 +67,16 @@ - + {$lang->cmd_close} +
- +
diff --git a/modules/menu/tpl/menu_management.html b/modules/menu/tpl/menu_management.html index 69b703ed5..de0945e4b 100644 --- a/modules/menu/tpl/menu_management.html +++ b/modules/menu/tpl/menu_management.html @@ -12,18 +12,20 @@ - +
@@ -69,15 +71,15 @@ - +
+ {$lang->cmd_insert} +
- +
+ {$lang->cmd_open_all} + {$lang->cmd_close_all} + {$lang->cmd_remake_cache} +
diff --git a/modules/menu/tpl/mid_list.html b/modules/menu/tpl/mid_list.html index f40a8157e..15fd07dc1 100644 --- a/modules/menu/tpl/mid_list.html +++ b/modules/menu/tpl/mid_list.html @@ -4,36 +4,30 @@
+
+ + +
{$lang->title} - +
+ +
+
+ + {$lang->cmd_cancel} +
@@ -58,10 +52,12 @@
- - - - - -
- - - - -
+ 		{$lang->mid} {$lang->title}
+ +
diff --git a/modules/message/tpl/config.html b/modules/message/tpl/config.html index 429c78f59..3249c03dc 100644 --- a/modules/message/tpl/config.html +++ b/modules/message/tpl/config.html @@ -18,7 +18,7 @@ -
    -
    • -
+
+ +
diff --git a/modules/module/tpl/category_list.html b/modules/module/tpl/category_list.html index 9db8c80a7..2b47e0f0b 100644 --- a/modules/module/tpl/category_list.html +++ b/modules/module/tpl/category_list.html @@ -28,8 +28,8 @@ {$val->title} {zdate($val->regdate,"Y-m-d H:i:s")} - {$lang->cmd_modify} - {$lang->cmd_delete} + {$lang->cmd_modify} + {$lang->cmd_delete} @@ -52,8 +52,8 @@ -
- +
+
diff --git a/modules/module/tpl/category_update_form.html b/modules/module/tpl/category_update_form.html index 11924a370..6f10aeac9 100644 --- a/modules/module/tpl/category_update_form.html +++ b/modules/module/tpl/category_update_form.html @@ -19,8 +19,8 @@ -
- +
+
diff --git a/modules/module/tpl/module_info.html b/modules/module/tpl/module_info.html index b58f37ef5..0d065b9f9 100644 --- a/modules/module/tpl/module_info.html +++ b/modules/module/tpl/module_info.html @@ -31,6 +31,6 @@
-
- {$lang->cmd_close} + diff --git a/modules/module/tpl/module_list.html b/modules/module/tpl/module_list.html index 542e7208d..c91677329 100644 --- a/modules/module/tpl/module_list.html +++ b/modules/module/tpl/module_list.html @@ -37,17 +37,17 @@ {$val->created_table_count}/{$val->table_count} {$val->path} - {$lang->cmd_view} - + {$lang->cmd_view} + {$lang->cmd_update} {$lang->cmd_install} - + - {$lang->cmd_add_shortcut} + {$lang->cmd_add_shortcut}   diff --git a/modules/page/tpl/content.html b/modules/page/tpl/content.html index 6f70989aa..337c9c85a 100644 --- a/modules/page/tpl/content.html +++ b/modules/page/tpl/content.html @@ -1,10 +1,7 @@ {$page_content} - -
- +
+ {$lang->cmd_page_modify}
diff --git a/modules/page/tpl/css/page.css b/modules/page/tpl/css/page.css index 0d72d3ecb..e69de29bb 100644 --- a/modules/page/tpl/css/page.css +++ b/modules/page/tpl/css/page.css @@ -1,10 +0,0 @@ -#pageManage { clear:both; } -#pageManage .buttonWrite ul { text-align:center; display:block;} -#pageManage .buttonWrite li { margin-top:.5em; float:left; margin-right:.3em;} - -#pageManage .buttonTypeA { display:block; cursor:pointer; background:url(../images/buttonTypeACenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; white-space:nowrap;border:0px;} -#pageManage .buttonTypeA:hover { text-decoration:none;} -#pageManage .buttonTypeA img { vertical-align:middle;} -#pageManage .buttonTypeA .leftCap { width:2px; height:24px; background:url(../images/buttonTypeALeft.gif) no-repeat; margin:0 .3em 0 0; left:-1px;} -#pageManage .buttonTypeA .rightCap { width:2px; height:24px; background:url(../images/buttonTypeARight.gif) no-repeat; margin:0 -1px 0 .4em;} -#pageManage .buttonTypeA .icon { margin:0 .2em;} diff --git a/modules/page/tpl/header.html b/modules/page/tpl/header.html index da333872b..e90559e6f 100644 --- a/modules/page/tpl/header.html +++ b/modules/page/tpl/header.html @@ -1,4 +1,3 @@ -

{$lang->page} {$lang->cmd_management}

diff --git a/modules/page/tpl/index.html b/modules/page/tpl/index.html index 61cb4e276..36abf46ac 100644 --- a/modules/page/tpl/index.html +++ b/modules/page/tpl/index.html @@ -25,7 +25,7 @@ - + {$lang->mid} @@ -61,9 +61,9 @@ - +
+ {$lang->cmd_make} +
diff --git a/modules/page/tpl/page_delete.html b/modules/page/tpl/page_delete.html index 9765f8389..a5ee98f7b 100644 --- a/modules/page/tpl/page_delete.html +++ b/modules/page/tpl/page_delete.html @@ -21,10 +21,10 @@ - +
+ {$lang->cmd_back} + +
diff --git a/modules/page/tpl/page_info.html b/modules/page/tpl/page_info.html index 21f5681f2..55305d936 100644 --- a/modules/page/tpl/page_info.html +++ b/modules/page/tpl/page_info.html @@ -35,9 +35,9 @@ - +
diff --git a/modules/page/tpl/page_insert.html b/modules/page/tpl/page_insert.html index bb658d01c..b80a793eb 100644 --- a/modules/page/tpl/page_insert.html +++ b/modules/page/tpl/page_insert.html @@ -64,20 +64,17 @@ {$lang->widget} - - - {$editor} - -
- +
{$editor} + +
+
diff --git a/modules/poll/tpl/config.html b/modules/poll/tpl/config.html index 9b5cee55e..c9dea0067 100644 --- a/modules/poll/tpl/config.html +++ b/modules/poll/tpl/config.html @@ -30,8 +30,8 @@ -
    -
    • -
+
+ +
diff --git a/modules/poll/tpl/poll_list.html b/modules/poll/tpl/poll_list.html index aec5d7227..94ddf1e95 100644 --- a/modules/poll/tpl/poll_list.html +++ b/modules/poll/tpl/poll_list.html @@ -12,6 +12,13 @@ + + + + + + + @@ -31,19 +38,19 @@ - +
{$lang->no}{$val->checkcount} {$val->poll_count} {zdate($val->regdate,"Y-m-d H:i")}{$lang->cmd_view}{$lang->cmd_view}
- -
    -
    • -
- + +
+ +
+
{$lang->first_page} @@ -57,25 +64,19 @@ {$lang->last_page}
-
- -
    -
  • - -
    • -
    • -
    • -
  • {$lang->cmd_cancel}
    • -
+ + + + {$lang->cmd_cancel}
diff --git a/modules/spamfilter/tpl/denied_ip_list.html b/modules/spamfilter/tpl/denied_ip_list.html index d99dfbf47..27cb7da42 100644 --- a/modules/spamfilter/tpl/denied_ip_list.html +++ b/modules/spamfilter/tpl/denied_ip_list.html @@ -29,7 +29,7 @@ {count($ip_list)-$no} {$val->ipaddress} {zdate($val->regdate,"Y-m-d")} - {$lang->cmd_delete} + {$lang->cmd_delete} @@ -49,7 +49,7 @@ -
- +
+
diff --git a/modules/spamfilter/tpl/denied_word_list.html b/modules/spamfilter/tpl/denied_word_list.html index 03e2b6461..a7993c72b 100644 --- a/modules/spamfilter/tpl/denied_word_list.html +++ b/modules/spamfilter/tpl/denied_word_list.html @@ -29,7 +29,7 @@ {count($word_list)-$no} {$val->word} {zdate($val->regdate,"Y-m-d")} - {$lang->cmd_delete} + {$lang->cmd_delete} @@ -49,7 +49,7 @@ -
- +
+
diff --git a/modules/spamfilter/tpl/index.html b/modules/spamfilter/tpl/index.html index e7a021fc9..9a76bf256 100644 --- a/modules/spamfilter/tpl/index.html +++ b/modules/spamfilter/tpl/index.html @@ -29,8 +29,8 @@ -
    -
    • -
+
+ +
diff --git a/modules/trackback/tpl/trackback_list.html b/modules/trackback/tpl/trackback_list.html index 93ec3762e..781cc24b5 100644 --- a/modules/trackback/tpl/trackback_list.html +++ b/modules/trackback/tpl/trackback_list.html @@ -30,11 +30,11 @@ {$no} {$module_list[$val->module_srl]->browser_title} - {htmlspecialchars($val->blog_name)} + {htmlspecialchars($val->blog_name)} {htmlspecialchars($val->title)} {zdate($val->regdate,"Y-m-d")} {$val->ipaddress} - {$lang->cmd_move} + {$lang->cmd_move} @@ -46,13 +46,14 @@ - -
    -
    • -
- + +
+ +
+ +
{$lang->first_page} @@ -72,18 +73,14 @@
-
    -
  • - -
    • -
    • -
    • -
  • {$lang->cmd_cancel}
    • -
+ + + + {$lang->cmd_cancel}
diff --git a/modules/ttimporter/tpl/index.html b/modules/ttimporter/tpl/index.html index 69457ffd3..bd8b1cc96 100644 --- a/modules/ttimporter/tpl/index.html +++ b/modules/ttimporter/tpl/index.html @@ -32,15 +32,15 @@ -
    -
    • -
+
+ +
diff --git a/modules/widget/tpl/downloaded_widget_list.html b/modules/widget/tpl/downloaded_widget_list.html index 032c20672..523108a11 100644 --- a/modules/widget/tpl/downloaded_widget_list.html +++ b/modules/widget/tpl/downloaded_widget_list.html @@ -23,10 +23,10 @@ ({$val->widget}) {$val->version} - {$val->author->name} + {$val->author->name} {$val->author->date} {$val->path} - {$lang->cmd_generate_code} + {$lang->cmd_generate_code} diff --git a/modules/widget/tpl/widget_detail_info.html b/modules/widget/tpl/widget_detail_info.html index 7e405c39c..28bcef2a6 100644 --- a/modules/widget/tpl/widget_detail_info.html +++ b/modules/widget/tpl/widget_detail_info.html @@ -1,4 +1,5 @@ +

{$lang->widget_maker}

@@ -31,6 +32,6 @@
-
- {$lang->cmd_close} + diff --git a/modules/widget/tpl/widget_generate_code.html b/modules/widget/tpl/widget_generate_code.html index e73709d0d..10dc19ef3 100644 --- a/modules/widget/tpl/widget_generate_code.html +++ b/modules/widget/tpl/widget_generate_code.html @@ -1,6 +1,7 @@ +
@@ -82,11 +83,9 @@
-
- + diff --git a/modules/widget/tpl/widget_generate_code_in_page.html b/modules/widget/tpl/widget_generate_code_in_page.html index 4cc8c8c76..e64cbe85c 100644 --- a/modules/widget/tpl/widget_generate_code_in_page.html +++ b/modules/widget/tpl/widget_generate_code_in_page.html @@ -1,6 +1,7 @@ +
@@ -114,13 +115,10 @@
-
- + -