From e56f5091a07d88d65b14fced60a8165e29ea00bd Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 21 Oct 2008 01:09:53 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@4661 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/addon/tpl/addon_info.html | 16 +++---- modules/addon/tpl/setup_addon.html | 14 +++--- modules/board/tpl/board_info.html | 24 +++++------ modules/board/tpl/board_insert.html | 28 ++++++------ modules/board/tpl/category_info.html | 6 +-- modules/board/tpl/grant_list.html | 2 +- modules/board/tpl/header.html | 2 +- modules/board/tpl/index.html | 2 +- modules/board/tpl/skin_info.html | 17 +++----- .../comment/tpl/comment_module_config.html | 2 +- modules/comment/tpl/declared_list.html | 20 ++++----- modules/communication/tpl/index.html | 4 +- modules/document/tpl/declared_list.html | 4 +- modules/document/tpl/document_config.html | 11 +++-- modules/editor/tpl/admin_index.html | 2 +- modules/editor/tpl/editor_module_config.html | 22 ++++++---- modules/editor/tpl/setup_component.html | 8 ++-- modules/editor/tpl/view_component.html | 22 ++++------ modules/file/tpl/file_config.html | 4 +- modules/file/tpl/file_module_config.html | 6 +-- modules/integration_search/tpl/index.html | 8 ++-- modules/integration_search/tpl/skin_info.html | 17 +++----- modules/issuetracker/tpl/grant_list.html | 4 +- modules/issuetracker/tpl/header.html | 2 +- modules/issuetracker/tpl/index.html | 2 +- modules/issuetracker/tpl/project_info.html | 16 +++---- modules/issuetracker/tpl/project_insert.html | 20 ++++----- modules/issuetracker/tpl/skin_info.html | 17 +++----- modules/layout/tpl/index.html | 8 ++-- modules/layout/tpl/layout_detail_info.html | 20 +++------ modules/lifepod/tpl/grant_list.html | 2 +- modules/lifepod/tpl/header.html | 2 +- modules/lifepod/tpl/lifepod_info.html | 14 +++--- modules/lifepod/tpl/lifepod_insert.html | 14 +++--- modules/lifepod/tpl/skin_info.html | 17 +++----- modules/member/lang/en.lang.php | 7 +++ modules/member/lang/es.lang.php | 7 +++ modules/member/lang/fr.lang.php | 7 +++ modules/member/lang/jp.lang.php | 7 +++ modules/member/lang/ko.lang.php | 7 +++ modules/member/lang/ru.lang.php | 7 +++ modules/member/lang/zh-CN.lang.php | 7 +++ modules/member/lang/zh-TW.lang.php | 7 +++ modules/member/member.admin.view.php | 6 ++- modules/member/tpl/group_list.html | 4 +- modules/member/tpl/group_update_form.html | 4 +- modules/member/tpl/insert_join_form.html | 10 ++--- modules/member/tpl/insert_member.html | 20 ++++----- modules/member/tpl/join_form_list.html | 2 +- modules/member/tpl/member_config.html | 20 ++++----- modules/member/tpl/member_info.html | 43 ++++++++++--------- modules/opage/tpl/opage_insert.html | 16 +++---- modules/page/tpl/page_insert.html | 12 +++--- modules/rss/tpl/rss_module_config.html | 4 +- modules/springnote/tpl/skin_info.html | 17 +++----- modules/springnote/tpl/springnote_insert.html | 16 +++---- modules/trackback/tpl/trackback_list.html | 4 +- .../tpl/trackback_module_config.html | 4 +- 58 files changed, 324 insertions(+), 293 deletions(-) diff --git a/modules/addon/tpl/addon_info.html b/modules/addon/tpl/addon_info.html index 565b6ca00..e07960da2 100644 --- a/modules/addon/tpl/addon_info.html +++ b/modules/addon/tpl/addon_info.html @@ -5,32 +5,27 @@
- - - + - - - + - + - - - + - diff --git a/modules/addon/tpl/setup_addon.html b/modules/addon/tpl/setup_addon.html index e81df2edd..5caa6a0ad 100644 --- a/modules/addon/tpl/setup_addon.html +++ b/modules/addon/tpl/setup_addon.html @@ -11,24 +11,22 @@
{$lang->title}
 {$addon_info->title} ver. {$addon_info->version}
{$lang->author}
 + {$author->name} ({$author->homepage}, {$author->email_address})
{$lang->homepage}
{$addon_info->homepage}{$addon_info->homepage}
{$lang->regdate}
 {zdate($addon_info->date, 'Y-m-d')}
{$lang->addon_license}
 {nl2br(trim($addon_info->license))} @@ -39,7 +34,6 @@
{$lang->description}
 {nl2br(trim($addon_info->description))}
- + - - - + - + - @@ -41,7 +39,7 @@ - +
{$addon_info->title} ver. {$addon_info->version} ({zdate($addon_info->date, 'Y-m-d')})
{$lang->author}
 + {$author->name} ({$author->homepage}, {$author->email_address})
{$addon_info->homepage}{$addon_info->homepage} 
{$group}
{$var->title}
 @@ -65,8 +63,6 @@
- - diff --git a/modules/board/tpl/board_info.html b/modules/board/tpl/board_info.html index dc784be5a..cbfdd9d3e 100644 --- a/modules/board/tpl/board_info.html +++ b/modules/board/tpl/board_info.html @@ -1,7 +1,7 @@
- + - + @@ -29,7 +29,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -102,7 +102,7 @@
{$lang->module_category}
 @@ -21,7 +21,7 @@
{$lang->skin}
 {$module_info->skin_title} ({$module_info->skin})
{$lang->browser_title}
 {htmlspecialchars($module_info->browser_title)}
{$lang->use_category}
 {$lang->use}{$lang->notuse}
{$lang->order_target}
 {$order_target[$module_info->order_target]}
{$lang->order_type}
 {$lang->order_asc}{$lang->order_desc}
{$lang->list_count}
 {$module_info->list_count?$module_info->list_count:20}
{$lang->search_list_count}
 {$module_info->search_list_count?$module_info->search_list_count:20}
{$lang->page_count}
 {$module_info->page_count?$module_info->page_count:10}
{$lang->except_notice}
 {$module_info->except_notice=='N'?$lang->notuse:$lang->use}
{$lang->consultation}
 {$module_info->consultation=='Y'?$lang->use:$lang->notuse}
{$lang->admin_mail}
 {$module_info->admin_mail} 
{$lang->description}
 {nl2br(htmlspecialchars($module_info->description))} 
{$lang->header_text}
 {htmlspecialchars($module_info->header_text)} 
{$lang->footer_text}
 {htmlspecialchars($module_info->footer_text)} 
{$lang->admin_id}
 {implode(",",$module_info->admin_id)} 
