From 941ee42a0b89274db0b3ca364ee72659a54df2a2 Mon Sep 17 00:00:00 2001 From: zero Date: Wed, 20 Feb 2008 12:16:17 +0000 Subject: [PATCH 001/140] =?UTF-8?q?asf=ED=8C=8C=EC=9D=BC=EC=9D=84=20?= =?UTF-8?q?=EB=A9=80=ED=8B=B0=EB=AF=B8=EB=94=94=EC=96=B4=EC=84=B1=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EB=A1=9C=20=ED=99=95=EC=9E=A5=EC=9E=90=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D?= 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@3740 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/file/file.controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php index 516b0fc0c..c463ff677 100644 --- a/modules/file/file.controller.php +++ b/modules/file/file.controller.php @@ -337,7 +337,7 @@ } // 이미지인지 기타 파일인지 체크하여 upload path 지정 - if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp3|asaf|wav|asx|midi)$/i", $file_info['name'])) { + if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp3|asaf|wav|asx|midi|asf)$/i", $file_info['name'])) { $path = sprintf("./files/attach/images/%s/%s/", $module_srl,$upload_target_srl); $filename = $path.$file_info['name']; $direct_download = 'Y'; @@ -472,7 +472,7 @@ $old_file = $file_info->uploaded_filename; // 이미지인지 기타 파일인지 체크하여 이동할 위치 정함 - if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp3|asaf|wav|asx|midi)$/i", $file_info->source_filename)) { + if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp3|asaf|wav|asx|midi|asf)$/i", $file_info->source_filename)) { $path = sprintf("./files/attach/images/%s/%s/", $target_module_srl,$target_srl); $new_file = $path.$file_info->source_filename; } else { From 937770d5594012aa55a84e64a637d8a9d2405111 Mon Sep 17 00:00:00 2001 From: zero Date: Wed, 20 Feb 2008 14:03:42 +0000 Subject: [PATCH 002/140] =?UTF-8?q?optimizer=EC=97=90=EC=84=9C=20url?= =?UTF-8?q?=EC=9D=98=20=EA=B2=BD=EB=A1=9C=EA=B0=80=20=EC=A0=88=EB=8C=80?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C(/=EB=A1=9C=20=EC=8B=9C=EC=9E=91)=ED=95=A0?= =?UTF-8?q?=EB=95=8C=EC=97=90=20=EA=B2=BD=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=ED=95=98=EC=A7=80=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= 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@3741 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/optimizer/Optimizer.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/optimizer/Optimizer.class.php b/classes/optimizer/Optimizer.class.php index 494919487..a856c841f 100644 --- a/classes/optimizer/Optimizer.class.php +++ b/classes/optimizer/Optimizer.class.php @@ -191,7 +191,7 @@ if(!$cached) { function _replaceCssPath($matches) { $path = str_replace(array('"',"'"),'',$matches[1]); - if(preg_match('/^http/i', $path) || preg_match('/\.htc$/i',$path) ) return $matches[0]; + if(preg_match('/^http|^\//i', $path) || preg_match('/\.htc$/i',$path) ) return $matches[0]; return 'url("../../../../'.$this->tmp_css_path.$path.'")'; } From 7fecc052fe3f8441e6c2215b18416623aebdb44c Mon Sep 17 00:00:00 2001 From: supershop Date: Wed, 20 Feb 2008 15:20:25 +0000 Subject: [PATCH 003/140] =?UTF-8?q?=EC=98=81=EC=96=B4=20-=20=EA=B8=B0?= =?UTF-8?q?=EC=A1=B4=20=EB=B2=88=EC=97=AD=EB=AC=B8=20=EC=88=98=EC=A0=95?= 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@3744 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/lang/en.lang.php | 61 +++++++++++++++++---------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/modules/member/lang/en.lang.php b/modules/member/lang/en.lang.php index 7c5287174..d446cb7c8 100644 --- a/modules/member/lang/en.lang.php +++ b/modules/member/lang/en.lang.php @@ -13,15 +13,15 @@ $lang->admin_group = "Managing Group"; $lang->keep_signed = 'Keep me signed in'; $lang->remember_user_id = 'Save ID'; - $lang->already_logged = "You're already logged on"; - $lang->denied_user_id = 'Entered ID is prohibited.'; - $lang->null_user_id = 'Please input user ID'; + $lang->already_logged = "You are already logged on"; + $lang->denied_user_id = 'You have entered a prohibited ID.'; + $lang->null_user_id = 'Please input ID'; $lang->null_password = 'Please input password'; - $lang->invalid_authorization = 'It is not certificated'; + $lang->invalid_authorization = 'The account is not certificated.'; $lang->invalid_user_id= "You have entered an invalid ID"; $lang->invalid_password = 'You have entered an invalid password'; $lang->allow_mailing = 'Join Mailing'; - $lang->allow_message = 'Allow Message Reception'; + $lang->allow_message = 'Receive Messages'; $lang->allow_message_type = array( 'Y' => 'Receive All', 'N' => 'Reject All', @@ -42,12 +42,13 @@ $lang->image_mark = 'Image Mark'; $lang->image_mark_max_width = 'Max Width'; $lang->image_mark_max_height = 'Max Height'; + $lang->signature_max_height = 'Max Signature Height'; $lang->enable_openid = 'Enable OpenID'; $lang->enable_join = 'Allow Member Join'; $lang->limit_day = 'Temporary Limit Date'; $lang->limit_date = 'Limit Date'; - $lang->after_login_url = 'URL after login'; - $lang->after_logout_url = 'URL after logout'; + $lang->after_login_url = 'URL after Login'; + $lang->after_logout_url = 'URL after Logout'; $lang->redirect_url = 'URL after Join'; $lang->agreement = 'Member Join Agreement'; $lang->accept_agreement = 'Agree'; @@ -62,8 +63,8 @@ $lang->webmaster_name = "Webmaster's Name"; $lang->webmaster_email = "Webmaster's Email"; - $lang->about_keep_signed = 'Your login session will not be expired even browser is closed.\n\nYou would not have to login manually from next time.\n\nIt is strongly recommended not to use auto-login in PC room, school, or other commons areas where your private information could be stolen.'; - $lang->about_webmaster_name = "Please input webmaster's name which will be used for authentication mails or other site administration. (default : webmaster)"; + $lang->about_keep_signed = 'Your login session will not be expired even browser is closed.\n\nYou would not have to login manually from next time.\n\nIt is strongly recommended not to use this function in PC room, school, or other commons areas where your private information could be stolen.'; + $lang->about_webmaster_name = "Please input webmaster's name which will be used for certification mails or other site administration. (default : webmaster)"; $lang->about_webmaster_email = "Please input webmaster's email address."; $lang->search_target_list = array( @@ -88,45 +89,45 @@ $lang->cmd_logout = 'Logout'; $lang->cmd_signup = 'Join'; $lang->cmd_modify_member_info = 'Modify Member Info'; - $lang->cmd_modify_member_password = 'Change Password'; + $lang->cmd_modify_member_password = 'Modify Password'; $lang->cmd_view_member_info = 'Member Info'; $lang->cmd_leave = 'Leave'; $lang->cmd_find_member_account = 'Find Account Info'; $lang->cmd_member_list = 'Member List'; $lang->cmd_module_config = 'Default Setting'; - $lang->cmd_member_group = 'Manage Group'; + $lang->cmd_member_group = 'Manage Groups'; $lang->cmd_send_mail = 'Send Mail'; - $lang->cmd_manage_id = 'Manage Prohibited ID'; + $lang->cmd_manage_id = 'Manage Prohibited IDs'; $lang->cmd_manage_form = 'Manage Join Form'; - $lang->cmd_view_own_document = 'View Written Articles'; + $lang->cmd_view_own_document = 'Written Articles'; $lang->cmd_view_scrapped_document = 'Scraps'; - $lang->cmd_view_saved_document = 'View Saved Articles'; + $lang->cmd_view_saved_document = 'Saved Articles'; $lang->cmd_send_email = 'Send Mail'; $lang->cmd_send_message = 'Send Message'; $lang->cmd_reply_message = 'Reply Message'; $lang->cmd_view_friend = 'Friends'; - $lang->cmd_add_friend = 'Register as Friend'; + $lang->cmd_add_friend = 'Add to Friends'; $lang->cmd_view_message_box = 'Message Box'; $lang->cmd_store = "Save"; $lang->cmd_add_friend_group = 'Add Friend Group'; - $lang->cmd_rename_friend_group = 'Change Name of Friend Group'; + $lang->cmd_rename_friend_group = 'Modify Friend Group Name'; - $lang->msg_email_not_exists = "Email address doesn't exists"; + $lang->msg_email_not_exists = "You have entered an invalid email address"; $lang->msg_alreay_scrapped = 'This article is already scrapped'; $lang->msg_cart_is_null = 'Please select the target'; - $lang->msg_checked_file_is_deleted = '%d attached files are deleted'; + $lang->msg_checked_file_is_deleted = '%d attached file(s) is(are) deleted'; $lang->msg_find_account_title = 'Account Info'; $lang->msg_find_account_info = 'This is requested account info.'; - $lang->msg_find_account_comment = 'The password will be modified to above one when you click below link.
Please modify the password after login.'; - $lang->msg_auth_mail_sended = 'The authentication mail has been sent to %s. Please check your mail.'; - $lang->msg_invalid_auth_key = 'This is an invalid request of authentication.
Please retry finding account info or contact to administrator.'; - $lang->msg_success_authed = 'Your account has been successfully authenticated and logged on. Please modify the password to your own one with the password in the mail.'; + $lang->msg_find_account_comment = 'The password will be modified as above one as you click below link.
Please modify the password after login.'; + $lang->msg_auth_mail_sended = 'The certification mail has been sent to %s. Please check your mail.'; + $lang->msg_invalid_auth_key = 'This is an invalid request of certification.
Please retry finding account info or contact to administrator.'; + $lang->msg_success_authed = 'Your account has been successfully certificated and logged on. Please modify the password to your own one with the password in the mail.'; - $lang->msg_no_message = 'There are no messages'; + $lang->msg_no_message = 'There is no message'; $lang->message_received = 'You have a new message'; $lang->msg_new_member = 'Add Member'; @@ -134,7 +135,7 @@ $lang->msg_leave_member = 'Leave'; $lang->msg_group_is_null = 'There is no registered group'; $lang->msg_not_delete_default = 'Default items cannot be deleted'; - $lang->msg_not_exists_member = "This member doesn't exist"; + $lang->msg_not_exists_member = "Invalid member"; $lang->msg_cannot_delete_admin = 'Admin ID cannot be deleted. Please remove the ID from administration and try again.'; $lang->msg_exists_user_id = 'This ID already exists. Please try with another one.'; $lang->msg_exists_email_address = 'This email address already exists. Please try with another one.'; @@ -142,11 +143,11 @@ $lang->msg_signup_disabled = 'You are not able to sign up'; $lang->msg_already_logged = 'You have already signed up'; $lang->msg_not_logged = 'Please login first'; - $lang->msg_title_is_null = 'Please input title of message'; - $lang->msg_content_is_null = 'Please input content'; + $lang->msg_title_is_null = 'Please input the title of message'; + $lang->msg_content_is_null = 'Please input the content'; $lang->msg_allow_message_to_friend = "Failed to send because receiver only allows friends' messages"; $lang->msg_disallow_message = 'Failed to send because receiver rejects message reception'; - $lang->msg_insert_group_name = 'Please input name of group'; + $lang->msg_insert_group_name = 'Please input the name of group'; $lang->msg_check_group = 'Please select the group'; $lang->msg_not_uploaded_profile_image = 'Profile image could not be registered'; @@ -155,8 +156,8 @@ $lang->msg_accept_agreement = 'You have to agree to the agreement'; - $lang->msg_user_denied = 'Entered ID is prohibited'; - $lang->msg_user_limited = 'Entered ID can be used after %s'; + $lang->msg_user_denied = 'You have entered a prohibited ID'; + $lang->msg_user_limited = 'You have entered an ID that can be used after %s'; $lang->about_user_id = 'User ID should be 3~20 letters long and consist of alphabet+number with alphabet as first letter.'; $lang->about_password = 'Password should be 6~20 letters long'; @@ -193,7 +194,7 @@ $lang->about_image_name = "Allow users to use image name instead of text name"; $lang->about_image_mark = "Allow users to use mark in front of their names"; $lang->about_profile_image = 'Allow users to use profile images'; - $lang->about_accept_agreement = "I have read the agreement all and agree"; + $lang->about_accept_agreement = "I have read the agreement and agree"; $lang->about_member_default = 'It will be set as default group on sign up'; From ead1ffd65e4b030a578a51210833744c33672f51 Mon Sep 17 00:00:00 2001 From: sspa3141 Date: Thu, 21 Feb 2008 08:59:53 +0000 Subject: [PATCH 004/140] =?UTF-8?q?=EC=97=90=EC=8A=A4=ED=8C=8C=EB=83=90?= =?UTF-8?q?=EC=96=B4,=20=EB=9F=AC=EC=8B=9C=EC=95=84=EC=96=B4=20=EB=B2=88?= =?UTF-8?q?=EC=97=AD(=EB=B6=80=EB=B6=84)?= 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@3745 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/skins/xe_board/skin.xml | 34 +++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/modules/board/skins/xe_board/skin.xml b/modules/board/skins/xe_board/skin.xml index 0f15c7fbe..a5058fead 100644 --- a/modules/board/skins/xe_board/skin.xml +++ b/modules/board/skins/xe_board/skin.xml @@ -4,11 +4,13 @@ ゼロボードXE掲示板のデフォルトスキン Zeroboard XE版面默认皮肤 ZeroboardXE Basic Board Skin + ZeroboardXE Basic Board Skin zero zero Zero zero + zero 제로보드XE 게시판의 기본 스킨입니다. 디자인 : 서기정 (http://blog.naver.com/addcozy) @@ -28,6 +30,11 @@ This is the basic board skin of Zeroboard XE. Design : Ki-Jeong Seo (http://blog.naver.com/addcozy) HTML/CSS : Chan-Myung Jeong (http://naradesign.net) + + + This is the basic board skin of Zeroboard XE. + Design : Ki-Jeong Seo (http://blog.naver.com/addcozy) + HTML/CSS : Chan-Myung Jeong (http://naradesign.net) @@ -36,30 +43,35 @@ 白（デフォルト） 白色（基本） White (default) + White (default) 청록색 青緑 青绿色 Cyan + Cyan 초록색 緑 绿色 Green + Green 빨간색 赤 红色 Red + Red 보라색 紫 紫色 Purple + Purple @@ -68,6 +80,7 @@ デフォルトスタイル 默认样式 Default Form + Default Form 목록형, 웹진형, 갤러리형, 포럼형의 기본 스타일을 지정할 수 있습니다. 포럼형 스타일은 정렬대상을 updated로 하셔야 합니다. @@ -83,6 +96,10 @@ You may select default styles such as list style, webzine style, gallery stylz or forum style. Align Target for forum style is required to be selected as 'updated'. + + + You may select default styles such as list style, webzine style, gallery stylz or forum style. + Align Target for forum style is required to be selected as 'updated'. list webzine @@ -95,10 +112,12 @@ ソート対象 排序对象 Align Target + Align Target 등록된 순서 또는 변경된 순서로 정렬을 할 수 있습니다. 登録順、変更順にソートできます。 可对主题按发表顺或最后更新顺进行排序。 It can align articles as registered order or modified order. + It can align articles as registered order or modified order. list_order update_order @@ -141,10 +160,12 @@ 掲示板タイトル 版面标题 Title of Board + Title of Board 게시판의 제목을 적어주세요. 掲示板タイトルを入力してください。 请输入版面标题(留空为不显示)。 Plase input the title of board. + Plase input the title of board. 게시판 부제목 @@ -155,32 +176,38 @@ 掲示板タイトルの横に表示されるサブタイトルを入力してください。 请输入版面副标题(留空为不显示)。 Please input the subtitle of board which will be displayed beside of board title. + Please input the subtitle of board which will be displayed beside of board title. 게시판 상세 설명 掲示板の詳細 版面详细说明 Description of Board + Description of Board 게시판 제목 아래 표시될 설명을 입력하실 수 있습니다. 掲示板タイトルの下に表示される説明文を入力してください。 请输入版面说明(留空为不显示)。 You may input description which will be displayed under the board title. + You may input description which will be displayed under the board title. 제목 글자수 タイトルの文字数 标题字数 Length of Subject + Length of Subject 제목 글자수를 지정할 수 있습니다. (0또는 비워주시면 자르지 않습니다) タイトルの文字数が指定できます（「0」または空欄の場合は、文字数を制限しません）。 可以指定标题字数(0或留空为不限)。 You may set length of title. (0 or blank value will not restrict the length) + You may set length of title. (0 or blank value will not restrict the length) 번호 표시 番号表示 显示编号 Dispay Number + Dispay Number Y N @@ -190,6 +217,7 @@ 投稿者表示 显示昵称 Display Author + Display Author Y N @@ -199,6 +227,7 @@ 作成日表示 显示发表日期 Display Registered Date + Display Registered Date Y N @@ -208,6 +237,7 @@ 照合数表示 显示查看 Display Hit + Display Hit Y N @@ -217,6 +247,7 @@ 推薦数表示 显示推荐 Display Votes + Display Votes Y N @@ -226,6 +257,7 @@ 最近の変更時間表示 显示最后更新时间 Display Latest Update + Display Latest Update N Y @@ -235,10 +267,12 @@ Newの表示時間 (Hours) new图标显示时间(hours) Duration of indication for new item + Duration of indication for new item 새로 등록된 게시물의 new 표시시간을 정할 수 있습니다. 新しく登録された書き込みに対して「New」の表示時間を設定します。 可以设置最新更新主题的new图标显示时间。 You may set the duration of indication for fresh item. + You may set the duration of indication for fresh item. 24 From 07c996df1f7943c6fab199e1e3a2adc5dfaf4c05 Mon Sep 17 00:00:00 2001 From: sspa3141 Date: Thu, 21 Feb 2008 09:18:48 +0000 Subject: [PATCH 005/140] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3746 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/components/cc_license/info.xml | 15 +++++++++++++++ .../editor/components/code_highlighter/info.xml | 3 +++ .../editor/components/colorpicker_text/info.xml | 3 +++ modules/editor/components/emoticon/info.xml | 3 +++ modules/editor/components/image_gallery/info.xml | 3 +++ modules/editor/components/image_link/info.xml | 3 +++ .../editor/components/multimedia_link/info.xml | 3 +++ modules/editor/components/naver_map/info.xml | 5 +++++ modules/editor/components/poll_maker/info.xml | 3 +++ modules/editor/components/quotation/info.xml | 5 ++++- modules/editor/components/table_maker/info.xml | 3 +++ modules/editor/components/url_link/info.xml | 3 +++ 12 files changed, 51 insertions(+), 1 deletion(-) diff --git a/modules/editor/components/cc_license/info.xml b/modules/editor/components/cc_license/info.xml index b065175d9..c8de1201e 100755 --- a/modules/editor/components/cc_license/info.xml +++ b/modules/editor/components/cc_license/info.xml @@ -1,8 +1,23 @@ Creative Commons Licenses + Licencias Creative Commons + Creative Commons Licenses + Creative Commons Licenses + Creative Commons Licenses + Creative Commons Licenses zero + zero + zero + zero + zero + zero CCL 라이센스를 출력합니다. + CCL licencia de producto + CCL 라이센스를 출력합니다. + CCL 라이센스를 출력합니다. + CCL 라이센스를 출력합니다. + Output CCL license diff --git a/modules/editor/components/code_highlighter/info.xml b/modules/editor/components/code_highlighter/info.xml index 34f7cc478..2fcc8a6f4 100755 --- a/modules/editor/components/code_highlighter/info.xml +++ b/modules/editor/components/code_highlighter/info.xml @@ -4,17 +4,20 @@ コードハイライト 代码高亮显示 Code Highlighter + Código para resaltar Подсветка кода BNU BNU BNU BNU + BNU BNU 코드를 보기 좋게 출력합니다. ソースコードを見やすく表示します。 高亮显示所选代码。 It displays code in good shape. + Muestra el código en buena forma. Компонент служащий для подсветки кода \ No newline at end of file diff --git a/modules/editor/components/colorpicker_text/info.xml b/modules/editor/components/colorpicker_text/info.xml index a35314d62..0f8493883 100644 --- a/modules/editor/components/colorpicker_text/info.xml +++ b/modules/editor/components/colorpicker_text/info.xml @@ -4,17 +4,20 @@ 文字色変更 字体颜色 Change the color of text + Cambiar el color de texto Изменение цвета текста 제로 Zero zero zero + zero zero 글자색을 변경합니다. 文字色を変更します。 可修改字体颜色。 It will change the color of text. + Se va a cambiar el color del texto. Позволяет изменение цвета текста. diff --git a/modules/editor/components/emoticon/info.xml b/modules/editor/components/emoticon/info.xml index 3339a1f29..d2fab388e 100644 --- a/modules/editor/components/emoticon/info.xml +++ b/modules/editor/components/emoticon/info.xml @@ -4,12 +4,15 @@ 顔文字（イモティコン） 表情图标 Display Emoticons + Mostrar iconos gestuales Отображение смайлов 제로 Zero zero zero + zero + zero 이모티콘을 에디터에 삽입할 수 있습니다. 顔文字（イモティコン）をエディターに追加することができます。 可以插入表情图标到编辑器。 diff --git a/modules/editor/components/image_gallery/info.xml b/modules/editor/components/image_gallery/info.xml index 13235c7f3..175088971 100644 --- a/modules/editor/components/image_gallery/info.xml +++ b/modules/editor/components/image_gallery/info.xml @@ -4,17 +4,20 @@ デフォルトイメージギャラリー 图片相册 Basic Image Gallery + Galería de imágenes básicos Базовая галлерея изображений 제로 Zero zero zero + zero zero 첨부된 이미지파일을 이용하여 슬라이드/목록형 이미지 갤러리를 만들 수 있습니다. 添付されたイメージファイルを利用して、スライド型・リスト型のイメージギャラリーが作成できます。 利用上传的图片文件实现幻灯片式或目录型相册图片。 It can create image gallery of slide/list style by using attached image file. + It can create image gallery of slide/list style by using attached image file. Это может создать гллерею изображений в стиле слайдов/списка, используя вложенный файл изображения. diff --git a/modules/editor/components/image_link/info.xml b/modules/editor/components/image_link/info.xml index dbc320359..1bf14dcae 100644 --- a/modules/editor/components/image_link/info.xml +++ b/modules/editor/components/image_link/info.xml @@ -4,17 +4,20 @@ イメージ追加 插入图像 Add Images + Añadir imágenes Добавление изображений 제로 Zero zero zero + zero zero 에디터에 이미지를 추가하거나 속성을 변경할 수 있습니다. エディターでイメージの追加、属性の変更ができます。 可以插入图像或编辑其相应属性。 It can add an image to editor or change the attribution of image. + Se puede añadir una imagen a editor o cambiar la atribución de la imagen. Это может добавить изображение в редактор или изменить параметры изображения. diff --git a/modules/editor/components/multimedia_link/info.xml b/modules/editor/components/multimedia_link/info.xml index 858b3633d..c4b11db55 100644 --- a/modules/editor/components/multimedia_link/info.xml +++ b/modules/editor/components/multimedia_link/info.xml @@ -4,17 +4,20 @@ マルチメディア管理 多媒体 Manage Multimedia Data + Administrar datos multimedia Управление мультимедиа данными 제로 Zero zero zero + zero zero 에디터에 wmv,avi,flv등의 멀티미디어 자료를 추가하거나 속성을 수정할 수 있습니다. エディターに拡張子が「wmv,avi,flv」などのマルチメディアコンテンツを追加、または属性の修正ができます。 插入wmv,avi,flv等多媒体文件或修改其相应属性 。 It can add multimedia data like wmv,avi,flv to editor or change the attribution of multimedia data. + Se pueden agregar datos multimedia como wmv, avi, flv al editor o cambiar la atribución de datos multimedia. Это может добавить мультимедиа данные как wmv,avi,flv в редактор или изменить параметры данных мультимедиа. diff --git a/modules/editor/components/naver_map/info.xml b/modules/editor/components/naver_map/info.xml index 37352e517..96776ad46 100644 --- a/modules/editor/components/naver_map/info.xml +++ b/modules/editor/components/naver_map/info.xml @@ -4,17 +4,20 @@ ネイバーマップ NAVER 地图 Naver Map Open Api + Naver mapa abierto api Открытые API карт Naver 제로 Zero zero zero + zero zero 네이버에서 제공하는 네이버 지도 open api를 이용하여 에디터에 원하는 곳의 지도를 추가하거나 수정할 수 있습니다.\n네이버 지도 open api키를 발급 받아서 등록을 해주셔야 정상적인 사용이 가능합니다. ネイバーから提供されるネイバーマップのOpenAPIを利用してエディターに表示したい地図を追加したり、修正したりすることができます。ネイバーマップは、OpenAPIキーを取得して登録すれば使用することができます。 naver提供的naver地图，利用open api在编辑器里添加或修改您所需要的地图。\n为了使用naver地图首先要取得open api key,然后登录此key才可正常使用。 You can add a map to the editor or modify it by using Naver Map open api provided by Naver.\nYou would be able to use it when you register Naver Map api key after you get it from http://www.naver.com. + Puede poner un mapa para el editor o modificarlo utilizando Naver Mapa abierta api proporcionada por Naver. \ NSe se podrá hacer uso del mismo cuando se registra Naver Mapa api clave se obtiene después de http://www.naver.com . Вы можете добавить карту в редактор или изменить ее, используя Naver Map open api, предлагаемые Naver.\nВы сможете использовать это после регистрации ключа Naver Map API, полученного с http://www.naver.com. @@ -23,11 +26,13 @@ ネイバーマップＡＰＩキー naver地图 api key Naver Map api key + Naver Map api key Naver Map API Ключ http://www.naver.com/ 에서 네이버 지도 API key를 발급 받으신 후 입력해주세요. http://www.naver.com/ からネイバーマップのＡＰＩキーを取得してから入力してください。 在http://www.naver.com/ 取得naver地图 API key后输入。 Please get Naver Map API key from http://www.naver.com first and then input the key. + Por favor Naver Mapa clave de la API de http://www.naver.com primero y luego ingrese la clave. Пожалуйста, получите ключ Naver Map API с http://www.naver.com и введите его. diff --git a/modules/editor/components/poll_maker/info.xml b/modules/editor/components/poll_maker/info.xml index 78334aa0c..9103daa93 100644 --- a/modules/editor/components/poll_maker/info.xml +++ b/modules/editor/components/poll_maker/info.xml @@ -4,17 +4,20 @@ アンケート調査 投票调查 Poll Component + Componente Poll Компонент опросов 제로 Zero zero zero + zero zero 글 작성시에 설문조사를 첨부하실 수 있습니다. 설문조사 컴포넌트는 설문조사 모듈의 설정에 영향을 받습니다. 書き込みの時、アンケート機能の追加ができます。アンケートモジュールの影響を受けます。 发表主题时可以附加投票调查。投票调查组件受投票调查模块设置的影响。 You can attach a poll on writing articles. Poll component is affected by setting of poll module. + Puede adjuntar una encuesta sobre la redacción de artículos. Encuesta componente se ve afectada por la configuración de módulo de encuesta. Вы можете присоединить опрос при написании статей. Компонент опросов зависит от настроек модуля отпросов. diff --git a/modules/editor/components/quotation/info.xml b/modules/editor/components/quotation/info.xml index 801835da5..641d55c3f 100644 --- a/modules/editor/components/quotation/info.xml +++ b/modules/editor/components/quotation/info.xml @@ -3,18 +3,21 @@ 인용구 작성 引用文作成 引用 - Quotations + Citas célebres + Quotations Цитаты 제로 Zero zero zero + zero zero 특정 범위를 인용문으로 꾸밀 수 있습니다. 외곽선의 종류나 색상, 굵기를 수정할 수 있으며 열기/닫기 기능을 가진 폴더기능을 만들 수 있습니다. 特定範囲を引用文として表示できます。ボーダーの種類、色、太さを修正することができ、「展開・折りたたみ」の機能も可能です。 可以把要发表的主题特定范围用引用布置。可以修改外围线的种类或粗细，还支持展开/折叠功能。 You can decorate specific range as quotation. The style, color or thickness of outline can be modified and folder system which has open/close function can be made. + Puedes decorar rango específico como cita. El estilo, el color o el grosor de esquema puede ser modificado y carpeta de sistema que tiene abrir / cerrar la función se puede hacer. Вы можете украсить определенную область цитаты. Стиль, цвет или толщина внешней линии может быть изменена, и система папок, которая имеет функцию открыть/закрыть может быть создана. diff --git a/modules/editor/components/table_maker/info.xml b/modules/editor/components/table_maker/info.xml index d371b31af..98725ee7a 100644 --- a/modules/editor/components/table_maker/info.xml +++ b/modules/editor/components/table_maker/info.xml @@ -4,17 +4,20 @@ テーブル作成 表格 Create Table + Crear Tabla Создание таблиц 제로 Zero zero zero + zero zero 에디터에 표(table)을 생성하거나 표(table) 또는 칸(td)의 속성을 변경할 수 있습니다. エディターでテーブル（table）の作成、テーブル（table）またはセル（td）の属性の変更ができます。 插入表格(table)或编辑表格属性。 It can create a table on editor or modify the attribution of table or td. + Se puede crear una tabla en editor o modificar la atribución de la mesa o td. Это может создать таблицу в редакторе или изменить ее параметры или ячейки. diff --git a/modules/editor/components/url_link/info.xml b/modules/editor/components/url_link/info.xml index 3d5ff715f..df681109c 100644 --- a/modules/editor/components/url_link/info.xml +++ b/modules/editor/components/url_link/info.xml @@ -4,17 +4,20 @@ リンク生成 链接 Create Link + Crear Link Создание ссылок 제로 Zero zero zero + zero zero 에디터에 링크를 추가하거나 링크의 속성을 변경할 수 있습니다. エディターでリンクの追加、属性の変更ができます。 插入链接或编辑链接属性。 It can add a link to editor or modify the attribution of link. + Puede añadir un enlace al editor o modificar la atribución de enlace. Это может добавить ссылку в редактор или изменить ее параметры. From c479c8cb2383e8ccee721becc4b150f7a2b3544b Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 22 Feb 2008 12:24:13 +0000 Subject: [PATCH 006/140] =?UTF-8?q?category=5Fsrl=EC=97=90=20=ED=95=B4?= =?UTF-8?q?=EB=8B=B9=ED=95=98=EB=8A=94=20=EC=96=B8=EC=96=B4=EA=B0=92?= =?UTF-8?q?=EC=9D=84=20category=EC=99=80=20=EB=8F=99=EC=9D=BC=ED=95=98?= =?UTF-8?q?=EA=B2=8C=20=EB=A7=A4=EC=B9=AD?= 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@3747 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/lang/en.lang.php | 2 +- common/lang/es.lang.php | 2 +- common/lang/fr.lang.php | 2 +- common/lang/jp.lang.php | 2 +- common/lang/ko.lang.php | 2 +- common/lang/ru.lang.php | 2 +- common/lang/zh-CN.lang.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/lang/en.lang.php b/common/lang/en.lang.php index 6ed8c4261..fc2c31cdb 100644 --- a/common/lang/en.lang.php +++ b/common/lang/en.lang.php @@ -70,7 +70,7 @@ $lang->no = 'No.'; $lang->notice = 'Notice'; $lang->secret = 'Secret'; - $lang->category = 'Category'; + $lang->category = $lang->category_srl = 'Category'; $lang->document_srl = 'Doc. No.'; $lang->user_id = 'User ID'; $lang->author = 'Developer'; diff --git a/common/lang/es.lang.php b/common/lang/es.lang.php index 764a18a13..e966c0909 100644 --- a/common/lang/es.lang.php +++ b/common/lang/es.lang.php @@ -69,7 +69,7 @@ $lang->no = 'Nº'; $lang->notice = 'Aviso'; $lang->secret = 'Secreto'; - $lang->category = 'Categoría'; + $lang->category = $lang->category_srl = 'Categoría'; $lang->document_srl = 'Número del documento'; $lang->user_id = 'Usuario'; $lang->author = 'Autor'; diff --git a/common/lang/fr.lang.php b/common/lang/fr.lang.php index 872498dfe..09e59d10d 100644 --- a/common/lang/fr.lang.php +++ b/common/lang/fr.lang.php @@ -69,7 +69,7 @@ $lang->no = 'numéro'; $lang->notice = 'Notification'; $lang->secret = 'Secret'; - $lang->category = 'Categorie'; + $lang->category = $lang->category_srl = 'Categorie'; $lang->document_srl = 'numéro du Document'; $lang->user_id = 'Pseudo'; $lang->author = 'Auteur'; diff --git a/common/lang/jp.lang.php b/common/lang/jp.lang.php index 443689616..585a49021 100644 --- a/common/lang/jp.lang.php +++ b/common/lang/jp.lang.php @@ -70,7 +70,7 @@ $lang->no = '番号'; $lang->notice = 'お知らせ'; $lang->secret = '非公開'; - $lang->category = 'カテゴリ'; + $lang->category = $lang->category_srl = 'カテゴリ'; $lang->document_srl = '書き込み番号'; $lang->user_id = 'ユーザＩＤ'; $lang->author = '作者'; diff --git a/common/lang/ko.lang.php b/common/lang/ko.lang.php index eae8e8340..94088631c 100644 --- a/common/lang/ko.lang.php +++ b/common/lang/ko.lang.php @@ -70,7 +70,7 @@ $lang->no = '번호'; $lang->notice = '공지'; $lang->secret = '비밀'; - $lang->category = '분류'; + $lang->category = $lang->category_srl = '분류'; $lang->document_srl = '문서번호'; $lang->user_id = '아이디'; $lang->author = '작성자'; diff --git a/common/lang/ru.lang.php b/common/lang/ru.lang.php index cd302a578..35061a733 100644 --- a/common/lang/ru.lang.php +++ b/common/lang/ru.lang.php @@ -70,7 +70,7 @@ $lang->no = 'No.'; $lang->notice = 'Уведомление'; $lang->secret = 'Секрет'; - $lang->category = 'Категория'; + $lang->category = $lang->category_srl = 'Категория'; $lang->document_srl = 'Док. No.'; $lang->user_id = 'Юзер ID'; $lang->author = 'Разработчик'; diff --git a/common/lang/zh-CN.lang.php b/common/lang/zh-CN.lang.php index 054c2aaca..22a950442 100644 --- a/common/lang/zh-CN.lang.php +++ b/common/lang/zh-CN.lang.php @@ -70,7 +70,7 @@ $lang->no = '编号'; $lang->notice = '公告'; $lang->secret = '密帖'; - $lang->category = '分类'; + $lang->category = $lang->category_srl = '分类'; $lang->document_srl = '文章编号'; $lang->user_id = '用户名'; $lang->author = '制作'; From 27d176f9ec767fe78ce57c129ac89b931fb364c6 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 22 Feb 2008 12:26:37 +0000 Subject: [PATCH 007/140] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3748 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/comment/comment.controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php index e9c6bf4ca..523f266bc 100644 --- a/modules/comment/comment.controller.php +++ b/modules/comment/comment.controller.php @@ -14,7 +14,7 @@ } /** - * @breif 댓글의 추천을 처리하는 action (Up) + * @brief 댓글의 추천을 처리하는 action (Up) **/ function procCommentVoteUp() { $comment_srl = Context::get('target_srl'); @@ -25,7 +25,7 @@ } /** - * @breif 댓글의 추천을 처리하는 action (Down) + * @brief 댓글의 추천을 처리하는 action (Down) **/ function procCommentVoteDown() { $comment_srl = Context::get('target_srl'); From 1dbe0daeded9827bbab2b054f428c83ff584ebbc Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 22 Feb 2008 13:21:11 +0000 Subject: [PATCH 008/140] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EC=B2=A8=EB=B6=80?= =?UTF-8?q?=EA=B0=80=20=ED=97=88=EC=9A=A9=EB=90=9C=20=EC=97=90=EB=94=94?= =?UTF-8?q?=ED=84=B0=20=EC=B6=9C=EB=A0=A5=EC=8B=9C=20=EC=9D=B4=EB=AF=B8=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=EB=90=9C=20=EC=B2=A8=EB=B6=80=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=EC=9D=98=20=EC=88=98=EB=A5=BC=20count=ED=95=98?= =?UTF-8?q?=EC=97=AC=20=EC=B2=A8=EB=B6=80=EB=90=9C=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EC=9D=B4=20=EC=97=86=EC=9C=BC=EB=A9=B4=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=EC=9D=84=20=EA=B5=AC=ED=95=B4=EC=98=A4?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=ED=95=98=EC=97=AC=20?= =?UTF-8?q?=EC=93=B8=EB=8D=B0=EC=97=86=EB=8A=94=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=ED=98=B8=EC=B6=9C=20=EB=B0=8F=20=EC=84=9C=EB=B2=84?= =?UTF-8?q?=20=EC=9E=91=EC=97=85/=20=ED=81=B4=EB=9D=BC=EC=9D=B4=EC=96=B8?= =?UTF-8?q?=ED=8A=B8=20=EB=B6=80=ED=95=98=EB=A5=BC=20=EC=97=86=EC=95=B0?= 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@3749 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/editor.model.php | 7 +++++++ modules/editor/skins/default/editor.html | 2 +- modules/editor/skins/msword2007/editor.html | 2 +- modules/editor/skins/xquared/editor.html | 2 +- modules/editor/tpl/js/uploader.js | 14 ++++++++------ 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php index 5b9b4ab7e..997e79364 100644 --- a/modules/editor/editor.model.php +++ b/modules/editor/editor.model.php @@ -98,6 +98,7 @@ if($enable_autosave) { // 자동 저장된 데이터를 추출 $saved_doc = $this->getSavedDoc(); + if($saved_doc->document_srl && !$upload_target_srl) $upload_target_srl = $saved_doc->document_srl; // 자동 저장 데이터를 context setting Context::set('saved_doc', $saved_doc); @@ -116,6 +117,7 @@ /** * 업로드 활성화시 내부적으로 file 모듈의 환경설정을 이용하여 설정 **/ + $files_count = 0; if($allow_fileupload) { $oFileModel = &getModel('file'); @@ -133,7 +135,12 @@ // upload가능하다고 설정 (내부적으로 캐싱하여 처리) $oFileController = &getController('file'); $oFileController->setUploadInfo($editor_sequence, $upload_target_srl); + + // 이미 등록된 파일이 있는지 검사 + if($upload_target_srl) $files_count = $oFileModel->getFilesCount($upload_target_srl); } + Context::set('files_count', (int)$files_count); + Context::set('allow_fileupload', $allow_fileupload); // 에디터 동작을 위한 editor_sequence값 설정 diff --git a/modules/editor/skins/default/editor.html b/modules/editor/skins/default/editor.html index 986112812..92f0ea4ae 100644 --- a/modules/editor/skins/default/editor.html +++ b/modules/editor/skins/default/editor.html @@ -149,7 +149,7 @@ var zbxe_session_name = "{session_name()}"; var uploader_setting = { "allowed_filesize" : "{$file_config->allowed_filesize}", "allowed_filetypes" : "{$file_config->allowed_filetypes}", "allowed_filetypes_description" : "{$file_config->allowed_filetypes}" } - editor_upload_init("{$editor_sequence}"); + editor_upload_init("{$editor_sequence}", '', "{$files_count}"); //]]> diff --git a/modules/editor/skins/msword2007/editor.html b/modules/editor/skins/msword2007/editor.html index ff3cf0c45..d4802a306 100644 --- a/modules/editor/skins/msword2007/editor.html +++ b/modules/editor/skins/msword2007/editor.html @@ -140,7 +140,7 @@ diff --git a/modules/editor/skins/xquared/editor.html b/modules/editor/skins/xquared/editor.html index 04f59715f..e7f3b76bc 100644 --- a/modules/editor/skins/xquared/editor.html +++ b/modules/editor/skins/xquared/editor.html @@ -55,7 +55,7 @@ var zbxe_session_name = "{session_name()}"; var uploader_setting = { "allowed_filesize" : "{$file_config->allowed_filesize}", "allowed_filetypes" : "{$file_config->allowed_filetypes}", "allowed_filetypes_description" : "{$file_config->allowed_filetypes}" } - editor_upload_init("{$editor_sequence}", editorGetForm_xq(document.getElementById("xqEditor_{$editor_sequence}"))); + editor_upload_init("{$editor_sequence}", editorGetForm_xq(document.getElementById("xqEditor_{$editor_sequence}")), "{$files_count}"); //]]> diff --git a/modules/editor/tpl/js/uploader.js b/modules/editor/tpl/js/uploader.js index 1cd7a6b01..f360a943d 100755 --- a/modules/editor/tpl/js/uploader.js +++ b/modules/editor/tpl/js/uploader.js @@ -18,8 +18,8 @@ var uploaded_files = new Array(); * 이 함수는 editor.html 에서 파일 업로드 가능할 경우 호출됨 **/ // window.load 이벤트일 경우 && 문서 번호가 가상의 번호가 아니면 기존에 저장되어 있을지도 모르는 파일 목록을 가져옴 -function editor_upload_init(editor_sequence, el) { - xAddEventListener(window,'load',function() { editor_upload_start(editor_sequence, el);} ); +function editor_upload_init(editor_sequence, el, inserted_files_count) { + xAddEventListener(window,'load',function() { editor_upload_start(editor_sequence, el, inserted_files_count);} ); } function editor_upload_get_target_srl(editor_sequence) { @@ -32,7 +32,10 @@ function editor_upload_get_uploader_name(editor_sequence) { } // 파일 업로드를 위한 기본 준비를 함 -function editor_upload_start(editor_sequence, fo_obj) { +function editor_upload_start(editor_sequence, fo_obj, inserted_files_count) { + if(typeof(inserted_files_count)=='undefined' || !inserted_files_count) inserted_files_count = 0; + else inserted_files_count = parseInt(inserted_files_count, 10); + // 캐시 삭제 try { document.execCommand('BackgroundImageCache',false,true); } catch(e) { } @@ -58,8 +61,7 @@ function editor_upload_start(editor_sequence, fo_obj) { if(!field_obj) return; // 에디터를 감싸는 form을 구해 submit target을 임시 iframe으로 변경 - if(!fo_obj) - fo_obj = editorGetForm(editor_sequence); + if(!fo_obj) fo_obj = editorGetForm(editor_sequence); fo_obj.target = 'tmp_upload_iframe'; // SWF uploader 생성 @@ -101,7 +103,7 @@ function editor_upload_start(editor_sequence, fo_obj) { * upload_target_srl값이 실제 문서 번호일 경우 이미 등록되 있을지도 모르는 첨부파일 목록을 로드 * procDeleteFile에 file_srl을 보내주지 않으면 삭제시도는 없이 목록만 갱신할 수 있음 **/ - editor_display_uploaded_file(editor_sequence); + if(inserted_files_count>0) editor_display_uploaded_file(editor_sequence); } // 파일 업로드 에러 핸들링 From 1afc1d601f3e7bf1f3cd8680a7d57572d0b5ea54 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 22 Feb 2008 14:03:41 +0000 Subject: [PATCH 009/140] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88=EC=9D=98=20=ED=9A=8C=EC=9B=90=20=ED=8C=9D=EC=97=85=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=EC=97=90=EC=84=9C=20=EC=9E=91=EC=84=B1?= =?UTF-8?q?=EA=B8=80=20=EB=B3=B4=EA=B8=B0=EC=8B=9C=20id=EA=B2=80=EC=83=89?= =?UTF-8?q?=EC=9D=B4=20=EC=95=84=EB=8B=8C=20member=5Fsrl=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=EC=9C=BC=EB=A1=9C=20=EC=A0=95=ED=99=95=ED=9E=88=20?= =?UTF-8?q?=EA=B2=B0=EA=B3=BC=EA=B0=80=20=EB=82=98=EC=98=A4=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= 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@3750 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/board.controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php index 8cae944ed..a859798cb 100644 --- a/modules/board/board.controller.php +++ b/modules/board/board.controller.php @@ -254,7 +254,7 @@ // 아이디로 검색 $menu_str = Context::getLang('cmd_view_own_document'); - $menu_url = sprintf('./?mid=%s&search_target=user_id&search_keyword=%s', $mid, $member_info->user_id); + $menu_url = sprintf('./?mid=%s&search_target=member_srl&search_keyword=%s', $mid, $member_info->member_srl); $obj[] = sprintf('%s,%s,move_url(\'%s\')', Context::getRequestUri().'/modules/member/tpl/images/icon_view_written.gif',$menu_str, $menu_url); return new Object(); From b5b724277d3328ff7176c07102de8b0dff0188f4 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 22 Feb 2008 14:08:55 +0000 Subject: [PATCH 010/140] 3750 rollback git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3751 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/board.controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php index a859798cb..8cae944ed 100644 --- a/modules/board/board.controller.php +++ b/modules/board/board.controller.php @@ -254,7 +254,7 @@ // 아이디로 검색 $menu_str = Context::getLang('cmd_view_own_document'); - $menu_url = sprintf('./?mid=%s&search_target=member_srl&search_keyword=%s', $mid, $member_info->member_srl); + $menu_url = sprintf('./?mid=%s&search_target=user_id&search_keyword=%s', $mid, $member_info->user_id); $obj[] = sprintf('%s,%s,move_url(\'%s\')', Context::getRequestUri().'/modules/member/tpl/images/icon_view_written.gif',$menu_str, $menu_url); return new Object(); From e9522fa376a0dada2c7ff4b4f40f9de194134ca3 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 22 Feb 2008 14:11:51 +0000 Subject: [PATCH 011/140] =?UTF-8?q?#420=20=EA=B3=B5=EC=8B=9D=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EC=9C=84=EC=A0=AF=EC=9D=98=20black=20?= =?UTF-8?q?=EC=BB=AC=EB=9F=AC=EC=85=8B=20=EC=9E=98=EB=AA=BB=EB=90=9C=20css?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= 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@3752 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- widgets/login_info/skins/xe_official/css/black.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widgets/login_info/skins/xe_official/css/black.css b/widgets/login_info/skins/xe_official/css/black.css index 50e4ba375..ca0ff6ad2 100644 --- a/widgets/login_info/skins/xe_official/css/black.css +++ b/widgets/login_info/skins/xe_official/css/black.css @@ -1,4 +1,4 @@ -.login_black { border:2px solid #515151; width:196px; position:relative; _padding-top:2px; display:block; display:none;} +.login_black { border:2px solid #515151; width:196px; position:relative; _padding-top:2px; display:block; } *:first-child+html body#black .login_black { padding-top:2px;} .login_black legend { display:none; width:0; height:0; overflow:hidden; font-size:0;} .login_black form { position:relative; border:1px solid #6b6b6b; padding:11px 11px 7px 11px; width:172px;} From f166d84e48c67e43f9c04f08355a87d47ecf83f9 Mon Sep 17 00:00:00 2001 From: supershop Date: Fri, 22 Feb 2008 15:14:56 +0000 Subject: [PATCH 012/140] =?UTF-8?q?=EC=98=81=EC=96=B4=20-=20=EA=B8=B0?= =?UTF-8?q?=EC=A1=B4=20=EB=B2=88=EC=97=AD=EB=AC=B8=20=EC=88=98=EC=A0=95?= 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@3753 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/lang/en.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/lang/en.lang.php b/common/lang/en.lang.php index fc2c31cdb..2e8a8fd1c 100644 --- a/common/lang/en.lang.php +++ b/common/lang/en.lang.php @@ -176,7 +176,7 @@ $lang->msg_invalid_document = 'Invalid Article Number'; $lang->msg_invalid_request = 'Invalid Request'; $lang->msg_invalid_password = 'Invalid Password'; - $lang->msg_error_occured = 'Error has occured'; + $lang->msg_error_occured = 'An error has occured'; $lang->msg_not_founded = 'Target could not be found'; $lang->msg_no_result = 'Nothing found'; From 131a679572e3083e4ecb320fd2eb09c8ccc166c2 Mon Sep 17 00:00:00 2001 From: haojilin Date: Fri, 22 Feb 2008 18:20:28 +0000 Subject: [PATCH 013/140] =?UTF-8?q?=E7=AE=80=E4=BD=93=E4=B8=AD=E6=96=87-?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=99=BB=E5=BD=95=E9=83=A8=E5=88=86=E7=BF=BB?= =?UTF-8?q?=E8=AF=91.?= 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@3754 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/lang/zh-CN.lang.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/member/lang/zh-CN.lang.php b/modules/member/lang/zh-CN.lang.php index 7b25e2e72..2bae73560 100644 --- a/modules/member/lang/zh-CN.lang.php +++ b/modules/member/lang/zh-CN.lang.php @@ -11,7 +11,7 @@ $lang->default_group_1 = "准会员"; $lang->default_group_2 = "正会员"; $lang->admin_group = "管理组"; - $lang->keep_signed = '로그인 유지'; + $lang->keep_signed = '自动登录'; $lang->remember_user_id = '保存ID'; $lang->already_logged = '您已经登录！'; $lang->denied_user_id = '被禁止的用户名。'; @@ -46,8 +46,8 @@ $lang->enable_join = '允许会员注册'; $lang->limit_day = '认证限制'; $lang->limit_date = '限制日期'; - $lang->after_login_url = '로그인 후 이동할 URL'; - $lang->after_logout_url = '로그아웃 후 이동할 URL'; + $lang->after_login_url = '登录后页面转向'; + $lang->after_logout_url = '退出后页面转向'; $lang->redirect_url = '注册会员后页面转向'; $lang->agreement = '会员注册条款'; $lang->accept_agreement = '同意条款'; @@ -62,7 +62,7 @@ $lang->webmaster_name = '管理员名'; $lang->webmaster_email = '管理员电子邮件'; - $lang->about_keep_signed = '브라우저를 닫더라도 로그인이 게속 유지될 수 있습니다.\n\n로그인 유지시 사용시 다음 접속부터는 로그인을 하실필요가 없습니다.\n\n단, 게임방, 학교등 공공장소에서 이용시 개인정보가 유출될수 있으니 꼭 로그아웃을 해주세요'; + $lang->about_keep_signed = '关闭浏览器后有可能维持登录状态。\n\n使用自动登录功能时下次访问网页不用再次输入用户名和密码。\n\n为防止个人信息的泄露，在网吧，学校等公共场所使用时请一定要退出登录。'; $lang->about_webmaster_name = '请输入认证所需的电子邮件地址或管理其他网站时要使用的网站管理员名称。(默认 : webmaster)'; $lang->about_webmaster_email = '请输入网站管理员的电子邮件地址。'; @@ -146,7 +146,7 @@ $lang->msg_allow_message_to_friend = '因其为只允许接收好友短消息的用户，所以不能发送短消息。'; $lang->msg_disallow_message = '因其为拒绝接收短消息的用户，所以不能发送短消息。'; $lang->msg_insert_group_name = '请输入组名称'; - $lang->msg_check_group = '그룹을 선택해 주세요'; + $lang->msg_check_group = '请选择组'; $lang->msg_not_uploaded_image_name = '不能登录昵称图像！'; $lang->msg_not_uploaded_image_mark = '不能登录用户图标！'; @@ -183,8 +183,8 @@ $lang->about_enable_join = '选择此项后用户才可以注册。'; $lang->about_limit_day = '注册会员后的认证有效期限。'; $lang->about_limit_date = '直到指定日期该用户不能登录。'; - $lang->about_after_login_url = '로그인 후 이동할 URL을 정하실 수 있습니다. 비어 있으면 해당 페이지가 유지됩니다.'; - $lang->about_after_logout_url = '로그아웃 후 이동할 URL을 정하실 수 있습니다. 비어 있으면 해당 페이지가 유지됩니다.'; + $lang->about_after_login_url = '可以指定登录后的页面转向url。留空为返回当前页面。'; + $lang->about_after_logout_url = '可以指定退出后的转向url。留空为返回当前页面。'; $lang->about_redirect_url = '请输入注册会员后的页面转向 url。(留空为返回前页)'; $lang->about_agreement = '没有会员条款时不显示。'; From bf9eee69b8b08ffeba56f67f81444c430e0c4dae Mon Sep 17 00:00:00 2001 From: haojilin Date: Fri, 22 Feb 2008 18:30:37 +0000 Subject: [PATCH 014/140] =?UTF-8?q?=E7=AE=80=E4=BD=93=E4=B8=AD=E6=96=87=20?= =?UTF-8?q?-=201:1=E8=AE=BA=E5=9D=9B=E7=BF=BB=E8=AF=91?= 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@3755 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/lang/zh-CN.lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/board/lang/zh-CN.lang.php b/modules/board/lang/zh-CN.lang.php index c8a60da37..8f3d23dde 100644 --- a/modules/board/lang/zh-CN.lang.php +++ b/modules/board/lang/zh-CN.lang.php @@ -22,7 +22,7 @@ $lang->expand = '展开'; $lang->category_group_srls = '用户组'; $lang->search_result = '搜索结果'; - $lang->consultation = '상담 기능'; + $lang->consultation = '1:1论坛'; // 按钮语言 $lang->cmd_board_list = '版面目录'; @@ -38,5 +38,5 @@ $lang->about_board_category = '可以添加/删除博客分类
博客分类有异常情况时，可以尝试重新生成缓冲文件。'; $lang->about_except_notice = "设置一般目录下不显示公告。"; $lang->about_board = "可生成，管理版面的模块。\n生成版面后，点击模块名即可对其详细设置。"; - $lang->about_consultation = "상담 기능은 관리권한이 없는 회원은 자신이 쓴 글만 보이도록 하는 기능입니다\n단 상담기능 사용시 비회원 글쓰기는 자동으로 금지됩니다."; + $lang->about_consultation = "1:1论坛功能是除了管理权限的会员以外只能浏览自己发表的主题.\n使用1:1论坛时系统自动禁止非会员发表主题的功能."; ?> From d122c1a0b41705bd546fa783d46524b69fded3b7 Mon Sep 17 00:00:00 2001 From: haojilin Date: Fri, 22 Feb 2008 18:37:42 +0000 Subject: [PATCH 015/140] =?UTF-8?q?=E7=AE=80=E4=BD=93=E4=B8=AD=E6=96=87=20?= =?UTF-8?q?-=20=E8=BE=93=E5=87=BA=E5=85=AC=E5=91=8A=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=9A=84=E6=9C=80=E6=96=B0=E4=B8=BB=E9=A2=98=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= 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@3756 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- widgets/webzine/skins/notice_style/skin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widgets/webzine/skins/notice_style/skin.xml b/widgets/webzine/skins/notice_style/skin.xml index afde87d30..b0c6e494a 100644 --- a/widgets/webzine/skins/notice_style/skin.xml +++ b/widgets/webzine/skins/notice_style/skin.xml @@ -2,7 +2,7 @@ 공지사항 형태의 출력 공지사항 형태의 출력 - 공지사항 형태의 출력 + 输出公告类型的最新主题控件 공지사항 형태의 출력 제로 From 21dcd2d1918d0b1813d247c46c4a3f86a2fe9daa Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 22 Feb 2008 19:42:50 +0000 Subject: [PATCH 016/140] =?UTF-8?q?=EB=8C=93=EA=B8=80=EC=9D=84=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=EA=B0=80=20=EC=A0=95=ED=95=9C=20=EC=88=98?= =?UTF-8?q?=EB=A7=8C=ED=81=BC=20=ED=8E=98=EC=9D=B4=EC=A7=95=EC=9D=84=20?= =?UTF-8?q?=ED=95=98=EC=97=AC=20=EB=B3=B4=EC=97=AC=EC=A3=BC=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80.=20?= =?UTF-8?q?=EB=AA=A8=EB=93=88=EC=9D=98=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=20=ED=95=84=EC=9A=94?= 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@3757 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/context/Context.class.php | 2 +- classes/db/DB.class.php | 8 +- modules/board/skins/cozy_board/comment.html | 14 ++ modules/board/skins/cozy_board/css/blue.css | 2 +- .../skins/cozy_board/css/bluish_green.css | 2 +- modules/board/skins/cozy_board/css/common.css | 10 ++ modules/board/skins/cozy_board/css/green.css | 2 +- modules/board/skins/cozy_board/css/pink.css | 2 +- modules/board/skins/cozy_board/css/red.css | 2 +- modules/board/skins/xe_board/comment.html | 13 ++ modules/board/skins/xe_guestbook/comment.html | 13 ++ modules/comment/comment.admin.controller.php | 39 ++++++ modules/comment/comment.class.php | 10 ++ modules/comment/comment.controller.php | 51 ++++++- modules/comment/comment.model.php | 132 ++++++++++++++---- modules/comment/comment.view.php | 48 +++++++ modules/comment/conf/module.xml | 1 + modules/comment/lang/en.lang.php | 3 + modules/comment/lang/es.lang.php | 3 + modules/comment/lang/jp.lang.php | 3 + modules/comment/lang/ko.lang.php | 3 + modules/comment/lang/ru.lang.php | 3 + modules/comment/lang/zh-CN.lang.php | 3 + modules/comment/queries/deleteCommentList.xml | 8 ++ .../comment/queries/deleteCommentsList.xml | 8 ++ .../queries/deleteModuleCommentsList.xml | 8 ++ modules/comment/queries/getCommentList.xml | 4 +- .../comment/queries/getCommentListItem.xml | 11 ++ .../comment/queries/getCommentPageList.xml | 21 +++ modules/comment/queries/insertCommentList.xml | 14 ++ .../queries/updateCommentListArrange.xml | 13 ++ .../queries/updateCommentListModule.xml | 11 ++ modules/comment/schemas/comments_list.xml | 9 ++ .../comment/tpl/comment_module_config.html | 27 ++++ .../filter/insert_comment_module_config.xml | 7 + .../document/document.admin.controller.php | 6 + modules/document/document.item.php | 19 ++- 37 files changed, 490 insertions(+), 45 deletions(-) create mode 100644 modules/comment/comment.view.php create mode 100644 modules/comment/queries/deleteCommentList.xml create mode 100644 modules/comment/queries/deleteCommentsList.xml create mode 100644 modules/comment/queries/deleteModuleCommentsList.xml create mode 100644 modules/comment/queries/getCommentListItem.xml create mode 100644 modules/comment/queries/getCommentPageList.xml create mode 100644 modules/comment/queries/insertCommentList.xml create mode 100644 modules/comment/queries/updateCommentListArrange.xml create mode 100644 modules/comment/queries/updateCommentListModule.xml create mode 100644 modules/comment/schemas/comments_list.xml create mode 100644 modules/comment/tpl/comment_module_config.html create mode 100644 modules/comment/tpl/filter/insert_comment_module_config.xml diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 415d34a23..26d458e5c 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -456,7 +456,7 @@ if(!count($_REQUEST)) return; foreach($_REQUEST as $key => $val) { - if($key == "page" || substr($key,-3)=="srl") $val = (int)$val; + if($key == "page" || $key == "cpage" || substr($key,-3)=="srl") $val = (int)$val; if(is_array($val)) { for($i=0;$i $table) { $table_filename = sprintf('%s/cache.%s%s', $this->count_cache_path, $this->prefix, $table) ; - if(file_exists($table_filename) && filemtime($table_filename) > $cache_mtime) return false; + if(!file_exists($table_filename) || filemtime($table_filename) > $cache_mtime) return false; } $count = (int)FileHandler::readFile($cache_filename); @@ -480,7 +480,11 @@ if(!is_dir($this->count_cache_path)) return FileHandler::makeDir($this->count_cache_path); if(!is_array($tables)) $tables = array($tables); - foreach($tables as $alias => $table) FileHandler::writeFile( sprintf('%s/cache.%s%s', $this->count_cache_path, $this->prefix, $table), '' ); + foreach($tables as $alias => $table) { + $filename = sprintf('%s/cache.%s%s', $this->count_cache_path, $this->prefix, $table); + @unlink($filename); + FileHandler::writeFile( $filename, '' ); + } return true; } diff --git a/modules/board/skins/cozy_board/comment.html b/modules/board/skins/cozy_board/comment.html index f454e4645..07e86775a 100644 --- a/modules/board/skins/cozy_board/comment.html +++ b/modules/board/skins/cozy_board/comment.html @@ -85,5 +85,19 @@ {@ $idx++} + + + + +
+ {$lang->first_page} + + + {$page_no} + + {$page_no} + + + {$lang->last_page}
diff --git a/modules/board/skins/cozy_board/css/blue.css b/modules/board/skins/cozy_board/css/blue.css index 085c6985c..f8b5f2ba6 100644 --- a/modules/board/skins/cozy_board/css/blue.css +++ b/modules/board/skins/cozy_board/css/blue.css @@ -8,7 +8,7 @@ .boardList td .replyAndTrackback { font:.8em Tahoma; color:#007ed5; cursor:default; position:relative; top:-.2em;} .boardList td.recommend { font:bold .8em Tahoma; color:#007ed5; text-align:center;} -.pageNavigation .current { margin-left:-4px; font:bold .8em Tahoma; color:#007ed5; display:inline-block; padding:1px 5px 2px 4px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } +.pageNavigation .current, .commentPageNavigation .current { margin-left:-4px; font:bold .8em Tahoma; color:#007ed5; display:inline-block; padding:1px 5px 2px 4px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } .boardRead { position:relative; _width:100%; margin:1em 0 0 0; padding: 0 0 .6em 0; border-bottom:3px solid #1187d8;} .boardRead .readHeader { width:100%; padding-bottom:.5em; margin-bottom:1em; border-bottom:3px solid #1187d8; overflow:hidden;} diff --git a/modules/board/skins/cozy_board/css/bluish_green.css b/modules/board/skins/cozy_board/css/bluish_green.css index 9c221ce62..df89f4bcb 100644 --- a/modules/board/skins/cozy_board/css/bluish_green.css +++ b/modules/board/skins/cozy_board/css/bluish_green.css @@ -8,7 +8,7 @@ .boardList td .replyAndTrackback { font:.8em Tahoma; color:#9ab09f; cursor:default; position:relative; top:-.2em;} .boardList td.recommend { font:bold .8em Tahoma; color:#9ab09f; text-align:center;} -.pageNavigation .current { margin-left:-4px; font:bold .8em Tahoma; color:#9ab09f; display:inline-block; padding:1px 5px 2px 4px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } +.pageNavigation .current , .commentPageNavigation .current{ margin-left:-4px; font:bold .8em Tahoma; color:#9ab09f; display:inline-block; padding:1px 5px 2px 4px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } .boardRead { position:relative; _width:100%; margin:1em 0 0 0; padding: 0 0 .6em 0; border-bottom:3px solid #9ab09f;} .boardRead .readHeader { width:100%; padding-bottom:.5em; margin-bottom:1em; border-bottom:3px solid #9ab09f; overflow:hidden;} diff --git a/modules/board/skins/cozy_board/css/common.css b/modules/board/skins/cozy_board/css/common.css index f8fd5e7d6..9a0ef1dd8 100644 --- a/modules/board/skins/cozy_board/css/common.css +++ b/modules/board/skins/cozy_board/css/common.css @@ -128,6 +128,16 @@ Jeong, Chan Myeong 070601~070630 .pageNavigation a.goToFirst img, .pageNavigation a.goToLast img { vertical-align:middle;} +/* comment pageNavigation */ +.commentPageNavigation { overflow:hidden; margin:5px 0 10px 0; text-align:center; font:bold .8em Tahoma; } +.commentPageNavigation a, .commentPageNavigation a:visited, .commentPageNavigation a:active { margin-left:-4px; font:bold .8em Tahoma; color:#676767; display:inline-block; padding:1px 5px 2px 4px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } +.commentPageNavigation a:hover { text-decoration:none; } +.commentPageNavigation a.goToFirst, +.commentPageNavigation a.goToLast { border:none; border-right:1px solid #ffffff; border-left:1px solid #ffffff; z-index:99; padding:1px 5px 3px 4px;} +.commentPageNavigation a.goToFirst img, +.commentPageNavigation a.goToLast img { vertical-align:middle;} + + .buttonBox { float:right; margin:1.2em 0 0 0; } /* boardRead */ diff --git a/modules/board/skins/cozy_board/css/green.css b/modules/board/skins/cozy_board/css/green.css index 592d74f50..fe99a4fe3 100644 --- a/modules/board/skins/cozy_board/css/green.css +++ b/modules/board/skins/cozy_board/css/green.css @@ -8,7 +8,7 @@ .boardList td .replyAndTrackback { font:.8em Tahoma; color:#27a939; cursor:default; position:relative; top:-.2em;} .boardList td.recommend { font:bold .8em Tahoma; color:#27a939; text-align:center;} -.pageNavigation .current { margin-left:-4px; font:bold .8em Tahoma; color:#27a939; display:inline-block; padding:1px 5px 2px 4px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } +.pageNavigation .current , .commentPageNavigation .current{ margin-left:-4px; font:bold .8em Tahoma; color:#27a939; display:inline-block; padding:1px 5px 2px 4px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } .boardRead { position:relative; _width:100%; margin:1em 0 0 0; padding: 0 0 .6em 0; border-bottom:3px solid #8dc63f;} .boardRead .readHeader { width:100%; padding-bottom:.5em; margin-bottom:1em; border-bottom:3px solid #8dc63f; overflow:hidden;} diff --git a/modules/board/skins/cozy_board/css/pink.css b/modules/board/skins/cozy_board/css/pink.css index 7269ac2a4..5a5d5a5ad 100644 --- a/modules/board/skins/cozy_board/css/pink.css +++ b/modules/board/skins/cozy_board/css/pink.css @@ -8,7 +8,7 @@ .boardList td .replyAndTrackback { font:.8em Tahoma; color:#f70795; cursor:default; position:relative; top:-.2em;} .boardList td.recommend { font:bold .8em Tahoma; color:#f70795; text-align:center;} -.pageNavigation .current { margin-left:-4px; font:bold .8em Tahoma; color:#f70795; display:inline-block; padding:1px 5px 2px 4px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } +.pageNavigation .current , .commentPageNavigation .current{ margin-left:-4px; font:bold .8em Tahoma; color:#f70795; display:inline-block; padding:1px 5px 2px 4px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } .boardRead { position:relative; _width:100%; margin:1em 0 0 0; padding: 0 0 .6em 0; border-bottom:3px solid #f70795;} .boardRead .readHeader { width:100%; padding-bottom:.5em; margin-bottom:1em; border-bottom:3px solid #f70795; overflow:hidden;} diff --git a/modules/board/skins/cozy_board/css/red.css b/modules/board/skins/cozy_board/css/red.css index b703a9dbb..a7b8adc9a 100644 --- a/modules/board/skins/cozy_board/css/red.css +++ b/modules/board/skins/cozy_board/css/red.css @@ -8,7 +8,7 @@ .boardList td .replyAndTrackback { font:.8em Tahoma; color:#ed1f29; cursor:default; position:relative; top:-.2em;} .boardList td.recommend { font:bold .8em Tahoma; color:#ec2127; text-align:center;} -.pageNavigation .current { margin-left:-4px; font:bold .8em Tahoma; color:#ff6600; display:inline-block; padding:1px 5px 2px 4px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } +.pageNavigation .current , .commentPageNavigation .current{ margin-left:-4px; font:bold .8em Tahoma; color:#ff6600; display:inline-block; padding:1px 5px 2px 4px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } .boardRead { position:relative; _width:100%; margin:1em 0 0 0; padding: 0 0 .6em 0; border-bottom:3px solid #ed2228;} .boardRead .readHeader { width:100%; padding-bottom:.5em; margin-bottom:1em; border-bottom:3px solid #ee202a; overflow:hidden;} diff --git a/modules/board/skins/xe_board/comment.html b/modules/board/skins/xe_board/comment.html index 9650390cb..dfccda3e3 100644 --- a/modules/board/skins/xe_board/comment.html +++ b/modules/board/skins/xe_board/comment.html @@ -89,5 +89,18 @@ + +
+ {$lang->first_page} + + + {$page_no} + + {$page_no} + + + {$lang->last_page} +
+ diff --git a/modules/board/skins/xe_guestbook/comment.html b/modules/board/skins/xe_guestbook/comment.html index b1113298d..bc674662a 100644 --- a/modules/board/skins/xe_guestbook/comment.html +++ b/modules/board/skins/xe_guestbook/comment.html @@ -84,5 +84,18 @@ + +
+ {$lang->first_page} + + + {$page_no} + + {$page_no} + + + {$lang->last_page} +
+ diff --git a/modules/comment/comment.admin.controller.php b/modules/comment/comment.admin.controller.php index ad93f1868..00f0c27f8 100644 --- a/modules/comment/comment.admin.controller.php +++ b/modules/comment/comment.admin.controller.php @@ -62,8 +62,47 @@ function deleteModuleComments($module_srl) { $args->module_srl = $module_srl; $output = executeQuery('comment.deleteModuleComments', $args); + if(!$output->toBool()) return $output; + + $output = executeQuery('comment.deleteModuleCommentsList', $args); return $output; } + + /** + * @brief 댓글의 모듈별 추가 확장 폼을 저장 + **/ + function procCommentAdminInsertModuleConfig() { + // 기존 설정을 가져옴 + $oModuleModel = &getModel('module'); + $config = $oModuleModel->getModuleConfig('comment'); + + // 대상을 구함 + $module_srl = Context::get('target_module_srl'); + + // 여러개의 모듈 일괄 설정일 경우 + if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl); + else $module_srl = array($module_srl); + + $comment_config = null; + + $comment_config->comment_count = (int)Context::get('comment_count'); + if(!$comment_config->comment_count) $comment_config->comment_count = 50; + + for($i=0;$imodule_config[$srl] = $comment_config; + } + + // module Controller 객체 생성하여 입력 + $oModuleController = &getController('module'); + $output = $oModuleController->insertModuleConfig('comment',$config); + + $this->setError(-1); + $this->setMessage('success_updated'); + } + + } ?> diff --git a/modules/comment/comment.class.php b/modules/comment/comment.class.php index ca04f48ba..04e4952d4 100644 --- a/modules/comment/comment.class.php +++ b/modules/comment/comment.class.php @@ -24,6 +24,9 @@ // 2007. 10. 17 모듈이 삭제될때 등록된 댓글도 모두 삭제하는 트리거 추가 $oModuleController->insertTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'); + // 2008. 02. 22 모듈의 추가 설정에서 댓글 추가 설정 추가 + $oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'); + return new Object(); } @@ -46,6 +49,9 @@ if(!$oModuleModel->getActionForward('dispCommentAdminDeclared')) return true; + // 2008. 02. 22 모듈의 추가 설정에서 댓글 추가 설정 추가 + if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before')) return true; + return false; } @@ -78,6 +84,10 @@ if(!$oModuleModel->getActionForward('dispCommentAdminDeclared')) $oModuleController->insertActionForward('comment', 'view', 'dispCommentAdminDeclared'); + // 2008. 02. 22 모듈의 추가 설정에서 댓글 추가 설정 추가 + if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before')) + $oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'); + return new Object(0, 'success_updated'); } diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php index 523f266bc..20d66c04c 100644 --- a/modules/comment/comment.controller.php +++ b/modules/comment/comment.controller.php @@ -118,11 +118,11 @@ // 내용에서 제로보드XE만의 태그를 삭제 $obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content); + $obj->regdate = date("YmdHis"); // 세션에서 최고 관리자가 아니면 iframe, script 제거 if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content); - if(!$obj->notify_message) $obj->notify_message = 'N'; if(!$obj->is_secret) $obj->is_secret = 'N'; @@ -130,15 +130,48 @@ $oDB = &DB::getInstance(); $oDB->begin(); - // 댓글을 입력 - $output = executeQuery('comment.insertComment', $obj); + // 댓글 목록 부분을 먼저 입력 + $list_args->comment_srl = $obj->comment_srl; + $list_args->document_srl = $obj->document_srl; + $list_args->module_srl = $obj->module_srl; + $list_args->regdate = $obj->regdate; - // 입력에 이상이 없으면 해당 글의 댓글 수를 올림 + // 부모댓글이 없으면 바로 데이터를 설정 + if(!$obj->parent_srl) { + $list_args->head = $list_args->arrange = $obj->comment_srl; + $list_args->depth = 0; + + // 부모댓글이 있으면 부모글의 정보를 구해옴 + } else { + // 부모댓글의 정보를 구함 + $parent_args->comment_srl = $obj->parent_srl; + $parent_output = executeQuery('comment.getCommentListItem', $parent_args); + + // 부모댓글이 존재하지 않으면 return + if(!$parent_output->toBool() || !$parent_output->data) return; + $parent = $parent_output->data; + + $list_args->head = $parent->head; + $list_args->depth = $parent->depth+1; + if($list_args->depth<2) $list_args->arrange = $obj->comment_srl; + else { + $list_args->arrange = $parent->arrange; + $output = executeQuery('comment.updateCommentListArrange', $list_args); + if(!$output->toBool()) return $output; + } + } + + $output = executeQuery('comment.insertCommentList', $list_args); + if(!$output->toBool()) return $output; + + // 댓글 본문을 입력 + $output = executeQuery('comment.insertComment', $obj); if(!$output->toBool()) { $oDB->rollback(); return $output; } + // 입력에 이상이 없으면 해당 글의 댓글 수를 올림 if(!$manual_inserted) { // comment model객체 생성 $oCommentModel = &getModel('comment'); @@ -155,6 +188,7 @@ // 댓글의 권한을 부여 $this->addGrant($obj->comment_srl); } + // trigger 호출 (after) if($output->toBool()) { @@ -301,6 +335,8 @@ return $output; } + $output = executeQuery('comment.deleteCommentList', $args); + // 댓글 수를 구해서 업데이트 $comment_count = $oCommentModel->getCommentCount($document_srl); @@ -341,9 +377,14 @@ $oDocument = $oDocumentModel->getDocument($document_srl); if(!$oDocument->isExists() || !$oDocument->isGranted()) return new Object(-1, 'msg_not_permitted'); - // 삭제 + // 댓글 본문 삭제 $args->document_srl = $document_srl; $output = executeQuery('comment.deleteComments', $args); + if(!$output->toBool()) return $output; + + // 댓글 목록 삭제 + $output = executeQuery('comment.deleteCommentsList', $args); + return $output; } diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php index c831920e4..afa7040ba 100644 --- a/modules/comment/comment.model.php +++ b/modules/comment/comment.model.php @@ -158,13 +158,62 @@ /** * @brief document_srl에 해당하는 문서의 댓글 목록을 가져옴 **/ - function getCommentList($document_srl, $is_admin = false) { + function getCommentList($document_srl, $page = 1, $is_admin = false) { + // 해당 문서의 모듈에 해당하는 댓글 수를 구함 + $oDocumentModel = &getModel('document'); + $oDocument = $oDocumentModel->getDocument($document_srl); + + // 문서가 존재하지 않으면 return~ + if(!$oDocument->isExists()) return; + + // 댓글수가 없으면 return~ + if($oDocument->getCommentCount()<1) return; + + // 정해진 댓글수에 따른 댓글 목록 구함 + $module_srl = $oDocument->get('module_srl'); + $comment_config = $this->getCommentConfig($module_srl); + $comment_count = $comment_config->comment_count; + if(!$comment_count) $comment_count = 50; + + if(!$page) !$page = 1; + + // 정해진 수에 따라 목록을 구해옴 + $args->document_srl = $document_srl; + $args->list_count = $comment_count; + $args->page = $page; + $args->page_count = 10; + $output = executeQueryArray('comment.getCommentPageList', $args); + + // 쿼리 결과에서 오류가 생기면 그냥 return + if(!$output->toBool()) return; + + // 만약 구해온 결과값이 저장된 댓글수와 다르다면 기존의 데이터로 판단하고 댓글 목록 테이블에 데이터 입력 + if(!$output->data) { + $this->fixCommentList($oDocument->get('module_srl'), $document_srl); + $output = executeQueryArray('comment.getCommentPageList', $args); + if(!$output->toBool()) return; + } + + return $output; + } + + /** + * @brief document_srl에 해당하는 댓글 목록을 갱신 + * 정식버전 이전에 사용되던 데이터를 위한 처리 + **/ + function fixCommentList($module_srl, $document_srl) { + // 일괄 작업이라서 lock 파일을 생성하여 중복 작업이 되지 않도록 한다 + $lock_file = "./files/cache/tmp/lock.".$document_srl; + if(file_exists($lock_file) && filemtime($lock_file)+60*60*10document_srl = $document_srl; $args->list_order = 'list_order'; $output = executeQuery('comment.getCommentList', $args); if(!$output->toBool()) return $output; - $source_list= $output->data; + $source_list = $output->data; if(!is_array($source_list)) $source_list = array($source_list); // 댓글를 계층형 구조로 정렬 @@ -172,26 +221,18 @@ $root = NULL; $list = NULL; + $comment_list = array(); // 로그인 사용자의 경우 로그인 정보를 일단 구해 놓음 $logged_info = Context::get('logged_info'); + // loop를 돌면서 코멘트의 계층 구조 만듬 for($i=$comment_count-1;$i>=0;$i--) { $comment_srl = $source_list[$i]->comment_srl; $parent_srl = $source_list[$i]->parent_srl; - $member_srl = $source_list[$i]->member_srl; - - // OL/LI 태그를 위한 치환 처리 - //$source_list[$i]->content = preg_replace('!<(ol|ul|blockquote)>!is','<\\1 style="margin-left:40px;">',$source_list[$i]->content); - - // url에 대해서 정규표현식으로 치환 - $source_list[$i]->content = preg_replace('!([^>^"^\'^=])(http|https|ftp|mms):\/\/([^ ^<^"^\']*)!is','$1$2://$3',' '.$source_list[$i]->content); - if(!$comment_srl) continue; - //if($is_admin || $this->isGranted($comment_srl) || $member_srl == $logged_info->member_srl) $source_list[$i]->is_granted = true; - // 목록을 만듬 $list[$comment_srl] = $source_list[$i]; @@ -201,35 +242,48 @@ $root->child[] = &$list[$comment_srl]; } } - $this->_arrangeComment($comment_list, $root->child, 0); - return $comment_list; + $this->_arrangeComment($comment_list, $root->child, 0, null); + + // 구해진 값을 db에 입력함 + if(count($comment_list)) { + foreach($comment_list as $comment_srl => $item) { + $comment_args = null; + $comment_args->comment_srl = $comment_srl; + $comment_args->document_srl = $document_srl; + $comment_args->head = $item->head; + $comment_args->arrange = $item->arrange; + $comment_args->module_srl = $module_srl; + $comment_args->regdate = $item->regdate; + $comment_args->depth = $item->depth; + + executeQuery('comment.insertCommentList', $comment_args); + } + } + + // 성공시 lock파일 제거 + @unlink($lock_file); } /** * @brief 댓글을 계층형으로 재배치 **/ - function _arrangeComment(&$comment_list, $list, $depth, $set_grant = false) { + function _arrangeComment(&$comment_list, $list, $depth, $parent = null) { if(!count($list)) return; foreach($list as $key => $val) { - $oCommentItem = new commentItem(); + + if($parent) $val->head = $parent->head; + else $val->head = $val->comment_srl; + $val->arrange = count($comment_list)+1; if($val->child) { - $tmp = $val; - $tmp->depth = $depth; - $oCommentItem->setAttribute($tmp); - - $comment_list[$tmp->comment_srl] = $oCommentItem; - if($set_grant) $oCommentItem->setAccessible(); - - $this->_arrangeComment($comment_list,$val->child,$depth+1, $oCommentItem->isGranted()); + $val->depth = $depth; + $comment_list[$val->comment_srl] = $val; + $this->_arrangeComment($comment_list,$val->child,$depth+1, $val); + unset($val->child); } else { $val->depth = $depth; - $oCommentItem->setAttribute($val); - - if($set_grant) $oCommentItem->setAccessible(); - $comment_list[$val->comment_srl] = $oCommentItem; + $comment_list[$val->comment_srl] = $val; } - } } @@ -297,5 +351,25 @@ return $output; } + + /** + * @brief 모듈별 댓글 설정을 return + **/ + function getCommentConfig($module_srl) { + if(!$GLOBLAS['__comment_module_config__']) { + // 선택된 모듈의 trackback설정을 가져옴 + $oModuleModel = &getModel('module'); + $GLOBLAS['__comment_module_config__'] = $oModuleModel->getModuleConfig('comment'); + } + + $comment_config = $GLOBLAS['__comment_module_config__']->module_config[$module_srl]; + + if(!is_object($comment_config)) $comment_config = null; + + if(!isset($comment_config->comment_count)) $comment_count->comment_count = 50; + + return $comment_config; + } + } ?> diff --git a/modules/comment/comment.view.php b/modules/comment/comment.view.php new file mode 100644 index 000000000..a6c35f2fb --- /dev/null +++ b/modules/comment/comment.view.php @@ -0,0 +1,48 @@ +module_srl; + if(!$current_module_srl) return new Object(); + } + + // 댓글 설정을 구함 + $oCommentModel = &getModel('comment'); + $comment_config = $oCommentModel->getCommentConfig($current_module_srl); + Context::set('comment_config', $comment_config); + + // 그룹 목록을 구함 + $oMemberModel = &getModel('member'); + $group_list = $oMemberModel->getGroups(); + Context::set('group_list', $group_list); + + // 템플릿 파일 지정 + $oTemplate = &TemplateHandler::getInstance(); + $tpl = $oTemplate->compile($this->module_path.'tpl', 'comment_module_config'); + $obj .= $tpl; + + return new Object(); + } + } +?> diff --git a/modules/comment/conf/module.xml b/modules/comment/conf/module.xml index 03fa6b95c..ae5a4c69b 100644 --- a/modules/comment/conf/module.xml +++ b/modules/comment/conf/module.xml @@ -10,5 +10,6 @@ + diff --git a/modules/comment/lang/en.lang.php b/modules/comment/lang/en.lang.php index ed4d26b82..93353ca00 100644 --- a/modules/comment/lang/en.lang.php +++ b/modules/comment/lang/en.lang.php @@ -10,6 +10,9 @@ $lang->comment_list = 'Comments List'; $lang->cmd_delete_checked_comment = 'Delete selected item'; + $lang->comment_count = '댓글 수'; + $lang->about_comment_count = '댓글을 정해진 수 만큼만 표시하고 그 이상일 경우 목록으로 이동할 수 있게 합니다.'; + $lang->msg_cart_is_null = 'Please select an article to delete'; $lang->msg_checked_comment_is_deleted = '%d comment(s) is(are) successfully deleted.'; diff --git a/modules/comment/lang/es.lang.php b/modules/comment/lang/es.lang.php index 95b01c425..17b0bc84b 100644 --- a/modules/comment/lang/es.lang.php +++ b/modules/comment/lang/es.lang.php @@ -10,6 +10,9 @@ $lang->comment_list = 'Comentarios Lista'; $lang->cmd_delete_checked_comment = 'Eliminar lo seleccionado' ; + $lang->comment_count = '댓글 수'; + $lang->about_comment_count = '댓글을 정해진 수 만큼만 표시하고 그 이상일 경우 목록으로 이동할 수 있게 합니다.'; + $lang->msg_cart_is_null = 'Selecciona el commentario que desea eliminar'; $lang->msg_checked_comment_is_deleted = '%d comentario eliminado correctamente.'; diff --git a/modules/comment/lang/jp.lang.php b/modules/comment/lang/jp.lang.php index 4ba0c0471..acf314cc0 100644 --- a/modules/comment/lang/jp.lang.php +++ b/modules/comment/lang/jp.lang.php @@ -11,6 +11,9 @@ $lang->cmd_toggle_checked_comment = '選択項目の反転'; $lang->cmd_delete_checked_comment = '選択項目削除'; + $lang->comment_count = '댓글 수'; + $lang->about_comment_count = '댓글을 정해진 수 만큼만 표시하고 그 이상일 경우 목록으로 이동할 수 있게 합니다.'; + $lang->msg_cart_is_null = '削除するコメントを選択してください。'; $lang->msg_checked_comment_is_deleted = '%d個のコメントを削除しました。'; diff --git a/modules/comment/lang/ko.lang.php b/modules/comment/lang/ko.lang.php index 732411f48..c8692772a 100644 --- a/modules/comment/lang/ko.lang.php +++ b/modules/comment/lang/ko.lang.php @@ -11,6 +11,9 @@ $lang->cmd_toggle_checked_comment = '선택항목 반전'; $lang->cmd_delete_checked_comment = '선택항목 삭제'; + $lang->comment_count = '댓글 수'; + $lang->about_comment_count = '댓글을 정해진 수 만큼만 표시하고 그 이상일 경우 목록으로 이동할 수 있게 합니다.'; + $lang->msg_cart_is_null = '삭제할 글을 선택해주세요'; $lang->msg_checked_comment_is_deleted = '%d개의 댓글이 삭제되었습니다'; diff --git a/modules/comment/lang/ru.lang.php b/modules/comment/lang/ru.lang.php index c9ca0a266..01eeaaa09 100644 --- a/modules/comment/lang/ru.lang.php +++ b/modules/comment/lang/ru.lang.php @@ -10,6 +10,9 @@ $lang->comment_list = 'Список комментариев'; $lang->cmd_delete_checked_comment = 'Удалить выбранный объект'; + $lang->comment_count = '댓글 수'; + $lang->about_comment_count = '댓글을 정해진 수 만큼만 표시하고 그 이상일 경우 목록으로 이동할 수 있게 합니다.'; + $lang->msg_cart_is_null = 'Пожалуйста, выберите статью для удаления.'; $lang->msg_checked_comment_is_deleted = '%d комментарий(-ия) успешно удален(о).'; diff --git a/modules/comment/lang/zh-CN.lang.php b/modules/comment/lang/zh-CN.lang.php index 25499ac08..e5bba3c8c 100644 --- a/modules/comment/lang/zh-CN.lang.php +++ b/modules/comment/lang/zh-CN.lang.php @@ -11,6 +11,9 @@ $lang->cmd_toggle_checked_comment = '反选'; $lang->cmd_delete_checked_comment = '删除所选'; + $lang->comment_count = '댓글 수'; + $lang->about_comment_count = '댓글을 정해진 수 만큼만 표시하고 그 이상일 경우 목록으로 이동할 수 있게 합니다.'; + $lang->msg_cart_is_null = '请选择要删除的评论。'; $lang->msg_checked_comment_is_deleted = '已删除%d个评论。'; diff --git a/modules/comment/queries/deleteCommentList.xml b/modules/comment/queries/deleteCommentList.xml new file mode 100644 index 000000000..59f1e8497 --- /dev/null +++ b/modules/comment/queries/deleteCommentList.xml @@ -0,0 +1,8 @@ + + +
+ + + + + diff --git a/modules/comment/queries/deleteCommentsList.xml b/modules/comment/queries/deleteCommentsList.xml new file mode 100644 index 000000000..16a0a41ca --- /dev/null +++ b/modules/comment/queries/deleteCommentsList.xml @@ -0,0 +1,8 @@ + + +
+ + + + + diff --git a/modules/comment/queries/deleteModuleCommentsList.xml b/modules/comment/queries/deleteModuleCommentsList.xml new file mode 100644 index 000000000..dd4858c70 --- /dev/null +++ b/modules/comment/queries/deleteModuleCommentsList.xml @@ -0,0 +1,8 @@ + + +
+ + + + + diff --git a/modules/comment/queries/getCommentList.xml b/modules/comment/queries/getCommentList.xml index a7461f7f8..490d40f0a 100644 --- a/modules/comment/queries/getCommentList.xml +++ b/modules/comment/queries/getCommentList.xml @@ -3,7 +3,9 @@
- + + + diff --git a/modules/comment/queries/getCommentListItem.xml b/modules/comment/queries/getCommentListItem.xml new file mode 100644 index 000000000..e964057c2 --- /dev/null +++ b/modules/comment/queries/getCommentListItem.xml @@ -0,0 +1,11 @@ + + +
+ + + + + + + + diff --git a/modules/comment/queries/getCommentPageList.xml b/modules/comment/queries/getCommentPageList.xml new file mode 100644 index 000000000..4e7737fce --- /dev/null +++ b/modules/comment/queries/getCommentPageList.xml @@ -0,0 +1,21 @@ + + +
+
+ + + + + + + + + + + + + + + + + diff --git a/modules/comment/queries/insertCommentList.xml b/modules/comment/queries/insertCommentList.xml new file mode 100644 index 000000000..50269ed71 --- /dev/null +++ b/modules/comment/queries/insertCommentList.xml @@ -0,0 +1,14 @@ + + +
+ + + + + + + + + + + diff --git a/modules/comment/queries/updateCommentListArrange.xml b/modules/comment/queries/updateCommentListArrange.xml new file mode 100644 index 000000000..53d40f71a --- /dev/null +++ b/modules/comment/queries/updateCommentListArrange.xml @@ -0,0 +1,13 @@ + + +
+ + + + + + + + + + diff --git a/modules/comment/queries/updateCommentListModule.xml b/modules/comment/queries/updateCommentListModule.xml new file mode 100644 index 000000000..9cb2a16d4 --- /dev/null +++ b/modules/comment/queries/updateCommentListModule.xml @@ -0,0 +1,11 @@ + + +
+ + + + + + + + diff --git a/modules/comment/schemas/comments_list.xml b/modules/comment/schemas/comments_list.xml new file mode 100644 index 000000000..62fde55a8 --- /dev/null +++ b/modules/comment/schemas/comments_list.xml @@ -0,0 +1,9 @@ +
+ + + + + + + +
diff --git a/modules/comment/tpl/comment_module_config.html b/modules/comment/tpl/comment_module_config.html new file mode 100644 index 000000000..d30feaeb6 --- /dev/null +++ b/modules/comment/tpl/comment_module_config.html @@ -0,0 +1,27 @@ + + +
+ + + + + + + + + + + + + + + +
{$lang->comment}
{$lang->comment_count} + +
{$lang->about_comment_count}
+ +
+ +
+ +
diff --git a/modules/comment/tpl/filter/insert_comment_module_config.xml b/modules/comment/tpl/filter/insert_comment_module_config.xml new file mode 100644 index 000000000..0ba885b16 --- /dev/null +++ b/modules/comment/tpl/filter/insert_comment_module_config.xml @@ -0,0 +1,7 @@ + +
+ + + + + diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php index 56c93d851..cc572ce90 100644 --- a/modules/document/document.admin.controller.php +++ b/modules/document/document.admin.controller.php @@ -207,6 +207,12 @@ return $output; } + $output = executeQuery('comment.updateCommentListModule', $args); + if(!$output->toBool()) { + $oDB->rollback(); + return $output; + } + // 엮인글의 이동 $output = executeQuery('trackback.updateTrackbackModule', $args); if(!$output->toBool()) { diff --git a/modules/document/document.item.php b/modules/document/document.item.php index ae8098e9a..0c6854ff3 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -375,9 +375,24 @@ if(!$this->allowComment() || !$this->getCommentCount()) return; if(!$this->isGranted() && $this->isSecret()) return; + $cpage = Context::get('cpage'); + if(!$cpage) $cpage = 1; + $oCommentModel = &getModel('comment'); - $output = $oCommentModel->getCommentList($this->document_srl, $is_admin); - return $output; + $output = $oCommentModel->getCommentList($this->document_srl, $cpage, $is_admin); + if(!$output->toBool() || !count($output->data)) return; + + $oCommentModel = &getModel('comment'); + foreach($output->data as $key => $val) { + $oCommentItem = new commentItem(); + $oCommentItem->setAttribute($val); + $comment_list[$val->comment_srl] = $oCommentItem; + } + + Context::set('comment_page_navigation', $output->page_navigation); + Context::set('cpage', $output->page_navigation->cur_page); + + return $comment_list; } function getTrackbackCount() { From 3ceafbf3fafb515fe750547c1840f4e02ee54ea3 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 22 Feb 2008 19:59:57 +0000 Subject: [PATCH 017/140] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3758 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/skins/cozy_board/comment.html | 4 ++-- modules/board/skins/xe_board/comment.html | 4 ++-- modules/board/skins/xe_guestbook/comment.html | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/board/skins/cozy_board/comment.html b/modules/board/skins/cozy_board/comment.html index 07e86775a..604487595 100644 --- a/modules/board/skins/cozy_board/comment.html +++ b/modules/board/skins/cozy_board/comment.html @@ -90,7 +90,7 @@
- {$lang->first_page} + {$lang->first_page} {$page_no} @@ -98,6 +98,6 @@ {$page_no} - {$lang->last_page} + {$lang->last_page}
diff --git a/modules/board/skins/xe_board/comment.html b/modules/board/skins/xe_board/comment.html index dfccda3e3..cc83bde98 100644 --- a/modules/board/skins/xe_board/comment.html +++ b/modules/board/skins/xe_board/comment.html @@ -91,7 +91,7 @@
- {$lang->first_page} + {$lang->first_page} {$page_no} @@ -99,7 +99,7 @@ {$page_no} - {$lang->last_page} + {$lang->last_page}
diff --git a/modules/board/skins/xe_guestbook/comment.html b/modules/board/skins/xe_guestbook/comment.html index bc674662a..6de543bfb 100644 --- a/modules/board/skins/xe_guestbook/comment.html +++ b/modules/board/skins/xe_guestbook/comment.html @@ -86,7 +86,7 @@
- {$lang->first_page} + {$lang->first_page} {$page_no} @@ -94,7 +94,7 @@ {$page_no} - {$lang->last_page} + {$lang->last_page}
From a64cb56b16ca3f1214dc3a84a01d43495a79f2bd Mon Sep 17 00:00:00 2001 From: duvent Date: Fri, 22 Feb 2008 20:26:26 +0000 Subject: [PATCH 018/140] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3759 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/lang/fr.lang.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/lang/fr.lang.php b/common/lang/fr.lang.php index 09e59d10d..42586c1a3 100644 --- a/common/lang/fr.lang.php +++ b/common/lang/fr.lang.php @@ -1,4 +1,4 @@ -cmd_delete = 'Supprimer'; $lang->cmd_modify = 'Modifier'; $lang->cmd_edit = 'Editer'; - $lang->cmd_view = 'Regarder'; - $lang->cmd_view_all = 'Regarder Tous'; + $lang->cmd_view = 'Voir'; + $lang->cmd_view_all = 'Voir Tout'; $lang->cmd_list = 'Liste'; $lang->cmd_prev = 'Précédent '; $lang->cmd_next = 'Après'; @@ -21,7 +21,7 @@ $lang->cmd_comment_registration = 'Ajouter le Commentaire'; $lang->cmd_insert = 'Insérer'; $lang->cmd_save = 'Economiser'; - $lang->cmd_load = '불러오기'; + $lang->cmd_load = 'Télécharger'; $lang->cmd_input = 'Entrer'; $lang->cmd_search = 'Rechercher'; $lang->cmd_cancel = 'Decommander'; From 87bfa7fbe2bd9a37bdde5120c84020887041eb18 Mon Sep 17 00:00:00 2001 From: supershop Date: Fri, 22 Feb 2008 21:18:16 +0000 Subject: [PATCH 019/140] =?UTF-8?q?=EC=98=81=EC=96=B4=20-=20=EA=B8=B0?= =?UTF-8?q?=EC=A1=B4=20=EB=B2=88=EC=97=AD=EB=AC=B8=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EB=B0=8F=20=EC=B6=94=EA=B0=80=20=EB=B2=88=EC=97=AD?= 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@3760 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/comment/lang/en.lang.php | 4 ++-- modules/counter/lang/en.lang.php | 4 ++-- modules/document/lang/en.lang.php | 18 +++++++++--------- modules/file/lang/en.lang.php | 30 +++++++++++++++--------------- modules/menu/lang/en.lang.php | 6 +++--- modules/module/lang/en.lang.php | 16 ++++++++-------- 6 files changed, 39 insertions(+), 39 deletions(-) diff --git a/modules/comment/lang/en.lang.php b/modules/comment/lang/en.lang.php index 93353ca00..8127365e0 100644 --- a/modules/comment/lang/en.lang.php +++ b/modules/comment/lang/en.lang.php @@ -10,8 +10,8 @@ $lang->comment_list = 'Comments List'; $lang->cmd_delete_checked_comment = 'Delete selected item'; - $lang->comment_count = '댓글 수'; - $lang->about_comment_count = '댓글을 정해진 수 만큼만 표시하고 그 이상일 경우 목록으로 이동할 수 있게 합니다.'; + $lang->comment_count = 'Number of Comments'; + $lang->about_comment_count = 'If there are more comments, they will be moved to list.'; $lang->msg_cart_is_null = 'Please select an article to delete'; $lang->msg_checked_comment_is_deleted = '%d comment(s) is(are) successfully deleted.'; diff --git a/modules/counter/lang/en.lang.php b/modules/counter/lang/en.lang.php index cc39f6f7b..20fffb303 100644 --- a/modules/counter/lang/en.lang.php +++ b/modules/counter/lang/en.lang.php @@ -6,7 +6,7 @@ **/ $lang->counter = "Counter"; - $lang->cmd_select_date = 'Select date'; + $lang->cmd_select_date = 'Select Date'; $lang->cmd_select_counter_type = array( 'hour' => 'By Hour', 'day' => 'By Day', @@ -15,7 +15,7 @@ ); $lang->total_counter = 'Total Status'; - $lang->selected_day_counter = 'Selected day status'; + $lang->selected_day_counter = 'Status of Selected Day'; $lang->unique_visitor = 'Visitors'; $lang->pageview = 'Pageview'; diff --git a/modules/document/lang/en.lang.php b/modules/document/lang/en.lang.php index d9e2c7a0b..144ba4d03 100644 --- a/modules/document/lang/en.lang.php +++ b/modules/document/lang/en.lang.php @@ -23,16 +23,16 @@ $lang->cmd_document_do = 'You would..'; $lang->msg_cart_is_null = 'Please select the articles to delete'; - $lang->msg_category_not_moved = 'Cannot move'; + $lang->msg_category_not_moved = 'Could not be moved'; $lang->msg_is_secret = 'This article is secret'; - $lang->msg_checked_document_is_deleted = 'Total of %d article(s) was(were) deleted'; + $lang->msg_checked_document_is_deleted = '%d article(s) was(were) deleted'; // Search targets in admin page $lang->search_target_list = array( 'title' => 'Subject', 'content' => 'Content', 'user_id' => 'User ID', - 'member_srl' => 'Member No.', + 'member_srl' => 'Member Serial Number', 'user_name' => 'User Name', 'nick_name' => 'Nickname', 'email_address' => 'Email', @@ -40,13 +40,13 @@ 'is_notice' => 'Notice', 'is_secret' => 'Secret', 'tags' => 'Tag', - 'readed_count' => 'Number of Views (Over)', - 'voted_count' => 'Number of Votes (Over)', - 'comment_count ' => 'Number of Comments (Over)', - 'trackback_count ' => 'Number of trackbacks (Over)', - 'uploaded_count ' => 'Number of Attachments (Over)', + 'readed_count' => 'Number of Views (over)', + 'voted_count' => 'Number of Votes (over)', + 'comment_count ' => 'Number of Comments (over)', + 'trackback_count ' => 'Number of Trackbacks (over)', + 'uploaded_count ' => 'Number of Attachments (over)', 'regdate' => 'Date', - 'last_update' => 'Last Revised', + 'last_update' => 'Last Modified Date', 'ipaddress' => 'IP Address', ); ?> diff --git a/modules/file/lang/en.lang.php b/modules/file/lang/en.lang.php index 9a571770a..d39456427 100644 --- a/modules/file/lang/en.lang.php +++ b/modules/file/lang/en.lang.php @@ -6,35 +6,35 @@ **/ $lang->file = 'Attachment'; - $lang->file_name = 'File name'; - $lang->file_size = 'File size'; - $lang->download_count = 'Number of downloads'; + $lang->file_name = 'File Name'; + $lang->file_size = 'File Size'; + $lang->download_count = 'Number of Downloads'; $lang->status = 'Status'; $lang->is_valid = 'Valid'; $lang->is_stand_by = 'Stand by'; $lang->file_list = 'Attachments List'; - $lang->allowed_filesize = 'Max Filesize'; - $lang->allowed_attach_size = 'Max Attachments'; + $lang->allowed_filesize = 'Maximum File Size'; + $lang->allowed_attach_size = 'Maximum Attachments'; $lang->allowed_filetypes = 'Allowed Extensions'; - $lang->enable_download_group = 'Download allowed groups'; + $lang->enable_download_group = 'Download Allowed Groups'; $lang->about_allowed_filesize = 'You can assign file size limit for each file. (Exclude administrators)'; $lang->about_allowed_attach_size = 'You can assign file size limit for each document. (Exclude administrators)'; - $lang->about_allowed_filetypes = 'Only allowed extentsions can be attached. To allow an extension, use "*.extention". To allow multiple extensions, use ";" between each extension.
ex) *.* or *.jpg;*.gif;
(Exclude Administrators)'; + $lang->about_allowed_filetypes = 'Only allowed extentsions can be attached. To allow an extension, use "*.[extention]". To allow multiple extensions, use ";" between each extension.
ex) *.* or *.jpg;*.gif;
(Exclude Administrators)'; - $lang->cmd_delete_checked_file = 'Delete Selected'; - $lang->cmd_move_to_document = 'Move to document'; + $lang->cmd_delete_checked_file = 'Delete Selected Item(s)'; + $lang->cmd_move_to_document = 'Move to Document'; $lang->cmd_download = 'Download'; - $lang->msg_not_permitted_download = 'You do not have any permission to download'; + $lang->msg_not_permitted_download = 'You do not have permission to download'; $lang->msg_cart_is_null = 'Please select file(s) to delete'; - $lang->msg_checked_file_is_deleted = 'Total of %d attachment(s) was(were) deleted'; - $lang->msg_exceeds_limit_size = 'Attachment failed due to the excess of file size'; + $lang->msg_checked_file_is_deleted = '%d attachment(s) was(were) deleted'; + $lang->msg_exceeds_limit_size = 'File size of attachment is bigger than maximum size.'; $lang->search_target_list = array( - 'filename' => 'File name', - 'filesize' => 'File size (byte, Over)', - 'download_count' => 'Downloads (Over)', + 'filename' => 'File Name', + 'filesize' => 'File Size (byte, over)', + 'download_count' => 'Downloads (over)', 'regdate' => 'Registered Date', 'ipaddress' => 'IP Address', ); diff --git a/modules/menu/lang/en.lang.php b/modules/menu/lang/en.lang.php index d4675bfa6..c18e4d7f1 100644 --- a/modules/menu/lang/en.lang.php +++ b/modules/menu/lang/en.lang.php @@ -12,9 +12,9 @@ $lang->menu_count = 'No. of menu'; $lang->menu_management = 'Menu Management'; $lang->depth = 'Step'; - $lang->parent_menu_name = 'Parent menu name'; + $lang->parent_menu_name = 'Parent Menu Name'; $lang->menu_name = 'Menu Name'; - $lang->menu_srl = 'Menu SRL'; + $lang->menu_srl = 'Menu Serial Number'; $lang->menu_id = 'Menu ID'; $lang->menu_url = 'Menu URL'; $lang->menu_open_window = 'Open a new window'; @@ -29,7 +29,7 @@ $lang->layout_info = "Layout Info"; $lang->layout_list = 'Layout List'; $lang->downloaded_list = 'Download List'; - $lang->limit_menu_depth = 'Display Eenabled'; + $lang->limit_menu_depth = 'Display Enabled'; $lang->cmd_make_child = 'Add a child menu'; $lang->cmd_move_to_installed_list = "View created lists"; diff --git a/modules/module/lang/en.lang.php b/modules/module/lang/en.lang.php index 98d64ed51..67ace8f95 100644 --- a/modules/module/lang/en.lang.php +++ b/modules/module/lang/en.lang.php @@ -5,10 +5,10 @@ * @brief English language pack **/ - $lang->module_list = "Module List"; - $lang->module_index = "Module List"; + $lang->module_list = "Modules List"; + $lang->module_index = "Modules List"; $lang->module_category = "Module Category"; - $lang->module_info = "Info"; + $lang->module_info = "Module Info"; $lang->add_shortcut = "Add Shortcuts"; $lang->module_action = "Actions"; $lang->module_maker = "Module Developer"; @@ -18,11 +18,11 @@ $lang->footer_text = 'Footer Text'; $lang->use_category = 'Enable Category'; $lang->category_title = 'Category Title'; - $lang->checked_count = 'Number of checked article'; + $lang->checked_count = 'Number of Checked Articles'; $lang->skin_default_info = 'Default Skin Info'; $lang->skin_maker = 'Skin Developer'; $lang->skin_maker_homepage = "Skin Developer's Homepage"; - $lang->module_copy = "Copy module"; + $lang->module_copy = "Duplicate Module"; $lang->cmd_add_shortcut = "Add Shortcut"; $lang->cmd_install = "Install"; @@ -34,9 +34,9 @@ $lang->msg_new_module = "Create new module"; $lang->msg_update_module = "Modify module"; - $lang->msg_module_name_exists = "The name already exists. Please try other name."; - $lang->msg_category_is_null = 'No registered category exists.'; - $lang->msg_grant_is_null = 'No list exists for grant.'; + $lang->msg_module_name_exists = "The name already exists. Please try another name."; + $lang->msg_category_is_null = 'There is no registered category.'; + $lang->msg_grant_is_null = 'There is no permission list.'; $lang->msg_no_checked_document = 'No checked articles exist.'; $lang->msg_move_failed = 'Failed to move'; $lang->msg_cannot_delete_for_child = 'Cannot delete a category having child categories.'; From 4887c0983de136848acb188be7f1cef822d20b2a Mon Sep 17 00:00:00 2001 From: zero Date: Sat, 23 Feb 2008 00:12:24 +0000 Subject: [PATCH 020/140] =?UTF-8?q?=EB=8C=93=EA=B8=80=20=EB=AA=A9=EB=A1=9D?= =?UTF-8?q?=EC=97=90=EC=84=9C=20cpage=EA=B0=80=20=EC=97=86=EC=9C=BC?= =?UTF-8?q?=EB=A9=B4=20=EC=A0=9C=EC=9D=BC=20=EB=92=B7=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=EA=B0=80=20=EB=82=98=ED=83=80=EB=82=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=ED=95=98=EA=B3=A0=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EA=B0=80=20=EB=82=98=EB=88=A0=EC=A7=80=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EC=9C=BC=EB=A9=B4=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=EC=9D=84=20=EB=B3=B4=EC=9D=B4=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=ED=95=A8?= 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@3761 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/skins/cozy_board/comment.html | 22 +++++++++++-------- modules/board/skins/xe_board/comment.html | 6 +++-- modules/board/skins/xe_guestbook/comment.html | 6 +++-- modules/comment/comment.model.php | 5 +++-- modules/document/document.item.php | 7 ++++-- 5 files changed, 29 insertions(+), 17 deletions(-) diff --git a/modules/board/skins/cozy_board/comment.html b/modules/board/skins/cozy_board/comment.html index 604487595..25f260288 100644 --- a/modules/board/skins/cozy_board/comment.html +++ b/modules/board/skins/cozy_board/comment.html @@ -1,3 +1,5 @@ + +
{@ $_comment_list = $oDocument->getComments() } @@ -89,15 +91,17 @@
-
- {$lang->first_page} - - - {$page_no} - - {$page_no} + +
+ {$lang->first_page} + + + {$page_no} + + {$page_no} + + {$lang->last_page} +
- {$lang->last_page} -
diff --git a/modules/board/skins/xe_board/comment.html b/modules/board/skins/xe_board/comment.html index cc83bde98..d44ff06d9 100644 --- a/modules/board/skins/xe_board/comment.html +++ b/modules/board/skins/xe_board/comment.html @@ -90,17 +90,19 @@ +
{$lang->first_page} - + {$page_no} {$page_no} - {$lang->last_page} + {$lang->last_page}
+ diff --git a/modules/board/skins/xe_guestbook/comment.html b/modules/board/skins/xe_guestbook/comment.html index 6de543bfb..14c2492c5 100644 --- a/modules/board/skins/xe_guestbook/comment.html +++ b/modules/board/skins/xe_guestbook/comment.html @@ -85,17 +85,19 @@ +
{$lang->first_page} - + {$page_no} {$page_no} - {$lang->last_page} + {$lang->last_page}
+ diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php index afa7040ba..66fcfd6e0 100644 --- a/modules/comment/comment.model.php +++ b/modules/comment/comment.model.php @@ -158,7 +158,7 @@ /** * @brief document_srl에 해당하는 문서의 댓글 목록을 가져옴 **/ - function getCommentList($document_srl, $page = 1, $is_admin = false) { + function getCommentList($document_srl, $page = 0, $is_admin = false) { // 해당 문서의 모듈에 해당하는 댓글 수를 구함 $oDocumentModel = &getModel('document'); $oDocument = $oDocumentModel->getDocument($document_srl); @@ -175,7 +175,8 @@ $comment_count = $comment_config->comment_count; if(!$comment_count) $comment_count = 50; - if(!$page) !$page = 1; + // 페이지가 없으면 제일 뒤 페이지를 구함 + if(!$page) $page = (int)( ($oDocument->getCommentCount()-1) / $comment_count) + 1; // 정해진 수에 따라 목록을 구해옴 $args->document_srl = $document_srl; diff --git a/modules/document/document.item.php b/modules/document/document.item.php index 0c6854ff3..69cfbe9bf 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -375,13 +375,15 @@ if(!$this->allowComment() || !$this->getCommentCount()) return; if(!$this->isGranted() && $this->isSecret()) return; + // cpage는 댓글페이지의 번호 $cpage = Context::get('cpage'); - if(!$cpage) $cpage = 1; + // 댓글 목록을 구해옴 $oCommentModel = &getModel('comment'); $output = $oCommentModel->getCommentList($this->document_srl, $cpage, $is_admin); if(!$output->toBool() || !count($output->data)) return; + // 구해온 목록을 commentItem 객체로 만듬 $oCommentModel = &getModel('comment'); foreach($output->data as $key => $val) { $oCommentItem = new commentItem(); @@ -389,8 +391,9 @@ $comment_list[$val->comment_srl] = $oCommentItem; } - Context::set('comment_page_navigation', $output->page_navigation); + // 스킨에서 출력하기 위한 변수 설정 Context::set('cpage', $output->page_navigation->cur_page); + if($output->total_page>1) $this->comment_page_navigation = $output->page_navigation; return $comment_list; } From 6f36c54564922f2b67e41a7ab38c5447a8bfee59 Mon Sep 17 00:00:00 2001 From: zero Date: Sat, 23 Feb 2008 00:16:59 +0000 Subject: [PATCH 021/140] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3762 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/document/document.item.php | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/document/document.item.php b/modules/document/document.item.php index 69cfbe9bf..3b5f6d02d 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -384,7 +384,6 @@ if(!$output->toBool() || !count($output->data)) return; // 구해온 목록을 commentItem 객체로 만듬 - $oCommentModel = &getModel('comment'); foreach($output->data as $key => $val) { $oCommentItem = new commentItem(); $oCommentItem->setAttribute($val); From e4a5701978f7ff6e06ba4b563da585a726ef51ff Mon Sep 17 00:00:00 2001 From: zero Date: Sat, 23 Feb 2008 00:17:06 +0000 Subject: [PATCH 022/140] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3763 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/module/module.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/module/module.class.php b/modules/module/module.class.php index 849c9e639..3913b256a 100644 --- a/modules/module/module.class.php +++ b/modules/module/module.class.php @@ -51,6 +51,9 @@ // DB캐시 파일을 모두 삭제 FileHandler::removeFilesInDir("./files/cache/db"); + + // 기타 캐시 삭제 + FileHandler::removeFilesInDir("./files/cache/tmp"); } } ?> From 810fcba83c243e9954cf81805e0dc36999348474 Mon Sep 17 00:00:00 2001 From: risapapa Date: Sun, 24 Feb 2008 16:49:26 +0000 Subject: [PATCH 023/140] Added Japanese Translation(modules/board/lang/jp.lang.php). git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3764 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/lang/jp.lang.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/board/lang/jp.lang.php b/modules/board/lang/jp.lang.php index 496874e03..ba39bdc00 100644 --- a/modules/board/lang/jp.lang.php +++ b/modules/board/lang/jp.lang.php @@ -7,7 +7,7 @@ $lang->board = "掲示板"; - $lang->except_notice = "공지사항 제외"; + $lang->except_notice = "お知らせ非表示"; $lang->cmd_manage_menu = 'メニュー管理'; $lang->cmd_make_child = '下位カテゴリ追加'; @@ -22,7 +22,7 @@ $lang->expand = '拡張表示'; $lang->category_group_srls = 'グループ制限'; $lang->search_result = '検索結果'; - $lang->consultation = '상담 기능'; + $lang->consultation = '相談機能'; // ボタンに使用する用語 $lang->cmd_board_list = '掲示板リスト'; @@ -35,7 +35,7 @@ $lang->about_category_group_srls = '選択したグループのみ現在のカテゴリが見えるようになります（XMLファイルを直接閲覧すると表示されます）。'; $lang->about_layout_setup = 'ブログのレイアウトのコードを直接修正します。ウィジェットコードを好きなところに入力、又は管理して下さい。'; $lang->about_board_category = 'ブログのカテゴリを作成します。
ブログのカテゴリが誤作動する場合、「キャッシュファイルの再生性」を手動で行うことで解決できます。'; - $lang->about_except_notice = "목록 상단에 늘 나타나는 공지사항을 일반 목록에서 공지사항을 출력하지 않도록 합니다."; + $lang->about_except_notice = "リストの上段に常に表示されるお知らせの書き込みを一般リストからお知らせの書き込みが表示されないようにします。"; $lang->about_board = "掲示板の生成、および管理する掲示板モジュールです。\n生成後、リストからモジュール名を選択すると詳細な設定ができます。\n掲示板のモジュール名はURLになりますので注意してください。 (ex : http://ドメイン/zb/?mid=モジュール名)"; - $lang->about_consultation = "상담 기능은 관리권한이 없는 회원은 자신이 쓴 글만 보이도록 하는 기능입니다\n단 상담기능 사용시 비회원 글쓰기는 자동으로 금지됩니다."; + $lang->about_consultation = "相談機能は、管理権限がない会員は自分自身の書き込みのみ表示されるようにする機能です。\n但し、相談機能を使用する際は、非会員の書き込みは自動禁止されます。"; ?> From 177b325faf1a64b6908a2d322236424e3ef61a91 Mon Sep 17 00:00:00 2001 From: risapapa Date: Sun, 24 Feb 2008 16:54:29 +0000 Subject: [PATCH 024/140] Corrected Japanese Translation(modules/board/skins/xe_board/skin.xml). git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3765 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/skins/xe_board/skin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/board/skins/xe_board/skin.xml b/modules/board/skins/xe_board/skin.xml index a5058fead..90ccf753f 100644 --- a/modules/board/skins/xe_board/skin.xml +++ b/modules/board/skins/xe_board/skin.xml @@ -148,7 +148,7 @@ 설정 표시 设置表单 - ログイン設定 + 設定表示 Display Setup Muestra la información de la Configuración Y From cf35c06ab03540ad3c7f36df69c24a73bd1481ef Mon Sep 17 00:00:00 2001 From: risapapa Date: Sun, 24 Feb 2008 16:59:09 +0000 Subject: [PATCH 025/140] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3766 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/lang/jp.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/board/lang/jp.lang.php b/modules/board/lang/jp.lang.php index ba39bdc00..85dc3c536 100644 --- a/modules/board/lang/jp.lang.php +++ b/modules/board/lang/jp.lang.php @@ -7,7 +7,7 @@ $lang->board = "掲示板"; - $lang->except_notice = "お知らせ非表示"; + $lang->except_notice = "お知らせの非表示機能"; $lang->cmd_manage_menu = 'メニュー管理'; $lang->cmd_make_child = '下位カテゴリ追加'; From 29e07f1a477ce3178af74864c52ac35bffe75816 Mon Sep 17 00:00:00 2001 From: risapapa Date: Sun, 24 Feb 2008 17:12:23 +0000 Subject: [PATCH 026/140] Added Japanese Translation(common/lang/jp.lang.php). git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3767 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/lang/jp.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/lang/jp.lang.php b/common/lang/jp.lang.php index 585a49021..f9072d34c 100644 --- a/common/lang/jp.lang.php +++ b/common/lang/jp.lang.php @@ -126,7 +126,7 @@ $lang->document_count = '書き込み数'; $lang->page_count = 'ページ数'; $lang->list_count = 'リスト数'; - $lang->search_list_count = '검색 목록 수'; + $lang->search_list_count = '検索リスト数'; $lang->readed_count = '照合数'; $lang->voted_count = '推薦数'; $lang->member_count = '会員数'; From 87b9e803d5c622ffb486d698aa8821fb40de80f5 Mon Sep 17 00:00:00 2001 From: risapapa Date: Sun, 24 Feb 2008 17:17:41 +0000 Subject: [PATCH 027/140] Corrected Japanese Translation(modules/editor/lang/jp.lang.php). git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3768 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/lang/jp.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/editor/lang/jp.lang.php b/modules/editor/lang/jp.lang.php index 3abb51a8d..08bbe9d9f 100644 --- a/modules/editor/lang/jp.lang.php +++ b/modules/editor/lang/jp.lang.php @@ -34,7 +34,7 @@ $lang->enable_component_grant = 'コンポーネント使用権限'; $lang->enable_html_grant = 'HTML編集権限'; $lang->enable_autosave = '自動保存使用'; - $lang->height_resizable = '高さの調節可能'; + $lang->height_resizable = '高さの調節'; $lang->editor_height = 'エディターの高さ'; $lang->about_editor_skin = 'エディターのスキンの選択が出来ます。'; From 2cf27f7afd98e184aab30f850fbbd0b675ac5b43 Mon Sep 17 00:00:00 2001 From: risapapa Date: Sun, 24 Feb 2008 17:40:19 +0000 Subject: [PATCH 028/140] Added and Corrected Japanese Translation(modules/springnote/lang/jp.lang.php). git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3769 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/springnote/lang/jp.lang.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/springnote/lang/jp.lang.php b/modules/springnote/lang/jp.lang.php index fd6f6f1db..c9c9ed502 100644 --- a/modules/springnote/lang/jp.lang.php +++ b/modules/springnote/lang/jp.lang.php @@ -9,10 +9,10 @@ $lang->springnote_openid = "オープンID"; $lang->springnote_userkey = "ユーザーKey"; $lang->springnote_pageid = "ページ番号"; - $lang->springnote_pageid_setup = '페이지 번호 설정'; - $lang->springnote_pageid_option_only = '지정된 페이지만 보여주기 (목록 보이지 않음)'; - $lang->springnote_pageid_option_list = '지정된 페이지부터 보이기 (목록 보임)'; - $lang->springnote_domain = "도메인 지정"; + $lang->springnote_pageid_setup = 'ページ番号設定'; + $lang->springnote_pageid_option_only = '指定ページのみ表示（リスト非表示）'; + $lang->springnote_pageid_option_list = '指定ページから表示（リスト表示）'; + $lang->springnote_domain = "ドメイン指定"; $lang->page_url = "元のURL"; $lang->page_modified = "最終修正"; @@ -23,8 +23,8 @@ $lang->about_springnote = "スプリングノートは、「openmaru.com」から提供されるウィキサービスです。
スプリングノート連動モジュールは、スプリングノートの特定のページを自分のコンテンツの閲覧することができるようにするモジュールです。"; $lang->about_springnote_openid = "スプリングノートでページを作成したオープンIDを入力してください。"; - $lang->about_springnote_userkey = 'スプリングノートとの連動するためのユーザKeyを入力してください。
[ユーザーキー受信]をクリックして入力して生成されるキーの値を入力してください。'; - $lang->about_springnote_pageid = '使用するスプリングノートの中の特定ページを出力したい場合、「pageid」の値を入力してください。'; - $lang->about_springnote_pageid_setup = '設定することができます\'選択されたページのみを表示（隠すリスト） \' 、 \'ショーから選択されたページ（番組リスト） \' etcときにページ番号を設定します。'; - $lang->about_springnote_domain = 'springnote他のドメインの設定をお勧めします。 （ドメインのみを入力してくださいフォームからの\' http://domain.springnote.com \' ）'; + $lang->about_springnote_userkey = 'スプリングノートと連動させるためのユーザKeyを入力してください。
[ユーザーキー受信]をクリックして入力して生成されたキーの値を入力してください。'; + $lang->about_springnote_pageid = '使用するスプリングノートの特定ページを出力させたい場合、「pageid」の値を入力してください。'; + $lang->about_springnote_pageid_setup = 'ページ番号を指定する際に、該当ページのみ表示（リストを含まない）、該当ページから表示（リストを含む）などを指定することができます。'; + $lang->about_springnote_domain = '自分のスプリングノートではない他のドメインのスプリングノートを入力することができます（ 「http://domain.springnote.com」でドメインの値を入力してください ）。'; ?> From 837b20f6d00b6576026af314437e7fe85f68154d Mon Sep 17 00:00:00 2001 From: risapapa Date: Sun, 24 Feb 2008 18:41:29 +0000 Subject: [PATCH 029/140] Added Japanese Translation(widgets/category/conf/info.xml). git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3770 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- widgets/category/conf/info.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/widgets/category/conf/info.xml b/widgets/category/conf/info.xml index 908444e19..f0502e39f 100644 --- a/widgets/category/conf/info.xml +++ b/widgets/category/conf/info.xml @@ -4,20 +4,20 @@ 게시글 분류 출력기 게시글 분류 출력기 게시글 분류 출력기 - 게시글 분류 출력기 + 書き込みのカテゴリ表示 输出主题分类 제로 zero zero zero - zero + Zero zero 게시판등 문서모듈의 분류를 사용하는 모듈에서 분류를 추출하여 블로그 카테고리와 같이 출력하는 기능입니다. 게시판등 문서모듈의 분류를 사용하는 모듈에서 분류를 추출하여 블로그 카테고리와 같이 출력하는 기능입니다. 게시판등 문서모듈의 분류를 사용하는 모듈에서 분류를 추출하여 블로그 카테고리와 같이 출력하는 기능입니다. 게시판등 문서모듈의 분류를 사용하는 모듈에서 분류를 추출하여 블로그 카테고리와 같이 출력하는 기능입니다. - 게시판등 문서모듈의 분류를 사용하는 모듈에서 분류를 추출하여 블로그 카테고리와 같이 출력하는 기능입니다. + 掲示板など、ドキュメントモジュールのカテゴリを使用するモジュールでカテゴリを抽出してブログのカテゴリのように表示する機能です。 把论坛等文本模块的分类在使用的模块里抽出分类后输出类似于博客分类的功能。 @@ -25,7 +25,7 @@ 대상 모듈 대상 모듈 대상 모듈 - 대상 모듈 + 対象モジュール 대상 모듈 对象模块 mid_list @@ -33,7 +33,7 @@ 선택하신 모듈을 대상으로 합니다. 꼭 한개의 모듈만 선택해 주세요. 선택하신 모듈을 대상으로 합니다. 꼭 한개의 모듈만 선택해 주세요. 선택하신 모듈을 대상으로 합니다. 꼭 한개의 모듈만 선택해 주세요. - 선택하신 모듈을 대상으로 합니다. 꼭 한개의 모듈만 선택해 주세요. + 選択されたモジュールを対象とします。必ず一つのモジュールのみ選択してください。 将把被选模块当中的主题作为对象。请选择一个模块。 From 7a301ae4ec1813123d0e6a959baf4ca6abe75800 Mon Sep 17 00:00:00 2001 From: risapapa Date: Sun, 24 Feb 2008 18:46:16 +0000 Subject: [PATCH 030/140] Added Japanese Translation(widgets/category/skins/default/skin.xml). git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3771 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- widgets/category/skins/default/skin.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/widgets/category/skins/default/skin.xml b/widgets/category/skins/default/skin.xml index 7317ad2ff..3c2530e7c 100644 --- a/widgets/category/skins/default/skin.xml +++ b/widgets/category/skins/default/skin.xml @@ -1,19 +1,23 @@ 분류 출력 기본 스킨 + カテゴリ表示デフォルトスキン Default Skin of Category Widget 分类输出基本皮肤 제로 + Zero Zero Zero 게시글 분류를 출력하는 기본 스킨입니다 + 書き込みのカテゴリを表示表示させるデフォルトスキンです。 This is a widget that displays categories of articles. 输出主题分类的基本皮肤 기본 컬러 + デフォルトカラー Default Color 默认颜色 From c99fcf4052be2af851c43b71f1f78d144a08a435 Mon Sep 17 00:00:00 2001 From: risapapa Date: Sun, 24 Feb 2008 19:19:35 +0000 Subject: [PATCH 031/140] Added Japanese Translation(widgets/gagachat/conf/info.xml). git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3772 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- widgets/gagachat/conf/info.xml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/widgets/gagachat/conf/info.xml b/widgets/gagachat/conf/info.xml index b4a2fed16..41b48c7e4 100644 --- a/widgets/gagachat/conf/info.xml +++ b/widgets/gagachat/conf/info.xml @@ -1,19 +1,23 @@ 가가 채팅 + ガガチャット Gaga Chat Gaga Chat 디지레이브 + ディジレイブ Digirave Digirave 실시간 채팅방을 생성합니다 + ライブチャットボックスを生成します。 This widget created realtime chat room Este artilugio creado sala de chat en tiempo real 채팅방 이름(필수/영문) + チャットボックスの名前（必須/ローマ字） Title of Room (Essential/English only) Título de la habitación (Esenciales / Inglés solamente) text @@ -22,6 +26,11 @@ 보안 채팅방은 http://www.gagalive.kr/live/livechatxe 에서 신청하시길 바랍니다. 회원 시스템과 연동하지 않을 경우 별도의 신청 필요 없이 원하는 채팅방 이름만 입력하면 됩니다. + チャットボックスの名前 + （@, @@, @@@ で始まるチャットボックスは会員システムと連動可能なセキュリティチャットボックス） + セキュリティチャットボックスは「http://www.gagalive.kr/live/livechatxe」で申し込みできます。 + 会員システムと連動されない場合は、別当の手続きなしでチャットボックスの名前だけを入力します。 + Title of Room. (Chat room which title starts with @, @@, @@@ is a secure chat room that can be linked with member system) Please apply for secure chat room at http://www.gagalive.kr/live/livechatxe. @@ -35,38 +44,46 @@ Si los miembros del sistema no es necesario, basta con introducir el título. 채팅방 보안 키(선택사항) + チャットボックスセキュリティキー（オプション） Chat Room Security Key (Optional)) Sala de chat clave de seguridad (Opcional)) text 보안 채팅방 사용시에만 필요함. 보안 채팅방을 사용하지 않을 경우에는 빈 칸으로 놔두시길 바랍니다. + セキュリティチャットボックスを使用する時のみ必要です。使用しない場合は空欄のままにしてください。 Security Key is only necessary for secure chat rooms. In case of normal chat room, please leave it blank. Clave de seguridad sólo es necesario para garantizar las salas de chat. En caso de la sala de chat normal, por favor dejar en blanco. 채팅방 관리자(선택사항) + チャットボックス管理者（オプション） Chat Room Adminstrator (Optional) Sala de chat Administrador (Opcional) text 보안 채팅방 사용시에만 적용됨. 강제 퇴장 기능 가능함. 아이디, 아이디2, 아이디3 처럼 채팅방 관리자들을 , 로 분리하시길 바랍니다. + セキュリティチャット使用しのみ適用されます。強制退機能が使用できます。ID１、ID2、ID3のように管理者を「,」で区切ってください。 Adminstrators will be applied for secure chat rooms. Banning available. Please seperate each id with comma(,) like ID1, ID2, ID3. Adminstrators se aplicarán para garantizar las salas de chat. Se prohíben los disponibles. Por favor, separar cada id con una coma (,) como ID1, ID2, ID3. 채팅방 형태 + チャットボックスの形 Form of Chat Room Forma de la sala de chat select 세로형/가로형 + 縦型/横型 Vertical/Horizontal Vertical/Horizontal 세로형 + 縦型 Vertical Vertical 2 가로형 + 横型 Horizontal Horizontal 1 @@ -74,62 +91,75 @@ Si los miembros del sistema no es necesario, basta con introducir el título. 채팅방 높이(선택사항) + チャットボックスの高さ（オプション） Height of Chat Room (Optional) Altura de la Sala de chat (Opcional) text + 채팅방 높이(기본값 450) 채팅방 높이(기본값 450) Height of chat room (450 as default) Altura de la sala de chat (450 como valor por defecto) 글씨체(선택사항) + フォント（オプション） Font (Optional) Font (Opcional) text Font-family 예) 굴림체 + Font-family 例）Gulim Font-family ex) Gulim Font-family ex) Gulim 글씨 색깔(선택사항) + フォント色（オプション） Font Color (Optional) Font Color (Optional) text 채팅방 글씨 색깔 예) white 또는 #FFFFFF + チャットボックスのフォント色　例） white または #FFFFFF Font color of chat room ex) white or #FFFFFF Font color de la ex sala de chat) o blanco # FFFFFF 배경 색깔(선택사항) + 背景色（オプション） Background Color (Optional) Color de fondo (Opcional) text 채팅방 배경 색깔 예) black 또는 #000000 + チャットボックスの背景色　例） black または #000000 Background color of chat room ex) black or #000000 Color de fondo de la sala de chat ex) o negro # 000000 큰 글씨체 + 大きいフォント Large Font Large Font select 글씨체 크기 + フォントの大きさ Font size Font size 작은 글씨체 + 小さいフォント Small Font Small Font small 중간 글씨체 + ミディアムフォント Medium Font Medium Font medium 큰 글씨체 + 大きいフォント Large Font Large Font large From b45d7ec20fa54ea8289cd3ed2e0f02e351785757 Mon Sep 17 00:00:00 2001 From: risapapa Date: Sun, 24 Feb 2008 19:30:35 +0000 Subject: [PATCH 032/140] Added Japanese Translation(widgets/gagachat/conf/skin.xml). git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3773 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- widgets/gagachat/skins/default/skin.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/widgets/gagachat/skins/default/skin.xml b/widgets/gagachat/skins/default/skin.xml index 2d684a2fc..06d518cc7 100644 --- a/widgets/gagachat/skins/default/skin.xml +++ b/widgets/gagachat/skins/default/skin.xml @@ -1,16 +1,20 @@ 가가 채팅 기본 스킨 + ガガチャットデフォルトスキン Basic Skin of Gagachat 디지레이브 + デジレイブ디지레이브 Digirave newest_document의 기본 스킨 + 最新のドキュメントデフォルトスキン Default skin of newest document 기본 - + デフォルト + From 5cd6cff81b2b058254c1fe33388c2bac15c50265 Mon Sep 17 00:00:00 2001 From: risapapa Date: Sun, 24 Feb 2008 19:55:27 +0000 Subject: [PATCH 033/140] Added Japanese Translation file(modules/editor/components/cc_license/lang/jp.lang.php). git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3774 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- .../components/cc_license/lang/jp.lang.php | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 modules/editor/components/cc_license/lang/jp.lang.php diff --git a/modules/editor/components/cc_license/lang/jp.lang.php b/modules/editor/components/cc_license/lang/jp.lang.php new file mode 100644 index 000000000..16bee65ab --- /dev/null +++ b/modules/editor/components/cc_license/lang/jp.lang.php @@ -0,0 +1,29 @@ + 翻訳：RisaPapa + * @brief ウィジウィグエディターモジュール > CCL 表示エディターコンポーネント + **/ + + $lang->ccl_default_title = 'クリエイティブコモンズジャパン著作者表示'; + $lang->ccl_default_message = 'この著作物は%s%s%s%sに従って利用することができます。'; + + $lang->ccl_title = 'タイトル'; + $lang->ccl_use_mark = 'マーク使用'; + $lang->ccl_allow_commercial = '営利目的許可'; + $lang->ccl_allow_modification = '著作物変更許'; + + $lang->ccl_allow = '許可'; + $lang->ccl_disallow = '禁止'; + $lang->ccl_sa = '同一条件変更'; + + $lang->ccl_options = array( + 'ccl_allow_commercial' => array('Y'=>'-営利', 'N'=>'-非営利'), + 'ccl_allow_modification' => array('Y'=>'-変更許可', 'N'=>'-変更禁止', 'SA'=>'-同一条件変更許可'), + ); + + $lang->about_ccl_title = 'タイトルを表示します。空欄の場合はデフォルトのメッセージが表示されます。'; + $lang->about_ccl_use_mark = 'マークを表示するかどうかが選択できます（デフォルト：表示）。'; + $lang->about_ccl_allow_commercial = '営利目的での利用を許可するかどうかが選択できます（デフォルト：禁止）'; + $lang->about_ccl_allow_modification = '著作権の変更ができるかがどうかが許可できます（デフォルト：同一条件変更）。'; +?> From 07626d009a0bc9daa59b807f5df3965848a69d2f Mon Sep 17 00:00:00 2001 From: risapapa Date: Sun, 24 Feb 2008 19:57:19 +0000 Subject: [PATCH 034/140] Corrected Korean message(modules/editor/components/cc_license/lang/ko.lang.php). git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3775 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/components/cc_license/lang/ko.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/editor/components/cc_license/lang/ko.lang.php b/modules/editor/components/cc_license/lang/ko.lang.php index c535a447e..53c9a078a 100644 --- a/modules/editor/components/cc_license/lang/ko.lang.php +++ b/modules/editor/components/cc_license/lang/ko.lang.php @@ -19,7 +19,7 @@ $lang->ccl_options = array( 'ccl_allow_commercial' => array('Y'=>'-영리', 'N'=>'-비영리'), - 'ccl_allow_modification' => array('Y'=>'-변경금지', 'N'=>'-변경금지', 'SA'=>'-동일조건변경허락'), + 'ccl_allow_modification' => array('Y'=>'-변경허용', 'N'=>'-변경금지', 'SA'=>'-동일조건변경허락'), ); $lang->about_ccl_title = '제목을 표시합니다. 비워져 있으면 기본 메세지가 출력됩니다.'; From 0d3e2c123f3623514358930dd06bcfb2266b1a87 Mon Sep 17 00:00:00 2001 From: risapapa Date: Sun, 24 Feb 2008 19:59:13 +0000 Subject: [PATCH 035/140] Added Japanese Translation(modules/editor/components/cc_license/info.xml). git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3776 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/components/cc_license/info.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/editor/components/cc_license/info.xml b/modules/editor/components/cc_license/info.xml index c8de1201e..f8dc0d73a 100755 --- a/modules/editor/components/cc_license/info.xml +++ b/modules/editor/components/cc_license/info.xml @@ -3,20 +3,20 @@ Creative Commons Licenses Licencias Creative Commons Creative Commons Licenses - Creative Commons Licenses + クリエイティブコモンズライセンス Creative Commons Licenses Creative Commons Licenses zero zero zero - zero + Zero zero zero CCL 라이센스를 출력합니다. CCL licencia de producto CCL 라이센스를 출력합니다. - CCL 라이센스를 출력합니다. + CCLライセンスを表示します。 CCL 라이센스를 출력합니다. Output CCL license From f531ef7213697cf48f665edfb8a6f6fa5e316e13 Mon Sep 17 00:00:00 2001 From: risapapa Date: Sun, 24 Feb 2008 20:10:33 +0000 Subject: [PATCH 036/140] Added Japanese Translation(modules/importer/lang/jp.lang.php). git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3777 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/importer/lang/jp.lang.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/importer/lang/jp.lang.php b/modules/importer/lang/jp.lang.php index ca5e50281..a390d8129 100644 --- a/modules/importer/lang/jp.lang.php +++ b/modules/importer/lang/jp.lang.php @@ -13,7 +13,7 @@ $lang->importer = 'ＺＢデータ変換'; $lang->source_type = 'データ変換の対象'; $lang->type_member = '会員情報'; - $lang->type_message = '쪽지(메세지) 정보'; + $lang->type_message = 'メッセージ情報'; $lang->type_ttxml = 'TTXML'; $lang->type_module = '書き込みデータ情報'; $lang->type_syncmember = '会員情報同期化'; @@ -46,9 +46,9 @@ // Bla, Blah.. $lang->about_type_member = 'データ変換の対象が会員情報の場合は選択してください。'; - $lang->about_type_message = '데이터 이전 대상이 쪽지(메세지)일 경우 선택해주세요'; - $lang->about_type_ttxml = '데이터 이전 대상이 TTXML(textcube계열)일 경우 선택해주세요'; - $lang->about_ttxml_user_id = 'TTXML이전시에 글쓴이로 지정할 사용자 아이디를 입력해주세요. (이미 가입된 아이디여야 합니다)'; + $lang->about_type_message = 'データ移転対象がメッセージの場合選択してください。'; + $lang->about_type_ttxml = 'データ移転対象が、TTXML(textcube系列)の場合選択してください。'; + $lang->about_ttxml_user_id = 'TTXML移転時に投稿者として指定するユーザIDを入力してください（すでに加入されているIDでなければなりません）。'; $lang->about_type_module = 'データ変換の対象が書き込みデータである場合は選択してください。'; $lang->about_type_syncmember = '会員情報と書き込みデータなどの変換を行った後、会員情報を同期化する必要がある場合は、選択してください。'; $lang->about_importer = "ゼロボード4、zb5betaまたは他のプログラムの書き込みデータをゼロボードXEのデータに変換することができます。\n変換するためには、XML Exporterを利用して変換したい書き込みデータをXMLファイルで作成してアップロードしてください。"; From dafdff579cc9a86a8a9f4e8f91c778b89214f359 Mon Sep 17 00:00:00 2001 From: risapapa Date: Sun, 24 Feb 2008 20:58:10 +0000 Subject: [PATCH 037/140] Corrected Japanese Translation(common/lang/jp.lang.php). git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3778 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/lang/jp.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/lang/jp.lang.php b/common/lang/jp.lang.php index f9072d34c..26b482ac1 100644 --- a/common/lang/jp.lang.php +++ b/common/lang/jp.lang.php @@ -108,7 +108,7 @@ $lang->path = 'パス'; $lang->cart = '選択項目'; $lang->friend = '友達'; - $lang->notify = 'アラット'; + $lang->notify = 'アラート'; $lang->mid = 'モジュール名'; $lang->layout = 'レイアウト'; From bc6d5911bd8bff57f8779aee190707ffa0d286db Mon Sep 17 00:00:00 2001 From: risapapa Date: Sun, 24 Feb 2008 21:03:03 +0000 Subject: [PATCH 038/140] Modified Japanese Translation(modules/document/lang/jp.lang.php). git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3779 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/document/lang/jp.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/document/lang/jp.lang.php b/modules/document/lang/jp.lang.php index 1f7292cd4..c347b2a50 100644 --- a/modules/document/lang/jp.lang.php +++ b/modules/document/lang/jp.lang.php @@ -11,7 +11,7 @@ $lang->thumbnail_ratio = '比率に合わせる'; $lang->cmd_delete_all_thumbnail = 'すべてのサムネール削除'; $lang->title_bold = 'タイトル太字'; - $lang->title_color = 'タイトル文字色'; + $lang->title_color = 'タイトル色'; $lang->cmd_search_next = '継続検索'; From 84aa5e95d90a1fe49be17540a26ce7cf46685ab5 Mon Sep 17 00:00:00 2001 From: risapapa Date: Sun, 24 Feb 2008 21:05:15 +0000 Subject: [PATCH 039/140] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3780 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/document/lang/jp.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/document/lang/jp.lang.php b/modules/document/lang/jp.lang.php index c347b2a50..0f2043a52 100644 --- a/modules/document/lang/jp.lang.php +++ b/modules/document/lang/jp.lang.php @@ -11,7 +11,7 @@ $lang->thumbnail_ratio = '比率に合わせる'; $lang->cmd_delete_all_thumbnail = 'すべてのサムネール削除'; $lang->title_bold = 'タイトル太字'; - $lang->title_color = 'タイトル色'; + $lang->title_color = 'タイトルの色'; $lang->cmd_search_next = '継続検索'; From abfacf1dff076e9246ac420460f94b4f10e05129 Mon Sep 17 00:00:00 2001 From: duvent Date: Mon, 25 Feb 2008 00:01:15 +0000 Subject: [PATCH 040/140] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3781 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/lang/fr.lang.php | 298 ++++++++++++++++++++-------------------- 1 file changed, 150 insertions(+), 148 deletions(-) diff --git a/common/lang/fr.lang.php b/common/lang/fr.lang.php index 42586c1a3..c6ceb804e 100644 --- a/common/lang/fr.lang.php +++ b/common/lang/fr.lang.php @@ -2,7 +2,7 @@ /** * @file common/lang/fr.lang.php * @author zero (zero@nzeo.com) - * @brief Paquet Francais de Langue (mots de base seulement) + * @brief Paquet de La Langue Francaise(mots de base seulement) **/ // verbes et mots de base decrivant des actions @@ -12,229 +12,231 @@ $lang->cmd_modify = 'Modifier'; $lang->cmd_edit = 'Editer'; $lang->cmd_view = 'Voir'; - $lang->cmd_view_all = 'Voir Tout'; + $lang->cmd_view_all = 'Voir Tous'; $lang->cmd_list = 'Liste'; - $lang->cmd_prev = 'Précédent '; - $lang->cmd_next = 'Après'; - $lang->cmd_send_trackback = 'Envoyer Trackback'; - $lang->cmd_registration = $lang->cmd_submit = 'Soumettre'; - $lang->cmd_comment_registration = 'Ajouter le Commentaire'; + $lang->cmd_prev = 'Précédent'; + $lang->cmd_next = 'Suivant'; + $lang->cmd_send_trackback = 'Envoyer Rétrolien'; + $lang->cmd_registration = $lang->cmd_submit = 'Enrégistrer'; + $lang->cmd_comment_registration = 'Ajouter un Commentaire'; $lang->cmd_insert = 'Insérer'; - $lang->cmd_save = 'Economiser'; - $lang->cmd_load = 'Télécharger'; + $lang->cmd_save = 'Conserver'; + $lang->cmd_load = 'Charger'; $lang->cmd_input = 'Entrer'; $lang->cmd_search = 'Rechercher'; - $lang->cmd_cancel = 'Decommander'; - $lang->cmd_back = 'Retour'; - $lang->cmd_vote = 'Voter'; - $lang->cmd_vote_down = '비추천'; - $lang->cmd_declare = '신고'; - $lang->cmd_cancel_declare = '신고 취소'; - $lang->cmd_declared_list = '신고 목록'; - $lang->cmd_copy = 'Copie'; - $lang->cmd_move = 'Deplacer'; - $lang->cmd_move_up = 'Relever'; - $lang->cmd_move_down = 'Abaisser'; - $lang->cmd_add_indent = 'Ajouter le Creux'; - $lang->cmd_remove_indent = 'Enlever le Creux'; - $lang->cmd_management = 'Gestion'; - $lang->cmd_make = 'Creer'; + $lang->cmd_cancel = 'Annuler'; + $lang->cmd_back = 'Retourner'; + $lang->cmd_vote = 'Recommander'; + $lang->cmd_vote_down = 'Critiquer'; + $lang->cmd_declare = 'Accuser'; + $lang->cmd_cancel_declare = 'Annuler l\'Accusation'; + $lang->cmd_declared_list = 'Liste de l\'Accusation'; + $lang->cmd_copy = 'Copier'; + $lang->cmd_move = 'Bouger'; + $lang->cmd_move_up = 'En haut'; + $lang->cmd_move_down = 'En bas'; + $lang->cmd_add_indent = 'Ajouter un Rentré'; + $lang->cmd_remove_indent = 'Enlever un Rentré'; + $lang->cmd_management = 'Administration'; + $lang->cmd_make = 'Créer'; $lang->cmd_select = 'Choisir'; $lang->cmd_select_all = 'Choisir Tous'; - $lang->cmd_unselect_all = 'Ne pas Selectionner Tous'; - $lang->cmd_close_all = 'Cloturer Tous'; + $lang->cmd_unselect_all = 'Annuler Tous'; + $lang->cmd_reverse_all = 'Renverser la Sélection'; + $lang->cmd_close_all = 'Fermer Tous'; $lang->cmd_open_all = 'Ouvrir Tous'; $lang->cmd_reload = 'Recharger'; $lang->cmd_close = 'Fermer'; - $lang->cmd_open = 'Cloturer'; + $lang->cmd_open = 'Ouvrir'; $lang->cmd_setup = 'Configurer'; - $lang->cmd_addition_setup = '추가 설정'; + $lang->cmd_addition_setup = 'Configuration Additionnelle'; $lang->cmd_option = 'Option'; $lang->cmd_apply = 'Appliquer'; - $lang->cmd_open_calendar = 'Choisir la Date'; + $lang->cmd_open_calendar = 'Choisir un Jour'; $lang->cmd_send = 'Envoyer'; $lang->cmd_print = 'Imprimer'; - $lang->cmd_scrap = '스크랩'; - $lang->cmd_preview = '미리 보기'; - $lang->cmd_reset = '초기화'; - $lang->cmd_remake_cache = "캐시파일 재생성"; - $lang->cmd_publish = "발행"; - $lang->cmd_layout_setup = '레이아웃 설정'; - $lang->cmd_layout_edit = '레이아웃 편집'; + $lang->cmd_scrap = 'Coupure'; + $lang->cmd_preview = 'Avant-première'; + $lang->cmd_reset = 'Restaurer'; + $lang->cmd_remake_cache = "Recréer le Fichier cache"; + $lang->cmd_publish = "Publier"; + $lang->cmd_layout_setup = 'Configurer la Mise en page'; + $lang->cmd_layout_edit = 'Editer la Mise en page'; - $lang->enable = 'Permettre'; - $lang->disable = 'Neutraliser'; + $lang->enable = 'Valider'; + $lang->disable = 'Invalider'; // Mots essentiels - $lang->no = 'numéro'; - $lang->notice = 'Notification'; + $lang->no = 'Numéro'; + $lang->notice = 'Remarque'; $lang->secret = 'Secret'; - $lang->category = $lang->category_srl = 'Categorie'; - $lang->document_srl = 'numéro du Document'; - $lang->user_id = 'Pseudo'; + $lang->category = $lang->category_srl = 'Catégorie'; + $lang->document_srl = 'Numéro du Document'; + $lang->user_id = 'Compte d\'Utilisateur'; $lang->author = 'Auteur'; $lang->password = 'Mot de Passe'; $lang->password1 = 'Mot de Passe'; $lang->password2 = 'Confirmer le Mot de Passe'; - $lang->admin_id = 'Pseudo d\'Administrateur'; + $lang->admin_id = 'Compte d\'Administrateur'; $lang->writer = 'Auteur'; $lang->user_name = 'Nom d\'utilisateur'; $lang->nick_name = 'Surnom'; - $lang->email_address = 'E-mail'; - $lang->homepage = 'Site Web'; - $lang->blog = 'Blog'; + $lang->email_address = 'Courriel'; + $lang->homepage = 'Page d\'accueil'; + $lang->blog = 'Blogue'; $lang->birthday = 'Anniversaire'; $lang->browser_title = 'Titre de Navigateur'; $lang->title = 'Titre'; $lang->title_content = 'Titre + Contenu'; - $lang->topic = '주제'; - $lang->replies = '응답'; + $lang->topic = 'Sujet'; + $lang->replies = 'Répondse'; $lang->content = 'Contenu'; $lang->document = 'Article'; $lang->comment = 'Commentaire'; $lang->description = 'Description'; - $lang->trackback = 'Trackback'; - $lang->tag = 'Tag'; - $lang->allow_comment = 'Permettre les Commentaires'; - $lang->lock_comment = 'Rejeter les Commentaires'; - $lang->allow_trackback = 'Permettre la Trackback'; - $lang->uploaded_file = 'Dossier Téléchargé'; - $lang->grant = 'Autorité'; + $lang->trackback = 'Rétrolien'; + $lang->tag = 'Balise'; + $lang->allow_comment = 'Permettre Commentaires'; + $lang->lock_comment = 'Bloquer Commentaires'; + $lang->allow_trackback = 'Permettre Rétrolien'; + $lang->uploaded_file = 'Fichier Attaché'; + $lang->grant = 'Permission'; $lang->target = 'Cible'; $lang->total = 'Total'; - $lang->total_count = 'Comptage Total'; - $lang->ipaddress = 'IP Address'; + $lang->total_count = 'Somme'; + $lang->ipaddress = 'Address IP'; $lang->path = 'Chemin'; $lang->cart = 'Article Choisi'; $lang->friend = 'Les Amis'; + $lang->notify = 'Annoncer'; - $lang->mid = 'Titre de Module'; - $lang->layout = 'Disposition'; + $lang->mid = 'Nom de Module'; + $lang->layout = 'Mise en Page'; $lang->widget = 'Widget'; $lang->module = 'Module'; $lang->skin = 'Thème'; $lang->colorset = 'Arrangement de couleur'; $lang->extra_vars = 'Variables Supplementaires'; - $lang->document_url = 'URL du Document'; - $lang->trackback_url = 'URL de la Trackback'; - $lang->blog_name = 'Nom du Blog'; - $lang->excerpt = 'Citation'; + $lang->document_url = 'Document URL'; + $lang->trackback_url = 'Rétrolien URL'; + $lang->blog_name = 'Nom du Blogue'; + $lang->excerpt = 'Extrait'; - $lang->document_count = 'Nombre Total des Articles'; - $lang->page_count = 'Nombre de Pages'; - $lang->list_count = 'Nombre de Listes'; - $lang->search_list_count = '검색 목록 수'; - $lang->readed_count = 'Nombre de Fois Lues'; - $lang->voted_count = 'Nombre de Voix'; - $lang->member_count = 'Nombre de Membres'; - $lang->date = 'Date'; - $lang->regdate = 'Date d\'Enregistrement'; - $lang->last_update = 'La Dernière Mise a Jour'; - $lang->last_post = '최근 등록'; - $lang->signup_date = 'Date d\'Enregistrement'; - $lang->last_login = 'La Dernière Ouverture'; + $lang->document_count = 'Somme des Articles'; + $lang->page_count = 'Somme de Pages'; + $lang->list_count = 'Somme de Listes'; + $lang->search_list_count = 'Somme de Liste des recherches'; + $lang->readed_count = 'Somme de Vues'; + $lang->voted_count = 'Somme de Recommandations'; + $lang->member_count = 'Somme de Membres'; + $lang->date = 'Jour'; + $lang->regdate = 'Jour d\'Enrégistrement'; + $lang->last_update = 'La Dernière Mise à Jour'; + $lang->last_post = 'Dernière Affichage'; + $lang->signup_date = 'Jour de s\'inscrire'; + $lang->last_login = 'Dernière connexion'; $lang->first_page = 'Première Page'; $lang->last_page = 'Dernière Page'; - $lang->search_target = 'Cible de Recherche'; - $lang->search_keyword = 'Mot-clé de Recherche'; - $lang->is_default = 'défaut'; + $lang->search_target = 'Cible à Rechercher'; + $lang->search_keyword = 'Mot-clé à Recherche'; + $lang->is_default = 'Par Défaut'; - $lang->no_documents = 'Aucunes Entrées'; + $lang->no_documents = 'Aucune Fiche'; - $lang->board_manager = 'Arrangements des Conseils'; + $lang->board_manager = 'Arrangements des Tableaux d\'Affichage'; $lang->member_manager = 'Arrangements des Membres'; - $lang->layout_manager = 'Arrangements de Dispositions'; + $lang->layout_manager = 'Arrangements de Mise en Page'; $lang->use = 'Utiliser'; - $lang->notuse = 'Ne pas Utiliser'; + $lang->notuse = 'Ne Pas Utiliser'; $lang->not_exists = 'n\'Existe Pas'; $lang->public = 'public'; - $lang->private = 'private'; + $lang->private = 'privé'; - $lang->unit_sec = 'sec'; - $lang->unit_min = 'min'; - $lang->unit_hour = 'heur'; + $lang->unit_sec = 'seconde'; + $lang->unit_min = 'minute'; + $lang->unit_hour = 'heure'; $lang->unit_day = 'jour'; $lang->unit_week = 'semaine'; $lang->unit_month = 'mois'; $lang->unit_year = 'année';; // Descriptions et information - $lang->about_tag = 'Quand l\'insertion des tags, insérent une virgule(,) entre chaque tags te permet d\'entrer les tags multiples.'; - $lang->about_layout = 'es dispositions décorent l\'aspect d\'un module. Vous pouvez les configurer du menu de disposition ci-dessus.'; + $lang->about_tag = 'Vous pouvez enrégistrer plusieurs tags en utilisant ,(virgule) entre chaque tag'; + $lang->about_layout = 'Le Mise en Page décore l\'apparence des modules. Vous pouvez les configurer avec le menu de Mise en Page en haut'; // Messages et alertes - $lang->msg_call_server = 'En demandant le serveur pour information, attendre svp.'; - $lang->msg_db_not_setted = 'Les informations de DB n\'ont pas été placees.'; - $lang->msg_invalid_queryid = 'La valeur indiquee d\'identification de question est inadmissi.'; - $lang->msg_not_permitted = 'Vous n\'etes pas autorises a continuer.'; + $lang->msg_call_server = 'En demandant sur le serveur, attendez svp.'; + $lang->msg_db_not_setted = 'La configuration de DB n\'est pas été établie.'; + $lang->msg_invalid_queryid = 'La valeur spécifiée de query ID est invalide.'; + $lang->msg_not_permitted = 'Vous n\'avez pas le droit d\'accès.'; $lang->msg_input_password = 'Veuillez entrer votre mot de passe.'; - $lang->msg_invalid_document = 'Vous avez demandé pour un article inadmissible.'; - $lang->msg_invalid_request = 'Votre demande est inadmissible.'; - $lang->msg_invalid_password = 'Vous avez entré un mot de passe inadmissible.'; - $lang->msg_error_occured = 'Une erreur s\'est produite.'; - $lang->msg_not_founded = 'La cible demandée n\'a pas pu être trouvée.'; - $lang->msg_no_result = 'Aucun Resultat'; + $lang->msg_invalid_document = 'Nombre invalide d\'affichage'; + $lang->msg_invalid_request = 'Requête invalide'; + $lang->msg_invalid_password = 'Mot de passe invalide'; + $lang->msg_error_occured = 'Une erreur a lieu'; + $lang->msg_not_founded = 'La cible n\'est pas trouvée.'; + $lang->msg_no_result = 'Aucun Résultat'; - $lang->msg_not_permitted_act = 'Vous n\'êtes pas autorisés pour exécuter l\'action priée.'; - $lang->msg_module_is_not_exists = 'Le module demandé n\'a pas pu être trouvé.'; + $lang->msg_not_permitted_act = 'Vous n\'êtes pas autorisés à exécuter l\'action que vous demandez.'; + $lang->msg_module_is_not_exists = 'Le module demandé n\'a pas été trouvé.'; $lang->msg_module_is_not_standalone = 'Le module demandé ne peut pas être exécuté indépendamment.'; - $lang->success_registed = 'L\'enregistrement a été avec succès exécuté.'; - $lang->success_declared = '신고되었습니다'; - $lang->success_updated = 'Avec succès mis a jour.'; - $lang->success_deleted = 'Avec succès supprime'; - $lang->success_voted = 'Avec succès voté'; - $lang->success_moved = 'Avec succès deplacé'; - $lang->success_sended = 'Avec succès envoyé'; - $lang->success_reset = 'Avec succès remisé'; - $lang->success_leaved = 'Avec succès fait cécession'; - $lang->success_saved = '저장되었습니다'; + $lang->success_registed = 'Enregistré avec succès'; + $lang->success_declared = 'Accusé avec succès'; + $lang->success_updated = 'Mise a jour avec succès'; + $lang->success_deleted = 'Supprimé avec succès'; + $lang->success_voted = 'Voté avec succès'; + $lang->success_moved = 'Bougé avec succès'; + $lang->success_sended = 'Envoyé avec succès'; + $lang->success_reset = 'Restauré avec succès'; + $lang->success_leaved = 'Toutes vos informations sont complètement supprimés'; + $lang->success_saved = 'Conservé avec succès'; $lang->fail_to_delete = 'N\'a pas pu être supprimé.'; - $lang->fail_to_move = 'N\'a pas pu être déplacé'; + $lang->fail_to_move = 'N\'a pas pu être bougé'; - $lang->failed_voted = 'La demande de voter a échoué'; - $lang->failed_declared = '신고를 하실 수 없습니다'; - $lang->fail_to_delete_have_children = 'Une ou plusieurs reponses existent et ne pourraient pas être supprimees ainsi'; + $lang->failed_voted = 'N\'a pas pu recommander'; + $lang->failed_declared = 'N\'a pas pu accuser'; + $lang->fail_to_delete_have_children = 'Essayez encore après avoir suprimé les reponses, SVP'; - $lang->confirm_submit = 'Etes-vous sur vous voulez-vous soumettre?'; - $lang->confirm_logout = 'Etes-vous sur vous voulez-vous se deconnecter?'; - $lang->confirm_vote = 'Etes-vous sur vous voulez-vous voter?'; - $lang->confirm_delete = 'Etes-vous sur vous voulez-vous supprimer?'; - $lang->confirm_move = 'Etes-vous sur vous voulez-vous deplacer ceci?'; - $lang->confirm_reset = 'Etes-vous sur vous voulez-vous remettre a zero ceci?'; - $lang->confirm_leave = 'Etes-vous sur vous voulez-vous partir?'; + $lang->confirm_submit = 'Vous voulez sûrement soumettre?'; + $lang->confirm_logout = 'Vous voulez sûrement fermer la session?'; + $lang->confirm_vote = 'Vous voulez recommander?'; + $lang->confirm_delete = 'Vous voulez sûrement supprimer?'; + $lang->confirm_move = 'Vous voulez sûrement bouger?'; + $lang->confirm_reset = 'Vous voulez sûrement restaurer?'; + $lang->confirm_leave = 'Vous voulez sûrement supprimer votre compte?'; - $lang->column_type = 'Type de Colonne'; - $lang->column_type_list['text'] = 'un-ligne texte'; - $lang->column_type_list['homepage'] = 'url'; - $lang->column_type_list['email_address'] = 'e-mail'; - $lang->column_type_list['tel'] = 'numéro de telephone'; - $lang->column_type_list['textarea'] = 'secteur multiligne des textes'; - $lang->column_type_list['checkbox'] = 'boite de controle (choix multiple)'; - $lang->column_type_list['select'] = 'boite choisie (choix simple)'; - $lang->column_type_list['kr_zip'] = 'code postal (coréen)'; - $lang->column_type_list['date'] = 'date (yyyy/mm/dd)'; + $lang->column_type = 'Types des colonnes'; + $lang->column_type_list['text'] = 'Texte en une seul ligne'; + $lang->column_type_list['homepage'] = 'URL'; + $lang->column_type_list['email_address'] = 'Courriel'; + $lang->column_type_list['tel'] = 'Numéro de Telephone'; + $lang->column_type_list['textarea'] = 'Texte en plusieurs lignes'; + $lang->column_type_list['checkbox'] = 'Case à cocher (multichoix)'; + $lang->column_type_list['select'] = 'Case d\'option (seul choix)'; + $lang->column_type_list['kr_zip'] = 'Code postal (coréen)'; + $lang->column_type_list['date'] = 'Jour (yyyy/mm/dd)'; //$lang->column_type_list['jp_zip'] = 'code postal (japonais)'; - $lang->column_name = 'Nom de colonne'; - $lang->column_title = 'Titre de colonne'; + $lang->column_name = 'Nom de la colonne'; + $lang->column_title = 'Titre de la colonne'; $lang->default_value = 'Valeur par défaut'; $lang->is_active = 'Actif'; - $lang->is_required = 'Champ requis'; + $lang->is_required = 'Champ obligatoire'; - // Messages alertes pour le Javascript a l'aide des filtres de XML - $lang->filter->isnull = 'Entrer une valeur pour %s'; - $lang->filter->outofrange = 'Aligner la longueur des textes de %s'; - $lang->filter->equalto = "La valeur de %s est inadmissible."; - $lang->filter->invalid_email = "La format de %s est inadmissible. ex) zbxe@zeroboard.com"; - $lang->filter->invalid_user_id = $lang->filter->invalid_userid = "La format de %s est inadmissible.\\nToutes les valeurs devraient se composer des alphabets, des nombres ou du soulignage (_) avec la premiere lettre etant un caractere de l'alphabet."; - $lang->filter->invalid_homepage = "La format de %s est inadmissible. ex) http://www.zeroboard.com"; - $lang->filter->invalid_korean = "La format de %s est inadmissible. On permet seulement le coréen"; - $lang->filter->invalid_korean_number = "La format de %s est inadmissible. Svp caracteres ou nombres coréens d'entrée seulement."; - $lang->filter->invalid_alpha = "La format de %s est inadmissible. Svp alphabets d'entrée seulement."; - $lang->filter->invalid_alpha_number = "La format de %s est inadmissible. Svp alphabets ou nombres d'entrée seulement."; - $lang->filter->invalid_number = "La format de %s est inadmissible. Svp l'entrée numérote seulement."; + // Messages d\'alerte de le Javascript qui est utilisé dans les filtres en XML + $lang->filter->isnull = 'Entrez une valeur pour %s'; + $lang->filter->outofrange = 'Aligner la longueur du texte de %s'; + $lang->filter->equalto = "La valeur de %s est invalide."; + $lang->filter->invalid_email = "Le format de %s est invalide. ex) zbxe@zeroboard.com"; + $lang->filter->invalid_user_id = $lang->filter->invalid_userid = "La format de %s n\'est pas convenable.\\nToutes les lettres devraient se composer des alphabets, des nombres ou du soulignage(_) Et la première lettre doit être un des alphabet."; + $lang->filter->invalid_homepage = "La format de %s n\'est pas convenable. ex) http://www.zeroboard.com"; + $lang->filter->invalid_korean = "La format de %s n\'est pas convenable. Entrez seulement en coréen, SVP"; + $lang->filter->invalid_korean_number = "La format de %s n\'est pas convenable. Entrez seulement en alphabet coréen ou en nombres, SVP."; + $lang->filter->invalid_alpha = "La format de %s n\'est pas convenable. Entrez seulement en alphabet, SVP."; + $lang->filter->invalid_alpha_number = "La format de %s n\'est pas convenable. Entrez seulement en alphabet ou en nombres."; + $lang->filter->invalid_number = "La format de %s n\'est pas convenable. Entrez seulement en numéros."; ?> From c48762e43fde5924be81b03a1073ad3613d40e1e Mon Sep 17 00:00:00 2001 From: duvent Date: Mon, 25 Feb 2008 00:03:47 +0000 Subject: [PATCH 041/140] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3782 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/lang/lang.info | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/lang/lang.info b/common/lang/lang.info index bd717093c..c036521a0 100644 --- a/common/lang/lang.info +++ b/common/lang/lang.info @@ -1,6 +1,7 @@ -ko,한국어 +ko,한국어 en,English zh-CN,中文 jp,日本語 es,Español -ru,Русский \ No newline at end of file +ru,Русский +fr,français \ No newline at end of file From 50a12759ca06b633a586554aec7cd04f22da7406 Mon Sep 17 00:00:00 2001 From: rokmcssu Date: Mon, 25 Feb 2008 10:45:27 +0000 Subject: [PATCH 042/140] =?UTF-8?q?#425=20UPDATE=EC=97=90=20=EC=A4=91?= =?UTF-8?q?=EB=B3=B5=20=EC=BB=AC=EB=9F=BC=20=EC=84=A4=EC=A0=95=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=EB=A5=BC=20DB=20=EB=AA=A8=EB=93=88=EC=97=90=EC=84=9C?= =?UTF-8?q?=20=EC=9D=BC=EB=8B=A8=20=EB=B3=B4=EC=99=84=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95=ED=95=A9=EB=8B=88=EB=8B=A4?= 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@3783 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/db/DBCubrid.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php index f25f47613..2a94d2c4e 100644 --- a/classes/db/DBCubrid.class.php +++ b/classes/db/DBCubrid.class.php @@ -464,6 +464,10 @@ if(!isset($val['value'])) continue; $name = $val['name']; $value = $val['value']; + for ($i = 0; $i < $key; $i++) { // 한문장에 같은 속성에 대한 중복 설정은 큐브리드에서는 허용치 않음 + if ($output->columns[$i]['name'] == $name) break; + } + if ($i < $key) continue; // 중복이 발견되면 이후의 설정은 무시 if(strpos($name,'.')!==false&&strpos($value,'.')!==false) $column_list[] = $name.' = '.$value; else { if($output->column_type[$name]!='number') { From 9920a6fdff4989ca23614089abf2998a06f1c578 Mon Sep 17 00:00:00 2001 From: zero Date: Mon, 25 Feb 2008 10:49:41 +0000 Subject: [PATCH 043/140] =?UTF-8?q?=ED=94=84=EB=9E=91=EC=8A=A4=EC=96=B4=20?= =?UTF-8?q?=EB=B0=8F=20=EC=96=B8=EC=96=B4=20=EC=A0=95=EB=B3=B4=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=A0=9C=EC=9D=BC=20=EC=95=9E=EC=9D=98=20=ED=8A=B9?= =?UTF-8?q?=EC=88=98=EB=AC=B8=EC=9E=90=20=EC=A0=9C=EA=B1=B0?= 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@3784 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/lang/fr.lang.php | 2 +- common/lang/lang.info | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/lang/fr.lang.php b/common/lang/fr.lang.php index c6ceb804e..80f83980d 100644 --- a/common/lang/fr.lang.php +++ b/common/lang/fr.lang.php @@ -1,4 +1,4 @@ - Date: Mon, 25 Feb 2008 12:04:22 +0000 Subject: [PATCH 044/140] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3785 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/addon/lang/fr.lang.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/addon/lang/fr.lang.php b/modules/addon/lang/fr.lang.php index 5cf0ede9b..9a15cdd3b 100644 --- a/modules/addon/lang/fr.lang.php +++ b/modules/addon/lang/fr.lang.php @@ -2,14 +2,16 @@ /** * @file fr.lang.php * @author zero (zero@nzeo.com) - * @brief Paquet Francais de Langue + * @brief Paquet de la Langue francaise **/ - $lang->addon = "Additions"; + $lang->addon = "Compagnon"; - $lang->addon_info = 'Un resume de ce additions'; - $lang->addon_maker = 'Le createur de ce additions'; - $lang->addon_history = 'L\'histoire de ce additions'; + $lang->addon_info = 'Un rsum de la Compagnon'; + $lang->addon_maker = 'L\'Auteur de la Compagnon'; + $lang->addon_history = 'L\'histoire de la Compagnon'; - $lang->about_addon = 'Les operations de service de additions plutot que le HTML reel results.
Simply basculant n\'importe quel additions te permet en marche et en arret d\'employer les dispositifs utiles.'; + $lang->about_addon = 'La Compagnon contrle les actions plutt d\'imprimer des rsultats de HTML.
Seulement par touche bascule des compagnons que vous voulez faire marcher ou arrter, vous pouvez appliquer les fonctions trs utiles pour administrer votre site web.'; ?> + + From ff721dbd27718f91d26b8902abc11d01577e76f4 Mon Sep 17 00:00:00 2001 From: zero Date: Mon, 25 Feb 2008 13:03:55 +0000 Subject: [PATCH 045/140] =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EA=B2=8C=EC=8B=9C?= =?UTF-8?q?=ED=8C=90=20=EC=8A=A4=ED=82=A8=EC=97=90=EC=84=9C=20=EB=8C=93?= =?UTF-8?q?=EA=B8=80=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=B3=80=EC=88=98?= =?UTF-8?q?=EA=B0=80=20=EB=94=B0=EB=9D=BC=EB=8B=A4=EB=8B=88=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= 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@3786 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/skins/cozy_board/style.gallery.html | 6 +++--- modules/board/skins/cozy_board/style.list.html | 4 ++-- modules/board/skins/cozy_board/style.webzine.html | 8 ++++---- modules/board/skins/xe_board/style.blog.html | 2 +- modules/board/skins/xe_board/style.forum.html | 4 ++-- modules/board/skins/xe_board/style.gallery.html | 6 +++--- modules/board/skins/xe_board/style.list.html | 4 ++-- modules/board/skins/xe_board/style.webzine.html | 8 ++++---- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/board/skins/cozy_board/style.gallery.html b/modules/board/skins/cozy_board/style.gallery.html index c1da2b373..c41509ba9 100644 --- a/modules/board/skins/cozy_board/style.gallery.html +++ b/modules/board/skins/cozy_board/style.gallery.html @@ -62,7 +62,7 @@ {$category_list[$document->get('category_srl')]->title} - {$document->getTitle($module_info->subject_cut_size)} + {$document->getTitle($module_info->subject_cut_size)} {$document->getCommentCount()} @@ -98,7 +98,7 @@
- + @@ -112,7 +112,7 @@ isCarted())-->checked="checked" /> - {$document->getTitle($module_info->subject_cut_size)} + {$document->getTitle($module_info->subject_cut_size)} ({$document->getCommentCount()}) diff --git a/modules/board/skins/cozy_board/style.list.html b/modules/board/skins/cozy_board/style.list.html index 3a7b99499..f287725d8 100644 --- a/modules/board/skins/cozy_board/style.list.html +++ b/modules/board/skins/cozy_board/style.list.html @@ -55,7 +55,7 @@ {$category_list[$document->get('category_srl')]->title}
- {$document->getTitle($module_info->subject_cut_size)} + {$document->getTitle($module_info->subject_cut_size)} [R{$document->getCommentCount()}] @@ -84,7 +84,7 @@ {$category_list[$document->get('category_srl')]->title}
- {$document->getTitle($module_info->subject_cut_size)} + {$document->getTitle($module_info->subject_cut_size)} [R{$document->getCommentCount()}] diff --git a/modules/board/skins/cozy_board/style.webzine.html b/modules/board/skins/cozy_board/style.webzine.html index 889039f65..cd58bc99c 100644 --- a/modules/board/skins/cozy_board/style.webzine.html +++ b/modules/board/skins/cozy_board/style.webzine.html @@ -56,7 +56,7 @@ {$category_list[$document->get('category_srl')]->title}
- {$document->getTitle($module_info->subject_cut_size)} + {$document->getTitle($module_info->subject_cut_size)} [R{$document->getCommentCount()}] @@ -87,13 +87,13 @@ {$category_list[$document->get('category_srl')]->title} - +
- {$document->getTitle($module_info->subject_cut_size)} + {$document->getTitle($module_info->subject_cut_size)} [R{$document->getCommentCount()}] @@ -122,7 +122,7 @@ - {$document->getSummary(120)} + {$document->getSummary(120)}   diff --git a/modules/board/skins/xe_board/style.blog.html b/modules/board/skins/xe_board/style.blog.html index 35c1d3544..ca991f04d 100644 --- a/modules/board/skins/xe_board/style.blog.html +++ b/modules/board/skins/xe_board/style.blog.html @@ -26,7 +26,7 @@
[{$document->getRegdate("Y-m-d")}] - {$document->getTitle()} + {$document->getTitle()} {$document->getCommentCount()} diff --git a/modules/board/skins/xe_board/style.forum.html b/modules/board/skins/xe_board/style.forum.html index 36959a100..32775645b 100644 --- a/modules/board/skins/xe_board/style.forum.html +++ b/modules/board/skins/xe_board/style.forum.html @@ -74,7 +74,7 @@ - {$lang->notice} | {$document->getTitle($module_info->subject_cut_size)} + {$lang->notice} | {$document->getTitle($module_info->subject_cut_size)} {$document->printExtraImages(60*60*$module_info->duration_new)} @@ -114,7 +114,7 @@ - {$document->getTitle($module_info->subject_cut_size)} + {$document->getTitle($module_info->subject_cut_size)} {$document->printExtraImages(60*60*$module_info->duration_new)} diff --git a/modules/board/skins/xe_board/style.gallery.html b/modules/board/skins/xe_board/style.gallery.html index 7b29c1dd2..fe10cbf28 100644 --- a/modules/board/skins/xe_board/style.gallery.html +++ b/modules/board/skins/xe_board/style.gallery.html @@ -61,7 +61,7 @@ {$category_list[$document->get('category_srl')]->title} - {$document->getTitle($module_info->subject_cut_size)} + {$document->getTitle($module_info->subject_cut_size)} {$document->getCommentCount()} @@ -96,7 +96,7 @@
- + @@ -110,7 +110,7 @@ isCarted())-->checked="checked" /> - {$document->getTitle($module_info->subject_cut_size)} + {$document->getTitle($module_info->subject_cut_size)} ({$document->getCommentCount()}) diff --git a/modules/board/skins/xe_board/style.list.html b/modules/board/skins/xe_board/style.list.html index d6d1212db..85fd43086 100644 --- a/modules/board/skins/xe_board/style.list.html +++ b/modules/board/skins/xe_board/style.list.html @@ -69,7 +69,7 @@ {$category_list[$document->get('category_srl')]->title} - {$document->getTitle($module_info->subject_cut_size)} + {$document->getTitle($module_info->subject_cut_size)} {$document->getCommentCount()} @@ -99,7 +99,7 @@ {$category_list[$document->get('category_srl')]->title} - {$document->getTitle($module_info->subject_cut_size)} + {$document->getTitle($module_info->subject_cut_size)} {$document->getCommentCount()} diff --git a/modules/board/skins/xe_board/style.webzine.html b/modules/board/skins/xe_board/style.webzine.html index 14f1c9170..c3ef4501c 100644 --- a/modules/board/skins/xe_board/style.webzine.html +++ b/modules/board/skins/xe_board/style.webzine.html @@ -67,7 +67,7 @@ {$category_list[$document->get('category_srl')]->title} - {$document->getTitle($module_info->subject_cut_size)} + {$document->getTitle($module_info->subject_cut_size)} {$document->getCommentCount()} @@ -96,7 +96,7 @@ isCarted())-->checked="checked" /> - + @@ -105,7 +105,7 @@ {$category_list[$document->get('category_srl')]->title} - {$document->getTitle($module_info->subject_cut_size)} + {$document->getTitle($module_info->subject_cut_size)} {$document->getCommentCount()} @@ -132,7 +132,7 @@ - {$document->getSummary(120)} + {$document->getSummary(120)}   From 10334c459efb6cf2b04557f55026d96833275ea6 Mon Sep 17 00:00:00 2001 From: duvent Date: Mon, 25 Feb 2008 13:17:16 +0000 Subject: [PATCH 046/140] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3787 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/lang/fr.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/lang/fr.lang.php b/common/lang/fr.lang.php index 80f83980d..280d73487 100644 --- a/common/lang/fr.lang.php +++ b/common/lang/fr.lang.php @@ -112,7 +112,7 @@ $lang->mid = 'Nom de Module'; $lang->layout = 'Mise en Page'; - $lang->widget = 'Widget'; + $lang->widget = 'Gadget'; $lang->module = 'Module'; $lang->skin = 'Thème'; $lang->colorset = 'Arrangement de couleur'; From 9517243837ff0881929ff5a8f9b4c2001b1898b3 Mon Sep 17 00:00:00 2001 From: duvent Date: Mon, 25 Feb 2008 13:25:06 +0000 Subject: [PATCH 047/140] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3788 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/lang/lang.info | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/lang/lang.info b/common/lang/lang.info index 382dc0f92..bc93f73f2 100644 --- a/common/lang/lang.info +++ b/common/lang/lang.info @@ -1,7 +1,7 @@ -ko,한국어 +ko,한국어 en,English zh-CN,中文 jp,日本語 es,Español ru,Русский -fr,français +fr,Français \ No newline at end of file From 629fcac8a294c9771d7f45d58d4e064c0a529e53 Mon Sep 17 00:00:00 2001 From: duvent Date: Mon, 25 Feb 2008 13:29:33 +0000 Subject: [PATCH 048/140] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3789 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/lang/fr.lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/lang/fr.lang.php b/common/lang/fr.lang.php index 280d73487..c6ceb804e 100644 --- a/common/lang/fr.lang.php +++ b/common/lang/fr.lang.php @@ -1,4 +1,4 @@ -mid = 'Nom de Module'; $lang->layout = 'Mise en Page'; - $lang->widget = 'Gadget'; + $lang->widget = 'Widget'; $lang->module = 'Module'; $lang->skin = 'Thème'; $lang->colorset = 'Arrangement de couleur'; From fc0aee8d58ac9e2e2732106e59b9a91de6e7fb6d Mon Sep 17 00:00:00 2001 From: haneul Date: Mon, 25 Feb 2008 13:50:31 +0000 Subject: [PATCH 049/140] =?UTF-8?q?springnote=20module=EC=97=90=EC=84=9C?= =?UTF-8?q?=20springnote=EC=AA=BD=20css=EB=95=8C=EB=AC=B8=EC=97=90=20?= =?UTF-8?q?=EC=83=9D=EA=B8=B0=EB=8A=94=20=EB=B6=84=ED=99=8D=EC=83=89=20?= =?UTF-8?q?=ED=85=8C=EB=91=90=EB=A6=AC=20=EC=97=86=EC=95=B0?= 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@3790 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/springnote/skins/xe_official/css/common.css | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/springnote/skins/xe_official/css/common.css b/modules/springnote/skins/xe_official/css/common.css index b5ac73b47..e5721a0ad 100644 --- a/modules/springnote/skins/xe_official/css/common.css +++ b/modules/springnote/skins/xe_official/css/common.css @@ -37,3 +37,4 @@ { border:1px solid #CCCCCC; margin-bottom:10px; } .pageView { border:1px solid #E3E3E2; padding:20px; margin-bottom:10px; } .pageView .xhtmlEditorBody ol, .pageView .xhtmlEditorBody ul { margin-left:20px; } +.pageView .xhtmlEditorBody { border: 0; } From 0c946e0b15d7eafd85de08987a9258fc72fb5e41 Mon Sep 17 00:00:00 2001 From: zero Date: Mon, 25 Feb 2008 13:53:02 +0000 Subject: [PATCH 050/140] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3791 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/lang/fr.lang.php | 2 +- common/lang/lang.info | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/lang/fr.lang.php b/common/lang/fr.lang.php index c6ceb804e..80f83980d 100644 --- a/common/lang/fr.lang.php +++ b/common/lang/fr.lang.php @@ -1,4 +1,4 @@ - Date: Mon, 25 Feb 2008 14:01:14 +0000 Subject: [PATCH 051/140] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80/=EB=8C=93?= =?UTF-8?q?=EA=B8=80=20=EC=8B=A0=EA=B3=A0=20=EC=B7=A8=EC=86=8C=EC=8B=9C=20?= =?UTF-8?q?=ED=95=9C=EA=B0=9C=EC=9D=98=20=EC=8B=A0=EA=B3=A0=EB=A7=8C=20?= =?UTF-8?q?=EC=9E=88=EC=9D=84=EB=95=8C=20=EB=8F=99=EC=9E=91=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8D=98=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= 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@3792 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/comment/tpl/js/comment_admin.js | 8 ++++++-- modules/document/tpl/js/document_admin.js | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/comment/tpl/js/comment_admin.js b/modules/comment/tpl/js/comment_admin.js index 3f927421f..a4093b0fc 100644 --- a/modules/comment/tpl/js/comment_admin.js +++ b/modules/comment/tpl/js/comment_admin.js @@ -11,8 +11,12 @@ function doCheckAll(bToggle) { function doCancelDeclare() { var fo_obj = xGetElementById('fo_list'); var comment_srl = new Array(); - for(var i=0;i Date: Mon, 25 Feb 2008 14:31:39 +0000 Subject: [PATCH 052/140] =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=EB=AA=A8?= =?UTF-8?q?=EB=93=88=EC=97=90=EC=84=9C=20=EC=BB=A8=ED=85=90=EC=B8=A0=20?= =?UTF-8?q?=EC=9C=84=EC=A0=AF=20=EC=B6=94=EA=B0=80=EC=8B=9C=20=EA=B8=B0?= =?UTF-8?q?=EC=A1=B4=EC=9D=98=20=EC=97=85=EB=A1=9C=EB=93=9C=EB=90=9C=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EB=AA=A9=EB=A1=9D=EC=9D=B4=20=EB=82=98?= =?UTF-8?q?=EC=98=A4=EC=A7=80=20=EC=95=8A=EB=8D=98=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= 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@3793 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/widget/widget.admin.view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/widget/widget.admin.view.php b/modules/widget/widget.admin.view.php index e6e418400..c7654da97 100644 --- a/modules/widget/widget.admin.view.php +++ b/modules/widget/widget.admin.view.php @@ -49,7 +49,7 @@ $option->enable_component = true; $option->resizable = false; $option->height = 400; - $option->manual_start = true; + $option->manual_start = false; $editor = $oEditorModel->getEditor($module_srl, $option); Context::set('editor', $editor); From ccf770e89226e83a94eef4d7023c0ecc9be5d722 Mon Sep 17 00:00:00 2001 From: zero Date: Mon, 25 Feb 2008 18:08:39 +0000 Subject: [PATCH 053/140] =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20css=EC=97=90?= =?UTF-8?q?=EC=84=9C=20margin/padding=EB=93=B1=20html=20elements=EC=97=90?= =?UTF-8?q?=20=EB=8C=80=ED=95=B4=EC=84=9C=20=EC=98=81=ED=96=A5=EC=9D=84=20?= =?UTF-8?q?=EB=81=BC=EC=B9=A0=20=EC=88=98=20=EC=9E=88=EB=8A=94=20=EB=AA=A8?= =?UTF-8?q?=EB=93=A0=20=EC=86=8D=EC=84=B1=20=EC=A0=9C=EA=B1=B0.=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=ED=8C=A8=ED=82=A4=EC=A7=80=EC=9D=98=20css?= =?UTF-8?q?=20=EB=B0=8F=20css=20=EA=B4=80=EB=A0=A8=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=9D=BC=EA=B4=84=20=EC=A1=B0=EC=A0=88?= 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@3794 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/widget/WidgetHandler.class.php | 2 +- common/css/default.css | 21 ++++++------------- layouts/xe_blog/css/layout.css | 4 ++-- layouts/xe_official/css/black.css | 4 ++++ layouts/xe_official/css/default.css | 4 ++++ layouts/xe_official/css/white.css | 4 ++++ modules/admin/tpl/css/admin.css | 6 +++--- modules/admin/tpl/css/admin_layout.css | 2 +- modules/board/skins/cozy_board/css/common.css | 14 ++++++------- modules/board/skins/xe_board/css/common.css | 11 ++++++---- modules/board/skins/xe_board/css/cyan.css | 2 +- modules/board/skins/xe_board/css/green.css | 2 +- modules/board/skins/xe_board/css/purple.css | 2 +- modules/board/skins/xe_board/css/red.css | 2 +- modules/board/skins/xe_board/css/white.css | 2 +- .../board/skins/xe_guestbook/css/common.css | 6 ++++-- modules/document/tpl/css/document.css | 1 + .../components/code_highlighter/tpl/popup.js | 4 ++-- .../editor/components/quotation/tpl/popup.js | 2 +- .../components/table_maker/tpl/popup.js | 2 +- modules/editor/tpl/js/editor.js | 2 +- .../skins/default/css/white.css | 11 +++++----- modules/member/skins/default/css/common.css | 17 ++++++++------- modules/member/skins/default/css/cyan.css | 2 +- modules/member/skins/default/css/green.css | 2 +- modules/member/skins/default/css/purple.css | 2 +- modules/member/skins/default/css/red.css | 2 +- modules/member/skins/default/css/white.css | 2 +- .../skins/blog_archive_list/css/cyan.css | 6 +++--- .../skins/blog_archive_list/css/green.css | 6 +++--- .../skins/blog_archive_list/css/normal.css | 6 +++--- .../skins/blog_archive_list/css/purple.css | 6 +++--- .../skins/blog_archive_list/css/red.css | 6 +++--- .../skins/cozy_simple/archive_list.html | 2 +- .../skins/cozy_simple/css/blue.css | 2 +- .../skins/cozy_simple/css/bluish_green.css | 2 +- .../skins/cozy_simple/css/common.css | 5 +++-- .../skins/cozy_simple/css/green.css | 2 +- .../skins/cozy_simple/css/pink.css | 2 +- .../skins/cozy_simple/css/red.css | 2 +- .../skins/blog_calendar_list/calendar.html | 2 +- .../calendar/skins/cozy_simple/calendar.html | 2 +- .../calendar/skins/cozy_simple/css/blue.css | 2 +- .../skins/cozy_simple/css/bluish_green.css | 2 +- .../calendar/skins/cozy_simple/css/common.css | 8 +++---- .../calendar/skins/cozy_simple/css/green.css | 2 +- .../calendar/skins/cozy_simple/css/pink.css | 2 +- .../calendar/skins/cozy_simple/css/red.css | 2 +- .../skins/default/normal/style.css | 2 +- .../skins/styx_flash/counter_status.html | 8 ++++--- .../login_info/skins/default/css/default.css | 6 ++++-- .../skins/xe_official/css/black.css | 21 ++++++++++--------- .../skins/xe_official/css/default.css | 18 ++++++++-------- .../skins/xe_official/css/white.css | 20 ++++++++++-------- .../member_group/skins/default/css/normal.css | 2 +- .../skins/blog_newest_comment/css/cyan.css | 4 ++-- .../skins/blog_newest_comment/css/green.css | 4 ++-- .../skins/blog_newest_comment/css/normal.css | 4 ++-- .../skins/blog_newest_comment/css/purple.css | 4 ++-- .../skins/blog_newest_comment/css/red.css | 4 ++-- .../skins/cozy_simple/css/blue.css | 2 +- .../skins/cozy_simple/css/bluish_green.css | 2 +- .../skins/cozy_simple/css/common.css | 2 +- .../skins/cozy_simple/css/green.css | 2 +- .../skins/cozy_simple/css/pink.css | 2 +- .../skins/cozy_simple/css/red.css | 2 +- .../skins/cozy_simple/list.html | 2 +- .../skins/blog_newest_document/css/cyan.css | 4 ++-- .../skins/blog_newest_document/css/green.css | 4 ++-- .../skins/blog_newest_document/css/normal.css | 4 ++-- .../skins/blog_newest_document/css/purple.css | 4 ++-- .../skins/blog_newest_document/css/red.css | 4 ++-- .../skins/cozy_simple/css/blue.css | 2 +- .../skins/cozy_simple/css/bluish_green.css | 2 +- .../skins/cozy_simple/css/common.css | 2 +- .../skins/cozy_simple/css/green.css | 2 +- .../skins/cozy_simple/css/pink.css | 2 +- .../skins/cozy_simple/css/red.css | 2 +- .../skins/cozy_simple/list.html | 2 +- .../skins/news_ticker/css/black.css | 2 +- .../skins/news_ticker/css/blue.css | 2 +- .../skins/news_ticker/css/gray.css | 2 +- .../skins/news_ticker/css/green.css | 2 +- .../skins/news_ticker/css/none.css | 2 +- .../skins/news_ticker/css/red.css | 2 +- .../skins/news_ticker/css/yellow.css | 2 +- .../skins/xe_official/css/black.css | 4 ++-- .../skins/xe_official/css/white.css | 4 ++-- .../skins/xe_official/list.html | 1 - .../skins/blog_newest_trackback/css/cyan.css | 4 ++-- .../skins/blog_newest_trackback/css/green.css | 4 ++-- .../blog_newest_trackback/css/normal.css | 4 ++-- .../blog_newest_trackback/css/purple.css | 4 ++-- .../skins/blog_newest_trackback/css/red.css | 4 ++-- .../skins/cozy_simple/css/blue.css | 2 +- .../skins/cozy_simple/css/bluish_green.css | 2 +- .../skins/cozy_simple/css/common.css | 2 +- .../skins/cozy_simple/css/green.css | 2 +- .../skins/cozy_simple/css/pink.css | 2 +- .../skins/cozy_simple/css/red.css | 2 +- .../skins/cozy_simple/list.html | 2 +- .../rank_count/skins/sz_xe/css/default.css | 4 ++-- .../rank_download/skins/sz_xe/css/default.css | 2 +- .../rank_point/skins/sz_xe/css/default.css | 4 ++-- widgets/rank_point/skins/sz_xe/skin.xml | 1 - .../rss_reader/skins/sz_select/css/select.css | 2 +- .../rss_reader/skins/sz_xe/css/default.css | 4 +++- widgets/rss_reader/skins/sz_xe/list.html | 2 +- .../skins/xe_official/css/black.css | 4 +++- .../skins/xe_official/css/white.css | 2 ++ .../rss_reader/skins/xe_select/css/select.css | 2 +- widgets/rss_reader/skins/xe_select/list.html | 4 ++-- .../tag_list/skins/blog_tag_list/css/cyan.css | 4 ++-- .../skins/blog_tag_list/css/green.css | 4 ++-- .../skins/blog_tag_list/css/normal.css | 4 ++-- .../skins/blog_tag_list/css/purple.css | 4 ++-- .../tag_list/skins/blog_tag_list/css/red.css | 4 ++-- .../tag_list/skins/cozy_simple/css/blue.css | 2 +- .../skins/cozy_simple/css/bluish_green.css | 2 +- .../tag_list/skins/cozy_simple/css/common.css | 2 +- .../tag_list/skins/cozy_simple/css/green.css | 2 +- .../tag_list/skins/cozy_simple/css/pink.css | 2 +- .../tag_list/skins/cozy_simple/css/red.css | 2 +- widgets/tag_list/skins/cozy_simple/tags.html | 2 +- .../webzine/skins/notice_style/css/normal.css | 2 +- .../webzine/skins/xe_official/css/normal.css | 2 +- 126 files changed, 250 insertions(+), 227 deletions(-) diff --git a/classes/widget/WidgetHandler.class.php b/classes/widget/WidgetHandler.class.php index 473888751..ccbc26345 100644 --- a/classes/widget/WidgetHandler.class.php +++ b/classes/widget/WidgetHandler.class.php @@ -119,7 +119,7 @@ // 내용 직접 추가일 경우 case 'widgetContent' : $body = base64_decode($args->body); - $output = sprintf('
%s
', $style, $inner_style, $body); + $output = sprintf('
%s
', $style, $inner_style, $body); break; // 위젯 박스일 경우 diff --git a/common/css/default.css b/common/css/default.css index a656b7b81..b8f096344 100644 --- a/common/css/default.css +++ b/common/css/default.css @@ -11,6 +11,12 @@ IE7 & IE6 & Below * html #selector {} */ +/* default.css - Type Selector Definition */ +body { margin:0;padding:0; font-size:9pt; } +img { border:none; } +label { cursor:pointer; } +form { margin:0; padding:0; } + /* Special Class Selector */ .fr { float:right; } .fl { float:left; } @@ -22,15 +28,6 @@ IE7 & IE6 & Below .gap1 { margin-top:.8em; } .nowrap { white-space:nowrap; } -/* default.css - Type Selector Definition */ -body,p,div,ul,ol,li,dd,dt,span,fieldset,h1,h2,h3,h4,h5,h6 { margin:0; padding:0; } -html { width:100%; } -body { margin:0; font-size:.75em; _font-size:9pt; font-family:sans-serif;} -*:first-child+html body { font-size:9pt; } -img { border:none; } -label { cursor:pointer; } -form { margin:0; padding:0; } - .iePngFix { behavior:url(./common/js/iePngFix.htc); } .zbxe_info { vertical-align:middle; behavior:url(./common/js/iePngFix.htc); } @@ -88,12 +85,6 @@ a.bold { font-weight:bold; } .zbxe_widget_output { background:url(../tpl/images/widget_text.gif) no-repeat center bottom; display:block;} -/* xe content */ -div.xe_content { line-height:140%; !important} -div.xe_content ol { margin-left:40px; !important} -div.xe_content ul { margin-left:40px; !important} -div.xe_content blockquote { margin-left:40px; !important} - /* xe layer */ #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; } diff --git a/layouts/xe_blog/css/layout.css b/layouts/xe_blog/css/layout.css index d26e86f19..60407355f 100644 --- a/layouts/xe_blog/css/layout.css +++ b/layouts/xe_blog/css/layout.css @@ -82,7 +82,7 @@ div#searchBox .imgBtn {vertical-align:middle; _position:relative; top:-4px; } /* widget common css */ .category_widget { border:1px solid #e0e1db; margin-bottom:10px; padding:15px 5px 10px 5px; overflow:hidden;} -.blog_widget_ h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_ .items { padding:10px; overflow:hidden;} +.blog_widget_ h2 { margin:0; padding:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_ .items { margin:0; padding:10px; overflow:hidden;} .blog_widget_ .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; line-height:150%; overflow:hidden; white-space:nowrap; list-style:none; width:100%; padding:3px 0 3px 0;} .blog_widget_ .items li a { color:#a4a4a4; margin-right:1em; } diff --git a/layouts/xe_official/css/black.css b/layouts/xe_official/css/black.css index 92139ae87..fed0ad983 100644 --- a/layouts/xe_official/css/black.css +++ b/layouts/xe_official/css/black.css @@ -5,6 +5,10 @@ Jeong, Chan Myeong 070601~070630 */ /* Black Skin - Start */ +#selectLang { margin:0; padding:0; } +#gnb { margin:0; padding:0; } +#lnb { margin:0; padding:0; } +#lnb ul { margin:0; padding:0; } /* Site Layout - Body Wrap */ body { background:#3d3d3d url(../images/black/bgBody.gif) repeat-x;} diff --git a/layouts/xe_official/css/default.css b/layouts/xe_official/css/default.css index a64c31bde..80ddc0cb4 100644 --- a/layouts/xe_official/css/default.css +++ b/layouts/xe_official/css/default.css @@ -5,6 +5,10 @@ Jeong, Chan Myeong 070601~070630 */ /* Default Skin - Start */ +#selectLang { margin:0; padding:0; } +#gnb { margin:0; padding:0; } +#lnb { margin:0; padding:0; } +#lnb ul { margin:0; padding:0; } /* Site Layout - Body Wrap */ body { background:#FFFFFF url(../images/default/bgBody.gif) repeat-x left top; } diff --git a/layouts/xe_official/css/white.css b/layouts/xe_official/css/white.css index f2e1337bc..357f962a9 100644 --- a/layouts/xe_official/css/white.css +++ b/layouts/xe_official/css/white.css @@ -5,6 +5,10 @@ Jeong, Chan Myeong 070601~070630 */ /* White Skin - Start */ +#selectLang { margin:0; padding:0; } +#gnb { margin:0; padding:0; } +#lnb { margin:0; padding:0; } +#lnb ul { margin:0; padding:0; } /* Site Layout - Body Wrap */ body { background:#ffffff;} diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index 8cb1509ae..8e0232f62 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -15,7 +15,7 @@ IE7 Only */ -h3 { background:url("../images/top_head_title_bg.gif") repeat-x left top; font-size:1em; border:1px solid #E3E3E2; padding:11px 9px 7px 25px; color:#555555; } +h3 { background:url("../images/top_head_title_bg.gif") repeat-x left top; font-size:1em; border:1px solid #E3E3E2; padding:11px 9px 7px 25px; color:#555555; margin:0; } h3 .gray { color:#9d9d9d;} .adminTable { width:100%; border-left:1px solid #E3E3E2; border-top:1px solid #E3E3E2; margin-bottom:10px; table-layout:fixed;} @@ -93,7 +93,7 @@ select.time_zone { width:70%; position:relative; top:4px; } .header4 table.summary th .vr { color:#a3a39f; margin:0 4px; font-weight:normal;} .header4 table.summary td { border-top:1px solid #f2f2f2; border-bottom:1px solid #f2f2f2; font:.9em Tahoma; padding-left:17px;} -h4 { font-size:1em; color:#f2250d; padding-left:10px; } +h4 { font-size:1em; color:#f2250d; padding-left:10px; margin:0;} h4 .bracket { font-weight:normal; color:#9d9d9d;} h4 .vr { font-weight:normal; color:#d1d1d1;} h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background:url(../images/iconView.gif) no-repeat right center; text-decoration:none; } @@ -125,7 +125,7 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background: .buttonTypeGo { border:none; cursor:pointer; width:24px; height:20px; position:relative; top:-1px; font:.75em Tahoma; text-align:center; background:url(../images/buttonTypeInput24.gif) no-repeat; } #popHeadder { height:40px; background:url(../images/popupTopBg.png) repeat-x left top; padding:10px;} -#popHeadder h1 { background:url("../images/top_head_title_bg.gif") repeat-x left top; font-size:1em; border:1px solid #E3E3E2; padding:9px; color:#555555; } +#popHeadder h1 { background:url("../images/top_head_title_bg.gif") repeat-x left top; font-size:1em; border:1px solid #E3E3E2; padding:9px; color:#555555; margin:0; } #popBody { width:600px; padding:10px; background:#ffffff;} #popFooter { width:620px; background:#f7f7f6; border-top:1px solid #e8e8e7; padding:.5em 0 .5em 0; overflow:hidden; } #popFooter .close { position:relative; left:50%; margin-left:-1em; float:left;} diff --git a/modules/admin/tpl/css/admin_layout.css b/modules/admin/tpl/css/admin_layout.css index 1db365577..82b0b5086 100644 --- a/modules/admin/tpl/css/admin_layout.css +++ b/modules/admin/tpl/css/admin_layout.css @@ -26,7 +26,7 @@ body { background:url("../images/admin_background.gif") repeat-x left top; backg #adminMenuContent h3.accessory { background:url("../images/icon_accessory_module.gif") no-repeat 3px 5px; background-color:#FFFFFF;} #adminMenuContent h3.base { background:url("../images/icon_base_module.gif") no-repeat 3px 5px; background-color:#FFFFFF;} -#adminMenuContent ul { width:170px; } +#adminMenuContent ul { width:170px; margin:0; padding:0;} #adminMenuContent ul li { background-color:#F8F6F3; list-style:none; padding:5px 10px 3px 10px; margin-left:8px; white-space:nowrap; overflow:hidden; color:#888785; border-bottom:1px solid #E3E3E2; cursor:pointer; } #adminMenuContent ul li:hover { background-color:#EFE6D3; border-left:1px solid #E3E3E2; border-right:1px solid #E3E3E2;} #adminMenuContent li.on { background-color:#EFE6D3; border-left:1px solid #E3E3E2; border-right:1px solid #E3E3E2;} diff --git a/modules/board/skins/cozy_board/css/common.css b/modules/board/skins/cozy_board/css/common.css index 9a0ef1dd8..63ed99bd8 100644 --- a/modules/board/skins/cozy_board/css/common.css +++ b/modules/board/skins/cozy_board/css/common.css @@ -5,7 +5,7 @@ Jeong, Chan Myeong 070601~070630 */ /* ----- List+Read+Write+Modify | Start ----- */ -.boardHeader h3 { float:left; clear:both; padding:1.9em 1.5em 1.8em 1.5em; font-size:1.2em; color:#FFFFFF;} +.boardHeader h3 { margin:0; float:left; clear:both; padding:1.9em 1.5em 1.8em 1.5em; font-size:1.2em; color:#FFFFFF;} /* boardInformation */ .boardInformation { width:100%; clear:both; margin:0 0 .5em 0; background:#EFEFEF; color:#8D8D8D; overflow:hidden;} @@ -144,7 +144,7 @@ Jeong, Chan Myeong 070601~070630 #blog .boardRead { position:relative; margin:0; _overflow:hidden;} .boardRead .originalContent { padding:2em 0 2em 0;} .boardRead .titleAndCategory { float:left;} -.boardRead .titleAndCategory h4 { font-size:1.4em; display:inline; padding-left:.2em;} +.boardRead .titleAndCategory h4 { margin:0; font-size:1.4em; display:inline; padding-left:.2em;} .boardRead .titleAndCategory .vr { font-size:.9em; margin:0 .3em; color:#c5c7c0;} .boardRead .titleAndCategory .category { font-size:.9em; color:#999999; white-space:nowrap;} @@ -183,7 +183,7 @@ Jeong, Chan Myeong 070601~070630 .boardRead .readFooter .tag .tagIcon { vertical-align:middle;} .boardRead .readFooter .fileAttached { padding:1em 1em .8em 0; position:relative; _width:100%; border-bottom:1px solid #dfdfdd; overflow:hidden; background:#f9f9f9;} .boardRead .readFooter .fileAttached h5 {} -.boardRead .readFooter .fileAttached ul { margin-left:1.8em;} +.boardRead .readFooter .fileAttached ul { margin:0 0 0 1.8em;} .boardRead .readFooter .fileAttached li { float:left; margin-right:.75em; line-height:1.6em; color:#888888; white-space:nowrap; list-style:none;} .boardRead .readFooter .fileAttached li a { font-size:.9em; padding:.1em 0 .1em .2em; white-space:nowrap; position:relative; color:#888888; text-decoration:none; } .boardRead .readFooter .fileAttached li a:visited { color:#777777;} @@ -220,7 +220,7 @@ Jeong, Chan Myeong 070601~070630 .boardRead .contentBox .fileAttached { position:relative; _width:100%; overflow:hidden; clear:both; } .boardRead .contentBox .fileAttached h5 {} -.boardRead .contentBox .fileAttached ul { margin-bottom:.5em;} +.boardRead .contentBox .fileAttached ul { margin:0 0 0 .5em;} .boardRead .contentBox .fileAttached li { float:left; margin-right:.75em; line-height:1.6em; color:#888888; white-space:nowrap; list-style:none;} .boardRead .contentBox .fileAttached li a { font-size:.9em; padding:.1em 0 .1em .2em; white-space:nowrap; position:relative; color:#888888; text-decoration:none; } .boardRead .contentBox .fileAttached li a:visited { color:#777777;} @@ -378,7 +378,7 @@ Jeong, Chan Myeong 070601~070630 /* ----- Member | Start ----- */ .memberHeader { position:relative; _width:100%; background:#ED2027 url(../images/common/bg_top_title.gif) no-repeat 23px -6px; overflow:hidden;} -.memberHeader h3 { float:left; clear:both; padding:1.2em 0 1em 1.7em; font-size:1.1em; color:#FFFFFF;} +.memberHeader h3 { margin:0; float:left; clear:both; padding:1.2em 0 1em 1.7em; font-size:1.1em; color:#FFFFFF;} .memberInformation { width:100%; clear:both; margin:0 0 .5em 0; background:#EFEFEF; color:#8D8D8D; overflow:hidden;} .memberInformation .friendNum { float:left; padding:.7em 0 .7em 2em; background:url(../images/common/iconFriend.gif) no-repeat .5em .4em;} .memberInformation .friendNum strong { font:bold 11px Tahoma; color:#ec2127;} @@ -415,7 +415,7 @@ Jeong, Chan Myeong 070601~070630 .smallBox.w298 { width:298px;} .smallBox.w498 { width:498px;} .smallBox .header { position:relative; _width:100%; background:#ed2027; overflow:hidden;} -.smallBox .header h3 { font-size:1.2em; color:#FFFFFF; padding:1em 2em .8em 1em;} +.smallBox .header h3 { margin:0; font-size:1.2em; color:#FFFFFF; padding:1em 2em .8em 1em;} .smallBox .login { position:relative; border:none; padding:2.4em 0 2em 2.3em;} .smallBox .login legend { position:absolute; overflow:hidden; width:1px; height:1px; font-size:.001em; text-indent:-100em;} .smallBox .login dl { overflow:hidden; width:162px; float:left;} @@ -508,7 +508,7 @@ Jeong, Chan Myeong 070601~070630 .readMessage { margin-bottom:2em;} .readMessage .messageHeader { padding:1.5em; height:1em; overflow:hidden;} -.readMessage .messageHeader h4 { float:left; padding-left:.5em; font-size:1em; background:url(../images/common/iconArrow99.gif) no-repeat left .3em;} +.readMessage .messageHeader h4 { margin:0; float:left; padding-left:.5em; font-size:1em; background:url(../images/common/iconArrow99.gif) no-repeat left .3em;} .readMessage .messageHeader address { float:right; white-space:nowrap;} .readMessage .messageHeader address em { font-size:.9em; font-style:normal; color:#333333; margin-right:.3em;} .readMessage .messageHeader address em a { color:#333333;} diff --git a/modules/board/skins/xe_board/css/common.css b/modules/board/skins/xe_board/css/common.css index 6b9b65136..b6c83944d 100644 --- a/modules/board/skins/xe_board/css/common.css +++ b/modules/board/skins/xe_board/css/common.css @@ -12,7 +12,7 @@ Jeong, Chan Myeong 070601~070630 /* board Title */ .boardHeader { border:1px solid #e1e1dd; border-bottom:0; background:#ffffff url(../images/common/bgH3.gif) repeat-x left bottom; overflow:hidden;} .boardHeader .boardHeaderBorder { width:100%;} -.boardHeader h3 { float:left; padding:15px 15px 12px 15px; font-size:1.2em; background:#ffffff url(../images/common/lineH3.gif) no-repeat right bottom;} +.boardHeader h3 { margin:0; float:left; padding:15px 15px 12px 15px; font-size:1.2em; background:#ffffff url(../images/common/lineH3.gif) no-repeat right bottom;} /* board Description */ .boardDescription { color:#AEAEAE; border:1px solid #DDDDDD; overflow:hidden; padding:10px; margin-top:5px; background-color:#FFFFFF;} @@ -50,7 +50,7 @@ Jeong, Chan Myeong 070601~070630 .boardRead .titleAndUser { overflow:hidden; border-bottom:1px solid #e0e1db; } .boardRead .titleAndUser .title { float:left; margin:10px 0 5px 0; } -.boardRead .titleAndUser h4 { font-size:1.5em; margin-left:3px;} +.boardRead .titleAndUser h4 { margin:0; font-size:1.5em; margin-left:3px;} .boardRead .titleAndUser h4 a { color:#000000; text-decoration:none; } .boardRead .titleAndUser h4 a:hover { text-decoration:underline; } @@ -83,11 +83,13 @@ Jeong, Chan Myeong 070601~070630 .boardRead .readBody .contentBody .ipaddress { text-align:right; margin-top:10px; color:#bbbbbb; font-family:tahoma;} .boardRead .tag { background:#FFFFFF url(../images/common/iconTag.gif) no-repeat 3px 2px; padding-left:25px; margin:10px 0 0 0; } +.boardRead .tag ul { margin:0; padding:0; } .boardRead .tag li { display:inline; list-style:none; } .boardRead .tag li a { color:#444444;} .boardRead .fileAttached { border:1px solid #EFEFEF; background-color:#F4F4F4; padding:5px; margin-top:10px; overflow:hidden;} .boardRead .fileAttached h5 { font-weight:normal; color:#999999; font-size:1em; line-height:22px; } +.boardRead .fileAttached ul { border:0; margin:0; } .boardRead .fileAttached li { padding-left:15px; display:block; float:left; white-space:nowrap; list-style:none; margin-right:10px; height:18px;} .boardRead .fileAttached li a { text-decoration:none; font-size:.9em; white-space:nowrap; color:#444444; } .boardRead .fileAttached li a:visited { color:#777777;} @@ -124,6 +126,7 @@ Jeong, Chan Myeong 070601~070630 .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; overflow:hidden;} +.replyBox .fileAttached ul { border:0; margin:0; } .replyBox .fileAttached h5 { font-weight:normal; color:#999999; float:left; font-size:1em; line-height:22px;} .replyBox .fileAttached li { padding-left:15px; display:block; float:left; white-space:nowrap; list-style:none; margin-right:10px; height:18px;} .replyBox .fileAttached li a { text-decoration:none; font-size:.9em; white-space:nowrap; color:#444444; } @@ -291,12 +294,12 @@ html:not([lang*=""]) .boardList th { height:33px; } /* 게시물의 팝업 메뉴 */ -.comment_popup_menu, .document_popup_menu { text-align:right; background:none; background:url(../images/common/document_menu.gif) no-repeat right top; padding:0 15px; 0 0; } +.comment_popup_menu, .document_popup_menu { text-align:right; background:none; background:url(../images/common/document_menu.gif) no-repeat right top; padding:0 15px 0 0; height:18px; } .comment_popup_menu span, .document_popup_menu span { cursor:pointer; display:inline; } /* tag list */ .tagsBox { border:1px solid #EEEEEE; padding:10px; overflow:hidden;} -h5 { padding:2px; } +.tagsBox h5 { margin:0; padding:2px; } .tags { width:100%; } .tags div { float:left; padding:2px; margin-right:10px; overflow:hidden; white-space:nowrap; height:15px;} .tags div a { text-decoration:none; color:#555555; line-height:150%;} diff --git a/modules/board/skins/xe_board/css/cyan.css b/modules/board/skins/xe_board/css/cyan.css index 684534d9e..811ae4e1b 100644 --- a/modules/board/skins/xe_board/css/cyan.css +++ b/modules/board/skins/xe_board/css/cyan.css @@ -1,7 +1,7 @@ @charset "utf-8"; /* board Title */ -.boardHeader h3 { border-bottom:3px solid #2895c0; } +.boardHeader h3 { margin:0; border-bottom:3px solid #2895c0; } /* board Information */ .articleNum { float:left; background:url(../images/cyan/iconArticle.gif) no-repeat left top; } diff --git a/modules/board/skins/xe_board/css/green.css b/modules/board/skins/xe_board/css/green.css index eb0b34992..f6f37709e 100644 --- a/modules/board/skins/xe_board/css/green.css +++ b/modules/board/skins/xe_board/css/green.css @@ -1,7 +1,7 @@ @charset "utf-8"; /* board Title */ -.boardHeader h3 { border-bottom:3px solid #38b549; } +.boardHeader h3 { margin:0; border-bottom:3px solid #38b549; } /* board Information */ .articleNum { float:left; background:url(../images/green/iconArticle.gif) no-repeat left top; } diff --git a/modules/board/skins/xe_board/css/purple.css b/modules/board/skins/xe_board/css/purple.css index ff5f45cb9..2d10f2e7e 100644 --- a/modules/board/skins/xe_board/css/purple.css +++ b/modules/board/skins/xe_board/css/purple.css @@ -1,7 +1,7 @@ @charset "utf-8"; /* board Title */ -.boardHeader h3 { border-bottom:3px solid #ac19a9; } +.boardHeader h3 { margin:0; border-bottom:3px solid #ac19a9; } /* board Information */ .articleNum { float:left; background:url(../images/purple/iconArticle.gif) no-repeat left top; } diff --git a/modules/board/skins/xe_board/css/red.css b/modules/board/skins/xe_board/css/red.css index 5e67302af..5694924ad 100644 --- a/modules/board/skins/xe_board/css/red.css +++ b/modules/board/skins/xe_board/css/red.css @@ -1,7 +1,7 @@ @charset "utf-8"; /* board Title */ -.boardHeader h3 { border-bottom:3px solid #ed135a; } +.boardHeader h3 { margin:0; border-bottom:3px solid #ed135a; } /* board Information */ .articleNum { float:left; background:url(../images/red/iconArticle.gif) no-repeat left top; } diff --git a/modules/board/skins/xe_board/css/white.css b/modules/board/skins/xe_board/css/white.css index 9705e7d4d..7a184aabf 100644 --- a/modules/board/skins/xe_board/css/white.css +++ b/modules/board/skins/xe_board/css/white.css @@ -1,7 +1,7 @@ @charset "utf-8"; /* board Title */ -.boardHeader h3 { border-bottom:3px solid #fe3614; } +.boardHeader h3 { margin:0; border-bottom:3px solid #fe3614; } /* board Information */ .articleNum { float:left; background:url(../images/white/iconArticle.gif) no-repeat left top; } diff --git a/modules/board/skins/xe_guestbook/css/common.css b/modules/board/skins/xe_guestbook/css/common.css index 75353aead..2b4fe16d8 100644 --- a/modules/board/skins/xe_guestbook/css/common.css +++ b/modules/board/skins/xe_guestbook/css/common.css @@ -12,7 +12,7 @@ Jeong, Chan Myeong 070601~070630 /* board Title */ .boardHeader { border:1px solid #e1e1dd; border-bottom:0; background:#ffffff url(../images/common/bgH3.gif) repeat-x left bottom; overflow:hidden;} .boardHeader .boardHeaderBorder { width:100%;} -.boardHeader h3 { float:left; padding:15px 15px 12px 15px; font-size:1.2em; background:#ffffff url(../images/common/lineH3.gif) no-repeat right bottom;} +.boardHeader h3 { margin:0; float:left; padding:15px 15px 12px 15px; font-size:1.2em; background:#ffffff url(../images/common/lineH3.gif) no-repeat right bottom;} /* board Description */ .boardDescription { color:#AEAEAE; border:1px solid #DDDDDD; overflow:hidden; padding:10px; margin-top:5px; background-color:#FFFFFF;} @@ -63,6 +63,7 @@ Jeong, Chan Myeong 070601~070630 .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; } .boardRead .fileAttached h5 { font-weight:normal; color:#999999; font-size:1em; line-height:22px;} .boardRead .fileAttached li { display:inline; white-space:nowrap margin:3px 5px 0 3px; list-style:none; } .boardRead .fileAttached li a { text-decoration:none; font-size:.9em; padding:0 0 2px 17px; white-space:nowrap; color:#444444; } @@ -99,6 +100,7 @@ Jeong, Chan Myeong 070601~070630 .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;} +.replyBox .fileAttached ul { margin:0; padding:0; } .replyBox .fileAttached h5 { font-weight:normal; color:#999999; float:left; font-size:1em; line-height:22px;} .replyBox .fileAttached li { display:inline; white-space:nowrap margin:3px 5px 0 3px; list-style:none; } .replyBox .fileAttached li a { text-decoration:none; font-size:.9em; white-space:nowrap; color:#444444; } @@ -256,7 +258,7 @@ Jeong, Chan Myeong 070601~070630 .smallBox { border:1px solid #e0e1db; margin-left:auto; margin-right:auto; } .smallBox.w268 { width:268px;} .smallBox .header { position:relative; _width:100%; background:#ffffff url(../images/normal/bgH3.gif) no-repeat left bottom; overflow:hidden;} -.smallBox .header h3 { clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #fe3614; } +.smallBox .header h3 { margin:0; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #fe3614; } .smallBox .complex { padding:1.5em 2em 2em 2em;} .smallBox .inputPassword { position:relative; border:none; padding:2em 2em 1.5em 2em;} .smallBox .inputPassword .inputTypeText { float:left; margin-right:.5em; width:8em;} diff --git a/modules/document/tpl/css/document.css b/modules/document/tpl/css/document.css index 3397e16ee..cc4fa9092 100644 --- a/modules/document/tpl/css/document.css +++ b/modules/document/tpl/css/document.css @@ -1,3 +1,4 @@ +ul.document_list_box { margin:0; padding:0; list-style:none; } .document_list_box { height:300px; overflow-y:scroll; overflow-x:hidden;} .document_list { margin-top:.5em; overflow:hidden; white-space:nowrap; clear:both;} .document_list input { float:left; margin-right:10px; } diff --git a/modules/editor/components/code_highlighter/tpl/popup.js b/modules/editor/components/code_highlighter/tpl/popup.js index 77b17cf6d..76a73e499 100755 --- a/modules/editor/components/code_highlighter/tpl/popup.js +++ b/modules/editor/components/code_highlighter/tpl/popup.js @@ -50,7 +50,7 @@ function insertCode() { if(!content) content = " "; - var text = "\n"+'
'+content+'
'+"\n
"; + var text = '
'+content+'
'+"
"; if(selected_node) { selected_node.setAttribute('code_type', code_type); @@ -74,4 +74,4 @@ function insertCode() { window.close(); } -xAddEventListener(window, 'load', getCode); \ No newline at end of file +xAddEventListener(window, 'load', getCode); diff --git a/modules/editor/components/quotation/tpl/popup.js b/modules/editor/components/quotation/tpl/popup.js index 971c6050e..45dc297f1 100644 --- a/modules/editor/components/quotation/tpl/popup.js +++ b/modules/editor/components/quotation/tpl/popup.js @@ -135,7 +135,7 @@ function insertQuotation() { if(!content) content = " "; - var text = "\n
"+content+"
\n
"; + var text = "
"+content+"

"; if(selected_node) { selected_node.setAttribute("use_folder", use_folder); diff --git a/modules/editor/components/table_maker/tpl/popup.js b/modules/editor/components/table_maker/tpl/popup.js index f8b28279b..caed7459b 100644 --- a/modules/editor/components/table_maker/tpl/popup.js +++ b/modules/editor/components/table_maker/tpl/popup.js @@ -161,7 +161,7 @@ function insertTable() { } text += ""; } - text += "\n
"; + text += "
"; opener.editorFocus(opener.editorPrevSrl); var iframe_obj = opener.editorGetIFrame(opener.editorPrevSrl) diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js index d65bf3287..d04673a9a 100755 --- a/modules/editor/tpl/js/editor.js +++ b/modules/editor/tpl/js/editor.js @@ -209,7 +209,7 @@ function editorKeyPress(evt) { return; break; default : - obj.pasteHTML("
\n"); + obj.pasteHTML("
"); break; } obj.select(); diff --git a/modules/integration_search/skins/default/css/white.css b/modules/integration_search/skins/default/css/white.css index 1bdd0f48a..e1d8b9ea6 100644 --- a/modules/integration_search/skins/default/css/white.css +++ b/modules/integration_search/skins/default/css/white.css @@ -1,6 +1,6 @@ @charset "utf-8"; #spot { border:8px solid #cecece; height:64px; position:relative; margin-bottom:30px;} -#spot h2 { position:absolute; top:24px; left:-8px;} +#spot h2 { padding:0; margin:0; position:absolute; top:24px; left:-8px;} #spot .search { text-align:center; position:relative; top:22px;} #spot .search * { vertical-align:middle;} #spot .search select { margin-top:1px;} @@ -8,6 +8,7 @@ #spot .search .submit {} #content { width:100%; overflow:hidden; position:relative;} +#content h3 { margin:0; padding:0; } #content h3.result { width:100%; height:23px; border-bottom:1px solid #cecece; margin-bottom:23px; margin-left:15px;} #content h3.result strong { color:#ff1a00;} #content .sortBy { position:absolute; top:0; right:0; overflow:hidden;} @@ -15,17 +16,17 @@ #content .sortBy li a { display:block; float:left; padding-left:9px; color:#3e3e3e; white-space:nowrap; background:url(../images/white/bulletSortBy.gif) no-repeat left 4px; text-decoration:none; } #content .sortBy li.on a { color:#ff1a00; background:url(../images/white/bulletSortByOn.gif) no-repeat left 4px;} -.searchResult { margin-left:15px;} +.searchResult { margin:0 0 0 15px; padding:0;} .searchResult li { width:100%; margin-bottom:29px; clear:both; overflow:hidden;list-style:none; } .searchResult li .thumb { display:block; float:left; margin-right:14px;} -.searchResult li dl { margin:0; } -.searchResult li dl dt { color:#d8d8d8; margin-bottom:1px;} +.searchResult li dl { margin:0; padding:0; } +.searchResult li dl dt { padding:0; margin:0; color:#d8d8d8; margin-bottom:1px;} .searchResult li dl dt a { color:#1a3588; text-decoration:underline;} .searchResult li dl dt .reply { color:#fe6700; font:.9em Tahoma;} .searchResult li dl dt .reply em { color:#fe6700; font:bold 1em Tahoma;} .searchResult li dl dt .category { color:#818181;} .searchResult li dl dt .category a { color:#818181; border:none; text-decoration:none;} -.searchResult li dl dd { line-height:18px; color:#555555; margin-bottom:4px;} +.searchResult li dl dd { padding:0; margin:0; line-height:18px; color:#555555; margin-bottom:4px;} .searchResult li address { color:#d8d8d8; font-size:11px;} .searchResult li address strong { color:#3e3e3e; font-size:1em; font-weight:normal;} .searchResult li address img { vertical-align:middle; margin-right:2px;} diff --git a/modules/member/skins/default/css/common.css b/modules/member/skins/default/css/common.css index 47e26ac19..3ec1dc2c2 100644 --- a/modules/member/skins/default/css/common.css +++ b/modules/member/skins/default/css/common.css @@ -2,6 +2,7 @@ /* common */ .memberSmallBox { border:1px solid #e0e1db; margin:5em auto 1em auto;} +.memberSmallBox fieldset { border:0; margin:0; } .memberSmallBox.w400 { width:400px;} .memberSmallBox.w500 { width:500px;} @@ -59,18 +60,18 @@ /* login */ .memberSmallBox .login { border:none; padding:2em 0 1.5em 2em;} .memberSmallBox .login legend { position:absolute; overflow:hidden; width:1px; height:1px; font-size:.001em; text-indent:-100em;} -.memberSmallBox .login dl { overflow:hidden; float:left; margin-right:10px; width:250px;} -.memberSmallBox .login dl dt { width:100px; clear:left; float:left; color:#54564b; height:24px; padding-top:3px;} -.memberSmallBox .login dl dd { float:left; height:27px; width:150px; } +.memberSmallBox .login dl { margin:0; padding:0; overflow:hidden; float:left; margin-right:10px; width:250px;} +.memberSmallBox .login dl dt { margin:0; padding:0; width:100px; clear:left; float:left; color:#54564b; height:24px; padding-top:3px;} +.memberSmallBox .login dl dd { margin:0; padding:0; float:left; height:27px; width:150px; } .memberSmallBox .login .keep { clear:both; white-space:nowrap; margin-left:100px;} .memberSmallBox .login .keep input { vertical-align:middle;} -.memberSmallBox .login .keep label { font-size:11px; color:#999999;} +.memberSmallBox .login .keep label { margin:0; padding:0; font-size:11px; color:#999999;} .memberSmallBox .openid_user_id { background: url(../images/openid_input_bg.gif) left no-repeat; background-color: #ffffff; background-position: 0 50%; padding:3px 3px 3px 18px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; line-height:1em; vertical-align:middle; color:#666666; width:120px;} .memberSmallBox .help { background:#f5f5f3; color:#666666; border-top:1px solid #eaebe7; overflow:hidden; padding:1.1em; } /* logout */ .memberSmallBox .text { color:#54564b; text-align:center; padding:4em 2em 5em 2em;} -.memberSmallBox .text p { margin-bottom:.5em;} +.memberSmallBox .text p { margin:0; padding:0; margin-bottom:.5em;} /* friend */ .friendNum { float:left; background:url(../images/common/iconFriend.gif) no-repeat .5em .4em; padding:.4em 0 0 2em;} @@ -79,7 +80,7 @@ /* message */ .readMessage { border:1px solid #e0e1db; border-top:none; margin-bottom:2em;} .readMessage .messageHeader { padding:1.5em; height:1em; overflow:hidden;} -.readMessage .messageHeader h4 { float:left; padding-left:.5em; font-size:1em; background:url(../images/common/iconArrow99.gif) no-repeat left .3em;} +.readMessage .messageHeader h4 { margin:0; padding:0; float:left; padding-left:.5em; font-size:1em; background:url(../images/common/iconArrow99.gif) no-repeat left .3em;} .readMessage .messageHeader address { float:right; white-space:nowrap;} .readMessage .messageHeader address em { font-size:1em; font-style:white; color:#333333; margin-right:.3em; float:left;} .readMessage .messageHeader address em a { color:#333333;} @@ -107,7 +108,7 @@ .memberInfoTable td checkbox { border:0; } .memberInfoTable td .fl { margin-right:.5em;} .memberInfoTable td br { clear:both;} -.memberInfoTable td p { font-size:.9em; color:#999999; padding-top:.5em; margin-right:.5em;} +.memberInfoTable td p { margin:0; padding:0; font-size:.9em; color:#999999; padding-top:.5em; margin-right:.5em;} .memberInfoTable td label { color:#3f4040; padding-top:.3em; margin-right:.5em;} .memberInfoTable td ul { list-style:none; } .memberInfoTable td .checkbox { border:none; } @@ -156,7 +157,7 @@ span.privateItem { display:inline; margin:0; font-weight:normal; color:#666666; .memberSmallBox .pwModify legend { position:absolute; overflow:hidden; width:1px; height:1px; font-size:.001em; text-indent:-100em;} .memberSmallBox .pwModify input { width:9em;} .memberSmallBox .pwModify br { display:block; margin-bottom:.2em} -.memberSmallBox .pwModify p { text-align:center; margin-top:1em; color:#54564b;} +.memberSmallBox .pwModify p { margin:0; padding:0; text-align:center; margin-top:1em; color:#54564b;} /* pageNavigation */ .pageNavigation { position:relative; display:block; padding:1.5em 0 2em 0; text-align:center; font:bold .8em Tahoma; } diff --git a/modules/member/skins/default/css/cyan.css b/modules/member/skins/default/css/cyan.css index f44b4ac04..b7a0567ae 100644 --- a/modules/member/skins/default/css/cyan.css +++ b/modules/member/skins/default/css/cyan.css @@ -1,4 +1,4 @@ @charset "utf-8"; -.boardHeader h3 { float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d1d9db; border-bottom:3px solid #2895c0; background:url(../images/common/lineH3.gif) no-repeat right bottom;} +.boardHeader h3 { margin:0; padding:0; float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d1d9db; border-bottom:3px solid #2895c0; background:url(../images/common/lineH3.gif) no-repeat right bottom;} .memberSmallBox .header h3 { margin:0; border:none; float:left; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #2895c0; background:url(../images/common/lineH3.gif) no-repeat right bottom;} diff --git a/modules/member/skins/default/css/green.css b/modules/member/skins/default/css/green.css index 878496c2b..68325b48a 100644 --- a/modules/member/skins/default/css/green.css +++ b/modules/member/skins/default/css/green.css @@ -1,4 +1,4 @@ @charset "utf-8"; -.boardHeader h3 { float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d0dbd1; border-bottom:3px solid #38b549; background:url(../images/common/lineH3.gif) no-repeat right bottom;} +.boardHeader h3 { margin:0; padding:0; float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d0dbd1; border-bottom:3px solid #38b549; background:url(../images/common/lineH3.gif) no-repeat right bottom;} .memberSmallBox .header h3 { margin:0; border:none; float:left; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #38b549; background:url(../images/common/lineH3.gif) no-repeat right bottom;} diff --git a/modules/member/skins/default/css/purple.css b/modules/member/skins/default/css/purple.css index 3cd1adf13..79dd2e074 100644 --- a/modules/member/skins/default/css/purple.css +++ b/modules/member/skins/default/css/purple.css @@ -1,4 +1,4 @@ @charset "utf-8"; -.boardHeader h3 { float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d1d9db; border-bottom:3px solid #ac19a9; background:url(../images/common/lineH3.gif) no-repeat right bottom;} +.boardHeader h3 { margin:0; padding:0; float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d1d9db; border-bottom:3px solid #ac19a9; background:url(../images/common/lineH3.gif) no-repeat right bottom;} .memberSmallBox .header h3 { margin:0; border:none; float:left; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #ac19a9; background:url(../images/common/lineH3.gif) no-repeat right bottom;} diff --git a/modules/member/skins/default/css/red.css b/modules/member/skins/default/css/red.css index e3af1d9e4..12c08b486 100644 --- a/modules/member/skins/default/css/red.css +++ b/modules/member/skins/default/css/red.css @@ -1,4 +1,4 @@ @charset "utf-8"; -.boardHeader h3 { float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #e1e1dd; border-bottom:3px solid #fe3614; background:url(../images/common/lineH3.gif) no-repeat right bottom;} +.boardHeader h3 { margin:0; padding:0; float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #e1e1dd; border-bottom:3px solid #fe3614; background:url(../images/common/lineH3.gif) no-repeat right bottom;} .memberSmallBox .header h3 { margin:0; border:none; float:left; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #fe3614; background:url(../images/common/lineH3.gif) no-repeat right bottom;} diff --git a/modules/member/skins/default/css/white.css b/modules/member/skins/default/css/white.css index 10cb268b4..a78b5fbdc 100644 --- a/modules/member/skins/default/css/white.css +++ b/modules/member/skins/default/css/white.css @@ -1,5 +1,5 @@ @charset "utf-8"; -.boardHeader h3 { float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border:none; border-left:1px solid #e1e1dd; border-bottom:3px solid #fe3614; background:url(../images/common/lineH3.gif) no-repeat right bottom;} +.boardHeader h3 { margin:0; padding:0; float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border:none; border-left:1px solid #e1e1dd; border-bottom:3px solid #fe3614; background:url(../images/common/lineH3.gif) no-repeat right bottom;} .memberSmallBox .header h3 { margin:0; border:none; float:left; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border:none; border-bottom:3px solid #fe3614; background:url(../images/common/lineH3.gif) no-repeat right bottom;} diff --git a/widgets/archive_list/skins/blog_archive_list/css/cyan.css b/widgets/archive_list/skins/blog_archive_list/css/cyan.css index cb9215921..9416c8d45 100644 --- a/widgets/archive_list/skins/blog_archive_list/css/cyan.css +++ b/widgets/archive_list/skins/blog_archive_list/css/cyan.css @@ -1,5 +1,5 @@ .blog_widget_cyan .archive { position:relative; border:1px solid #e0e1db; background:url(../images/cyan/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_cyan .archive h2 { position:relative; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;} -.blog_widget_cyan .archive .items { padding:.4em 1.2em .4em 1.2em; overflow:hidden;} -.blog_widget_cyan .archive .items li { font-size:.75em; display:block; color:#a4a4a4; margin-right:.1em; line-height:1.5em; font-family:tahoma; padding:3px 0 3px 0;} +.blog_widget_cyan .archive h2 { margin:0; padding:0; position:relative; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;} +.blog_widget_cyan .archive .items { margin:0; padding:.4em 1.2em .4em 1.2em; overflow:hidden;} +.blog_widget_cyan .archive .items li { list-style:none; font-size:.75em; display:block; color:#a4a4a4; margin-right:.1em; line-height:1.5em; font-family:tahoma; padding:3px 0 3px 0;} .blog_widget_cyan .archive .items li a { color:#a4a4a4; font-weight:bold; margin-right:1em; font-family:tahoma;} diff --git a/widgets/archive_list/skins/blog_archive_list/css/green.css b/widgets/archive_list/skins/blog_archive_list/css/green.css index 631d118ff..bad5c5960 100644 --- a/widgets/archive_list/skins/blog_archive_list/css/green.css +++ b/widgets/archive_list/skins/blog_archive_list/css/green.css @@ -1,5 +1,5 @@ .blog_widget_green .archive { position:relative; border:1px solid #e0e1db; background:url(../images/green/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_green .archive h2 { position:relative; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;} -.blog_widget_green .archive .items { padding:.4em 1.2em .4em 1.2em; overflow:hidden;} -.blog_widget_green .archive .items li { font-size:.75em; display:block; color:#a4a4a4; margin-right:.1em; line-height:1.5em; font-family:tahoma; padding:3px 0 3px 0;} +.blog_widget_green .archive h2 { margin:0; padding:0; position:relative; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;} +.blog_widget_green .archive .items { margin:0; padding:.4em 1.2em .4em 1.2em; overflow:hidden;} +.blog_widget_green .archive .items li { list-style:none; font-size:.75em; display:block; color:#a4a4a4; margin-right:.1em; line-height:1.5em; font-family:tahoma; padding:3px 0 3px 0;} .blog_widget_green .archive .items li a { color:#a4a4a4; font-weight:bold; margin-right:1em; font-family:tahoma;} diff --git a/widgets/archive_list/skins/blog_archive_list/css/normal.css b/widgets/archive_list/skins/blog_archive_list/css/normal.css index a60468fbd..c06e79e90 100644 --- a/widgets/archive_list/skins/blog_archive_list/css/normal.css +++ b/widgets/archive_list/skins/blog_archive_list/css/normal.css @@ -1,5 +1,5 @@ .blog_widget_normal .archive { position:relative; border:1px solid #e0e1db; background:url(../images/normal/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_normal .archive h2 { position:relative; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;} -.blog_widget_normal .archive .items { padding:.4em 1.2em .4em 1.2em; overflow:hidden;} -.blog_widget_normal .archive .items li { font-size:.75em; display:block; color:#a4a4a4; margin-right:.1em; line-height:1.5em; font-family:tahoma; padding:3px 0 3px 0;} +.blog_widget_normal .archive h2 { margin:0; padding:0; position:relative; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;} +.blog_widget_normal .archive .items { margin:0; padding:.4em 1.2em .4em 1.2em; overflow:hidden;} +.blog_widget_normal .archive .items li { list-style:none; font-size:.75em; display:block; color:#a4a4a4; margin-right:.1em; line-height:1.5em; font-family:tahoma; padding:3px 0 3px 0;} .blog_widget_normal .archive .items li a { color:#a4a4a4; font-weight:bold; margin-right:1em; font-family:tahoma;} diff --git a/widgets/archive_list/skins/blog_archive_list/css/purple.css b/widgets/archive_list/skins/blog_archive_list/css/purple.css index b15ae2fb6..27595149c 100644 --- a/widgets/archive_list/skins/blog_archive_list/css/purple.css +++ b/widgets/archive_list/skins/blog_archive_list/css/purple.css @@ -1,5 +1,5 @@ .blog_widget_purple .archive { position:relative; border:1px solid #e0e1db; background:url(../images/purple/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_purple .archive h2 { position:relative; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;} -.blog_widget_purple .archive .items { padding:.4em 1.2em .4em 1.2em; overflow:hidden;} -.blog_widget_purple .archive .items li { font-size:.75em; display:block; color:#a4a4a4; margin-right:.1em; line-height:1.5em; font-family:tahoma; padding:3px 0 3px 0;} +.blog_widget_purple .archive h2 { margin:0; padding:0; position:relative; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;} +.blog_widget_purple .archive .items { margin:0; padding:.4em 1.2em .4em 1.2em; overflow:hidden;} +.blog_widget_purple .archive .items li { list-style:none; font-size:.75em; display:block; color:#a4a4a4; margin-right:.1em; line-height:1.5em; font-family:tahoma; padding:3px 0 3px 0;} .blog_widget_purple .archive .items li a { color:#a4a4a4; font-weight:bold; margin-right:1em; font-family:tahoma;} diff --git a/widgets/archive_list/skins/blog_archive_list/css/red.css b/widgets/archive_list/skins/blog_archive_list/css/red.css index 3c93e6d30..dc4d4bf88 100644 --- a/widgets/archive_list/skins/blog_archive_list/css/red.css +++ b/widgets/archive_list/skins/blog_archive_list/css/red.css @@ -1,5 +1,5 @@ .blog_widget_red .archive { position:relative; border:1px solid #e0e1db; background:url(../images/red/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_red .archive h2 { position:relative; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;} -.blog_widget_red .archive .items { padding:.4em 1.2em .4em 1.2em; overflow:hidden;} -.blog_widget_red .archive .items li { font-size:.75em; display:block; color:#a4a4a4; margin-right:.1em; line-height:1.5em; font-family:tahoma; padding:3px 0 3px 0;} +.blog_widget_red .archive h2 { margin:0; padding:0; position:relative; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; font-family:Tahoma;} +.blog_widget_red .archive .items { margin:0; padding:.4em 1.2em .4em 1.2em; overflow:hidden;} +.blog_widget_red .archive .items li { list-style:none; font-size:.75em; display:block; color:#a4a4a4; margin-right:.1em; line-height:1.5em; font-family:tahoma; padding:3px 0 3px 0;} .blog_widget_red .archive .items li a { color:#a4a4a4; font-weight:bold; margin-right:1em; font-family:tahoma;} diff --git a/widgets/archive_list/skins/cozy_simple/archive_list.html b/widgets/archive_list/skins/cozy_simple/archive_list.html index bb317cc60..fe38b243a 100644 --- a/widgets/archive_list/skins/cozy_simple/archive_list.html +++ b/widgets/archive_list/skins/cozy_simple/archive_list.html @@ -12,7 +12,7 @@ -
+

{$widget_info->title}

diff --git a/widgets/archive_list/skins/cozy_simple/css/blue.css b/widgets/archive_list/skins/cozy_simple/css/blue.css index f0fb7138b..11597dc38 100644 --- a/widgets/archive_list/skins/cozy_simple/css/blue.css +++ b/widgets/archive_list/skins/cozy_simple/css/blue.css @@ -1 +1 @@ -div.archiveBox .header h2 { font-size:1em; color:#1187d8;} +div.cozy_ab_blue .header h2 { font-size:1em; color:#1187d8;} diff --git a/widgets/archive_list/skins/cozy_simple/css/bluish_green.css b/widgets/archive_list/skins/cozy_simple/css/bluish_green.css index e21255c50..406b1c7bb 100644 --- a/widgets/archive_list/skins/cozy_simple/css/bluish_green.css +++ b/widgets/archive_list/skins/cozy_simple/css/bluish_green.css @@ -1 +1 @@ -div.archiveBox .header h2 { font-size:1em; color:#9ab09f;} +div.cozy_ab_bluish_green .header h2 { font-size:1em; color:#9ab09f;} diff --git a/widgets/archive_list/skins/cozy_simple/css/common.css b/widgets/archive_list/skins/cozy_simple/css/common.css index 2cabfbb51..08c5ddf83 100644 --- a/widgets/archive_list/skins/cozy_simple/css/common.css +++ b/widgets/archive_list/skins/cozy_simple/css/common.css @@ -2,8 +2,9 @@ div.archiveBox { padding-bottom:1em;} div.archiveBox .header { padding:7px 0 0 12px; height:21px; _height:20px; background:#f5f5f5; } *:first-child+html div.archiveBox .header { height:20px; color:#ef2121;} -div.archiveBox ul { padding:.5em; overflow:hidden;} -div.archiveBox ul li { color:#a4a4a4; margin-right:.1em; line-height:1.5em; font-size:.9em;} +div.archiveBox .header h2 { margin:0; padding:0; } +div.archiveBox ul { margin:0; padding:.5em; overflow:hidden;} +div.archiveBox ul li { list-style:none;color:#a4a4a4; margin-right:.1em; line-height:1.5em; font-size:.9em;} div.archiveBox ul li a { font-size:.9em; color:#a4a4a4;} div.archiveBox ul li.typeA a { color:#717171; font-weight:bold;} div.archiveBox ul li.typeB a { color:#3d3d3d;} diff --git a/widgets/archive_list/skins/cozy_simple/css/green.css b/widgets/archive_list/skins/cozy_simple/css/green.css index 2b13656ea..00ac9e7ff 100644 --- a/widgets/archive_list/skins/cozy_simple/css/green.css +++ b/widgets/archive_list/skins/cozy_simple/css/green.css @@ -1 +1 @@ -div.archiveBox .header h2 { font-size:1em; color:#8dc63f;} +div.cozy_ab_green .header h2 { font-size:1em; color:#8dc63f;} diff --git a/widgets/archive_list/skins/cozy_simple/css/pink.css b/widgets/archive_list/skins/cozy_simple/css/pink.css index 9532eb080..566eb683b 100644 --- a/widgets/archive_list/skins/cozy_simple/css/pink.css +++ b/widgets/archive_list/skins/cozy_simple/css/pink.css @@ -1 +1 @@ -div.archiveBox .header h2 { font-size:1em; color:#f70795;} +div.cozy_ab_pink .header h2 { font-size:1em; color:#f70795;} diff --git a/widgets/archive_list/skins/cozy_simple/css/red.css b/widgets/archive_list/skins/cozy_simple/css/red.css index 602191381..d523187e2 100644 --- a/widgets/archive_list/skins/cozy_simple/css/red.css +++ b/widgets/archive_list/skins/cozy_simple/css/red.css @@ -1 +1 @@ -div.archiveBox .header h2 { font-size:1em; color:#ef2121;} +div.cozy_ab_red .header h2 { font-size:1em; color:#ef2121;} diff --git a/widgets/calendar/skins/blog_calendar_list/calendar.html b/widgets/calendar/skins/blog_calendar_list/calendar.html index a9099a851..ed24c4155 100644 --- a/widgets/calendar/skins/blog_calendar_list/calendar.html +++ b/widgets/calendar/skins/blog_calendar_list/calendar.html @@ -6,7 +6,7 @@ {@ $day = ''} diff --git a/widgets/calendar/skins/cozy_simple/calendar.html b/widgets/calendar/skins/cozy_simple/calendar.html index b364ed714..aeebf705d 100644 --- a/widgets/calendar/skins/cozy_simple/calendar.html +++ b/widgets/calendar/skins/cozy_simple/calendar.html @@ -14,7 +14,7 @@ -
+
- prev{zdate($widget_info->cur_date,"Y")}.{zdate($widget_info->cur_date,"m")}next + prev{zdate($widget_info->cur_date,"Y")}.{zdate($widget_info->cur_date,"m")}next
{zdate($widget_info->cur_date,"Y")}.{zdate($widget_info->cur_date,"m")} diff --git a/widgets/calendar/skins/cozy_simple/css/blue.css b/widgets/calendar/skins/cozy_simple/css/blue.css index df39703e1..30b5a8997 100644 --- a/widgets/calendar/skins/cozy_simple/css/blue.css +++ b/widgets/calendar/skins/cozy_simple/css/blue.css @@ -1 +1 @@ -div.calendarBox table caption { font:bold 1em 돋움; color:#1187d8; padding:1em;} +div.cozy_cal_blue table caption { font:bold 1em 돋움; color:#1187d8; padding:1em;} diff --git a/widgets/calendar/skins/cozy_simple/css/bluish_green.css b/widgets/calendar/skins/cozy_simple/css/bluish_green.css index 5958ce4cf..d2d22921e 100644 --- a/widgets/calendar/skins/cozy_simple/css/bluish_green.css +++ b/widgets/calendar/skins/cozy_simple/css/bluish_green.css @@ -1 +1 @@ -div.calendarBox table caption { font:bold 1em 돋움; color:#9ab09f; padding:1em;} +div.cozy_cal_bluish_green table caption { font:bold 1em 돋움; color:#9ab09f; padding:1em;} diff --git a/widgets/calendar/skins/cozy_simple/css/common.css b/widgets/calendar/skins/cozy_simple/css/common.css index 99a74cc24..2e7e41f54 100644 --- a/widgets/calendar/skins/cozy_simple/css/common.css +++ b/widgets/calendar/skins/cozy_simple/css/common.css @@ -5,13 +5,13 @@ div.calendarBox table caption a { padding:.2em;} div.calendarBox table caption a img { vertical-align:middle;} div.calendarBox table th { padding:.6em 0;} div.calendarBox table td { padding:.25em 0;} -div.calendarBox table th { font:bold .7em tahoma; color:#717171;} +div.calendarBox table th { font:bold .9em tahoma; color:#717171;} div.calendarBox table th.sun { color:#000000;} -div.calendarBox table td { text-align:center; font:.8em Tahoma; color:#9a9a9a;} -div.calendarBox table td a { font:.7em Tahoma; color:#9a9a9a;} +div.calendarBox table td { text-align:center; font:.9em Tahoma; color:#9a9a9a;} +div.calendarBox table td a { font:.9em Tahoma; color:#9a9a9a;} div.calendarBox table td.sun { color:#000000;} div.calendarBox table td.sun a { color:#000000;} -div.calendarBox table td.today a { font-weight:bold; color:#54564b;} +div.calendarBox table td.today a { font:.9em Tahoma; font-weight:bold; color:#54564b;} div.calendarBox table td.posted a { text-decoration:underline;} diff --git a/widgets/calendar/skins/cozy_simple/css/green.css b/widgets/calendar/skins/cozy_simple/css/green.css index 2ecf05d47..4f745d6d2 100644 --- a/widgets/calendar/skins/cozy_simple/css/green.css +++ b/widgets/calendar/skins/cozy_simple/css/green.css @@ -1 +1 @@ -div.calendarBox table caption { font:bold 1em 돋움; color:#8dc63f; padding:1em;} +div.cozy_cal_green table caption { font:bold 1em 돋움; color:#8dc63f; padding:1em;} diff --git a/widgets/calendar/skins/cozy_simple/css/pink.css b/widgets/calendar/skins/cozy_simple/css/pink.css index 674d0771a..d2bbdf733 100644 --- a/widgets/calendar/skins/cozy_simple/css/pink.css +++ b/widgets/calendar/skins/cozy_simple/css/pink.css @@ -1 +1 @@ -div.calendarBox table caption { font:bold 1em 돋움; color:#f70795; padding:1em;} +div.cozy_cal_pink table caption { font:bold 1em 돋움; color:#f70795; padding:1em;} diff --git a/widgets/calendar/skins/cozy_simple/css/red.css b/widgets/calendar/skins/cozy_simple/css/red.css index 00f106ad0..75bfa73a6 100644 --- a/widgets/calendar/skins/cozy_simple/css/red.css +++ b/widgets/calendar/skins/cozy_simple/css/red.css @@ -1 +1 @@ -div.calendarBox table caption { font:bold 1em 돋움; color:#ec1a25; padding:1em;} +div.cozy_cal_red table caption { font:bold 1em 돋움; color:#ec1a25; padding:1em;} diff --git a/widgets/counter_status/skins/default/normal/style.css b/widgets/counter_status/skins/default/normal/style.css index 528a1bea7..be4280c45 100644 --- a/widgets/counter_status/skins/default/normal/style.css +++ b/widgets/counter_status/skins/default/normal/style.css @@ -7,4 +7,4 @@ font-size:8pt; } -.counter_widget ul { list-style:none; } +.counter_widget ul { margin:0; padding:0; list-style:none; } diff --git a/widgets/counter_status/skins/styx_flash/counter_status.html b/widgets/counter_status/skins/styx_flash/counter_status.html index c8e91b966..e10425bcc 100644 --- a/widgets/counter_status/skins/styx_flash/counter_status.html +++ b/widgets/counter_status/skins/styx_flash/counter_status.html @@ -1,3 +1,5 @@ - +
+ +
diff --git a/widgets/login_info/skins/default/css/default.css b/widgets/login_info/skins/default/css/default.css index dc2fad50e..85df3265c 100644 --- a/widgets/login_info/skins/default/css/default.css +++ b/widgets/login_info/skins/default/css/default.css @@ -20,14 +20,16 @@ .box_login .form_field div { margin-top:2px; margin-bottom:3px; } .box_login input.submit { width:45px; height:45px; background:url(../images/default/login_btn_submit.gif) no-repeat; border:none; margin:9px 0 0 0; _margin:5px 0 0 0; cursor:pointer; } .box_login .input { width:140px; background-color: #ffffff; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:2px; height:14px; margin:0px; cursor:text; color:#666666;} +.box_login ul { margin:0; padding:0; } .box_login ul.option { clear:both; height:20px; margin:0 0 0 9px;} .box_login ul.option li { float:left; list-style:none;} .box_login ul.option li a.btn { background:url(../images/default/bul_01.gif) no-repeat left; padding-left:10px; margin-left:14px; } .box_login .checkbox { width:15px; height:15px; margin:-1px 0px 0px -1px; margin-right:2px; } .box_login .clear { clear:both; } +.box_login ul { margin:0; padding:0; } .box_login ul.extra_option { clear:both; height:40px; } .box_login ul.extra_option li a {text-decoration:none;} -.box_login ul.extra_option li a.btn { background:url(../images/default/bul_01.gif) no-repeat left; padding-left:10px; margin-left:20px; } +.box_login ul.extra_option li a.btn { background:url(../images/default/bul_01.gif) no-repeat left; padding-left:10px; margin-left:10px; } .openid_login { clear:both; height:38px; border:3px solid #D5D8DB; background-color:#FFFFFF; margin:0 0 10px 0; } .openid_login .openid_user_id { width:110px; _width:100px; background: url(../images/openid_login_bg.gif) left no-repeat; background-color: #ffffff; background-position: 0 50%; padding:3px 3px 3px 18px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:16px; line-height:1em; vertical-align:middle; margin-bottom:.5em; color:#666666;} @@ -39,6 +41,6 @@ .openid_login .wButtonTypeA .leftCap { width:2px; height:24px; background:url(../images/default/buttonTypeALeft.gif) no-repeat; margin:0 .3em 0 0; position:relative; left:-1px;} .openid_login .wButtonTypeA .rightCap { width:2px; height:24px; background:url(../images/default/buttonTypeARight.gif) no-repeat; margin:0 -1px 0 .4em;} .openid_login .wButtonTypeA .icon { margin:0 .2em;} -.openid_login .wButtonWrite ul { text-align:center; clear:both; display:block;} +.openid_login .wButtonWrite ul { text-align:center; clear:both; display:block; margin:0; padding:0; } .openid_login .wButtonWrite li { margin-top:.5em; float:left; margin-left:.3em; list-style:none;} diff --git a/widgets/login_info/skins/xe_official/css/black.css b/widgets/login_info/skins/xe_official/css/black.css index ca0ff6ad2..6de1cf77a 100644 --- a/widgets/login_info/skins/xe_official/css/black.css +++ b/widgets/login_info/skins/xe_official/css/black.css @@ -1,4 +1,4 @@ -.login_black { border:2px solid #515151; width:196px; position:relative; _padding-top:2px; display:block; } +.login_black { margin:0; padding:0; border:2px solid #515151; width:196px; position:relative; _padding-top:2px; display:block; } *:first-child+html body#black .login_black { padding-top:2px;} .login_black legend { display:none; width:0; height:0; overflow:hidden; font-size:0;} .login_black form { position:relative; border:1px solid #6b6b6b; padding:11px 11px 7px 11px; width:172px;} @@ -6,37 +6,38 @@ .login_black form .idpw { float:left; width:110px;} .login_black form .idpw input { border:1px solid #6b6b6b; color:#cbcbcb; width:105px; background:#515151; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma;} .login_black form .login { float:right;} -.login_black form p.save { clear:both; padding:.3em 0;} +.login_black form p.save { margin:0; clear:both; padding:.3em 0;} .login_black form p.save input { vertical-align:middle; _margin:-3px;} *:first-child+html body#black .login_black form p input { margin:-3px; } .login_black form p.save label { font:.9em "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#818181;} -.login_black form ul.help { border-top:1px solid #515151; overflow:hidden; padding:.5em 0 0 0; white-space:nowrap;} +.login_black form ul.help { margin:0; border-top:1px solid #515151; overflow:hidden; padding:.5em 0 0 0; white-space:nowrap;} .login_black form ul.help li { list-style:none; float:left; display:block; padding:0 3px 0 7px; background:url(../images/black/vrType1.gif) no-repeat left center;} .login_black form ul.help li.first-child { background:none; padding-left:0;} .login_black form ul.help li a { color:#818181; font:.9em "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; white-space:nowrap; text-decoration:none;} .login_black form ul.help li a:hover { text-decoration:underline;} .login_black form ul.help li.first-child a { color:#cbcbcb;} -.login_black form .userName { position:relative; width:172px; overflow:hidden; border-bottom:1px solid #515151; padding:0 0 6px 0; margin-top:-5px;} +.login_black form .userName { margin:0; position:relative; width:172px; overflow:hidden; border-bottom:1px solid #515151; padding:0 0 6px 0; margin-top:-5px;} .login_black form .userName strong { color:#cbcbcb; padding:4px 0 0 2px; font:bold .9em Tahoma;} .login_black form .userName a { position:relative; right:0px; } -.login_black form ul.userMenu { position:relative; padding:0 0 6px 4px; overflow:hidden; margin-top:10px;} +.login_black form ul.userMenu { margin:0; position:relative; padding:0 0 6px 4px; overflow:hidden; margin-top:10px;} .login_black form ul.userMenu li { list-style:none; color:#cbcbcb; list-style:none;padding-left:10px; background:url(../images/black/bulletFF1A00.gif) no-repeat left 4px; margin-bottom:5px;} .login_black form ul.userMenu li a { color:#cbcbcb;text-decoration:none;} .login_black form ul.userMenu li a:hover {text-decoration:underline;} -.login_black form p.latestLogin { color:#818181; font:.9em "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif;} +.login_black form p.latestLogin { margin:0; color:#818181; font:.9em "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif;} .login_black form p.latestLogin span { font:1em Tahoma;} img.login_mask { width:201px; height:5px; background:#3d3d3d; display:block;} -.openid_login_black { border:2px solid #515151; width:196px; position:relative; _padding-top:2px; display:block;} +.openid_login_black { padding:0; margin:0; border:2px solid #515151; width:196px; position:relative; _padding-top:2px; display:block;} *:first-child+html body#black .openid_login_black { padding-top:2px;} -.openid_login_black legend { display:block; width:0; height:0; overflow:hidden; font-size:0;} +.openid_login_black legend { display:none; width:0; height:0; overflow:hidden; font-size:0;} .openid_login_black form { position:relative; border:1px solid #6b6b6b; padding:11px 11px 7px 11px; width:172px;} .openid_login_black form .idpwWrap { overflow:hidden; clear:both; width:172px;} .openid_login_black form .idpw { float:left;} -.openid_login_black form .idpw p { margin-bottom:5px; background: url(../images/openid_login_bg.gif) left no-repeat; padding-left:18px; font-size:.9em Tahoma;color:#999999} +.openid_login_black form .idpw p { margin:0; padding:0; margin-bottom:5px; background: url(../images/openid_login_bg.gif) left no-repeat; padding-left:18px; font-size:.9em Tahoma;color:#999999} .openid_login_black form .idpw input { border:1px solid #6b6b6b; color:#cbcbcb; width:105px; background:#515151; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma;} .openid_login_black form .login { float:right;} -.openid_login_black form p.save { clear:both; padding:.3em 0;} +.openid_login_black form p.save { margin:0; padding:0; clear:both; padding:.3em 0;} .openid_login_black form p.save input { vertical-align:middle; _margin:-3px;} *:first-child+html body .openid_login_black form p input { margin:-3px; } +.openid_login_black form p.save label { font:.9em "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#818181;} diff --git a/widgets/login_info/skins/xe_official/css/default.css b/widgets/login_info/skins/xe_official/css/default.css index 2dc71947b..5d7bbb62c 100644 --- a/widgets/login_info/skins/xe_official/css/default.css +++ b/widgets/login_info/skins/xe_official/css/default.css @@ -1,4 +1,4 @@ -.login_default { border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block;} +.login_default { margin:0; padding:0; border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block;} *:first-child+html body .login_default { padding-top:2px;} .login_default legend { display:none; width:0; height:0; overflow:hidden; font-size:0;} .login_default form { position:relative; border:1px solid #cacaca; padding:11px 11px 7px 11px; width:172px;} @@ -6,11 +6,11 @@ .login_default form .idpw { float:left; width:110px; } .login_default form .idpw input { border:1px solid #c9c9c9; color:#282828; width:105px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma;} .login_default form .login { float:right;} -.login_default form p.save { clear:both; padding:.3em 0;} +.login_default form p.save { margin:0; clear:both; padding:.3em 0;} .login_default form p.save input { vertical-align:middle; _margin:-3px;} *:first-child+html body .login_default form p input { margin:-3px; } .login_default form p.save label { font:.9em "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#999999;} -.login_default form ul.help { border-top:1px solid #e4e4e4; overflow:hidden; padding:.5em 0 0 0; white-space:nowrap;} +.login_default form ul.help { margin:0; border-top:1px solid #e4e4e4; overflow:hidden; padding:.5em 0 0 0; white-space:nowrap;} .login_default form ul.help li { float:left; display:block; padding:0 3px 0 7px; background:url(../images/default/vrType1.gif) no-repeat left center;} .login_default form ul.help li.first-child { background:none; padding-left:0;} .login_default form ul.help li a { color:#999999; font:.9em "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; white-space:nowrap; text-decoration:none; } @@ -19,24 +19,24 @@ .login_default form .userName { position:relative; width:172px; overflow:hidden; border-bottom:1px solid #e4e4e4; padding:0 0 6px 0; margin-top:-5px;} .login_default form .userName strong { color:#282828; padding:4px 0 0 2px; font:bold .9em Tahoma;} .login_default form .userName a { position:relative; right:0px; } -.login_default form ul.userMenu { position:relative; padding:0 0 6px 4px; margin-top:10px;} +.login_default form ul.userMenu { margin:0; position:relative; padding:0 0 6px 4px; margin-top:10px;} .login_default form ul.userMenu li { list-style:none; padding-left:10px; background:url(../images/default/bulletFF1A00.gif) no-repeat left 4px; margin-bottom:5px;} .login_default form ul.userMenu li a { color:#54564b; text-decoration:none;} .login_default form ul.userMenu li a:hover { text-decoration:underline;} -.login_default form p.latestLogin { color:#999999; font:.9em "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif;} +.login_default form p.latestLogin { margin:0; color:#999999; font:.9em "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif;} .login_default form p.latestLogin span { font:1em Tahoma;} img.login_mask { width:201px; height:5px; background:#ffffff; display:block;} -.openid_login_default { border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block; } +.openid_login_default { margin:0; padding:0; border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block; } *:first-child+html body .openid_login_default { padding-top:2px;} -.openid_login_default legend { display:block; width:0; height:0; overflow:hidden; font-size:0;} +.openid_login_default legend { display:none; width:0; height:0; overflow:hidden; font-size:0;} .openid_login_default form { position:relative; border:1px solid #cacaca; padding:11px 11px 7px 11px; width:172px; } .openid_login_default form .idpwWrap { overflow:hidden; clear:both; width:172px;} .openid_login_default form .idpw { float:left;} -.openid_login_default form .idpw p { margin-bottom:5px; background: url(../images/openid_login_bg.gif) left no-repeat; padding-left:18px; font-size:.9em Tahoma;color:#999999} +.openid_login_default form .idpw p { margin:0; padding:0; margin-bottom:5px; background: url(../images/openid_login_bg.gif) left no-repeat; padding-left:18px; font-size:.9em Tahoma;color:#999999} .openid_login_default form .idpw input { border:1px solid #c9c9c9; color:#282828; width:105px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma; } .openid_login_default form .login { float:right;} -.openid_login_default form p.save { clear:both; padding:.3em 0;} +.openid_login_default form p.save { margin:0; padding:0; clear:both; padding:.3em 0;} .openid_login_default form p.save input { vertical-align:middle; _margin:-3px;} *:first-child+html body .openid_login_default form p input { margin:-3px; } .openid_login_default form p.save label { font:.9em "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#999999;} diff --git a/widgets/login_info/skins/xe_official/css/white.css b/widgets/login_info/skins/xe_official/css/white.css index c2aadf7e8..148e5fc0d 100644 --- a/widgets/login_info/skins/xe_official/css/white.css +++ b/widgets/login_info/skins/xe_official/css/white.css @@ -1,4 +1,4 @@ -.login_white { border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block;} +.login_white { margin:0; padding:0; border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block;} *:first-child+html body#white .login_white { padding-top:2px;} .login_white legend { display:none; width:0; height:0; overflow:hidden; font-size:0;} .login_white form { position:relative; border:1px solid #cacaca; padding:11px 11px 7px 11px; width:172px;} @@ -6,11 +6,11 @@ .login_white form .idpw { float:left; width:110px;} .login_white form .idpw input { border:1px solid #c9c9c9; color:#282828; width:105px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma;} .login_white form .login { float:right;} -.login_white form p.save { clear:both; padding:.3em 0;} +.login_white form p.save { margin:0; clear:both; padding:.3em 0;} .login_white form p.save input { vertical-align:middle; _margin:-3px;} *:first-child+html body#white .login_white form p input { margin:-3px; } .login_white form p.save label { font:.9em "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#999999;} -.login_white form ul.help { border-top:1px solid #e4e4e4; overflow:hidden; padding:.5em 0 0 0; white-space:nowrap;} +.login_white form ul.help { margin:0; border-top:1px solid #e4e4e4; overflow:hidden; padding:.5em 0 0 0; white-space:nowrap;} .login_white form ul.help li { list-style:none; float:left; display:block; padding:0 3px 0 7px; background:url(../images/white/vrType1.gif) no-repeat left center;} .login_white form ul.help li.first-child { background:none; padding-left:0;} .login_white form ul.help li a { color:#999999; font:.9em "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; white-space:nowrap; text-decoration:none; } @@ -19,20 +19,22 @@ .login_white form .userName { position:relative; width:172px; overflow:hidden; border-bottom:1px solid #e4e4e4; padding:0 0 6px 0; margin-top:-5px;} .login_white form .userName strong { color:#282828; padding:4px 0 0 2px; font:bold .9em Tahoma;} .login_white form .userName a { position:relative; right:0px; } -.login_white form ul.userMenu { position:relative; padding:0 0 6px 4px; overflow:hidden; margin-top:10px;} -.login_white form ul.userMenu li { list-style:none; padding-left:10px; background:url(../images/white/bulletFF1A00.gif) no-repeat left 4px; height:18px; margin-bottom:5px;} +.login_white form ul.userMenu { margin:0; position:relative; padding:0 0 6px 4px; overflow:hidden; margin-top:10px;} +.login_white form ul.userMenu li { list-style:none; padding-left:10px; background:url(../images/white/bulletFF1A00.gif) no-repeat left 4px; margin-bottom:5px;} .login_white form ul.userMenu li a { color:#54564b; text-decoration:none; } .login_white form ul.userMenu li a:hover { text-decoration:underline; } -.login_white form p.latestLogin { color:#999999; font:.9em "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif;} +.login_white form p.latestLogin { margin:0; color:#999999; font:.9em "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif;} .login_white form p.latestLogin span { font:1em Tahoma;} img.login_mask { width:201px; height:5px; background:#ffffff; display:block;} -.openid_login_white { border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block; } +.openid_login_white { margin:0; padding:0; border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block; } *:first-child+html body .openid_login_white { padding-top:2px;} -.openid_login_white legend { display:block; width:0; height:0; overflow:hidden; font-size:0;} +.openid_login_white legend { display:none; width:0; height:0; overflow:hidden; font-size:0;} .openid_login_white form { position:relative; border:1px solid #cacaca; padding:11px 11px 7px 11px; width:172px; } .openid_login_white form .idpwWrap { overflow:hidden; clear:both; width:172px;} .openid_login_white form .idpw { float:left;} -.openid_login_white form .idpw p { margin-bottom:5px; background: url(../images/openid_login_bg.gif) left no-repeat; padding-left:18px; font-size:.9em Tahoma;color:#999999} +.openid_login_white form .idpw p { margin:0; padding:0; margin-bottom:5px; background: url(../images/openid_login_bg.gif) left no-repeat; padding-left:18px; font-size:.9em Tahoma;color:#999999} .openid_login_white form .idpw input { border:1px solid #c9c9c9; color:#282828; width:105px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma; } .openid_login_white form .login { float:right;} +.openid_login_white form p.save { margin:0; padding: 0; } +.openid_login_white form p.save label { font:.9em "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#999999;} diff --git a/widgets/member_group/skins/default/css/normal.css b/widgets/member_group/skins/default/css/normal.css index 96616b60b..5e5f3d3c0 100644 --- a/widgets/member_group/skins/default/css/normal.css +++ b/widgets/member_group/skins/default/css/normal.css @@ -1,4 +1,4 @@ .mg { padding-bottom:15px; overflow:hidden; position:relative;} .mg h2 { font-size:1em; display:block; height:21px; padding:9px 0 0 9px; margin-bottom:4px; color:#000000; background:url(../images/normal/lineNotice.gif) no-repeat left bottom;} -.mg ul { overflow:hidden; width:100%;} +.mg ul { margin:0; padding:0; overflow:hidden; width:100%;} .mg ul li { white-space:nowrap; padding:3px 0 3px 10px; overflow:hidden; border-bottom:1px dashed #EEEEEE; color:#54564b;} diff --git a/widgets/newest_comment/skins/blog_newest_comment/css/cyan.css b/widgets/newest_comment/skins/blog_newest_comment/css/cyan.css index d70671b17..db26f4538 100644 --- a/widgets/newest_comment/skins/blog_newest_comment/css/cyan.css +++ b/widgets/newest_comment/skins/blog_newest_comment/css/cyan.css @@ -1,5 +1,5 @@ .blog_widget_cyan .newest_comment { border:1px solid #e0e1db; background:url(../images/cyan/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_cyan .newest_comment h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_cyan .newest_comment .items { padding:10px; overflow:hidden;} +.blog_widget_cyan .newest_comment h2 { margin:0; padding:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_cyan .newest_comment .items { margin:0; padding:10px; overflow:hidden;} .blog_widget_cyan .newest_comment .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%; padding:3px 0 3px 0;} .blog_widget_cyan .newest_comment .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; } diff --git a/widgets/newest_comment/skins/blog_newest_comment/css/green.css b/widgets/newest_comment/skins/blog_newest_comment/css/green.css index 49b59133b..71b66ad89 100644 --- a/widgets/newest_comment/skins/blog_newest_comment/css/green.css +++ b/widgets/newest_comment/skins/blog_newest_comment/css/green.css @@ -1,5 +1,5 @@ .blog_widget_green .newest_comment { border:1px solid #e0e1db; background:url(../images/green/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_green .newest_comment h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_green .newest_comment .items { padding:10px; overflow:hidden;} +.blog_widget_green .newest_comment h2 { margin:0; padding:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_green .newest_comment .items { margin:0; padding:10px; overflow:hidden;} .blog_widget_green .newest_comment .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%; padding:3px 0 3px 0;} .blog_widget_green .newest_comment .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; } diff --git a/widgets/newest_comment/skins/blog_newest_comment/css/normal.css b/widgets/newest_comment/skins/blog_newest_comment/css/normal.css index 5883222f5..b679c471e 100644 --- a/widgets/newest_comment/skins/blog_newest_comment/css/normal.css +++ b/widgets/newest_comment/skins/blog_newest_comment/css/normal.css @@ -1,5 +1,5 @@ .blog_widget_normal .newest_comment { border:1px solid #e0e1db; background:url(../images/normal/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_normal .newest_comment h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_normal .newest_comment .items { padding:10px; overflow:hidden;} +.blog_widget_normal .newest_comment h2 { margin:0; padding:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_normal .newest_comment .items { margin:0; padding:10px; overflow:hidden;} .blog_widget_normal .newest_comment .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%; padding:3px 0 3px 0;} .blog_widget_normal .newest_comment .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; text-decoration:none; } diff --git a/widgets/newest_comment/skins/blog_newest_comment/css/purple.css b/widgets/newest_comment/skins/blog_newest_comment/css/purple.css index 6acf820d3..a4e166594 100644 --- a/widgets/newest_comment/skins/blog_newest_comment/css/purple.css +++ b/widgets/newest_comment/skins/blog_newest_comment/css/purple.css @@ -1,5 +1,5 @@ .blog_widget_purple .newest_comment { border:1px solid #e0e1db; background:url(../images/purple/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_purple .newest_comment h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_purple .newest_comment .items { padding:10px; overflow:hidden;} +.blog_widget_purple .newest_comment h2 { margin:0; padding:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_purple .newest_comment .items { margin:0; padding:10px; overflow:hidden;} .blog_widget_purple .newest_comment .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%; padding:3px 0 3px 0;} .blog_widget_purple .newest_comment .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; } diff --git a/widgets/newest_comment/skins/blog_newest_comment/css/red.css b/widgets/newest_comment/skins/blog_newest_comment/css/red.css index 39bebe2b7..e21f3d5bc 100644 --- a/widgets/newest_comment/skins/blog_newest_comment/css/red.css +++ b/widgets/newest_comment/skins/blog_newest_comment/css/red.css @@ -1,5 +1,5 @@ .blog_widget_red .newest_comment { border:1px solid #e0e1db; background:url(../images/red/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_red .newest_comment h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_red .newest_comment .items { padding:10px; overflow:hidden;} +.blog_widget_red .newest_comment h2 { margin:0; padding:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_red .newest_comment .items { margin:0; padding:10px; overflow:hidden;} .blog_widget_red .newest_comment .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%; padding:3px 0 3px 0;} .blog_widget_red .newest_comment .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; } diff --git a/widgets/newest_comment/skins/cozy_simple/css/blue.css b/widgets/newest_comment/skins/cozy_simple/css/blue.css index 70ebc9b1c..91ee60548 100644 --- a/widgets/newest_comment/skins/cozy_simple/css/blue.css +++ b/widgets/newest_comment/skins/cozy_simple/css/blue.css @@ -1 +1 @@ -div.commentBox .header h2 { font-size:1em; color:#1187d8;} +div.cozy_nc_blue .header h2 { margin:0; padding:0; font-size:1em; color:#1187d8;} diff --git a/widgets/newest_comment/skins/cozy_simple/css/bluish_green.css b/widgets/newest_comment/skins/cozy_simple/css/bluish_green.css index 908e68b75..157a3a957 100644 --- a/widgets/newest_comment/skins/cozy_simple/css/bluish_green.css +++ b/widgets/newest_comment/skins/cozy_simple/css/bluish_green.css @@ -1 +1 @@ -div.commentBox .header h2 { font-size:1em; color:#9ab09f;} +div.cozy_nc_green.header h2 { margin:0; padding:0; font-size:1em; color:#9ab09f;} diff --git a/widgets/newest_comment/skins/cozy_simple/css/common.css b/widgets/newest_comment/skins/cozy_simple/css/common.css index 51f3dfe86..60c5fdd83 100644 --- a/widgets/newest_comment/skins/cozy_simple/css/common.css +++ b/widgets/newest_comment/skins/cozy_simple/css/common.css @@ -2,6 +2,6 @@ div.commentBox { padding-bottom:1em;} div.commentBox .header { padding:7px 0 0 12px; height:21px; _height:20px; background:#f5f5f5; } *:first-child+html div.commentBox .header { height:20px; color:#ef2121;} -div.commentBox ul { padding:.5em; overflow:hidden;} +div.commentBox ul { margin:0; padding:.5em; overflow:hidden;} div.commentBox ul li { color:#a4a4a4; margin-right:.1em; line-height:1.5em; list-style:none; overflow:hidden; white-space:nowrap;} div.commentBox ul li a { color:#a4a4a4; text-decoration:none;} diff --git a/widgets/newest_comment/skins/cozy_simple/css/green.css b/widgets/newest_comment/skins/cozy_simple/css/green.css index 2bd4446d2..abb8421cd 100644 --- a/widgets/newest_comment/skins/cozy_simple/css/green.css +++ b/widgets/newest_comment/skins/cozy_simple/css/green.css @@ -1 +1 @@ -div.commentBox .header h2 { font-size:1em; color:#8dc63f;} +div.cozy_nc_green .header h2 { margin:0; padding:0; font-size:1em; color:#8dc63f;} diff --git a/widgets/newest_comment/skins/cozy_simple/css/pink.css b/widgets/newest_comment/skins/cozy_simple/css/pink.css index 575584310..8e65d85f2 100644 --- a/widgets/newest_comment/skins/cozy_simple/css/pink.css +++ b/widgets/newest_comment/skins/cozy_simple/css/pink.css @@ -1 +1 @@ -div.commentBox .header h2 { font-size:1em; color:#f70795;} +div.cozy_nc_pink .header h2 { margin:0; padding:0; font-size:1em; color:#f70795;} diff --git a/widgets/newest_comment/skins/cozy_simple/css/red.css b/widgets/newest_comment/skins/cozy_simple/css/red.css index 4d47f62e9..5c2b9313e 100644 --- a/widgets/newest_comment/skins/cozy_simple/css/red.css +++ b/widgets/newest_comment/skins/cozy_simple/css/red.css @@ -1 +1 @@ -div.commentBox .header h2 { font-size:1em; color:#ef2121;} +div.cozy_nc_red .header h2 { margin:0; padding:0; font-size:1em; color:#ef2121;} diff --git a/widgets/newest_comment/skins/cozy_simple/list.html b/widgets/newest_comment/skins/cozy_simple/list.html index ddf7e5228..9cb2d270f 100644 --- a/widgets/newest_comment/skins/cozy_simple/list.html +++ b/widgets/newest_comment/skins/cozy_simple/list.html @@ -12,7 +12,7 @@ -
+

{$widget_info->title}

diff --git a/widgets/newest_document/skins/blog_newest_document/css/cyan.css b/widgets/newest_document/skins/blog_newest_document/css/cyan.css index 6de34c94b..a729e173c 100644 --- a/widgets/newest_document/skins/blog_newest_document/css/cyan.css +++ b/widgets/newest_document/skins/blog_newest_document/css/cyan.css @@ -1,5 +1,5 @@ .blog_widget_cyan .newest_document { border:1px solid #e0e1db; background:url(../images/cyan/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_cyan .newest_document h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_cyan .newest_document .items { padding:10px; overflow:hidden;} +.blog_widget_cyan .newest_document h2 { padding:0; margin:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_cyan .newest_document .items { margin:0;padding:10px; overflow:hidden;} .blog_widget_cyan .newest_document .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%; padding:3px 0 3px 0;} .blog_widget_cyan .newest_document .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; } diff --git a/widgets/newest_document/skins/blog_newest_document/css/green.css b/widgets/newest_document/skins/blog_newest_document/css/green.css index 7bf0dbebc..0a19b4ea7 100644 --- a/widgets/newest_document/skins/blog_newest_document/css/green.css +++ b/widgets/newest_document/skins/blog_newest_document/css/green.css @@ -1,5 +1,5 @@ .blog_widget_green .newest_document { border:1px solid #e0e1db; background:url(../images/green/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_green .newest_document h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_green .newest_document .items { padding:10px; overflow:hidden;} +.blog_widget_green .newest_document h2 { padding:0; margin:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_green .newest_document .items { margin:0;padding:10px; overflow:hidden;} .blog_widget_green .newest_document .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%; padding:3px 0 3px 0;} .blog_widget_green .newest_document .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; } diff --git a/widgets/newest_document/skins/blog_newest_document/css/normal.css b/widgets/newest_document/skins/blog_newest_document/css/normal.css index 870107d28..a430d126d 100644 --- a/widgets/newest_document/skins/blog_newest_document/css/normal.css +++ b/widgets/newest_document/skins/blog_newest_document/css/normal.css @@ -1,5 +1,5 @@ .blog_widget_normal .newest_document { border:1px solid #e0e1db; background:url(../images/normal/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_normal .newest_document h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_normal .newest_document .items { padding:10px; overflow:hidden;} +.blog_widget_normal .newest_document h2 { padding:0; margin:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_normal .newest_document .items { margin:0;padding:10px; overflow:hidden;} .blog_widget_normal .newest_document .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%; padding:3px 0 3px 0;} .blog_widget_normal .newest_document .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; text-decoration:none; } diff --git a/widgets/newest_document/skins/blog_newest_document/css/purple.css b/widgets/newest_document/skins/blog_newest_document/css/purple.css index f3550a339..04b6f151d 100644 --- a/widgets/newest_document/skins/blog_newest_document/css/purple.css +++ b/widgets/newest_document/skins/blog_newest_document/css/purple.css @@ -1,5 +1,5 @@ .blog_widget_purple .newest_document { border:1px solid #e0e1db; background:url(../images/purple/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_purple .newest_document h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_purple .newest_document .items { padding:10px; overflow:hidden;} +.blog_widget_purple .newest_document h2 { padding:0; margin:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_purple .newest_document .items { margin:0;padding:10px; overflow:hidden;} .blog_widget_purple .newest_document .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%; padding:3px 0 3px 0;} .blog_widget_purple .newest_document .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; } diff --git a/widgets/newest_document/skins/blog_newest_document/css/red.css b/widgets/newest_document/skins/blog_newest_document/css/red.css index 154cbc636..e64913eea 100644 --- a/widgets/newest_document/skins/blog_newest_document/css/red.css +++ b/widgets/newest_document/skins/blog_newest_document/css/red.css @@ -1,5 +1,5 @@ .blog_widget_red .newest_document { border:1px solid #e0e1db; background:url(../images/red/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_red .newest_document h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_red .newest_document .items { padding:10px; overflow:hidden;} +.blog_widget_red .newest_document h2 { padding:0; margin:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_red .newest_document .items { margin:0;padding:10px; overflow:hidden;} .blog_widget_red .newest_document .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%; padding:3px 0 3px 0;} .blog_widget_red .newest_document .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; } diff --git a/widgets/newest_document/skins/cozy_simple/css/blue.css b/widgets/newest_document/skins/cozy_simple/css/blue.css index defd87313..12fd9391b 100644 --- a/widgets/newest_document/skins/cozy_simple/css/blue.css +++ b/widgets/newest_document/skins/cozy_simple/css/blue.css @@ -1 +1 @@ -div.documentBox .header h2 { font-size:1em; color:#1187d8;} +div.cozy_blue .header h2 { margin:0; padding:0; font-size:1em; color:#1187d8;} diff --git a/widgets/newest_document/skins/cozy_simple/css/bluish_green.css b/widgets/newest_document/skins/cozy_simple/css/bluish_green.css index a0897736b..06ddd9a9e 100644 --- a/widgets/newest_document/skins/cozy_simple/css/bluish_green.css +++ b/widgets/newest_document/skins/cozy_simple/css/bluish_green.css @@ -1 +1 @@ -div.documentBox .header h2 { font-size:1em; color:#9ab09f;} +div.cozy_green .header h2 { margin:0; padding:0; font-size:1em; color:#9ab09f;} diff --git a/widgets/newest_document/skins/cozy_simple/css/common.css b/widgets/newest_document/skins/cozy_simple/css/common.css index dac05d95b..154761a22 100644 --- a/widgets/newest_document/skins/cozy_simple/css/common.css +++ b/widgets/newest_document/skins/cozy_simple/css/common.css @@ -2,6 +2,6 @@ div.documentBox { padding-bottom:1em;} div.documentBox .header { padding:7px 0 0 12px; height:21px; _height:20px; background:#f5f5f5; } *:first-child+html div.documentBox .header { height:20px; color:#ef2121;} -div.documentBox ul { padding:.5em; overflow:hidden;} +div.documentBox ul { margin:0; padding:.5em; overflow:hidden;} div.documentBox ul li { color:#a4a4a4; margin-right:.1em; line-height:1.5em; list-style:none;white-space:nowrap;overflow:hidden;} div.documentBox ul li a { color:#a4a4a4;text-decoration:none;} diff --git a/widgets/newest_document/skins/cozy_simple/css/green.css b/widgets/newest_document/skins/cozy_simple/css/green.css index ebe0066a8..5633e2a82 100644 --- a/widgets/newest_document/skins/cozy_simple/css/green.css +++ b/widgets/newest_document/skins/cozy_simple/css/green.css @@ -1 +1 @@ -div.documentBox .header h2 { font-size:1em; color:#8dc63f;} +div.cozy_green .header h2 { margin:0; padding:0; font-size:1em; color:#8dc63f;} diff --git a/widgets/newest_document/skins/cozy_simple/css/pink.css b/widgets/newest_document/skins/cozy_simple/css/pink.css index c06fc7343..839532afe 100644 --- a/widgets/newest_document/skins/cozy_simple/css/pink.css +++ b/widgets/newest_document/skins/cozy_simple/css/pink.css @@ -1 +1 @@ -div.documentBox .header h2 { font-size:1em; color:#f70795;} +div.cozy_pink .header h2 { margin:0; padding:0; font-size:1em; color:#f70795;} diff --git a/widgets/newest_document/skins/cozy_simple/css/red.css b/widgets/newest_document/skins/cozy_simple/css/red.css index ea497e003..add8fcdd0 100644 --- a/widgets/newest_document/skins/cozy_simple/css/red.css +++ b/widgets/newest_document/skins/cozy_simple/css/red.css @@ -1 +1 @@ -div.documentBox .header h2 { font-size:1em; color:#ef2121;} +div.cozy_red .header h2 { margin:0; padding:0; font-size:1em; color:#ef2121;} diff --git a/widgets/newest_document/skins/cozy_simple/list.html b/widgets/newest_document/skins/cozy_simple/list.html index 63e59082d..e031ff082 100644 --- a/widgets/newest_document/skins/cozy_simple/list.html +++ b/widgets/newest_document/skins/cozy_simple/list.html @@ -13,7 +13,7 @@ -
+

{$widget_info->title}

diff --git a/widgets/newest_document/skins/news_ticker/css/black.css b/widgets/newest_document/skins/news_ticker/css/black.css index 68c6e1f6c..8a602410b 100644 --- a/widgets/newest_document/skins/news_ticker/css/black.css +++ b/widgets/newest_document/skins/news_ticker/css/black.css @@ -5,7 +5,7 @@ .news_ticker_black .tickerBox { height:16px; margin:3px 0 3px 0; padding-top:3px; white-space:nowrap; overflow:hidden; } -.news_ticker_black ul { white-space:nowrap; overflow:hidden; } +.news_ticker_black ul { margin:0; padding:0; white-space:nowrap; overflow:hidden; } .news_ticker_black li { list-style:none; height:25px; overflow:hidden; white-space:nowrap; font-size:9pt;} .news_ticker_black ul li .title a { color:#FFFFFF; text-decoration:none; font-size:9pt;} diff --git a/widgets/newest_document/skins/news_ticker/css/blue.css b/widgets/newest_document/skins/news_ticker/css/blue.css index bc9c8af48..c99e874b3 100644 --- a/widgets/newest_document/skins/news_ticker/css/blue.css +++ b/widgets/newest_document/skins/news_ticker/css/blue.css @@ -5,7 +5,7 @@ .news_ticker_blue .tickerBox { height:25px; padding-top:6px; white-space:nowrap; overflow:hidden; } -.news_ticker_blue ul { white-space:nowrap; overflow:hidden; } +.news_ticker_blue ul { margin:0; padding:0; white-space:nowrap; overflow:hidden; } .news_ticker_blue li { list-style:none; height:25px; overflow:hidden; white-space:nowrap; font-size:9pt;} .news_ticker_blue ul li .title a { color:#000000; text-decoration:none; font-size:9pt;} diff --git a/widgets/newest_document/skins/news_ticker/css/gray.css b/widgets/newest_document/skins/news_ticker/css/gray.css index 3df93b939..94346b7e3 100644 --- a/widgets/newest_document/skins/news_ticker/css/gray.css +++ b/widgets/newest_document/skins/news_ticker/css/gray.css @@ -5,7 +5,7 @@ .news_ticker_gray .tickerBox { height:25px; padding-top:6px; white-space:nowrap; overflow:hidden; } -.news_ticker_gray ul { white-space:nowrap; overflow:hidden; } +.news_ticker_gray ul { margin:0; padding:0; white-space:nowrap; overflow:hidden; } .news_ticker_gray li { list-style:none; height:25px; overflow:hidden; white-space:nowrap; font-size:9pt;} .news_ticker_gray ul li .title a { color:#000000; text-decoration:none; font-size:9pt;} diff --git a/widgets/newest_document/skins/news_ticker/css/green.css b/widgets/newest_document/skins/news_ticker/css/green.css index bfbe66f5e..8c27c8bad 100644 --- a/widgets/newest_document/skins/news_ticker/css/green.css +++ b/widgets/newest_document/skins/news_ticker/css/green.css @@ -5,7 +5,7 @@ .news_ticker_green .tickerBox { height:25px; padding-top:6px; white-space:nowrap; overflow:hidden; } -.news_ticker_green ul { white-space:nowrap; overflow:hidden; } +.news_ticker_green ul { margin:0; padding:0; white-space:nowrap; overflow:hidden; } .news_ticker_green li { list-style:none; height:25px; overflow:hidden; white-space:nowrap; font-size:9pt;} .news_ticker_green ul li .title a { color:#000000; text-decoration:none; font-size:9pt;} diff --git a/widgets/newest_document/skins/news_ticker/css/none.css b/widgets/newest_document/skins/news_ticker/css/none.css index 328864919..2818357ff 100644 --- a/widgets/newest_document/skins/news_ticker/css/none.css +++ b/widgets/newest_document/skins/news_ticker/css/none.css @@ -5,7 +5,7 @@ .news_ticker_none .tickerBox { height:25px; padding-top:6px; white-space:nowrap; overflow:hidden; } -.news_ticker_none ul { white-space:nowrap; overflow:hidden; } +.news_ticker_none ul { margin:0; padding:0; white-space:nowrap; overflow:hidden; } .news_ticker_none li { list-style:none; height:25px; overflow:hidden; white-space:nowrap; font-size:9pt;} .news_ticker_none ul li .title a { color:#555555; text-decoration:none; font-size:9pt;} diff --git a/widgets/newest_document/skins/news_ticker/css/red.css b/widgets/newest_document/skins/news_ticker/css/red.css index 8e2acf392..5988be29b 100644 --- a/widgets/newest_document/skins/news_ticker/css/red.css +++ b/widgets/newest_document/skins/news_ticker/css/red.css @@ -5,7 +5,7 @@ .news_ticker_red .tickerBox { height:25px; padding-top:6px; white-space:nowrap; overflow:hidden; } -.news_ticker_red ul { white-space:nowrap; overflow:hidden; } +.news_ticker_red ul { margin:0; padding:0; white-space:nowrap; overflow:hidden; } .news_ticker_red li { list-style:none; height:25px; overflow:hidden; white-space:nowrap; font-size:9pt;} .news_ticker_red ul li .title a { color:#000000; text-decoration:none; font-size:9pt;} diff --git a/widgets/newest_document/skins/news_ticker/css/yellow.css b/widgets/newest_document/skins/news_ticker/css/yellow.css index ac1b5d26c..ab6c7b576 100644 --- a/widgets/newest_document/skins/news_ticker/css/yellow.css +++ b/widgets/newest_document/skins/news_ticker/css/yellow.css @@ -5,7 +5,7 @@ .news_ticker_yellow .tickerBox { height:25px; padding-top:6px; white-space:nowrap; overflow:hidden; } -.news_ticker_yellow ul { white-space:nowrap; overflow:hidden; } +.news_ticker_yellow ul { margin:0; padding:0; white-space:nowrap; overflow:hidden; } .news_ticker_yellow li { list-style:none; height:25px; overflow:hidden; white-space:nowrap; font-size:9pt;} .news_ticker_yellow ul li .title a { color:#000000; text-decoration:none; font-size:9pt;} diff --git a/widgets/newest_document/skins/xe_official/css/black.css b/widgets/newest_document/skins/xe_official/css/black.css index 59fdfe2cf..c112fd5bf 100644 --- a/widgets/newest_document/skins/xe_official/css/black.css +++ b/widgets/newest_document/skins/xe_official/css/black.css @@ -1,7 +1,7 @@ .latest_black { width:100%; padding-bottom:15px; overflow:hidden; position:relative;} -.latest_black h2 { display:block; height:21px; padding:9px 0 0 9px; margin-bottom:12px; color:#ffffff; background:url(../images/black/lineNotice.gif) no-repeat left bottom; font-size:1em;} +.latest_black h2 { margin:0; display:block; height:21px; padding:9px 0 0 9px; margin-bottom:12px; color:#ffffff; background:url(../images/black/lineNotice.gif) no-repeat left bottom; font-size:1em;} -.latest_black ul { } +.latest_black ul { margin:0; padding:0; } .latest_black ul li { height:20px; background:url(../images/black/bulletD0.gif) no-repeat left 5px; padding-left:10px; overflow:hidden; list-style:none; white-space:nowrap;} .latest_black ul li .title a { color:#818181; text-decoration:none; } diff --git a/widgets/newest_document/skins/xe_official/css/white.css b/widgets/newest_document/skins/xe_official/css/white.css index 078498964..b607c3c3e 100644 --- a/widgets/newest_document/skins/xe_official/css/white.css +++ b/widgets/newest_document/skins/xe_official/css/white.css @@ -1,7 +1,7 @@ .latest_white { width:100%; padding-bottom:15px; overflow:hidden; position:relative;} -.latest_white h2 { display:block; height:21px; padding:9px 0 0 9px; margin-bottom:12px; color:#000000; background:url(../images/white/lineNotice.gif) no-repeat left bottom; font-size:1em;} +.latest_white h2 { margin:0; display:block; height:21px; padding:9px 0 0 9px; margin-bottom:12px; color:#000000; background:url(../images/white/lineNotice.gif) no-repeat left bottom; font-size:1em;} -.latest_white ul { } +.latest_white ul { margin:0; padding:0; } .latest_white ul li { height:20px; background:url(../images/white/bulletD0.gif) no-repeat left 5px; padding-left:10px; overflow:hidden; list-style:none; white-space:nowrap;} .latest_white ul li .title a { color:#555555; text-decoration:none; } diff --git a/widgets/newest_document/skins/xe_official/list.html b/widgets/newest_document/skins/xe_official/list.html index 3e8b98490..1197f2d69 100644 --- a/widgets/newest_document/skins/xe_official/list.html +++ b/widgets/newest_document/skins/xe_official/list.html @@ -1,5 +1,4 @@ - diff --git a/widgets/newest_trackback/skins/blog_newest_trackback/css/cyan.css b/widgets/newest_trackback/skins/blog_newest_trackback/css/cyan.css index c2ab6f163..9ee84624d 100644 --- a/widgets/newest_trackback/skins/blog_newest_trackback/css/cyan.css +++ b/widgets/newest_trackback/skins/blog_newest_trackback/css/cyan.css @@ -1,5 +1,5 @@ .blog_widget_cyan .newest_trackback { border:1px solid #e0e1db; background:url(../images/cyan/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_cyan .newest_trackback h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_cyan .newest_trackback .items { padding:10px; overflow:hidden;} +.blog_widget_cyan .newest_trackback h2 { margin:0; padding:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_cyan .newest_trackback .items { margin:0; padding:10px; overflow:hidden;} .blog_widget_cyan .newest_trackback .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%; padding:3px 0 3px 0;} .blog_widget_cyan .newest_trackback .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; } diff --git a/widgets/newest_trackback/skins/blog_newest_trackback/css/green.css b/widgets/newest_trackback/skins/blog_newest_trackback/css/green.css index ee21c6ba8..acd70f1f8 100644 --- a/widgets/newest_trackback/skins/blog_newest_trackback/css/green.css +++ b/widgets/newest_trackback/skins/blog_newest_trackback/css/green.css @@ -1,5 +1,5 @@ .blog_widget_green .newest_trackback { border:1px solid #e0e1db; background:url(../images/green/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_green .newest_trackback h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_green .newest_trackback .items { padding:10px; overflow:hidden;} +.blog_widget_green .newest_trackback h2 { margin:0; padding:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_green .newest_trackback .items { margin:0; padding:10px; overflow:hidden;} .blog_widget_green .newest_trackback .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%; padding:3px 0 3px 0;} .blog_widget_green .newest_trackback .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; } diff --git a/widgets/newest_trackback/skins/blog_newest_trackback/css/normal.css b/widgets/newest_trackback/skins/blog_newest_trackback/css/normal.css index 425be87ff..909879244 100644 --- a/widgets/newest_trackback/skins/blog_newest_trackback/css/normal.css +++ b/widgets/newest_trackback/skins/blog_newest_trackback/css/normal.css @@ -1,5 +1,5 @@ .blog_widget_normal .newest_trackback { border:1px solid #e0e1db; background:url(../images/normal/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_normal .newest_trackback h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_normal .newest_trackback .items { padding:10px; overflow:hidden;} +.blog_widget_normal .newest_trackback h2 { margin:0; padding:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_normal .newest_trackback .items { margin:0; padding:10px; overflow:hidden;} .blog_widget_normal .newest_trackback .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%; padding:3px 0 3px 0;} .blog_widget_normal .newest_trackback .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; text-decoration:none; } diff --git a/widgets/newest_trackback/skins/blog_newest_trackback/css/purple.css b/widgets/newest_trackback/skins/blog_newest_trackback/css/purple.css index 3360e7e00..e8cce1df4 100644 --- a/widgets/newest_trackback/skins/blog_newest_trackback/css/purple.css +++ b/widgets/newest_trackback/skins/blog_newest_trackback/css/purple.css @@ -1,5 +1,5 @@ .blog_widget_purple .newest_trackback { border:1px solid #e0e1db; background:url(../images/purple/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_purple .newest_trackback h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_purple .newest_trackback .items { padding:10px; overflow:hidden;} +.blog_widget_purple .newest_trackback h2 { margin:0; padding:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_purple .newest_trackback .items { margin:0; padding:10px; overflow:hidden;} .blog_widget_purple .newest_trackback .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%; padding:3px 0 3px 0;} .blog_widget_purple .newest_trackback .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; } diff --git a/widgets/newest_trackback/skins/blog_newest_trackback/css/red.css b/widgets/newest_trackback/skins/blog_newest_trackback/css/red.css index 4966e2300..a228a3bd0 100644 --- a/widgets/newest_trackback/skins/blog_newest_trackback/css/red.css +++ b/widgets/newest_trackback/skins/blog_newest_trackback/css/red.css @@ -1,5 +1,5 @@ .blog_widget_red .newest_trackback { border:1px solid #e0e1db; background:url(../images/red/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_red .newest_trackback h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_red .newest_trackback .items { padding:10px; overflow:hidden;} +.blog_widget_red .newest_trackback h2 { margin:0; padding:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_red .newest_trackback .items { margin:0; padding:10px; overflow:hidden;} .blog_widget_red .newest_trackback .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%; padding:3px 0 3px 0;} .blog_widget_red .newest_trackback .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; } diff --git a/widgets/newest_trackback/skins/cozy_simple/css/blue.css b/widgets/newest_trackback/skins/cozy_simple/css/blue.css index 6ff18a1e0..a414ec65b 100644 --- a/widgets/newest_trackback/skins/cozy_simple/css/blue.css +++ b/widgets/newest_trackback/skins/cozy_simple/css/blue.css @@ -1 +1 @@ -div.trackbackBox .header h2 { font-size:1em; color:#1187d8;} +div.cozy_tb_blue .header h2 { margin:0; padding:0; font-size:1em; color:#1187d8;} diff --git a/widgets/newest_trackback/skins/cozy_simple/css/bluish_green.css b/widgets/newest_trackback/skins/cozy_simple/css/bluish_green.css index d43dfc191..c0d36ad9d 100644 --- a/widgets/newest_trackback/skins/cozy_simple/css/bluish_green.css +++ b/widgets/newest_trackback/skins/cozy_simple/css/bluish_green.css @@ -1 +1 @@ -div.trackbackBox .header h2 { font-size:1em; color:#9ab09f;} +div.cozy_tb_bluish_green .header h2 { margin:0; padding:0; font-size:1em; color:#9ab09f;} diff --git a/widgets/newest_trackback/skins/cozy_simple/css/common.css b/widgets/newest_trackback/skins/cozy_simple/css/common.css index c06f746c3..2f51335e4 100644 --- a/widgets/newest_trackback/skins/cozy_simple/css/common.css +++ b/widgets/newest_trackback/skins/cozy_simple/css/common.css @@ -2,6 +2,6 @@ div.trackbackBox { padding-bottom:1em;} div.trackbackBox .header { padding:7px 0 0 12px; height:21px; _height:20px; background:#f5f5f5; } *:first-child+html div.trackbackBox .header { height:20px; color:#ef2121;} -div.trackbackBox ul { padding:.5em; overflow:hidden;} +div.trackbackBox ul { margin:0; padding:.5em; overflow:hidden;} div.trackbackBox ul li { color:#a4a4a4; margin-right:.1em; line-height:1.5em;list-style:none;overflow:hidden;white-space:nowrap;} div.trackbackBox ul li a { color:#a4a4a4;text-decoration:none;} diff --git a/widgets/newest_trackback/skins/cozy_simple/css/green.css b/widgets/newest_trackback/skins/cozy_simple/css/green.css index 4158308a3..92fdcab98 100644 --- a/widgets/newest_trackback/skins/cozy_simple/css/green.css +++ b/widgets/newest_trackback/skins/cozy_simple/css/green.css @@ -1 +1 @@ -div.trackbackBox .header h2 { font-size:1em; color:#8dc63f;} +div.cozy_tb_green .header h2 { margin:0; padding:0; font-size:1em; color:#8dc63f;} diff --git a/widgets/newest_trackback/skins/cozy_simple/css/pink.css b/widgets/newest_trackback/skins/cozy_simple/css/pink.css index 354d82ac8..2c6ad048e 100644 --- a/widgets/newest_trackback/skins/cozy_simple/css/pink.css +++ b/widgets/newest_trackback/skins/cozy_simple/css/pink.css @@ -1 +1 @@ -div.trackbackBox .header h2 { font-size:1em; color:#f70795;} +div.cozy_tb_pink .header h2 { margin:0; padding:0; font-size:1em; color:#f70795;} diff --git a/widgets/newest_trackback/skins/cozy_simple/css/red.css b/widgets/newest_trackback/skins/cozy_simple/css/red.css index 7a4c1a742..dacfa95f0 100644 --- a/widgets/newest_trackback/skins/cozy_simple/css/red.css +++ b/widgets/newest_trackback/skins/cozy_simple/css/red.css @@ -1 +1 @@ -div.trackbackBox .header h2 { font-size:1em; color:#ef2121;} +div.cozy_tb_red .header h2 { margin:0; padding:0; font-size:1em; color:#ef2121;} diff --git a/widgets/newest_trackback/skins/cozy_simple/list.html b/widgets/newest_trackback/skins/cozy_simple/list.html index 6a77f3fad..aa1a4fe05 100644 --- a/widgets/newest_trackback/skins/cozy_simple/list.html +++ b/widgets/newest_trackback/skins/cozy_simple/list.html @@ -12,7 +12,7 @@ -
+

{$widget_info->title}

diff --git a/widgets/rank_count/skins/sz_xe/css/default.css b/widgets/rank_count/skins/sz_xe/css/default.css index b9d6c67cd..558e4f3f2 100644 --- a/widgets/rank_count/skins/sz_xe/css/default.css +++ b/widgets/rank_count/skins/sz_xe/css/default.css @@ -1,6 +1,6 @@ .szrank_count { width:100%; position:relative; } -.szrank_count h2 { height:21px; padding:9px 0 0 9px; font-size:1em;} -.szrank_count h5{ height:21px; padding:0 0 0 9px; font-size:1em;} +.szrank_count h2 { margin:0; height:21px; padding:9px 0 0 9px; font-size:1em;} +.szrank_count h5{ margin:0; height:21px; padding:0 0 0 9px; font-size:1em;} .szrank_count .left { cursor:pointer; height:20px; background:url(../images/default/bullet.gif) no-repeat left; padding-left:15px; overflow:hidden; } diff --git a/widgets/rank_download/skins/sz_xe/css/default.css b/widgets/rank_download/skins/sz_xe/css/default.css index 19a9fdcc1..996a7820a 100644 --- a/widgets/rank_download/skins/sz_xe/css/default.css +++ b/widgets/rank_download/skins/sz_xe/css/default.css @@ -1,5 +1,5 @@ .sz_download { width:100%; position:relative;} -.sz_download h2 { height:21px; padding:9px 0 0 9px; font-size:1em;} +.sz_download h2 { margin:0; height:21px; padding:9px 0 0 9px; font-size:1em;} .sz_download .left { cursor:pointer; height:20px; background:url(../images/default/bullet.gif) no-repeat left; padding-left:15px; overflow:hidden; } diff --git a/widgets/rank_point/skins/sz_xe/css/default.css b/widgets/rank_point/skins/sz_xe/css/default.css index bfcaddf1f..538d20215 100644 --- a/widgets/rank_point/skins/sz_xe/css/default.css +++ b/widgets/rank_point/skins/sz_xe/css/default.css @@ -1,5 +1,5 @@ .sz_point { width:100%; position:relative;} -.sz_point h2 { height:21px; padding:9px 0 0 9px; font-size:1em;} +.sz_point h2 { margin:0; height:21px; padding:9px 0 0 9px; font-size:1em;} .sz_point .left { cursor:pointer; height:20px; background:url(../images/default/bullet.gif) no-repeat left; padding-left:15px; overflow:hidden; } @@ -18,4 +18,4 @@ .sz_point a {color: #3e81de; text-decoration:none;} .sz_point a:hover {color: #3e81de;} -.sz_point a:visit {color: #3e81de;} \ No newline at end of file +.sz_point a:visit {color: #3e81de;} diff --git a/widgets/rank_point/skins/sz_xe/skin.xml b/widgets/rank_point/skins/sz_xe/skin.xml index 9d8b1b84b..0ad53176a 100644 --- a/widgets/rank_point/skins/sz_xe/skin.xml +++ b/widgets/rank_point/skins/sz_xe/skin.xml @@ -23,7 +23,6 @@ - 기본 デフォルト diff --git a/widgets/rss_reader/skins/sz_select/css/select.css b/widgets/rss_reader/skins/sz_select/css/select.css index d0e95fc8d..2b0a4d74b 100644 --- a/widgets/rss_reader/skins/sz_select/css/select.css +++ b/widgets/rss_reader/skins/sz_select/css/select.css @@ -1,5 +1,5 @@ .rss_reader_sz_select { width:100%; padding-bottom:15px; overflow:hidden; position:relative;} -.rss_reader_sz_select h2 { height:21px; padding:9px 0 0 9px; font-size:1em;} +.rss_reader_sz_select h2 { margin:0; padding:0; height:21px; padding:9px 0 0 9px; font-size:1em;} .rss_reader_sz_select h2 a, .rss_reader_sz_select .tabcontent_rss a { text-decoration:none; color:#000000;} .rss_reader_sz_select h2 a:hover, diff --git a/widgets/rss_reader/skins/sz_xe/css/default.css b/widgets/rss_reader/skins/sz_xe/css/default.css index 1761ed8fe..b896b731c 100644 --- a/widgets/rss_reader/skins/sz_xe/css/default.css +++ b/widgets/rss_reader/skins/sz_xe/css/default.css @@ -1,5 +1,7 @@ .rss_reader_sz_xe { position:relative;} -.rss_reader_sz_xe h2 { height:21px; padding:9px 0 0 9px; font-size:1em;} +.rss_reader_sz_xe h2 { margin:0; padding;0; height:21px; padding:9px 0 0 0; font-size:1em;} + +.rss_reader_sz_xe ul { margin:0; padding:0; height:20px; overflow:hidden; list-style:none; white-space:nowrap; } .rss_reader_sz_xe ul li { height:20px; overflow:hidden; list-style:none; white-space:nowrap; } diff --git a/widgets/rss_reader/skins/sz_xe/list.html b/widgets/rss_reader/skins/sz_xe/list.html index 5ecdad1ef..a500f6a2b 100644 --- a/widgets/rss_reader/skins/sz_xe/list.html +++ b/widgets/rss_reader/skins/sz_xe/list.html @@ -14,4 +14,4 @@
-
\ No newline at end of file +
diff --git a/widgets/rss_reader/skins/xe_official/css/black.css b/widgets/rss_reader/skins/xe_official/css/black.css index 11098b2d6..e5d5ccf37 100644 --- a/widgets/rss_reader/skins/xe_official/css/black.css +++ b/widgets/rss_reader/skins/xe_official/css/black.css @@ -1,8 +1,10 @@ .rss_reader_black { width:100%; padding-bottom:15px; overflow:hidden; position:relative;} -.rss_reader_black h2 { display:block; height:21px; padding:9px 0 0 9px; margin-bottom:12px; color:#ffffff; background:url(../images/black/lineNotice.gif) no-repeat left bottom; font-size:1em;} +.rss_reader_black h2 { margin:0; display:block; height:21px; padding:9px 0 0 9px; margin-bottom:12px; color:#ffffff; background:url(../images/black/lineNotice.gif) no-repeat left bottom; font-size:1em;} .rss_reader_black h2 a { text-decoration:none; color:#ffffff;} .rss_reader_black h2 a:hover { text-decoration:underline;} +.rss_reader_black ul { margin:0; padding:0; } + .rss_reader_black ul li { height:20px; background:url(../images/black/bulletD0.gif) no-repeat left 5px; padding-left:10px; overflow:hidden; list-style:none; white-space:nowrap;} .rss_reader_black ul li .title a { color:#818181; text-decoration:none; } diff --git a/widgets/rss_reader/skins/xe_official/css/white.css b/widgets/rss_reader/skins/xe_official/css/white.css index c79d35157..69800538f 100644 --- a/widgets/rss_reader/skins/xe_official/css/white.css +++ b/widgets/rss_reader/skins/xe_official/css/white.css @@ -3,6 +3,8 @@ .rss_reader_white h2 a { text-decoration:none; color:#000000;} .rss_reader_white h2 a:hover { text-decoration:underline;} +.rss_reader_white ul { margin:0; padding:0; } + .rss_reader_white ul li { height:20px; background:url(../images/white/bulletD0.gif) no-repeat left 5px; padding-left:10px; overflow:hidden; list-style:none; white-space:nowrap;} .rss_reader_white ul li .title a { color:#555555; text-decoration:none; } diff --git a/widgets/rss_reader/skins/xe_select/css/select.css b/widgets/rss_reader/skins/xe_select/css/select.css index e30c93b8c..5320558ae 100644 --- a/widgets/rss_reader/skins/xe_select/css/select.css +++ b/widgets/rss_reader/skins/xe_select/css/select.css @@ -1,5 +1,5 @@ .rss_reader_select { width:100%; padding-bottom:15px; overflow:hidden; position:relative;} -.rss_reader_select h2 { display:block; height:21px; padding:9px 0 0 9px; margin-bottom:12px; color:#000000; background:url(../images/black/lineNotice.gif) no-repeat left bottom; font-size:1em;} +.rss_reader_select h2 { margin:0; display:block; height:21px; padding:9px 0 0 9px; margin-bottom:12px; color:#000000; background:url(../images/black/lineNotice.gif) no-repeat left bottom; font-size:1em;} .rss_reader_select h2 a, .rss_reader_select .tabcontent_rss a { text-decoration:none; color:#000000;} .rss_reader_select h2 a:hover, diff --git a/widgets/rss_reader/skins/xe_select/list.html b/widgets/rss_reader/skins/xe_select/list.html index 0edf6ed3d..6935aec3a 100644 --- a/widgets/rss_reader/skins/xe_select/list.html +++ b/widgets/rss_reader/skins/xe_select/list.html @@ -20,7 +20,7 @@
{@$i=1} -
+
{$item->date} | {$item->author}
@@ -28,5 +28,5 @@
{@$i++} -
+
diff --git a/widgets/tag_list/skins/blog_tag_list/css/cyan.css b/widgets/tag_list/skins/blog_tag_list/css/cyan.css index 679f52370..1ebc30a46 100644 --- a/widgets/tag_list/skins/blog_tag_list/css/cyan.css +++ b/widgets/tag_list/skins/blog_tag_list/css/cyan.css @@ -1,5 +1,5 @@ .blog_widget_cyan .tag_list { border:1px solid #e0e1db; background:url(../images/cyan/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_cyan .tag_list h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_cyan .tag_list .items { padding:10px; overflow:hidden;} +.blog_widget_cyan .tag_list h2 { padding:0; margin:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_cyan .tag_list .items { margin:0; padding:10px; overflow:hidden;} .blog_widget_cyan .tag_list .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%;} .blog_widget_cyan .tag_list .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; } diff --git a/widgets/tag_list/skins/blog_tag_list/css/green.css b/widgets/tag_list/skins/blog_tag_list/css/green.css index aa6e63562..2ef58b653 100644 --- a/widgets/tag_list/skins/blog_tag_list/css/green.css +++ b/widgets/tag_list/skins/blog_tag_list/css/green.css @@ -1,5 +1,5 @@ .blog_widget_green .tag_list { border:1px solid #e0e1db; background:url(../images/green/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_green .tag_list h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_green .tag_list .items { padding:10px; overflow:hidden;} +.blog_widget_green .tag_list h2 { margin:0; padding:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_green .tag_list .items { margin:0; padding:10px; overflow:hidden;} .blog_widget_green .tag_list .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%;} .blog_widget_green .tag_list .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; } diff --git a/widgets/tag_list/skins/blog_tag_list/css/normal.css b/widgets/tag_list/skins/blog_tag_list/css/normal.css index 87608a88f..d010e7fc6 100644 --- a/widgets/tag_list/skins/blog_tag_list/css/normal.css +++ b/widgets/tag_list/skins/blog_tag_list/css/normal.css @@ -1,5 +1,5 @@ .blog_widget_normal .tag_list { border:1px solid #e0e1db; background:url(../images/normal/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_normal .tag_list h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_normal .tag_list .items { padding:10px; overflow:hidden;} +.blog_widget_normal .tag_list h2 { margin:0; padding:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_normal .tag_list .items { margin:0; padding:10px; overflow:hidden;} .blog_widget_normal .tag_list .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%;} .blog_widget_normal .tag_list .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; text-decoration:none; } diff --git a/widgets/tag_list/skins/blog_tag_list/css/purple.css b/widgets/tag_list/skins/blog_tag_list/css/purple.css index 31391be04..974396551 100644 --- a/widgets/tag_list/skins/blog_tag_list/css/purple.css +++ b/widgets/tag_list/skins/blog_tag_list/css/purple.css @@ -1,5 +1,5 @@ .blog_widget_purple .tag_list { border:1px solid #e0e1db; background:url(../images/purple/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_purple .tag_list h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_purple .tag_list .items { padding:10px; overflow:hidden;} +.blog_widget_purple .tag_list h2 { margin:0; padding:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_purple .tag_list .items { margin:0; padding:10px; overflow:hidden;} .blog_widget_purple .tag_list .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%;} .blog_widget_purple .tag_list .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; } diff --git a/widgets/tag_list/skins/blog_tag_list/css/red.css b/widgets/tag_list/skins/blog_tag_list/css/red.css index 87629f191..6bcd4df77 100644 --- a/widgets/tag_list/skins/blog_tag_list/css/red.css +++ b/widgets/tag_list/skins/blog_tag_list/css/red.css @@ -1,5 +1,5 @@ .blog_widget_red .tag_list { border:1px solid #e0e1db; background:url(../images/red/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } -.blog_widget_red .tag_list h2 { border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } -.blog_widget_red .tag_list .items { padding:10px; overflow:hidden;} +.blog_widget_red .tag_list h2 { margin:0; padding:0; border-left:1px solid #ffffff; border-right:1px solid #ffffff; padding:7px 0 0 12px; height:21px; _height:20px; font-size:1em; color:#54564b; } +.blog_widget_red .tag_list .items { margin:0; padding:10px; overflow:hidden;} .blog_widget_red .tag_list .items li { font-size:.9em; display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; white-space:nowrap; list-style:none; width:100%;} .blog_widget_red .tag_list .items li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; } diff --git a/widgets/tag_list/skins/cozy_simple/css/blue.css b/widgets/tag_list/skins/cozy_simple/css/blue.css index 272b2697f..bed495604 100644 --- a/widgets/tag_list/skins/cozy_simple/css/blue.css +++ b/widgets/tag_list/skins/cozy_simple/css/blue.css @@ -1 +1 @@ -div.tagBox .header h2 { font-size:1em; color:#1187d8;} +div.cozy_tag_blue .header h2 { padding:0; margin:0; font-size:1em; color:#1187d8;} diff --git a/widgets/tag_list/skins/cozy_simple/css/bluish_green.css b/widgets/tag_list/skins/cozy_simple/css/bluish_green.css index da4efd651..43ee14edb 100644 --- a/widgets/tag_list/skins/cozy_simple/css/bluish_green.css +++ b/widgets/tag_list/skins/cozy_simple/css/bluish_green.css @@ -1 +1 @@ -div.tagBox .header h2 { font-size:1em; color:#9ab09f;} +div.cozy_tag_bluish_green .header h2 { margin:0; padding:0; font-size:1em; color:#9ab09f;} diff --git a/widgets/tag_list/skins/cozy_simple/css/common.css b/widgets/tag_list/skins/cozy_simple/css/common.css index c416e9612..ebb72064d 100644 --- a/widgets/tag_list/skins/cozy_simple/css/common.css +++ b/widgets/tag_list/skins/cozy_simple/css/common.css @@ -2,7 +2,7 @@ div.tagBox { padding-bottom:1em;} div.tagBox .header { padding:7px 0 0 12px; height:21px; _height:20px; background:#f5f5f5; } *:first-child+html div.tagBox .header { height:20px; color:#ef2121;} -div.tagBox ul { padding:.5em; overflow:hidden;} +div.tagBox ul { margin:0; padding:.5em; overflow:hidden;} div.tagBox ul li { display:inline; color:#a4a4a4; margin-right:.1em; line-height:1.5em;} div.tagBox ul li a { color:#a4a4a4;} div.tagBox ul li.typeA a { color:#717171; font-weight:bold;} diff --git a/widgets/tag_list/skins/cozy_simple/css/green.css b/widgets/tag_list/skins/cozy_simple/css/green.css index 17226a659..f0b9169d9 100644 --- a/widgets/tag_list/skins/cozy_simple/css/green.css +++ b/widgets/tag_list/skins/cozy_simple/css/green.css @@ -1 +1 @@ -div.tagBox .header h2 { font-size:1em; color:#8dc63f;} +div.cozy_tag_green .header h2 { padding:0; margin:0; font-size:1em; color:#8dc63f;} diff --git a/widgets/tag_list/skins/cozy_simple/css/pink.css b/widgets/tag_list/skins/cozy_simple/css/pink.css index bc0312af4..11fed825c 100644 --- a/widgets/tag_list/skins/cozy_simple/css/pink.css +++ b/widgets/tag_list/skins/cozy_simple/css/pink.css @@ -1 +1 @@ -div.tagBox .header h2 { font-size:1em; color:#f70795;} +div.cozy_tag_pink .header h2 { padding:0; margin:0; font-size:1em; color:#f70795;} diff --git a/widgets/tag_list/skins/cozy_simple/css/red.css b/widgets/tag_list/skins/cozy_simple/css/red.css index 222ed6f31..4a497f37f 100644 --- a/widgets/tag_list/skins/cozy_simple/css/red.css +++ b/widgets/tag_list/skins/cozy_simple/css/red.css @@ -1 +1 @@ -div.tagBox .header h2 { font-size:1em; color:#ef2121;} +div.cozy_tag_red .header h2 { margin:0; padding:0; font-size:1em; color:#ef2121;} diff --git a/widgets/tag_list/skins/cozy_simple/tags.html b/widgets/tag_list/skins/cozy_simple/tags.html index 0383a5bc5..bc038a4a9 100644 --- a/widgets/tag_list/skins/cozy_simple/tags.html +++ b/widgets/tag_list/skins/cozy_simple/tags.html @@ -12,7 +12,7 @@ -
+

{$widget_info->title}

diff --git a/widgets/webzine/skins/notice_style/css/normal.css b/widgets/webzine/skins/notice_style/css/normal.css index 3c2881850..307526fab 100644 --- a/widgets/webzine/skins/notice_style/css/normal.css +++ b/widgets/webzine/skins/notice_style/css/normal.css @@ -1,6 +1,6 @@ .noticeBox { padding-bottom:5px; overflow:hidden; } -.noticeBox h2 { font-size:1em; display:block; height:21px; padding:9px 0 0 9px; margin-bottom:5px; color:#000000; background:url(../images/normal/lineNotice.gif) no-repeat left bottom;} +.noticeBox h2 { margin:0; font-size:1em; display:block; height:21px; padding:9px 0 0 9px; margin-bottom:5px; color:#000000; background:url(../images/normal/lineNotice.gif) no-repeat left bottom;} .noticeBox .listTable { width:100%; table-layout:fixed; border:none;} diff --git a/widgets/webzine/skins/xe_official/css/normal.css b/widgets/webzine/skins/xe_official/css/normal.css index 9585eaa20..2d7ca3234 100644 --- a/widgets/webzine/skins/xe_official/css/normal.css +++ b/widgets/webzine/skins/xe_official/css/normal.css @@ -1,5 +1,5 @@ .nw_box { padding-bottom:5px; overflow:hidden; } -.nw_box h2 { font-size:1em; display:block; height:21px; padding:9px 0 0 9px; margin-bottom:5px; color:#000000; background:url(../images/normal/lineNotice.gif) no-repeat left bottom;} +.nw_box h2 { margin:0; font-size:1em; display:block; height:21px; padding:9px 0 0 9px; margin-bottom:5px; color:#000000; background:url(../images/normal/lineNotice.gif) no-repeat left bottom;} .nw_box a.more { text-decoration:none;} .nw_box a.more:hover { text-decoration:underline;} From 9a18eec669b56b03df8aac22c1142d4fa3e6a5e9 Mon Sep 17 00:00:00 2001 From: supershop Date: Mon, 25 Feb 2008 18:37:59 +0000 Subject: [PATCH 054/140] =?UTF-8?q?=EC=98=81=EC=96=B4=20-=20=EA=B8=B0?= =?UTF-8?q?=EC=A1=B4=20=EB=B2=88=EC=97=AD=EB=B3=B8=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EB=B0=8F=20=EC=B6=94=EA=B0=80=20=EB=B2=88=EC=97=AD?= 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@3795 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/file/lang/en.lang.php | 2 +- modules/lifepod/lang/en.lang.php | 2 +- widgets/DroArc_clock/conf/info.xml | 2 +- widgets/calendar/conf/info.xml | 2 +- widgets/category/conf/info.xml | 8 ++++---- widgets/counter_status/conf/info.xml | 2 +- widgets/forum/conf/info.xml | 2 +- widgets/gagachat/conf/info.xml | 8 ++++---- widgets/image_counter/conf/info.xml | 2 +- widgets/language_select/conf/info.xml | 2 +- widgets/login_info/conf/info.xml | 2 +- widgets/member_group/conf/info.xml | 2 +- widgets/newest_comment/conf/info.xml | 2 +- widgets/newest_document/conf/info.xml | 2 +- widgets/newest_images/conf/info.xml | 2 +- widgets/newest_trackback/conf/info.xml | 2 +- widgets/rank_point/conf/info.xml | 2 +- widgets/tab_newest_document/conf/info.xml | 2 +- widgets/tag_list/conf/info.xml | 2 +- widgets/webzine/conf/info.xml | 2 +- 20 files changed, 26 insertions(+), 26 deletions(-) diff --git a/modules/file/lang/en.lang.php b/modules/file/lang/en.lang.php index d39456427..1e2aec7e2 100644 --- a/modules/file/lang/en.lang.php +++ b/modules/file/lang/en.lang.php @@ -29,7 +29,7 @@ $lang->msg_not_permitted_download = 'You do not have permission to download'; $lang->msg_cart_is_null = 'Please select file(s) to delete'; $lang->msg_checked_file_is_deleted = '%d attachment(s) was(were) deleted'; - $lang->msg_exceeds_limit_size = 'File size of attachment is bigger than maximum size.'; + $lang->msg_exceeds_limit_size = 'File size of attachment is bigger than allowed size.'; $lang->search_target_list = array( 'filename' => 'File Name', diff --git a/modules/lifepod/lang/en.lang.php b/modules/lifepod/lang/en.lang.php index c77d06ae1..711c41a22 100644 --- a/modules/lifepod/lang/en.lang.php +++ b/modules/lifepod/lang/en.lang.php @@ -11,5 +11,5 @@ $lang->cmd_lifepod_list = 'Lifepod List'; $lang->cmd_view_info = 'Lifepod Info.'; - $lang->about_lifepod = "Lifepod is a calendar service provided by Openmaru Studio.
Lifepod Zeroboard XE module desplays Lifepod's specific calendars as internal documents."; + $lang->about_lifepod = "Lifepod is a calendar service provided by Openmaru Studio.
Lifepod Zeroboard XE module displays Lifepod's specific calendars as internal documents."; ?> diff --git a/widgets/DroArc_clock/conf/info.xml b/widgets/DroArc_clock/conf/info.xml index e994f0ee9..0f58ef710 100644 --- a/widgets/DroArc_clock/conf/info.xml +++ b/widgets/DroArc_clock/conf/info.xml @@ -3,7 +3,7 @@ 플래시 디지털 시계 Flash数字时钟 フラッシュデジタル時計 - Flash digital Clock + Flash Digital Clock Reloj digital Flash Цифровые Flash часы diff --git a/widgets/calendar/conf/info.xml b/widgets/calendar/conf/info.xml index fdb748365..a7ab54cb4 100644 --- a/widgets/calendar/conf/info.xml +++ b/widgets/calendar/conf/info.xml @@ -3,7 +3,7 @@ 달력 출력 日历 カレンダー表示 - Display Calendar + Calendar Mostrar Calendario Отображение календаря diff --git a/widgets/category/conf/info.xml b/widgets/category/conf/info.xml index f0502e39f..ed9c0ba69 100644 --- a/widgets/category/conf/info.xml +++ b/widgets/category/conf/info.xml @@ -1,7 +1,7 @@ 게시글 분류 출력기 - 게시글 분류 출력기 + Article Categories 게시글 분류 출력기 게시글 분류 출력기 書き込みのカテゴリ表示 @@ -14,7 +14,7 @@ Zero zero 게시판등 문서모듈의 분류를 사용하는 모듈에서 분류를 추출하여 블로그 카테고리와 같이 출력하는 기능입니다. - 게시판등 문서모듈의 분류를 사용하는 모듈에서 분류를 추출하여 블로그 카테고리와 같이 출력하는 기능입니다. + This widgets displays categories of documents from modules which use category function. 게시판등 문서모듈의 분류를 사용하는 모듈에서 분류를 추출하여 블로그 카테고리와 같이 출력하는 기능입니다. 게시판등 문서모듈의 분류를 사용하는 모듈에서 분류를 추출하여 블로그 카테고리와 같이 출력하는 기능입니다. 掲示板など、ドキュメントモジュールのカテゴリを使用するモジュールでカテゴリを抽出してブログのカテゴリのように表示する機能です。 @@ -24,13 +24,13 @@ 대상 모듈 대상 모듈 - 대상 모듈 + Target Module 対象モジュール 대상 모듈 对象模块 mid_list 선택하신 모듈을 대상으로 합니다. 꼭 한개의 모듈만 선택해 주세요. - 선택하신 모듈을 대상으로 합니다. 꼭 한개의 모듈만 선택해 주세요. + Selected module will be target. Please select only 1 module. 선택하신 모듈을 대상으로 합니다. 꼭 한개의 모듈만 선택해 주세요. 선택하신 모듈을 대상으로 합니다. 꼭 한개의 모듈만 선택해 주세요. 選択されたモジュールを対象とします。必ず一つのモジュールのみ選択してください。 diff --git a/widgets/counter_status/conf/info.xml b/widgets/counter_status/conf/info.xml index 986649ba8..bf0c23758 100644 --- a/widgets/counter_status/conf/info.xml +++ b/widgets/counter_status/conf/info.xml @@ -2,7 +2,7 @@ 기본 카운터 위젯 デフォルト接続カウンター - Basic Counter Widget + Counter Widget de Contador Básico 计数器 Базовый виджет счетчика diff --git a/widgets/forum/conf/info.xml b/widgets/forum/conf/info.xml index 4f8e1ec61..0dbfd9eb9 100644 --- a/widgets/forum/conf/info.xml +++ b/widgets/forum/conf/info.xml @@ -3,7 +3,7 @@ 포럼형 최근 게시물 论坛型最新主题列表 フォーラムスタイルの最新の記事を表示 - Display Forum Style Newest Articles + Forum Style Newest Articles Pantalla Foro estilo más reciente de artículos Дисплей стиле форума новейших статей diff --git a/widgets/gagachat/conf/info.xml b/widgets/gagachat/conf/info.xml index 41b48c7e4..d1e5ce805 100644 --- a/widgets/gagachat/conf/info.xml +++ b/widgets/gagachat/conf/info.xml @@ -11,7 +11,7 @@ Digirave 실시간 채팅방을 생성합니다 ライブチャットボックスを生成します。 - This widget created realtime chat room + This widget creates realtime chat room Este artilugio creado sala de chat en tiempo real @@ -50,13 +50,13 @@ Si los miembros del sistema no es necesario, basta con introducir el título. text 보안 채팅방 사용시에만 필요함. 보안 채팅방을 사용하지 않을 경우에는 빈 칸으로 놔두시길 바랍니다. セキュリティチャットボックスを使用する時のみ必要です。使用しない場合は空欄のままにしてください。 - Security Key is only necessary for secure chat rooms. In case of normal chat room, please leave it blank. + Security Key is necessary for secure chat rooms only. In case of normal chat rooms, please leave it blank. Clave de seguridad sólo es necesario para garantizar las salas de chat. En caso de la sala de chat normal, por favor dejar en blanco. 채팅방 관리자(선택사항) チャットボックス管理者（オプション） - Chat Room Adminstrator (Optional) + Room Adminstrator (Optional) Sala de chat Administrador (Opcional) text 보안 채팅방 사용시에만 적용됨. 강제 퇴장 기능 가능함. 아이디, 아이디2, 아이디3 처럼 채팅방 관리자들을 , 로 분리하시길 바랍니다. @@ -141,7 +141,7 @@ Si los miembros del sistema no es necesario, basta con introducir el título. select 글씨체 크기 フォントの大きさ - Font size + Font Size Font size 작은 글씨체 diff --git a/widgets/image_counter/conf/info.xml b/widgets/image_counter/conf/info.xml index 6465177fe..7f44a8d33 100644 --- a/widgets/image_counter/conf/info.xml +++ b/widgets/image_counter/conf/info.xml @@ -4,7 +4,7 @@ 图像访问统计 イメージカウンターウィジェット Widget Contador de imagen - Image Counter Widget + Image Counter Виджет изображения счетчика 제로 diff --git a/widgets/language_select/conf/info.xml b/widgets/language_select/conf/info.xml index 8249e8171..79f0a4125 100644 --- a/widgets/language_select/conf/info.xml +++ b/widgets/language_select/conf/info.xml @@ -3,7 +3,7 @@ 언어 선택 言語選択 多国语言切换 - Language Selection + Language Selcción del Idioma Выбор языка diff --git a/widgets/login_info/conf/info.xml b/widgets/login_info/conf/info.xml index df5f311a1..f250039f8 100644 --- a/widgets/login_info/conf/info.xml +++ b/widgets/login_info/conf/info.xml @@ -3,7 +3,7 @@ 로그인 정보 출력 登陆表单 ログイン情報表示 - Display Login Info + Login Info Muestra la información de la conección Отображение информации логина diff --git a/widgets/member_group/conf/info.xml b/widgets/member_group/conf/info.xml index e598bcd74..b28c59939 100644 --- a/widgets/member_group/conf/info.xml +++ b/widgets/member_group/conf/info.xml @@ -2,7 +2,7 @@ 특정 그룹 회원 출력 위젯 グループ会員表示 - Display Specific Group Member + Specific Group Members Muestra el grupo de usuario específico 会员列表 Отображение членов определенной группы diff --git a/widgets/newest_comment/conf/info.xml b/widgets/newest_comment/conf/info.xml index 2c5515951..d73d69d79 100644 --- a/widgets/newest_comment/conf/info.xml +++ b/widgets/newest_comment/conf/info.xml @@ -3,7 +3,7 @@ 최근 댓글 출력 评论列表 最新コメント表示 - Display Newest Comments + Newest Comments Mostrar los comentarios recientes Отображение последних комментариев diff --git a/widgets/newest_document/conf/info.xml b/widgets/newest_document/conf/info.xml index 9d760f276..fb2d65881 100644 --- a/widgets/newest_document/conf/info.xml +++ b/widgets/newest_document/conf/info.xml @@ -3,7 +3,7 @@ 최근 문서 출력 主题列表 最新書き込み表示 - Display Newest Articles + Newest Articles Mostrar los documentos recientes Отображение последних статей diff --git a/widgets/newest_images/conf/info.xml b/widgets/newest_images/conf/info.xml index d0e2078b3..827f3f2e1 100644 --- a/widgets/newest_images/conf/info.xml +++ b/widgets/newest_images/conf/info.xml @@ -3,7 +3,7 @@ 최근 이미지 출력 最新イメージ表示 图片列表 - Display Newest Images + Newest Images Mostrar las imágenes recientes Отображение последних изображений diff --git a/widgets/newest_trackback/conf/info.xml b/widgets/newest_trackback/conf/info.xml index 934782425..568270b74 100644 --- a/widgets/newest_trackback/conf/info.xml +++ b/widgets/newest_trackback/conf/info.xml @@ -3,7 +3,7 @@ 최근 엮인글 출력 引用列表 最新トラックバック表示 - Display Newest Trackbacks + Newest Trackbacks Mostrar Trackbacks recientes Отображение последних трекбеков diff --git a/widgets/rank_point/conf/info.xml b/widgets/rank_point/conf/info.xml index 657074ba5..0de8601f9 100644 --- a/widgets/rank_point/conf/info.xml +++ b/widgets/rank_point/conf/info.xml @@ -2,7 +2,7 @@ 포인트 랭킹 출력 ポイントランキング出力 - Display Point Ranking + Point Ranking Pantalla punto ranking 会员积分排行榜 Отображение рейтинга поинтов diff --git a/widgets/tab_newest_document/conf/info.xml b/widgets/tab_newest_document/conf/info.xml index f571a3331..8e057b009 100644 --- a/widgets/tab_newest_document/conf/info.xml +++ b/widgets/tab_newest_document/conf/info.xml @@ -3,7 +3,7 @@ 탭 형태 최근 문서 출력 选项卡主题列表 タブスタイル最新コンテンツ出力 - Display Tab Style Newest Articles + Newest Articles in Tab Style 탭 형태 최근 문서 출력 Отображение последних статей в стиле закладок diff --git a/widgets/tag_list/conf/info.xml b/widgets/tag_list/conf/info.xml index b56ab2f13..eae4f07a3 100644 --- a/widgets/tag_list/conf/info.xml +++ b/widgets/tag_list/conf/info.xml @@ -3,7 +3,7 @@ 꼬리표 목록 출력 标签 タグリスト表示 - Show Tag List + Tag List Mostrar la lista de etiqueta Отображение списка тегов diff --git a/widgets/webzine/conf/info.xml b/widgets/webzine/conf/info.xml index 5bf833fdc..7264fd080 100644 --- a/widgets/webzine/conf/info.xml +++ b/widgets/webzine/conf/info.xml @@ -3,7 +3,7 @@ 웹진 형태 최근 문서 출력 网络杂志型主题列表 ウェブジンスタイル最新コンテンツ出力 - Display Newest Articles with Webzine Style + Newest Articles in Webzine Style Mostrar más nuevos artículos con el estilo Webzine Отображение последних статей в стиле webzine From 45827f830f226e377aed58ea49f46492009f1ea5 Mon Sep 17 00:00:00 2001 From: zero Date: Mon, 25 Feb 2008 18:45:58 +0000 Subject: [PATCH 055/140] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3796 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- layouts/xe_blog/conf/info.xml | 14 -------------- layouts/xe_blog/css/layout.css | 2 +- layouts/xe_blog/layout.html | 5 +---- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/layouts/xe_blog/conf/info.xml b/layouts/xe_blog/conf/info.xml index 2dbc62912..c7b41b146 100644 --- a/layouts/xe_blog/conf/info.xml +++ b/layouts/xe_blog/conf/info.xml @@ -132,20 +132,6 @@ Introduce el título que se mostrará en la parte superior de diseño. Введите название, которое будет отображаться в верхней части формы. - - 부제 - サブタイトル - 副标题 - Subtitle - Subtítulo - Подзаголовок - 레이아웃의 상단에 큰 제목 아래 부제목을 입력하세요. - レイアウトの上段にメインタイトルの下のサブタイトルを入力してください。 - 请输入副标题。 - Please input subtitle which will be displayed under the top title. - Por favor, de entrada subtítulo que se mostrará bajo el título arriba. - Введите субтитров, которые будут отображаться в верхней заголовок. - 로고이미지 ロゴイメージ diff --git a/layouts/xe_blog/css/layout.css b/layouts/xe_blog/css/layout.css index 60407355f..fb72de4e8 100644 --- a/layouts/xe_blog/css/layout.css +++ b/layouts/xe_blog/css/layout.css @@ -44,7 +44,7 @@ a { text-decoration:none; } #bodyWrap #header h1 a { font-family:Tahoma; color:#53554a;} #bodyWrap #header #tagLine { position:relative; left:20px; top:30px; color:#7e7f77;} -#bodyWrap #header #globalNavigation { line-height:11pt; font-size:9pt; float:right; overflow:hidden; margin:45px 3px 0 0; } +#bodyWrap #header #globalNavigation { font-size:9pt; float:right; overflow:hidden; margin:30px 3px 0 0; } #bodyWrap #header #globalNavigation li { float:left; margin-left:-1px; background:url(../images/common/blogHeaderVr.gif) no-repeat left center;} #bodyWrap #header #globalNavigation li a { display:block; float:left; padding:0 7px; font-weight:bold; color:#54564b; white-space:nowrap;} diff --git a/layouts/xe_blog/layout.html b/layouts/xe_blog/layout.html index 1ee1adea5..0eaeea0e8 100644 --- a/layouts/xe_blog/layout.html +++ b/layouts/xe_blog/layout.html @@ -68,12 +68,9 @@ {$layout_info->top_title} +   - -

{$layout_info->sub_title}

- -