- + @@ -110,7 +110,7 @@ - + @@ -118,7 +118,7 @@ - + diff --git a/modules/board/tpl/board_insert.html b/modules/board/tpl/board_insert.html index 2be4a1682..272b90404 100644 --- a/modules/board/tpl/board_insert.html +++ b/modules/board/tpl/board_insert.html @@ -20,7 +20,7 @@ - + - + - + - + - + - + - + - + - + - +
{$lang->extra_vars} {$i}
{$lang->column_name}
 {$extra_vars_name}
{$lang->column_type}
 {$extra_vars_type}
{$lang->is_required}
 {$extra_vars_is_required}
{$lang->default_value}
 {$extra_vars_default_value}
{$lang->description}
 {$extra_vars_desc}
{$lang->is_default}
 is_default=='Y')-->checked="checked" id="fld_for_default" class="checkbox" /> @@ -43,7 +43,7 @@
{$lang->browser_title}
 @@ -64,7 +64,7 @@

{$lang->about_layout}
{$lang->skin}
{$lang->order_target}
{$lang->list_count}
 @@ -116,7 +116,7 @@

{$lang->about_search_list_count}
{$lang->page_count}
 @@ -130,7 +130,7 @@

{$lang->about_except_notice}
{$lang->consultation}
 consultation=='Y')-->checked="checked" /> @@ -144,7 +144,7 @@

{$lang->about_admin_mail}
{$lang->description}
 @@ -158,7 +158,7 @@

{$lang->about_header_text}
{$lang->footer_text}
 @@ -172,7 +172,7 @@

{$lang->about_admin_id}
@@ -198,7 +198,7 @@ - + @@ -214,7 +214,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -230,7 +230,7 @@ - +
{$lang->extra_vars} {$i}
{$lang->column_name}
{$lang->is_required}
 checked="checked" />
{$lang->default_value}

{$lang->about_extra_vars_default_value}
{$lang->description}
{$lang->cmd_search}
 checked="checked" />
diff --git a/modules/board/tpl/category_info.html b/modules/board/tpl/category_info.html index ebf3c9121..83ceb74b0 100644 --- a/modules/board/tpl/category_info.html +++ b/modules/board/tpl/category_info.html @@ -3,7 +3,7 @@ - + @@ -15,7 +15,7 @@

{$lang->about_category_title}

- + - + - + - + - + - - - + - + - - - + @@ -80,7 +77,7 @@ - +
{$lang->parent_category_title}
 {$category_info->parent_category_title}
{$lang->expand}
 expand=="Y")-->checked="checked" class="checkbox" /> @@ -31,7 +31,7 @@

{$lang->about_category_group_srls}
{$lang->cmd_delete} diff --git a/modules/board/tpl/grant_list.html b/modules/board/tpl/grant_list.html index ecb6574d1..02fa952bc 100644 --- a/modules/board/tpl/grant_list.html +++ b/modules/board/tpl/grant_list.html @@ -16,7 +16,7 @@
{$val->title}
 diff --git a/modules/board/tpl/header.html b/modules/board/tpl/header.html index cb781a1d5..d7650177d 100644 --- a/modules/board/tpl/header.html +++ b/modules/board/tpl/header.html @@ -16,7 +16,7 @@
  • {$lang->cmd_back}
    • -
  • class="on">{$lang->cmd_view_info}
    • +
  • class="on">{$lang->cmd_view_info}
  • class="on">{$lang->cmd_addition_setup}
  • class="on">{$lang->cmd_manage_category}
  • class="on">{$lang->cmd_manage_grant}
    • diff --git a/modules/board/tpl/index.html b/modules/board/tpl/index.html index 9b6c42ed6..d4b904645 100644 --- a/modules/board/tpl/index.html +++ b/modules/board/tpl/index.html @@ -37,7 +37,7 @@
    {$no} diff --git a/modules/board/tpl/skin_info.html b/modules/board/tpl/skin_info.html index 412e65d20..af4d5fd65 100644 --- a/modules/board/tpl/skin_info.html +++ b/modules/board/tpl/skin_info.html @@ -13,7 +13,7 @@
    {$lang->skin}
    		 {$skin_info->title}
    {$lang->skin_author}
    		 @@ -21,17 +21,14 @@
    {$lang->homepage}
    		 {$skin_info->homepage}
    {$lang->date}
    		{zdate($skin_info->date, 'Y-m-d')}{zdate($skin_info->date, 'Y-m-d')} 
    {$lang->skin_license}
    		 @@ -39,10 +36,10 @@

    {$skin_info->license_link}

    +  
    {$lang->description}
    		 {nl2br(trim($skin_info->description))}
    {$group}
    {$val->title}
    		 @@ -136,7 +133,7 @@ - + diff --git a/modules/comment/tpl/comment_module_config.html b/modules/comment/tpl/comment_module_config.html index 6b88410e6..6db771a78 100644 --- a/modules/comment/tpl/comment_module_config.html +++ b/modules/comment/tpl/comment_module_config.html @@ -12,7 +12,7 @@

    {$lang->about_comment_count}

    - + diff --git a/modules/comment/tpl/declared_list.html b/modules/comment/tpl/declared_list.html index 88c19064e..89ffe3f55 100644 --- a/modules/comment/tpl/declared_list.html +++ b/modules/comment/tpl/declared_list.html @@ -24,7 +24,7 @@ - + @@ -34,18 +34,16 @@ + + +
    {$no} {$oComment->getSummary(100)} {$oComment->getNickName()}{$lang->cmd_move}
    + {$lang->cmd_cancel_declare} + {$lang->cmd_select_all} + {$lang->cmd_reverse_all} + +
    - - -
    - {$lang->cmd_cancel_declare} -
    -
    - {$lang->cmd_select_all} - {$lang->cmd_reverse_all} - -
    diff --git a/modules/communication/tpl/index.html b/modules/communication/tpl/index.html index ba7be0120..3d96f34a9 100644 --- a/modules/communication/tpl/index.html +++ b/modules/communication/tpl/index.html @@ -8,7 +8,7 @@
    - + - + diff --git a/modules/document/tpl/declared_list.html b/modules/document/tpl/declared_list.html index 6af21f546..856786eea 100644 --- a/modules/document/tpl/declared_list.html +++ b/modules/document/tpl/declared_list.html @@ -27,7 +27,7 @@ - + - + - +
    {$lang->editor_skin}
    {$lang->colorset}
    {$no} isCarted())-->checked="checked"/> @@ -48,7 +48,7 @@ {$oDocument->getRegdate("Y-m-d")}
    {$lang->cmd_cancel_declare} {$lang->cmd_manage_document} diff --git a/modules/document/tpl/document_config.html b/modules/document/tpl/document_config.html index f636ae684..216323389 100644 --- a/modules/document/tpl/document_config.html +++ b/modules/document/tpl/document_config.html @@ -3,7 +3,7 @@ - + @@ -12,10 +12,13 @@ thumbnail_type == 'ratio')-->checked="checked"/> {$lang->thumbnail_ratio} - - + + - +
    {$lang->thumbnail_type}
    + + +
    diff --git a/modules/editor/tpl/admin_index.html b/modules/editor/tpl/admin_index.html index 1fffbef61..12918f941 100644 --- a/modules/editor/tpl/admin_index.html +++ b/modules/editor/tpl/admin_index.html @@ -13,7 +13,7 @@
    {$xml_info->title} ({$component_name})
    		 {$lang->cmd_setup} diff --git a/modules/editor/tpl/editor_module_config.html b/modules/editor/tpl/editor_module_config.html index 5d966eefc..324fb6a64 100644 --- a/modules/editor/tpl/editor_module_config.html +++ b/modules/editor/tpl/editor_module_config.html @@ -5,12 +5,15 @@ + - + + + - + - + - + - + - + - + - + - + +
    {$lang->editor}
     
    {$lang->document}
    {$lang->comment}
    {$lang->editor_skin}

    {$lang->about_editor_skin}
    {$lang->enable_html_grant}
    		 @@ -46,7 +49,7 @@

    {$lang->about_enable_html_grant}
    {$lang->upload_file_grant}
    		 @@ -62,7 +65,7 @@

    {$lang->about_upload_file_grant}
    {$lang->enable_default_component_grant}
    		 @@ -78,7 +81,7 @@

    {$lang->about_default_component_grant}
    {$lang->enable_component_grant}
    		 @@ -94,7 +97,7 @@

    {$lang->about_component_grant}
    {$lang->editor_height}
    		 px @@ -106,7 +109,7 @@

    {$lang->about_editor_height}
    {$lang->height_resizable}
    		 enable_height_resizable=='Y')-->checked="checked"/> @@ -118,18 +121,19 @@

    {$lang->about_editor_height_resizable}
    {$lang->enable_autosave}
    		 enable_autosave=='Y')-->checked="checked"/>

    {$lang->about_enable_autosave}
    diff --git a/modules/editor/tpl/setup_component.html b/modules/editor/tpl/setup_component.html index 5c40e7710..cc9b13bc6 100644 --- a/modules/editor/tpl/setup_component.html +++ b/modules/editor/tpl/setup_component.html @@ -12,7 +12,7 @@
    - + @@ -25,14 +25,14 @@ - + - + - +
    {$lang->component_name}
    		 {$component->component_name} ver. {$component->version}
    {$lang->component_link}
    		 {$component->link}
    {$val->title}
    		 @@ -41,7 +41,7 @@
    {$lang->grant}
    		 diff --git a/modules/editor/tpl/view_component.html b/modules/editor/tpl/view_component.html index 6b987c67f..d4fe3cf71 100644 --- a/modules/editor/tpl/view_component.html +++ b/modules/editor/tpl/view_component.html @@ -7,24 +7,21 @@
    - + - - - + - - + - - - + @@ -49,16 +46,13 @@
    {$lang->component_author}
    		 + {$author->name} ({$author->homepage}, {$author->email_address})
    {$lang->homepage}
    		{$component->homepage}{$component->homepage} 
    {$lang->regdate}
    		 {zdate($component->date, 'Y-m-d')}
    {$lang->component_license}
    		 @@ -32,10 +29,10 @@

    {$component->license_link}

    +  
    {$lang->component_description}
    		 {nl2br(trim($component->description))}
    - - - - + -
    {$history->version}
    {zdate($history->date, 'Y-m-d')}
    		+

    {$author->name} ({$author->homepage} / {$author->email_address})

    diff --git a/modules/file/tpl/file_config.html b/modules/file/tpl/file_config.html index 74f991065..d3310ad81 100644 --- a/modules/file/tpl/file_config.html +++ b/modules/file/tpl/file_config.html @@ -3,7 +3,7 @@
    - + - +
    {$lang->allowed_filesize}
    		 MB @@ -18,7 +18,7 @@

    {$lang->about_allowed_attach_size}
    {$lang->allowed_filetypes}
    		 diff --git a/modules/file/tpl/file_module_config.html b/modules/file/tpl/file_module_config.html index 8a26289d1..a44b34468 100644 --- a/modules/file/tpl/file_module_config.html +++ b/modules/file/tpl/file_module_config.html @@ -4,7 +4,7 @@ - + - + - + diff --git a/modules/integration_search/tpl/index.html b/modules/integration_search/tpl/index.html index e2a841f6b..c2b32bb3c 100644 --- a/modules/integration_search/tpl/index.html +++ b/modules/integration_search/tpl/index.html @@ -3,7 +3,7 @@
    {$lang->file}
    {$lang->allowed_filesize}
    		 MB @@ -19,7 +19,7 @@

    {$lang->about_allowed_attach_size}
    {$lang->allowed_filetypes}
    		 @@ -36,7 +36,7 @@
    - + - + @@ -37,7 +37,7 @@ - + - + diff --git a/modules/integration_search/tpl/skin_info.html b/modules/integration_search/tpl/skin_info.html index 330b9b434..49e591a94 100644 --- a/modules/integration_search/tpl/skin_info.html +++ b/modules/integration_search/tpl/skin_info.html @@ -10,7 +10,7 @@ - + - - + - - + - - - + @@ -77,7 +74,7 @@ - +
    {$lang->sample_code}
    		 @@ -21,7 +21,7 @@

    {$lang->about_skin}
    {$lang->about_target_module}
    {$val->module} target_mid))-->checked="checked" /> @@ -46,7 +46,7 @@
    {$lang->skin}
    		 {$skin_info->title}
    {$lang->skin_author}
    		 @@ -18,17 +18,14 @@
    {$lang->homepage}
    		{$skin_info->homepage}{$skin_info->homepage} 
    {$lang->date}
    		 {zdate($skin_info->date, 'Y-m-d')}
    {$lang->skin_license}
    		 @@ -36,10 +33,10 @@

    {$skin_info->license_link}

    +  
    {$lang->description}
    		 {nl2br($skin_info->description)}
    {$group}
    {$val->title}
    		 @@ -134,7 +131,7 @@ - + diff --git a/modules/issuetracker/tpl/grant_list.html b/modules/issuetracker/tpl/grant_list.html index ae2465ae3..bb3c23299 100644 --- a/modules/issuetracker/tpl/grant_list.html +++ b/modules/issuetracker/tpl/grant_list.html @@ -16,7 +16,7 @@ - + - + - + diff --git a/modules/issuetracker/tpl/project_info.html b/modules/issuetracker/tpl/project_info.html index 89138792f..5b4a15675 100644 --- a/modules/issuetracker/tpl/project_info.html +++ b/modules/issuetracker/tpl/project_info.html @@ -1,7 +1,7 @@
    {$val->title}
    		 @@ -28,7 +28,7 @@ {$lang->cmd_unselect_all}
    diff --git a/modules/issuetracker/tpl/header.html b/modules/issuetracker/tpl/header.html index 4bdd77528..f075a1db5 100644 --- a/modules/issuetracker/tpl/header.html +++ b/modules/issuetracker/tpl/header.html @@ -21,7 +21,7 @@ -
  • class="on">{$lang->cmd_view_info}
    • +
  • class="on">{$lang->cmd_view_info}
  • class="on">{$lang->cmd_project_setting}
  • class="on">{$lang->cmd_release_setting}
  • class="on">{$lang->cmd_addition_setup}
    • diff --git a/modules/issuetracker/tpl/index.html b/modules/issuetracker/tpl/index.html index 1d36d93b5..976f06f31 100644 --- a/modules/issuetracker/tpl/index.html +++ b/modules/issuetracker/tpl/index.html @@ -50,7 +50,7 @@     		{$lang->cmd_delete} 
    {$lang->cmd_make}
    - + - + @@ -29,7 +29,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -70,7 +70,7 @@
    {$lang->module_category}
    		 @@ -21,7 +21,7 @@
    {$lang->skin}
    		 {$module_info->skin_title} ({$module_info->skin})
    {$lang->browser_title}
    		 {htmlspecialchars($module_info->browser_title)}
    {$lang->svn_url}
    		 {$module_info->svn_url} 
    {$lang->svn_cmd}
    		 {$module_info->svn_cmd} 
    {$lang->diff_cmd}
    		 {$module_info->diff_cmd} 
    {$lang->description}
    		 {nl2br(htmlspecialchars($module_info->description))} 
    {$lang->admin_id}
    		 {implode(",",$module_info->admin_id)} 
    - + @@ -78,7 +78,7 @@ - + @@ -86,7 +86,7 @@ - + diff --git a/modules/issuetracker/tpl/project_insert.html b/modules/issuetracker/tpl/project_insert.html index 6f72d40cb..6a0bf4c6b 100644 --- a/modules/issuetracker/tpl/project_insert.html +++ b/modules/issuetracker/tpl/project_insert.html @@ -12,7 +12,7 @@
    {$lang->extra_vars} {$i}
    {$lang->column_name}
    		 {$extra_vars_name}
    {$lang->column_type}
    		 {$extra_vars_type}
    {$lang->is_required}
    		 {$extra_vars_is_required}
    {$lang->default_value}
    		 {$extra_vars_default_value}
    {$lang->description}
    		 {$extra_vars_desc}
    - + - + - + - + - + - +
    {$lang->mid}
    		 @@ -29,7 +29,7 @@
    {$lang->module_category}
    {$lang->layout}
    {$lang->svn_url}
    		 @@ -89,7 +89,7 @@

    {$lang->about_svn_cmd}
    {$lang->diff_cmd}
    		 @@ -103,7 +103,7 @@

    {$lang->about_description}
    {$lang->admin_id}
    		 @@ -136,7 +136,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -168,7 +168,7 @@ - +
    {$lang->extra_vars} {$i}
    {$lang->column_name}
    {$lang->is_required}
    		 checked="checked" />
    {$lang->default_value}

    {$lang->about_extra_vars_default_value}
    {$lang->description}
    {$lang->cmd_search}
    		 checked="checked" />
    diff --git a/modules/issuetracker/tpl/skin_info.html b/modules/issuetracker/tpl/skin_info.html index d03b4f0aa..073342dd3 100644 --- a/modules/issuetracker/tpl/skin_info.html +++ b/modules/issuetracker/tpl/skin_info.html @@ -8,7 +8,7 @@ - + @@ -20,27 +20,24 @@ - - + - + - - - + - @@ -79,7 +76,7 @@ - +
    {$lang->skin_default_info}
    {$lang->skin}
    		 {$skin_info->title}
    {$lang->homepage}
    		{$skin_info->homepage}{$skin_info->homepage} 
    {$lang->date}
    		 {zdate($skin_info->date, 'Y-m-d')}
    {$lang->skin_license}
    		 {nl2br(trim($skin_info->license))}

    {$skin_info->license_link}

    +  
    {$lang->description}
    		 {nl2br($skin_info->description)}
    {$group}
    {$val->title}
    		 @@ -135,7 +132,7 @@ - + diff --git a/modules/layout/tpl/index.html b/modules/layout/tpl/index.html index 8f08d6adb..5fb04c127 100644 --- a/modules/layout/tpl/index.html +++ b/modules/layout/tpl/index.html @@ -22,7 +22,7 @@ - + - - + + - + diff --git a/modules/layout/tpl/layout_detail_info.html b/modules/layout/tpl/layout_detail_info.html index eb911c3d0..ad7f3b662 100644 --- a/modules/layout/tpl/layout_detail_info.html +++ b/modules/layout/tpl/layout_detail_info.html @@ -4,39 +4,36 @@
    {$no+1} {$val->layout} @@ -39,11 +39,11 @@   {$lang->cmd_layout_edit}{$lang->cmd_delete}{$lang->cmd_layout_edit}{$lang->cmd_delete}
    {$lang->cmd_make}
    - + - - - + - + - - - + - @@ -51,11 +48,8 @@
    {$lang->title}
    		 {$layout_info->title} ver {$layout_info->version}
    {$lang->author}
    		 + {$author->name} ({$author->homepage}, {$author->email_address})
    {$lang->homepage}
    		{$layout_info->homepage}{$layout_info->homepage} 
    {$lang->regdate}
    		 {zdate($layout_info->date, 'Y-m-d')}
    {$lang->layout_license}
    		 {nl2br(trim($layout_info->license))}

    {$layout_info->license_link}

    +  
    {$lang->description}
    		 {nl2br(trim($layout_info->description))}
    - - - - + - +
    {$history->version}
    {zdate($history->date, 'Y-m-d')} diff --git a/modules/lifepod/tpl/grant_list.html b/modules/lifepod/tpl/grant_list.html index 126f27b0d..a2afd306a 100644 --- a/modules/lifepod/tpl/grant_list.html +++ b/modules/lifepod/tpl/grant_list.html @@ -10,7 +10,7 @@
    {$val->title}
    		 diff --git a/modules/lifepod/tpl/header.html b/modules/lifepod/tpl/header.html index 5aedd5350..7b728f638 100644 --- a/modules/lifepod/tpl/header.html +++ b/modules/lifepod/tpl/header.html @@ -16,7 +16,7 @@
  • {$lang->cmd_back}
    • -
  • class="on">{$lang->cmd_view_info}
    • +
  • class="on">{$lang->cmd_view_info}
  • class="on">{$lang->cmd_manage_grant}
  • class="on">{$lang->cmd_manage_skin}
    • diff --git a/modules/lifepod/tpl/lifepod_info.html b/modules/lifepod/tpl/lifepod_info.html index ccae8e339..acedac406 100644 --- a/modules/lifepod/tpl/lifepod_info.html +++ b/modules/lifepod/tpl/lifepod_info.html @@ -1,7 +1,7 @@ - + - + - + @@ -38,7 +38,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -62,7 +62,7 @@ - +
    {$lang->module_category}
    		 @@ -15,7 +15,7 @@
    {$lang->calendar_address}
    		 {$module_info->calendar_address} 
    {$lang->layout}
    		 @@ -30,7 +30,7 @@
    {$lang->skin}
    		 {$module_info->skin_title} ({$module_info->skin})
    {$lang->browser_title}
    		 {htmlspecialchars($module_info->browser_title)}
    {$lang->use_category}
    		 {$lang->use}{$lang->notuse}
    {$lang->list_count}
    		 {$module_info->list_count?$module_info->list_count:20}
    {$lang->page_count}
    		 {$module_info->page_count?$module_info->page_count:10}
    {$lang->description}
    		 {nl2br(htmlspecialchars($module_info->description))} 
    {$lang->header_text}
    		 {htmlspecialchars($module_info->header_text)} 
    {$lang->footer_text}
    		 {htmlspecialchars($module_info->footer_text)} 
    {$lang->admin_id}
    		 {implode(",",$module_info->admin_id)} 
    {$lang->cmd_modify} diff --git a/modules/lifepod/tpl/lifepod_insert.html b/modules/lifepod/tpl/lifepod_insert.html index 0489ff2fb..75142d744 100644 --- a/modules/lifepod/tpl/lifepod_insert.html +++ b/modules/lifepod/tpl/lifepod_insert.html @@ -12,7 +12,7 @@ - + - + - + - + - + - + - + diff --git a/modules/lifepod/tpl/skin_info.html b/modules/lifepod/tpl/skin_info.html index 4f643a5a5..d96d9df17 100644 --- a/modules/lifepod/tpl/skin_info.html +++ b/modules/lifepod/tpl/skin_info.html @@ -9,7 +9,7 @@
    {$lang->mid}
    		 @@ -28,7 +28,7 @@
    {$lang->module_category}
    {$lang->browser_title}
    		 @@ -67,7 +67,7 @@

    {$lang->about_layout}
    {$lang->skin}
    {$lang->header_text}
    		 @@ -99,14 +99,14 @@

    {$lang->about_footer_text}
    {$lang->admin_id}

    {$lang->about_admin_id}
    - + @@ -21,27 +21,24 @@ - - + - + - - - + - @@ -82,7 +79,7 @@ - + - + diff --git a/modules/member/tpl/member_config.html b/modules/member/tpl/member_config.html index a527533e4..510047c21 100644 --- a/modules/member/tpl/member_config.html +++ b/modules/member/tpl/member_config.html @@ -7,7 +7,7 @@
    {$lang->skin_default_info}
    {$lang->skin}
    		 {$skin_info->title}
    {$lang->homepage}
    		{$skin_info->homepage}{$skin_info->homepage} 
    {$lang->date}
    		 {zdate($skin_info->date, 'Y-m-d')}
    {$lang->skin_license}
    		 {nl2br(trim($skin_info->license))}

    {$skin_info->license_link}

    +  
    {$lang->description}
    		 {nl2br($skin_info->description)}
    {$group}
    {$val->title}
    		 @@ -138,7 +135,7 @@ - + diff --git a/modules/member/lang/en.lang.php b/modules/member/lang/en.lang.php index bf80d26b1..ec66373c8 100644 --- a/modules/member/lang/en.lang.php +++ b/modules/member/lang/en.lang.php @@ -52,6 +52,13 @@ $lang->member_info = 'Member Info'; $lang->current_password = 'Current Password'; $lang->openid = 'OpenID'; + $lang->allow_message = '쪽지 허용'; + $lang->allow_message_type = array( + 'Y' => '모두 허용', + 'F' => '등록된 친구들만 허용', + 'N' => '모두 금지', + ); + $lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다'; $lang->webmaster_name = "Webmaster's Name"; $lang->webmaster_email = "Webmaster's Email"; diff --git a/modules/member/lang/es.lang.php b/modules/member/lang/es.lang.php index f1ccd5445..aa1646a19 100644 --- a/modules/member/lang/es.lang.php +++ b/modules/member/lang/es.lang.php @@ -51,6 +51,13 @@ $lang->member_info = 'Información del Usuario'; $lang->current_password = 'Contraseña actual'; $lang->openid = 'OpenID'; + $lang->allow_message = '쪽지 허용'; + $lang->allow_message_type = array( + 'Y' => '모두 허용', + 'F' => '등록된 친구들만 허용', + 'N' => '모두 금지', + ); + $lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다'; $lang->webmaster_name = 'Nombre del Webmaster'; $lang->webmaster_email = 'Correo electrónico Webmaster'; diff --git a/modules/member/lang/fr.lang.php b/modules/member/lang/fr.lang.php index b4b69a8a4..07e888fc7 100644 --- a/modules/member/lang/fr.lang.php +++ b/modules/member/lang/fr.lang.php @@ -52,6 +52,13 @@ $lang->member_info = 'Information de Membre'; $lang->current_password = 'Mot de Passe courant'; $lang->openid = 'OpenID'; + $lang->allow_message = '쪽지 허용'; + $lang->allow_message_type = array( + 'Y' => '모두 허용', + 'F' => '등록된 친구들만 허용', + 'N' => '모두 금지', + ); + $lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다'; $lang->webmaster_name = "Nom de Webmestre"; $lang->webmaster_email = "Mél de Webmestre"; diff --git a/modules/member/lang/jp.lang.php b/modules/member/lang/jp.lang.php index 7a1f853b4..d4ed92a91 100644 --- a/modules/member/lang/jp.lang.php +++ b/modules/member/lang/jp.lang.php @@ -52,6 +52,13 @@ $lang->member_info = '会員情報'; $lang->current_password = '現在のパスワード'; $lang->openid = 'OpenID'; + $lang->allow_message = '쪽지 허용'; + $lang->allow_message_type = array( + 'Y' => '모두 허용', + 'F' => '등록된 친구들만 허용', + 'N' => '모두 금지', + ); + $lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다'; $lang->webmaster_name = 'ウェブマスターのお名前'; $lang->webmaster_email = 'ウェブマスターのメールアドレス'; diff --git a/modules/member/lang/ko.lang.php b/modules/member/lang/ko.lang.php index 04884faf0..bc834ac99 100644 --- a/modules/member/lang/ko.lang.php +++ b/modules/member/lang/ko.lang.php @@ -52,6 +52,13 @@ $lang->member_info = '회원 정보'; $lang->current_password = '현재 비밀번호'; $lang->openid = 'OpenID'; + $lang->allow_message = '쪽지 허용'; + $lang->allow_message_type = array( + 'Y' => '모두 허용', + 'F' => '등록된 친구들만 허용', + 'N' => '모두 금지', + ); + $lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다'; $lang->webmaster_name = '웹마스터 이름'; $lang->webmaster_email = '웹마스터 메일주소'; diff --git a/modules/member/lang/ru.lang.php b/modules/member/lang/ru.lang.php index e716a7d5e..311f70ab1 100644 --- a/modules/member/lang/ru.lang.php +++ b/modules/member/lang/ru.lang.php @@ -51,6 +51,13 @@ $lang->member_info = 'Пользовательская информация'; $lang->current_password = 'Текущий пароль'; $lang->openid = 'OpenID'; + $lang->allow_message = '쪽지 허용'; + $lang->allow_message_type = array( + 'Y' => '모두 허용', + 'F' => '등록된 친구들만 허용', + 'N' => '모두 금지', + ); + $lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다'; $lang->webmaster_name = "Имя веб-мастера"; $lang->webmaster_email = "Email веб-мастера"; diff --git a/modules/member/lang/zh-CN.lang.php b/modules/member/lang/zh-CN.lang.php index 9117d06da..1dfc36bbc 100644 --- a/modules/member/lang/zh-CN.lang.php +++ b/modules/member/lang/zh-CN.lang.php @@ -52,6 +52,13 @@ $lang->member_info = '会员信息'; $lang->current_password = '当前密码'; $lang->openid = 'OpenID'; + $lang->allow_message = '쪽지 허용'; + $lang->allow_message_type = array( + 'Y' => '모두 허용', + 'F' => '등록된 친구들만 허용', + 'N' => '모두 금지', + ); + $lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다'; $lang->webmaster_name = '管理员名'; $lang->webmaster_email = '管理员电子邮件'; diff --git a/modules/member/lang/zh-TW.lang.php b/modules/member/lang/zh-TW.lang.php index 4b49921e7..0cb77d439 100644 --- a/modules/member/lang/zh-TW.lang.php +++ b/modules/member/lang/zh-TW.lang.php @@ -52,6 +52,13 @@ $lang->member_info = '會員資料'; $lang->current_password = '當前密碼'; $lang->openid = 'OpenID'; + $lang->allow_message = '쪽지 허용'; + $lang->allow_message_type = array( + 'Y' => '모두 허용', + 'F' => '등록된 친구들만 허용', + 'N' => '모두 금지', + ); + $lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다'; $lang->webmaster_name = '管理員名稱'; $lang->webmaster_email = '管理員電子郵件'; diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php index e84a1d3ee..812152f20 100644 --- a/modules/member/member.admin.view.php +++ b/modules/member/member.admin.view.php @@ -109,8 +109,9 @@ * @brief 회원 정보 출력 **/ function dispMemberAdminInfo() { - // 추가 가입폼 목록을 받음 - $oMemberModel = &getModel('member'); + return $this->dispMemberAdminInsert(); + + /* $oModuleModel = &getModel('module'); $member_config = $oModuleModel->getModuleConfig('member'); @@ -118,6 +119,7 @@ Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($this->member_info)); $this->setTemplateFile('member_info'); + */ } /** diff --git a/modules/member/tpl/group_list.html b/modules/member/tpl/group_list.html index 98dc5f407..fbabf20f4 100644 --- a/modules/member/tpl/group_list.html +++ b/modules/member/tpl/group_list.html @@ -56,7 +56,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/modules/member/tpl/group_update_form.html b/modules/member/tpl/group_update_form.html index 952ff03d3..daa306b48 100644 --- a/modules/member/tpl/group_update_form.html +++ b/modules/member/tpl/group_update_form.html @@ -13,7 +13,7 @@ - + @@ -22,7 +22,7 @@ - + diff --git a/modules/member/tpl/insert_join_form.html b/modules/member/tpl/insert_join_form.html index ace9bda0e..de0744b00 100644 --- a/modules/member/tpl/insert_join_form.html +++ b/modules/member/tpl/insert_join_form.html @@ -6,7 +6,7 @@
    {$lang->group_title}
    {$lang->is_default}
    		 {$lang->about_member_default}
    {$lang->description}
    {$lang->is_default}
    		 {$lang->about_member_default}
    {$lang->description}
    - + - + - + - + - + diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html index 7965b80d0..286bbe45f 100644 --- a/modules/member/tpl/insert_member.html +++ b/modules/member/tpl/insert_member.html @@ -42,7 +42,7 @@ - + - + - + - + - + - + - + - + - +
    {$lang->column_type}
    {$lang->column_title}
    		 @@ -62,7 +62,7 @@

    {$lang->about_active}
    {$lang->is_required}
    		 required=='Y')-->checked="checked"/> @@ -70,13 +70,13 @@
    {$lang->description}
    {$lang->description}

    {$lang->about_form_description}
    {$lang->password}
    		 @@ -55,7 +55,7 @@

    {$lang->about_user_name}
    {$lang->nick_name}
    		 @@ -68,7 +68,7 @@
    {$lang->homepage}
    		 @@ -81,7 +81,7 @@
    {$lang->birthday}
    		 @@ -100,7 +100,7 @@ {$lang->about_allow_mailing}
    {$lang->allow_message}
    		 {$editor}
    {$lang->denied}
    		 denied=='Y')-->checked="checked"/> @@ -135,7 +135,7 @@

    {$lang->about_limit_date}
    {$lang->is_admin}
    		 is_admin=='Y')-->checked="checked"/> @@ -149,7 +149,7 @@

    {$lang->about_member_description}
    {$lang->group}
    		 @@ -167,7 +167,7 @@
    {$lang->member_extend_info}
    {htmlspecialchars($val->column_title)} * @@ -260,7 +260,7 @@
    -
    +
    {$lang->cmd_cancel} diff --git a/modules/member/tpl/join_form_list.html b/modules/member/tpl/join_form_list.html index 31c55eb64..4818e7614 100644 --- a/modules/member/tpl/join_form_list.html +++ b/modules/member/tpl/join_form_list.html @@ -37,7 +37,7 @@
    		{$lang->cmd_delete}
    {$lang->cmd_make}
    - + - + - + - + - + - + - + - + - + - +
    {$lang->webmaster_name}
    		 @@ -21,7 +21,7 @@

    {$lang->about_webmaster_email}
    {$lang->enable_openid}
    		 enable_openid=='Y')-->checked="checked" class="checkbox" /> @@ -35,7 +35,7 @@ {$lang->about_enable_join}
    {$lang->enable_confirm}
    		 enable_confirm=='Y')-->checked="checked" class="checkbox" /> @@ -49,7 +49,7 @@ {$lang->about_enable_ssl}
    {$lang->limit_day}
    		 {$lang->unit_day} @@ -67,7 +67,7 @@ {$lang->profile_image_max_height} : px
    {$lang->image_name}

    @@ -89,7 +89,7 @@ {$lang->image_mark_max_height} : px
    {$lang->signature_max_height}
    		 px @@ -106,7 +106,7 @@
    {$lang->after_login_url}
    		 @@ -120,7 +120,7 @@

    {$lang->about_after_logout_url}
    {$lang->redirect_url}
    		 @@ -134,7 +134,7 @@

    {$lang->about_agreement}
    {$lang->skin}
    {$lang->colorset}
    diff --git a/modules/member/tpl/member_info.html b/modules/member/tpl/member_info.html index 9d4b9e2d9..b04b7390a 100644 --- a/modules/member/tpl/member_info.html +++ b/modules/member/tpl/member_info.html @@ -9,7 +9,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -32,7 +32,7 @@ - + - + - + - + @@ -102,7 +102,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -131,7 +131,7 @@   - + @@ -145,7 +145,7 @@ - + + + +
    {$lang->user_id}
    		 {htmlspecialchars($member_info->user_id)}
    {$lang->user_name}
    		 {htmlspecialchars($member_info->user_name)}
    {$lang->nick_name}
    		 {htmlspecialchars($member_info->nick_name)}
    @@ -55,7 +55,7 @@
    @@ -78,7 +78,7 @@
    @@ -94,7 +94,7 @@
    {$lang->email_address}
    		 {htmlspecialchars($member_info->email_address)}
    {$lang->homepage}
    		 {htmlspecialchars($member_info->homepage)} 
    {$lang->blog}
    		 {htmlspecialchars($member_info->blog)} 
    {$lang->birthday}
    		 {zdate($member_info->birthday,'Y-m-d')} 
    {$lang->allow_mailing}
    		 {$member_info->allow_mailing} 
    {$lang->allow_message}
    		 {$lang->allow_message_type[$member_info->allow_message]}
    {$lang->signature}
    		 {$member_info->signature} 
    {$lang->denied}
    		 {$member_info->denied}
    {$lang->is_admin}
    		 {$member_info->is_admin}
    {htmlspecialchars($val->column_title)} ({$lang->public})
    		 @@ -172,16 +172,17 @@
    {$lang->description}
    		 {htmlspecialchars($member_info->description)} 
    + {$lang->cmd_modify} + + {$lang->cmd_delete} + + + {$lang->cmd_back} + +
    -
    - {$lang->cmd_modify} - - {$lang->cmd_delete} - - - {$lang->cmd_back} - -
    - diff --git a/modules/opage/tpl/opage_insert.html b/modules/opage/tpl/opage_insert.html index 811159e60..9d7e09c36 100644 --- a/modules/opage/tpl/opage_insert.html +++ b/modules/opage/tpl/opage_insert.html @@ -9,7 +9,7 @@ - + - + - + - + - + - + - - +
    {$lang->mid}
    		 @@ -25,7 +25,7 @@
    {$lang->module_category}
    {$lang->layout}
    {$lang->opage_path}
    		 @@ -72,12 +72,12 @@
    {$lang->grant}
    {$lang->target}
    {$lang->target}
    {$val->title}
    		 + grants[$key])&&in_array($v->group_srl,$module_info->grants[$key]))-->checked="checked"/> @@ -87,7 +87,7 @@ {$lang->cmd_unselect_all}
    diff --git a/modules/page/tpl/page_insert.html b/modules/page/tpl/page_insert.html index b8aa8091e..6167d4269 100644 --- a/modules/page/tpl/page_insert.html +++ b/modules/page/tpl/page_insert.html @@ -9,7 +9,7 @@ - + - + - + - + - + - + diff --git a/modules/rss/tpl/rss_module_config.html b/modules/rss/tpl/rss_module_config.html index 8429fd305..4f7a85b9c 100644 --- a/modules/rss/tpl/rss_module_config.html +++ b/modules/rss/tpl/rss_module_config.html @@ -15,7 +15,9 @@

    {$lang->about_open_rss}

    - + + +
    {$lang->mid}
    		 @@ -25,7 +25,7 @@
    {$lang->module_category}
    {$lang->layout}
    {$lang->grant}
    		{$lang->target}{$lang->target}
    {$val->title}
    		 @@ -73,7 +73,7 @@ {$lang->cmd_unselect_all}
    diff --git a/modules/springnote/tpl/skin_info.html b/modules/springnote/tpl/skin_info.html index 632d5b848..0f91f50bb 100644 --- a/modules/springnote/tpl/skin_info.html +++ b/modules/springnote/tpl/skin_info.html @@ -9,7 +9,7 @@ - + @@ -21,27 +21,24 @@ - - + - + - - - + - @@ -50,7 +47,7 @@
    {$lang->skin_default_info}
    {$lang->skin}
    		 {$skin_info->title}
    {$lang->homepage}
    		{$skin_info->homepage}{$skin_info->homepage} 
    {$lang->date}
    		 {zdate($skin_info->date, 'Y-m-d')}
    {$lang->skin_license}
    		 {nl2br(trim($skin_info->license))}

    {$skin_info->license_link}

    +  
    {$lang->description}
    		 {nl2br($skin_info->description)}
    - + valign="top">
    {$lang->extra_vars}
    {$lang->colorset}
    		 @@ -138,7 +135,7 @@ - + diff --git a/modules/springnote/tpl/springnote_insert.html b/modules/springnote/tpl/springnote_insert.html index 90529ef3c..11ce18dcd 100644 --- a/modules/springnote/tpl/springnote_insert.html +++ b/modules/springnote/tpl/springnote_insert.html @@ -13,7 +13,7 @@
    - + - + - + - + - + - + - + - + - + + +
    {$lang->mid}
    		 @@ -29,7 +29,7 @@
    {$lang->module_category}
    {$lang->springnote_userkey}
    		 @@ -63,7 +63,7 @@

    {$lang->about_springnote_pageid}
    {$lang->springnote_pageid_setup}

    pageid_option!='list')-->checked="checked" id="springnote_pageid_option_only" />

    @@ -79,7 +79,7 @@
    {$lang->browser_title}
    		 @@ -98,7 +98,7 @@

    {$lang->about_layout}
    {$lang->skin}
    {$lang->header_text}
    		 @@ -130,7 +130,7 @@

    {$lang->about_footer_text}
    {$lang->admin_id}
    		 diff --git a/modules/trackback/tpl/trackback_list.html b/modules/trackback/tpl/trackback_list.html index d7d19ae3d..5e79f6a08 100644 --- a/modules/trackback/tpl/trackback_list.html +++ b/modules/trackback/tpl/trackback_list.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

    {$lang->about_enable_trackback}

    - +
    {$lang->enable_trackback}
    diff --git a/modules/trackback/tpl/trackback_module_config.html b/modules/trackback/tpl/trackback_module_config.html index 2c8691143..a7e5ff646 100644 --- a/modules/trackback/tpl/trackback_module_config.html +++ b/modules/trackback/tpl/trackback_module_config.html @@ -8,7 +8,9 @@
    {$lang->enable_trackback}
    		 enable_trackback == "Y")-->checked="checked" />